npm - @bobfrankston/mailx - Versions diffs - 1.0.234 → 1.0.236 - Mend

@bobfrankston/mailx 1.0.234 → 1.0.236

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/client/components/message-viewer.js +17 -1
package/package.json +3 -3
package/packages/mailx-imap/index.d.ts +4 -1
package/packages/mailx-imap/index.js +63 -12
package/packages/mailx-service/index.js +15 -2

package/client/components/message-viewer.js CHANGED Viewed

@@ -458,7 +458,14 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
     catch (e) {
         const err = e.message || "Unknown error";
         console.error("showMessage error:", e);
-        // Don't retry on "not found" or known errors — only on connection issues
+        // "Message was deleted from the server" — the service already dropped
+        // the local row. Remove it from the list so the UI advances to the next
+        // message instead of sitting on a stale error banner.
+        const isDeleted = /deleted from the server|isNotFound/.test(err);
+        if (isDeleted) {
+            state.removeMessages([{ accountId, uid }]);
+            return;
+        }
         const isNotFound = err.includes("not found") || err.includes("Not Found") || err.includes("404");
         if (!isNotFound && retryCount < 3) {
             retryCount++;
@@ -532,6 +539,15 @@ document.addEventListener("mouseover", e => {
     const a = e.target.closest("a[href]");
     window.parent.postMessage({ type: "linkHover", url: a ? a.href : "" }, "*");
 });
+// Intercept link clicks — Android WebView silently drops window.open, so forward to parent
+document.addEventListener("click", e => {
+    const a = e.target.closest("a[href]");
+    if (!a) return;
+    const url = a.href;
+    if (!url || url.startsWith("javascript:") || url.startsWith("#")) return;
+    e.preventDefault();
+    window.parent.postMessage({ type: "linkClick", url: url }, "*");
+}, true);
 </script>
 </head><body>${html}</body></html>`;
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.234",
+  "version": "1.0.236",
   "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.296",
+    "@bobfrankston/msger": "^0.1.298",
     "@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.296",
+      "@bobfrankston/msger": "^0.1.298",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.d.ts CHANGED Viewed

@@ -132,7 +132,10 @@ export declare class ImapManager extends EventEmitter {
     /** Fetch a single message body on demand, caching in the store.
      *  Uses its own fresh connection — never blocked by background prefetch. */
     fetchMessageBody(accountId: string, folderId: number, uid: number): Promise<Buffer | null>;
-    /** Fetch message body via Gmail/Outlook API */
+    /** Fetch message body via Gmail/Outlook API.
+     *  Throws `MessageNotFoundError` when the server says the message is gone
+     *  (deleted from another device, for example). The caller uses that to
+     *  delete the stale row locally instead of showing a generic error. */
     private fetchMessageBodyViaApi;
     /** Background body prefetch — download bodies for messages that don't have them */
     private prefetchBodies;

package/packages/mailx-imap/index.js CHANGED Viewed

@@ -42,6 +42,15 @@ function insertHeaderBeforeBody(raw, line) {
     const nl = m[0].startsWith("\r\n") ? "\r\n" : "\n";
     return raw.slice(0, m.index) + nl + line + raw.slice(m.index);
 }
+/** Error thrown when a message body can't be fetched because the server says
+ *  the message is gone (deleted from another device, expunged, etc.). The
+ *  caller uses this to remove the stale local row instead of showing a
+ *  generic "fetch failed" error to the user. */
+function makeNotFoundError(accountId, folderId, uid) {
+    const err = new Error(`Message ${accountId}/${folderId}/${uid} not found on server`);
+    err.isNotFound = true;
+    return err;
+}
 /** Extract full error detail with provenance */
 function imapError(err) {
     const msg = err.message || err.reason || err.code || (typeof err === "string" ? err : "");
@@ -1009,9 +1018,15 @@ export class ImapManager extends EventEmitter {
         // the previous high. upsertMessage's primary-key dedup handles it.
         void highestUid;
         let stored = 0;
-        this.db.beginTransaction();
-        try {
-            for (const msg of msgs) {
+        let errors = 0;
+        // Don't wrap the whole batch in one transaction: a single bad row
+        // would roll back the entire batch. E.g. a message with a malformed
+        // Date header gave `new Date(rawStr).getTime() === NaN`, SQLite
+        // coerced that to NULL, the NOT NULL constraint failed, and the
+        // whole Gmail sync lost 200 messages per tick. Now each row runs
+        // standalone — bad rows are logged and skipped.
+        for (const msg of msgs) {
+            try {
                 const flags = [];
                 if (msg.seen)
                     flags.push("\\Seen");
@@ -1021,12 +1036,20 @@ export class ImapManager extends EventEmitter {
                     flags.push("\\Answered");
                 if (msg.draft)
                     flags.push("\\Draft");
+                // Sanitize date: reject NaN (from malformed RFC 822 Date headers)
+                // and fall back to "now" so the message still lands in the DB.
+                let dateMs = Date.now();
+                if (msg.date instanceof Date) {
+                    const t = msg.date.getTime();
+                    if (Number.isFinite(t))
+                        dateMs = t;
+                }
                 this.db.upsertMessage({
                     accountId, folderId, uid: msg.uid,
                     messageId: msg.messageId || "",
                     inReplyTo: msg.inReplyTo || "",
                     references: msg.references || [],
-                    date: msg.date instanceof Date ? msg.date.getTime() : Date.now(),
+                    date: dateMs,
                     subject: msg.subject || "",
                     from: toEmailAddress(msg.from?.[0] || {}),
                     to: toEmailAddresses(msg.to || []),
@@ -1035,12 +1058,15 @@ export class ImapManager extends EventEmitter {
                 });
                 stored++;
             }
-            this.db.commitTransaction();
-        }
-        catch (e) {
-            this.db.rollbackTransaction();
-            console.error(`  [api] storeApiMessages error: ${e.message}`);
+            catch (e) {
+                errors++;
+                if (errors <= 3) {
+                    console.error(`  [api] upsert ${accountId}/${folderId}/${msg.uid} (${msg.messageId}): ${e.message}`);
+                }
+            }
         }
+        if (errors > 0)
+            console.error(`  [api] storeApiMessages: ${errors} of ${msgs.length} rows failed (${stored} stored)`);
         return stored;
     }
     /** Kill and recreate the persistent ops connection */
@@ -1315,7 +1341,12 @@ export class ImapManager extends EventEmitter {
             const msg = await client.fetchMessageByUid(folder.path, uid, { source: true });
             await client.logout();
             client = null;
-            if (!msg?.source)
+            if (!msg) {
+                // IMAP server says the UID is gone — message was deleted
+                // elsewhere. Raise NotFound so the caller can remove the row.
+                throw makeNotFoundError(accountId, folderId, uid);
+            }
+            if (!msg.source)
                 return null;
             const raw = Buffer.from(msg.source, "utf-8");
             const bodyPath = await this.bodyStore.putMessage(accountId, folderId, uid, raw);
@@ -1323,6 +1354,15 @@ export class ImapManager extends EventEmitter {
             return raw;
         }
         catch (e) {
+            if (e?.isNotFound) {
+                if (client) {
+                    try {
+                        await client.logout();
+                    }
+                    catch { /* */ }
+                }
+                throw e;
+            }
             console.error(`  Body fetch error (${accountId}/${uid}): ${e.message}`);
             if (client) {
                 try {
@@ -1333,13 +1373,20 @@ export class ImapManager extends EventEmitter {
             return null;
         }
     }
-    /** Fetch message body via Gmail/Outlook API */
+    /** Fetch message body via Gmail/Outlook API.
+     *  Throws `MessageNotFoundError` when the server says the message is gone
+     *  (deleted from another device, for example). The caller uses that to
+     *  delete the stale row locally instead of showing a generic error. */
     async fetchMessageBodyViaApi(accountId, folderId, uid, folderPath) {
         try {
             const api = this.getGmailProvider(accountId);
             const msg = await api.fetchOne(folderPath, uid, { source: true });
             await api.close();
-            if (!msg?.source)
+            if (!msg) {
+                // fetchOne returned null — message doesn't exist on the server anymore
+                throw makeNotFoundError(accountId, folderId, uid);
+            }
+            if (!msg.source)
                 return null;
             const raw = Buffer.from(msg.source, "utf-8");
             const bodyPath = await this.bodyStore.putMessage(accountId, folderId, uid, raw);
@@ -1347,6 +1394,10 @@ export class ImapManager extends EventEmitter {
             return raw;
         }
         catch (e) {
+            // Gmail API 404 → the message was deleted on the server
+            if (e?.isNotFound || /Gmail API 404|404|not found/i.test(e?.message || "")) {
+                throw makeNotFoundError(accountId, folderId, uid);
+            }
             console.error(`  [api] Body fetch error (${accountId}/${uid}): ${e.message}`);
             return null;
         }

package/packages/mailx-service/index.js CHANGED Viewed

@@ -141,13 +141,26 @@ export class MailxService {
             raw = await this.imapManager.fetchMessageBody(accountId, envelope.folderId, envelope.uid);
         }
         catch (fetchErr) {
+            // Message was deleted from the server (another device, expunge, etc.) —
+            // drop the stale local row so the UI removes it instead of showing a
+            // confusing error. Throwing a tagged error lets the client react.
+            if (fetchErr?.isNotFound) {
+                try {
+                    this.db.deleteMessage(accountId, envelope.uid);
+                    this.db.recalcFolderCounts(envelope.folderId);
+                }
+                catch { /* ignore */ }
+                const err = new Error("Message was deleted from the server");
+                err.isNotFound = true;
+                throw err;
+            }
             return {
-                ...envelope, bodyHtml: "", bodyText: `[Message body unavailable: ${fetchErr.message || "IMAP connection failed"}]`,
+                ...envelope, bodyHtml: "", bodyText: `[Message body unavailable: ${fetchErr.message || "connection failed"}]`,
                 hasRemoteContent: false, remoteAllowed: false, attachments: [], emlPath: "", deliveredTo: "", returnPath: "", listUnsubscribe: ""
             };
         }
         if (!raw) {
-            bodyText = "[Message body not available — not cached locally and IMAP fetch failed. Try again or re-sync the folder.]";
+            bodyText = "[Message body not cached locally and the server fetch returned nothing. Try re-syncing the folder.]";
         }
         else {
             const parsed = await simpleParser(raw);