Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions lib/models/apirequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,31 @@ function getMissingParams (params, required) {
return missing.length > 0 ? missing : null;
}

function timeout(ms, promise) {
return new Promise(function(resolve, reject) {
setTimeout(function() {
reject(new Error("timeout"))
}, ms);
promise.then(resolve, reject);
});
}

function DefaultTransporter(){

};
DefaultTransporter.prototype.request = function(opts, auth, opt_callback) {
const url = (opts.uri || opts.url) + '?key=' + auth;
let err = false;
let response = null;
return fetch(url, opts).then(
result => {
response = result;
err = result.ok !== true;
return result.text();
}
).then(text => {

return timeout(opts.timeout, fetch(url, opts)).then(result => {
response = result;
err = result.ok !== true;
return result.text();
}).then(text => {
this.wrapCallback_(opt_callback)(err, response, text);
}).catch(e => {
this.wrapCallback_(opt_callback)(e, null, null);
});
};

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"request": "^2.67.0",
"underscore": "^1.8.3"
},
"author": "Vladimir Hovsepyan <vladimirhovsepyan@gmail.com>",
"author": "ROOT",
"repository": {
"type": "git",
"url": "git+https://github.com/vladimir2492/react-cloud-vision-api.git"
},
"devDependencies": {},
"directories": {},
"main": "index.js",
"name": "react-cloud-vision-api",
"name": "react-cloud-vision-api-ext",
"optionalDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"version": "0.2.0"
"version": "0.2.1"
}