@fireproof/core 0.20.0-dev-preview-14 → 0.20.0-dev-preview-15

package/index.cjs

@@ -71,7 +71,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/ledger.ts
-var import_cement19 = require("@adviser/cement");
+var import_cement20 = require("@adviser/cement");
 
 // src/utils.ts
 var import_cement = require("@adviser/cement");
@@ -1251,16 +1251,20 @@ var DefSerdeGateway = class {
     this.subscribeFn = /* @__PURE__ */ new Map();
     this.gw = gw;
   }
-  start(sthis, baseURL) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  start(sthis, baseURL, loader) {
     return this.gw.start(baseURL, sthis);
   }
-  async buildUrl(sthis, baseUrl, key) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async buildUrl(sthis, baseUrl, key, loader) {
     return this.gw.buildUrl(baseUrl, key, sthis);
   }
-  async close(sthis, uri) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async close(sthis, uri, loader) {
     return this.gw.close(uri, sthis);
   }
-  async put(sthis, url, env) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async put(sthis, url, env, loader) {
     const rUint8 = await fpSerialize(sthis, env);
     if (rUint8.isErr()) return rUint8;
     const ret = this.gw.put(url, rUint8.Ok(), sthis);
@@ -1271,12 +1275,13 @@ var DefSerdeGateway = class {
     }
     return ret;
   }
-  async get(sthis, url) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async get(sthis, url, loader) {
     const res = await this.gw.get(url, sthis);
     if (res.isErr()) return import_cement9.Result.Err(res.Err());
     return fpDeserialize(sthis, url, res);
   }
