@fireproof/core 0.17.3 → 0.17.5

package/dist/node/fireproof.global.js

@@ -4089,7 +4089,7 @@ var Fireproof = (() => {
   };
   var parse = (source, base4) => CID.parse(source, base4);
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.0/node_modules/@web3-storage/pail/src/block.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.2/node_modules/@web3-storage/pail/src/block.js
   var MemoryBlockstore = class {
     /** @type {Map<string, Uint8Array>} */
     #blocks = /* @__PURE__ */ new Map();
@@ -4136,6 +4136,22 @@ var Fireproof = (() => {
       }
     }
   };
+  var MultiBlockFetcher = class {
+    /** @type {API.BlockFetcher[]} */
+    #fetchers;
+    /** @param {API.BlockFetcher[]} fetchers */
+    constructor(...fetchers) {
+      this.#fetchers = fetchers;
+    }
+    /** @type {API.BlockFetcher['get']} */
+    async get(link2) {
+      for (const f of this.#fetchers) {
+        const v = await f.get(link2);
+        if (v)
+          return v;
+      }
+    }
+  };
 
   // ../../node_modules/.pnpm/yocto-queue@1.0.0/node_modules/yocto-queue/index.js
   var Node = class {
@@ -9936,8 +9952,7 @@ You can use close({ resize: true }) to resize header`);
     return uint8Array;
   }
   async function encryptedEncodeCarFile(crypto22, 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()) {
@@ -10014,7 +10029,7 @@ You can use close({ resize: true }) to resize header`);
     }
     return bytes;
   }
-  var PACKAGE_VERSION = "0.16.10";
+  var PACKAGE_VERSION = "0.17.4";
   var match = PACKAGE_VERSION.match(/^([^.]*\.[^.]*)/);
   if (!match)
     throw new Error("invalid version: " + PACKAGE_VERSION);
@@ -10090,11 +10105,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");
@@ -10268,19 +10283,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);
       }
@@ -18750,12 +18776,15 @@ ${key.data.toString("base64")}
     DataStore: () => DataStore2,
     MetaStore: () => MetaStore2,
     RemoteWAL: () => RemoteWAL2,
+    makeDataStore: () => makeDataStore,
+    makeMetaStore: () => makeMetaStore,
+    makeRemoteWAL: () => makeRemoteWAL,
     testConfig: () => testConfig
   });
   var import_path = __require("path");
   var import_os = __require("os");
   var import_promises = __require("fs/promises");
-  var PACKAGE_VERSION2 = "0.16.10";
+  var PACKAGE_VERSION2 = "0.17.4";
   var match2 = PACKAGE_VERSION2.match(/^([^.]*\.[^.]*)/);
   if (!match2)
     throw new Error("invalid version: " + PACKAGE_VERSION2);
@@ -18843,14 +18872,14 @@ ${key.data.toString("base64")}
     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;
@@ -18949,6 +18978,9 @@ ${key.data.toString("base64")}
       await rmlp;
     }
   };
+  var makeDataStore = (name7) => new DataStore2(name7);
+  var makeMetaStore = (loader) => new MetaStore2(loader.name);
+  var makeRemoteWAL = (loader) => new RemoteWAL2(loader);
   var RemoteWAL2 = class extends RemoteWAL {
     filePathForBranch(branch) {
       return (0, import_path.join)(MetaStore2.dataDir, this.loader.name, "wal", branch + ".json");
@@ -19018,7 +19050,7 @@ ${key.data.toString("base64")}
     return await (0, import_promises.writeFile)(path, data);
   }
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/clock/index.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.2/node_modules/@web3-storage/pail/src/clock/index.js
   var advance = async (blocks, head, event) => {
     const events = new EventFetcher(blocks);
     const headmap = new Map(head.map((cid) => [cid.toString(), cid]));
@@ -19092,6 +19124,7 @@ ${key.data.toString("base64")}
       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)
@@ -19100,6 +19133,9 @@ ${key.data.toString("base64")}
         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);
     }
@@ -19140,7 +19176,7 @@ ${key.data.toString("base64")}
   };
   var shortLink = (l) => `${String(l).slice(0, 4)}..${String(l).slice(-4)}`;
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/shard.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.2/node_modules/@web3-storage/pail/src/shard.js
   var MaxKeyLength = 64;
   var MaxShardSize = 512 * 1024;
   var CID_TAG2 = new Token(Type.tag, 42);
