@xyo-network/diviner-boundwitness-indexeddb 2.90.2 → 2.90.4

package/dist/browser/Diviner.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cAyD5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cA2D5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}

package/dist/browser/Diviner.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cAyD5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cA2D5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}

package/dist/browser/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cAyD5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cA2D5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}

package/dist/browser/index.cjs

@@ -41,7 +41,7 @@ var import_archivist_indexeddb = require("@xyo-network/archivist-indexeddb");
 var import_boundwitness_model = require("@xyo-network/boundwitness-model");
 var import_diviner_boundwitness_abstract = require("@xyo-network/diviner-boundwitness-abstract");
 var import_diviner_boundwitness_model2 = require("@xyo-network/diviner-boundwitness-model");
-var import_hash = require("@xyo-network/hash");
+var import_payload_builder = require("@xyo-network/payload-builder");
 var import_idb = require("idb");
 var bwValueFilter = /* @__PURE__ */ __name((key, values) => {
   if (!values || values?.length === 0)
@@ -120,9 +120,9 @@ var IndexedDbBoundWitnessDiviner = class extends import_diviner_boundwitness_abs
         cursor = await cursor.continue();
       }
       await tx.done;
-      return results.filter(import_boundwitness_model.isBoundWitness).map((bw) => {
-        return import_hash.PayloadHasher.jsonPayload(bw);
-      });
+      return await Promise.all(results.filter(import_boundwitness_model.isBoundWitness).map((bw) => {
+        return import_payload_builder.PayloadBuilder.build(bw);
+      }));
     });
     return result ?? [];
   }

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["export * from './Config'\nexport * from './Diviner'\nexport * from './Params'\nexport * from './Schema'\n","import { BoundWitnessDivinerSchema } from '@xyo-network/diviner-boundwitness-model'\n\nexport const IndexedDbBoundWitnessDivinerSchema = `${BoundWitnessDivinerSchema}.indexeddb`\nexport type IndexedDbBoundWitnessDivinerSchema = typeof IndexedDbBoundWitnessDivinerSchema\n","import { IndexDescription } from '@xyo-network/archivist-model'\nimport { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbBoundWitnessDivinerSchema } from './Schema'\n\nexport const IndexedDbBoundWitnessDivinerConfigSchema = `${IndexedDbBoundWitnessDivinerSchema}.config`\nexport type IndexedDbBoundWitnessDivinerConfigSchema = typeof IndexedDbBoundWitnessDivinerConfigSchema\n\nexport type IndexedDbBoundWitnessDivinerConfig = DivinerConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbBoundWitnessDivinerConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main diviner config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n","import { containsAll } from '@xylabs/array'\nimport { exists } from '@xylabs/exists'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbBoundWitnessDivinerConfigSchema } from './Config'\nimport { IndexedDbBoundWitnessDivinerParams } from './Params'\n\ninterface BoundWitnessStore {\n  [s: string]: BoundWitness\n}\n\ntype ValueFilter = (bw?: BoundWitness | null) => boolean\n\nconst bwValueFilter = (\n  key: keyof Pick<BoundWitness, 'addresses' | 'payload_hashes' | 'payload_schemas'>,\n  values?: string[],\n): ValueFilter | undefined => {\n  if (!values || values?.length === 0) return undefined\n  return (bw) => {\n    if (!bw) return false\n    return containsAll(bw[key], values)\n  }\n}\n\nexport class IndexedDbBoundWitnessDiviner<\n  TParams extends IndexedDbBoundWitnessDivinerParams = IndexedDbBoundWitnessDivinerParams,\n> extends BoundWitnessDiviner<TParams> {\n  static override configSchemas = [IndexedDbBoundWitnessDivinerConfigSchema]\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the archivist's name and if archivist's name is not supplied,\n   * it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.archivist ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  protected override async divineHandler(payloads?: Payload[]): Promise<BoundWitness[]> {\n    const query = payloads?.filter(isBoundWitnessDivinerQueryPayload)?.pop()\n    if (!query) return []\n\n    const result = await this.tryUseDb(async (db) => {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { addresses, payload_hashes, payload_schemas, limit, offset, order } = query\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: BoundWitness[] = []\n      let parsedOffset = offset ?? 0\n      const parsedLimit = limit ?? 10\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n      const valueFilters: ValueFilter[] = [\n        bwValueFilter('addresses', addresses),\n        bwValueFilter('payload_hashes', payload_hashes),\n        bwValueFilter('payload_schemas', payload_schemas),\n      ].filter(exists)\n      // Only iterate over BWs\n      let cursor = await store.index(IndexedDbArchivist.schemaIndexName).openCursor(IDBKeyRange.only(BoundWitnessSchema), direction)\n\n      // If we're filtering on more than just the schema, we need to\n      // iterate through all the results\n      if (valueFilters.length === 0) {\n        // Skip records until the offset is reached\n        while (cursor && parsedOffset > 0) {\n          cursor = await cursor.advance(parsedOffset)\n          parsedOffset = 0 // Reset offset after skipping\n        }\n      }\n      // Collect results up to the limit\n      while (cursor && results.length < parsedLimit) {\n        const value = cursor.value\n        if (value) {\n          // If we're filtering on more than just the schema\n          if (valueFilters.length > 0) {\n            // Ensure all filters pass\n            if (valueFilters.every((filter) => filter(value))) {\n              // Then save the value\n              results.push(value)\n            }\n          } else {\n            // Otherwise just save the value\n            results.push(value)\n          }\n        }\n        cursor = await cursor.continue()\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return results.filter(isBoundWitness).map((bw) => {\n        return PayloadHasher.jsonPayload(bw)\n      })\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: Do not eager initialize the DB here. It will cause the\n    // DB to be created by this process and then the DB will be\n    // in a bad state for other processes that need to create the DB.\n    return true\n  }\n\n  /**\n   * Checks that the desired DB/objectStore exists and is initialized to the correct version\n   * @returns The initialized DB or undefined if it does not exist in the desired state\n   */\n  private async tryGetInitializedDb(): Promise<IDBPDatabase<BoundWitnessStore> | undefined> {\n    // Enumerate the DBs\n    const dbs = await indexedDB.databases()\n    // Check that the DB exists at the desired version\n    const dbExists = dbs.some((db) => {\n      return db.name === this.dbName && db.version === this.dbVersion\n    })\n    // If the DB exists at the desired version\n    if (dbExists) {\n      // If the db does exist, open it\n      const db = await openDB<BoundWitnessStore>(this.dbName, this.dbVersion)\n      // Check that the desired objectStore exists\n      const storeExists = db.objectStoreNames.contains(this.storeName)\n      // If the correct db/version/objectStore exists\n      if (storeExists) {\n        return db\n      } else {\n        // Otherwise close the db so the process that is going to update the\n        // db can open it\n        db.close()\n      }\n    }\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async tryUseDb<T>(callback: (db: IDBPDatabase<BoundWitnessStore>) => Promise<T> | T): Promise<T | undefined> {\n    // Get the initialized DB\n    const db = await this.tryGetInitializedDb()\n    if (db) {\n      try {\n        // Perform the callback\n        return await callback(db)\n      } finally {\n        // Close the DB\n        db.close()\n      }\n    }\n    return undefined\n  }\n}\n"],"mappings":"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","names":["IndexedDbBoundWitnessDivinerSchema","BoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerConfigSchema","IndexedDbBoundWitnessDivinerSchema","import_diviner_boundwitness_model","bwValueFilter","key","values","length","undefined","bw","containsAll","IndexedDbBoundWitnessDiviner","BoundWitnessDiviner","configSchemas","IndexedDbBoundWitnessDivinerConfigSchema","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","filter","isBoundWitnessDivinerQueryPayload","pop","result","tryUseDb","db","addresses","payload_hashes","payload_schemas","limit","offset","order","tx","transaction","store","objectStore","results","parsedOffset","parsedLimit","direction","valueFilters","exists","cursor","index","schemaIndexName","openCursor","IDBKeyRange","only","BoundWitnessSchema","advance","value","every","push","continue","done","isBoundWitness","map","PayloadHasher","jsonPayload","startHandler","tryGetInitializedDb","dbs","indexedDB","databases","dbExists","some","name","version","openDB","storeExists","objectStoreNames","contains","close","callback"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["export * from './Config'\nexport * from './Diviner'\nexport * from './Params'\nexport * from './Schema'\n","import { BoundWitnessDivinerSchema } from '@xyo-network/diviner-boundwitness-model'\n\nexport const IndexedDbBoundWitnessDivinerSchema = `${BoundWitnessDivinerSchema}.indexeddb`\nexport type IndexedDbBoundWitnessDivinerSchema = typeof IndexedDbBoundWitnessDivinerSchema\n","import { IndexDescription } from '@xyo-network/archivist-model'\nimport { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbBoundWitnessDivinerSchema } from './Schema'\n\nexport const IndexedDbBoundWitnessDivinerConfigSchema = `${IndexedDbBoundWitnessDivinerSchema}.config`\nexport type IndexedDbBoundWitnessDivinerConfigSchema = typeof IndexedDbBoundWitnessDivinerConfigSchema\n\nexport type IndexedDbBoundWitnessDivinerConfig = DivinerConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbBoundWitnessDivinerConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main diviner config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n","import { containsAll } from '@xylabs/array'\nimport { exists } from '@xylabs/exists'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbBoundWitnessDivinerConfigSchema } from './Config'\nimport { IndexedDbBoundWitnessDivinerParams } from './Params'\n\ninterface BoundWitnessStore {\n  [s: string]: BoundWitness\n}\n\ntype ValueFilter = (bw?: BoundWitness | null) => boolean\n\nconst bwValueFilter = (\n  key: keyof Pick<BoundWitness, 'addresses' | 'payload_hashes' | 'payload_schemas'>,\n  values?: string[],\n): ValueFilter | undefined => {\n  if (!values || values?.length === 0) return undefined\n  return (bw) => {\n    if (!bw) return false\n    return containsAll(bw[key], values)\n  }\n}\n\nexport class IndexedDbBoundWitnessDiviner<\n  TParams extends IndexedDbBoundWitnessDivinerParams = IndexedDbBoundWitnessDivinerParams,\n> extends BoundWitnessDiviner<TParams> {\n  static override configSchemas = [IndexedDbBoundWitnessDivinerConfigSchema]\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the archivist's name and if archivist's name is not supplied,\n   * it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.archivist ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  protected override async divineHandler(payloads?: Payload[]): Promise<BoundWitness[]> {\n    const query = payloads?.filter(isBoundWitnessDivinerQueryPayload)?.pop()\n    if (!query) return []\n\n    const result = await this.tryUseDb(async (db) => {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { addresses, payload_hashes, payload_schemas, limit, offset, order } = query\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: BoundWitness[] = []\n      let parsedOffset = offset ?? 0\n      const parsedLimit = limit ?? 10\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n      const valueFilters: ValueFilter[] = [\n        bwValueFilter('addresses', addresses),\n        bwValueFilter('payload_hashes', payload_hashes),\n        bwValueFilter('payload_schemas', payload_schemas),\n      ].filter(exists)\n      // Only iterate over BWs\n      let cursor = await store.index(IndexedDbArchivist.schemaIndexName).openCursor(IDBKeyRange.only(BoundWitnessSchema), direction)\n\n      // If we're filtering on more than just the schema, we need to\n      // iterate through all the results\n      if (valueFilters.length === 0) {\n        // Skip records until the offset is reached\n        while (cursor && parsedOffset > 0) {\n          cursor = await cursor.advance(parsedOffset)\n          parsedOffset = 0 // Reset offset after skipping\n        }\n      }\n      // Collect results up to the limit\n      while (cursor && results.length < parsedLimit) {\n        const value = cursor.value\n        if (value) {\n          // If we're filtering on more than just the schema\n          if (valueFilters.length > 0) {\n            // Ensure all filters pass\n            if (valueFilters.every((filter) => filter(value))) {\n              // Then save the value\n              results.push(value)\n            }\n          } else {\n            // Otherwise just save the value\n            results.push(value)\n          }\n        }\n        cursor = await cursor.continue()\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return await Promise.all(\n        results.filter(isBoundWitness).map((bw) => {\n          return PayloadBuilder.build(bw)\n        }),\n      )\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: Do not eager initialize the DB here. It will cause the\n    // DB to be created by this process and then the DB will be\n    // in a bad state for other processes that need to create the DB.\n    return true\n  }\n\n  /**\n   * Checks that the desired DB/objectStore exists and is initialized to the correct version\n   * @returns The initialized DB or undefined if it does not exist in the desired state\n   */\n  private async tryGetInitializedDb(): Promise<IDBPDatabase<BoundWitnessStore> | undefined> {\n    // Enumerate the DBs\n    const dbs = await indexedDB.databases()\n    // Check that the DB exists at the desired version\n    const dbExists = dbs.some((db) => {\n      return db.name === this.dbName && db.version === this.dbVersion\n    })\n    // If the DB exists at the desired version\n    if (dbExists) {\n      // If the db does exist, open it\n      const db = await openDB<BoundWitnessStore>(this.dbName, this.dbVersion)\n      // Check that the desired objectStore exists\n      const storeExists = db.objectStoreNames.contains(this.storeName)\n      // If the correct db/version/objectStore exists\n      if (storeExists) {\n        return db\n      } else {\n        // Otherwise close the db so the process that is going to update the\n        // db can open it\n        db.close()\n      }\n    }\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async tryUseDb<T>(callback: (db: IDBPDatabase<BoundWitnessStore>) => Promise<T> | T): Promise<T | undefined> {\n    // Get the initialized DB\n    const db = await this.tryGetInitializedDb()\n    if (db) {\n      try {\n        // Perform the callback\n        return await callback(db)\n      } finally {\n        // Close the DB\n        db.close()\n      }\n    }\n    return undefined\n  }\n}\n"],"mappings":"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","names":["IndexedDbBoundWitnessDivinerSchema","BoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerConfigSchema","IndexedDbBoundWitnessDivinerSchema","import_diviner_boundwitness_model","bwValueFilter","key","values","length","undefined","bw","containsAll","IndexedDbBoundWitnessDiviner","BoundWitnessDiviner","configSchemas","IndexedDbBoundWitnessDivinerConfigSchema","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","filter","isBoundWitnessDivinerQueryPayload","pop","result","tryUseDb","db","addresses","payload_hashes","payload_schemas","limit","offset","order","tx","transaction","store","objectStore","results","parsedOffset","parsedLimit","direction","valueFilters","exists","cursor","index","schemaIndexName","openCursor","IDBKeyRange","only","BoundWitnessSchema","advance","value","every","push","continue","done","Promise","all","isBoundWitness","map","PayloadBuilder","build","startHandler","tryGetInitializedDb","dbs","indexedDB","databases","dbExists","some","name","version","openDB","storeExists","objectStoreNames","contains","close","callback"]}

