selfstore 1.8.28 → 1.8.29

package/dist/advanced.js

@@ -1,6 +1,6 @@
 import { peer, fromSession as fromSession$3, connect as connect$3 } from './chunk-GHSHIDF3.js';
 import { fromSession as fromSession$2, connect as connect$2 } from './chunk-IDW3WQKF.js';
-export { RESERVED_STORE_MODES, createLocalStore, deriveStatus, gisDriveAuth, indexedDbCache, isLockableCache, isReservedStoreMode, memoryCache, preloadGoogleIdentity } from './chunk-GM47BISW.js';
+export { RESERVED_STORE_MODES, createLocalStore, deriveStatus, gisDriveAuth, indexedDbCache, isLockableCache, isReservedStoreMode, memoryCache, preloadGoogleIdentity } from './chunk-OCWNUAXV.js';
 import './chunk-GSZSZGSD.js';
 export { datedName, pickFromDisk, saveToDisk } from './chunk-Q3NO477P.js';
 import './chunk-FJGWTBAL.js';

package/dist/{chunk-GM47BISW.js → chunk-OCWNUAXV.js}

@@ -553,6 +553,33 @@ function createLocalStore(opts) {
       return null;
     }
   }
+  async function statBeforeOverwrite() {
+    return durable?.stat ? durable.stat() : null;
+  }
+  async function flushBeforeLeaving() {
+    try {
+      await persistLocal();
+    } catch (e) {
+      logger.warn("[selfstore] local save before a switch failed", e);
+    }
+    if (await pushDurable("push")) return;
+    if (await contentDigest(await gather()) === lastSavedContentHash) return;
+    throw new SelfstoreError(
+      "TARGET_WRITE_FAILED",
+      "attachTarget(): an edit not yet saved to the current destination could not reach it; try again online before switching."
+    );
+  }
+  async function settleRewrite(written, ...followUps) {
+    lastError = null;
+    try {
+      await setRemoteVersion(typeof written === "string" ? written : await statRemote());
+      for (const followUp of followUps) await followUp();
+    } catch (e) {
+      logger.error("[selfstore] bookkeeping after a key rewrite failed; the new key is kept", e);
+    }
+    await publishReplicas();
+    notify();
+  }
   async function requireReady(where) {
     let ok;
     try {
@@ -572,7 +599,18 @@ function createLocalStore(opts) {
   }
   async function convergeBeforeRewrite(where) {
     await requireReady(where);
-    const seen = await statRemote();
+    let seen;
+    try {
+      seen = await statBeforeOverwrite();
+    } catch (e) {
+      if (isAuthExpired(e)) {
+        raiseGate("AUTH_EXPIRED", "Access to the destination expired or was revoked.");
+      }
+      throw new SelfstoreError(
+        "TARGET_WRITE_FAILED",
+        `${where}(): cannot tell whether the destination moved; try again online.`
+      );
+    }
     if (seen === null || remoteVersion === null || seen === remoteVersion) return;
     const pulled = await pullRemoteIntoLocal("push", seen);
     if (locked() || needsAttention) {
@@ -620,7 +658,7 @@ function createLocalStore(opts) {
         lastError = transient("Save deferred: destination momentarily unreachable.");
         return false;
       }
-      const seen = await statRemote();
+      const seen = await statBeforeOverwrite();
       if (seen !== null && remoteVersion !== null && seen !== remoteVersion) {
         const pulled = await pullRemoteIntoLocal(source, seen);
         if (locked() || needsAttention) return false;
@@ -1236,11 +1274,7 @@ function createLocalStore(opts) {
         await becomePersistent();
         const strategy = attachOpts?.strategy ?? "merge";
         if (strategy === "replace-local" && durable && !locked() && !needsAttention) {
-          try {
-            await persistLocal();
-            await pushDurable("push");
-          } catch {
-          }
+          await flushBeforeLeaving();
         }
         if (g) {
           const stored = await kv.get(groupSeqKey(g.manifest.group));
@@ -1500,13 +1534,11 @@ function createLocalStore(opts) {
         encrypted = !!password;
         setPass(password || null);
         envelope = null;
+        let written;
         try {
           await persistLocal();
           pendingEdit = false;
-          const written = await durable.save(await buildBlob());
-          await setRemoteVersion(typeof written === "string" ? written : await statRemote());
-          lastError = null;
-          await kv.set(KEY.enc, encrypted);
+          written = await durable.save(await buildBlob());
         } catch (e) {
           encrypted = prevEncrypted;
           setPass(prevPass);
@@ -1515,10 +1547,10 @@ function createLocalStore(opts) {
           if (isAuthExpired(e)) {
             raiseGate("AUTH_EXPIRED", "Access to the destination expired or was revoked.");
           }
-          throw e;
-        } finally {
           notify();
+          throw e;
         }
+        await settleRewrite(written, () => kv.set(KEY.enc, encrypted));
       });
     },
     async addEncryptionKey(password, id) {
@@ -1565,22 +1597,21 @@ function createLocalStore(opts) {
         const prevEnvelope = envelope;
         const slot = await mintSlot(password, envelope.dataKey, id);
         envelope = { dataKey: envelope.dataKey, slots: [...envelope.slots, slot] };
+        let written;
         try {
           const blob = await buildBlob();
           await readBoxWithSync(await asBytes(blob), password);
-          const written = await durable.save(blob);
-          await setRemoteVersion(typeof written === "string" ? written : await statRemote());
-          lastError = null;
-          return slot.id;
+          written = await durable.save(blob);
         } catch (e) {
           envelope = prevEnvelope;
           if (isAuthExpired(e)) {
             raiseGate("AUTH_EXPIRED", "Access to the destination expired or was revoked.");
           }
-          throw e;
-        } finally {
           notify();
+          throw e;
         }
+        await settleRewrite(written);
+        return slot.id;
       });
     },
     async removeEncryptionKey(id) {
@@ -1636,21 +1667,20 @@ function createLocalStore(opts) {
         }
         const prevEnvelope = envelope;
         envelope = { dataKey: envelope.dataKey, slots: remaining };
+        let written;
         try {
           const blob = await buildBlob();
           await readBoxWithSync(await asBytes(blob), pass);
-          const written = await durable.save(blob);
-          await setRemoteVersion(typeof written === "string" ? written : await statRemote());
-          lastError = null;
+          written = await durable.save(blob);
         } catch (e) {
           envelope = prevEnvelope;
           if (isAuthExpired(e)) {
             raiseGate("AUTH_EXPIRED", "Access to the destination expired or was revoked.");
           }
-          throw e;
-        } finally {
           notify();
+          throw e;
         }
+        await settleRewrite(written);
       });
     },
     async setExternalEncryption(secret, keyRef) {
@@ -1682,6 +1712,7 @@ function createLocalStore(opts) {
         pass = null;
         envelope = { dataKey, slots: [slot] };
         armIdleLock();
+        let written;
         try {
           await persistLocal();
           pendingEdit = false;
@@ -1693,10 +1724,7 @@ function createLocalStore(opts) {
             void 0,
             async () => secret
           );
-          const written = await durable.save(blob);
-          await setRemoteVersion(typeof written === "string" ? written : await statRemote());
-          lastError = null;
-          await kv.set(KEY.enc, true);
+          written = await durable.save(blob);
         } catch (e) {
           encrypted = prevEncrypted;
           pass = prevPass;
@@ -1706,10 +1734,10 @@ function createLocalStore(opts) {
           if (isAuthExpired(e)) {
             raiseGate("AUTH_EXPIRED", "Access to the destination expired or was revoked.");
           }
-          throw e;
-        } finally {
           notify();
+          throw e;
         }
+        await settleRewrite(written, () => kv.set(KEY.enc, true));
       });
     },
     async addExternalKey(secret, keyRef, id) {
@@ -1752,6 +1780,7 @@ function createLocalStore(opts) {
         const prevEnvelope = envelope;
         const slot = await mintExternalSlot(secret, keyRef, envelope.dataKey, id);
         envelope = { dataKey: envelope.dataKey, slots: [...envelope.slots, slot] };
+        let written;
         try {
           const blob = await buildBlob();
           await readBoxWithSync(
@@ -1761,19 +1790,17 @@ function createLocalStore(opts) {
             void 0,
             async () => secret
           );
-          const written = await durable.save(blob);
-          await setRemoteVersion(typeof written === "string" ? written : await statRemote());
-          lastError = null;
-          return slot.id;
+          written = await durable.save(blob);
         } catch (e) {
           envelope = prevEnvelope;
           if (isAuthExpired(e)) {
             raiseGate("AUTH_EXPIRED", "Access to the destination expired or was revoked.");
           }
-          throw e;
-        } finally {
           notify();
+          throw e;
         }
+        await settleRewrite(written);
+        return slot.id;
       });
     },
     async unlockWithExternal(secret) {
@@ -2150,5 +2177,5 @@ function gisDriveAuth(opts) {
 }
 
 export { RESERVED_STORE_MODES, createLocalStore, deriveStatus, gisDriveAuth, indexedDbCache, isLockableCache, isReservedStoreMode, memoryCache, preloadGoogleIdentity };
-//# sourceMappingURL=chunk-GM47BISW.js.map
-//# sourceMappingURL=chunk-GM47BISW.js.map
+//# sourceMappingURL=chunk-OCWNUAXV.js.map
+//# sourceMappingURL=chunk-OCWNUAXV.js.map