@bobfrankston/rmfmail 1.1.123 → 1.1.125

package/packages/mailx-imap/index.ts

@@ -7,7 +7,7 @@
 import { createAutoImapConfig, CompatImapClient } from "@bobfrankston/iflow-direct";
 import type { TransportFactory } from "@bobfrankston/tcp-transport";
 import { authenticateOAuth } from "@bobfrankston/oauthsupport";
-import { MailxDB, FileMessageStore, parseSerial, storeBus, Store } from "@bobfrankston/mailx-store";
+import { MailxDB, FileMessageStore, parseSerial, fixCharsetDeclString, storeBus, Store } from "@bobfrankston/mailx-store";
 import { loadSettings, getStorePath, getConfigDir, getHistoryDays, getPrefetch } from "@bobfrankston/mailx-settings";
 import type { AccountConfig, MessageEnvelope, EmailAddress, Folder } from "@bobfrankston/mailx-types";
 import { EventEmitter } from "node:events";
@@ -175,7 +175,11 @@ function decodeEntities(text: string): string {
 /** Extract a plain-text preview from message source */
 async function extractPreview(source: string): Promise<{ bodyHtml: string; bodyText: string; preview: string; hasAttachments: boolean }> {
     try {
-        const parsed = await parseSerial(source, "background");
+        // Normalize iso-8859-1 → windows-1252 in the part charset declaration
+        // before parsing, so the preview decodes 0x80-0x9F (smart quotes,
+        // em-dash) correctly — same correction the viewer path gets via
+        // sniffAndFixCharset (Bob 2026-05-22).
+        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
@@ -3201,6 +3205,15 @@ export class ImapManager extends EventEmitter {
                             }
                             continue;
                         }
+                        // Success — clear the in-flight delete/move
+                        // suppression (see the IMAP branch below for the
+                        // full rationale). After a move the local row lives
+                        // at the TARGET folder, so the (uid, folder) lookup
+                        // uses targetFolderId.
+                        if (action.action === "move") {
+                            this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                            this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                        }
                         this.db.completeSyncAction(action.id);
                     } catch (e: any) {
                         console.error(`  [api] ${accountId}: flag sync failed UID ${action.uid}: ${e.message}`);
@@ -3209,7 +3222,10 @@ export class ImapManager extends EventEmitter {
                             // Terminal failure on delete/move → clear tombstone
                             // so the row reappears on next sync (server still
                             // has it). Same rationale as the IMAP branch below.
-                            if (action.action === "delete" || action.action === "move") {
+                            if (action.action === "move") {
+                                this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                                this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                            } else if (action.action === "delete") {
                                 this.db.clearTombstoneForUid(accountId, action.uid, action.folderId);
                             }
                             this.db.completeSyncAction(action.id);
@@ -3283,6 +3299,22 @@ export class ImapManager extends EventEmitter {
                             break;
                         }
                     }
+                    // Success: the local action reached the server. Lift the
+                    // in-flight delete/move suppression so the destination
+                    // folder syncs the moved message under its real
+                    // post-move UID. hasTombstone's documented contract is
+                    // "cleared on successful action complete OR permanent
+                    // failure" — only the failure half had been wired, so a
+                    // successful move left a Message-ID tombstone alive for
+                    // 30 days, blocking the Trash folder from ever storing
+                    // the message (and resurrecting it once the tombstone
+                    // finally aged out). After a move the local row lives at
+                    // the TARGET folder, so the (uid, folder) lookup uses
+                    // targetFolderId.
+                    if (action.action === "move") {
+                        this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                        this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                    }
                     this.db.completeSyncAction(action.id);
                 } catch (e: any) {
                     console.error(`  [sync] Failed action ${action.action} UID ${action.uid}: ${e.message}`);
@@ -3298,7 +3330,12 @@ export class ImapManager extends EventEmitter {
                         // reflecting "your action didn't take, here it is
                         // again." Applies to delete + move; flags/append
                         // never tombstone.
-                        if (action.action === "delete" || action.action === "move") {
+                        if (action.action === "move") {
+                            // Local row is at the TARGET folder (the local
+                            // move committed; only the server move failed).
+                            this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                            this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                        } else if (action.action === "delete") {
                             this.db.clearTombstoneForUid(accountId, action.uid, action.folderId);
                         }
                         this.db.completeSyncAction(action.id);

package/packages/mailx-imap/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.55",
+  "version": "0.1.57",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bobfrankston/mailx-imap",
-      "version": "0.1.55",
+      "version": "0.1.57",
       "license": "ISC",
       "dependencies": {
         "@bobfrankston/iflow-direct": "^0.1.27",

package/packages/mailx-imap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.55",
+  "version": "0.1.57",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

package/packages/mailx-store/charset.d.ts

@@ -1,15 +1,29 @@
 /**
- * Charset normalization for incoming email bodies.
+ * Charset normalization for incoming email bodies. Two corrections, both
+ * applied by rewriting the part's `charset=` declaration before the parser
+ * decodes it:
  *
- * Many senders (esp. PHPMailer-driven marketing) declare
- * `charset=iso-8859-1` but emit UTF-8 bytes. simpleParser honors the
- * declared charset and produces "â??" garbage for every non-ASCII
- * codepoint (em-dash, smart quotes, …). When the raw body bytes are
- * valid UTF-8, rewrite the charset header before parsing. We only
- * override the obviously-wrong legacy declarations; explicit utf-8 /
- * koi8 / etc. pass through.
+ *  1. Mis-declared UTF-8: PHPMailer-style senders declare `iso-8859-1`
+ *     (the PHP default) but emit UTF-8 bytes. When the raw body really is
+ *     valid UTF-8, rewrite the declaration to utf-8.
+ *
+ *  2. iso-8859-1 → windows-1252: senders that genuinely mean a legacy
+ *     8-bit charset overwhelmingly emit Windows-1252, not strict
+ *     ISO-8859-1 — smart quotes / em-dash / euro live in 0x80-0x9F, which
+ *     ISO-8859-1 leaves as unusable C1 control codes. The WHATWG / browser
+ *     standard is to decode `iso-8859-1` AS `windows-1252`; iconv-lite
+ *     does not, so we rewrite the declaration. windows-1252 is a strict
+ *     superset of printable ISO-8859-1, so a genuine ISO-8859-1 char is
+ *     never lost.
  */
 /** Returns either the original buffer (no change needed) or a copy with
- *  the leading charset declaration rewritten to utf-8. */
+ *  the leading charset declaration corrected. */
 export declare function sniffAndFixCharset(raw: Buffer): Buffer;
+/** String form of sniffAndFixCharset — for the preview path, which parses
+ *  the message as a string (extractPreview). Same two corrections, applied
+ *  to the charset declaration in the text. The UTF-8-misdeclare correction
+ *  can't be done on a string (the bytes are already decoded), so this only
+ *  does correction 2 (iso-8859-1 → windows-1252), which is a pure
+ *  declaration rewrite and the common case for previews. */
+export declare function fixCharsetDeclString(s: string): string;
 //# sourceMappingURL=charset.d.ts.map

package/packages/mailx-store/charset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"charset.d.ts","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH;0DAC0D;AAC1D,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAiBtD"}
+{"version":3,"file":"charset.d.ts","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH;iDACiD;AACjD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CA4BtD;AAED;;;;;4DAK4D;AAC5D,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEtD"}

package/packages/mailx-store/charset.js

@@ -1,36 +1,58 @@
 /**
- * Charset normalization for incoming email bodies.
+ * Charset normalization for incoming email bodies. Two corrections, both
+ * applied by rewriting the part's `charset=` declaration before the parser
+ * decodes it:
  *
- * Many senders (esp. PHPMailer-driven marketing) declare
- * `charset=iso-8859-1` but emit UTF-8 bytes. simpleParser honors the
- * declared charset and produces "â??" garbage for every non-ASCII
- * codepoint (em-dash, smart quotes, …). When the raw body bytes are
- * valid UTF-8, rewrite the charset header before parsing. We only
- * override the obviously-wrong legacy declarations; explicit utf-8 /
- * koi8 / etc. pass through.
+ *  1. Mis-declared UTF-8: PHPMailer-style senders declare `iso-8859-1`
+ *     (the PHP default) but emit UTF-8 bytes. When the raw body really is
+ *     valid UTF-8, rewrite the declaration to utf-8.
+ *
+ *  2. iso-8859-1 → windows-1252: senders that genuinely mean a legacy
+ *     8-bit charset overwhelmingly emit Windows-1252, not strict
+ *     ISO-8859-1 — smart quotes / em-dash / euro live in 0x80-0x9F, which
+ *     ISO-8859-1 leaves as unusable C1 control codes. The WHATWG / browser
+ *     standard is to decode `iso-8859-1` AS `windows-1252`; iconv-lite
+ *     does not, so we rewrite the declaration. windows-1252 is a strict
+ *     superset of printable ISO-8859-1, so a genuine ISO-8859-1 char is
+ *     never lost.
  */
 /** Returns either the original buffer (no change needed) or a copy with
- *  the leading charset declaration rewritten to utf-8. */
+ *  the leading charset declaration corrected. */
 export function sniffAndFixCharset(raw) {
     const HEAD_LIMIT = 16384;
     const head = raw.subarray(0, Math.min(HEAD_LIMIT, raw.length)).toString("latin1");
-    const re = /charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi;
-    if (!re.test(head))
-        return raw;
-    // The rewrite is only sound when the raw bytes ARE the body bytes — i.e.
-    // an 8bit / binary part. For a quoted-printable or base64 part the raw
-    // .eml is pure ASCII (the high bytes live inside `=XX` / base64 chars),
-    // so isValidUtf8(raw) passes vacuously and we would relabel a genuine
-    // Windows-1252 part as utf-8 — every smart-quote / em-dash then decodes
-    // as mojibake (Bob's 2026-05-21 report: a QP Windows-1252 Outlook mail).
-    // Requiring an actual non-ASCII byte in the raw gates the heuristic to
-    // the only case where the UTF-8 sniff is meaningful.
-    if (!hasNonAscii(raw))
-        return raw;
-    if (!isValidUtf8(raw))
+    const legacyRe = /charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi;
+    if (!legacyRe.test(head))
         return raw;
-    const fixed = head.replace(/charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi, "charset=utf-8");
-    return Buffer.concat([Buffer.from(fixed, "latin1"), raw.subarray(head.length)]);
+    // Correction 1 — mis-declared UTF-8. Only sound when the raw bytes ARE
+    // the body bytes (an 8bit part): for a quoted-printable / base64 part
+    // the raw .eml is pure ASCII, so isValidUtf8 passes vacuously and we'd
+    // wrongly relabel a real Windows-1252 part as utf-8 (Bob 2026-05-21).
+    // Requiring a real non-ASCII byte gates the UTF-8 sniff to where it
+    // means something.
+    if (hasNonAscii(raw) && isValidUtf8(raw)) {
+        const fixed = head.replace(legacyRe, "charset=utf-8");
+        return Buffer.concat([Buffer.from(fixed, "latin1"), raw.subarray(head.length)]);
+    }
+    // Correction 2 — iso-8859-1 / latin1 → windows-1252. Applies whether
+    // the part is QP or 8bit; the rewrite is purely on the declaration.
+    // (Bob 2026-05-22: an Intuit mail declared ISO-8859-1, QP-encoded a
+    // 0x92 apostrophe → latin1 decode produced a U+0092 control char.)
+    const isoRe = /charset\s*=\s*"?(iso-8859-1|latin1)"?/gi;
+    if (isoRe.test(head)) {
+        const fixed = head.replace(isoRe, "charset=windows-1252");
+        return Buffer.concat([Buffer.from(fixed, "latin1"), raw.subarray(head.length)]);
+    }
+    return raw;
+}
+/** String form of sniffAndFixCharset — for the preview path, which parses
+ *  the message as a string (extractPreview). Same two corrections, applied
+ *  to the charset declaration in the text. The UTF-8-misdeclare correction
+ *  can't be done on a string (the bytes are already decoded), so this only
+ *  does correction 2 (iso-8859-1 → windows-1252), which is a pure
+ *  declaration rewrite and the common case for previews. */
+export function fixCharsetDeclString(s) {
+    return s.replace(/charset\s*=\s*"?(iso-8859-1|latin1)"?/gi, "charset=windows-1252");
 }
 /** True if the buffer contains at least one byte >= 0x80. A pure-ASCII
  *  buffer is trivially valid UTF-8, so the isValidUtf8 sniff tells us

package/packages/mailx-store/charset.js.map

@@ -1 +1 @@
-{"version":3,"file":"charset.js","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH;0DAC0D;AAC1D,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC1C,MAAM,UAAU,GAAG,KAAK,CAAC;IACzB,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClF,MAAM,EAAE,GAAG,+DAA+D,CAAC;IAC3E,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,GAAG,CAAC;IAC/B,yEAAyE;IACzE,uEAAuE;IACvE,wEAAwE;IACxE,sEAAsE;IACtE,wEAAwE;IACxE,yEAAyE;IACzE,uEAAuE;IACvE,qDAAqD;IACrD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAClC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,+DAA+D,EAAE,eAAe,CAAC,CAAC;IAC7G,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACpF,CAAC;AAED;;2EAE2E;AAC3E,SAAS,WAAW,CAAC,GAAW;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;IACpC,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;qDAEqD;AACrD,SAAS,WAAW,CAAC,GAAW;IAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACjB,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;YAAC,CAAC,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAChC,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,IAAI;gBAAE,OAAO,KAAK,CAAC;YAAC,IAAI,GAAG,CAAC,CAAC;QAAC,CAAC;aAC7D,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI;YAAE,IAAI,GAAG,CAAC,CAAC;aAClC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,IAAI;gBAAE,OAAO,KAAK,CAAC;YAAC,IAAI,GAAG,CAAC,CAAC;QAAC,CAAC;;YAClE,OAAO,KAAK,CAAC;QAClB,IAAI,CAAC,GAAG,IAAI,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,KAAK,CAAC;QACnD,CAAC;QACD,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"charset.js","sourceRoot":"","sources":["charset.ts"],"names":[],"mappings":"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"}

package/packages/mailx-store/charset.ts

@@ -1,34 +1,62 @@
 /**
- * Charset normalization for incoming email bodies.
+ * Charset normalization for incoming email bodies. Two corrections, both
+ * applied by rewriting the part's `charset=` declaration before the parser
+ * decodes it:
  *
- * Many senders (esp. PHPMailer-driven marketing) declare
- * `charset=iso-8859-1` but emit UTF-8 bytes. simpleParser honors the
- * declared charset and produces "â??" garbage for every non-ASCII
- * codepoint (em-dash, smart quotes, …). When the raw body bytes are
- * valid UTF-8, rewrite the charset header before parsing. We only
- * override the obviously-wrong legacy declarations; explicit utf-8 /
- * koi8 / etc. pass through.
+ *  1. Mis-declared UTF-8: PHPMailer-style senders declare `iso-8859-1`
+ *     (the PHP default) but emit UTF-8 bytes. When the raw body really is
+ *     valid UTF-8, rewrite the declaration to utf-8.
+ *
+ *  2. iso-8859-1 → windows-1252: senders that genuinely mean a legacy
+ *     8-bit charset overwhelmingly emit Windows-1252, not strict
+ *     ISO-8859-1 — smart quotes / em-dash / euro live in 0x80-0x9F, which
+ *     ISO-8859-1 leaves as unusable C1 control codes. The WHATWG / browser
+ *     standard is to decode `iso-8859-1` AS `windows-1252`; iconv-lite
+ *     does not, so we rewrite the declaration. windows-1252 is a strict
+ *     superset of printable ISO-8859-1, so a genuine ISO-8859-1 char is
+ *     never lost.
  */
 
 /** Returns either the original buffer (no change needed) or a copy with
- *  the leading charset declaration rewritten to utf-8. */
+ *  the leading charset declaration corrected. */
 export function sniffAndFixCharset(raw: Buffer): Buffer {
     const HEAD_LIMIT = 16384;
     const head = raw.subarray(0, Math.min(HEAD_LIMIT, raw.length)).toString("latin1");
-    const re = /charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi;
-    if (!re.test(head)) return raw;
-    // The rewrite is only sound when the raw bytes ARE the body bytes — i.e.
-    // an 8bit / binary part. For a quoted-printable or base64 part the raw
-    // .eml is pure ASCII (the high bytes live inside `=XX` / base64 chars),
-    // so isValidUtf8(raw) passes vacuously and we would relabel a genuine
-    // Windows-1252 part as utf-8 — every smart-quote / em-dash then decodes
-    // as mojibake (Bob's 2026-05-21 report: a QP Windows-1252 Outlook mail).
-    // Requiring an actual non-ASCII byte in the raw gates the heuristic to
-    // the only case where the UTF-8 sniff is meaningful.
-    if (!hasNonAscii(raw)) return raw;
-    if (!isValidUtf8(raw)) return raw;
-    const fixed = head.replace(/charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi, "charset=utf-8");
-    return Buffer.concat([Buffer.from(fixed, "latin1"), raw.subarray(head.length)]);
+    const legacyRe = /charset\s*=\s*"?(iso-8859-1|us-ascii|windows-1252|latin1)"?/gi;
+    if (!legacyRe.test(head)) return raw;
+
+    // Correction 1 — mis-declared UTF-8. Only sound when the raw bytes ARE
+    // the body bytes (an 8bit part): for a quoted-printable / base64 part
+    // the raw .eml is pure ASCII, so isValidUtf8 passes vacuously and we'd
+    // wrongly relabel a real Windows-1252 part as utf-8 (Bob 2026-05-21).
+    // Requiring a real non-ASCII byte gates the UTF-8 sniff to where it
+    // means something.
+    if (hasNonAscii(raw) && isValidUtf8(raw)) {
+        const fixed = head.replace(legacyRe, "charset=utf-8");
+        return Buffer.concat([Buffer.from(fixed, "latin1"), raw.subarray(head.length)]);
+    }
+
+    // Correction 2 — iso-8859-1 / latin1 → windows-1252. Applies whether
+    // the part is QP or 8bit; the rewrite is purely on the declaration.
+    // (Bob 2026-05-22: an Intuit mail declared ISO-8859-1, QP-encoded a
+    // 0x92 apostrophe → latin1 decode produced a U+0092 control char.)
+    const isoRe = /charset\s*=\s*"?(iso-8859-1|latin1)"?/gi;
+    if (isoRe.test(head)) {
+        const fixed = head.replace(isoRe, "charset=windows-1252");
+        return Buffer.concat([Buffer.from(fixed, "latin1"), raw.subarray(head.length)]);
+    }
+
+    return raw;
+}
+
+/** String form of sniffAndFixCharset — for the preview path, which parses
+ *  the message as a string (extractPreview). Same two corrections, applied
+ *  to the charset declaration in the text. The UTF-8-misdeclare correction
+ *  can't be done on a string (the bytes are already decoded), so this only
+ *  does correction 2 (iso-8859-1 → windows-1252), which is a pure
+ *  declaration rewrite and the common case for previews. */
+export function fixCharsetDeclString(s: string): string {
+    return s.replace(/charset\s*=\s*"?(iso-8859-1|latin1)"?/gi, "charset=windows-1252");
 }
 
 /** True if the buffer contains at least one byte >= 0x80. A pure-ASCII

package/packages/mailx-store/index.d.ts

@@ -5,6 +5,7 @@
 export { MailxDB } from "./db.js";
 export { FileMessageStore } from "./file-store.js";
 export { parseSerial, prewarmParseWorker } from "./parse-serial.js";
+export { sniffAndFixCharset, fixCharsetDeclString } from "./charset.js";
 export { Store } from "./store.js";
 export type { StoreMessage } from "./store.js";
 export { StoreBus, storeBus } from "@bobfrankston/mailx-bus";

package/packages/mailx-store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGpE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM/C,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC7D,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGxE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM/C,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC7D,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC"}

package/packages/mailx-store/index.js

@@ -5,6 +5,7 @@
 export { MailxDB } from "./db.js";
 export { FileMessageStore } from "./file-store.js";
 export { parseSerial, prewarmParseWorker } from "./parse-serial.js";
+export { sniffAndFixCharset, fixCharsetDeclString } from "./charset.js";
 // Store — the nexus. Owns DB + .eml files + operations + bus.
 export { Store } from "./store.js";
 // Store-event bus lives in `@bobfrankston/mailx-bus` so the browser-side

package/packages/mailx-store/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEpE,8DAA8D;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGnC,yEAAyE;AACzE,0EAA0E;AAC1E,yEAAyE;AACzE,uBAAuB;AACvB,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAExE,8DAA8D;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGnC,yEAAyE;AACzE,0EAA0E;AAC1E,yEAAyE;AACzE,uBAAuB;AACvB,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC"}

package/packages/mailx-store/index.ts

@@ -6,6 +6,7 @@
 export { MailxDB } from "./db.js";
 export { FileMessageStore } from "./file-store.js";
 export { parseSerial, prewarmParseWorker } from "./parse-serial.js";
+export { sniffAndFixCharset, fixCharsetDeclString } from "./charset.js";
 
 // Store — the nexus. Owns DB + .eml files + operations + bus.
 export { Store } from "./store.js";

package/packages/mailx-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",