package/dist/browser/index.js

@@ -15,7 +15,7 @@ import { IndexedDbArchivist } from "@xyo-network/archivist-indexeddb";
 import { BoundWitnessSchema, isBoundWitness } from "@xyo-network/boundwitness-model";
 import { BoundWitnessDiviner } from "@xyo-network/diviner-boundwitness-abstract";
 import { isBoundWitnessDivinerQueryPayload } from "@xyo-network/diviner-boundwitness-model";
-import { PayloadHasher } from "@xyo-network/hash";
+import { PayloadBuilder } from "@xyo-network/payload-builder";
 import { openDB } from "idb";
 var bwValueFilter = /* @__PURE__ */ __name((key, values) => {
   if (!values || values?.length === 0)
@@ -94,9 +94,9 @@ var IndexedDbBoundWitnessDiviner = class extends BoundWitnessDiviner {
         cursor = await cursor.continue();
       }
       await tx.done;
-      return results.filter(isBoundWitness).map((bw) => {
-        return PayloadHasher.jsonPayload(bw);
-      });
+      return await Promise.all(results.filter(isBoundWitness).map((bw) => {
+        return PayloadBuilder.build(bw);
+      }));
     });
     return result ?? [];
   }

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["import { BoundWitnessDivinerSchema } from '@xyo-network/diviner-boundwitness-model'\n\nexport const IndexedDbBoundWitnessDivinerSchema = `${BoundWitnessDivinerSchema}.indexeddb`\nexport type IndexedDbBoundWitnessDivinerSchema = typeof IndexedDbBoundWitnessDivinerSchema\n","import { IndexDescription } from '@xyo-network/archivist-model'\nimport { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbBoundWitnessDivinerSchema } from './Schema'\n\nexport const IndexedDbBoundWitnessDivinerConfigSchema = `${IndexedDbBoundWitnessDivinerSchema}.config`\nexport type IndexedDbBoundWitnessDivinerConfigSchema = typeof IndexedDbBoundWitnessDivinerConfigSchema\n\nexport type IndexedDbBoundWitnessDivinerConfig = DivinerConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbBoundWitnessDivinerConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main diviner config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n","import { containsAll } from '@xylabs/array'\nimport { exists } from '@xylabs/exists'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbBoundWitnessDivinerConfigSchema } from './Config'\nimport { IndexedDbBoundWitnessDivinerParams } from './Params'\n\ninterface BoundWitnessStore {\n  [s: string]: BoundWitness\n}\n\ntype ValueFilter = (bw?: BoundWitness | null) => boolean\n\nconst bwValueFilter = (\n  key: keyof Pick<BoundWitness, 'addresses' | 'payload_hashes' | 'payload_schemas'>,\n  values?: string[],\n): ValueFilter | undefined => {\n  if (!values || values?.length === 0) return undefined\n  return (bw) => {\n    if (!bw) return false\n    return containsAll(bw[key], values)\n  }\n}\n\nexport class IndexedDbBoundWitnessDiviner<\n  TParams extends IndexedDbBoundWitnessDivinerParams = IndexedDbBoundWitnessDivinerParams,\n> extends BoundWitnessDiviner<TParams> {\n  static override configSchemas = [IndexedDbBoundWitnessDivinerConfigSchema]\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the archivist's name and if archivist's name is not supplied,\n   * it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.archivist ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  protected override async divineHandler(payloads?: Payload[]): Promise<BoundWitness[]> {\n    const query = payloads?.filter(isBoundWitnessDivinerQueryPayload)?.pop()\n    if (!query) return []\n\n    const result = await this.tryUseDb(async (db) => {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { addresses, payload_hashes, payload_schemas, limit, offset, order } = query\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: BoundWitness[] = []\n      let parsedOffset = offset ?? 0\n      const parsedLimit = limit ?? 10\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n      const valueFilters: ValueFilter[] = [\n        bwValueFilter('addresses', addresses),\n        bwValueFilter('payload_hashes', payload_hashes),\n        bwValueFilter('payload_schemas', payload_schemas),\n      ].filter(exists)\n      // Only iterate over BWs\n      let cursor = await store.index(IndexedDbArchivist.schemaIndexName).openCursor(IDBKeyRange.only(BoundWitnessSchema), direction)\n\n      // If we're filtering on more than just the schema, we need to\n      // iterate through all the results\n      if (valueFilters.length === 0) {\n        // Skip records until the offset is reached\n        while (cursor && parsedOffset > 0) {\n          cursor = await cursor.advance(parsedOffset)\n          parsedOffset = 0 // Reset offset after skipping\n        }\n      }\n      // Collect results up to the limit\n      while (cursor && results.length < parsedLimit) {\n        const value = cursor.value\n        if (value) {\n          // If we're filtering on more than just the schema\n          if (valueFilters.length > 0) {\n            // Ensure all filters pass\n            if (valueFilters.every((filter) => filter(value))) {\n              // Then save the value\n              results.push(value)\n            }\n          } else {\n            // Otherwise just save the value\n            results.push(value)\n          }\n        }\n        cursor = await cursor.continue()\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return results.filter(isBoundWitness).map((bw) => {\n        return PayloadHasher.jsonPayload(bw)\n      })\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: Do not eager initialize the DB here. It will cause the\n    // DB to be created by this process and then the DB will be\n    // in a bad state for other processes that need to create the DB.\n    return true\n  }\n\n  /**\n   * Checks that the desired DB/objectStore exists and is initialized to the correct version\n   * @returns The initialized DB or undefined if it does not exist in the desired state\n   */\n  private async tryGetInitializedDb(): Promise<IDBPDatabase<BoundWitnessStore> | undefined> {\n    // Enumerate the DBs\n    const dbs = await indexedDB.databases()\n    // Check that the DB exists at the desired version\n    const dbExists = dbs.some((db) => {\n      return db.name === this.dbName && db.version === this.dbVersion\n    })\n    // If the DB exists at the desired version\n    if (dbExists) {\n      // If the db does exist, open it\n      const db = await openDB<BoundWitnessStore>(this.dbName, this.dbVersion)\n      // Check that the desired objectStore exists\n      const storeExists = db.objectStoreNames.contains(this.storeName)\n      // If the correct db/version/objectStore exists\n      if (storeExists) {\n        return db\n      } else {\n        // Otherwise close the db so the process that is going to update the\n        // db can open it\n        db.close()\n      }\n    }\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async tryUseDb<T>(callback: (db: IDBPDatabase<BoundWitnessStore>) => Promise<T> | T): Promise<T | undefined> {\n    // Get the initialized DB\n    const db = await this.tryGetInitializedDb()\n    if (db) {\n      try {\n        // Perform the callback\n        return await callback(db)\n      } finally {\n        // Close the DB\n        db.close()\n      }\n    }\n    return undefined\n  }\n}\n"],"mappings":"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","names":["BoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerConfigSchema","IndexedDbBoundWitnessDivinerSchema","containsAll","exists","IndexedDbArchivist","BoundWitnessSchema","isBoundWitness","BoundWitnessDiviner","isBoundWitnessDivinerQueryPayload","PayloadHasher","openDB","bwValueFilter","key","values","length","undefined","bw","containsAll","IndexedDbBoundWitnessDiviner","BoundWitnessDiviner","configSchemas","IndexedDbBoundWitnessDivinerConfigSchema","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","filter","isBoundWitnessDivinerQueryPayload","pop","result","tryUseDb","db","addresses","payload_hashes","payload_schemas","limit","offset","order","tx","transaction","store","objectStore","results","parsedOffset","parsedLimit","direction","valueFilters","exists","cursor","index","schemaIndexName","openCursor","IDBKeyRange","only","BoundWitnessSchema","advance","value","every","push","continue","done","isBoundWitness","map","PayloadHasher","jsonPayload","startHandler","tryGetInitializedDb","dbs","indexedDB","databases","dbExists","some","name","version","openDB","storeExists","objectStoreNames","contains","close","callback"]}
+{"version":3,"sources":["../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["import { BoundWitnessDivinerSchema } from '@xyo-network/diviner-boundwitness-model'\n\nexport const IndexedDbBoundWitnessDivinerSchema = `${BoundWitnessDivinerSchema}.indexeddb`\nexport type IndexedDbBoundWitnessDivinerSchema = typeof IndexedDbBoundWitnessDivinerSchema\n","import { IndexDescription } from '@xyo-network/archivist-model'\nimport { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbBoundWitnessDivinerSchema } from './Schema'\n\nexport const IndexedDbBoundWitnessDivinerConfigSchema = `${IndexedDbBoundWitnessDivinerSchema}.config`\nexport type IndexedDbBoundWitnessDivinerConfigSchema = typeof IndexedDbBoundWitnessDivinerConfigSchema\n\nexport type IndexedDbBoundWitnessDivinerConfig = DivinerConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbBoundWitnessDivinerConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main diviner config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n","import { containsAll } from '@xylabs/array'\nimport { exists } from '@xylabs/exists'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbBoundWitnessDivinerConfigSchema } from './Config'\nimport { IndexedDbBoundWitnessDivinerParams } from './Params'\n\ninterface BoundWitnessStore {\n  [s: string]: BoundWitness\n}\n\ntype ValueFilter = (bw?: BoundWitness | null) => boolean\n\nconst bwValueFilter = (\n  key: keyof Pick<BoundWitness, 'addresses' | 'payload_hashes' | 'payload_schemas'>,\n  values?: string[],\n): ValueFilter | undefined => {\n  if (!values || values?.length === 0) return undefined\n  return (bw) => {\n    if (!bw) return false\n    return containsAll(bw[key], values)\n  }\n}\n\nexport class IndexedDbBoundWitnessDiviner<\n  TParams extends IndexedDbBoundWitnessDivinerParams = IndexedDbBoundWitnessDivinerParams,\n> extends BoundWitnessDiviner<TParams> {\n  static override configSchemas = [IndexedDbBoundWitnessDivinerConfigSchema]\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the archivist's name and if archivist's name is not supplied,\n   * it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.archivist ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  protected override async divineHandler(payloads?: Payload[]): Promise<BoundWitness[]> {\n    const query = payloads?.filter(isBoundWitnessDivinerQueryPayload)?.pop()\n    if (!query) return []\n\n    const result = await this.tryUseDb(async (db) => {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { addresses, payload_hashes, payload_schemas, limit, offset, order } = query\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: BoundWitness[] = []\n      let parsedOffset = offset ?? 0\n      const parsedLimit = limit ?? 10\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n      const valueFilters: ValueFilter[] = [\n        bwValueFilter('addresses', addresses),\n        bwValueFilter('payload_hashes', payload_hashes),\n        bwValueFilter('payload_schemas', payload_schemas),\n      ].filter(exists)\n      // Only iterate over BWs\n      let cursor = await store.index(IndexedDbArchivist.schemaIndexName).openCursor(IDBKeyRange.only(BoundWitnessSchema), direction)\n\n      // If we're filtering on more than just the schema, we need to\n      // iterate through all the results\n      if (valueFilters.length === 0) {\n        // Skip records until the offset is reached\n        while (cursor && parsedOffset > 0) {\n          cursor = await cursor.advance(parsedOffset)\n          parsedOffset = 0 // Reset offset after skipping\n        }\n      }\n      // Collect results up to the limit\n      while (cursor && results.length < parsedLimit) {\n        const value = cursor.value\n        if (value) {\n          // If we're filtering on more than just the schema\n          if (valueFilters.length > 0) {\n            // Ensure all filters pass\n            if (valueFilters.every((filter) => filter(value))) {\n              // Then save the value\n              results.push(value)\n            }\n          } else {\n            // Otherwise just save the value\n            results.push(value)\n          }\n        }\n        cursor = await cursor.continue()\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return await Promise.all(\n        results.filter(isBoundWitness).map((bw) => {\n          return PayloadBuilder.build(bw)\n        }),\n      )\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: Do not eager initialize the DB here. It will cause the\n    // DB to be created by this process and then the DB will be\n    // in a bad state for other processes that need to create the DB.\n    return true\n  }\n\n  /**\n   * Checks that the desired DB/objectStore exists and is initialized to the correct version\n   * @returns The initialized DB or undefined if it does not exist in the desired state\n   */\n  private async tryGetInitializedDb(): Promise<IDBPDatabase<BoundWitnessStore> | undefined> {\n    // Enumerate the DBs\n    const dbs = await indexedDB.databases()\n    // Check that the DB exists at the desired version\n    const dbExists = dbs.some((db) => {\n      return db.name === this.dbName && db.version === this.dbVersion\n    })\n    // If the DB exists at the desired version\n    if (dbExists) {\n      // If the db does exist, open it\n      const db = await openDB<BoundWitnessStore>(this.dbName, this.dbVersion)\n      // Check that the desired objectStore exists\n      const storeExists = db.objectStoreNames.contains(this.storeName)\n      // If the correct db/version/objectStore exists\n      if (storeExists) {\n        return db\n      } else {\n        // Otherwise close the db so the process that is going to update the\n        // db can open it\n        db.close()\n      }\n    }\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async tryUseDb<T>(callback: (db: IDBPDatabase<BoundWitnessStore>) => Promise<T> | T): Promise<T | undefined> {\n    // Get the initialized DB\n    const db = await this.tryGetInitializedDb()\n    if (db) {\n      try {\n        // Perform the callback\n        return await callback(db)\n      } finally {\n        // Close the DB\n        db.close()\n      }\n    }\n    return undefined\n  }\n}\n"],"mappings":"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","names":["BoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerConfigSchema","IndexedDbBoundWitnessDivinerSchema","containsAll","exists","IndexedDbArchivist","BoundWitnessSchema","isBoundWitness","BoundWitnessDiviner","isBoundWitnessDivinerQueryPayload","PayloadBuilder","openDB","bwValueFilter","key","values","length","undefined","bw","containsAll","IndexedDbBoundWitnessDiviner","BoundWitnessDiviner","configSchemas","IndexedDbBoundWitnessDivinerConfigSchema","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","filter","isBoundWitnessDivinerQueryPayload","pop","result","tryUseDb","db","addresses","payload_hashes","payload_schemas","limit","offset","order","tx","transaction","store","objectStore","results","parsedOffset","parsedLimit","direction","valueFilters","exists","cursor","index","schemaIndexName","openCursor","IDBKeyRange","only","BoundWitnessSchema","advance","value","every","push","continue","done","Promise","all","isBoundWitness","map","PayloadBuilder","build","startHandler","tryGetInitializedDb","dbs","indexedDB","databases","dbExists","some","name","version","openDB","storeExists","objectStoreNames","contains","close","callback"]}

package/dist/node/Diviner.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cAyD5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cA2D5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}

package/dist/node/Diviner.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cAyD5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cA2D5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}

package/dist/node/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cAyD5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAsC,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAA;AAmB7D,qBAAa,4BAA4B,CACvC,OAAO,SAAS,kCAAkC,GAAG,kCAAkC,CACvF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IACpC,OAAgB,aAAa,WAA6C;IAE1E;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;cA2D5D,YAAY;IAQrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}

package/dist/node/index.cjs

@@ -46,7 +46,7 @@ var import_archivist_indexeddb = require("@xyo-network/archivist-indexeddb");
 var import_boundwitness_model = require("@xyo-network/boundwitness-model");
 var import_diviner_boundwitness_abstract = require("@xyo-network/diviner-boundwitness-abstract");
 var import_diviner_boundwitness_model2 = require("@xyo-network/diviner-boundwitness-model");
-var import_hash = require("@xyo-network/hash");
+var import_payload_builder = require("@xyo-network/payload-builder");
 var import_idb = require("idb");
 var bwValueFilter = /* @__PURE__ */ __name((key, values) => {
   if (!values || (values == null ? void 0 : values.length) === 0)
@@ -123,9 +123,9 @@ var _IndexedDbBoundWitnessDiviner = class _IndexedDbBoundWitnessDiviner extends
         cursor = await cursor.continue();
       }
       await tx.done;
-      return results.filter(import_boundwitness_model.isBoundWitness).map((bw) => {
-        return import_hash.PayloadHasher.jsonPayload(bw);
-      });
+      return await Promise.all(results.filter(import_boundwitness_model.isBoundWitness).map((bw) => {
+        return import_payload_builder.PayloadBuilder.build(bw);
+      }));
     });
     return result ?? [];
   }

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["export * from './Config'\nexport * from './Diviner'\nexport * from './Params'\nexport * from './Schema'\n","import { BoundWitnessDivinerSchema } from '@xyo-network/diviner-boundwitness-model'\n\nexport const IndexedDbBoundWitnessDivinerSchema = `${BoundWitnessDivinerSchema}.indexeddb`\nexport type IndexedDbBoundWitnessDivinerSchema = typeof IndexedDbBoundWitnessDivinerSchema\n","import { IndexDescription } from '@xyo-network/archivist-model'\nimport { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbBoundWitnessDivinerSchema } from './Schema'\n\nexport const IndexedDbBoundWitnessDivinerConfigSchema = `${IndexedDbBoundWitnessDivinerSchema}.config`\nexport type IndexedDbBoundWitnessDivinerConfigSchema = typeof IndexedDbBoundWitnessDivinerConfigSchema\n\nexport type IndexedDbBoundWitnessDivinerConfig = DivinerConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbBoundWitnessDivinerConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main diviner config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n","import { containsAll } from '@xylabs/array'\nimport { exists } from '@xylabs/exists'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbBoundWitnessDivinerConfigSchema } from './Config'\nimport { IndexedDbBoundWitnessDivinerParams } from './Params'\n\ninterface BoundWitnessStore {\n  [s: string]: BoundWitness\n}\n\ntype ValueFilter = (bw?: BoundWitness | null) => boolean\n\nconst bwValueFilter = (\n  key: keyof Pick<BoundWitness, 'addresses' | 'payload_hashes' | 'payload_schemas'>,\n  values?: string[],\n): ValueFilter | undefined => {\n  if (!values || values?.length === 0) return undefined\n  return (bw) => {\n    if (!bw) return false\n    return containsAll(bw[key], values)\n  }\n}\n\nexport class IndexedDbBoundWitnessDiviner<\n  TParams extends IndexedDbBoundWitnessDivinerParams = IndexedDbBoundWitnessDivinerParams,\n> extends BoundWitnessDiviner<TParams> {\n  static override configSchemas = [IndexedDbBoundWitnessDivinerConfigSchema]\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the archivist's name and if archivist's name is not supplied,\n   * it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.archivist ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  protected override async divineHandler(payloads?: Payload[]): Promise<BoundWitness[]> {\n    const query = payloads?.filter(isBoundWitnessDivinerQueryPayload)?.pop()\n    if (!query) return []\n\n    const result = await this.tryUseDb(async (db) => {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { addresses, payload_hashes, payload_schemas, limit, offset, order } = query\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: BoundWitness[] = []\n      let parsedOffset = offset ?? 0\n      const parsedLimit = limit ?? 10\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n      const valueFilters: ValueFilter[] = [\n        bwValueFilter('addresses', addresses),\n        bwValueFilter('payload_hashes', payload_hashes),\n        bwValueFilter('payload_schemas', payload_schemas),\n      ].filter(exists)\n      // Only iterate over BWs\n      let cursor = await store.index(IndexedDbArchivist.schemaIndexName).openCursor(IDBKeyRange.only(BoundWitnessSchema), direction)\n\n      // If we're filtering on more than just the schema, we need to\n      // iterate through all the results\n      if (valueFilters.length === 0) {\n        // Skip records until the offset is reached\n        while (cursor && parsedOffset > 0) {\n          cursor = await cursor.advance(parsedOffset)\n          parsedOffset = 0 // Reset offset after skipping\n        }\n      }\n      // Collect results up to the limit\n      while (cursor && results.length < parsedLimit) {\n        const value = cursor.value\n        if (value) {\n          // If we're filtering on more than just the schema\n          if (valueFilters.length > 0) {\n            // Ensure all filters pass\n            if (valueFilters.every((filter) => filter(value))) {\n              // Then save the value\n              results.push(value)\n            }\n          } else {\n            // Otherwise just save the value\n            results.push(value)\n          }\n        }\n        cursor = await cursor.continue()\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return results.filter(isBoundWitness).map((bw) => {\n        return PayloadHasher.jsonPayload(bw)\n      })\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: Do not eager initialize the DB here. It will cause the\n    // DB to be created by this process and then the DB will be\n    // in a bad state for other processes that need to create the DB.\n    return true\n  }\n\n  /**\n   * Checks that the desired DB/objectStore exists and is initialized to the correct version\n   * @returns The initialized DB or undefined if it does not exist in the desired state\n   */\n  private async tryGetInitializedDb(): Promise<IDBPDatabase<BoundWitnessStore> | undefined> {\n    // Enumerate the DBs\n    const dbs = await indexedDB.databases()\n    // Check that the DB exists at the desired version\n    const dbExists = dbs.some((db) => {\n      return db.name === this.dbName && db.version === this.dbVersion\n    })\n    // If the DB exists at the desired version\n    if (dbExists) {\n      // If the db does exist, open it\n      const db = await openDB<BoundWitnessStore>(this.dbName, this.dbVersion)\n      // Check that the desired objectStore exists\n      const storeExists = db.objectStoreNames.contains(this.storeName)\n      // If the correct db/version/objectStore exists\n      if (storeExists) {\n        return db\n      } else {\n        // Otherwise close the db so the process that is going to update the\n        // db can open it\n        db.close()\n      }\n    }\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async tryUseDb<T>(callback: (db: IDBPDatabase<BoundWitnessStore>) => Promise<T> | T): Promise<T | undefined> {\n    // Get the initialized DB\n    const db = await this.tryGetInitializedDb()\n    if (db) {\n      try {\n        // Perform the callback\n        return await callback(db)\n      } finally {\n        // Close the DB\n        db.close()\n      }\n    }\n    return undefined\n  }\n}\n"],"mappings":"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","names":["IndexedDbBoundWitnessDivinerSchema","BoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerConfigSchema","IndexedDbBoundWitnessDivinerSchema","import_diviner_boundwitness_model","bwValueFilter","key","values","length","undefined","bw","containsAll","IndexedDbBoundWitnessDiviner","BoundWitnessDiviner","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","filter","isBoundWitnessDivinerQueryPayload","pop","result","tryUseDb","db","addresses","payload_hashes","payload_schemas","limit","offset","order","tx","transaction","store","objectStore","results","parsedOffset","parsedLimit","direction","valueFilters","exists","cursor","index","schemaIndexName","openCursor","IDBKeyRange","only","BoundWitnessSchema","advance","value","every","push","continue","done","isBoundWitness","map","PayloadHasher","jsonPayload","startHandler","tryGetInitializedDb","dbs","indexedDB","databases","dbExists","some","name","version","openDB","storeExists","objectStoreNames","contains","close","callback","configSchemas","IndexedDbBoundWitnessDivinerConfigSchema"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["export * from './Config'\nexport * from './Diviner'\nexport * from './Params'\nexport * from './Schema'\n","import { BoundWitnessDivinerSchema } from '@xyo-network/diviner-boundwitness-model'\n\nexport const IndexedDbBoundWitnessDivinerSchema = `${BoundWitnessDivinerSchema}.indexeddb`\nexport type IndexedDbBoundWitnessDivinerSchema = typeof IndexedDbBoundWitnessDivinerSchema\n","import { IndexDescription } from '@xyo-network/archivist-model'\nimport { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbBoundWitnessDivinerSchema } from './Schema'\n\nexport const IndexedDbBoundWitnessDivinerConfigSchema = `${IndexedDbBoundWitnessDivinerSchema}.config`\nexport type IndexedDbBoundWitnessDivinerConfigSchema = typeof IndexedDbBoundWitnessDivinerConfigSchema\n\nexport type IndexedDbBoundWitnessDivinerConfig = DivinerConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbBoundWitnessDivinerConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main diviner config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n","import { containsAll } from '@xylabs/array'\nimport { exists } from '@xylabs/exists'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbBoundWitnessDivinerConfigSchema } from './Config'\nimport { IndexedDbBoundWitnessDivinerParams } from './Params'\n\ninterface BoundWitnessStore {\n  [s: string]: BoundWitness\n}\n\ntype ValueFilter = (bw?: BoundWitness | null) => boolean\n\nconst bwValueFilter = (\n  key: keyof Pick<BoundWitness, 'addresses' | 'payload_hashes' | 'payload_schemas'>,\n  values?: string[],\n): ValueFilter | undefined => {\n  if (!values || values?.length === 0) return undefined\n  return (bw) => {\n    if (!bw) return false\n    return containsAll(bw[key], values)\n  }\n}\n\nexport class IndexedDbBoundWitnessDiviner<\n  TParams extends IndexedDbBoundWitnessDivinerParams = IndexedDbBoundWitnessDivinerParams,\n> extends BoundWitnessDiviner<TParams> {\n  static override configSchemas = [IndexedDbBoundWitnessDivinerConfigSchema]\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the archivist's name and if archivist's name is not supplied,\n   * it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.archivist ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  protected override async divineHandler(payloads?: Payload[]): Promise<BoundWitness[]> {\n    const query = payloads?.filter(isBoundWitnessDivinerQueryPayload)?.pop()\n    if (!query) return []\n\n    const result = await this.tryUseDb(async (db) => {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { addresses, payload_hashes, payload_schemas, limit, offset, order } = query\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: BoundWitness[] = []\n      let parsedOffset = offset ?? 0\n      const parsedLimit = limit ?? 10\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n      const valueFilters: ValueFilter[] = [\n        bwValueFilter('addresses', addresses),\n        bwValueFilter('payload_hashes', payload_hashes),\n        bwValueFilter('payload_schemas', payload_schemas),\n      ].filter(exists)\n      // Only iterate over BWs\n      let cursor = await store.index(IndexedDbArchivist.schemaIndexName).openCursor(IDBKeyRange.only(BoundWitnessSchema), direction)\n\n      // If we're filtering on more than just the schema, we need to\n      // iterate through all the results\n      if (valueFilters.length === 0) {\n        // Skip records until the offset is reached\n        while (cursor && parsedOffset > 0) {\n          cursor = await cursor.advance(parsedOffset)\n          parsedOffset = 0 // Reset offset after skipping\n        }\n      }\n      // Collect results up to the limit\n      while (cursor && results.length < parsedLimit) {\n        const value = cursor.value\n        if (value) {\n          // If we're filtering on more than just the schema\n          if (valueFilters.length > 0) {\n            // Ensure all filters pass\n            if (valueFilters.every((filter) => filter(value))) {\n              // Then save the value\n              results.push(value)\n            }\n          } else {\n            // Otherwise just save the value\n            results.push(value)\n          }\n        }\n        cursor = await cursor.continue()\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return await Promise.all(\n        results.filter(isBoundWitness).map((bw) => {\n          return PayloadBuilder.build(bw)\n        }),\n      )\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: Do not eager initialize the DB here. It will cause the\n    // DB to be created by this process and then the DB will be\n    // in a bad state for other processes that need to create the DB.\n    return true\n  }\n\n  /**\n   * Checks that the desired DB/objectStore exists and is initialized to the correct version\n   * @returns The initialized DB or undefined if it does not exist in the desired state\n   */\n  private async tryGetInitializedDb(): Promise<IDBPDatabase<BoundWitnessStore> | undefined> {\n    // Enumerate the DBs\n    const dbs = await indexedDB.databases()\n    // Check that the DB exists at the desired version\n    const dbExists = dbs.some((db) => {\n      return db.name === this.dbName && db.version === this.dbVersion\n    })\n    // If the DB exists at the desired version\n    if (dbExists) {\n      // If the db does exist, open it\n      const db = await openDB<BoundWitnessStore>(this.dbName, this.dbVersion)\n      // Check that the desired objectStore exists\n      const storeExists = db.objectStoreNames.contains(this.storeName)\n      // If the correct db/version/objectStore exists\n      if (storeExists) {\n        return db\n      } else {\n        // Otherwise close the db so the process that is going to update the\n        // db can open it\n        db.close()\n      }\n    }\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async tryUseDb<T>(callback: (db: IDBPDatabase<BoundWitnessStore>) => Promise<T> | T): Promise<T | undefined> {\n    // Get the initialized DB\n    const db = await this.tryGetInitializedDb()\n    if (db) {\n      try {\n        // Perform the callback\n        return await callback(db)\n      } finally {\n        // Close the DB\n        db.close()\n      }\n    }\n    return undefined\n  }\n}\n"],"mappings":"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","names":["IndexedDbBoundWitnessDivinerSchema","BoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerConfigSchema","IndexedDbBoundWitnessDivinerSchema","import_diviner_boundwitness_model","bwValueFilter","key","values","length","undefined","bw","containsAll","IndexedDbBoundWitnessDiviner","BoundWitnessDiviner","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","filter","isBoundWitnessDivinerQueryPayload","pop","result","tryUseDb","db","addresses","payload_hashes","payload_schemas","limit","offset","order","tx","transaction","store","objectStore","results","parsedOffset","parsedLimit","direction","valueFilters","exists","cursor","index","schemaIndexName","openCursor","IDBKeyRange","only","BoundWitnessSchema","advance","value","every","push","continue","done","Promise","all","isBoundWitness","map","PayloadBuilder","build","startHandler","tryGetInitializedDb","dbs","indexedDB","databases","dbExists","some","name","version","openDB","storeExists","objectStoreNames","contains","close","callback","configSchemas","IndexedDbBoundWitnessDivinerConfigSchema"]}

