@bobfrankston/mailx-imap 0.1.84 → 0.1.86

package/index.js

@@ -118,18 +118,30 @@ async function extractPreview(source) {
         // remaining base64 data: URIs (rare: text/plain copies generated
         // from a Quill compose pasted-image HTML) collapsed to [image] too.
         let raw;
-        if (bodyHtml) {
-            // Drop the CONTENTS of style/script/head blocks and HTML comments
-            // first — a plain tag-strip removes the <style> tags but leaves the
-            // CSS rules between them, which then leak into the preview as
-            // `*{box-sizing:border-box}` / `@media …{ … }` garbage (Bob's
-            // 2026-05-31 marketing-mail shot). Order matters: kill blocks, then
-            // images → [image], then any remaining tags.
+        // PREFER the plain-text rendering for the summary. The HTML→[image]
+        // path turns an image-heavy marketing/tracking email into a useless
+        // "[image] [image] [image]…" wall — the "[no summary]" Bob hit
+        // 2026-06-04. mailparser's `text` is the text/plain alternative when
+        // present, otherwise a tags-and-images-stripped rendering of the HTML,
+        // i.e. the actual words. Only fall back to HTML when there's no usable
+        // text at all (genuinely image-only mail).
+        const textCandidate = (bodyText || "").replace(/\s+/g, " ").trim();
+        if (textCandidate.length >= 3) {
+            raw = bodyText;
+        }
+        else if (bodyHtml) {
+            // No usable text part. Strip style/script/head + comments (CSS would
+            // otherwise leak into the preview — Bob 2026-05-31), then prefer an
+            // <img alt="…"> caption over the bare "[image]" token, and collapse
+            // runs of placeholders so even this fallback isn't a wall.
             raw = bodyHtml
                 .replace(/<!--[\s\S]*?-->/g, " ")
                 .replace(/<(style|script|head)\b[^>]*>[\s\S]*?<\/\1>/gi, " ")
+                .replace(/<img\b[^>]*\balt\s*=\s*"([^"]+)"[^>]*>/gi, " $1 ")
+                .replace(/<img\b[^>]*\balt\s*=\s*'([^']+)'[^>]*>/gi, " $1 ")
                 .replace(/<img\b[^>]*>/gi, " [image] ")
-                .replace(/<[^>]+>/g, " ");
+                .replace(/<[^>]+>/g, " ")
+                .replace(/(\[image\]\s*){2,}/g, "[image] ");
         }
         else {
             raw = bodyText;
@@ -4181,19 +4193,37 @@ export class ImapManager extends EventEmitter {
                 if (host !== this.hostname)
                     continue;
                 const pid = parseInt(pidStr);
-                if (pid === myPid)
-                    continue; // it's us
+                let ageMs = Infinity;
+                try {
+                    ageMs = Date.now() - fs.statSync(path.join(dir, f)).mtimeMs;
+                }
+                catch { /* */ }
+                if (pid === myPid) {
+                    // Our own claim. Normally we're actively sending it — leave
+                    // it. But the send is now bounded (60s APPEND timeout), so
+                    // an OWN claim older than STALE_CLAIM_MS means the send
+                    // hung past its timeout, or a prior tick orphaned it (the
+                    // release rename failed). Without reclaiming it the file
+                    // sits in `.sending-` forever — recovery used to skip every
+                    // own-PID claim unconditionally, so a transient connection
+                    // wedge pinned the message even after the link recovered
+                    // (Bob 2026-06-11: two messages stuck .sending-<ourpid>
+                    // while SELECT Outbox was already succeeding again).
+                    if (ageMs < STALE_CLAIM_MS)
+                        continue;
+                    try {
+                        fs.renameSync(path.join(dir, f), path.join(dir, original));
+                        console.log(`  [outbox] Recovered our own stale claim ${f} → ${original} (hung ${Math.round(ageMs / 60_000)}m)`);
+                    }
+                    catch { /* ignore */ }
+                    continue;
+                }
                 let alive = false;
                 try {
                     process.kill(pid, 0);
                     alive = true;
                 }
                 catch { /* dead */ }
-                let ageMs = Infinity;
-                try {
-                    ageMs = Date.now() - fs.statSync(path.join(dir, f)).mtimeMs;
-                }
-                catch { /* */ }
                 // Live PID + recent mtime → genuine sibling owner, leave it.
                 // Live PID + ancient mtime → recycled PID, sweep. Dead PID → sweep.
                 if (alive && ageMs < STALE_CLAIM_MS)
@@ -4326,7 +4356,15 @@ export class ImapManager extends EventEmitter {
                     }
                     try {
                         const raw = fs.readFileSync(claimedPath, "utf-8");
-                        await client.appendMessage(outboxPath, raw, ["\\Seen"]);
+                        // Bound the APPEND. On a wedged connection (Dovecot
+                        // ETIMEDOUT storm) the bare await can hang the full
+                        // 300s inactivity timeout, pinning the file in
+                        // `.sending-` state the whole time and reading to the
+                        // user as "stuck, not sending" (Bob 2026-06-11). A
+                        // 60s cap force-closes the socket and throws, so the
+                        // catch below releases the claim and the next tick
+                        // retries instead of hanging for 5 minutes.
+                        await withTimeout(client.appendMessage(outboxPath, raw, ["\\Seen"]), 60_000, client, `outbox APPEND ${file}`);
                         fs.renameSync(claimedPath, path.join(sentDir, file));
                         console.log(`  [outbox] Moved ${file} to IMAP Outbox → sent/`);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.84",
+  "version": "0.1.86",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -12,11 +12,11 @@
     "@bobfrankston/mailx-types": "^0.1.18",
     "@bobfrankston/mailx-settings": "^0.1.26",
     "@bobfrankston/mailx-store": "^0.1.45",
-    "@bobfrankston/iflow-direct": "^0.1.52",
-    "@bobfrankston/tcp-transport": "^0.1.6",
-    "@bobfrankston/smtp-direct": "^0.1.8",
-    "@bobfrankston/mailx-sync": "^0.1.19",
-    "@bobfrankston/oauthsupport": "^1.0.31"
+    "@bobfrankston/iflow-direct": "^0.1.53",
+    "@bobfrankston/tcp-transport": "^0.1.7",
+    "@bobfrankston/smtp-direct": "^0.1.9",
+    "@bobfrankston/mailx-sync": "^0.1.20",
+    "@bobfrankston/oauthsupport": "^1.0.32"
   },
   "repository": {
     "type": "git",
@@ -40,11 +40,11 @@
       "@bobfrankston/mailx-types": "^0.1.18",
       "@bobfrankston/mailx-settings": "^0.1.26",
       "@bobfrankston/mailx-store": "^0.1.45",
-      "@bobfrankston/iflow-direct": "^0.1.52",
-      "@bobfrankston/tcp-transport": "^0.1.6",
-      "@bobfrankston/smtp-direct": "^0.1.8",
-      "@bobfrankston/mailx-sync": "^0.1.19",
-      "@bobfrankston/oauthsupport": "^1.0.31"
+      "@bobfrankston/iflow-direct": "^0.1.53",
+      "@bobfrankston/tcp-transport": "^0.1.7",
+      "@bobfrankston/smtp-direct": "^0.1.9",
+      "@bobfrankston/mailx-sync": "^0.1.20",
+      "@bobfrankston/oauthsupport": "^1.0.32"
     }
   }
 }