emailengine-app 2.63.0 → 2.63.2

package/server.js

@@ -616,6 +616,8 @@ let workerAssigned = new WeakMap(); // Map of worker -> Set of accounts
 let onlineWorkers = new WeakSet(); // Set of workers that are online
 let reassignmentTimer = null; // Timer for failsafe reassignment
 let reassignmentPending = false; // Flag to track if reassignment is pending
+let assignRetryCount = 0; // Counter for safety-net retries in assignAccounts
+const MAX_ASSIGN_RETRIES = 3; // Max consecutive safety-net retries before giving up
 
 // Worker management
 let imapInitialWorkersLoaded = false; // Have all initial IMAP workers started?
@@ -1578,6 +1580,11 @@ async function assignAccounts() {
         let totalAccounts = assigned.size + unassigned.size;
         let targetPerWorker = Math.ceil(totalAccounts / availableIMAPWorkers.size);
 
+        // Collect accounts that fail assignment so we do not re-insert into
+        // the Set we are iterating (re-insertion during for..of would cause
+        // the same account to be visited again in the same pass).
+        let failedAccounts = [];
+
         // Assign each unassigned account
         for (let account of unassigned) {
             if (!availableIMAPWorkers.size) {
@@ -1636,7 +1643,14 @@ async function assignAccounts() {
                 // Roll back -- account was never actually assigned
                 workerAssigned.get(worker).delete(account);
                 assigned.delete(account);
-                unassigned.add(account);
+                // Revert load map so subsequent iterations see accurate counts
+                if (!isReassignment) {
+                    workerLoadMap.set(worker, workerLoadMap.get(worker) - 1);
+                    sortedWorkers = Array.from(workerLoadMap.entries())
+                        .sort((a, b) => a[1] - b[1])
+                        .map(entry => entry[0]);
+                }
+                failedAccounts.push(account);
                 logger.error({ msg: 'Failed to assign account to worker', account, threadId: worker.threadId, err });
                 continue;
             }
@@ -1647,6 +1661,11 @@ async function assignAccounts() {
             }
         }
 
+        // Re-add failed accounts after iteration completes
+        for (let account of failedAccounts) {
+            unassigned.add(account);
+        }
+
         // Log final distribution for monitoring
         let distribution = [];
         for (let worker of availableIMAPWorkers) {
@@ -1661,15 +1680,30 @@ async function assignAccounts() {
     } finally {
         assigning = false;
 
-        // Safety net: if accounts remain unassigned, schedule a retry
+        // Safety net: if accounts remain unassigned, schedule a retry with backoff
         if (unassigned && unassigned.size > 0 && availableIMAPWorkers.size > 0 && !isClosing) {
-            logger.warn({
-                msg: 'Accounts remain unassigned after assignment pass, scheduling retry',
-                remaining: unassigned.size
-            });
-            setTimeout(() => {
-                assignAccounts().catch(err => logger.error({ msg: 'Retry assignment failed', err }));
-            }, 5000);
+            assignRetryCount++;
+            if (assignRetryCount <= MAX_ASSIGN_RETRIES) {
+                let delay = 5000 * assignRetryCount;
+                logger.warn({
+                    msg: 'Accounts remain unassigned after assignment pass, scheduling retry',
+                    remaining: unassigned.size,
+                    retry: assignRetryCount,
+                    maxRetries: MAX_ASSIGN_RETRIES,
+                    delayMs: delay
+                });
+                setTimeout(() => {
+                    assignAccounts().catch(err => logger.error({ msg: 'Retry assignment failed', err }));
+                }, delay);
+            } else {
+                logger.error({
+                    msg: 'Max assignment retries reached, accounts remain unassigned',
+                    remaining: unassigned.size
+                });
+                assignRetryCount = 0;
+            }
+        } else {
+            assignRetryCount = 0;
         }
     }
 }

package/static/licenses.html

@@ -1,6 +1,6 @@
 <!doctype html><html><head><meta charset="utf-8"><title>EmailEngine Licenses</title><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous"></head><body>
 <div class="container-fluid">
-<h1>EmailEngine v2.62.2</h1><p>EmailEngine includes code from the following software packages:</p>
+<h1>EmailEngine v2.63.1</h1><p>EmailEngine includes code from the following software packages:</p>
 <table class="table table-sm">
 <tr><thead class="thead-dark"><th>Package</th><th>Version</th><th>License</th><th>Publisher</th><th>Publisher's Email</th><th>Package URL</th></tr>
 <tbody>
@@ -146,7 +146,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/@bull-board/api">@bull-board/api</a></td>
-<td>6.19.0</td>
+<td>6.20.3</td>
 <td>MIT</td>
 <td>felixmosh</td>
 <td></td>
@@ -156,7 +156,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/@bull-board/hapi">@bull-board/hapi</a></td>
-<td>6.19.0</td>
+<td>6.20.3</td>
 <td>MIT</td>
 <td>felixmosh</td>
 <td></td>
@@ -166,7 +166,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/@bull-board/ui">@bull-board/ui</a></td>
-<td>6.19.0</td>
+<td>6.20.3</td>
 <td>MIT</td>
 <td>felixmosh</td>
 <td></td>
@@ -216,7 +216,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/@csstools/css-syntax-patches-for-csstree">@csstools/css-syntax-patches-for-csstree</a></td>
-<td>1.0.27</td>
+<td>1.0.29</td>
 <td>MIT-0</td>
 <td></td>
 <td></td>
@@ -276,7 +276,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/@eslint/config-array">@eslint/config-array</a></td>
-<td>0.23.1</td>
+<td>0.23.2</td>
 <td>Apache-2.0</td>
 <td>Nicholas C. Zakas</td>
 <td></td>
@@ -316,7 +316,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/@eslint/object-schema">@eslint/object-schema</a></td>
-<td>3.0.1</td>
+<td>3.0.2</td>
 <td>Apache-2.0</td>
 <td>Nicholas C. Zakas</td>
 <td></td>
@@ -506,7 +506,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/@hapi/hapi">@hapi/hapi</a></td>
-<td>21.4.5</td>
+<td>21.4.6</td>
 <td>BSD-3-Clause</td>
 <td></td>
 <td></td>
@@ -785,6 +785,16 @@
 </td
 </tr>
 <tr>
+<td><a href="https://npmjs.com/package/@ioredis/commands">@ioredis/commands</a></td>
+<td>1.5.1</td>
+<td>MIT</td>
+<td>Zihua Li</td>
+<td>i@zihua.li</td>
+<td>
+<a href="https://github.com/ioredis/commands">github.com/ioredis/commands</a>
+</td
+</tr>
+<tr>
 <td><a href="https://npmjs.com/package/@jsdevtools/ono">@jsdevtools/ono</a></td>
 <td>7.1.3</td>
 <td>MIT</td>
@@ -846,7 +856,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/@opentelemetry/semantic-conventions">@opentelemetry/semantic-conventions</a></td>
-<td>1.39.0</td>
+<td>1.40.0</td>
 <td>Apache-2.0</td>
 <td>OpenTelemetry Authors</td>
 <td></td>
@@ -1266,7 +1276,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/acorn">acorn</a></td>
-<td>8.15.0</td>
+<td>8.16.0</td>
 <td>MIT</td>
 <td></td>
 <td></td>
@@ -1286,7 +1296,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/ajv">ajv</a></td>
-<td>6.12.6</td>
+<td>6.14.0</td>
 <td>MIT</td>
 <td>Evgeny Poberezkin</td>
 <td></td>
@@ -1466,7 +1476,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/balanced-match">balanced-match</a></td>
-<td>4.0.3</td>
+<td>4.0.4</td>
 <td>MIT</td>
 <td></td>
 <td></td>
@@ -1576,7 +1586,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/brace-expansion">brace-expansion</a></td>
-<td>5.0.2</td>
+<td>5.0.4</td>
 <td>MIT</td>
 <td></td>
 <td></td>
@@ -1606,7 +1616,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/bullmq">bullmq</a></td>
-<td>5.69.3</td>
+<td>5.70.1</td>
 <td>MIT</td>
 <td>Taskforce.sh Inc.</td>
 <td></td>
@@ -2485,7 +2495,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/eslint-scope">eslint-scope</a></td>
-<td>9.1.0</td>
+<td>9.1.1</td>
 <td>BSD-2-Clause</td>
 <td></td>
 <td></td>
@@ -2505,7 +2515,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/eslint-visitor-keys">eslint-visitor-keys</a></td>
-<td>5.0.0</td>
+<td>5.0.1</td>
 <td>Apache-2.0</td>
 <td>Toru Nagashima</td>
 <td></td>
@@ -2515,7 +2525,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/eslint">eslint</a></td>
-<td>10.0.0</td>
+<td>10.0.2</td>
 <td>MIT</td>
 <td>Nicholas C. Zakas</td>
 <td>nicholas+npm@nczconsulting.com</td>
@@ -2535,7 +2545,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/espree">espree</a></td>
-<td>11.1.0</td>
+<td>11.1.1</td>
 <td>BSD-2-Clause</td>
 <td>Nicholas C. Zakas</td>
 <td>nicholas+npm@nczconsulting.com</td>
@@ -2745,7 +2755,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/filelist">filelist</a></td>
-<td>1.0.4</td>
+<td>1.0.6</td>
 <td>Apache-2.0</td>
 <td>Matthew Eernisse</td>
 <td>mde@fleegix.org</td>
@@ -2835,7 +2845,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/flatted">flatted</a></td>
-<td>3.3.3</td>
+<td>3.3.4</td>
 <td>ISC</td>
 <td>Andrea Giammarchi</td>
 <td></td>
@@ -3465,7 +3475,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/imapflow">imapflow</a></td>
-<td>1.2.10</td>
+<td>1.2.11</td>
 <td>MIT</td>
 <td>Postal Systems O&#xDC;</td>
 <td></td>
@@ -3534,8 +3544,18 @@
 </td
 </tr>
 <tr>
+<td><a href="https://npmjs.com/package/ioredfour">ioredfour</a></td>
+<td>1.4.0</td>
+<td>MIT</td>
+<td>Mixmax</td>
+<td>hello@mixmax.com</td>
+<td>
+<a href="https://github.com/nodemailer/ioredfour">github.com/nodemailer/ioredfour</a>
+</td
+</tr>
+<tr>
 <td><a href="https://npmjs.com/package/ioredis">ioredis</a></td>
-<td>5.3.2</td>
+<td>5.10.0</td>
 <td>MIT</td>
 <td>Zihua Li</td>
 <td>i@zihua.li</td>
@@ -3545,7 +3565,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/ioredis">ioredis</a></td>
-<td>5.9.2</td>
+<td>5.3.2</td>
 <td>MIT</td>
 <td>Zihua Li</td>
 <td>i@zihua.li</td>
@@ -4285,7 +4305,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/minimatch">minimatch</a></td>
-<td>10.2.1</td>
+<td>10.2.4</td>
 <td>BlueOak-1.0.0</td>
 <td>Isaac Z. Schlueter</td>
 <td>i@izs.me</td>
@@ -4305,7 +4325,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/minimatch">minimatch</a></td>
-<td>3.1.2</td>
+<td>3.1.5</td>
 <td>ISC</td>
 <td>Isaac Z. Schlueter</td>
 <td>i@izs.me</td>
@@ -4315,7 +4335,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/minimatch">minimatch</a></td>
-<td>5.1.6</td>
+<td>5.1.9</td>
 <td>ISC</td>
 <td>Isaac Z. Schlueter</td>
 <td>i@izs.me</td>
@@ -5135,7 +5155,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/pump">pump</a></td>
-<td>3.0.3</td>
+<td>3.0.4</td>
 <td>MIT</td>
 <td>Mathias Buus Madsen</td>
 <td>mathiasbuus@gmail.com</td>
@@ -5415,7 +5435,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/sax">sax</a></td>
-<td>1.4.4</td>
+<td>1.5.0</td>
 <td>BlueOak-1.0.0</td>
 <td>Isaac Z. Schlueter</td>
 <td>i@izs.me</td>
@@ -5685,7 +5705,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/spdx-license-ids">spdx-license-ids</a></td>
-<td>3.0.22</td>
+<td>3.0.23</td>
 <td>CC0-1.0</td>
 <td>Shinnosuke Watanabe</td>
 <td></td>
@@ -5915,7 +5935,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/swagger-ui-dist">swagger-ui-dist</a></td>
-<td>5.31.1</td>
+<td>5.32.0</td>
 <td>Apache-2.0</td>
 <td></td>
 <td></td>
@@ -5995,7 +6015,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/tldts-core">tldts-core</a></td>
-<td>7.0.23</td>
+<td>7.0.24</td>
 <td>MIT</td>
 <td>R&#xE9;mi Berson</td>
 <td></td>
@@ -6005,7 +6025,7 @@
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/tldts">tldts</a></td>
-<td>7.0.23</td>
+<td>7.0.24</td>
 <td>MIT</td>
 <td>R&#xE9;mi Berson</td>
 <td></td>

package/translations/messages.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=ascii\n"
-"POT-Creation-Date: 2026-02-19 09:51+0000\n"
+"POT-Creation-Date: 2026-03-03 13:39+0000\n"
 
 #: views/config/license.hbs:45
 msgid "%d day"
@@ -62,21 +62,45 @@ msgstr ""
 msgid "Enter your email address"
 msgstr ""
 
-#: views/accounts/register/imap-server.hbs:19
-msgid "IMAP"
+#: views/accounts/register/imap.hbs:11
+msgid "Your name"
 msgstr ""
 
-#: views/accounts/register/imap-server.hbs:22
-#: views/accounts/register/imap-server.hbs:114
-msgid "Username"
+#: views/accounts/register/imap.hbs:17
+msgid "Enter your full name"
 msgstr ""
 
+#: views/accounts/register/imap.hbs:31
 #: views/accounts/register/imap-server.hbs:36
 #: views/accounts/register/imap-server.hbs:128
-#: views/accounts/register/imap.hbs:31
 msgid "Password"
 msgstr ""
 
+#: views/accounts/register/imap.hbs:37
+msgid "Enter your account password"
+msgstr ""
+
+#: views/accounts/register/imap.hbs:51
+msgid "Continue"
+msgstr ""
+
+#: views/accounts/register/index.hbs:2
+msgid "Choose your email account provider"
+msgstr ""
+
+#: views/accounts/register/index.hbs:15
+msgid "Standard IMAP"
+msgstr ""
+
+#: views/accounts/register/imap-server.hbs:19
+msgid "IMAP"
+msgstr ""
+
+#: views/accounts/register/imap-server.hbs:22
+#: views/accounts/register/imap-server.hbs:114
+msgid "Username"
+msgstr ""
+
 #: views/accounts/register/imap-server.hbs:45
 #: views/accounts/register/imap-server.hbs:136
 msgid "Important"
@@ -183,30 +207,6 @@ msgstr ""
 msgid "Request failed."
 msgstr ""
 
-#: views/accounts/register/index.hbs:2
-msgid "Choose your email account provider"
-msgstr ""
-
-#: views/accounts/register/index.hbs:15
-msgid "Standard IMAP"
-msgstr ""
-
-#: views/accounts/register/imap.hbs:11
-msgid "Your name"
-msgstr ""
-
-#: views/accounts/register/imap.hbs:17
-msgid "Enter your full name"
-msgstr ""
-
-#: views/accounts/register/imap.hbs:37
-msgid "Enter your account password"
-msgstr ""
-
-#: views/accounts/register/imap.hbs:51
-msgid "Continue"
-msgstr ""
-
 #: lib/routes-ui.js:523
 #: lib/ui-routes/account-routes.js:60
 msgid "Delegated"
@@ -253,7 +253,7 @@ msgstr ""
 #: lib/routes-ui.js:4874
 #: lib/routes-ui.js:5121
 #: lib/routes-ui.js:5157
-#: workers/api.js:2414
+#: workers/api.js:2416
 #: lib/ui-routes/account-routes.js:549
 #: lib/ui-routes/account-routes.js:585
 #: lib/ui-routes/account-routes.js:702
@@ -327,7 +327,7 @@ msgid "Unexpected server response"
 msgstr ""
 
 #: lib/routes-ui.js:7693
-#: lib/tools.js:942
+#: lib/tools.js:950
 msgid "Invalid input"
 msgstr ""
 
@@ -338,21 +338,21 @@ msgstr ""
 msgid "Subscription Management"
 msgstr ""
 
-#: workers/api.js:6908
-#: workers/api.js:7024
+#: workers/api.js:6910
+#: workers/api.js:7026
 msgid "Requested page not found"
 msgstr ""
 
-#: workers/api.js:6909
+#: workers/api.js:6911
 msgid "Something went wrong"
 msgstr ""
 
-#: lib/tools.js:1645
+#: lib/tools.js:1653
 msgid "Signature validation failed"
 msgstr ""
 
-#: lib/tools.js:1654
-#: lib/tools.js:1659
+#: lib/tools.js:1662
+#: lib/tools.js:1667
 msgid "Invalid or expired account setup URL"
 msgstr ""
 

package/workers/api.js

@@ -40,7 +40,8 @@ const {
     getBoolean,
     loadTlsConfig,
     httpAgent,
-    reloadHttpProxyAgent
+    reloadHttpProxyAgent,
+    resolveOAuthErrorStatus
 } = require('../lib/tools');
 const { matchIp, detectAutomatedRequest } = require('../lib/utils/network');
 
@@ -1491,17 +1492,55 @@ Include your token in requests using one of these methods:
         }
     });
 
