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

package/index.d.cts

@@ -295,6 +295,13 @@ interface SerdeGatewayInterceptor {
     subscribe(sthis: SuperThis, url: URI, callback: (meta: FPEnvelopeMeta) => Promise<void>, loader: Loadable): Promise<Result<SerdeGatewaySubscribeReturn>>;
 }
 
+declare class Context {
+    private ctx;
+    set<T>(key: string, value: T): void;
+    get<T>(key: string): T | undefined;
+    delete(key: string): void;
+}
+
 type AnyLink = Link<unknown, number, number, Version>;
 type CarGroup = AnyLink[];
 type CarLog = CarGroup[];
@@ -450,7 +457,8 @@ interface RefBlockstore {
     readonly blockstore: RefLoadable;
 }
 interface Connection {
-    readonly loaded: Promise<void>;
+    loaded(): Future<void>;
+    readonly context: Context;
     connectStorage(ref: RefLoadable | RefBlockstore): void;
 }
 interface BaseStore {
@@ -703,10 +711,13 @@ declare function parseCarFile<T>(reader: CarReader$1, logger: Logger): Promise<C
 declare abstract class ConnectionBase implements Connection {
     private loader?;
     taskManager?: TaskManager;
-    loaded: Promise<void>;
+    readonly context: Context;
     readonly url: URI;
     readonly logger: Logger;
     constructor(url: URI, logger: Logger);
+    private readonly _loaded;
+    private _metaIsLoading;
+    loaded(): Future<void>;
     refresh(): Promise<void>;
     connect(refl: RefLoadable | RefBlockstore): Promise<void>;
     connectMeta(refl: RefLoadable | RefBlockstore): Promise<void>;
@@ -897,13 +908,6 @@ declare class Index<K extends IndexKeyType, T extends DocTypes, R extends DocFra
     _updateIndex(): Promise<IndexTransactionMeta>;
 }
 
-declare class Context {
-    private ctx;
-    set<T>(key: string, value: T): void;
-    get<T>(key: string): T | undefined;
-    delete(key: string): void;
-}
-
 type Falsy = false | null | undefined;
 declare function isFalsy(value: unknown): value is Falsy;
 declare enum PARAM {
@@ -1535,16 +1539,16 @@ declare namespace index$2 {
 declare class DefSerdeGateway implements SerdeGateway {
     readonly gw: Gateway;
     constructor(gw: Gateway);
-    start(sthis: SuperThis, baseURL: URI): Promise<Result<URI>>;
-    buildUrl(sthis: SuperThis, baseUrl: URI, key: string): Promise<Result<URI>>;
-    close(sthis: SuperThis, uri: URI): Promise<Result<void>>;
+    start(sthis: SuperThis, baseURL: URI, loader?: Loadable): Promise<Result<URI>>;
+    buildUrl(sthis: SuperThis, baseUrl: URI, key: string, loader?: Loadable): Promise<Result<URI>>;
+    close(sthis: SuperThis, uri: URI, loader?: Loadable): Promise<Result<void>>;
     private subscribeFn;
-    put<T>(sthis: SuperThis, url: URI, env: FPEnvelope<T>): Promise<Result<void>>;
-    get<S>(sthis: SuperThis, url: URI): Promise<SerdeGetResult<S>>;
-    subscribe(sthis: SuperThis, url: URI, callback: (meta: FPEnvelopeMeta) => Promise<void>): Promise<Result<() => void>>;
-    delete(sthis: SuperThis, url: URI): Promise<Result<void>>;
-    destroy(sthis: SuperThis, baseURL: URI): Promise<Result<void>>;
-    getPlain(sthis: SuperThis, iurl: URI, key: string): Promise<Result<Uint8Array<ArrayBufferLike>, Error>>;
+    put<T>(sthis: SuperThis, url: URI, env: FPEnvelope<T>, loader?: Loadable): Promise<Result<void>>;
+    get<S>(sthis: SuperThis, url: URI, loader?: Loadable): Promise<SerdeGetResult<S>>;
+    subscribe(sthis: SuperThis, url: URI, callback: (meta: FPEnvelopeMeta) => Promise<void>, loader?: Loadable): Promise<Result<() => void>>;
+    delete(sthis: SuperThis, url: URI, loader?: Loadable): Promise<Result<void>>;
+    destroy(sthis: SuperThis, baseURL: URI, loader?: Loadable): Promise<Result<void>>;
+    getPlain(sthis: SuperThis, iurl: URI, key: string, loader?: Loadable): Promise<Result<Uint8Array<ArrayBufferLike>, Error>>;
 }
 
 type index$1_CARDecodeEnvelope = CARDecodeEnvelope;

package/index.d.ts

@@ -295,6 +295,13 @@ interface SerdeGatewayInterceptor {
     subscribe(sthis: SuperThis, url: URI, callback: (meta: FPEnvelopeMeta) => Promise<void>, loader: Loadable): Promise<Result<SerdeGatewaySubscribeReturn>>;
 }
 
+declare class Context {
+    private ctx;
+    set<T>(key: string, value: T): void;
+    get<T>(key: string): T | undefined;
+    delete(key: string): void;
+}
+
 type AnyLink = Link<unknown, number, number, Version>;
 type CarGroup = AnyLink[];
 type CarLog = CarGroup[];
@@ -450,7 +457,8 @@ interface RefBlockstore {
     readonly blockstore: RefLoadable;
 }
 interface Connection {
-    readonly loaded: Promise<void>;
+    loaded(): Future<void>;
+    readonly context: Context;
     connectStorage(ref: RefLoadable | RefBlockstore): void;
 }
 interface BaseStore {
@@ -703,10 +711,13 @@ declare function parseCarFile<T>(reader: CarReader$1, logger: Logger): Promise<C
 declare abstract class ConnectionBase implements Connection {
     private loader?;
     taskManager?: TaskManager;
-    loaded: Promise<void>;
+    readonly context: Context;
     readonly url: URI;
     readonly logger: Logger;
     constructor(url: URI, logger: Logger);
+    private readonly _loaded;
+    private _metaIsLoading;
+    loaded(): Future<void>;
     refresh(): Promise<void>;
     connect(refl: RefLoadable | RefBlockstore): Promise<void>;
     connectMeta(refl: RefLoadable | RefBlockstore): Promise<void>;
@@ -897,13 +908,6 @@ declare class Index<K extends IndexKeyType, T extends DocTypes, R extends DocFra
     _updateIndex(): Promise<IndexTransactionMeta>;
 }
 
-declare class Context {
-    private ctx;
-    set<T>(key: string, value: T): void;
-    get<T>(key: string): T | undefined;
-    delete(key: string): void;
-}
-
 type Falsy = false | null | undefined;
 declare function isFalsy(value: unknown): value is Falsy;
 declare enum PARAM {
@@ -1535,16 +1539,16 @@ declare namespace index$2 {
 declare class DefSerdeGateway implements SerdeGateway {
     readonly gw: Gateway;
     constructor(gw: Gateway);
-    start(sthis: SuperThis, baseURL: URI): Promise<Result<URI>>;
-    buildUrl(sthis: SuperThis, baseUrl: URI, key: string): Promise<Result<URI>>;
-    close(sthis: SuperThis, uri: URI): Promise<Result<void>>;
+    start(sthis: SuperThis, baseURL: URI, loader?: Loadable): Promise<Result<URI>>;
+    buildUrl(sthis: SuperThis, baseUrl: URI, key: string, loader?: Loadable): Promise<Result<URI>>;
+    close(sthis: SuperThis, uri: URI, loader?: Loadable): Promise<Result<void>>;
     private subscribeFn;
-    put<T>(sthis: SuperThis, url: URI, env: FPEnvelope<T>): Promise<Result<void>>;
-    get<S>(sthis: SuperThis, url: URI): Promise<SerdeGetResult<S>>;
-    subscribe(sthis: SuperThis, url: URI, callback: (meta: FPEnvelopeMeta) => Promise<void>): Promise<Result<() => void>>;
-    delete(sthis: SuperThis, url: URI): Promise<Result<void>>;
-    destroy(sthis: SuperThis, baseURL: URI): Promise<Result<void>>;
-    getPlain(sthis: SuperThis, iurl: URI, key: string): Promise<Result<Uint8Array<ArrayBufferLike>, Error>>;
+    put<T>(sthis: SuperThis, url: URI, env: FPEnvelope<T>, loader?: Loadable): Promise<Result<void>>;
+    get<S>(sthis: SuperThis, url: URI, loader?: Loadable): Promise<SerdeGetResult<S>>;
+    subscribe(sthis: SuperThis, url: URI, callback: (meta: FPEnvelopeMeta) => Promise<void>, loader?: Loadable): Promise<Result<() => void>>;
+    delete(sthis: SuperThis, url: URI, loader?: Loadable): Promise<Result<void>>;
+    destroy(sthis: SuperThis, baseURL: URI, loader?: Loadable): Promise<Result<void>>;
+    getPlain(sthis: SuperThis, iurl: URI, key: string, loader?: Loadable): Promise<Result<Uint8Array<ArrayBufferLike>, Error>>;
 }
 
 type index$1_CARDecodeEnvelope = CARDecodeEnvelope;

package/index.js

@@ -5,7 +5,7 @@ var __export = (target, all) => {
 };
 
 // src/ledger.ts
-import { BuildURI as BuildURI2, KeyedResolvOnce as KeyedResolvOnce4, ResolveOnce as ResolveOnce7, URI as URI12 } from "@adviser/cement";
+import { BuildURI as BuildURI2, KeyedResolvOnce as KeyedResolvOnce4, ResolveOnce as ResolveOnce7, URI as URI13 } from "@adviser/cement";
 
 // src/utils.ts
 import {
@@ -1203,16 +1203,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);
@@ -1223,12 +1227,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 Result7.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 Result7.Ok(() => {
@@ -1247,13 +1252,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);
   }
 };
@@ -3639,6 +3647,9 @@ function toStoreRuntime(sthis, endeOpts = {}) {
   };
 }
 
+// src/blockstore/connection-base.ts
+import { exception2Result as exception2Result4, Future as Future3 } from "@adviser/cement";
+
 // src/blockstore/store-remote.ts
 async function RemoteDataStore(sthis, url, opts) {
   const ds = new DataStoreImpl(sthis, url, opts);
@@ -3651,6 +3662,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;
@@ -3665,10 +3692,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 Future3();
+    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();
@@ -3696,22 +3735,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 exception2Result4(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
@@ -4327,22 +4378,6 @@ 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 KeyedResolvOnce4();
 function keyConfigOpts(sthis, name, opts) {
@@ -4530,7 +4565,7 @@ var LedgerImpl = class {
 };
 function defaultURI2(sthis, curi, uri, store, ctx) {
   ctx = ctx || {};
-  const ret = (curi ? URI12.from(curi) : uri).build().setParam("store" /* STORE */, store);
+  const ret = (curi ? URI13.from(curi) : uri).build().setParam("store" /* STORE */, store);
   if (!ret.hasParam("name" /* NAME */)) {
     const name = sthis.pathOps.basename(ret.URI().pathname);
     if (!name) {
@@ -4637,7 +4672,7 @@ __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];
 export {
   CRDTImpl,