@fireproof/core 0.17.3 → 0.17.4

package/dist/memory/fireproof.global.js

@@ -9875,8 +9875,7 @@ You can use close({ resize: true }) to resize header`);
     return uint8Array;
   }
   async function encryptedEncodeCarFile(crypto2, key, rootCid, t) {
-    const encryptionKeyUint8 = hexStringToUint8Array(key);
-    const encryptionKey = encryptionKeyUint8.buffer.slice(0, encryptionKeyUint8.byteLength);
+    const encryptionKey = hexStringToUint8Array(key);
     const encryptedBlocks = new MemoryBlockstore();
     const cidsToEncrypt = [];
     for (const { cid } of t.entries()) {
@@ -9953,7 +9952,7 @@ You can use close({ resize: true }) to resize header`);
     }
     return bytes;
   }
-  var PACKAGE_VERSION = "0.16.10";
+  var PACKAGE_VERSION = "0.17.3";
   var match = PACKAGE_VERSION.match(/^([^.]*\.[^.]*)/);
   if (!match)
     throw new Error("invalid version: " + PACKAGE_VERSION);
@@ -10029,11 +10028,11 @@ You can use close({ resize: true }) to resize header`);
     constructor(name7, ebOpts) {
       this.name = name7;
       this.ebOpts = ebOpts;
-      this.metaStore = new ebOpts.store.MetaStore(this.name);
-      this.carStore = new ebOpts.store.DataStore(this.name);
-      this.fileStore = new ebOpts.store.DataStore(this.name);
-      this.remoteWAL = new ebOpts.store.RemoteWAL(this);
+      this.carStore = ebOpts.store.makeDataStore(this.name);
+      this.fileStore = ebOpts.store.makeDataStore(this.name);
+      this.remoteWAL = ebOpts.store.makeRemoteWAL(this);
       this.ready = Promise.resolve().then(async () => {
+        this.metaStore = ebOpts.store.makeMetaStore(this);
         if (!this.metaStore || !this.carStore || !this.remoteWAL)
           throw new Error("stores not initialized");
         const metas = this.ebOpts.meta ? [this.ebOpts.meta] : await this.metaStore.load("main");
@@ -10207,19 +10206,30 @@ You can use close({ resize: true }) to resize header`);
       const sCid = cid.toString();
       if (this.getBlockCache.has(sCid))
         return this.getBlockCache.get(sCid);
-      const got = await Promise.any(
-        // maybe worth taking this in chunks of 5? to allow cache to favor recent files, carLog order is newest first
-        this.carLog.map(async (carCid) => {
-          const reader = await this.loadCar(carCid);
-          if (!reader) {
-            throw new Error(`missing car reader ${carCid.toString()}`);
-          }
-          await this.cacheCarReader(reader);
-          if (this.getBlockCache.has(sCid))
-            return this.getBlockCache.get(sCid);
-          throw new Error(`block not in reader: ${cid.toString()}`);
-        })
-      ).catch(() => void 0);
+      const getCarCid = async (carCid) => {
+        const reader = await this.loadCar(carCid);
+        if (!reader) {
+          throw new Error(`missing car reader ${carCid.toString()}`);
+        }
+        await this.cacheCarReader(reader);
+        if (this.getBlockCache.has(sCid))
+          return this.getBlockCache.get(sCid);
+        throw new Error(`block not in reader: ${cid.toString()}`);
+      };
+      let got;
+      const batchSize = 5;
+      for (let i = 0; i < this.carLog.length; i += batchSize) {
+        const promises = [];
+        for (let j = i; j < Math.min(i + batchSize, this.carLog.length); j++) {
+          promises.push(getCarCid(this.carLog[j]));
+        }
+        try {
+          got = await Promise.any(promises);
+        } catch {
+        }
+        if (got)
+          break;
+      }
       if (got) {
         this.getBlockCache.set(sCid, got);
       }