+    const staticRoot = pathlib.resolve(__dirname, '..', 'static');
+    const staticRootPrefix = staticRoot + pathlib.sep;
+
     server.route({
         method: 'GET',
         path: '/static/{file*}',
         handler: {
             directory: {
-                path: pathlib.join(__dirname, '..', 'static')
+                path: staticRoot,
+                index: false
             }
         },
         options: {
             auth: false,
-            tags: ['static']
+            tags: ['static'],
+            // Prevent EISDIR crash in pkg snapshot environments.
+            // Inert calls fs.open() on directory paths which triggers an uncaught exception
+            // in pkg's patched fs, so we intercept directory requests before they reach Inert.
+            pre: process.pkg
+                ? [
+                      {
+                          method: async request => {
+                              const filePath = request.params.file;
+                              if (!filePath) {
+                                  throw Boom.notFound();
+                              }
+
+                              const resolved = pathlib.resolve(staticRoot, filePath);
+                              if (!resolved.startsWith(staticRootPrefix)) {
+                                  throw Boom.notFound();
+                              }
+
+                              try {
+                                  const stat = await fs.promises.stat(resolved);
+                                  if (stat.isDirectory()) {
+                                      throw Boom.notFound();
+                                  }
+                              } catch (err) {
+                                  if (err.isBoom) {
+                                      throw err;
+                                  }
+                                  // stat failed (ENOENT etc.) - let Inert handle it
+                              }
+
+                              return null;
+                          }
+                      }
+                  ]
+                : undefined
         }
     });
 
