@bobfrankston/rmfmail 1.2.206 → 1.2.208

package/client/android-bootstrap.bundle.js

@@ -2668,6 +2668,7 @@ __export(web_settings_exports, {
   loadDeviceState: () => loadDeviceState,
   loadPreferences: () => loadPreferences,
   loadSettings: () => loadSettings,
+  primeSharedConfigs: () => primeSharedConfigs,
   saveAccounts: () => saveAccounts,
   saveAllowlist: () => saveAllowlist,
   saveAutocomplete: () => saveAutocomplete,
@@ -2940,21 +2941,36 @@ async function stashPrevIdb(filename, aboutToBecome) {
   } catch {
   }
 }
-function refreshSharedFile(filename, cached) {
+async function pullSharedFile(filename, force) {
   const now = Date.now();
-  if (now - (__lastSharedRefresh.get(filename) || 0) < SHARED_REFRESH_MS)
-    return;
+  if (!force && now - (__lastSharedRefresh.get(filename) || 0) < SHARED_REFRESH_MS)
+    return false;
   __lastSharedRefresh.set(filename, now);
-  void (async () => {
+  try {
+    const fresh = await gDriveRead(filename);
+    if (!fresh)
+      return false;
+    const cached = await idbRead(filename);
+    if (fresh === cached)
+      return false;
+    await idbWrite(filename, fresh);
+    console.log(`[settings] ${filename} refreshed from GDrive (shared copy changed)`);
+    return true;
+  } catch {
+  }
+  return false;
+}
+function refreshSharedFile(filename, _cached) {
+  void pullSharedFile(filename, false);
+}
+async function primeSharedConfigs(force = true) {
+  for (const f of SHARED_FILES) {
     try {
-      const fresh = await gDriveRead(filename);
-      if (fresh && fresh !== cached) {
-        await idbWrite(filename, fresh);
-        console.log(`[settings] ${filename} refreshed from GDrive (shared copy changed)`);
-      }
-    } catch {
+      await pullSharedFile(f, force);
+    } catch (e) {
+      console.warn(`[settings] prime ${f}: ${e?.message || e}`);
     }
-  })();
+  }
 }
 async function loadAccounts() {
   const cached = await idbRead("accounts.jsonc");
@@ -3180,7 +3196,7 @@ async function loadDeviceState() {
   }
   return {};
 }
-var IDB_NAME2, IDB_VERSION, STORE_NAME2, gDriveFolderId, gDriveFolderName, gDriveFolderPath, gDriveFolderOwner, tokenProvider, PROVIDERS, DEFAULT_PREFERENCES, DEFAULT_ALLOWLIST, PREV_KEEP, SHARED_REFRESH_MS, __lastSharedRefresh, ALLOWLIST_KEYS, DEVICE_ID_KEY;
+var IDB_NAME2, IDB_VERSION, STORE_NAME2, gDriveFolderId, gDriveFolderName, gDriveFolderPath, gDriveFolderOwner, tokenProvider, PROVIDERS, DEFAULT_PREFERENCES, DEFAULT_ALLOWLIST, PREV_KEEP, SHARED_REFRESH_MS, SHARED_FILES, __lastSharedRefresh, ALLOWLIST_KEYS, DEVICE_ID_KEY;
 var init_web_settings = __esm({
   "packages/mailx-store-web/web-settings.js"() {
     "use strict";
@@ -3257,6 +3273,7 @@ var init_web_settings = __esm({
     };
     PREV_KEEP = 5;
     SHARED_REFRESH_MS = 5 * 6e4;
+    SHARED_FILES = ["allowlist.jsonc", "preferences.jsonc"];
     __lastSharedRefresh = /* @__PURE__ */ new Map();
     ALLOWLIST_KEYS = ["senders", "domains", "recipients", "flaggedSenders", "flaggedDomains"];
     DEVICE_ID_KEY = "mailx-device-id";
@@ -11401,6 +11418,7 @@ async function initAndroidOnce() {
           } catch (e) {
             console.warn(`[android] List debug: ${e.message}`);
           }
+          primeSharedConfigs().catch((e) => console.warn(`[android] prime shared configs: ${e?.message || e}`));
           narrate("Loading accounts from Google Drive\u2026");
           const gdriveAccounts = await loadAccountsFromCloud();
           console.log(`[android] GDrive returned ${gdriveAccounts.length} accounts: ${gdriveAccounts.map((a) => a.id).join(",")}`);
@@ -11475,6 +11493,7 @@ async function initAndroidOnce() {
       }
       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}`));
+      primeSharedConfigs(false).catch((e) => console.error(`[android] resume shared config check: ${e?.message || e}`));
     }
   });
   console.log("[android] Initialization complete");