selfstore 1.8.28 → 1.8.30

package/dist/advanced.d.ts

@@ -1,12 +1,12 @@
-import { B as BackupTarget } from './store-CKGrIFQU.js';
-export { A as AuthExpiredError, f as BuiltinTargetKind, E as EncodeOptions, H as Header, K as KdfParams, L as LocalStore, g as LocalStoreOptions, e as LocalStoreState, M as MirrorState, h as Mode, i as PasswordCheck, b as PasswordPolicy, j as PasswordRequirement, P as PeerSource, k as PeerState, R as RESERVED_COLLECTION_PREFIX, l as RESERVED_STORE_MODES, m as RecipientStanza, n as ReplicaState, o as SelfstoreError, p as SelfstoreErrorCode, q as Severity, a as Snapshot, c as SnapshotFile, r as StatusAction, d as StatusDescriptor, s as StatusInput, t as StorageState, S as StoreError, u as StoreGroupConfig, v as SyncJournalEntry, w as SyncSource, T as TargetKind, x as checkPasswordPolicy, y as createLocalStore, z as deriveStatus, C as errorLabelKey, D as isAuthExpired, F as isReservedStoreMode, G as isSelfstoreError } from './store-CKGrIFQU.js';
+import { B as BackupTarget } from './store-CZOqxDj5.js';
+export { A as AuthExpiredError, f as BuiltinTargetKind, E as EncodeOptions, H as Header, K as KdfParams, L as LocalStore, g as LocalStoreOptions, e as LocalStoreState, M as MirrorState, h as Mode, i as PasswordCheck, b as PasswordPolicy, j as PasswordRequirement, P as PeerSource, k as PeerState, R as RESERVED_COLLECTION_PREFIX, l as RESERVED_STORE_MODES, m as RecipientStanza, n as ReplicaState, o as SelfstoreError, p as SelfstoreErrorCode, q as Severity, a as Snapshot, c as SnapshotFile, r as StatusAction, d as StatusDescriptor, s as StatusInput, t as StorageState, S as StoreError, u as StoreGroupConfig, v as SyncJournalEntry, w as SyncSource, T as TargetKind, x as checkPasswordPolicy, y as createLocalStore, z as deriveStatus, C as errorLabelKey, D as isAuthExpired, F as isReservedStoreMode, G as isSelfstoreError } from './store-CZOqxDj5.js';
 import { K as KV } from './cache-ilsK3Tki.js';
 export { C as CachedFile, L as LocalCache, e as LockableCache, i as indexedDbCache, f as isLockableCache, m as memoryCache } from './cache-ilsK3Tki.js';
-export { G as GisDriveAuthOptions, a as GisTokenPersistence, d as datedName, e as exportSnapshot, g as gisDriveAuth, i as importSnapshot, b as inspect, c as isEncrypted, p as pickFromDisk, f as preloadGoogleIdentity, s as saveToDisk } from './local-ClXq1N2M.js';
-import { c as connect$2, f as fromSession$2, a as connect$3, b as fromSession$3, p as peer } from './s3-dG1SCnV1.js';
-export { S as S3Config, d as S3ConnectOptions, W as WebdavConfig, e as WebdavConnectOptions, g as WebdavPeerOptions } from './s3-dG1SCnV1.js';
-import { c as connect$1, f as fromSession$1, p as preview, b as adopt, d as findOrCreateOwnFile, l as listBackups, e as createBackup, g as deleteBackup, r as renameBackup, h as account, i as createCompanion, s as share, u as unshare, o as owner, j as secondary } from './drive--mndByvF.js';
-export { k as DriveAccount, a as DriveAuth, m as DriveBackupInfo, D as DriveOptions } from './drive--mndByvF.js';
+export { G as GisDriveAuthOptions, a as GisTokenPersistence, d as datedName, e as exportSnapshot, g as gisDriveAuth, i as importSnapshot, b as inspect, c as isEncrypted, p as pickFromDisk, f as preloadGoogleIdentity, s as saveToDisk } from './local-CGYx16zM.js';
+import { c as connect$2, f as fromSession$2, a as connect$3, b as fromSession$3, p as peer } from './s3-iiFYjype.js';
+export { S as S3Config, d as S3ConnectOptions, W as WebdavConfig, e as WebdavConnectOptions, g as WebdavPeerOptions } from './s3-iiFYjype.js';
+import { c as connect$1, f as fromSession$1, p as preview, b as adopt, d as findOrCreateOwnFile, l as listBackups, e as createBackup, g as deleteBackup, r as renameBackup, h as account, i as createCompanion, s as share, u as unshare, o as owner, j as secondary } from './drive-DvnzpjLM.js';
+export { k as DriveAccount, a as DriveAuth, m as DriveBackupInfo, D as DriveOptions } from './drive-DvnzpjLM.js';
 import './sync.js';
 
 /**

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-TB3CKC6Z.js';
 import './chunk-GSZSZGSD.js';
 export { datedName, pickFromDisk, saveToDisk } from './chunk-Q3NO477P.js';
 import './chunk-FJGWTBAL.js';

package/dist/backups.d.ts

@@ -1,8 +1,8 @@
-import { B as BackupsHost } from './manager-yCM0M0FL.js';
-export { a as BackupFileInfo, b as BackupOwner, c as BackupRow, d as BackupsErrorCode, e as BackupsKeys, f as BackupsManager, g as BackupsNaming, h as BackupsSnapshot, K as KnownBackups, i as createBackupsManager } from './manager-yCM0M0FL.js';
-import { D as DriveOptions } from './drive--mndByvF.js';
+import { B as BackupsHost } from './manager-B-gb3lIn.js';
+export { a as BackupFileInfo, b as BackupOwner, c as BackupRow, d as BackupsErrorCode, e as BackupsKeys, f as BackupsManager, g as BackupsNaming, h as BackupsSnapshot, K as KnownBackups, i as createBackupsManager } from './manager-B-gb3lIn.js';
+import { D as DriveOptions } from './drive-DvnzpjLM.js';
 import './cache-ilsK3Tki.js';
-import './store-CKGrIFQU.js';
+import './store-CZOqxDj5.js';
 import './sync.js';
 import './machine-ALMkT3mk.js';
 

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

@@ -46,6 +46,14 @@ function deriveStatus(input) {
       labelKey: "status.pendingDownload"
     };
   }
+  if (isDurableKind(input.targetKind) && input.unsent) {
+    return {
+      state: "cache-only",
+      severity: "warn",
+      actionable: false,
+      labelKey: "status.unsent"
+    };
+  }
   if (input.targetKind === "device") {
     if (input.copy?.at) {
       return {
@@ -192,6 +200,7 @@ function createLocalStore(opts) {
   const warnedNoId = /* @__PURE__ */ new Set();
   let seenEpoch;
   let pendingEdit = false;