@@ -10460,14 +10470,6 @@ You can use close({ resize: true }) to resize header`);
     return bytes;
   }
 
-  // ../encrypted-blockstore/dist/lib/store-web.js
-  var store_web_exports = {};
-  __export(store_web_exports, {
-    DataStore: () => DataStore2,
-    MetaStore: () => MetaStore2,
-    RemoteWAL: () => RemoteWAL2
-  });
-
   // ../../node_modules/.pnpm/idb@7.1.1/node_modules/idb/build/wrap-idb-value.js
   var instanceOfAny = (object, constructors) => constructors.some((c) => object instanceof c);
   var idbProxyableTypes;
@@ -10676,7 +10678,7 @@ You can use close({ resize: true }) to resize header`);
   }));
 
   // ../encrypted-blockstore/dist/lib/store-web.js
-  var PACKAGE_VERSION2 = "0.16.10";
+  var PACKAGE_VERSION2 = "0.17.3";
   var match2 = PACKAGE_VERSION2.match(/^([^.]*\.[^.]*)/);
   if (!match2)
     throw new Error("invalid version: " + PACKAGE_VERSION2);
@@ -10764,14 +10766,14 @@ You can use close({ resize: true }) to resize header`);
     processQueue = new CommitQueue2();
     constructor(loader) {
       this.loader = loader;
-      this.ready = (async () => {
+      this.ready = Promise.resolve().then(async () => {
         const walState = await this.load().catch((e) => {
           console.error("error loading wal", e);
           return null;
         });
         this.walState.operations = walState?.operations || [];
         this.walState.fileOperations = walState?.fileOperations || [];
-      })();
+      });
     }
     async enqueue(dbMeta, opts) {
       await this.ready;
@@ -10870,6 +10872,9 @@ You can use close({ resize: true }) to resize header`);
       await rmlp;
     }
   };
+  var makeDataStore = (name7) => new DataStore2(name7);
+  var makeMetaStore = (loader) => new MetaStore2(loader.name);
+  var makeRemoteWAL = (loader) => new RemoteWAL2(loader);
   var DataStore2 = class extends DataStore {
     tag = "car-web-idb";
     idb = null;
@@ -10964,6 +10969,13 @@ You can use close({ resize: true }) to resize header`);
     }
   };
 
+  // src/eb-web.ts
+  var store = {
+    makeDataStore,
+    makeMetaStore,
+    makeRemoteWAL
+  };
+
   // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/clock/index.js
   var advance = async (blocks, head, event) => {
     const events = new EventFetcher(blocks);
@@ -11038,6 +11050,7 @@ You can use close({ resize: true }) to resize header`);
       return true;
     const [{ value: aevent }, { value: bevent }] = await Promise.all([events.get(a), events.get(b)]);
     const links3 = [...aevent.parents];
+    const seen = /* @__PURE__ */ new Set();
     while (links3.length) {
       const link2 = links3.shift();
       if (!link2)
@@ -11046,6 +11059,9 @@ You can use close({ resize: true }) to resize header`);
         return true;
       if (bevent.parents.some((p) => link2.toString() === p.toString()))
         continue;
+      if (seen.has(link2.toString()))
+        continue;
+      seen.add(link2.toString());
       const { value: event } = await events.get(link2);
       links3.push(...event.parents);
     }
@@ -20611,6 +20627,7 @@ You can use close({ resize: true }) to resize header`);
     if (!block)
       throw new Error(`Missing linked block ${link2.toString()}`);
     const { value } = await decode11({ bytes: block.bytes, hasher: sha256, codec: src_exports });
+    value.cid = link2;
     readFiles(blocks, value);
     return value;
   }
@@ -21562,8 +21579,8 @@ You can use close({ resize: true }) to resize header`);
           return { head: this.clock.head };
         },
         autoCompact: this.opts.autoCompact || 100,
-        crypto: crypto_web_exports,
-        store: store_web_exports,
+        crypto: this.opts.crypto || crypto_web_exports,
+        store: this.opts.store || store,
         public: this.opts.public,
         meta: this.opts.meta
       });
@@ -21578,7 +21595,7 @@ You can use close({ resize: true }) to resize header`);
         },
         crypto: crypto_web_exports,
         public: this.opts.public,
-        store: store_web_exports
+        store
       });
       this.ready = Promise.all([this.blockstore.ready, this.indexBlockstore.ready]).then(() => {
       });