@fireproof/core 0.20.0-dev-preview-60 → 0.20.0-dev-preview-62

package/index.d.cts

@@ -223,7 +223,10 @@ declare function coerceIntoUint8(raw: ToUInt8): Result<Uint8Array>;
 declare function coercePromiseIntoUint8(raw: PromiseToUInt8): Promise<Result<Uint8Array>>;
 declare function makeName(fnString: string): string;
 declare function storeType2DataMetaWal(store: StoreType): "data" | "wal" | "meta";
-declare function ensureURIDefaults(sthis: SuperThis, name: string, curi: CoerceURI | undefined, uri: URI, store: StoreType, ctx?: Partial<{
+declare function ensureURIDefaults(sthis: SuperThis, names: {
+    name: string;
+    local?: string;
+}, curi: CoerceURI | undefined, uri: URI, store: StoreType, ctx?: Partial<{
     readonly idx: boolean;
     readonly file: boolean;
 }>): URI;
@@ -1199,6 +1202,7 @@ declare const PARAM: {
     CAR_COMPACT_CACHE_SIZE: string;
     CAR_META_CACHE_SIZE: string;
     GENESIS_CID: string;
+    LOCAL_NAME: string;
 };
 type PARAMS = (typeof PARAM)[keyof typeof PARAM];
 declare function throwFalsy<T>(value: T | Falsy): T;

package/index.d.ts

@@ -223,7 +223,10 @@ declare function coerceIntoUint8(raw: ToUInt8): Result<Uint8Array>;
 declare function coercePromiseIntoUint8(raw: PromiseToUInt8): Promise<Result<Uint8Array>>;
 declare function makeName(fnString: string): string;
 declare function storeType2DataMetaWal(store: StoreType): "data" | "wal" | "meta";
-declare function ensureURIDefaults(sthis: SuperThis, name: string, curi: CoerceURI | undefined, uri: URI, store: StoreType, ctx?: Partial<{
+declare function ensureURIDefaults(sthis: SuperThis, names: {
+    name: string;
+    local?: string;
+}, curi: CoerceURI | undefined, uri: URI, store: StoreType, ctx?: Partial<{
     readonly idx: boolean;
     readonly file: boolean;
 }>): URI;
@@ -1199,6 +1202,7 @@ declare const PARAM: {
     CAR_COMPACT_CACHE_SIZE: string;
     CAR_META_CACHE_SIZE: string;
     GENESIS_CID: string;
+    LOCAL_NAME: string;
 };
 type PARAMS = (typeof PARAM)[keyof typeof PARAM];
 declare function throwFalsy<T>(value: T | Falsy): T;

package/index.js

@@ -23,7 +23,7 @@ import {
 
 // src/types.ts
 function isFalsy(value) {
-  return value === false && value === null && value === void 0;
+  return value === false || value === null || value === void 0;
 }
 var PARAM = {
   SUFFIX: "suffix",
@@ -51,7 +51,8 @@ var PARAM = {
   CAR_CACHE_SIZE: "carCacheSize",
   CAR_COMPACT_CACHE_SIZE: "carCompactCacheSize",
   CAR_META_CACHE_SIZE: "carMetaCacheSize",
-  GENESIS_CID: "baembeiarootfireproofgenesisblockaaaafireproofgenesisblocka"
+  GENESIS_CID: "baembeiarootfireproofgenesisblockaaaafireproofgenesisblocka",
+  LOCAL_NAME: "localName"
   // FS = "fs",
 };
 function throwFalsy(value) {
@@ -426,11 +427,11 @@ function storeType2DataMetaWal(store) {
       throw new Error(`unknown store ${store}`);
   }
 }
-function ensureURIDefaults(sthis, name, curi, uri, store, ctx) {
+function ensureURIDefaults(sthis, names, curi, uri, store, ctx) {
   ctx = ctx || {};
-  const ret = (curi ? URI.from(curi) : uri).build().setParam(PARAM.STORE, store).defParam(PARAM.NAME, name);
-  if (!ret.hasParam(PARAM.NAME)) {
-    throw sthis.logger.Error().Url(ret).Any("ctx", ctx).Msg("Ledger name is required").AsError();
+  const ret = (curi ? URI.from(curi) : uri).build().setParam(PARAM.STORE, store).defParam(PARAM.NAME, names.name);
+  if (names.local) {
+    ret.defParam(PARAM.LOCAL_NAME, names.local);
   }
   if (ctx.idx) {
     ret.defParam(PARAM.INDEX, "idx");
@@ -1238,6 +1239,13 @@ import { Result as Result5 } from "@adviser/cement";
 var MEMORY_VERSION = "v0.19-memory";
 
 // src/runtime/gateways/memory/gateway.ts
+function cleanURI(uri) {
+  return uri.build().cleanParams(
+    PARAM.VERSION,
+    // PARAM.STORE,
+    PARAM.LOCAL_NAME
+  ).URI();
+}
 var MemoryGateway = class {
   // readonly logger: Logger;
   constructor(sthis, memorys) {
@@ -1255,33 +1263,33 @@ var MemoryGateway = class {
     return Promise.resolve(Result5.Ok(void 0));
   }
   destroy(baseUrl) {
-    const keyUrl = baseUrl.toString();
+    const keyUrl = cleanURI(baseUrl);
+    const match = keyUrl.match(keyUrl);
     for (const key of this.memorys.keys()) {
-      if (key.startsWith(keyUrl)) {
+      if (keyUrl.match(key).score >= match.score) {
         this.memorys.delete(key);
       }
     }
-    this.memorys.clear();
     return Promise.resolve(Result5.Ok(void 0));
   }
   async put(url, bytes) {
-    this.memorys.set(url.toString(), bytes);
+    this.memorys.set(cleanURI(url).toString(), bytes);
     return Result5.Ok(void 0);
   }
   // get could return a NotFoundError if the key is not found
   get(url) {
-    const x = this.memorys.get(url.toString());
+    const x = this.memorys.get(cleanURI(url).toString());
     if (!x) {
       return Promise.resolve(Result5.Err(new NotFoundError(`not found: ${url.toString()}`)));
     }
     return Promise.resolve(Result5.Ok(x));
   }
   delete(url) {
-    this.memorys.delete(url.toString());
+    this.memorys.delete(cleanURI(url).toString());
     return Promise.resolve(Result5.Ok(void 0));
   }
   async getPlain(url, key) {
-    const x = this.memorys.get(url.build().setParam(PARAM.KEY, key).toString());
+    const x = this.memorys.get(cleanURI(url).build().setParam(PARAM.KEY, key).toString());
     if (!x) {
       return Result5.Err(new NotFoundError("not found"));
     }
@@ -2964,19 +2972,44 @@ var AttachedRemotesImpl = class {
     const gws = {
       car: {
         ...gwp.car,
-        url: ensureURIDefaults(this.loadable.sthis, attached.name, gwp.car.url, URI9.from(gwp.car.url), "car")
+        url: ensureURIDefaults(
+          this.loadable.sthis,
+          { name: attached.name, local: this._local?.gatewayUrls.car.url.getParam(PARAM.NAME) },
+          void 0,
+          URI9.from(gwp.car.url),
+          "car"
+        )
       },
       file: {
         ...gwp.file,
-        url: ensureURIDefaults(this.loadable.sthis, attached.name, void 0, URI9.from(gwp.file.url), "file", { file: true })
+        url: ensureURIDefaults(
+          this.loadable.sthis,
+          { name: attached.name, local: this._local?.gatewayUrls.file.url.getParam(PARAM.NAME) },
+          void 0,
+          URI9.from(gwp.file.url),
+          "file",
+          { file: true }
+        )
       },
       meta: {
         ...gwp.meta,
-        url: ensureURIDefaults(this.loadable.sthis, attached.name, void 0, URI9.from(gwp.meta.url), "meta")
+        url: ensureURIDefaults(
+          this.loadable.sthis,
+          { name: attached.name, local: this._local?.gatewayUrls.meta.url.getParam(PARAM.NAME) },
+          void 0,
+          URI9.from(gwp.meta.url),
+          "meta"
+        )
       },
       wal: gwp.wal ? {
         ...gwp.wal,
-        url: ensureURIDefaults(this.loadable.sthis, attached.name, void 0, URI9.from(gwp.wal.url), "wal")
+        url: ensureURIDefaults(
+          this.loadable.sthis,
+          { name: attached.name, local: this._local?.gatewayUrls.wal?.url.getParam(PARAM.NAME) },
+          void 0,
+          URI9.from(gwp.wal.url),
+          "wal"
+        )
       } : void 0
     };
     const key = JSON.stringify(
@@ -3001,7 +3034,7 @@ var AttachedRemotesImpl = class {
       );
       if (result.stores.wal) {
         if (this._local) {
-          throw this.loadable.sthis.logger.Error().Msg("local store could only set once").AsError();
+          throw this.loadable.sthis.logger.Error().Any({ urls: result.gatewayUrls }).Msg("local store could only set once").AsError();
         }
         this._local = result;
       }
@@ -3068,10 +3101,11 @@ var Loader = class {
     if (!at.stores.wal) {
       try {
         const dbMeta = await at.stores.meta.load();
-        if (!Array.isArray(dbMeta)) {
-          throw this.logger.Error().Msg("missing dbMeta").AsError();
+        if (Array.isArray(dbMeta)) {
+          await this.handleDbMetasFromStore(dbMeta, this.attachedStores.activate(at.stores));
+        } else if (!isFalsy(dbMeta)) {
+          throw this.logger.Error().Any({ dbMeta }).Msg("missing dbMeta").AsError();
         }
-        await this.handleDbMetasFromStore(dbMeta, this.attachedStores.activate(at.stores));
       } catch (e) {
         this.logger.Error().Err(e).Msg("error attaching store");
         at.detach();
@@ -5200,19 +5234,26 @@ function toStoreURIRuntime(sthis, name, sopts) {
   const base = URI13.from(sopts.base);
   return {
     idx: {
-      car: ensureURIDefaults(sthis, name, sopts.idx?.car ?? sopts.data?.car, base, "car", { idx: true }),
-      file: ensureURIDefaults(sthis, name, sopts.idx?.file ?? sopts.idx?.car ?? sopts.data?.file ?? sopts.data?.car, base, "file", {
-        file: true,
-        idx: true
-      }),
-      meta: ensureURIDefaults(sthis, name, sopts.idx?.meta ?? sopts.data?.meta, base, "meta", { idx: true }),
-      wal: ensureURIDefaults(sthis, name, sopts.idx?.wal ?? sopts.data?.wal, base, "wal", { idx: true })
+      car: ensureURIDefaults(sthis, { name }, sopts.idx?.car ?? sopts.data?.car, base, "car", { idx: true }),
+      file: ensureURIDefaults(
+        sthis,
+        { name },
+        sopts.idx?.file ?? sopts.idx?.car ?? sopts.data?.file ?? sopts.data?.car,
+        base,
+        "file",
+        {
+          file: true,
+          idx: true
+        }
+      ),
+      meta: ensureURIDefaults(sthis, { name }, sopts.idx?.meta ?? sopts.data?.meta, base, "meta", { idx: true }),
+      wal: ensureURIDefaults(sthis, { name }, sopts.idx?.wal ?? sopts.data?.wal, base, "wal", { idx: true })
     },
     data: {
-      car: ensureURIDefaults(sthis, name, sopts.data?.car, base, "car"),
-      file: ensureURIDefaults(sthis, name, sopts.data?.file ?? sopts.data?.car, base, "file", { file: true }),
-      meta: ensureURIDefaults(sthis, name, sopts.data?.meta, base, "meta"),
-      wal: ensureURIDefaults(sthis, name, sopts.data?.wal, base, "wal")
+      car: ensureURIDefaults(sthis, { name }, sopts.data?.car, base, "car"),
+      file: ensureURIDefaults(sthis, { name }, sopts.data?.file ?? sopts.data?.car, base, "file", { file: true }),
+      meta: ensureURIDefaults(sthis, { name }, sopts.data?.meta, base, "meta"),
+      wal: ensureURIDefaults(sthis, { name }, sopts.data?.wal, base, "wal")
     }
   };
 }
@@ -7218,7 +7259,7 @@ function buildResDelWAL(msgCtx, req, ctx) {
 
 // src/version.ts
 var PACKAGE_VERSION = Object.keys({
-  "0.20.0-dev-preview-60": "xxxx"
+  "0.20.0-dev-preview-62": "xxxx"
 })[0];
 export {
   CRDTImpl,