@bobfrankston/mailx-imap 0.1.62 → 0.1.64

package/index.js

@@ -6,7 +6,7 @@
 import { createAutoImapConfig, CompatImapClient } from "@bobfrankston/iflow-direct";
 import { authenticateOAuth } from "@bobfrankston/oauthsupport";
 import { parseSerial, fixCharsetDeclString, storeBus } from "@bobfrankston/mailx-store";
-import { loadSettings, getConfigDir, getHistoryDays, getPrefetch } from "@bobfrankston/mailx-settings";
+import { loadSettings, getConfigDir, getHistoryDays, getPrefetch, tokenDirName } from "@bobfrankston/mailx-settings";
 import { EventEmitter } from "node:events";
 import * as fs from "node:fs";
 import * as path from "node:path";
@@ -113,8 +113,20 @@ async function extractPreview(source) {
         const parsed = await parseSerial(fixCharsetDeclString(source), "background");
         const bodyText = parsed.text || "";
         const bodyHtml = parsed.html || "";
-        // Use text part; fall back to stripping HTML tags if text is empty
-        let raw = bodyText || bodyHtml.replace(/<[^>]+>/g, " ");
+        // Prefer HTML so we can replace <img> with [image] before tag-strip;
+        // fall back to text if no HTML part. Either source then gets any
+        // remaining base64 data: URIs (rare: text/plain copies generated
+        // from a Quill compose pasted-image HTML) collapsed to [image] too.
+        let raw;
+        if (bodyHtml) {
+            raw = bodyHtml
+                .replace(/<img\b[^>]*>/gi, " [image] ")
+                .replace(/<[^>]+>/g, " ");
+        }
+        else {
+            raw = bodyText;
+        }
+        raw = raw.replace(/data:image\/[a-z0-9.+-]+;base64,[A-Za-z0-9+/=\s]+/gi, "[image]");
         const preview = decodeEntities(raw).replace(/\s+/g, " ").trim().slice(0, 200);
         const hasAttachments = (parsed.attachments?.length || 0) > 0;
         return { bodyHtml, bodyText, preview, hasAttachments };
@@ -284,7 +296,7 @@ export class ImapManager extends EventEmitter {
                 this.watchers.delete(accountId);
             }
             // Delete only the IMAP token (not contacts — separate scope, separate consent)
-            const accountDir = account.imap.user.replace(/[@.]/g, "_");
+            const accountDir = tokenDirName(account.imap.user);
             const tokenDir = path.join(getConfigDir(), "tokens", accountDir);
             const tokenPath = path.join(tokenDir, "token.json");
             if (fs.existsSync(tokenPath)) {
@@ -728,7 +740,7 @@ export class ImapManager extends EventEmitter {
                 }
                 catch { /* iflow-direct not resolvable */ }
             }
-            const tokenDir = path.join(getConfigDir(), "tokens", account.imap.user.replace(/[@.]/g, "_"));
+            const tokenDir = path.join(getConfigDir(), "tokens", tokenDirName(account.imap.user));
             tokenProvider = async () => {
                 // Wall-clock timeout on OAuth. Use a longer timeout when no
                 // cached token exists (first auth needs user to click through

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.62",
+  "version": "0.1.64",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@bobfrankston/mailx-types": "^0.1.18",
-    "@bobfrankston/mailx-settings": "^0.1.22",
+    "@bobfrankston/mailx-settings": "^0.1.24",
     "@bobfrankston/mailx-store": "^0.1.37",
     "@bobfrankston/iflow-direct": "^0.1.50",
     "@bobfrankston/tcp-transport": "^0.1.6",
@@ -38,7 +38,7 @@
   ".transformedSnapshot": {
     "dependencies": {
       "@bobfrankston/mailx-types": "^0.1.18",
-      "@bobfrankston/mailx-settings": "^0.1.22",
+      "@bobfrankston/mailx-settings": "^0.1.24",
       "@bobfrankston/mailx-store": "^0.1.37",
       "@bobfrankston/iflow-direct": "^0.1.50",
       "@bobfrankston/tcp-transport": "^0.1.6",