+  let unsent = false;
   let editSeq = 0;
   let queuedKind = null;
   let prefetched = null;
@@ -553,6 +562,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 +608,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) {
@@ -613,19 +660,23 @@ function createLocalStore(opts) {
     kvSetSafe(KEY.syncJournal, redactForStorage(journal), "journal");
     return entry;
   }
+  function deferPush() {
+    lastError = transient("Save deferred: destination momentarily unreachable.");
+    unsent = true;
+  }
   async function pushDurable(source = "push") {
     if (!durable || locked() || needsAttention) return false;
     try {
       if (!await durable.isReady()) {
-        lastError = transient("Save deferred: destination momentarily unreachable.");
+        deferPush();
         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;
         if (pulled === "unreachable") {
-          lastError = transient("Save deferred: destination momentarily unreachable.");
+          deferPush();
           return false;
         }
       }
@@ -633,6 +684,7 @@ function createLocalStore(opts) {
       const digest = await contentDigest(snap);
       if (digest === lastSavedContentHash) {
         lastError = null;
+        unsent = false;
         return true;
       }
       const written = await durable.save(await buildBlob(snap));
@@ -640,6 +692,7 @@ function createLocalStore(opts) {
       lastSavedContentHash = digest;
       kvSetSafe(KEY.savedHash, digest, "savedHash");
       lastError = null;
+      unsent = false;
       return true;
     } catch (e) {
       if (isAuthExpired(e)) {
@@ -647,7 +700,7 @@ function createLocalStore(opts) {
       } else if (isSelfstoreError(e) && e.code === "TARGET_GONE") {
         raiseGate("TARGET_GONE", e.message);
       } else {
-        lastError = transient("Save deferred: destination momentarily unreachable.");
+        deferPush();
       }
       logger.error("[selfstore] push to durable failed", e);
       return false;
@@ -1029,7 +1082,8 @@ function createLocalStore(opts) {
         needsAttention,
         locked: locked(),
         pendingDownload,
-        copy: { at: lastCopyAt, stale: copyIsStale }
+        copy: { at: lastCopyAt, stale: copyIsStale },
+        unsent
       }),
       lastError,
       journal,
@@ -1156,7 +1210,11 @@ function createLocalStore(opts) {
       editSeq++;
       clearTimeout(timer);
       timer = setTimeout(
-        () => save().catch((e) => logger.error("[selfstore] scheduled save failed", e)),
+        () => save().catch((e) => {
+          unsent = true;
+          notify();
+          logger.error("[selfstore] scheduled save failed", e);
+        }),
         debounceMs
       );
       armIdleLock();
@@ -1170,7 +1228,7 @@ function createLocalStore(opts) {
     syncIfStale(source) {
       return serialize(async () => {
         if (locked() || needsAttention || mode !== "persistent") return;
-        if (!durable?.stat && peerList.length === 0) return;
+        if (!durable?.stat && peerList.length === 0 && !unsent) return;
         const nowMs = Date.now();
         if (nowMs - lastStaleCheck < STALE_CHECK_MS) return;
         lastStaleCheck = nowMs;
@@ -1180,7 +1238,13 @@ function createLocalStore(opts) {
           moved = seen !== null && seen !== remoteVersion;
         }
         if (!moved) moved = await anyPeerMoved();
-        if (!moved) return;
+        if (!moved) {
+          if (unsent && durable) {
+            await pushDurable(source);
+            notify();
+          }
+          return;
+        }
         try {
           await doPull(source);
         } catch (e) {
@@ -1236,11 +1300,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 +1560,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 +1573,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 +1623,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 +1693,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 +1738,7 @@ function createLocalStore(opts) {
         pass = null;
         envelope = { dataKey, slots: [slot] };
         armIdleLock();
+        let written;
         try {
           await persistLocal();
           pendingEdit = false;
@@ -1693,10 +1750,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 +1760,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 +1806,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 +1816,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 +2203,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-TB3CKC6Z.js.map
+//# sourceMappingURL=chunk-TB3CKC6Z.js.map