@bobfrankston/rmfmail 1.2.77 → 1.2.79

package/client/android-bootstrap.bundle.js

@@ -6753,7 +6753,11 @@ var GmailApiProvider = class _GmailApiProvider {
     }
     const cap = options.since ? 0 : 200;
     const ids = await this.listMessageIds(query, cap);
-    return this.batchFetch(ids, options);
+    const fresh = options.knownUids ? ids.filter((id) => !options.knownUids.has(idToUid(id))) : ids;
+    if (options.knownUids) {
+      console.log(`[gmail] fetchSince ${folder}: ${ids.length} listed, ${ids.length - fresh.length} already stored, fetching ${fresh.length}`);
+    }
+    return this.batchFetch(fresh, options);
   }
   async fetchByDate(folder, since, before, options = {}, onChunk) {
     const afterDate = this.formatDate(since);
@@ -9796,6 +9800,11 @@ var AndroidSyncManager = class {
   // advanced to fetching new mail, so the list stayed stale despite "Synced"
   // (Bob 2026-06-27). Coalesce concurrent calls to one in-flight run.
   syncAllInflight = null;
+  // Separate guard for the Phase-2/3 background pass (other folders + body
+  // prefetch). It runs DETACHED from the inbox guard so a long folder sweep
+  // can't make the 60s poll skip the inbox refresh (new mail must keep
+  // flowing). One background pass at a time — overlapping triggers no-op.
+  bgSyncInflight = null;
   on(_event, _handler) {
   }
   emit(event, ...args) {
@@ -9850,41 +9859,53 @@ var AndroidSyncManager = class {
   }
   async syncAll() {
     if (this.syncAllInflight) {
-      console.log("[sync] syncAll already in flight \u2014 coalescing this trigger");
+      console.log("[sync] inbox sync already in flight \u2014 coalescing this trigger");
       return this.syncAllInflight;
     }
     const t0 = Date.now();
-    console.log("[sync] syncAll START");
-    this.syncAllInflight = this._syncAllImpl().catch((e) => {
-      console.error(`[sync] syncAll error: ${e?.message || e}`);
+    console.log("[sync] syncAll START (inbox phase)");
+    this.syncAllInflight = this._syncInboxes().catch((e) => {
+      console.error(`[sync] inbox sync error: ${e?.message || e}`);
     }).finally(() => {
-      console.log(`[sync] syncAll DONE in ${Date.now() - t0}ms`);
+      console.log(`[sync] inbox phase DONE in ${Date.now() - t0}ms`);
       this.syncAllInflight = null;
     });
+    this._kickBackgroundSync();
     return this.syncAllInflight;
   }
-  async _syncAllImpl() {
-    const accounts = this.db.getAccounts();
-    vlog(`syncAll: ${accounts.length} accounts in DB: ${accounts.map((a) => a.id).join(",")}`);
-    for (const account of accounts) {
-      if (!this.providers.has(account.id)) continue;
-      try {
-        await withTimeout(`${account.id} inbox`, 6e4, async () => {
-          const folders = await this.syncFolders(account.id);
-          const inbox = folders.find((f) => f.specialUse === "inbox");
-          if (inbox) {
-            console.log(`[sync] ${account.id}: fetching INBOX (folderId=${inbox.id})`);
-            await this.syncFolder(account.id, inbox.id);
-            console.log(`[sync] ${account.id}: INBOX fetch done`);
-            emitEvent({ type: "syncComplete", accountId: account.id });
-          }
-        });
-      } catch (e) {
-        console.error(`[sync] ${account.id} inbox: ${e.message}`);
-      }
-    }
+  /** Phase 1: sync every account's INBOX IN PARALLEL so a slow account (e.g.
+   *  Gmail's metadata fetch, or an auth-failing IMAP account) can't delay new
+   *  mail for the others. Each account is time-boxed; network fetches overlap
+   *  even though JS is single-threaded (the awaits yield). */
+  async _syncInboxes() {
+    const accounts = this.db.getAccounts().filter((a) => this.providers.has(a.id));
+    vlog(`syncInboxes: ${accounts.length} accounts: ${accounts.map((a) => a.id).join(",")}`);
+    await Promise.all(accounts.map(
+      (account) => withTimeout(`${account.id} inbox`, 6e4, async () => {
+        const folders = await this.syncFolders(account.id);
+        const inbox = folders.find((f) => f.specialUse === "inbox");
+        if (inbox) {
+          console.log(`[sync] ${account.id}: fetching INBOX (folderId=${inbox.id})`);
+          await this.syncFolder(account.id, inbox.id);
+          console.log(`[sync] ${account.id}: INBOX fetch done`);
+          emitEvent({ type: "syncComplete", accountId: account.id });
+        }
+      }).catch((e) => console.error(`[sync] ${account.id} inbox: ${e?.message || e}`))
+    ));
+  }
+  /** Phase 2 + 3: remaining folders, then body prefetch. Runs in the
+   *  background under its own single-flight guard. */
+  _kickBackgroundSync() {
+    if (this.bgSyncInflight) return;
+    const t0 = Date.now();
+    this.bgSyncInflight = this._syncRemainingAndPrefetch().catch((e) => console.error(`[sync] background sweep error: ${e?.message || e}`)).finally(() => {
+      console.log(`[sync] background sweep DONE in ${Date.now() - t0}ms`);
+      this.bgSyncInflight = null;
+    });
+  }
+  async _syncRemainingAndPrefetch() {
+    const accounts = this.db.getAccounts().filter((a) => this.providers.has(a.id));
     for (const account of accounts) {
-      if (!this.providers.has(account.id)) continue;
       try {
         const folders = this.db.getFolders(account.id);
         const remaining = folders.filter((f) => f.specialUse !== "inbox");
@@ -9899,12 +9920,10 @@ var AndroidSyncManager = class {
         emitEvent({ type: "syncComplete", accountId: account.id });
       } catch (e) {
         console.error(`[sync] ${account.id}: ${e.message}`);
-        vlog(`syncAll: ${account.id} ERROR: ${e.message}`);
         emitEvent({ type: "syncError", accountId: account.id, error: e.message });
       }
     }
     for (const account of accounts) {
-      if (!this.providers.has(account.id)) continue;
       this.prefetchBodies(account.id).catch((e) => console.error(`[prefetch] ${account.id}: ${e.message}`));
     }
   }
@@ -10037,10 +10056,18 @@ var AndroidSyncManager = class {
     emitEvent({ type: "syncProgress", accountId, phase: `sync:${folder.path}`, progress: 0 });
     const highestUid = this.db.getHighestUid(accountId, folderId);
     const startDate = new Date(Date.now() - 30 * 864e5);
+    const account = this.db.getAccounts().find((a) => a.id === accountId);
+    const isGoogle = !!account && isGoogleAccount(account);
     let messages;
     if (highestUid > 0) {
-      messages = await provider.fetchSince(folder.path, highestUid, { source: false });
-      messages = messages.filter((m) => m.uid > highestUid);
+      const opts = { source: false };
+      if (isGoogle) {
+        opts.knownUids = new Set(this.db.getUidsForFolder(accountId, folderId));
+      }
+      messages = await provider.fetchSince(folder.path, highestUid, opts);
+      if (!isGoogle) {
+        messages = messages.filter((m) => m.uid > highestUid);
+      }
     } else {
       const tomorrow = new Date(Date.now() + 864e5);
       messages = await provider.fetchByDate(folder.path, startDate, tomorrow, { source: false });