@bobfrankston/rmfmail 1.1.115 → 1.1.117

package/packages/mailx-service/index.ts

@@ -12,7 +12,6 @@ import { MailxDB, parseSerial } from "@bobfrankston/mailx-store";
 const __dirname = import.meta.dirname;
 import { ImapManager } from "@bobfrankston/mailx-imap";
 import * as gsync from "./google-sync.js";
-import { sniffAndFixCharset } from "./charset.js";
 import { Store } from "@bobfrankston/mailx-store";
 import { SyncQueue } from "./sync-queue.js";
 import { Reconciler } from "./reconciler.js";
@@ -20,18 +19,10 @@ import { loadSettings, saveSettings, loadAccounts, loadAccountsAsync, saveAccoun
 import type { AccountConfig, Folder, AutocompleteRequest, AutocompleteResponse, AutocompleteSettings, AiTransformRequest, AiTransformResponse, ExtractedEvent, MailxApi } from "@bobfrankston/mailx-types";
 import { sanitizeHtml, encodeQuotedPrintable, htmlToPlainText } from "@bobfrankston/mailx-types";
 
-/** Detect mis-labeled charset and rewrite the part header to `utf-8` when
- *  the body bytes are actually valid UTF-8. PHPMailer-driven senders are
- *  the chronic offender — they declare `charset=iso-8859-1` (the PHP
- *  default) and then encode "—", "'", "…" etc. as UTF-8, which simpleParser
- *  faithfully decodes as Latin-1 and produces "â??" garbage. We only
- *  override the obviously-wrong declarations (`iso-8859-1`, `us-ascii`,
- *  `windows-1252`, `latin1`); anything else passes through unchanged.
- *  Operates byte-wise so MIME boundaries / base64 / etc. are preserved.
- *  The `utf-8` validity test rejects 0xC0–0xC1 / 0xF5–0xFF and continuation
- *  bytes out of place, which would be common in genuine Latin-1 text. */
-// sniffAndFixCharset moved to ./charset.ts so LocalStore can use it
-// without creating a circular dep with index.ts.
+// Charset normalization (sniffAndFixCharset) is owned solely by
+// mailx-store/charset.ts — the single live parse path (LocalStore.getMessage)
+// calls it there. mailx-service used to keep a duplicate copy that nothing
+// invoked; removed 2026-05-21 (economy of mechanism — one charset fixer).
 
 // parseListUnsubscribe moved to ./local-store.ts (only consumer is the
 // body-read path, which is now part of LocalStore).
@@ -131,6 +122,10 @@ export class MailxService implements MailxApi {
     // comment in loadContactsConfig() for why we don't re-walk on
     // every fs.watch firing of contacts.jsonc.
     private _contactsCorpusSeeded = false;
+    // Retry bookkeeping for loadContactsConfig when the cloud isn't ready
+    // yet at startup. Without retries, a failed first read left the denylist
+    // / preferred list unloaded for the whole session.
+    private _contactsRetries = 0;
     // Settings cache. `loadSettings()` does a synchronous read of
     // accounts.jsonc (via loadAccounts) AND preferences.jsonc — both of
     // which may live on a GDrive-mounted shared dir where readFileSync
@@ -258,9 +253,33 @@ export class MailxService implements MailxApi {
             cloudAvailable = true;
         } catch { /* cloud unavailable */ }
 
+        // Cloud not ready — the read THREW (GDrive auth/init still in
+        // progress; loadContactsConfig() is fired from the constructor). Do
+        // NOT fall through to applyContactsConfig({denylist:[]}): that wipes
+        // the in-memory denylist for the whole session, so every "never
+        // suggest this address" choice silently comes back next run (Bob
+        // 2026-05-21: "it's on drive but not read for the new session").
+        // Retry with backoff until the cloud is actually up.
+        if (!cloudAvailable) {
+            const RETRY_DELAYS = [3_000, 8_000, 20_000, 45_000, 90_000, 90_000];
+            if (this._contactsRetries < RETRY_DELAYS.length) {
+                const delay = RETRY_DELAYS[this._contactsRetries];
+                this._contactsRetries++;
+                console.log(`  [contacts] cloud not ready — retry ${this._contactsRetries} in ${delay / 1000}s`);
+                setTimeout(() => { this.loadContactsConfig().catch(() => { /* */ }); }, delay);
+            } else {
+                console.error(`  [contacts] cloud unreachable after ${RETRY_DELAYS.length} retries — denylist/preferred NOT loaded this session`);
+            }
+            return null;
+        }
+        // Cloud reachable — clear the retry counter so a later fs.watch
+        // reload that briefly fails can retry afresh.
+        this._contactsRetries = 0;
+
         if (!raw) {
-            // No file (yet). Reset in-memory denylist and seed discovered
-            // from the local message corpus so autocomplete works immediately.
+            // No file (yet) — genuinely missing, cloud confirmed reachable.
+            // Reset in-memory denylist and seed discovered from the local
+            // message corpus so autocomplete works immediately.
             await this.db.applyContactsConfig({ preferred: [], denylist: [], discovered: [] });
             try { await this.db.seedContactsFromMessages(); } catch { /* corpus may be empty */ }
             // Auto-bootstrap GDrive copy if cloud is reachable. The file gets