@xyo-network/diviner-payload-indexeddb 3.6.0-rc.6 → 3.6.0-rc.8

package/dist/browser/Diviner.d.ts

@@ -1,12 +1,11 @@
 import type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model';
 import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract';
 import type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model';
-import { type Payload, type Schema } from '@xyo-network/payload-model';
+import type { Payload, Schema } from '@xyo-network/payload-model';
 import type { IndexedDbPayloadDivinerParams } from './Params.ts';
 export declare class IndexedDbPayloadDiviner<TParams extends IndexedDbPayloadDivinerParams = IndexedDbPayloadDivinerParams, TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut>> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
     static readonly configSchemas: Schema[];
     static readonly defaultConfigSchema: Schema;
-    private _db;
     /**
      * The database name. If not supplied via config, it defaults
      * to the archivist's name and if archivist's name is not supplied,
@@ -26,8 +25,6 @@ export declare class IndexedDbPayloadDiviner<TParams extends IndexedDbPayloadDiv
     get storeName(): string;
     protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
     protected startHandler(): Promise<boolean>;
-    private getKeyRangeValue;
-    private selectBestIndex;
     /**
      * Checks that the desired DB/objectStore exists and is initialized to the correct version
      * @returns The initialized DB or undefined if it does not exist in the desired state

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAA;AAEpF,OAAO,EACL,KAAK,OAAO,EAAE,KAAK,MAAM,EAC1B,MAAM,4BAA4B,CAAA;AAKnC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAA;AA4BhE,qBAAa,uBAAuB,CAClC,OAAO,SAAS,6BAA6B,GAAG,6BAA6B,EAC7E,GAAG,SAAS,0BAA0B,GAAG,0BAA0B,EACnE,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CACD,SAAQ,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACtD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAgE;IAChH,gBAAyB,mBAAmB,EAAE,MAAM,CAAsC;IAE1F,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cAoEhD,YAAY;IAKrC,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,eAAe;IAoBvB;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAA;AAEpF,OAAO,KAAK,EACV,OAAO,EAAE,MAAM,EAChB,MAAM,4BAA4B,CAAA;AAKnC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAA;AAoBhE,qBAAa,uBAAuB,CAClC,OAAO,SAAS,6BAA6B,GAAG,6BAA6B,EAC7E,GAAG,SAAS,0BAA0B,GAAG,0BAA0B,EACnE,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CACD,SAAQ,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACtD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAgE;IAChH,gBAAyB,mBAAmB,EAAE,MAAM,CAAsC;IAE1F;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cAqEhD,YAAY;IAKrC;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}

package/dist/browser/index.mjs

@@ -14,10 +14,8 @@ import { assertEx } from "@xylabs/assert";
 import { exists } from "@xylabs/exists";
 import { removeFields } from "@xylabs/object";
 import { IndexedDbArchivist } from "@xyo-network/archivist-indexeddb";
-import { IndexSeparator } from "@xyo-network/archivist-model";
 import { PayloadDiviner } from "@xyo-network/diviner-payload-abstract";
 import { isPayloadDivinerQueryPayload } from "@xyo-network/diviner-payload-model";
-import { SequenceConstants } from "@xyo-network/payload-model";
 import { openDB } from "idb";
 var payloadValueFilter = /* @__PURE__ */ __name((key, value) => {
   if (!value) return void 0;
@@ -28,9 +26,6 @@ var payloadValueFilter = /* @__PURE__ */ __name((key, value) => {
     return Array.isArray(sourceValue) && Array.isArray(value) ? containsAll(sourceValue, value) : sourceValue == value;
   };
 }, "payloadValueFilter");
-var extractFields = /* @__PURE__ */ __name((indexName) => {
-  return indexName.slice(3).split(IndexSeparator).map((field) => field.toLowerCase());
-}, "extractFields");
 var IndexedDbPayloadDiviner = class extends PayloadDiviner {
   static {
     __name(this, "IndexedDbPayloadDiviner");
@@ -40,7 +35,6 @@ var IndexedDbPayloadDiviner = class extends PayloadDiviner {
     IndexedDbPayloadDivinerConfigSchema
   ];
   static defaultConfigSchema = IndexedDbPayloadDivinerConfigSchema;
-  _db;
   /**
   * The database name. If not supplied via config, it defaults
   * to the archivist's name and if archivist's name is not supplied,
@@ -75,7 +69,7 @@ var IndexedDbPayloadDiviner = class extends PayloadDiviner {
       const tx = db.transaction(this.storeName, "readonly");
       const store = tx.objectStore(this.storeName);
       const results = [];
-      let parsedCursor = cursor ?? SequenceConstants.minLocalSequence;
+      let parsedCursor = cursor;
       const parsedLimit = limit ?? 10;
       assertEx((schemas?.length ?? 1) === 1, () => "IndexedDbPayloadDiviner: Only one filter schema supported");
       const filterSchema = schemas?.[0];
@@ -85,14 +79,16 @@ var IndexedDbPayloadDiviner = class extends PayloadDiviner {
       } : {
         ...props
       };
+      const valueFilters = Object.entries(filter).map(([key, value]) => payloadValueFilter(key, value)).filter(exists);
       const direction = order === "desc" ? "prev" : "next";
-      const suggestedIndex = this.selectBestIndex(filter, store);
-      const keyRangeValue = this.getKeyRangeValue(suggestedIndex, filter);
-      const valueFilters = props ? Object.entries(props).map(([key, value]) => payloadValueFilter(key, value)).filter(exists) : [];
-      let dbCursor = suggestedIndex ? await store.index(suggestedIndex).openCursor(IDBKeyRange.only(keyRangeValue), direction) : await store.openCursor(suggestedIndex, direction);
-      while (dbCursor && parsedCursor) {
-        dbCursor = await dbCursor.advance(1);
-        parsedCursor = SequenceConstants.minLocalSequence;
+      const sequenceIndex = assertEx(store.index(IndexedDbArchivist.sequenceIndexName), () => "Failed to get sequence index");
+      let dbCursor = assertEx(await sequenceIndex.openCursor(null, direction), () => `Failed to get cursor [${parsedCursor}, ${cursor}]`);
+      if (parsedCursor !== void 0) {
+        let currentSequence;
+        while (dbCursor && currentSequence !== parsedCursor) {
+          currentSequence = await dbCursor.value?.sequence;
+          dbCursor = await dbCursor.advance(1);
+        }
       }
       while (dbCursor && results.length < parsedLimit) {
         const value = dbCursor.value;
@@ -120,31 +116,6 @@ var IndexedDbPayloadDiviner = class extends PayloadDiviner {
     await super.startHandler();
     return true;
   }
-  getKeyRangeValue(indexName, query) {
-    if (!indexName) return [];
-    const indexFields = extractFields(indexName);
-    const keyRangeValue = indexFields.map((field) => query[field]);
-    return keyRangeValue.length === 1 ? keyRangeValue[0] : keyRangeValue;
-  }
-  selectBestIndex(query, store) {
-    const { indexNames } = store;
-    const queryKeys = new Set(Object.keys(query).map((key) => key.toLowerCase()));
-    let bestMatch = {
-      indexName: "",
-      matchCount: 0
-    };
-    for (const indexName of indexNames) {
-      const indexFields = extractFields(indexName);
-      const matchCount = indexFields.filter((field) => queryKeys.has(field)).length;
-      if (matchCount > bestMatch.matchCount) {
-        bestMatch = {
-          indexName,
-          matchCount
-        };
-      }
-    }
-    return bestMatch.matchCount > 0 ? bestMatch.indexName : null;
-  }
   /**
   * Checks that the desired DB/objectStore exists and is initialized to the correct version
   * @returns The initialized DB or undefined if it does not exist in the desired state

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["import { PayloadDivinerSchema } from '@xyo-network/diviner-payload-model'\n\nexport const IndexedDbPayloadDivinerSchema = `${PayloadDivinerSchema}.indexeddb` as const\nexport type IndexedDbPayloadDivinerSchema = typeof IndexedDbPayloadDivinerSchema\n","import type { IndexDescription } from '@xyo-network/archivist-model'\nimport type { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbPayloadDivinerSchema } from './Schema.ts'\n\nexport const IndexedDbPayloadDivinerConfigSchema = `${IndexedDbPayloadDivinerSchema}.config` as const\nexport type IndexedDbPayloadDivinerConfigSchema = typeof IndexedDbPayloadDivinerConfigSchema\n\nexport type IndexedDbPayloadDivinerConfig = 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: IndexedDbPayloadDivinerConfigSchema\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 { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport type { Hash } from '@xylabs/hex'\nimport type { AnyObject } from '@xylabs/object'\nimport { removeFields } from '@xylabs/object'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport { IndexSeparator } from '@xyo-network/archivist-model'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { isPayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport {\n  type Payload, type Schema, SequenceConstants,\n} from '@xyo-network/payload-model'\nimport type { IDBPDatabase, IDBPObjectStore } from 'idb'\nimport { openDB } from 'idb'\n\nimport { IndexedDbPayloadDivinerConfigSchema } from './Config.ts'\nimport type { IndexedDbPayloadDivinerParams } from './Params.ts'\n\ninterface PayloadStore {\n  [s: string]: Payload\n}\n\ntype AnyPayload = Payload<Record<string, unknown>>\n\ntype ValueFilter = (payload?: AnyPayload | null) => boolean\n\nconst payloadValueFilter = (key: keyof AnyPayload, value?: unknown | unknown[]): ValueFilter | undefined => {\n  if (!value) return undefined\n  return (payload) => {\n    if (!payload) return false\n    const sourceValue = payload?.[key]\n    if (sourceValue === undefined) return false\n    return Array.isArray(sourceValue) && Array.isArray(value) ? containsAll(sourceValue, value) : sourceValue == value\n  }\n}\n\n// Function to extract fields from an index name\nconst extractFields = (indexName: string): string[] => {\n  return indexName\n    .slice(3)\n    .split(IndexSeparator)\n    .map(field => field.toLowerCase())\n}\n\nexport class IndexedDbPayloadDiviner<\n  TParams extends IndexedDbPayloadDivinerParams = IndexedDbPayloadDivinerParams,\n  TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,\n  TOut extends Payload = Payload,\n  TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<\n    DivinerInstance<TParams, TIn, TOut>,\n    TIn,\n    TOut\n  >,\n> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, IndexedDbPayloadDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = IndexedDbPayloadDivinerConfigSchema\n\n  private _db: IDBPDatabase<PayloadStore> | undefined\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 the archivist default version.\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?: TIn[]): Promise<TOut[]> {\n    const query = payloads?.find(isPayloadDivinerQueryPayload) as TIn\n    if (!query) return []\n    const result = await this.tryUseDb(async (db) => {\n      const {\n        schemas, limit, cursor, order, ...props\n      } = removeFields(query as unknown as TIn & { sources?: Hash[] }, [\n        'hash',\n        'schema',\n      ])\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: TOut[] = []\n      let parsedCursor = cursor ?? SequenceConstants.minLocalSequence\n      const parsedLimit = limit ?? 10\n      assertEx((schemas?.length ?? 1) === 1, () => 'IndexedDbPayloadDiviner: Only one filter schema supported')\n      const filterSchema = schemas?.[0]\n      const filter = filterSchema ? { schema: filterSchema, ...props } : { ...props }\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n      const suggestedIndex = this.selectBestIndex(filter, store)\n      const keyRangeValue = this.getKeyRangeValue(suggestedIndex, filter)\n      const valueFilters: ValueFilter[]\n        = props\n          ? Object.entries(props)\n              .map(([key, value]) => payloadValueFilter(key, value))\n              .filter(exists)\n          : []\n      let dbCursor\n        = suggestedIndex\n          // Conditionally filter on schemas\n          ? await store.index(suggestedIndex).openCursor(IDBKeyRange.only(keyRangeValue), direction)\n          // Just iterate all records\n          : await store.openCursor(suggestedIndex, direction)\n\n      // Skip records until the offset is reached\n      while (dbCursor && parsedCursor) {\n        dbCursor = await dbCursor.advance(1)\n        parsedCursor = SequenceConstants.minLocalSequence // Reset offset after skipping\n      }\n      // Collect results up to the limit\n      while (dbCursor && results.length < parsedLimit) {\n        const value = dbCursor.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        try {\n          dbCursor = await dbCursor.continue()\n        } catch {\n          break\n        }\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return results\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    return true\n  }\n\n  private getKeyRangeValue(indexName: string | null, query: AnyObject): unknown | unknown[] {\n    if (!indexName) return []\n\n    // Extracting the relevant fields from the index name\n    const indexFields = extractFields(indexName)\n\n    // Collecting the values for these fields from the query object\n    const keyRangeValue = indexFields.map(field => query[field as keyof AnyObject])\n    return keyRangeValue.length === 1 ? keyRangeValue[0] : keyRangeValue\n  }\n\n  private selectBestIndex(query: AnyObject, store: IDBPObjectStore<PayloadStore>): string | null {\n    // List of available indexes\n    const { indexNames } = store\n\n    // Convert query object keys to a set for easier comparison\n    const queryKeys = new Set(Object.keys(query).map(key => key.toLowerCase()))\n\n    // Find the best matching index\n    let bestMatch: { indexName: string; matchCount: number } = { indexName: '', matchCount: 0 }\n\n    for (const indexName of indexNames) {\n      const indexFields = extractFields(indexName)\n      const matchCount = indexFields.filter(field => queryKeys.has(field)).length\n      if (matchCount > bestMatch.matchCount) {\n        bestMatch = { indexName, matchCount }\n      }\n    }\n    return bestMatch.matchCount > 0 ? bestMatch.indexName : null\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<PayloadStore> | 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<PayloadStore>(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<PayloadStore>) => 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":["PayloadDivinerSchema","IndexedDbPayloadDivinerSchema","IndexedDbPayloadDivinerConfigSchema","IndexedDbPayloadDivinerSchema","containsAll","assertEx","exists","removeFields","IndexedDbArchivist","IndexSeparator","PayloadDiviner","isPayloadDivinerQueryPayload","SequenceConstants","openDB","payloadValueFilter","key","value","undefined","payload","sourceValue","Array","isArray","containsAll","extractFields","indexName","slice","split","IndexSeparator","map","field","toLowerCase","IndexedDbPayloadDiviner","PayloadDiviner","configSchemas","IndexedDbPayloadDivinerConfigSchema","defaultConfigSchema","_db","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","find","isPayloadDivinerQueryPayload","result","tryUseDb","db","schemas","limit","cursor","order","props","removeFields","tx","transaction","store","objectStore","results","parsedCursor","SequenceConstants","minLocalSequence","parsedLimit","assertEx","length","filterSchema","filter","schema","direction","suggestedIndex","selectBestIndex","keyRangeValue","getKeyRangeValue","valueFilters","Object","entries","exists","dbCursor","index","openCursor","IDBKeyRange","only","advance","every","push","continue","done","startHandler","indexFields","indexNames","queryKeys","Set","keys","bestMatch","matchCount","has","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 { PayloadDivinerSchema } from '@xyo-network/diviner-payload-model'\n\nexport const IndexedDbPayloadDivinerSchema = `${PayloadDivinerSchema}.indexeddb` as const\nexport type IndexedDbPayloadDivinerSchema = typeof IndexedDbPayloadDivinerSchema\n","import type { IndexDescription } from '@xyo-network/archivist-model'\nimport type { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbPayloadDivinerSchema } from './Schema.ts'\n\nexport const IndexedDbPayloadDivinerConfigSchema = `${IndexedDbPayloadDivinerSchema}.config` as const\nexport type IndexedDbPayloadDivinerConfigSchema = typeof IndexedDbPayloadDivinerConfigSchema\n\nexport type IndexedDbPayloadDivinerConfig = 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: IndexedDbPayloadDivinerConfigSchema\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 { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport type { Hash } from '@xylabs/hex'\nimport { removeFields } from '@xylabs/object'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { isPayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport type {\n  Payload, Schema, Sequence,\n} from '@xyo-network/payload-model'\nimport type { IDBPCursorWithValue, IDBPDatabase } from 'idb'\nimport { openDB } from 'idb'\n\nimport { IndexedDbPayloadDivinerConfigSchema } from './Config.ts'\nimport type { IndexedDbPayloadDivinerParams } from './Params.ts'\n\ninterface PayloadStore {\n  [s: string]: Payload\n}\n\ntype AnyPayload = Payload<Record<string, unknown>>\n\ntype ValueFilter = (payload?: AnyPayload | null) => boolean\n\nconst payloadValueFilter = (key: keyof AnyPayload, value?: unknown | unknown[]): ValueFilter | undefined => {\n  if (!value) return undefined\n  return (payload) => {\n    if (!payload) return false\n    const sourceValue = payload?.[key]\n    if (sourceValue === undefined) return false\n    return Array.isArray(sourceValue) && Array.isArray(value) ? containsAll(sourceValue, value) : sourceValue == value\n  }\n}\n\nexport class IndexedDbPayloadDiviner<\n  TParams extends IndexedDbPayloadDivinerParams = IndexedDbPayloadDivinerParams,\n  TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,\n  TOut extends Payload = Payload,\n  TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<\n    DivinerInstance<TParams, TIn, TOut>,\n    TIn,\n    TOut\n  >,\n> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, IndexedDbPayloadDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = IndexedDbPayloadDivinerConfigSchema\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 the archivist default version.\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?: TIn[]): Promise<TOut[]> {\n    const query = payloads?.find(isPayloadDivinerQueryPayload) as TIn\n    if (!query) return []\n    const result = await this.tryUseDb(async (db) => {\n      const {\n        schemas, limit, cursor, order, ...props\n      } = removeFields(query as unknown as TIn & { sources?: Hash[] }, [\n        'hash',\n        'schema',\n      ])\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: TOut[] = []\n      let parsedCursor = cursor\n      const parsedLimit = limit ?? 10\n      assertEx((schemas?.length ?? 1) === 1, () => 'IndexedDbPayloadDiviner: Only one filter schema supported')\n      const filterSchema = schemas?.[0]\n      const filter = filterSchema ? { schema: filterSchema, ...props } : { ...props }\n      const valueFilters: ValueFilter[] = Object.entries(filter)\n        .map(([key, value]) => payloadValueFilter(key, value))\n        .filter(exists)\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n\n      // Iterate all records using the sequence index\n      const sequenceIndex = assertEx(store.index(IndexedDbArchivist.sequenceIndexName), () => 'Failed to get sequence index')\n      let dbCursor: IDBPCursorWithValue<PayloadStore, [string], string, string, 'readonly'> | null\n      = assertEx(await sequenceIndex.openCursor(null, direction), () => `Failed to get cursor [${parsedCursor}, ${cursor}]`)\n\n      // If a cursor was supplied\n      if (parsedCursor !== undefined) {\n        let currentSequence: Sequence | undefined\n        // Skip records until the supplied cursor offset is reached\n        while (dbCursor && currentSequence !== parsedCursor) {\n          // Find the sequence of the current record\n          currentSequence = await dbCursor.value?.sequence\n          // Advance one record beyond the cursor\n          dbCursor = await dbCursor.advance(1)\n        }\n      }\n\n      // Collect results up to the limit\n      while (dbCursor && results.length < parsedLimit) {\n        const value = dbCursor.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        try {\n          dbCursor = await dbCursor.continue()\n        } catch {\n          break\n        }\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return results\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\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<PayloadStore> | 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<PayloadStore>(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<PayloadStore>) => 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":["PayloadDivinerSchema","IndexedDbPayloadDivinerSchema","IndexedDbPayloadDivinerConfigSchema","IndexedDbPayloadDivinerSchema","containsAll","assertEx","exists","removeFields","IndexedDbArchivist","PayloadDiviner","isPayloadDivinerQueryPayload","openDB","payloadValueFilter","key","value","undefined","payload","sourceValue","Array","isArray","containsAll","IndexedDbPayloadDiviner","PayloadDiviner","configSchemas","IndexedDbPayloadDivinerConfigSchema","defaultConfigSchema","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","find","isPayloadDivinerQueryPayload","result","tryUseDb","db","schemas","limit","cursor","order","props","removeFields","tx","transaction","store","objectStore","results","parsedCursor","parsedLimit","assertEx","length","filterSchema","filter","schema","valueFilters","Object","entries","map","exists","direction","sequenceIndex","index","sequenceIndexName","dbCursor","openCursor","currentSequence","sequence","advance","every","push","continue","done","startHandler","tryGetInitializedDb","dbs","indexedDB","databases","dbExists","some","name","version","openDB","storeExists","objectStoreNames","contains","close","callback"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/diviner-payload-indexeddb",
-  "version": "3.6.0-rc.6",
+  "version": "3.6.0-rc.8",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -29,28 +29,28 @@
   "module": "dist/browser/index.mjs",
   "types": "dist/browser/index.d.ts",
   "dependencies": {
-    "@xylabs/array": "^4.4.15",
-    "@xylabs/assert": "^4.4.15",
-    "@xylabs/exists": "^4.4.15",
-    "@xylabs/hex": "^4.4.15",
-    "@xylabs/object": "^4.4.15",
-    "@xyo-network/archivist-indexeddb": "^3.6.0-rc.6",
-    "@xyo-network/archivist-model": "^3.6.0-rc.6",
-    "@xyo-network/diviner-model": "^3.6.0-rc.6",
-    "@xyo-network/diviner-payload-abstract": "^3.6.0-rc.6",
-    "@xyo-network/diviner-payload-model": "^3.6.0-rc.6",
-    "@xyo-network/module-model": "^3.6.0-rc.6",
-    "@xyo-network/payload-model": "^3.6.0-rc.6",
+    "@xylabs/array": "^4.4.16",
+    "@xylabs/assert": "^4.4.16",
+    "@xylabs/exists": "^4.4.16",
+    "@xylabs/hex": "^4.4.16",
+    "@xylabs/object": "^4.4.16",
+    "@xyo-network/archivist-indexeddb": "^3.6.0-rc.8",
+    "@xyo-network/archivist-model": "^3.6.0-rc.8",
+    "@xyo-network/diviner-model": "^3.6.0-rc.8",
+    "@xyo-network/diviner-payload-abstract": "^3.6.0-rc.8",
+    "@xyo-network/diviner-payload-model": "^3.6.0-rc.8",
+    "@xyo-network/module-model": "^3.6.0-rc.8",
+    "@xyo-network/payload-model": "^3.6.0-rc.8",
     "idb": "^8.0.1"
   },
   "devDependencies": {
-    "@xylabs/delay": "^4.4.15",
+    "@xylabs/delay": "^4.4.16",
     "@xylabs/ts-scripts-yarn3": "^4.2.4",
     "@xylabs/tsconfig": "^4.2.4",
-    "@xylabs/vitest-extended": "^4.4.15",
-    "@xyo-network/archivist-indexeddb": "^3.6.0-rc.6",
-    "@xyo-network/node-memory": "^3.6.0-rc.6",
-    "@xyo-network/payload-builder": "^3.6.0-rc.6",
+    "@xylabs/vitest-extended": "^4.4.16",
+    "@xyo-network/archivist-indexeddb": "^3.6.0-rc.8",
+    "@xyo-network/node-memory": "^3.6.0-rc.8",
+    "@xyo-network/payload-builder": "^3.6.0-rc.8",
     "fake-indexeddb": "^6.0.0",
     "typescript": "^5.7.2",
     "vitest": "^2.1.8"

package/src/Diviner.ts

@@ -2,18 +2,16 @@ import { containsAll } from '@xylabs/array'
 import { assertEx } from '@xylabs/assert'
 import { exists } from '@xylabs/exists'
 import type { Hash } from '@xylabs/hex'
-import type { AnyObject } from '@xylabs/object'
 import { removeFields } from '@xylabs/object'
 import { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'
-import { IndexSeparator } from '@xyo-network/archivist-model'
 import type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'
 import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'
 import type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'
 import { isPayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'
-import {
-  type Payload, type Schema, SequenceConstants,
+import type {
+  Payload, Schema, Sequence,
 } from '@xyo-network/payload-model'
-import type { IDBPDatabase, IDBPObjectStore } from 'idb'
+import type { IDBPCursorWithValue, IDBPDatabase } from 'idb'
 import { openDB } from 'idb'
 
 import { IndexedDbPayloadDivinerConfigSchema } from './Config.ts'
@@ -37,14 +35,6 @@ const payloadValueFilter = (key: keyof AnyPayload, value?: unknown | unknown[]):
   }
 }
 
-// Function to extract fields from an index name
-const extractFields = (indexName: string): string[] => {
-  return indexName
-    .slice(3)
-    .split(IndexSeparator)
-    .map(field => field.toLowerCase())
-}
-
 export class IndexedDbPayloadDiviner<
   TParams extends IndexedDbPayloadDivinerParams = IndexedDbPayloadDivinerParams,
   TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,
@@ -58,8 +48,6 @@ export class IndexedDbPayloadDiviner<
   static override readonly configSchemas: Schema[] = [...super.configSchemas, IndexedDbPayloadDivinerConfigSchema]
   static override readonly defaultConfigSchema: Schema = IndexedDbPayloadDivinerConfigSchema
 
-  private _db: IDBPDatabase<PayloadStore> | undefined
-
   /**
    * The database name. If not supplied via config, it defaults
    * to the archivist's name and if archivist's name is not supplied,
@@ -99,32 +87,33 @@ export class IndexedDbPayloadDiviner<
       const tx = db.transaction(this.storeName, 'readonly')
       const store = tx.objectStore(this.storeName)
       const results: TOut[] = []
-      let parsedCursor = cursor ?? SequenceConstants.minLocalSequence
+      let parsedCursor = cursor
       const parsedLimit = limit ?? 10
       assertEx((schemas?.length ?? 1) === 1, () => 'IndexedDbPayloadDiviner: Only one filter schema supported')
       const filterSchema = schemas?.[0]
       const filter = filterSchema ? { schema: filterSchema, ...props } : { ...props }
+      const valueFilters: ValueFilter[] = Object.entries(filter)
+        .map(([key, value]) => payloadValueFilter(key, value))
+        .filter(exists)
       const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'
-      const suggestedIndex = this.selectBestIndex(filter, store)
-      const keyRangeValue = this.getKeyRangeValue(suggestedIndex, filter)
-      const valueFilters: ValueFilter[]
-        = props
-          ? Object.entries(props)
-              .map(([key, value]) => payloadValueFilter(key, value))
-              .filter(exists)
-          : []
-      let dbCursor
-        = suggestedIndex
-          // Conditionally filter on schemas
-          ? await store.index(suggestedIndex).openCursor(IDBKeyRange.only(keyRangeValue), direction)
-          // Just iterate all records
-          : await store.openCursor(suggestedIndex, direction)
-
-      // Skip records until the offset is reached
-      while (dbCursor && parsedCursor) {
-        dbCursor = await dbCursor.advance(1)
-        parsedCursor = SequenceConstants.minLocalSequence // Reset offset after skipping
+
+      // Iterate all records using the sequence index
+      const sequenceIndex = assertEx(store.index(IndexedDbArchivist.sequenceIndexName), () => 'Failed to get sequence index')
+      let dbCursor: IDBPCursorWithValue<PayloadStore, [string], string, string, 'readonly'> | null
+      = assertEx(await sequenceIndex.openCursor(null, direction), () => `Failed to get cursor [${parsedCursor}, ${cursor}]`)
+
+      // If a cursor was supplied
+      if (parsedCursor !== undefined) {
+        let currentSequence: Sequence | undefined
+        // Skip records until the supplied cursor offset is reached
+        while (dbCursor && currentSequence !== parsedCursor) {
+          // Find the sequence of the current record
+          currentSequence = await dbCursor.value?.sequence
+          // Advance one record beyond the cursor
+          dbCursor = await dbCursor.advance(1)
+        }
       }
+
       // Collect results up to the limit
       while (dbCursor && results.length < parsedLimit) {
         const value = dbCursor.value
@@ -159,37 +148,6 @@ export class IndexedDbPayloadDiviner<
     return true
   }
 
-  private getKeyRangeValue(indexName: string | null, query: AnyObject): unknown | unknown[] {
-    if (!indexName) return []
-
-    // Extracting the relevant fields from the index name
-    const indexFields = extractFields(indexName)
-
-    // Collecting the values for these fields from the query object
-    const keyRangeValue = indexFields.map(field => query[field as keyof AnyObject])
-    return keyRangeValue.length === 1 ? keyRangeValue[0] : keyRangeValue
-  }
-
-  private selectBestIndex(query: AnyObject, store: IDBPObjectStore<PayloadStore>): string | null {
-    // List of available indexes
-    const { indexNames } = store
-
-    // Convert query object keys to a set for easier comparison
-    const queryKeys = new Set(Object.keys(query).map(key => key.toLowerCase()))
-
-    // Find the best matching index
-    let bestMatch: { indexName: string; matchCount: number } = { indexName: '', matchCount: 0 }
-
-    for (const indexName of indexNames) {
-      const indexFields = extractFields(indexName)
-      const matchCount = indexFields.filter(field => queryKeys.has(field)).length
-      if (matchCount > bestMatch.matchCount) {
-        bestMatch = { indexName, matchCount }
-      }
-    }
-    return bestMatch.matchCount > 0 ? bestMatch.indexName : null
-  }
-
   /**
    * Checks that the desired DB/objectStore exists and is initialized to the correct version
    * @returns The initialized DB or undefined if it does not exist in the desired state