gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix enforcing node's http requests for sync

Browse Source
This commit is contained in:
zadam 2020-06-15 18:24:43 +02:00
parent 00faf758e8
commit 85d986534d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/services/request.js
View File

@ -9,12 +9,13 @@ const syncOptions = require('./sync_options');
// this allows to support system proxy // this allows to support system proxy
function exec(opts) { function exec(opts) {
const client = getClient(opts);
// hack for cases where electron.net does not work but we don't want to set proxy // hack for cases where electron.net does not work but we don't want to set proxy
if (opts.proxy === 'noproxy') { if (opts.proxy === 'noproxy') {
opts.proxy = null; opts.proxy = null;
} }
const client = getClient(opts);
const proxyAgent = getProxyAgent(opts); const proxyAgent = getProxyAgent(opts);
const parsedTargetUrl = url.parse(opts.url); const parsedTargetUrl = url.parse(opts.url);
@ -111,6 +112,8 @@ async function getImage(imageUrl) {
request.on('error', err => reject(generateError(opts, err))); request.on('error', err => reject(generateError(opts, err)));
request.on('abort', err => reject(generateError(opts, err)));
request.on('response', response => { request.on('response', response => {
if (![200, 201, 204].includes(response.statusCode)) { if (![200, 201, 204].includes(response.statusCode)) {
reject(generateError(opts, response.statusCode + ' ' + response.statusMessage)); reject(generateError(opts, response.statusCode + ' ' + response.statusMessage));