@fireproof/core 0.13.5-dev → 0.13.7-dev

package/dist/node/fireproof.esm.js

@@ -11600,7 +11600,7 @@ replaceTraps((oldTraps) => ({
 }));
 
 // src/version.ts
-var PACKAGE_VERSION = "0.13.5-dev";
+var PACKAGE_VERSION = "0.13.7-dev";
 
 // src/store.ts
 var match = PACKAGE_VERSION.match(/^([^.]*\.[^.]*)/);
@@ -12013,9 +12013,6 @@ var Loader = class {
       const header = await encodeCarHeader(fp);
       await t.put(header.cid, header.bytes);
       roots = [header.cid];
-      const got = await t.get(header.cid);
-      if (!got)
-        throw new Error("missing header!!!");
     }
     const theKey = opts.public ? null : await this._getKey();
     const { cid, bytes } = theKey ? await encryptedEncodeCarFile(theKey, roots[0], t) : await encodeCarFile(roots, t);
@@ -12786,6 +12783,9 @@ function makeMapFnFromName(name8) {
   };
 }
 
+// ../../node_modules/.pnpm/multiformats@12.0.1/node_modules/multiformats/src/link.js
+var parse3 = (source, base3) => CID2.parse(source, base3);
+
 // ../../node_modules/.pnpm/multiformats@11.0.2/node_modules/multiformats/src/hashes/hasher.js
 var from4 = ({ name: name8, code: code8, encode: encode19 }) => new Hasher2(name8, code8, encode19);
 var Hasher2 = class {
@@ -14617,7 +14617,7 @@ var Data = $root.Data = (() => {
     }
     return d;
   };
-  Data3.prototype.toJSON = function toJSON2() {
+  Data3.prototype.toJSON = function toJSON3() {
     return this.constructor.toObject(this, import_minimal.default.util.toJSONOptions);
   };
   Data3.DataType = function() {
@@ -14714,7 +14714,7 @@ var UnixTime = $root.UnixTime = (() => {
     }
     return d;
   };
-  UnixTime3.prototype.toJSON = function toJSON2() {
+  UnixTime3.prototype.toJSON = function toJSON3() {
     return this.constructor.toObject(this, import_minimal.default.util.toJSONOptions);
   };
   return UnixTime3;
@@ -14773,7 +14773,7 @@ var Metadata = $root.Metadata = (() => {
     }
     return d;
   };
-  Metadata3.prototype.toJSON = function toJSON2() {
+  Metadata3.prototype.toJSON = function toJSON3() {
     return this.constructor.toObject(this, import_minimal.default.util.toJSONOptions);
   };
   return Metadata3;
@@ -20926,6 +20926,8 @@ async function doCompact(blocks, head) {
     if (!bl)
       throw new Error("Missing head block: " + cid.toString());
   }
+  for await (const entry of getAllEntries(blockLog, head)) {
+  }
   for await (const [, link2] of entries2(blockLog, head)) {
     const bl = await blockLog.get(link2);
     if (!bl)
@@ -20942,6 +20944,18 @@ async function doCompact(blocks, head) {
   isCompacting = false;
   return done;
 }
+async function getThatBlock({ bytes }) {
+  const realBytes = Uint8Array.from(atob(bytes), (c) => c.charCodeAt(0));
+  const { cid, value } = await decode12({ bytes: realBytes, codec: src_exports, hasher: sha256 });
+  return new Block({ cid, value, bytes: realBytes });
+}
+async function getBlock(blocks, cidString) {
+  const block = await blocks.get(parse3(cidString));
+  if (!block)
+    throw new Error(`Missing block ${cidString}`);
+  const { cid, value } = await decode12({ bytes: block.bytes, codec: src_exports, hasher: sha256 });
+  return new Block({ cid, value, bytes: block.bytes });
+}
 
 // src/loaders.ts
 var IdxLoader = class _IdxLoader extends Loader {
@@ -21005,18 +21019,17 @@ var DbLoader = class _DbLoader extends Loader {
         return;
       }
       this.isCompacting = true;
-      try {
-        const compactHead = this.clock.head;
-        const compactingResult = await doCompact(blocks, this.clock.head);
-        await this.clock.applyHead(null, compactHead, compactHead, null);
-        return compactingResult;
-      } finally {
-        this.isCompacting = false;
-      }
+      const compactHead = this.clock.head;
+      const compactingResult = await doCompact(blocks, this.clock.head);
+      await this.clock.applyHead(null, compactHead, compactHead, null);
+      return compactingResult;
     };
     this.compacting = this._setWaitForWrite(compactingFn);
+    this.compacting.finally(() => {
+      this.isCompacting = false;
+      this.awaitingCompact = false;
+    });
     await this.compacting;
-    this.awaitingCompact = false;
   }
   async loadFileCar(cid, isPublic = false) {
     return await this.storesLoadCar(cid, this.fileStore, this.remoteFileStore, isPublic);
@@ -21227,17 +21240,25 @@ var CRDTClock = class {
   }
   async applyHead(tblocks, newHead, prevHead, updates = null) {
     const taskId = Math.random().toString().slice(2, 8);
-    for await (const { updates: updatesAcc, all } of this.applyHeadQueue.push({ id: taskId, tblocks, newHead, prevHead, updates })) {
-      Promise.resolve().then(async () => {
-        if (this.watchers.size && !all) {
-          const changes = await clockChangesSince(this.blocks, this.head, prevHead, {});
-          updates = changes.result;
-        } else {
-          updates = updatesAcc;
-        }
-        this.zoomers.forEach((fn) => fn());
-        this.notifyWatchers(updates || []);
-      });
+    for await (const { updates: updatesAcc, all } of this.applyHeadQueue.push({
+      id: taskId,
+      tblocks,
+      newHead,
+      prevHead,
+      updates
+    })) {
+      ;
+      (async (updatesAcc2, all2) => {
+        Promise.resolve().then(async () => {
+          let intUpdates = updatesAcc2;
+          if (this.watchers.size && !all2) {
+            const changes = await clockChangesSince(this.blocks, this.head, prevHead, {});
+            intUpdates = changes.result;
+          }
+          this.zoomers.forEach((fn) => fn());
+          this.notifyWatchers(intUpdates || []);
+        });
+      })([...updatesAcc], all);
     }
   }
   async int_applyHead(taskId, tblocks, newHead, prevHead, updates = null) {
@@ -21250,13 +21271,11 @@ var CRDTClock = class {
       }
     });
     if (ogHead.toString() === newHead.toString()) {
-      this.notifyWatchers(updates || []);
       return;
     }
     const ogPrev = prevHead.sort((a, b) => a.toString().localeCompare(b.toString()));
     if (ogHead.toString() === ogPrev.toString()) {
       this.setHead(newHead);
-      this.notifyWatchers(updates || []);
       return;
     }
     let head = this.head;
@@ -21271,6 +21290,7 @@ var CRDTClock = class {
         try {
           head = await advance(tblocks2, head, cid);
         } catch (e) {
+          console.error("failed to advance", cid.toString(), e);
           continue;
         }
       }
@@ -21341,16 +21361,22 @@ var CRDT = class {
       if (loader?.isCompacting) {
         throw new Error("cant bulk while compacting");
       }
-      const { head } = await this.blocks.transaction(async (tblocks) => {
-        const { head: head2 } = await applyBulkUpdateToCrdt(tblocks, this.clock.head, updates, options);
+      const got = await this.blocks.transaction(async (tblocks) => {
+        const { head } = await applyBulkUpdateToCrdt(tblocks, this.clock.head, updates, options);
         updates = updates.map(({ key, value, del: del2 }) => {
           readFiles(this.blocks, { doc: value });
           return { key, value, del: del2 };
         });
-        return { head: head2 };
+        if (loader?.awaitingCompact) {
+          console.log("missing?", head.toString());
+        }
+        if (loader?.isCompacting) {
+          console.log("compacting?", head.toString());
+        }
+        return { head };
       });
-      await this.clock.applyHead(null, head, prevHead, updates);
-      return { head };
+      await this.clock.applyHead(null, got.head, prevHead, updates);
+      return got;
     })();
     if (loader) {
       const wr = loader.writing;
@@ -21379,6 +21405,14 @@ var CRDT = class {
     }
     return txt.join("\n");
   }
+  async getBlock(cidString) {
+    await this.ready;
+    return await getBlock(this.blocks, cidString);
+  }
+  async getThatBlock() {
+    const blockJson = { "cid": "bafyreib7ee4pscqpuioxobmh3ac5xbbslypmaqqbkugalhw67hnco6dvoa", "bytes": "omRkYXRhpGNrZXl4JDAxOGFmNzdiLWZmMTUtNzI5Ny04ODZiLTYwMjViM2MxODI2ZWRyb2902CpYJQABcRIgKVLI53HO1TFDbPUoSaybd0mop2oX/CRFm1RrpiY4ne9kdHlwZWNwdXRldmFsdWXYKlglAAFxEiAGw53MVtPzeeGT/itfdLBfCVu6MTj96AHU6v9a3K/wYGdwYXJlbnRzgdgqWCUAAXESIJiL5qjdpgghUfbQLpKJeCgMX+ubhoTpYBoZHYdzbQJ/" };
+    return await getThatBlock(blockJson);
+  }
   async get(key) {
     await this.ready;
     const result = await getValueFromCrdt(this.blocks, this.clock.head, key);