emailengine-app 2.61.5 → 2.62.1

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')) {
@@ -452,6 +452,34 @@ class ConnectionHandler {
         return await accountData.connection.getMessage(message.message, message.options);
     }
 
+    async getMessages(message) {
+        if (!this.accounts.has(message.account)) {
+            throw NO_ACTIVE_HANDLER_RESP_ERR;
+        }
+
+        let accountData = this.accounts.get(message.account);
+        if (!accountData.connection) {
+            throw NO_ACTIVE_HANDLER_RESP_ERR;
+        }
+
+        // Use batch method if available (Gmail/Outlook API clients)
+        if (typeof accountData.connection.getMessages === 'function') {
+            return await accountData.connection.getMessages(message.messageIds, message.options);
+        }
+
+        // Fallback to sequential fetching for IMAP
+        const results = [];
+        for (const messageId of message.messageIds) {
+            try {
+                const msg = await accountData.connection.getMessage(messageId, message.options);
+                results.push({ messageId, data: msg, error: null });
+            } catch (err) {
+                results.push({ messageId, data: null, error: { message: err.message, code: err.code } });
+            }
+        }
+        return results;
+    }
+
     async updateMessage(message) {
         if (!this.accounts.has(message.account)) {
             throw NO_ACTIVE_HANDLER_RESP_ERR;
@@ -798,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
@@ -841,6 +873,7 @@ class ConnectionHandler {
             case 'listMessages':
             case 'getText':
             case 'getMessage':
+            case 'getMessages':
             case 'updateMessage':
             case 'updateMessages':
             case 'listMailboxes':

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');
 
@@ -62,6 +62,16 @@ const SUBMIT_QC = (readEnvValue('EENGINE_SUBMIT_QC') && Number(readEnvValue('EEN
 
 const SUBMIT_DELAY = getDuration(readEnvValue('EENGINE_SUBMIT_DELAY') || config.submitDelay) || null;
 
+const NON_RETRYABLE_CODES = new Set([
+    'EAUTH', // authentication failed
+    'ENOAUTH', // no credentials provided
+    'EOAUTH2', // OAuth2 token failure
+    'ETLS', // TLS handshake failed
+    'EENVELOPE', // invalid sender/recipients
+    'EMESSAGE', // message content error
+    'EPROTOCOL' // SMTP protocol mismatch
+]);
+
 let callQueue = new Map();
 let mids = 0;
 
@@ -295,9 +305,11 @@ const submitWorker = new Worker(
                 // ignore
             }
 
-            if (err.statusCode >= 500 && job.attemptsMade < job.opts.attempts) {
+            const isPermanentSmtp = err.statusCode >= 500 && err.statusCode !== 503;
+            const isPermanentCode = NON_RETRYABLE_CODES.has(err.code);
+            if ((isPermanentSmtp || isPermanentCode) && job.attemptsMade < job.opts.attempts) {
                 try {
-                    // do not retry after 5xx error
+                    // do not retry after 5xx error (except 503 which is transient)
                     await job.discard();
                     logger.info({
                         msg: 'Job discarded',
@@ -305,9 +317,6 @@ const submitWorker = new Worker(
                         queueId: job.data.queueId
                     });
                 } catch (E) {
-                    // ignore
-                    logger.error({ msg: 'Failed to discard job', account: queueEntry.account, queueId: job.data.queueId, err: E });
-
                     logger.error({
                         msg: 'Failed to discard job',
                         action: 'submit',
@@ -329,6 +338,17 @@ const submitWorker = new Worker(
         {
             concurrency: SUBMIT_QC,
 
+            // Lock duration must exceed SMTP socket timeout (2 min) to prevent
+            // jobs from being marked stalled during normal email delivery
+            lockDuration: 3 * 60 * 1000, // 3 minutes
+
+            // Check for stalled jobs every 60 seconds
+            stalledInterval: 60 * 1000,
+
+            // Allow jobs to recover from stalled state up to 3 times before failing
+            // This handles transient Redis latency or connection issues
+            maxStalledCount: 3,
+
             limiter: SUBMIT_DELAY
                 ? {
                       max: 1,
@@ -474,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(
@@ -293,7 +300,7 @@ const notifyWorker = new Worker(
                     {
                         let filteredSubData = {};
                         let isPartial = false;
-                        for (let dataKey of Object.keys(job.data.data)) {
+                        for (let dataKey of Object.keys(job.data.data || {})) {
                             switch (dataKey) {
                                 case 'id':
                                 case 'uid':
@@ -402,7 +409,7 @@ const notifyWorker = new Worker(
                     method: 'post',
                     body,
                     headers,
-                    dispatcher: retryAgent
+                    dispatcher: httpAgent.retry
                 });
                 duration = Date.now() - start;
             } catch (err) {
@@ -546,7 +553,16 @@ route: customRoute && customRoute.id,
     },
     Object.assign(
         {
-            concurrency: Number(NOTIFY_QC) || 1
+            concurrency: Number(NOTIFY_QC) || 1,
+
+            // Webhook HTTP requests have 90s timeout, lock should exceed this
+            lockDuration: 3 * 60 * 1000, // 3 minutes
+
+            // Check for stalled jobs every 60 seconds
+            stalledInterval: 60 * 1000,
+
+            // Allow jobs to recover from stalled state up to 3 times
+            maxStalledCount: 3
         },
         queueConf || {}
     )