@@ -2145,7 +2184,7 @@ Include your token in requests using one of these methods:
                                         message = response.error.message;
                                     }
 
-                                    let error = Boom.boomify(new Error(message), { statusCode: response.error.code });
+                                    let error = Boom.boomify(new Error(message), { statusCode: resolveOAuthErrorStatus(response.error, err) });
                                     throw error;
                                 }
                                 throw err;
@@ -2239,7 +2278,7 @@ Include your token in requests using one of these methods:
                             let response = err.oauthRequest && err.oauthRequest.response;
                             if (response && response.error) {
                                 let message = response.error.message;
-                                let error = Boom.boomify(new Error(message), { statusCode: response.error.code });
+                                let error = Boom.boomify(new Error(message), { statusCode: resolveOAuthErrorStatus(response.error, err) });
                                 throw error;
                             }
                             throw err;
@@ -2328,7 +2367,7 @@ Include your token in requests using one of these methods:
                         let response = err.oauthRequest && err.oauthRequest.response;
                         if (response && response.error) {
                             let message = response.error.message;
-                            let error = Boom.boomify(new Error(message), { statusCode: response.error.code });
+                            let error = Boom.boomify(new Error(message), { statusCode: resolveOAuthErrorStatus(response.error, err) });
                             throw error;
                         }
                         throw err;