selfstore 1.0.0 → 1.1.0

package/dist/{chunk-N4RPMX3Y.js → chunk-XI3MGK4M.js}

@@ -1,8 +1,8 @@
-import { createNode, createMeta, gcTombstones, stamp, merge, unsyncableCounts, idPathFor, detectConflicts, changes } from './chunk-IBIEKK36.js';
-import { inspect, checkPasswordPolicy, writeBox, BACKUP_MIME, readBoxWithSync, asBytes } from './chunk-JB4JHM7V.js';
-import { openManifest, GROUP_KEYING } from './chunk-OWLX6PNT.js';
+import { createNode, createMeta, gcTombstones, stamp, merge, unsyncableCounts, idPathFor, detectConflicts, changes } from './chunk-SKWHKM25.js';
+import { inspect, checkPasswordPolicy, writeBox, BACKUP_MIME, readBoxWithSync, asBytes } from './chunk-SRKUHFRG.js';
+import { openManifest, GROUP_KEYING } from './chunk-KHER6MWR.js';
 import { seal, isEnvelope, unseal, newDeviceKey } from './chunk-QBCU7OOP.js';
-import { mintSlot, MAX_KEY_SLOTS, mintExternalSlot, openSlot } from './chunk-FDPAKHQS.js';
+import { mintSlot, MAX_KEY_SLOTS, mintExternalSlot, openSlot } from './chunk-6746AL4I.js';
 import { SelfstoreError, isAuthExpired, errorLabelKey, isSelfstoreError } from './chunk-VBFMMR7Q.js';
 import { openDB } from 'idb';
 
@@ -86,9 +86,40 @@ var KEY = {
   groupSeqIds: "groupSeqIds"
 };
 var JOURNAL_MAX = 20;
