chore: rename getBag to getBagProvider

chore: export de/serialize Meta
fireproof-storage · Jan 30, 2025 · 1075f0d · 1075f0d
1 parent 622a103
commit 1075f0d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/runtime/gateways/fp-envelope-serialize.ts b/src/runtime/gateways/fp-envelope-serialize.ts
@@ -23,7 +23,10 @@ export interface SerializedMeta {
   readonly cid: string;
 }
 
-async function dbMetaEvent2Serialized(sthis: SuperThis, dbEvents: Omit<DbMetaEvent, "eventCid">[]): Promise<SerializedMeta[]> {
+export async function dbMetaEvent2Serialized(
+  sthis: SuperThis,
+  dbEvents: Omit<DbMetaEvent, "eventCid">[],
+): Promise<SerializedMeta[]> {
   return await Promise.all(
     dbEvents.map(async (dbEvent) => {
       const event = await EventBlock.create<DbMetaBinary>(
@@ -36,7 +39,7 @@ async function dbMetaEvent2Serialized(sthis: SuperThis, dbEvents: Omit<DbMetaEve
         cid: event.cid.toString(),
         parents: dbEvent.parents.map((i) => i.toString()),
         data: base64pad.encode(event.bytes),
-      } as SerializedMeta;
+      } satisfies SerializedMeta;
     }),
   );
 }
@@ -103,7 +106,10 @@ export async function fpSerialize<T>(
   }
 }
 
-async function decode2DbMetaEvents(sthis: SuperThis, rserializedMeta: Result<SerializedMeta[]>): Promise<Result<DbMetaEvent[]>> {
+export async function decode2DbMetaEvents(
+  sthis: SuperThis,
+  rserializedMeta: Result<SerializedMeta[]>,
+): Promise<Result<DbMetaEvent[]>> {
   if (rserializedMeta.isErr()) {
     return Result.Err(rserializedMeta.Err());
   }

diff --git a/src/runtime/key-bag.ts b/src/runtime/key-bag.ts
@@ -89,7 +89,7 @@ export class KeyBag {
       name,
       key: key,
     };
-    const bag = await this.rt.getBag();
+    const bag = await this.rt.getBagProvider();
     this.logger.Debug().Str("name", name).Msg("setNamedKey");
     // there should be a version that throws if key exists
     await bag.set(name, item);
@@ -117,7 +117,7 @@ export class KeyBag {
   async getNamedKey(name: string, failIfNotFound = false): Promise<Result<KeyWithFingerPrint>> {
     const id = this.rt.sthis.nextId(4).str;
     return this._seq.add(async () => {
-      const bag = await this.rt.getBag();
+      const bag = await this.rt.getBagProvider();
       const named = await bag.get(name);
       if (named) {
         const fpr = await this.toKeyWithFingerPrint(named.key);
@@ -163,7 +163,7 @@ export interface KeyBagRuntime {
   readonly sthis: SuperThis;
   readonly keyLength: number;
   // readonly key?: FPCryptoKey;
-  getBag(): Promise<KeyBagProvider>;
+  getBagProvider(): Promise<KeyBagProvider>;
   id(): string;
 }
 
@@ -267,7 +267,7 @@ export function defaultKeyBagOpts(sthis: SuperThis, kbo?: Partial<KeyBagOpts>):
     sthis,
     logger,
     keyLength: kbo.keyLength || 16,
-    getBag: () => kitem.factory(url, sthis),
+    getBagProvider: () => kitem.factory(url, sthis),
     id: () => {
       return url.toString();
     },

diff --git a/tests/blockstore/keyed-crypto-indexdb-file.test.ts b/tests/blockstore/keyed-crypto-indexdb-file.test.ts
@@ -56,7 +56,7 @@ describe("KeyBag indexdb and file", () => {
 
     let diskBag: rt.kb.KeyItem;
     let diskBag2: rt.kb.KeyItem;
-    const provider = await kb.rt.getBag();
+    const provider = await kb.rt.getBagProvider();
     if (runtimeFn().isBrowser) {
       const p = provider as KeyBagProviderIndexDB;
       diskBag = await p._prepare().then((db) => db.get("bag", name));

diff --git a/tests/blockstore/keyed-crypto.test.ts b/tests/blockstore/keyed-crypto.test.ts
@@ -87,7 +87,7 @@ describe("KeyBag", () => {
 
     let diskBag: rt.kb.KeyItem;
     let diskBag2: rt.kb.KeyItem;
-    const provider = await kb.rt.getBag();
+    const provider = await kb.rt.getBagProvider();
     if (runtimeFn().isBrowser) {
       const p = provider as KeyBagProviderIndexDB;
       diskBag = await p._prepare().then((db) => db.get("bag", name));