@bobfrankston/mailx 1.0.213 → 1.0.214

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.213",
+  "version": "1.0.214",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,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.276",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -78,7 +78,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.276",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -346,7 +346,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 +360,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
@@ -1731,19 +1734,36 @@ export class ImapManager extends EventEmitter {
             return;
         // Gmail/API accounts: send directly via SMTP from local queue (no IMAP outbox)
         const sentDir = path.join(getConfigDir(), "sending", accountId, "sent");
+        const failedDir = path.join(getConfigDir(), "sending", accountId, "failed");
         fs.mkdirSync(sentDir, { recursive: true });
+        fs.mkdirSync(failedDir, { recursive: true });
         if (this.isGmailAccount(accountId)) {
             for (const { dir, file } of filesToSend) {
                 const filePath = path.join(dir, file);
                 const raw = fs.readFileSync(filePath, "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/`);
                 }
                 catch (e) {
-                    console.error(`  [outbox] Send failed for ${file}: ${e.message}`);
+                    // Critical: NEVER leave a .ltr in the queue after a send attempt unless the
+                    // failure was clearly pre-connect. An error after the SMTP session opened may
+                    // mean the server actually accepted DATA but we lost the ack — retrying would
+                    // double-send. Classify conservatively: only keep-in-queue for clearly
+                    // network-level / pre-auth errors.
+                    const code = String(e?.code || "");
+                    const cmd = String(e?.command || "").toUpperCase();
+                    const preConnect = /^(ECONNREFUSED|ENOTFOUND|EAI_AGAIN|ECONNECTION|ETIMEDOUT)$/.test(code)
+                        && (!cmd || cmd === "CONN");
+                    if (preConnect) {
+                        console.error(`  [outbox] Pre-connect failure for ${file} (${code}), will retry: ${e.message}`);
+                    }
+                    else {
+                        // Ambiguous or terminal — move to failed/ so we don't resend if SMTP actually delivered
+                        fs.renameSync(filePath, path.join(failedDir, file));
+                        console.error(`  [outbox] Send failed for ${file} → failed/ (no auto-retry, code=${code || "?"}): ${e.message}`);
+                    }
                 }
             }
             return;
@@ -1939,12 +1959,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, "_")}`;