+var BOOT_NET_MS = 25e3;
+var BootTimeout = class extends Error {
+  constructor(what) {
+    super(`${what} timed out at boot`);
+    this.name = "BootTimeout";
+  }
+};
+function bootDeadline(work, what, ms = BOOT_NET_MS) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new BootTimeout(what)), ms);
+    work.then(
+      (v) => {
+        clearTimeout(timer);
+        resolve(v);
+      },
+      (e) => {
+        clearTimeout(timer);
+        reject(e instanceof Error ? e : new Error(String(e)));
+      }
+    );
+  });
+}
 var STALE_CHECK_MS = 2e4;
 function createLocalStore(opts) {
-  const { app, schemaVersion: version, appVersion, gather, apply, cache, readme, debounceMs = 800 } = opts;
+  const {
+    app,
+    schemaVersion: version,
+    appVersion,
+    gather,
+    apply,
+    cache,
+    readme,
+    debounceMs = 800
+  } = opts;
   const logger = opts.logger ?? console;
   const requireEncryption = opts.requireEncryption ?? false;
   const passwordPolicy = opts.passwordPolicy;
@@ -96,7 +127,10 @@ function createLocalStore(opts) {
     if (!passwordPolicy) return;
     const { ok, unmet } = checkPasswordPolicy(pw, passwordPolicy);
     if (!ok) {
-      throw new SelfstoreError("WEAK_PASSWORD", `Password does not meet the policy: ${unmet.join(", ")}.`);
+      throw new SelfstoreError(
+        "WEAK_PASSWORD",
+        `Password does not meet the policy: ${unmet.join(", ")}.`
+      );
     }
   }
   const journalSilent = new Set(opts.journalSilent ?? []);
@@ -446,7 +480,7 @@ function createLocalStore(opts) {
     }
   }
   async function requireReady(where) {
-    let ok = false;
+    let ok;
     try {
       ok = await durable.isReady();
     } catch (e) {
@@ -469,7 +503,10 @@ function createLocalStore(opts) {
   }
   function redactForStorage(entries) {
     return entries.map(
-      (e) => e.conflicts ? { ...e, conflicts: e.conflicts.map(({ collection, id, kept }) => ({ collection, id, kept })) } : e
+      (e) => e.conflicts ? {
+        ...e,
+        conflicts: e.conflicts.map(({ collection, id, kept }) => ({ collection, id, kept }))
+      } : e
     );
   }
   function recordJournal(delta, source, conflicts = []) {
@@ -716,7 +753,12 @@ function createLocalStore(opts) {
           );
           continue;
         }
-        const { snapshot, sidecar, author, envelope: peerEnv } = await readBoxWithSync(
+        const {
+          snapshot,
+          sidecar,
+          author,
+          envelope: peerEnv
+        } = await readBoxWithSync(
           await asBytes(remote),
           p.password ?? pass ?? void 0,
           peerGroupRead(),
@@ -824,7 +866,9 @@ function createLocalStore(opts) {
     }
     await cache.requestPersistent?.();
   }
-  async function dropDurable({ keepSession = false } = {}) {
+  async function dropDurable({
+    keepSession = false
+  } = {}) {
     if (durable && !keepSession) await durable.disconnect();
     durable = null;
     label = null;
@@ -947,7 +991,10 @@ function createLocalStore(opts) {
         let t = null;
         let restoreThrew = false;
         try {
-          t = opts.restoreTarget ? await opts.restoreTarget(savedKind) : null;
+          t = opts.restoreTarget ? await bootDeadline(
+            Promise.resolve(opts.restoreTarget(savedKind)),
+            "destination restore"
+          ) : null;
         } catch (e) {
           restoreThrew = true;
           lastError = transient("Could not restore the destination; will retry.");
@@ -959,14 +1006,19 @@ function createLocalStore(opts) {
           label = t.label;
           let ok = false;
           try {
-            ok = await t.isReady();
-          } catch {
-            raiseGate("AUTH_EXPIRED", "Access to the destination expired or was revoked.");
+            ok = await bootDeadline(t.isReady(), "destination check");
+          } catch (e) {
+            if (e instanceof BootTimeout) {
+              lastError = transient("Destination is slow to answer; will retry.");
+              logger.error("[selfstore] boot destination check stalled", e);
+            } else {
+              raiseGate("AUTH_EXPIRED", "Access to the destination expired or was revoked.");
+            }
           }
           needsAttention = needsAttention || locked();
           if (ok && !locked()) {
             try {
-              await pull("boot");
+              await bootDeadline(pull("boot"), "boot sync");
             } catch (e) {
               lastError = transient("Boot sync failed; will retry.");
               logger.error("[selfstore] boot sync failed", e);
@@ -982,7 +1034,7 @@ function createLocalStore(opts) {
       }
       if (!durable && peerList.length > 0) {
         try {
-          await pull("boot");
+          await bootDeadline(pull("boot"), "boot sync");
         } catch (e) {
           lastError = transient("Boot sync failed; will retry.");
           logger.error("[selfstore] boot sync failed", e);
@@ -1115,7 +1167,7 @@ function createLocalStore(opts) {
     async inspectTarget(target) {
       const blob = await target.load();
       if (!blob || blob.size === 0) return { hasBackup: false, date: null, encrypted: false };
-      let marker = null;
+      let marker;
       try {
         marker = target.stat ? await target.stat() : null;
       } catch {
@@ -1158,6 +1210,7 @@ function createLocalStore(opts) {
       return false;
     },
     detachTarget(opts2) {
+      durable?.abortInFlight?.();
       return serialize(async () => {
         await dropDurable({ keepSession: opts2?.keepSession });
         targetKind = "device";
@@ -1252,7 +1305,13 @@ function createLocalStore(opts) {
       if (replicaList.some((r) => r.id === id)) {
         throw new TypeError(`attachReplica(): a replica with id "${id}" is already attached`);
       }
-      replicaList.push({ id, target, label: target.label ?? id, lastPublishAt: null, lastError: null });
+      replicaList.push({
+        id,
+        target,
+        label: target.label ?? id,
+        lastPublishAt: null,
+        lastError: null
+      });
       notify();
       if (ready) {
         void serialize(publishReplicas).catch(
@@ -1359,7 +1418,10 @@ function createLocalStore(opts) {
       }
       assertPasswordPolicy(password);
       if (!durable) {
-        throw new SelfstoreError("NOT_CONNECTED", "addEncryptionKey(): no destination is connected.");
+        throw new SelfstoreError(
+          "NOT_CONNECTED",
+          "addEncryptionKey(): no destination is connected."
+        );
       }
       if (locked() || needsAttention) {
         throw new SelfstoreError(
@@ -1389,7 +1451,9 @@ function createLocalStore(opts) {
           envelope = { dataKey, slots: [await mintSlot(pass, dataKey)] };
         }
         if (envelope.slots.length >= MAX_KEY_SLOTS) {
-          throw new TypeError(`addEncryptionKey(): this backup already has ${MAX_KEY_SLOTS} key slots.`);
+          throw new TypeError(
+            `addEncryptionKey(): this backup already has ${MAX_KEY_SLOTS} key slots.`
+          );
         }
         if (id && envelope.slots.some((s) => s.id === id)) {
           throw new TypeError(`addEncryptionKey(): a key slot named "${id}" already exists.`);
@@ -1422,7 +1486,10 @@ function createLocalStore(opts) {
         );
       }
       if (!durable) {
-        throw new SelfstoreError("NOT_CONNECTED", "removeEncryptionKey(): no destination is connected.");
+        throw new SelfstoreError(
+          "NOT_CONNECTED",
+          "removeEncryptionKey(): no destination is connected."
+        );
       }
       if (locked() || needsAttention) {
         throw new SelfstoreError(
@@ -1499,7 +1566,10 @@ function createLocalStore(opts) {
         );
       }
       if (!durable) {
-        throw new SelfstoreError("NOT_CONNECTED", "setExternalEncryption(): no destination is connected.");
+        throw new SelfstoreError(
+          "NOT_CONNECTED",
+          "setExternalEncryption(): no destination is connected."
+        );
       }
       if (locked() || needsAttention) {
         throw new SelfstoreError(
@@ -1532,7 +1602,13 @@ function createLocalStore(opts) {
           await persistLocal();
           pendingEdit = false;
           const blob = await buildBlob();
-          await readBoxWithSync(await asBytes(blob), void 0, void 0, void 0, async () => secret);
+          await readBoxWithSync(
+            await asBytes(blob),
+            void 0,
+            void 0,
+            void 0,
+            async () => secret
+          );
           const written = await durable.save(blob);
           await setRemoteVersion(typeof written === "string" ? written : await statRemote());
           lastError = null;
@@ -1592,7 +1668,9 @@ function createLocalStore(opts) {
           throw new TypeError("addExternalKey(): no data key in hand - unlock the backup first.");
         }
         if (envelope.slots.length >= MAX_KEY_SLOTS) {
-          throw new TypeError(`addExternalKey(): this backup already has ${MAX_KEY_SLOTS} key slots.`);
+          throw new TypeError(
+            `addExternalKey(): this backup already has ${MAX_KEY_SLOTS} key slots.`
+          );
         }
         if (id && envelope.slots.some((s) => s.id === id)) {
           throw new TypeError(`addExternalKey(): a key slot named "${id}" already exists.`);
@@ -1602,7 +1680,13 @@ function createLocalStore(opts) {
         envelope = { dataKey: envelope.dataKey, slots: [...envelope.slots, slot] };
         try {
           const blob = await buildBlob();
-          await readBoxWithSync(await asBytes(blob), void 0, void 0, void 0, async () => secret);
+          await readBoxWithSync(
+            await asBytes(blob),
+            void 0,
+            void 0,
+            void 0,
+            async () => secret
+          );
           const written = await durable.save(blob);
           await setRemoteVersion(typeof written === "string" ? written : await statRemote());
           lastError = null;
@@ -1697,7 +1781,10 @@ function indexedDbCache(name, opts) {
   function key() {
     if (lockMode) {
       return sealKey ? Promise.resolve(sealKey) : Promise.reject(
-        new SelfstoreError("PASSWORD_REQUIRED", "The local cache is locked - unlock() it first.")
+        new SelfstoreError(
+          "PASSWORD_REQUIRED",
+          "The local cache is locked - unlock() it first."
+        )
       );
     }
     return _key ??= loadOrCreateKey();
@@ -1737,7 +1824,10 @@ function indexedDbCache(name, opts) {
       const rawCollections = await d.get("kv", COLLECTIONS_KEY);
       if (rawCollections === void 0) return null;
       if (!isEnvelope(rawCollections)) {
-        throw new SelfstoreError("BAD_FORMAT", "Unrecognized cache record (not a sealed envelope).");
+        throw new SelfstoreError(
+          "BAD_FORMAT",
+          "Unrecognized cache record (not a sealed envelope)."
+        );
       }
       const collections = JSON.parse(
         new TextDecoder().decode(await unseal(await key(), rawCollections))
@@ -1797,7 +1887,7 @@ function indexedDbCache(name, opts) {
       sealKey = null;
     },
     async unlock(secret) {
-      const { keyFromPassword, freshCacheKdf, opens } = await import('./cache-lock-LZILZNLP.js');
+      const { keyFromPassword, freshCacheKdf, opens } = await import('./cache-lock-NXIR6JRB.js');
       const d = await db();
       let candidate;
       if (typeof secret === "string") {
@@ -1904,5 +1994,5 @@ function gisDriveAuth(opts) {
 }
 
 export { RESERVED_STORE_MODES, createLocalStore, deriveStatus, gisDriveAuth, indexedDbCache, isLockableCache, isReservedStoreMode, memoryCache };
-//# sourceMappingURL=chunk-N4RPMX3Y.js.map
-//# sourceMappingURL=chunk-N4RPMX3Y.js.map
+//# sourceMappingURL=chunk-XI3MGK4M.js.map
+//# sourceMappingURL=chunk-XI3MGK4M.js.map