emailengine-app 2.62.0 → 2.62.2

package/workers/documents.js

@@ -241,7 +241,7 @@ const documentsWorker = new Worker(
                         return;
                     }
 
-                    let deleteResult = null;
+                    let deleteResult;
 
                     let filterQuery = {
                         bool: {
@@ -612,7 +612,7 @@ const documentsWorker = new Worker(
                         return;
                     }
 
-                    let deleteResult = null;
+                    let deleteResult;
 
                     try {
                         let messageIdHeader;

package/workers/export.js

@@ -17,7 +17,7 @@ const {
     DEFAULT_EXPORT_MAX_MESSAGES,
     DEFAULT_EXPORT_MAX_SIZE
 } = require('../lib/consts');
-const { getDuration, readEnvValue, threadStats } = require('../lib/tools');
+const { getDuration, readEnvValue, threadStats, reloadHttpProxyAgent } = require('../lib/tools');
 const { webhooks: Webhooks } = require('../lib/webhooks');
 const settings = require('../lib/settings');
 const { Export } = require('../lib/export');
@@ -182,7 +182,7 @@ async function indexMessages(job, exportData) {
     try {
         mailboxes = await accountObject.listMailboxes();
     } catch (err) {
-        throw new Error(`Failed to list mailboxes: ${err.message}`);
+        throw new Error(`Failed to list mailboxes: ${err.message}`, { cause: err });
     }
 
     const foldersToProcess = resolveFolders(folders, mailboxes);
@@ -913,6 +913,13 @@ parentPort.on('message', message => {
             .then(response => parentPort.postMessage({ cmd: 'resp', mid: message.mid, response }))
             .catch(err => parentPort.postMessage({ cmd: 'resp', mid: message.mid, error: err.message, code: err.code, statusCode: err.statusCode }));
     }
+
+    if (message && message.cmd === 'settings') {
+        let d = message.data || {};
+        if ('httpProxyEnabled' in d || 'httpProxyUrl' in d) {
+            reloadHttpProxyAgent().catch(err => logger.error({ msg: 'Failed to reload HTTP proxy agent', err }));
+        }
+    }
 });
 
 logger.info({ msg: 'Started export worker thread', version: packageData.version });

package/workers/imap.js

@@ -7,7 +7,7 @@ const logger = require('../lib/logger');
 
 const { REDIS_PREFIX } = require('../lib/consts');
 
-const { getDuration, getBoolean, emitChangeEvent, readEnvValue, hasEnvValue, threadStats } = require('../lib/tools');
+const { getDuration, getBoolean, emitChangeEvent, readEnvValue, hasEnvValue, threadStats, reloadHttpProxyAgent } = require('../lib/tools');
 
 const Bugsnag = require('@bugsnag/js');
 if (readEnvValue('BUGSNAG_API_KEY')) {
@@ -826,6 +826,10 @@ class ConnectionHandler {
 
         switch (message.cmd) {
             case 'settings':
+                if (message.data && ('httpProxyEnabled' in message.data || 'httpProxyUrl' in message.data)) {
+                    reloadHttpProxyAgent().catch(err => logger.error({ msg: 'Failed to reload HTTP proxy agent', err }));
+                }
+
                 if (message.data && message.data.logs) {
                     for (let [account, accountObject] of this.accounts) {
                         // update log handling

package/workers/submit.js

@@ -7,7 +7,7 @@ const config = require('@zone-eu/wild-config');
 const logger = require('../lib/logger');
 
 const { REDIS_PREFIX } = require('../lib/consts');
-const { getDuration, readEnvValue, threadStats } = require('../lib/tools');
+const { getDuration, readEnvValue, threadStats, reloadHttpProxyAgent } = require('../lib/tools');
 const { webhooks: Webhooks } = require('../lib/webhooks');
 const settings = require('../lib/settings');
 
@@ -494,6 +494,13 @@ parentPort.on('message', message => {
                 });
             });
     }
+
+    if (message && message.cmd === 'settings') {
+        let d = message.data || {};
+        if ('httpProxyEnabled' in d || 'httpProxyUrl' in d) {
+            reloadHttpProxyAgent().catch(err => logger.error({ msg: 'Failed to reload HTTP proxy agent', err }));
+        }
+    }
 });
 
 logger.info({ msg: 'Started SMTP submission worker thread', version: packageData.version });

package/workers/webhooks.js

@@ -10,7 +10,7 @@ const { webhooks: Webhooks } = require('../lib/webhooks');
 
 const { GooglePubSub } = require('../lib/oauth/pubsub/google');
 
-const { readEnvValue, threadStats, getDuration, retryAgent, getServiceSecret } = require('../lib/tools');
+const { readEnvValue, threadStats, getDuration, httpAgent, getServiceSecret, reloadHttpProxyAgent } = require('../lib/tools');
 
 const Bugsnag = require('@bugsnag/js');
 if (readEnvValue('BUGSNAG_API_KEY')) {
@@ -176,6 +176,13 @@ parentPort.on('message', message => {
                 });
             });
     }
+
+    if (message && message.cmd === 'settings') {
+        let d = message.data || {};
+        if ('httpProxyEnabled' in d || 'httpProxyUrl' in d) {
+            reloadHttpProxyAgent().catch(err => logger.error({ msg: 'Failed to reload HTTP proxy agent', err }));
+        }
+    }
 });
 
 const notifyWorker = new Worker(
@@ -402,7 +409,7 @@ const notifyWorker = new Worker(
                     method: 'post',
                     body,
                     headers,
-                    dispatcher: retryAgent
+                    dispatcher: httpAgent.retry
                 });
                 duration = Date.now() - start;
             } catch (err) {