@fireproof/core 0.20.0-dev-preview-25 → 0.20.0-dev-preview-27

package/index.d.cts

@@ -113,10 +113,11 @@ declare class keysByFingerprint implements KeysByFingerprint {
     readonly keys: Record<string, keyWithFingerPrint>;
     readonly keybag: KeyBag;
     readonly name: string;
+    readonly id: string;
     static from(keyBag: KeyBag, named: KeysItem): Promise<KeysByFingerprint>;
     constructor(keyBag: KeyBag, name: string);
     get(fingerPrint?: Uint8Array | string): Promise<KeyWithFingerPrint | undefined>;
-    upsert(materialStrOrUint8: string | Uint8Array, def: boolean, keyBagAction?: boolean): Promise<Result<KeyUpsertResult>>;
+    upsert(materialStrOrUint8: string | Uint8Array, def?: boolean, keyBagAction?: boolean): Promise<Result<KeyUpsertResult>>;
     asKeysItem(): Promise<KeysItem>;
 }
 declare class KeyBag {
@@ -463,9 +464,10 @@ interface KeyUpsertResult {
     readonly kfp: KeyWithFingerPrint;
 }
 interface KeysByFingerprint {
+    readonly id: string;
     readonly name: string;
     get(fingerPrint?: Uint8Array | string): Promise<KeyWithFingerPrint | undefined>;
-    upsert(key: string | Uint8Array, def: boolean): Promise<Result<KeyUpsertResult>>;
+    upsert(key: string | Uint8Array, def?: boolean): Promise<Result<KeyUpsertResult>>;
     asKeysItem(): Promise<KeysItem>;
 }
 interface CryptoAction {
@@ -1359,7 +1361,7 @@ interface WriteQueue<T extends DocUpdate<S>, S extends DocTypes = DocTypes> {
     close(): Promise<void>;
 }
 interface LedgerOpts {
-    readonly name?: string;
+    readonly name: string;
     readonly meta?: DbMeta;
     readonly gatewayInterceptor?: SerdeGatewayInterceptor;
     readonly writeQueue: WriteQueueParams;
@@ -1384,7 +1386,7 @@ interface Ledger extends HasCRDT {
 
 declare function keyConfigOpts(sthis: SuperThis, name?: string, opts?: ConfigOpts): string;
 declare function isLedger(db: unknown): db is Ledger;
-declare function LedgerFactory(name: string | undefined, opts?: ConfigOpts): Ledger;
+declare function LedgerFactory(name: string, opts?: ConfigOpts): Ledger;
 declare class LedgerShell implements Ledger {
     readonly ref: LedgerImpl;
     readonly writeQueue: WriteQueue<DocUpdate<DocTypes>>;

package/index.d.ts

@@ -113,10 +113,11 @@ declare class keysByFingerprint implements KeysByFingerprint {
     readonly keys: Record<string, keyWithFingerPrint>;
     readonly keybag: KeyBag;
     readonly name: string;
+    readonly id: string;
     static from(keyBag: KeyBag, named: KeysItem): Promise<KeysByFingerprint>;
     constructor(keyBag: KeyBag, name: string);
     get(fingerPrint?: Uint8Array | string): Promise<KeyWithFingerPrint | undefined>;
-    upsert(materialStrOrUint8: string | Uint8Array, def: boolean, keyBagAction?: boolean): Promise<Result<KeyUpsertResult>>;
+    upsert(materialStrOrUint8: string | Uint8Array, def?: boolean, keyBagAction?: boolean): Promise<Result<KeyUpsertResult>>;
     asKeysItem(): Promise<KeysItem>;
 }
 declare class KeyBag {
@@ -463,9 +464,10 @@ interface KeyUpsertResult {
     readonly kfp: KeyWithFingerPrint;
 }
 interface KeysByFingerprint {
+    readonly id: string;
     readonly name: string;
     get(fingerPrint?: Uint8Array | string): Promise<KeyWithFingerPrint | undefined>;
-    upsert(key: string | Uint8Array, def: boolean): Promise<Result<KeyUpsertResult>>;
+    upsert(key: string | Uint8Array, def?: boolean): Promise<Result<KeyUpsertResult>>;
     asKeysItem(): Promise<KeysItem>;
 }
 interface CryptoAction {
@@ -1359,7 +1361,7 @@ interface WriteQueue<T extends DocUpdate<S>, S extends DocTypes = DocTypes> {
     close(): Promise<void>;
 }
 interface LedgerOpts {
-    readonly name?: string;
+    readonly name: string;
     readonly meta?: DbMeta;
     readonly gatewayInterceptor?: SerdeGatewayInterceptor;
     readonly writeQueue: WriteQueueParams;
@@ -1384,7 +1386,7 @@ interface Ledger extends HasCRDT {
 
 declare function keyConfigOpts(sthis: SuperThis, name?: string, opts?: ConfigOpts): string;
 declare function isLedger(db: unknown): db is Ledger;
-declare function LedgerFactory(name: string | undefined, opts?: ConfigOpts): Ledger;
+declare function LedgerFactory(name: string, opts?: ConfigOpts): Ledger;
 declare class LedgerShell implements Ledger {
     readonly ref: LedgerImpl;
     readonly writeQueue: WriteQueue<DocUpdate<DocTypes>>;

package/index.js

@@ -589,7 +589,7 @@ var KeyBagProviderFile = class {
       if (isNotFoundError(e)) {
         return void 0;
       }
-      throw this.logger.Error().Err(e).Str("file", ctx.dirName).Msg("read bag failed").AsError();
+      throw this.logger.Error().Err(e).Any("file", ctx).Msg("read bag failed").AsError();
     }
   }
   async set(item) {
@@ -689,6 +689,7 @@ var keysByFingerprint = class _keysByFingerprint {
     this.keys = {};
     this.keybag = keyBag;
     this.name = name;
+    this.id = keyBag.rt.sthis.nextId(4).str;
   }
   static async from(keyBag, named) {
     const kbf = new _keysByFingerprint(keyBag, named.name);
@@ -712,23 +713,23 @@ var keysByFingerprint = class _keysByFingerprint {
   async get(fingerPrint) {
     if (fingerPrint instanceof Uint8Array) {
       fingerPrint = base58btc2.encode(fingerPrint);
+    } else {
+      fingerPrint = fingerPrint || "*";
     }
-    if (fingerPrint) {
-      return this.keys[fingerPrint];
-    }
-    const def = this.keys["*"];
-    if (!def) {
-      throw this.keybag.logger.Error().Msg("KeyBag: keysByFingerprint: no default").AsError();
+    const found = this.keys[fingerPrint];
+    if (found) {
+      return found;
     }
-    return def;
+    throw this.keybag.logger.Error().Str("fpr", fingerPrint).Any("fprs", Object.keys(this.keys)).Msg("keysByFingerprint: not found").AsError();
   }
   async upsert(materialStrOrUint8, def, keyBagAction = true) {
+    def = !!def;
     const rKfp = await toKeyWithFingerPrint(this.keybag, materialStrOrUint8);
     if (rKfp.isErr()) {
       return Result2.Err(rKfp);
     }
     const kfp = rKfp.Ok();
-    const found = this.keys[kfp.fingerPrint];
+    let found = this.keys[kfp.fingerPrint];
     if (found) {
       if (found.default === def) {
         return Result2.Ok({
@@ -736,23 +737,24 @@ var keysByFingerprint = class _keysByFingerprint {
           kfp: found
         });
       }
+    } else {
+      found = new keyWithFingerPrint(kfp, materialStrOrUint8, def);
     }
     if (def) {
       for (const i of Object.values(this.keys)) {
         i.default = false;
       }
     }
-    const out = new keyWithFingerPrint(kfp, materialStrOrUint8, def);
-    this.keys[kfp.fingerPrint] = out;
+    this.keys[kfp.fingerPrint] = found;
     if (def) {
-      this.keys["*"] = out;
+      this.keys["*"] = found;
     }
     if (keyBagAction) {
       this.keybag._upsertNamedKey(this);
     }
     return Result2.Ok({
       modified: keyBagAction && true,
-      kfp: out
+      kfp: found
     });
   }
   async asKeysItem() {
@@ -835,7 +837,7 @@ var KeyBag = class {
       const keyName = `@${keyFactory()}@`;
       const ret = await this.getNamedKey(keyName);
       if (ret.isErr()) {
-        return ret;
+        return Result2.Err(ret);
       }
       const urb = url.build().setParam(PARAM.STORE_KEY, keyName);
       return Result2.Ok(urb.URI());
@@ -843,7 +845,7 @@ var KeyBag = class {
     if (storeKey.startsWith("@") && storeKey.endsWith("@")) {
       const ret = await this.getNamedKey(storeKey);
       if (ret.isErr()) {
-        return ret;
+        return Result2.Err(ret);
       }
     }
     return Result2.Ok(url);
@@ -901,6 +903,7 @@ var KeyBag = class {
     return this._seq.add(async () => {
       const rKbf = await this._getNamedKey(ksi.name, true);
       if (rKbf.isErr()) {
+        this.logger.Error().Err(rKbf).Str("name", ksi.name).Msg("_upsertNamedKey: getNamedKey failed");
         this._namedKeyCache.unget(ksi.name);
       }
       await bag.set(await ksi.asKeysItem());
@@ -1206,6 +1209,7 @@ var MEMORY_VERSION = "v0.19-memory";
 
 // src/runtime/gateways/memory/gateway.ts
 var MemoryGateway = class {
+  // readonly logger: Logger;
   constructor(sthis, memorys) {
     this.memorys = memorys;
     this.sthis = sthis;
@@ -3125,6 +3129,7 @@ var noCrypto = class {
     this.logger = ensureLogger(sthis, "noCrypto");
     this.crypto = cyrt;
     this.key = {
+      id: sthis.nextId().str,
       name: "noCrypto",
       get: () => {
         throw this.logger.Error().Msg("noCrypto.get not implemented").AsError();
@@ -4700,7 +4705,7 @@ var LedgerImpl = class {
     this.crdt.clock.onTock(() => this._no_update_notify());
   }
   get name() {
-    return this.opts.storeUrls.data.data.getParam(PARAM.NAME) ?? "default";
+    return this.opts.name;
   }
   addShell(shell) {
     this.shells.add(shell);
@@ -4898,7 +4903,7 @@ __export(file_exports, {
 
 // src/version.ts
 var PACKAGE_VERSION = Object.keys({
-  "0.20.0-dev-preview-25": "xxxx"
+  "0.20.0-dev-preview-27": "xxxx"
 })[0];
 export {
   CRDTImpl,