@bobfrankston/rmfmail 1.2.106 → 1.2.110

package/client/android-bootstrap.bundle.js

@@ -2568,6 +2568,7 @@ var web_settings_exports = {};
 __export(web_settings_exports, {
   clearSettings: () => clearSettings,
   cloudRead: () => cloudRead,
+  cloudStat: () => cloudStat,
   cloudWrite: () => cloudWrite,
   getDeviceId: () => getDeviceId,
   getHistoryDays: () => getHistoryDays,
@@ -2647,6 +2648,23 @@ async function cloudRead(filename) {
 async function cloudWrite(filename, content) {
   return gDriveWrite(filename, content);
 }
+async function cloudStat(filename) {
+  if (!tokenProvider || !gDriveFolderId)
+    return null;
+  try {
+    const token = await tokenProvider();
+    const q = encodeURIComponent(`name='${filename}' and '${gDriveFolderId}' in parents and trashed=false`);
+    const res = await globalThis.fetch(`https://www.googleapis.com/drive/v3/files?q=${q}&fields=files(id,modifiedTime)`, { headers: { "Authorization": `Bearer ${token}` } });
+    if (!res.ok)
+      return null;
+    const data = await res.json();
+    const f = data.files?.[0];
+    return f?.id ? { id: f.id, modifiedTime: f.modifiedTime || "" } : null;
+  } catch (e) {
+    console.error(`[settings] GDrive stat ${filename}: ${e.message}`);
+    return null;
+  }
+}
 async function gDriveRead(filename) {
   if (!tokenProvider || !gDriveFolderId)
     return null;
@@ -5329,6 +5347,28 @@ var WebMailxDB = class {
   setContactsDenylist(emails) {
     this._denylist = new Set((emails || []).map((e) => (e || "").trim().toLowerCase()).filter(Boolean));
   }
+  /** Regex patterns from contacts.jsonc#denylistPatterns — same semantics
+   *  as desktop (mailx-store db.ts setContactsDenyPatterns): compiled
+   *  case-insensitive, tested against the lowercased address, invalid
+   *  patterns skipped with a warning. */
+  _denyPatterns = [];
+  setContactsDenyPatterns(patterns) {
+    this._denyPatterns = [];
+    for (const p of patterns || []) {
+      if (!p)
+        continue;
+      try {
+        this._denyPatterns.push(new RegExp(p, "i"));
+      } catch (e) {
+        console.warn(`[contacts] invalid denylistPattern "${p}": ${e.message}`);
+      }
+    }
+  }
+  isDenylisted(emailLower) {
+    if (this._denylist.has(emailLower))
+      return true;
+    return this._denyPatterns.some((re) => re.test(emailLower));
+  }
   searchContacts(query, limit = 10) {
     query = (query || "").trim();
     if (!query)
@@ -5337,7 +5377,7 @@ var WebMailxDB = class {
     const rows = this.all(`SELECT name, email, source, use_count as useCount FROM contacts
              WHERE email LIKE ? OR name LIKE ?
              ORDER BY use_count DESC, last_used DESC LIMIT ?`, [q, q, limit + 25]);
-    return rows.filter((r) => !this._denylist.has((r.email || "").toLowerCase())).slice(0, limit);
+    return rows.filter((r) => !this.isDenylisted((r.email || "").toLowerCase())).slice(0, limit);
   }
   /** Address-book listing. Same shape as mailx-store/db.ts:listContacts so
    *  the address-book modal renders identically on desktop and Android. */
@@ -5732,7 +5772,7 @@ function decodeBody(body, encoding, charset = "utf-8") {
     return new TextDecoder("utf-8").decode(bytes);
   }
 }
-var WebMailxService = class {
+var WebMailxService = class _WebMailxService {
   db;
   bodyStore;
   syncManager;
@@ -6130,8 +6170,30 @@ ${bodyEncoded}`;
     query = (query || "").trim();
     if (query.length < 1)
       return [];
+    void this.maybeRefreshContactsConfig().catch(() => {
+    });
     return this.db.searchContacts(query);
   }
+  /** Re-pull contacts.jsonc only when the Drive copy actually changed.
+   *  One metadata request (cloudStat) throttled to a few minutes; the
+   *  full download + reload runs only on a new modifiedTime. Kicked from
+   *  autocomplete, the periodic sync tick, and app-resume. */
+  _contactsStatAt = 0;
+  _contactsModifiedTime = null;
+  static CONTACTS_STAT_MS = 3 * 60 * 1e3;
+  async maybeRefreshContactsConfig() {
+    const now = Date.now();
+    if (now - this._contactsStatAt < _WebMailxService.CONTACTS_STAT_MS)
+      return;
+    this._contactsStatAt = now;
+    const { cloudStat: cloudStat2 } = await Promise.resolve().then(() => (init_web_settings(), web_settings_exports));
+    const stat = await cloudStat2("contacts.jsonc");
+    if (!stat || stat.modifiedTime === this._contactsModifiedTime)
+      return;
+    this._contactsModifiedTime = stat.modifiedTime;
+    console.log(`[contacts] contacts.jsonc changed on Drive (${stat.modifiedTime}) \u2014 reloading`);
+    await this.loadContactsConfig();
+  }
   /** Address-book listing — paginated, filterable. Mirrors mailx-service's
    *  signature so the same client-side address-book modal works on Android
    *  without an "ipc(...).listContacts is not a function" crash. */
@@ -6394,8 +6456,13 @@ ${bodyEncoded}`;
    *  local contacts table. Desktop flushes the full union there (everything
    *  it discovered from its mailbox corpus + Google contacts + preferred);
    *  this is how an Android device gets contacts it never saw in its own
-   *  (partial) on-device corpus. Called once at startup — re-importing on a
-   *  loop would bump `use_count` every pass and distort autocomplete rank. */
+   *  (partial) on-device corpus. Called at startup AND on a periodic tick /
+   *  app-resume / after a ⊘ so a denylist edit made on another device
+   *  reaches a running phone (Bob 2026-07-07: GDrive edit was still being
+   *  offered). The denylist refresh runs every call; the contact IMPORT
+   *  runs once per session — recordSentAddress bumps `use_count`, so
+   *  re-importing on every reload would inflate autocomplete rank. */
+  _contactsImported = false;
   async loadContactsConfig() {
     try {
       const { cloudRead: cloudRead2 } = await Promise.resolve().then(() => (init_web_settings(), web_settings_exports));
@@ -6406,6 +6473,10 @@ ${bodyEncoded}`;
       if (!cfg)
         return null;
       this.db.setContactsDenylist(Array.isArray(cfg.denylist) ? cfg.denylist : []);
+      this.db.setContactsDenyPatterns(Array.isArray(cfg.denylistPatterns) ? cfg.denylistPatterns : []);
+      if (this._contactsImported)
+        return { imported: 0 };
+      this._contactsImported = true;
       let imported = 0;
       for (const list of [cfg.preferred, cfg.discovered]) {
         if (!Array.isArray(list))
@@ -10995,6 +11066,7 @@ async function initAndroid() {
       syncManager.processSyncActions(account.id).catch((e) => console.error(`[android] processSyncActions ${account.id}: ${e.message}`));
     }
     syncManager.syncAll().catch((e) => console.error(`[android] Periodic sync error: ${e.message}`));
+    service.maybeRefreshContactsConfig().catch((e) => console.error(`[android] contacts.jsonc freshness check: ${e?.message || e}`));
     if (++contactsSyncTickCounter % 8 === 0) {
       for (const account of db.getAccounts()) {
         if (!account.email || !isGoogleAccount(account)) continue;
@@ -11010,6 +11082,7 @@ async function initAndroid() {
         syncManager.processSendQueue(account.id).catch((e) => console.error(`[android] resume send-drain ${account.id}: ${e.message}`));
       }
       syncManager.syncAll().catch((e) => console.error(`[android] Resume sync error: ${e.message}`));
+      service.maybeRefreshContactsConfig().catch((e) => console.error(`[android] resume contacts.jsonc check: ${e?.message || e}`));
     }
   });
   console.log("[android] Initialization complete");
@@ -11103,6 +11176,22 @@ function installBridge() {
     deleteContact: (email) => service.deleteContact(email),
     addContact: (name, email) => service.addContact(name || "", email),
     hasCcHistoryTo: (email) => ({ hasCc: service.hasCcHistoryTo?.(email) ?? false }),
+    hasBccHistoryTo: (email) => ({ hasBcc: service.hasBccHistoryTo?.(email) ?? false }),
+    // ⊘ / ★ in compose autocomplete. The service has implemented these
+    // since the contacts-config share (web-service.ts), but they were
+    // never exposed here, so the compose iframe's IPC relay failed with
+    // `parent bridge has no method "addToDenylist"` (Bob 2026-07-07
+    // screenshot). Signatures mirror client/lib/mailxapi.js — positional
+    // args in, object built here.
+    addPreferredContact: async (name, email, source, organization) => {
+      await service.addPreferredContact({ name, email, source, organization });
+      return { ok: true };
+    },
+    addToDenylist: async (email) => {
+      await service.addToDenylist(email);
+      return { ok: true };
+    },
+    loadContactsConfig: () => service.loadContactsConfig(),
     syncAll: async () => {
       await service.syncAll();
       return { ok: true };