-  async subscribe(sthis, url, callback) {
+  async subscribe(sthis, url, callback, loader) {
     if (!this.gw.subscribe) {
       this.subscribeFn.set(url.toString(), callback);
       return import_cement9.Result.Ok(() => {
@@ -1295,13 +1300,16 @@ var DefSerdeGateway = class {
     );
     return unreg;
   }
-  async delete(sthis, url) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async delete(sthis, url, loader) {
     return this.gw.delete(url, sthis);
   }
-  async destroy(sthis, baseURL) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async destroy(sthis, baseURL, loader) {
     return this.gw.destroy(baseURL, sthis);
   }
-  async getPlain(sthis, iurl, key) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async getPlain(sthis, iurl, key, loader) {
     return this.gw.getPlain(iurl, key, sthis);
   }
 };
@@ -1936,7 +1944,7 @@ var DatabaseImpl = class {
 };
 
 // src/crdt.ts
-var import_cement18 = require("@adviser/cement");
+var import_cement19 = require("@adviser/cement");
 
 // src/blockstore/index.ts
 var blockstore_exports = {};
@@ -3687,6 +3695,9 @@ function toStoreRuntime(sthis, endeOpts = {}) {
   };
 }
 
+// src/blockstore/connection-base.ts
+var import_cement17 = require("@adviser/cement");
+
 // src/blockstore/store-remote.ts
 async function RemoteDataStore(sthis, url, opts) {
   const ds = new DataStoreImpl(sthis, url, opts);
@@ -3699,6 +3710,22 @@ async function RemoteMetaStore(sthis, url, opts) {
   return ms;
 }
 
+// src/context.ts
+var Context = class {
+  constructor() {
+    this.ctx = /* @__PURE__ */ new Map();
+  }
+  set(key, value) {
+    this.ctx.set(key, value);
+  }
+  get(key) {
+    return this.ctx.get(key);
+  }
+  delete(key) {
+    this.ctx.delete(key);
+  }
+};
+
 // src/blockstore/connection-base.ts
 function coerceLoader(ref) {
   const refl = ref;
@@ -3713,10 +3740,22 @@ function coerceLoader(ref) {
 }
 var ConnectionBase = class {
   constructor(url, logger) {
-    this.loaded = Promise.resolve();
+    // loaded: Promise<void> = Promise.resolve();
+    this.context = new Context();
+    this._loaded = /* @__PURE__ */ new Set();
+    this._metaIsLoading = false;
     this.logger = logger;
     this.url = url;
   }
+  loaded() {
+    const f = new import_cement17.Future();
+    if (!this._metaIsLoading) {
+      f.resolve();
+    } else {
+      this._loaded.add(f);
+    }
+    return f;
+  }
   async refresh() {
     await throwFalsy(throwFalsy(this.loader).remoteMetaStore).load();
     await (await throwFalsy(this.loader).WALStore()).process();
@@ -3744,22 +3783,34 @@ var ConnectionBase = class {
       loader
     });
     this.loader.remoteMetaStore = remote;
-    this.loaded = this.loader.ready().then(async () => {
+    this._metaIsLoading = true;
+    this.loader.ready().then(async () => {
       return remote.load().then(async () => {
-        return (await throwFalsy(this.loader).WALStore()).process();
+        const res = await (0, import_cement17.exception2Result)(async () => {
+          return await (await throwFalsy(this.loader).WALStore()).process();
+        });
+        this._metaIsLoading = false;
+        for (const f of this._loaded) {
+          if (res.isErr()) {
+            f.reject(res.Err());
+          } else {
+            f.resolve();
+          }
+        }
+        this._loaded.clear();
       });
     });
   }
   async connectStorage(refl) {
     const loader = coerceLoader(refl);
-    if (!loader) throw this.logger.Error().Msg("connectStorage_X: loader is required").AsError();
+    if (!loader) throw this.logger.Error().Msg("connectStorage: loader is required").AsError();
     this.loader = loader;
     const dataUrl = this.url.build().defParam("store" /* STORE */, "data").URI();
     const rgateway = await getStartedGateway(loader.sthis, dataUrl);
     if (rgateway.isErr())
-      throw this.logger.Error().Result("err", rgateway).Url(dataUrl).Msg("connectStorage_X: gateway is required").AsError();
+      throw this.logger.Error().Result("err", rgateway).Url(dataUrl).Msg("connectStorage: gateway is required").AsError();
     const name = dataUrl.getParam("name" /* NAME */);
-    if (!name) throw this.logger.Error().Url(dataUrl).Msg("connectStorage_X: name is required").AsError;
+    if (!name) throw this.logger.Error().Url(dataUrl).Msg("connectStorage: name is required").AsError;
     loader.remoteCarStore = await RemoteDataStore(loader.sthis, this.url, {
       gateway: rgateway.Ok().gateway,
       loader
@@ -4074,7 +4125,7 @@ async function getBlock(blocks, cidString) {
 // src/crdt-clock.ts
 var import_clock4 = require("@fireproof/vendor/@web3-storage/pail/clock");
 var import_crdt2 = require("@fireproof/vendor/@web3-storage/pail/crdt");
-var import_cement17 = require("@adviser/cement");
+var import_cement18 = require("@adviser/cement");
 
 // src/apply-head-queue.ts
 function applyHeadQueue(worker, logger) {
@@ -4131,7 +4182,7 @@ var CRDTClockImpl = class {
     this.zoomers = /* @__PURE__ */ new Map();
     this.watchers = /* @__PURE__ */ new Map();
     this.emptyWatchers = /* @__PURE__ */ new Map();
-    this._ready = new import_cement17.ResolveOnce();
+    this._ready = new import_cement18.ResolveOnce();
     this.sthis = blockstore.sthis;
     this.blockstore = blockstore;
     this.logger = ensureLogger(blockstore.sthis, "CRDTClock");
@@ -4257,7 +4308,7 @@ async function advanceBlocks(logger, newHead, tblocks, head) {
 var CRDTImpl = class {
   constructor(sthis, opts) {
     this.indexers = /* @__PURE__ */ new Map();
-    this.onceReady = new import_cement18.ResolveOnce();
+    this.onceReady = new import_cement19.ResolveOnce();
     this.sthis = sthis;
     this.crdt = this;
     this.logger = ensureLogger(sthis, "CRDT");
@@ -4375,24 +4426,8 @@ var CRDTImpl = class {
   }
 };
 
-// src/context.ts
-var Context = class {
-  constructor() {
-    this.ctx = /* @__PURE__ */ new Map();
-  }
-  set(key, value) {
-    this.ctx.set(key, value);
-  }
-  get(key) {
-    return this.ctx.get(key);
-  }
-  delete(key) {
-    this.ctx.delete(key);
-  }
-};
-
 // src/ledger.ts
-var ledgers = new import_cement19.KeyedResolvOnce();
+var ledgers = new import_cement20.KeyedResolvOnce();
 function keyConfigOpts(sthis, name, opts) {
   return JSON.stringify(
     toSortedArray({
@@ -4478,7 +4513,7 @@ var LedgerImpl = class {
     this.shells = /* @__PURE__ */ new Set();
     this.context = new Context();
     this._onClosedFns = /* @__PURE__ */ new Map();
-    this._ready = new import_cement19.ResolveOnce();
+    this._ready = new import_cement20.ResolveOnce();
     this.opts = opts;
     this.sthis = sthis;
     this.id = sthis.timeOrderedNextId().str;
@@ -4578,7 +4613,7 @@ var LedgerImpl = class {
 };
 function defaultURI2(sthis, curi, uri, store, ctx) {
   ctx = ctx || {};
-  const ret = (curi ? import_cement19.URI.from(curi) : uri).build().setParam("store" /* STORE */, store);
+  const ret = (curi ? import_cement20.URI.from(curi) : uri).build().setParam("store" /* STORE */, store);
   if (!ret.hasParam("name" /* NAME */)) {
     const name = sthis.pathOps.basename(ret.URI().pathname);
     if (!name) {
@@ -4605,12 +4640,12 @@ function toStoreURIRuntime(sthis, name, sopts) {
   if (!sopts.base) {
     const fp_env = sthis.env.get("FP_STORAGE_URL");
     if (fp_env) {
-      sopts = { ...sopts, base: import_cement19.BuildURI.from(fp_env).setParam("urlGen" /* URL_GEN */, "fromEnv") };
+      sopts = { ...sopts, base: import_cement20.BuildURI.from(fp_env).setParam("urlGen" /* URL_GEN */, "fromEnv") };
     } else {
       sopts = { ...sopts, base: getDefaultURI(sthis).build().setParam("urlGen" /* URL_GEN */, "default") };
     }
   }
-  const bbase = import_cement19.BuildURI.from(sopts.base);
+  const bbase = import_cement20.BuildURI.from(sopts.base);
   if (name) {
     bbase.setParam("name" /* NAME */, name);
   }
@@ -4651,7 +4686,7 @@ __export(runtime_exports, {
   kc: () => keyed_crypto_exports,
   mf: () => wait_pr_multiformats_exports,
   registerKeyBagProviderFactory: () => registerKeyBagProviderFactory,
-  runtimeFn: () => import_cement20.runtimeFn
+  runtimeFn: () => import_cement21.runtimeFn
 });
 
 // src/runtime/wait-pr-multiformats/index.ts
@@ -4665,7 +4700,7 @@ __export(wait_pr_multiformats_exports, {
 var codec_interface_exports = {};
 
 // src/runtime/index.ts
-var import_cement20 = require("@adviser/cement");
+var import_cement21 = require("@adviser/cement");
 
 // src/runtime/gateways/index.ts
 var gateways_exports = {};
@@ -4685,6 +4720,6 @@ __export(file_exports, {
 
 // src/version.ts
 var PACKAGE_VERSION = Object.keys({
-  "0.20.0-dev-preview-14": "xxxx"
+  "0.20.0-dev-preview-15": "xxxx"
 })[0];
 //# sourceMappingURL=index.cjs.map