@tinycloud/replica 0.4.0-beta.1 → 0.4.0-beta.3

package/dist/{kv-storage.worker.f2ee4476484924b91a94e0f97d77023eca43ed50cb532a0488bafbe68ae591bd.js → kv-storage.worker.71bb85eb4c4d49cbcf82e84da665129c8fcd8585768360ebba434003f650dd20.js}

@@ -3616,6 +3616,8 @@ var DEFAULT_PAGE_LIMIT = 500;
 var DEFAULT_LEASE_TTL_MS = 12e4;
 var FETCH_CHUNK = 100;
 var REPAIR_BATCH = 100;
+var REPAIR_MAX_TRIES = 5;
+var REPAIR_BACKOFF_BASE_MS = 6e4;
 var RETENTION_REVOKED = /* @__PURE__ */ new Set(["retention-grant-revoked", "retention-grant-ancestor-revoked"]);
 var PENDING_REFUSALS = /* @__PURE__ */ new Set([
   ReplicaErrorCode.GRANT_UNAUTHORIZED,
@@ -3625,6 +3627,9 @@ var PENDING_REFUSALS = /* @__PURE__ */ new Set([
 function contentHash(bytes) {
   return bytesToHex(blake3(bytes));
 }
+function repairId(entry) {
+  return `${entry.hash}\0${entry.key}`;
+}
 function sameEtag(a, b) {
   return a.replace(/^"|"$/g, "") === b.replace(/^"|"$/g, "");
 }
@@ -3641,6 +3646,9 @@ var Replica = class {
   #now;
   #leaseTtlMs;
   #onCommit;
+  #contentFetch;
+  /** Failed repair fetches of this session, by key and ETag hash. Never persisted: a new `Replica` retries afresh. */
+  #repairTries = /* @__PURE__ */ new Map();
   constructor(options) {
     this.#store = options.store;
     const transport = options.transport;
@@ -3648,6 +3656,7 @@ var Replica = class {
     this.#now = options.now ?? Date.now;
     this.#leaseTtlMs = options.leaseTtlMs ?? DEFAULT_LEASE_TTL_MS;
     this.#onCommit = options.onCommit;
+    this.#contentFetch = options.contentFetch ?? "eager";
   }
   async #state() {
     const state = await this.#store.open();
@@ -3976,6 +3985,7 @@ var Replica = class {
       changes[candidate.index].content = true;
       return false;
     });
+    if (this.#contentFetch === "lazy") return { changes, blobs, fetched: 0 };
     let fetched2 = 0;
     for (let start = 0; start < needed.length; start += FETCH_CHUNK) {
       const chunk = needed.slice(start, start + FETCH_CHUNK);
@@ -3995,7 +4005,15 @@ var Replica = class {
     return { changes, blobs, fetched: fetched2 };
   }
   async #repair(attempt, cursor, nodeDid, coverage, retentionGrantCid) {
-    const pending = await this.#store.pendingRepairs(Number.MAX_SAFE_INTEGER);
+    if (this.#contentFetch === "lazy") return 0;
+    const all = await this.#store.pendingRepairs(Number.MAX_SAFE_INTEGER);
+    const now = this.#now();
+    const pendingIds = new Set(all.map((entry) => repairId(entry)));
+    for (const id of this.#repairTries.keys()) if (!pendingIds.has(id)) this.#repairTries.delete(id);
+    const pending = all.filter((entry) => {
+      const state = this.#repairTries.get(repairId(entry));
+      return state === void 0 || state.tries < REPAIR_MAX_TRIES && now >= state.nextAttemptAt;
+    });
     let repaired = 0;
     for (let start = 0; start < pending.length; start += REPAIR_BATCH) {
       const chunk = pending.slice(start, start + REPAIR_BATCH);
@@ -4007,7 +4025,14 @@ var Replica = class {
       const changes = [];
       for (const entry of chunk) {
         const bytes = acceptContent(entry, contents.get(entry.key));
-        if (bytes === void 0) continue;
+        const id = repairId(entry);
+        if (bytes === void 0) {
+          const tries = (this.#repairTries.get(id)?.tries ?? 0) + 1;
+          const wait = tries === 1 ? 0 : REPAIR_BACKOFF_BASE_MS * 2 ** (tries - 2);
+          this.#repairTries.set(id, { tries, nextAttemptAt: this.#now() + wait });
+          continue;
+        }
+        this.#repairTries.delete(id);
         blobs.set(entry.hash, bytes);
         changes.push({ ...entry, content: true });
       }
@@ -6943,6 +6968,7 @@ ${spec.prefix}`);
       store: handle.store,
       now,
       transportFor: (record) => deps.transportFor(record, handle.spec, handle.device),
+      ...handle.spec.contentFetch === void 0 ? {} : { contentFetch: handle.spec.contentFetch },
       onCommit: () => pages += 1
     });
     let outcome;

package/dist/kv-storage.worker.js

@@ -3616,6 +3616,8 @@ var DEFAULT_PAGE_LIMIT = 500;
 var DEFAULT_LEASE_TTL_MS = 12e4;
 var FETCH_CHUNK = 100;
 var REPAIR_BATCH = 100;
+var REPAIR_MAX_TRIES = 5;
+var REPAIR_BACKOFF_BASE_MS = 6e4;
 var RETENTION_REVOKED = /* @__PURE__ */ new Set(["retention-grant-revoked", "retention-grant-ancestor-revoked"]);
 var PENDING_REFUSALS = /* @__PURE__ */ new Set([
   ReplicaErrorCode.GRANT_UNAUTHORIZED,
@@ -3625,6 +3627,9 @@ var PENDING_REFUSALS = /* @__PURE__ */ new Set([
 function contentHash(bytes) {
   return bytesToHex(blake3(bytes));
 }
+function repairId(entry) {
+  return `${entry.hash}\0${entry.key}`;
+}
 function sameEtag(a, b) {
   return a.replace(/^"|"$/g, "") === b.replace(/^"|"$/g, "");
 }
@@ -3641,6 +3646,9 @@ var Replica = class {
   #now;
   #leaseTtlMs;
   #onCommit;
+  #contentFetch;
+  /** Failed repair fetches of this session, by key and ETag hash. Never persisted: a new `Replica` retries afresh. */
+  #repairTries = /* @__PURE__ */ new Map();
   constructor(options) {
     this.#store = options.store;
     const transport = options.transport;
@@ -3648,6 +3656,7 @@ var Replica = class {
     this.#now = options.now ?? Date.now;
     this.#leaseTtlMs = options.leaseTtlMs ?? DEFAULT_LEASE_TTL_MS;
     this.#onCommit = options.onCommit;
+    this.#contentFetch = options.contentFetch ?? "eager";
   }
   async #state() {
     const state = await this.#store.open();
@@ -3976,6 +3985,7 @@ var Replica = class {
       changes[candidate.index].content = true;
       return false;
     });
+    if (this.#contentFetch === "lazy") return { changes, blobs, fetched: 0 };
     let fetched2 = 0;
     for (let start = 0; start < needed.length; start += FETCH_CHUNK) {
       const chunk = needed.slice(start, start + FETCH_CHUNK);
@@ -3995,7 +4005,15 @@ var Replica = class {
     return { changes, blobs, fetched: fetched2 };
   }
   async #repair(attempt, cursor, nodeDid, coverage, retentionGrantCid) {
-    const pending = await this.#store.pendingRepairs(Number.MAX_SAFE_INTEGER);
+    if (this.#contentFetch === "lazy") return 0;
+    const all = await this.#store.pendingRepairs(Number.MAX_SAFE_INTEGER);
+    const now = this.#now();
+    const pendingIds = new Set(all.map((entry) => repairId(entry)));
+    for (const id of this.#repairTries.keys()) if (!pendingIds.has(id)) this.#repairTries.delete(id);
+    const pending = all.filter((entry) => {
+      const state = this.#repairTries.get(repairId(entry));
+      return state === void 0 || state.tries < REPAIR_MAX_TRIES && now >= state.nextAttemptAt;
+    });
     let repaired = 0;
     for (let start = 0; start < pending.length; start += REPAIR_BATCH) {
       const chunk = pending.slice(start, start + REPAIR_BATCH);
@@ -4007,7 +4025,14 @@ var Replica = class {
       const changes = [];
       for (const entry of chunk) {
         const bytes = acceptContent(entry, contents.get(entry.key));
-        if (bytes === void 0) continue;
+        const id = repairId(entry);
+        if (bytes === void 0) {
+          const tries = (this.#repairTries.get(id)?.tries ?? 0) + 1;
+          const wait = tries === 1 ? 0 : REPAIR_BACKOFF_BASE_MS * 2 ** (tries - 2);
+          this.#repairTries.set(id, { tries, nextAttemptAt: this.#now() + wait });
+          continue;
+        }
+        this.#repairTries.delete(id);
         blobs.set(entry.hash, bytes);
         changes.push({ ...entry, content: true });
       }
@@ -6943,6 +6968,7 @@ ${spec.prefix}`);
       store: handle.store,
       now,
       transportFor: (record) => deps.transportFor(record, handle.spec, handle.device),
+      ...handle.spec.contentFetch === void 0 ? {} : { contentFetch: handle.spec.contentFetch },
       onCommit: () => pages += 1
     });
     let outcome;