@@ -19272,7 +19308,7 @@ ${key.data.toString("base64")}
     }
   };
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/index.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.2/node_modules/@web3-storage/pail/src/index.js
   var put = async (blocks, root2, key, value) => {
     const shards = new ShardFetcher(blocks);
     const rshard = await shards.get(root2);
@@ -19475,71 +19511,7 @@ ${key.data.toString("base64")}
     return [shard];
   };
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/block.js
-  var MemoryBlockstore2 = class {
-    /** @type {Map<string, Uint8Array>} */
-    #blocks = /* @__PURE__ */ new Map();
-    /**
-     * @param {Array<import('multiformats').Block>} [blocks]
-     */
-    constructor(blocks) {
-      if (blocks) {
-        this.#blocks = new Map(blocks.map((b) => [b.cid.toString(), b.bytes]));
-      }
-    }
-    /** @type {API.BlockFetcher['get']} */
-    async get(cid) {
-      const bytes = this.#blocks.get(cid.toString());
-      if (!bytes)
-        return;
-      return { cid, bytes };
-    }
-    /**
-     * @param {API.UnknownLink} cid
-     * @param {Uint8Array} bytes
-     */
-    async put(cid, bytes) {
-      this.#blocks.set(cid.toString(), bytes);
-    }
-    /**
-     * @param {API.UnknownLink} cid
-     * @param {Uint8Array} bytes
-     */
-    putSync(cid, bytes) {
-      this.#blocks.set(cid.toString(), bytes);
-    }
-    /** @param {API.UnknownLink} cid */
-    async delete(cid) {
-      this.#blocks.delete(cid.toString());
-    }
-    /** @param {API.UnknownLink} cid */
-    deleteSync(cid) {
-      this.#blocks.delete(cid.toString());
-    }
-    *entries() {
-      for (const [str, bytes] of this.#blocks) {
-        yield { cid: parse(str), bytes };
-      }
-    }
-  };
-  var MultiBlockFetcher = class {
-    /** @type {API.BlockFetcher[]} */
-    #fetchers;
-    /** @param {API.BlockFetcher[]} fetchers */
-    constructor(...fetchers) {
-      this.#fetchers = fetchers;
-    }
-    /** @type {API.BlockFetcher['get']} */
-    async get(link2) {
-      for (const f of this.#fetchers) {
-        const v = await f.get(link2);
-        if (v)
-          return v;
-      }
-    }
-  };
-
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/batch/shard.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.2/node_modules/@web3-storage/pail/src/batch/shard.js
   var ShardLinkByteLength = 36;
   var CID_TAG3 = new Token(Type.tag, 42);
   var create8 = (init2) => ({
@@ -19586,7 +19558,7 @@ ${key.data.toString("base64")}
     return tokensToLength(tokens);
   };
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/batch/index.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.2/node_modules/@web3-storage/pail/src/batch/index.js
   var Batcher = class _Batcher {
     #committed = false;
     /**
@@ -19768,9 +19740,9 @@ ${key.data.toString("base64")}
     static code = "ERR_BATCH_COMMITTED";
   };
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/crdt/index.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.2/node_modules/@web3-storage/pail/src/crdt/index.js
   var put3 = async (blocks, head, key, value) => {
-    const mblocks = new MemoryBlockstore2();
+    const mblocks = new MemoryBlockstore();
     blocks = new MultiBlockFetcher(mblocks, blocks);
     if (!head.length) {
       const shard = await ShardBlock.create();
@@ -19854,7 +19826,7 @@ ${key.data.toString("base64")}
   var root = async (blocks, head) => {
     if (!head.length)
       throw new Error("cannot determine root of headless clock");
-    const mblocks = new MemoryBlockstore2();
+    const mblocks = new MemoryBlockstore();
     blocks = new MultiBlockFetcher(mblocks, blocks);
     const events = new EventFetcher(blocks);
     if (head.length === 1) {
@@ -19913,7 +19885,7 @@ ${key.data.toString("base64")}
       return;
     const result = await root(blocks, head);
     if (result.additions.length) {
-      blocks = new MultiBlockFetcher(new MemoryBlockstore2(result.additions), blocks);
+      blocks = new MultiBlockFetcher(new MemoryBlockstore(result.additions), blocks);
     }
     return get2(blocks, result.root, key);
   };
@@ -19922,7 +19894,7 @@ ${key.data.toString("base64")}
       return;
     const result = await root(blocks, head);
     if (result.additions.length) {
-      blocks = new MultiBlockFetcher(new MemoryBlockstore2(result.additions), blocks);
+      blocks = new MultiBlockFetcher(new MemoryBlockstore(result.additions), blocks);
     }
     yield* entries(blocks, result.root, options);
   };
@@ -20006,7 +19978,7 @@ ${key.data.toString("base64")}
     return acc.concat(...rest);
   };
 
-  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.1/node_modules/@web3-storage/pail/src/crdt/batch/index.js
+  // ../../node_modules/.pnpm/@web3-storage+pail@0.4.2/node_modules/@web3-storage/pail/src/crdt/batch/index.js
   var Batcher2 = class _Batcher {
     #committed = false;
     /**
@@ -20051,7 +20023,7 @@ ${key.data.toString("base64")}
       const res = await commit(this);
       const data = { type: "batch", ops: this.ops, root: res.root };
       const event = await EventBlock.create(data, this.head);
-      const mblocks = new MemoryBlockstore2();
+      const mblocks = new MemoryBlockstore();
       const blocks = new MultiBlockFetcher(mblocks, this.blocks);
       mblocks.putSync(event.cid, event.bytes);
       const head = await advance(blocks, this.head, event.cid);
@@ -20091,7 +20063,7 @@ ${key.data.toString("base64")}
      * @param {string} init.prefix
      */
     static async create({ blocks, head, prefix }) {
-      const mblocks = new MemoryBlockstore2();
+      const mblocks = new MemoryBlockstore();
       blocks = new MultiBlockFetcher(mblocks, blocks);
       if (!head.length) {
         const base5 = await ShardBlock.create();
@@ -28660,6 +28632,7 @@ ${key.data.toString("base64")}
     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;
   }
@@ -29611,8 +29584,8 @@ ${key.data.toString("base64")}
           return { head: this.clock.head };
         },
         autoCompact: this.opts.autoCompact || 100,
-        crypto: crypto_node_exports,
-        store: store_node_exports,
+        crypto: this.opts.crypto || crypto_node_exports,
+        store: this.opts.store || store_node_exports,
         public: this.opts.public,
         meta: this.opts.meta
       });