@fireproof/core 0.20.0-dev-preview-19 → 0.20.0-dev-preview-21

package/index.d.cts

@@ -4,9 +4,9 @@ import { Operation } from '@fireproof/vendor/@web3-storage/pail/crdt/api';
 import { ByteView, ArrayBufferView, Version, Block as Block$1, UnknownLink, CID, Link, BlockView, MultihashHasher } from 'multiformats';
 import { BlockFetcher as BlockFetcher$1 } from '@fireproof/vendor/@web3-storage/pail/api';
 import { EventBlock } from '@fireproof/vendor/@web3-storage/pail/clock';
-import { CarReader } from '@fireproof/vendor/@ipld/car';
+import { CarReader } from '@ipld/car';
 import { ProllyNode as ProllyNode$1 } from 'prolly-trees/db-index';
-import { CarReader as CarReader$1 } from '@fireproof/vendor/@ipld/car/reader';
+import { CarReader as CarReader$1 } from '@ipld/car/reader';
 import { SuperThis as SuperThis$1 } from '@fireproof/core';
 import { Block as Block$2 } from 'multiformats/block';
 
@@ -1604,10 +1604,10 @@ declare namespace index$1 {
 
 declare const FILESTORE_VERSION = "v0.19-file";
 
-declare const INDEXDB_VERSION = "v0.19-indexdb";
+declare const INDEXEDDB_VERSION = "v0.19-indexeddb";
 
 declare const index_FILESTORE_VERSION: typeof FILESTORE_VERSION;
-declare const index_INDEXDB_VERSION: typeof INDEXDB_VERSION;
+declare const index_INDEXEDDB_VERSION: typeof INDEXEDDB_VERSION;
 type index_KeyBackProviderFactory = KeyBackProviderFactory;
 type index_KeyBag = KeyBag;
 declare const index_KeyBag: typeof KeyBag;
@@ -1626,7 +1626,7 @@ declare const index_getPath: typeof getPath;
 declare const index_registerKeyBagProviderFactory: typeof registerKeyBagProviderFactory;
 declare const index_runtimeFn: typeof runtimeFn;
 declare namespace index {
-  export { index_FILESTORE_VERSION as FILESTORE_VERSION, index_INDEXDB_VERSION as INDEXDB_VERSION, type index_KeyBackProviderFactory as KeyBackProviderFactory, index_KeyBag as KeyBag, type index_KeyBagFile as KeyBagFile, type index_KeyBagOpts as KeyBagOpts, type index_KeyBagProvider as KeyBagProvider, type index_KeyBagProviderFactoryItem as KeyBagProviderFactoryItem, type index_KeyBagRuntime as KeyBagRuntime, type index_KeyItem as KeyItem, index_defaultKeyBagOpts as defaultKeyBagOpts, index_defaultKeyBagUrl as defaultKeyBagUrl, index_files as files, index_getFileName as getFileName, index_getKeyBag as getKeyBag, index_getPath as getPath, index$1 as gw, keyBag as kb, keyedCrypto as kc, index$3 as mf, index_registerKeyBagProviderFactory as registerKeyBagProviderFactory, index_runtimeFn as runtimeFn };
+  export { index_FILESTORE_VERSION as FILESTORE_VERSION, index_INDEXEDDB_VERSION as INDEXEDDB_VERSION, type index_KeyBackProviderFactory as KeyBackProviderFactory, index_KeyBag as KeyBag, type index_KeyBagFile as KeyBagFile, type index_KeyBagOpts as KeyBagOpts, type index_KeyBagProvider as KeyBagProvider, type index_KeyBagProviderFactoryItem as KeyBagProviderFactoryItem, type index_KeyBagRuntime as KeyBagRuntime, type index_KeyItem as KeyItem, index_defaultKeyBagOpts as defaultKeyBagOpts, index_defaultKeyBagUrl as defaultKeyBagUrl, index_files as files, index_getFileName as getFileName, index_getKeyBag as getKeyBag, index_getPath as getPath, index$1 as gw, keyBag as kb, keyedCrypto as kc, index$3 as mf, index_registerKeyBagProviderFactory as registerKeyBagProviderFactory, index_runtimeFn as runtimeFn };
 }
 
 declare const PACKAGE_VERSION: string;

package/index.d.ts

@@ -4,9 +4,9 @@ import { Operation } from '@fireproof/vendor/@web3-storage/pail/crdt/api';
 import { ByteView, ArrayBufferView, Version, Block as Block$1, UnknownLink, CID, Link, BlockView, MultihashHasher } from 'multiformats';
 import { BlockFetcher as BlockFetcher$1 } from '@fireproof/vendor/@web3-storage/pail/api';
 import { EventBlock } from '@fireproof/vendor/@web3-storage/pail/clock';
-import { CarReader } from '@fireproof/vendor/@ipld/car';
+import { CarReader } from '@ipld/car';
 import { ProllyNode as ProllyNode$1 } from 'prolly-trees/db-index';
-import { CarReader as CarReader$1 } from '@fireproof/vendor/@ipld/car/reader';
+import { CarReader as CarReader$1 } from '@ipld/car/reader';
 import { SuperThis as SuperThis$1 } from '@fireproof/core';
 import { Block as Block$2 } from 'multiformats/block';
 
@@ -1604,10 +1604,10 @@ declare namespace index$1 {
 
 declare const FILESTORE_VERSION = "v0.19-file";
 
-declare const INDEXDB_VERSION = "v0.19-indexdb";
+declare const INDEXEDDB_VERSION = "v0.19-indexeddb";
 
 declare const index_FILESTORE_VERSION: typeof FILESTORE_VERSION;
-declare const index_INDEXDB_VERSION: typeof INDEXDB_VERSION;
+declare const index_INDEXEDDB_VERSION: typeof INDEXEDDB_VERSION;
 type index_KeyBackProviderFactory = KeyBackProviderFactory;
 type index_KeyBag = KeyBag;
 declare const index_KeyBag: typeof KeyBag;
@@ -1626,7 +1626,7 @@ declare const index_getPath: typeof getPath;
 declare const index_registerKeyBagProviderFactory: typeof registerKeyBagProviderFactory;
 declare const index_runtimeFn: typeof runtimeFn;
 declare namespace index {
-  export { index_FILESTORE_VERSION as FILESTORE_VERSION, index_INDEXDB_VERSION as INDEXDB_VERSION, type index_KeyBackProviderFactory as KeyBackProviderFactory, index_KeyBag as KeyBag, type index_KeyBagFile as KeyBagFile, type index_KeyBagOpts as KeyBagOpts, type index_KeyBagProvider as KeyBagProvider, type index_KeyBagProviderFactoryItem as KeyBagProviderFactoryItem, type index_KeyBagRuntime as KeyBagRuntime, type index_KeyItem as KeyItem, index_defaultKeyBagOpts as defaultKeyBagOpts, index_defaultKeyBagUrl as defaultKeyBagUrl, index_files as files, index_getFileName as getFileName, index_getKeyBag as getKeyBag, index_getPath as getPath, index$1 as gw, keyBag as kb, keyedCrypto as kc, index$3 as mf, index_registerKeyBagProviderFactory as registerKeyBagProviderFactory, index_runtimeFn as runtimeFn };
+  export { index_FILESTORE_VERSION as FILESTORE_VERSION, index_INDEXEDDB_VERSION as INDEXEDDB_VERSION, type index_KeyBackProviderFactory as KeyBackProviderFactory, index_KeyBag as KeyBag, type index_KeyBagFile as KeyBagFile, type index_KeyBagOpts as KeyBagOpts, type index_KeyBagProvider as KeyBagProvider, type index_KeyBagProviderFactoryItem as KeyBagProviderFactoryItem, type index_KeyBagRuntime as KeyBagRuntime, type index_KeyItem as KeyItem, index_defaultKeyBagOpts as defaultKeyBagOpts, index_defaultKeyBagUrl as defaultKeyBagUrl, index_files as files, index_getFileName as getFileName, index_getKeyBag as getKeyBag, index_getPath as getPath, index$1 as gw, keyBag as kb, keyedCrypto as kc, index$3 as mf, index_registerKeyBagProviderFactory as registerKeyBagProviderFactory, index_runtimeFn as runtimeFn };
 }
 
 declare const PACKAGE_VERSION: string;

package/index.js

@@ -460,7 +460,7 @@ import * as UnixFS from "@ipld/unixfs";
 import * as raw from "multiformats/codecs/raw";
 import { withMaxChunkSize } from "@ipld/unixfs/file/chunker/fixed";
 import { withWidth } from "@ipld/unixfs/file/layout/balanced";
-import { exporter } from "@fireproof/vendor/ipfs-unixfs-exporter";
+import { exporter } from "ipfs-unixfs-exporter";
 var queuingStrategy = UnixFS.withCapacity();
 var settings = UnixFS.configure({
   fileChunkEncoder: raw,
@@ -736,9 +736,9 @@ var keyBagProviderFactories = new Map(
       }
     },
     {
-      protocol: "indexdb:",
+      protocol: "indexeddb:",
       factory: async (url, sthis) => {
-        const { KeyBagProviderImpl } = await import("@fireproof/core/indexdb");
+        const { KeyBagProviderImpl } = await import("@fireproof/core/indexeddb");
         return new KeyBagProviderImpl(url, sthis);
       }
     },
@@ -761,7 +761,7 @@ function defaultKeyBagUrl(sthis) {
   let bagFnameOrUrl = sthis.env.get("FP_KEYBAG_URL");
   let url;
   if (runtimeFn2().isBrowser) {
-    url = URI3.from(bagFnameOrUrl || "indexdb://fp-keybag");
+    url = URI3.from(bagFnameOrUrl || "indexeddb://fp-keybag");
   } else {
     if (!bagFnameOrUrl) {
       const home = sthis.env.get("HOME");
@@ -788,7 +788,7 @@ function defaultKeyBagOpts(sthis, kbo) {
   } else {
     let bagFnameOrUrl = sthis.env.get("FP_KEYBAG_URL");
     if (runtimeFn2().isBrowser) {
-      url = URI3.from(bagFnameOrUrl || "indexdb://fp-keybag");
+      url = URI3.from(bagFnameOrUrl || "indexeddb://fp-keybag");
     } else {
       if (!bagFnameOrUrl) {
         const home = sthis.env.get("HOME");
@@ -832,8 +832,8 @@ import { BuildURI, runtimeFn as runtimeFn3 } from "@adviser/cement";
 // src/runtime/gateways/file/version.ts
 var FILESTORE_VERSION = "v0.19-file";
 
-// src/runtime/gateways/indexdb-version.ts
-var INDEXDB_VERSION = "v0.19-indexdb";
+// src/runtime/gateways/indexeddb-version.ts
+var INDEXEDDB_VERSION = "v0.19-indexeddb";
 
 // src/runtime/gateways/file/gateway-impl.ts
 import { exception2Result, KeyedResolvOnce as KeyedResolvOnce2, Result as Result3 } from "@adviser/cement";
@@ -1055,7 +1055,7 @@ import { decodeEventBlock, EventBlock } from "@fireproof/vendor/@web3-storage/pa
 import { base64pad } from "multiformats/bases/base64";
 import { CID } from "multiformats";
 import { fromJSON } from "multiformats/link";
-import { format, parse } from "@fireproof/vendor/@ipld/dag-json";
+import { format, parse } from "@ipld/dag-json";
 async function dbMetaEvent2Serialized(sthis, dbEvents) {
   return await Promise.all(
     dbEvents.map(async (dbEvent) => {
@@ -1222,7 +1222,7 @@ var DefSerdeGateway = class {
     const ret = this.gw.put(url, rUint8.Ok(), sthis);
     if (env.type === "meta" /* META */) {
       if (this.subscribeFn.has(url.toString())) {
-        this.subscribeFn.get(url.toString())(env);
+        this.subscribeFn.get(url.toString())(rUint8.Ok());
       }
     }
     return ret;
@@ -1233,22 +1233,22 @@ var DefSerdeGateway = class {
     return fpDeserialize(sthis, url, res, decoder);
   }
   async subscribe({ loader: { sthis }, decoder }, url, callback) {
+    function rawCallback(raw2) {
+      return fpDeserialize(sthis, url, Result7.Ok(raw2), decoder).then((res) => {
+        if (res.isErr()) {
+          sthis.logger.Error().Err(res).Msg("Failed to deserialize");
+          return;
+        }
+        callback(res.Ok());
+      });
+    }
     if (!this.gw.subscribe) {
-      this.subscribeFn.set(url.toString(), callback);
+      this.subscribeFn.set(url.toString(), rawCallback);
       return Result7.Ok(() => {
         this.subscribeFn.delete(url.toString());
       });
     }
-    const unreg = await this.gw.subscribe(
-      url,
-      (raw2) => {
-        fpDeserialize(sthis, url, Result7.Ok(raw2), decoder).then((res) => {
-          if (res.isErr()) return;
-          callback(res.Ok());
-        });
-      },
-      sthis
-    );
+    const unreg = await this.gw.subscribe(url, rawCallback, sthis);
     return unreg;
   }
   async delete({ loader: { sthis } }, url) {
@@ -1336,13 +1336,13 @@ if (runtimeFn3().isNodeIsh || runtimeFn3().isDeno) {
 }
 if (runtimeFn3().isBrowser) {
   registerStoreProtocol({
-    protocol: "indexdb:",
+    protocol: "indexeddb:",
     isDefault: true,
     defaultURI: () => {
-      return BuildURI.from("indexdb://").pathname("fp").setParam("version" /* VERSION */, INDEXDB_VERSION).setParam("runtime" /* RUNTIME */, "browser").URI();
+      return BuildURI.from("indexeddb://").pathname("fp").setParam("version" /* VERSION */, INDEXEDDB_VERSION).setParam("runtime" /* RUNTIME */, "browser").URI();
     },
     gateway: async () => {
-      const { GatewayImpl } = await import("@fireproof/core/indexdb");
+      const { GatewayImpl } = await import("@fireproof/core/indexeddb");
       return new GatewayImpl();
     }
   });
@@ -1432,7 +1432,7 @@ async function createUnsafe({
 
 // src/indexer-helpers.ts
 import { sha256 as hasher } from "multiformats/hashes/sha2";
-import * as codec from "@fireproof/vendor/@ipld/dag-cbor";
+import * as codec from "@ipld/dag-cbor";
 import charwise from "charwise";
 import * as DbIndex from "prolly-trees/db-index";
 import { bf, simpleCompare } from "prolly-trees/utils";
@@ -1941,12 +1941,12 @@ import { exception2Result as exception2Result3, ResolveOnce as ResolveOnce4, Res
 
 // src/blockstore/loader.ts
 import pLimit from "p-limit";
-import { CarReader } from "@fireproof/vendor/@ipld/car/reader";
+import { CarReader } from "@ipld/car/reader";
 import { ResolveOnce as ResolveOnce3 } from "@adviser/cement";
 
 // src/blockstore/loader-helpers.ts
 import { sha256 as hasher2 } from "multiformats/hashes/sha2";
-import * as dagCodec from "@fireproof/vendor/@ipld/dag-cbor";
+import * as dagCodec from "@ipld/dag-cbor";
 async function parseCarFile(reader, logger) {
   const roots = await reader.getRoots();
   const header = await reader.get(roots[0]);
@@ -2233,9 +2233,9 @@ var CommitQueue = class {
 };
 
 // src/blockstore/commitor.ts
-import * as CBW from "@fireproof/vendor/@ipld/car/buffer-writer";
+import * as CBW from "@ipld/car/buffer-writer";
 import { sha256 as hasher3 } from "multiformats/hashes/sha2";
-import * as dagCodec2 from "@fireproof/vendor/@ipld/dag-cbor";
+import * as dagCodec2 from "@ipld/dag-cbor";
 async function encodeCarFile(roots, t, codec3) {
   let size = 0;
   const headerSize = CBW.headerLength({ roots });
@@ -2714,7 +2714,7 @@ var Loader = class {
     let loadedCar = void 0;
     let activeStore = local;
     try {
-      this.logger.Debug().Str("cid", cidsString).Msg("loading car");
+      this.logger.Debug().Any("cid", cidsString).Msg("loading car");
       loadedCar = await local.load(cid);
       this.logger.Debug().Bool("loadedCar", loadedCar).Msg("loaded");
     } catch (e) {
@@ -2771,7 +2771,7 @@ __export(keyed_crypto_exports, {
 });
 import { base58btc as base58btc3 } from "multiformats/bases/base58";
 import { sha256 as hasher5 } from "multiformats/hashes/sha2";
-import * as CBOR from "@fireproof/vendor/cborg";
+import * as CBOR from "cborg";
 var generateIV = {
   random: {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -2937,7 +2937,7 @@ async function keyedCryptoFactory(url, kb, sthis) {
 
 // src/blockstore/store.ts
 import { EventBlock as EventBlock2 } from "@fireproof/vendor/@web3-storage/pail/clock";
-import { format as format2 } from "@fireproof/vendor/@ipld/dag-json";
+import { format as format2 } from "@ipld/dag-json";
 import pRetry from "p-retry";
 import pMap from "p-map";
 
@@ -3788,7 +3788,7 @@ var ConnectionBase = class {
 // src/crdt-helpers.ts
 import { parse as parse2 } from "multiformats/link";
 import { sha256 as hasher6 } from "multiformats/hashes/sha2";
-import * as codec2 from "@fireproof/vendor/@ipld/dag-cbor";
+import * as codec2 from "@ipld/dag-cbor";
 import { put, get, entries, root } from "@fireproof/vendor/@web3-storage/pail/crdt";
 import { EventFetcher, vis } from "@fireproof/vendor/@web3-storage/pail/clock";
 import * as Batch from "@fireproof/vendor/@web3-storage/pail/crdt/batch";
@@ -4609,7 +4609,7 @@ function fireproof(name, opts) {
 var runtime_exports = {};
 __export(runtime_exports, {
   FILESTORE_VERSION: () => FILESTORE_VERSION,
-  INDEXDB_VERSION: () => INDEXDB_VERSION,
+  INDEXEDDB_VERSION: () => INDEXEDDB_VERSION,
   KeyBag: () => KeyBag,
   defaultKeyBagOpts: () => defaultKeyBagOpts,
   defaultKeyBagUrl: () => defaultKeyBagUrl,
@@ -4659,7 +4659,7 @@ __export(file_exports, {
 
 // src/version.ts
 var PACKAGE_VERSION = Object.keys({
-  "0.20.0-dev-preview-19": "xxxx"
+  "0.20.0-dev-preview-21": "xxxx"
 })[0];
 export {
   CRDTImpl,