package/dist/node/index.js

@@ -20,7 +20,7 @@ import { IndexedDbArchivist } from "@xyo-network/archivist-indexeddb";
 import { BoundWitnessSchema, isBoundWitness } from "@xyo-network/boundwitness-model";
 import { BoundWitnessDiviner } from "@xyo-network/diviner-boundwitness-abstract";
 import { isBoundWitnessDivinerQueryPayload } from "@xyo-network/diviner-boundwitness-model";
-import { PayloadHasher } from "@xyo-network/hash";
+import { PayloadBuilder } from "@xyo-network/payload-builder";
 import { openDB } from "idb";
 var bwValueFilter = /* @__PURE__ */ __name((key, values) => {
   if (!values || (values == null ? void 0 : values.length) === 0)
@@ -97,9 +97,9 @@ var _IndexedDbBoundWitnessDiviner = class _IndexedDbBoundWitnessDiviner extends
         cursor = await cursor.continue();
       }
       await tx.done;
-      return results.filter(isBoundWitness).map((bw) => {
-        return PayloadHasher.jsonPayload(bw);
-      });
+      return await Promise.all(results.filter(isBoundWitness).map((bw) => {
+        return PayloadBuilder.build(bw);
+      }));
     });
     return result ?? [];
   }

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["import { BoundWitnessDivinerSchema } from '@xyo-network/diviner-boundwitness-model'\n\nexport const IndexedDbBoundWitnessDivinerSchema = `${BoundWitnessDivinerSchema}.indexeddb`\nexport type IndexedDbBoundWitnessDivinerSchema = typeof IndexedDbBoundWitnessDivinerSchema\n","import { IndexDescription } from '@xyo-network/archivist-model'\nimport { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbBoundWitnessDivinerSchema } from './Schema'\n\nexport const IndexedDbBoundWitnessDivinerConfigSchema = `${IndexedDbBoundWitnessDivinerSchema}.config`\nexport type IndexedDbBoundWitnessDivinerConfigSchema = typeof IndexedDbBoundWitnessDivinerConfigSchema\n\nexport type IndexedDbBoundWitnessDivinerConfig = DivinerConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbBoundWitnessDivinerConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main diviner config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n","import { containsAll } from '@xylabs/array'\nimport { exists } from '@xylabs/exists'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbBoundWitnessDivinerConfigSchema } from './Config'\nimport { IndexedDbBoundWitnessDivinerParams } from './Params'\n\ninterface BoundWitnessStore {\n  [s: string]: BoundWitness\n}\n\ntype ValueFilter = (bw?: BoundWitness | null) => boolean\n\nconst bwValueFilter = (\n  key: keyof Pick<BoundWitness, 'addresses' | 'payload_hashes' | 'payload_schemas'>,\n  values?: string[],\n): ValueFilter | undefined => {\n  if (!values || values?.length === 0) return undefined\n  return (bw) => {\n    if (!bw) return false\n    return containsAll(bw[key], values)\n  }\n}\n\nexport class IndexedDbBoundWitnessDiviner<\n  TParams extends IndexedDbBoundWitnessDivinerParams = IndexedDbBoundWitnessDivinerParams,\n> extends BoundWitnessDiviner<TParams> {\n  static override configSchemas = [IndexedDbBoundWitnessDivinerConfigSchema]\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the archivist's name and if archivist's name is not supplied,\n   * it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.archivist ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  protected override async divineHandler(payloads?: Payload[]): Promise<BoundWitness[]> {\n    const query = payloads?.filter(isBoundWitnessDivinerQueryPayload)?.pop()\n    if (!query) return []\n\n    const result = await this.tryUseDb(async (db) => {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { addresses, payload_hashes, payload_schemas, limit, offset, order } = query\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: BoundWitness[] = []\n      let parsedOffset = offset ?? 0\n      const parsedLimit = limit ?? 10\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n      const valueFilters: ValueFilter[] = [\n        bwValueFilter('addresses', addresses),\n        bwValueFilter('payload_hashes', payload_hashes),\n        bwValueFilter('payload_schemas', payload_schemas),\n      ].filter(exists)\n      // Only iterate over BWs\n      let cursor = await store.index(IndexedDbArchivist.schemaIndexName).openCursor(IDBKeyRange.only(BoundWitnessSchema), direction)\n\n      // If we're filtering on more than just the schema, we need to\n      // iterate through all the results\n      if (valueFilters.length === 0) {\n        // Skip records until the offset is reached\n        while (cursor && parsedOffset > 0) {\n          cursor = await cursor.advance(parsedOffset)\n          parsedOffset = 0 // Reset offset after skipping\n        }\n      }\n      // Collect results up to the limit\n      while (cursor && results.length < parsedLimit) {\n        const value = cursor.value\n        if (value) {\n          // If we're filtering on more than just the schema\n          if (valueFilters.length > 0) {\n            // Ensure all filters pass\n            if (valueFilters.every((filter) => filter(value))) {\n              // Then save the value\n              results.push(value)\n            }\n          } else {\n            // Otherwise just save the value\n            results.push(value)\n          }\n        }\n        cursor = await cursor.continue()\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return results.filter(isBoundWitness).map((bw) => {\n        return PayloadHasher.jsonPayload(bw)\n      })\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: Do not eager initialize the DB here. It will cause the\n    // DB to be created by this process and then the DB will be\n    // in a bad state for other processes that need to create the DB.\n    return true\n  }\n\n  /**\n   * Checks that the desired DB/objectStore exists and is initialized to the correct version\n   * @returns The initialized DB or undefined if it does not exist in the desired state\n   */\n  private async tryGetInitializedDb(): Promise<IDBPDatabase<BoundWitnessStore> | undefined> {\n    // Enumerate the DBs\n    const dbs = await indexedDB.databases()\n    // Check that the DB exists at the desired version\n    const dbExists = dbs.some((db) => {\n      return db.name === this.dbName && db.version === this.dbVersion\n    })\n    // If the DB exists at the desired version\n    if (dbExists) {\n      // If the db does exist, open it\n      const db = await openDB<BoundWitnessStore>(this.dbName, this.dbVersion)\n      // Check that the desired objectStore exists\n      const storeExists = db.objectStoreNames.contains(this.storeName)\n      // If the correct db/version/objectStore exists\n      if (storeExists) {\n        return db\n      } else {\n        // Otherwise close the db so the process that is going to update the\n        // db can open it\n        db.close()\n      }\n    }\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async tryUseDb<T>(callback: (db: IDBPDatabase<BoundWitnessStore>) => Promise<T> | T): Promise<T | undefined> {\n    // Get the initialized DB\n    const db = await this.tryGetInitializedDb()\n    if (db) {\n      try {\n        // Perform the callback\n        return await callback(db)\n      } finally {\n        // Close the DB\n        db.close()\n      }\n    }\n    return undefined\n  }\n}\n"],"mappings":"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","names":["BoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerConfigSchema","IndexedDbBoundWitnessDivinerSchema","containsAll","exists","IndexedDbArchivist","BoundWitnessSchema","isBoundWitness","BoundWitnessDiviner","isBoundWitnessDivinerQueryPayload","PayloadHasher","openDB","bwValueFilter","key","values","length","undefined","bw","containsAll","IndexedDbBoundWitnessDiviner","BoundWitnessDiviner","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","filter","isBoundWitnessDivinerQueryPayload","pop","result","tryUseDb","db","addresses","payload_hashes","payload_schemas","limit","offset","order","tx","transaction","store","objectStore","results","parsedOffset","parsedLimit","direction","valueFilters","exists","cursor","index","schemaIndexName","openCursor","IDBKeyRange","only","BoundWitnessSchema","advance","value","every","push","continue","done","isBoundWitness","map","PayloadHasher","jsonPayload","startHandler","tryGetInitializedDb","dbs","indexedDB","databases","dbExists","some","name","version","openDB","storeExists","objectStoreNames","contains","close","callback","configSchemas","IndexedDbBoundWitnessDivinerConfigSchema"]}
+{"version":3,"sources":["../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["import { BoundWitnessDivinerSchema } from '@xyo-network/diviner-boundwitness-model'\n\nexport const IndexedDbBoundWitnessDivinerSchema = `${BoundWitnessDivinerSchema}.indexeddb`\nexport type IndexedDbBoundWitnessDivinerSchema = typeof IndexedDbBoundWitnessDivinerSchema\n","import { IndexDescription } from '@xyo-network/archivist-model'\nimport { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbBoundWitnessDivinerSchema } from './Schema'\n\nexport const IndexedDbBoundWitnessDivinerConfigSchema = `${IndexedDbBoundWitnessDivinerSchema}.config`\nexport type IndexedDbBoundWitnessDivinerConfigSchema = typeof IndexedDbBoundWitnessDivinerConfigSchema\n\nexport type IndexedDbBoundWitnessDivinerConfig = DivinerConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbBoundWitnessDivinerConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main diviner config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n","import { containsAll } from '@xylabs/array'\nimport { exists } from '@xylabs/exists'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport { IDBPDatabase, openDB } from 'idb'\n\nimport { IndexedDbBoundWitnessDivinerConfigSchema } from './Config'\nimport { IndexedDbBoundWitnessDivinerParams } from './Params'\n\ninterface BoundWitnessStore {\n  [s: string]: BoundWitness\n}\n\ntype ValueFilter = (bw?: BoundWitness | null) => boolean\n\nconst bwValueFilter = (\n  key: keyof Pick<BoundWitness, 'addresses' | 'payload_hashes' | 'payload_schemas'>,\n  values?: string[],\n): ValueFilter | undefined => {\n  if (!values || values?.length === 0) return undefined\n  return (bw) => {\n    if (!bw) return false\n    return containsAll(bw[key], values)\n  }\n}\n\nexport class IndexedDbBoundWitnessDiviner<\n  TParams extends IndexedDbBoundWitnessDivinerParams = IndexedDbBoundWitnessDivinerParams,\n> extends BoundWitnessDiviner<TParams> {\n  static override configSchemas = [IndexedDbBoundWitnessDivinerConfigSchema]\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the archivist's name and if archivist's name is not supplied,\n   * it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.archivist ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to 1.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  protected override async divineHandler(payloads?: Payload[]): Promise<BoundWitness[]> {\n    const query = payloads?.filter(isBoundWitnessDivinerQueryPayload)?.pop()\n    if (!query) return []\n\n    const result = await this.tryUseDb(async (db) => {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      const { addresses, payload_hashes, payload_schemas, limit, offset, order } = query\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: BoundWitness[] = []\n      let parsedOffset = offset ?? 0\n      const parsedLimit = limit ?? 10\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n      const valueFilters: ValueFilter[] = [\n        bwValueFilter('addresses', addresses),\n        bwValueFilter('payload_hashes', payload_hashes),\n        bwValueFilter('payload_schemas', payload_schemas),\n      ].filter(exists)\n      // Only iterate over BWs\n      let cursor = await store.index(IndexedDbArchivist.schemaIndexName).openCursor(IDBKeyRange.only(BoundWitnessSchema), direction)\n\n      // If we're filtering on more than just the schema, we need to\n      // iterate through all the results\n      if (valueFilters.length === 0) {\n        // Skip records until the offset is reached\n        while (cursor && parsedOffset > 0) {\n          cursor = await cursor.advance(parsedOffset)\n          parsedOffset = 0 // Reset offset after skipping\n        }\n      }\n      // Collect results up to the limit\n      while (cursor && results.length < parsedLimit) {\n        const value = cursor.value\n        if (value) {\n          // If we're filtering on more than just the schema\n          if (valueFilters.length > 0) {\n            // Ensure all filters pass\n            if (valueFilters.every((filter) => filter(value))) {\n              // Then save the value\n              results.push(value)\n            }\n          } else {\n            // Otherwise just save the value\n            results.push(value)\n          }\n        }\n        cursor = await cursor.continue()\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return await Promise.all(\n        results.filter(isBoundWitness).map((bw) => {\n          return PayloadBuilder.build(bw)\n        }),\n      )\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    // NOTE: Do not eager initialize the DB here. It will cause the\n    // DB to be created by this process and then the DB will be\n    // in a bad state for other processes that need to create the DB.\n    return true\n  }\n\n  /**\n   * Checks that the desired DB/objectStore exists and is initialized to the correct version\n   * @returns The initialized DB or undefined if it does not exist in the desired state\n   */\n  private async tryGetInitializedDb(): Promise<IDBPDatabase<BoundWitnessStore> | undefined> {\n    // Enumerate the DBs\n    const dbs = await indexedDB.databases()\n    // Check that the DB exists at the desired version\n    const dbExists = dbs.some((db) => {\n      return db.name === this.dbName && db.version === this.dbVersion\n    })\n    // If the DB exists at the desired version\n    if (dbExists) {\n      // If the db does exist, open it\n      const db = await openDB<BoundWitnessStore>(this.dbName, this.dbVersion)\n      // Check that the desired objectStore exists\n      const storeExists = db.objectStoreNames.contains(this.storeName)\n      // If the correct db/version/objectStore exists\n      if (storeExists) {\n        return db\n      } else {\n        // Otherwise close the db so the process that is going to update the\n        // db can open it\n        db.close()\n      }\n    }\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async tryUseDb<T>(callback: (db: IDBPDatabase<BoundWitnessStore>) => Promise<T> | T): Promise<T | undefined> {\n    // Get the initialized DB\n    const db = await this.tryGetInitializedDb()\n    if (db) {\n      try {\n        // Perform the callback\n        return await callback(db)\n      } finally {\n        // Close the DB\n        db.close()\n      }\n    }\n    return undefined\n  }\n}\n"],"mappings":"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","names":["BoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerSchema","IndexedDbBoundWitnessDivinerConfigSchema","IndexedDbBoundWitnessDivinerSchema","containsAll","exists","IndexedDbArchivist","BoundWitnessSchema","isBoundWitness","BoundWitnessDiviner","isBoundWitnessDivinerQueryPayload","PayloadBuilder","openDB","bwValueFilter","key","values","length","undefined","bw","containsAll","IndexedDbBoundWitnessDiviner","BoundWitnessDiviner","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","filter","isBoundWitnessDivinerQueryPayload","pop","result","tryUseDb","db","addresses","payload_hashes","payload_schemas","limit","offset","order","tx","transaction","store","objectStore","results","parsedOffset","parsedLimit","direction","valueFilters","exists","cursor","index","schemaIndexName","openCursor","IDBKeyRange","only","BoundWitnessSchema","advance","value","every","push","continue","done","Promise","all","isBoundWitness","map","PayloadBuilder","build","startHandler","tryGetInitializedDb","dbs","indexedDB","databases","dbExists","some","name","version","openDB","storeExists","objectStoreNames","contains","close","callback","configSchemas","IndexedDbBoundWitnessDivinerConfigSchema"]}

package/package.json

@@ -10,27 +10,27 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/array": "^2.14.0",
-    "@xylabs/exists": "^2.14.0",
-    "@xyo-network/archivist-indexeddb": "~2.90.2",
-    "@xyo-network/archivist-model": "~2.90.2",
-    "@xyo-network/boundwitness-model": "~2.90.2",
-    "@xyo-network/diviner-boundwitness-abstract": "~2.90.2",
-    "@xyo-network/diviner-boundwitness-model": "~2.90.2",
-    "@xyo-network/diviner-model": "~2.90.2",
-    "@xyo-network/hash": "~2.90.2",
-    "@xyo-network/module-model": "~2.90.2",
-    "@xyo-network/payload-model": "~2.90.2",
+    "@xylabs/array": "^2.14.1",
+    "@xylabs/exists": "^2.14.1",
+    "@xyo-network/archivist-indexeddb": "~2.90.4",
+    "@xyo-network/archivist-model": "~2.90.4",
+    "@xyo-network/boundwitness-model": "~2.90.4",
+    "@xyo-network/diviner-boundwitness-abstract": "~2.90.4",
+    "@xyo-network/diviner-boundwitness-model": "~2.90.4",
+    "@xyo-network/diviner-model": "~2.90.4",
+    "@xyo-network/module-model": "~2.90.4",
+    "@xyo-network/payload-builder": "~2.90.4",
+    "@xyo-network/payload-model": "~2.90.4",
     "idb": "^8.0.0"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.2.42",
     "@xylabs/tsconfig": "^3.2.42",
-    "@xyo-network/account": "~2.90.2",
-    "@xyo-network/archivist-indexeddb": "~2.90.2",
-    "@xyo-network/boundwitness-builder": "~2.90.2",
-    "@xyo-network/node-memory": "~2.90.2",
-    "@xyo-network/payload-builder": "~2.90.2",
+    "@xyo-network/account": "~2.90.4",
+    "@xyo-network/archivist-indexeddb": "~2.90.4",
+    "@xyo-network/boundwitness-builder": "~2.90.4",
+    "@xyo-network/node-memory": "~2.90.4",
+    "@xyo-network/payload-builder": "~2.90.4",
     "fake-indexeddb": "^5.0.2",
     "typescript": "^5.3.3"
   },
@@ -73,6 +73,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.90.2",
+  "version": "2.90.4",
   "type": "module"
 }

package/src/Diviner.ts

@@ -4,7 +4,7 @@ import { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'
 import { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'
 import { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'
 import { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'
-import { PayloadHasher } from '@xyo-network/hash'
+import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { Payload } from '@xyo-network/payload-model'
 import { IDBPDatabase, openDB } from 'idb'
 
@@ -109,9 +109,11 @@ export class IndexedDbBoundWitnessDiviner<
       }
       await tx.done
       // Remove any metadata before returning to the client
-      return results.filter(isBoundWitness).map((bw) => {
-        return PayloadHasher.jsonPayload(bw)
-      })
+      return await Promise.all(
+        results.filter(isBoundWitness).map((bw) => {
+          return PayloadBuilder.build(bw)
+        }),
+      )
     })
     return result ?? []
   }