gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

better error handling in request

Browse Source
This commit is contained in:
azivner 2018-12-18 20:39:56 +01:00
parent 8ca943f87b
commit af8f5b11b8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/services/request.js
View File

@ -38,8 +38,6 @@ function exec(opts) {
port = parsedProxyUrl.port; port = parsedProxyUrl.port;
path = opts.url; path = opts.url;
console.log("Using proxy " + opts.proxy);
headers['Host'] = parsedTargetUrl.host; // host also includes port headers['Host'] = parsedTargetUrl.host; // host also includes port
} }
@ -57,6 +55,10 @@ function exec(opts) {
}); });
request.on('response', response => { request.on('response', response => {
if (![200, 201, 204].includes(response.statusCode)) {
reject(generateError(opts, response.statusCode + ' ' + response.statusMessage));
}
if (opts.cookieJar && response.headers['set-cookie']) { if (opts.cookieJar && response.headers['set-cookie']) {
opts.cookieJar.header = response.headers['set-cookie']; opts.cookieJar.header = response.headers['set-cookie'];
} }
@ -74,7 +76,7 @@ function exec(opts) {
catch (e) { catch (e) {
log.error("Failed to deserialize sync response: " + responseStr); log.error("Failed to deserialize sync response: " + responseStr);
reject(generateError(e, opts)); reject(generateError(opts, e.message));
} }
}); });
}); });
@ -82,7 +84,7 @@ function exec(opts) {
request.end(opts.body ? JSON.stringify(opts.body) : undefined); request.end(opts.body ? JSON.stringify(opts.body) : undefined);
} }
catch (e) { catch (e) {
reject(generateError(e, opts)); reject(generateError(opts, e.message));
} }
}) })
} }
@ -107,8 +109,8 @@ function getClient(opts) {
} }
} }
function generateError(e, opts) { function generateError(opts, message) {
return new Error(`Request to ${opts.method} ${opts.url} failed, error: ${e.message}`); return new Error(`Request to ${opts.method} ${opts.url} failed, error: ${message}`);
} }
module.exports = { module.exports = {