@bobfrankston/rmfmail 1.2.97 → 1.2.100

package/client/android-bootstrap.bundle.js

@@ -4797,6 +4797,7 @@ var SCHEMA = `
         in_reply_to TEXT,
         refs TEXT,
         date INTEGER NOT NULL,
+        sent_date INTEGER,
         subject TEXT DEFAULT '',
         from_address TEXT DEFAULT '',
         from_name TEXT DEFAULT '',
@@ -4995,6 +4996,10 @@ var WebMailxDB = class {
     }
     this.db.run("PRAGMA foreign_keys = ON");
     this.db.run(SCHEMA);
+    try {
+      this.db.run("ALTER TABLE messages ADD COLUMN sent_date INTEGER");
+    } catch {
+    }
     this.scheduleSave();
   }
   /** Wait for DB initialization */
@@ -5139,14 +5144,14 @@ var WebMailxDB = class {
   upsertMessage(msg) {
     const existing = this.get("SELECT id FROM messages WHERE account_id = ? AND folder_id = ? AND uid = ?", [msg.accountId, msg.folderId, msg.uid]);
     if (existing) {
-      this.run(`UPDATE messages SET flags_json = ?, preview = ?, body_path = ?, cached_at = ? WHERE id = ?`, [JSON.stringify(msg.flags), msg.preview, msg.bodyPath, Date.now(), existing.id]);
+      this.run(`UPDATE messages SET flags_json = ?, preview = ?, body_path = ?, sent_date = COALESCE(sent_date, ?), cached_at = ? WHERE id = ?`, [JSON.stringify(msg.flags), msg.preview, msg.bodyPath, msg.sentDate ?? msg.date, Date.now(), existing.id]);
       return existing.id;
     }
     this.run(`INSERT INTO messages (
                 account_id, folder_id, uid, message_id, in_reply_to, refs,
-                date, subject, from_address, from_name, to_json, cc_json,
+                date, sent_date, subject, from_address, from_name, to_json, cc_json,
                 flags_json, size, has_attachments, preview, body_path, cached_at
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
       msg.accountId,
       msg.folderId,
       msg.uid,
@@ -5154,6 +5159,7 @@ var WebMailxDB = class {
       msg.inReplyTo,
       JSON.stringify(msg.references),
       msg.date,
+      msg.sentDate ?? msg.date,
       msg.subject,
       msg.from.address,
       msg.from.name,
@@ -5490,6 +5496,9 @@ var WebMailxDB = class {
       inReplyTo: r.in_reply_to || "",
       references: JSON.parse(r.refs || "[]"),
       date: r.date,
+      // NULL for pre-migration rows — the client's `sentDate ?? date`
+      // fallback then shows the received date, same as before.
+      sentDate: r.sent_date ?? void 0,
       subject: r.subject,
       from: { name: r.from_name, address: r.from_address },
       to: JSON.parse(r.to_json),
@@ -9365,6 +9374,7 @@ function toProviderMessage(m) {
     messageId: m.messageId || "",
     providerId: "",
     date: m.date || null,
+    sentDate: m.sentDate || void 0,
     subject: m.subject || "",
     from: m.from || [],
     to: m.to || [],
@@ -9838,6 +9848,20 @@ var AndroidSyncManager = class {
   bodyStore;
   providers = /* @__PURE__ */ new Map();
   tokenProviders = /* @__PURE__ */ new Map();
+  // Dedicated body-fetch lane per IMAP account, mirroring the desktop's
+  // per-workload connections (v1.2.50). Body fetches used the SAME
+  // connection as folder sync; iflow-direct serializes single commands but
+  // not SELECT+FETCH *pairs*, so a concurrent folder sync could re-SELECT
+  // another mailbox between fetchOne's SELECT and its UID FETCH — the FETCH
+  // then ran against the wrong mailbox and returned nothing, which the
+  // viewer showed as "no body text" (Bob 2026-07-03, bobma/4970037-38).
+  // Lazy: the connection opens on the first body fetch. Gmail accounts skip
+  // this — the Gmail provider is stateless HTTP with no SELECT state.
+  fetchProviders = /* @__PURE__ */ new Map();
+  imapAccountConfigs = /* @__PURE__ */ new Map();
+  // Per-account FIFO so two body fetches (interactive click vs prefetch)
+  // can't interleave their own SELECT+FETCH pairs on the fetch lane either.
+  fetchChains = /* @__PURE__ */ new Map();
   // One prefetch session per account — prevents every syncAll tick from
   // spawning parallel fetch loops that race on IndexedDB and blow through
   // Gmail's per-user quota.
@@ -9888,6 +9912,7 @@ var AndroidSyncManager = class {
           fetchChunkSizeMax: 100
         }, () => new BridgeTcpTransport());
         this.providers.set(account.id, provider);
+        this.imapAccountConfigs.set(account.id, account);
         vlog(`addAccount ${account.id}: IMAP provider registered (${account.imap.host}:${account.imap.port})`);
         console.log(`[sync] ${account.id}: IMAP provider registered (${account.imap.host})`);
       } catch (e) {
@@ -9907,6 +9932,43 @@ var AndroidSyncManager = class {
   getProvider(accountId) {
     return this.providers.get(accountId) || null;
   }
+  /** Provider for BODY fetches. IMAP accounts get their own lazily-opened
+   *  connection so a fetch can never share (and race) the sync connection's
+   *  SELECT state. Gmail (stateless HTTP) reuses the main provider. */
+  getFetchProvider(accountId) {
+    const cfg = this.imapAccountConfigs.get(accountId);
+    if (!cfg?.imap?.host || !cfg.imap.user) return this.getProvider(accountId);
+    let p = this.fetchProviders.get(accountId);
+    if (!p) {
+      try {
+        p = new ImapWebProvider({
+          server: cfg.imap.host,
+          port: cfg.imap.port || 993,
+          username: cfg.imap.user,
+          password: cfg.imap.password,
+          inactivityTimeout: 3e5,
+          fetchChunkSize: 10,
+          fetchChunkSizeMax: 100
+        }, () => new BridgeTcpTransport());
+        this.fetchProviders.set(accountId, p);
+        console.log(`[fetchBody] ${accountId}: dedicated fetch connection opened`);
+      } catch (e) {
+        console.error(`[fetchBody] ${accountId}: fetch-lane provider failed (${e?.message || e}) \u2014 falling back to sync connection`);
+        return this.getProvider(accountId);
+      }
+    }
+    return p;
+  }
+  /** Per-account FIFO for body fetches: one SELECT+FETCH pair at a time on
+   *  the fetch lane. A rejected task never breaks the chain. */
+  enqueueFetch(accountId, fn) {
+    const prev = this.fetchChains.get(accountId) || Promise.resolve();
+    const next = prev.then(fn, fn);
+    this.fetchChains.set(accountId, next.then(() => {
+    }, () => {
+    }));
+    return next;
+  }
   async syncAll() {
     if (this.syncAllInflight) {
       console.log("[sync] inbox sync already in flight \u2014 coalescing this trigger");
@@ -10168,6 +10230,7 @@ var AndroidSyncManager = class {
         if (msg.answered) flags.push("\\Answered");
         if (msg.draft) flags.push("\\Draft");
         const bodyPath = msg.providerId ? `gmail:${msg.providerId}` : "";
+        const sentRaw = msg.sentDate instanceof Date ? msg.sentDate.getTime() : NaN;
         this.db.upsertMessage({
           accountId,
           folderId,
@@ -10176,6 +10239,7 @@ var AndroidSyncManager = class {
           inReplyTo: "",
           references: [],
           date: msg.date ? msg.date.getTime() : Date.now(),
+          sentDate: Number.isFinite(sentRaw) ? sentRaw : void 0,
           subject: msg.subject || "",
           from: toEmailAddress(msg.from?.[0]),
           to: msg.to.map((a) => toEmailAddress(a)),
@@ -10198,7 +10262,7 @@ var AndroidSyncManager = class {
     if (await this.bodyStore.hasMessage(accountId, folderId, uid)) {
       return await this.bodyStore.getMessage(accountId, folderId, uid);
     }
-    const provider = this.getProvider(accountId);
+    const provider = this.getFetchProvider(accountId);
     if (!provider) {
       console.warn(`[fetchBody] No provider for ${accountId}`);
       return null;
@@ -10207,30 +10271,29 @@ var AndroidSyncManager = class {
     const bp = envelope?.bodyPath || "";
     const FETCH_TIMEOUT_MS = 6e4;
     let __folderPath = "(n/a)";
-    const fetchPromise = (async () => {
-      if (bp.startsWith("gmail:") && provider.fetchById) {
-        const providerId = bp.substring(6);
-        __folderPath = `gmail:${bp.substring(6)}`;
-        return provider.fetchById(providerId, { source: true });
-      }
-      const folders = this.db.getFolders(accountId);
-      const folder = folders.find((f) => f.id === folderId);
-      if (!folder) {
-        __folderPath = "(folder row missing)";
-        return null;
-      }
-      __folderPath = folder.path || "(empty path)";
-      return provider.fetchOne(folder.path, uid, { source: true });
-    })();
     let msg = null;
     try {
-      msg = await Promise.race([
-        fetchPromise,
+      msg = await this.enqueueFetch(accountId, () => Promise.race([
+        (async () => {
+          if (bp.startsWith("gmail:") && provider.fetchById) {
+            const providerId = bp.substring(6);
+            __folderPath = `gmail:${bp.substring(6)}`;
+            return provider.fetchById(providerId, { source: true });
+          }
+          const folders = this.db.getFolders(accountId);
+          const folder = folders.find((f) => f.id === folderId);
+          if (!folder) {
+            __folderPath = "(folder row missing)";
+            return null;
+          }
+          __folderPath = folder.path || "(empty path)";
+          return provider.fetchOne(folder.path, uid, { source: true });
+        })(),
         new Promise((_, reject) => setTimeout(
           () => reject(new Error(`body-fetch timeout ${FETCH_TIMEOUT_MS / 1e3}s (${accountId}/${folderId}/${uid})`)),
           FETCH_TIMEOUT_MS
         ))
-      ]);
+      ]));
     } catch (e) {
       console.error(`[fetchBody] failed ${accountId}/${folderId}/${uid} after ${Date.now() - t0}ms: ${e?.message || e}`);
       throw e;