@bobfrankston/mailx 1.0.213 → 1.0.215

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.213",
+  "version": "1.0.215",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,11 +20,11 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.6",
+    "@bobfrankston/iflow-direct": "^0.1.7",
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.22",
-    "@bobfrankston/msger": "^0.1.275",
+    "@bobfrankston/msger": "^0.1.277",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -74,11 +74,11 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/iflow-direct": "^0.1.6",
+      "@bobfrankston/iflow-direct": "^0.1.7",
       "@bobfrankston/iflow-node": "^0.1.2",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.22",
-      "@bobfrankston/msger": "^0.1.275",
+      "@bobfrankston/msger": "^0.1.277",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -16,6 +16,32 @@ import * as os from "node:os";
 // Well-known ports — no magic numbers
 const SMTP_PORT_STARTTLS = 587;
 const SMTP_PORT_IMPLICIT_TLS = 465;
+/** Per-message SMTP retry delay: if a send attempt fails, wait this long before
+ *  the same file is retried. Gives the server time to settle so a retry after a
+ *  lost-ack doesn't arrive while the first copy is still being processed. */
+const OUTBOX_RETRY_DELAY_MS = 60000;
+/** Parse X-Mailx-Retry* tracking headers from a raw RFC822 message. */
+function parseRetryInfo(raw) {
+    const headerEnd = raw.search(/\r?\n\r?\n/);
+    const headers = headerEnd >= 0 ? raw.slice(0, headerEnd) : raw;
+    const attemptCount = (headers.match(/^X-Mailx-Retry:/gmi) || []).length;
+    const nextMatch = headers.match(/^X-Mailx-Retry-After:\s*(.+)$/mi);
+    const parsed = nextMatch ? Date.parse(nextMatch[1].trim()) : NaN;
+    return { attemptCount, nextAttemptAt: Number.isFinite(parsed) ? parsed : 0 };
+}
+/** Remove every occurrence of a header field from a raw RFC822 message. */
+function stripHeaderField(raw, name) {
+    const re = new RegExp(`^${name.replace(/[.*+?^${}()|[\\]\\\\]/g, "\\\\$&")}:.*\\r?\\n`, "gmi");
+    return raw.replace(re, "");
+}
+/** Insert a header line just before the header/body blank line. Preserves CRLF vs LF. */
+function insertHeaderBeforeBody(raw, line) {
+    const m = raw.match(/\r?\n\r?\n/);
+    if (!m)
+        return raw + "\r\n" + line + "\r\n";
+    const nl = m[0].startsWith("\r\n") ? "\r\n" : "\n";
+    return raw.slice(0, m.index) + nl + line + raw.slice(m.index);
+}
 /** Extract full error detail with provenance */
 function imapError(err) {
     const msg = err.message || err.reason || err.code || (typeof err === "string" ? err : "");
@@ -346,7 +372,7 @@ export class ImapManager extends EventEmitter {
             const tokenDir = path.join(getConfigDir(), "tokens", account.imap.user.replace(/[@.]/g, "_"));
             tokenProvider = async () => {
                 const result = await authenticateOAuth(credPath, {
-                    scope: "https://mail.google.com/ https://www.googleapis.com/auth/contacts.readonly",
+                    scope: "https://mail.google.com/ https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/calendar",
                     tokenDirectory: tokenDir,
                     credentialsKey: "installed",
                     loginHint: account.imap.user,
@@ -360,6 +386,9 @@ export class ImapManager extends EventEmitter {
             username: account.imap.user,
             password: account.imap.password,
             tokenProvider,
+            // Slow Dovecot servers (e.g. iecc.com) can stall >60s during multi-body FETCH.
+            // Raise the inactivity timeout so the connection isn't dropped mid-stream.
+            inactivityTimeout: 180000,
         });
         this.configs.set(account.id, config);
         // Register account in DB
@@ -1733,17 +1762,36 @@ export class ImapManager extends EventEmitter {
         const sentDir = path.join(getConfigDir(), "sending", accountId, "sent");
         fs.mkdirSync(sentDir, { recursive: true });
         if (this.isGmailAccount(accountId)) {
+            const nowMs = Date.now();
             for (const { dir, file } of filesToSend) {
                 const filePath = path.join(dir, file);
-                const raw = fs.readFileSync(filePath, "utf-8");
+                let raw = fs.readFileSync(filePath, "utf-8");
+                // Per-message rate limit: if a prior attempt set X-Mailx-Retry-After
+                // in the future, skip this file for now. Minimizes the race where the
+                // SMTP server actually accepted DATA but we lost the ack and would
+                // otherwise retry immediately on the next 10s tick.
+                const retryInfo = parseRetryInfo(raw);
+                if (retryInfo.nextAttemptAt > nowMs)
+                    continue;
+                // Record this attempt: strip internal X-Mailx-Retry-After, append a new
+                // X-Mailx-Retry: N <ISO-timestamp> line to the headers. The updated file
+                // is written back *before* the send so a crash mid-send doesn't lose state.
+                const attempt = retryInfo.attemptCount + 1;
+                raw = stripHeaderField(raw, "X-Mailx-Retry-After");
+                raw = insertHeaderBeforeBody(raw, `X-Mailx-Retry: ${attempt} ${new Date().toISOString()}`);
+                fs.writeFileSync(filePath, raw, "utf-8");
                 try {
                     await this.sendRawViaSMTP(accountId, raw);
-                    // Move to sent/
                     fs.renameSync(filePath, path.join(sentDir, file));
-                    console.log(`  [outbox] Sent ${file} via SMTP → sent/`);
+                    console.log(`  [outbox] Sent ${file} via SMTP → sent/ (attempt ${attempt})`);
                 }
                 catch (e) {
-                    console.error(`  [outbox] Send failed for ${file}: ${e.message}`);
+                    // Persist a next-attempt timestamp so the same file won't be retried
+                    // until RETRY_DELAY_MS later — gives the server time to settle.
+                    const nextAt = new Date(nowMs + OUTBOX_RETRY_DELAY_MS).toISOString();
+                    const withDelay = insertHeaderBeforeBody(raw, `X-Mailx-Retry-After: ${nextAt}`);
+                    fs.writeFileSync(filePath, withDelay, "utf-8");
+                    console.error(`  [outbox] Send failed for ${file} (attempt ${attempt}, retry after ${nextAt}): ${e.message}`);
                 }
             }
             return;
@@ -1939,12 +1987,21 @@ export class ImapManager extends EventEmitter {
                     this.outboxBackoffDelay.delete(accountId);
                 }
                 catch (e) {
-                    // Exponential backoff: 60s → 120s → 300s (max 5min)
-                    const prevDelay = this.outboxBackoffDelay.get(accountId) || 0;
-                    const delay = prevDelay ? Math.min(prevDelay * 2, 300000) : 60000;
-                    this.outboxBackoffDelay.set(accountId, delay);
-                    this.outboxBackoff.set(accountId, now + delay);
-                    console.error(`  [outbox] Error for ${accountId}: ${imapError(e)} (retry in ${Math.round(delay / 1000)}s)`);
+                    // Stale-socket errors (Dovecot silently drops idle connections):
+                    // don't back off — just reconnect on the next tick. The 300s
+                    // backoff is meant for real auth/network failures, not dead sockets.
+                    const msg = String(e?.message || e);
+                    if (/Not connected|ECONNRESET|socket hang up|EPIPE|write after end/i.test(msg)) {
+                        console.error(`  [outbox] Stale connection for ${accountId}: ${msg} — will retry next tick`);
+                    }
+                    else {
+                        // Exponential backoff: 60s → 120s → 300s (max 5min)
+                        const prevDelay = this.outboxBackoffDelay.get(accountId) || 0;
+                        const delay = prevDelay ? Math.min(prevDelay * 2, 300000) : 60000;
+                        this.outboxBackoffDelay.set(accountId, delay);
+                        this.outboxBackoff.set(accountId, now + delay);
+                        console.error(`  [outbox] Error for ${accountId}: ${imapError(e)} (retry in ${Math.round(delay / 1000)}s)`);
+                    }
                 }
             }
         };

package/packages/mailx-store-web/android-bootstrap.js

@@ -288,7 +288,7 @@ const OAUTH_CLIENT = {
 // Use full drive scope so we can read/write the desktop's accounts.jsonc + clients.jsonc.
 // drive.file is per-consent-grant: files created by desktop's grant aren't visible to Android's grant
 // even with the same client_id. drive (full) lets us see all files the user has access to.
-const OAUTH_SCOPES = "https://mail.google.com/ https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/drive";
+const OAUTH_SCOPES = "https://mail.google.com/ https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/drive https://www.googleapis.com/auth/calendar";
 // ── Token cache (IndexedDB) ──
 async function getCachedToken(email) {
     const key = `oauth-token-${email.replace(/[@.]/g, "_")}`;