@xyo-network/diviner-indexing-memory 3.5.2 → 3.6.0-rc.1

package/dist/neutral/Diviner.d.ts

@@ -4,7 +4,7 @@ import { IndexingDivinerConfig, IndexingDivinerParams, IndexingDivinerStage, Ind
 import { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model';
 import { DivinerWrapper } from '@xyo-network/diviner-wrapper';
 import { ModuleState } from '@xyo-network/module-model';
-import { Payload, Schema, WithMeta } from '@xyo-network/payload-model';
+import { Payload, Schema } from '@xyo-network/payload-model';
 export type ConfigStoreKey = 'indexStore' | 'stateStore';
 export type ConfigStore = Extract<keyof IndexingDivinerConfig, ConfigStoreKey>;
 export declare class IndexingDiviner<TParams extends IndexingDivinerParams = IndexingDivinerParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut>> extends AbstractDiviner<TParams, TIn, TOut, TEventData> {
@@ -28,7 +28,7 @@ export declare class IndexingDiviner<TParams extends IndexingDivinerParams = Ind
      * @param nextState The state to commit
      */
     protected commitState(nextState: ModuleState<IndexingDivinerState>): Promise<void>;
-    protected divineHandler(payloads?: TIn[]): Promise<WithMeta<TOut>[]>;
+    protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
     /**
      * Retrieves the archivist for the specified store
      * @param store The store to retrieve the archivist for

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAGjE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAE/D,OAAO,EACL,qBAAqB,EAErB,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EACc,eAAe,EAAE,sBAAsB,EAC3D,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EACkD,WAAW,EACnE,MAAM,2BAA2B,CAAA;AAElC,OAAO,EACL,OAAO,EAAE,MAAM,EAAE,QAAQ,EAC1B,MAAM,4BAA4B,CAAA;AAEnC,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,YAAY,CAAA;AAExD,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,qBAAqB,EAAE,cAAc,CAAC,CAAA;AAI9E,qBACa,eAAe,CAC1B,OAAO,SAAS,qBAAqB,GAAG,qBAAqB,EAC7D,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,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,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACvD,gBAAyB,kBAAkB,SAAQ;IACnD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwD;IACxG,gBAAyB,mBAAmB,EAAE,MAAM,CAA8B;IAElF,OAAO,CAAC,UAAU,CAAC,CAAmC;IACtD,OAAO,CAAC,OAAO,CAAC,CAAQ;IAExB,IAAI,mBAAmB,WAEtB;IAED,IAAI,aAAa,WAEhB;IAED;;;OAGG;IACH,SAAS,CAAC,gBAAgB,QAAa,OAAO,CAAC,IAAI,CAAC,CAmBnD;IAED;;;;;;OAMG;cACa,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,oBAAoB,CAAC;cAS/C,aAAa,CAAC,QAAQ,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAsBvF;;;;OAIG;cACa,oBAAoB,CAAC,KAAK,EAAE,WAAW;;;;;;;;;;;;;;;;;;;IAMvD;;;;OAIG;cACa,8BAA8B,CAAC,KAAK,EAAE,WAAW;;;;;;;;;;;;;;;;;;;IAMjE;;;;OAIG;cACa,uBAAuB,CAAC,SAAS,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;;IASvE;;;;OAIG;cACa,yBAAyB,CAAC,KAAK,EAAE,WAAW;;;;;;;;;;;;;;;;;;;IAM5D;;;OAGG;cACa,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,GAAG,SAAS,CAAC;cA0C9D,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;cAMhC,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAQrF;;;OAGG;IACH,OAAO,CAAC,IAAI;CAcb"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAGjE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAE/D,OAAO,EACL,qBAAqB,EAErB,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EACc,eAAe,EAAE,sBAAsB,EAC3D,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAC2B,WAAW,EAC5C,MAAM,2BAA2B,CAAA;AAElC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAE5D,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,YAAY,CAAA;AAExD,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,qBAAqB,EAAE,cAAc,CAAC,CAAA;AAI9E,qBACa,eAAe,CAC1B,OAAO,SAAS,qBAAqB,GAAG,qBAAqB,EAC7D,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,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,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACvD,gBAAyB,kBAAkB,SAAQ;IACnD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwD;IACxG,gBAAyB,mBAAmB,EAAE,MAAM,CAA8B;IAElF,OAAO,CAAC,UAAU,CAAC,CAAmC;IACtD,OAAO,CAAC,OAAO,CAAC,CAAQ;IAExB,IAAI,mBAAmB,WAEtB;IAED,IAAI,aAAa,WAEhB;IAED;;;OAGG;IACH,SAAS,CAAC,gBAAgB,QAAa,OAAO,CAAC,IAAI,CAAC,CAmBnD;IAED;;;;;;OAMG;cACa,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,oBAAoB,CAAC;cAS/C,aAAa,CAAC,QAAQ,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAsB7E;;;;OAIG;cACa,oBAAoB,CAAC,KAAK,EAAE,WAAW;;;;;;;;;;;;;;;;;;;IAMvD;;;;OAIG;cACa,8BAA8B,CAAC,KAAK,EAAE,WAAW;;;;;;;;;;;;;;;;;;;IAMjE;;;;OAIG;cACa,uBAAuB,CAAC,SAAS,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;;IASvE;;;;OAIG;cACa,yBAAyB,CAAC,KAAK,EAAE,WAAW;;;;;;;;;;;;;;;;;;;IAM5D;;;OAGG;cACa,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,GAAG,SAAS,CAAC;cA0C9D,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;cAMhC,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAQrF;;;OAGG;IACH,OAAO,CAAC,IAAI;CAcb"}

package/dist/neutral/index.mjs

@@ -12,7 +12,7 @@ import { BoundWitnessDivinerQuerySchema } from "@xyo-network/diviner-boundwitnes
 import { IndexingDivinerConfigSchema } from "@xyo-network/diviner-indexing-model";
 import { asDivinerInstance } from "@xyo-network/diviner-model";
 import { DivinerWrapper } from "@xyo-network/diviner-wrapper";
-import { creatableModule, isModuleState, isModuleStateWithMeta, ModuleStateSchema } from "@xyo-network/module-model";
+import { creatableModule, isModuleState, ModuleStateSchema } from "@xyo-network/module-model";
 import { PayloadBuilder } from "@xyo-network/payload-builder";
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -50,8 +50,8 @@ var IndexingDiviner = class extends AbstractDiviner {
     const results = lastState ? await indexCandidateDiviner.divine([
       lastState
     ]) : await indexCandidateDiviner.divine();
-    const nextState = results.find(isModuleStateWithMeta);
-    const indexCandidates = results.filter((x) => !isModuleStateWithMeta(x));
+    const nextState = results.find(isModuleState);
+    const indexCandidates = results.filter((x) => !isModuleState(x));
     const toIndexTransformDiviner = await this.getIndexingDivinerStage("indexCandidateToIndexDiviner");
     const indexes = await toIndexTransformDiviner.divine(indexCandidates);
     const indexArchivist = await this.getArchivistForStore("indexStore");
@@ -92,7 +92,7 @@ var IndexingDiviner = class extends AbstractDiviner {
       ])));
       return response.flat();
     }))).flat();
-    return await Promise.all(results.map((result) => PayloadBuilder.build(result)));
+    return results;
   }
   /**
   * Retrieves the archivist for the specified store

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Diviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { clearTimeoutEx, setTimeoutEx } from '@xylabs/timer'\nimport { ArchivistWrapper } from '@xyo-network/archivist-wrapper'\nimport { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'\nimport { isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport { BoundWitnessDivinerQueryPayload, BoundWitnessDivinerQuerySchema } from '@xyo-network/diviner-boundwitness-model'\nimport {\n  IndexingDivinerConfig,\n  IndexingDivinerConfigSchema,\n  IndexingDivinerParams,\n  IndexingDivinerStage,\n  IndexingDivinerState,\n} from '@xyo-network/diviner-indexing-model'\nimport {\n  asDivinerInstance, DivinerInstance, DivinerModuleEventData,\n} from '@xyo-network/diviner-model'\nimport { DivinerWrapper } from '@xyo-network/diviner-wrapper'\nimport {\n  creatableModule, isModuleState, isModuleStateWithMeta, ModuleState, ModuleStateSchema,\n} from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport {\n  Payload, Schema, WithMeta,\n} from '@xyo-network/payload-model'\n\nexport type ConfigStoreKey = 'indexStore' | 'stateStore'\n\nexport type ConfigStore = Extract<keyof IndexingDivinerConfig, ConfigStoreKey>\n\nconst moduleName = 'IndexingDiviner'\n\n@creatableModule<IndexingDiviner>()\nexport class IndexingDiviner<\n  TParams extends IndexingDivinerParams = IndexingDivinerParams,\n  TIn extends Payload = Payload,\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 AbstractDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly allowRandomAccount = false\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, IndexingDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = IndexingDivinerConfigSchema\n\n  private _lastState?: ModuleState<IndexingDivinerState>\n  private _pollId?: string\n\n  get payloadDivinerLimit() {\n    return this.config.payloadDivinerLimit ?? 1000\n  }\n\n  get pollFrequency() {\n    return this.config.pollFrequency ?? 10_000\n  }\n\n  /**\n   * Works via batched iteration of the source archivist to populate the index.\n   * @returns A promise that resolves when the background process is complete\n   */\n  protected backgroundDivine = async (): Promise<void> => {\n    // Load last state\n    const lastState = await this.retrieveState()\n    // Get next batch of results\n    const indexCandidateDiviner = await this.getIndexingDivinerStage('stateToIndexCandidateDiviner')\n    const results = lastState ? await indexCandidateDiviner.divine([lastState]) : await indexCandidateDiviner.divine()\n    // Filter next state out from results\n    const nextState = results.find(isModuleStateWithMeta<IndexingDivinerState>)\n    const indexCandidates = results.filter(x => !isModuleStateWithMeta(x))\n    // Transform candidates to indexes\n    const toIndexTransformDiviner = await this.getIndexingDivinerStage('indexCandidateToIndexDiviner')\n    const indexes = await toIndexTransformDiviner.divine(indexCandidates)\n    // Insert index results\n    const indexArchivist = await this.getArchivistForStore('indexStore')\n    await indexArchivist.insert(indexes)\n    // Update state\n    if (nextState) {\n      await this.commitState(nextState)\n    }\n  }\n\n  /**\n   * Commit the internal state of the Diviner process. This is similar\n   * to a transaction completion in a database and should only be called\n   * when results have been successfully persisted to the appropriate\n   * external stores.\n   * @param nextState The state to commit\n   */\n  protected async commitState(nextState: ModuleState<IndexingDivinerState>) {\n    // Don't commit state if no state has changed\n    if (nextState.state.offset === this._lastState?.state.offset) return\n    this._lastState = nextState\n    const archivist = await this.getArchivistForStore('stateStore')\n    const [bw] = await new BoundWitnessBuilder().payload(nextState).signer(this.account).build()\n    await archivist.insert([bw, nextState])\n  }\n\n  protected override async divineHandler(payloads: TIn[] = []): Promise<WithMeta<TOut>[]> {\n    const indexPayloadDiviner = await this.getPayloadDivinerForStore('indexStore')\n    const divinerQueryToIndexQueryDiviner = await this.getIndexingDivinerStage('divinerQueryToIndexQueryDiviner')\n    const indexQueryResponseToDivinerQueryResponseDiviner = await this.getIndexingDivinerStage('indexQueryResponseToDivinerQueryResponseDiviner')\n    const results = (\n      await Promise.all(\n        payloads.map(async (payload) => {\n          const indexQuery = await divinerQueryToIndexQueryDiviner.divine([payload])\n          // Divine the results\n          const indexedResults = await indexPayloadDiviner.divine(indexQuery)\n          // Transform the results to the response shape\n          const response = await Promise.all(\n            indexedResults.flat().map(indexedResult => indexQueryResponseToDivinerQueryResponseDiviner.divine([payload, indexedResult])),\n          )\n          return response.flat()\n        }),\n      )\n    ).flat()\n    // TODO: Infer this type over casting to this type\n    return (await Promise.all(results.map(result => PayloadBuilder.build(result)))) as WithMeta<TOut>[]\n  }\n\n  /**\n   * Retrieves the archivist for the specified store\n   * @param store The store to retrieve the archivist for\n   * @returns The archivist for the specified store\n   */\n  protected async getArchivistForStore(store: ConfigStore) {\n    const name = assertEx(this.config?.[store]?.archivist, () => `${moduleName}: Config for ${store}.archivist not specified`)\n    const mod = assertEx(await this.resolve(name), () => `${moduleName}: Failed to resolve ${store}.archivist [${name}]`)\n    return ArchivistWrapper.wrap(mod, this.account)\n  }\n\n  /**\n   * Retrieves the BoundWitness Diviner for the specified store\n   * @param store The store to retrieve the BoundWitness Diviner for\n   * @returns The BoundWitness Diviner for the specified store\n   */\n  protected async getBoundWitnessDivinerForStore(store: ConfigStore) {\n    const name = assertEx(this.config?.[store]?.boundWitnessDiviner, () => `${moduleName}: Config for ${store}.boundWitnessDiviner not specified`)\n    const mod = assertEx(await this.resolve(name), () => `${moduleName}: Failed to resolve ${store}.boundWitnessDiviner [${name}]`)\n    return DivinerWrapper.wrap(mod, this.account)\n  }\n\n  /**\n   * Gets the Diviner for the supplied Indexing Diviner stage\n   * @param transform The Indexing Diviner stage\n   * @returns The diviner corresponding to the Indexing Diviner stage\n   */\n  protected async getIndexingDivinerStage(transform: IndexingDivinerStage) {\n    const nameOrAddress = assertEx(\n      this.config?.indexingDivinerStages?.[transform],\n      () => `${moduleName}: Config for indexingDivinerStages.${transform} not specified`,\n    )\n    const mod = await this.resolve(nameOrAddress)\n    return assertEx(asDivinerInstance(mod), () => `${moduleName}: Failed to resolve indexing diviner stage for ${transform}`) as DivinerInstance\n  }\n\n  /**\n   * Retrieves the Payload Diviner for the specified store\n   * @param store The store to retrieve the Payload Diviner for\n   * @returns The Payload Diviner for the specified store\n   */\n  protected async getPayloadDivinerForStore(store: ConfigStore) {\n    const name = assertEx(this.config?.[store]?.payloadDiviner, () => `${moduleName}: Config for ${store}.payloadDiviner not specified`)\n    const mod = assertEx(await this.resolve(name), () => `${moduleName}: Failed to resolve ${store}.payloadDiviner [${name}]`)\n    return DivinerWrapper.wrap(mod, this.account)\n  }\n\n  /**\n   * Retrieves the last state of the Diviner process. Used to recover state after\n   * preemptions, reboots, etc.\n   */\n  protected async retrieveState(): Promise<ModuleState<IndexingDivinerState> | undefined> {\n    const accountAddress = this.account.address\n    if (this._lastState) return this._lastState\n    let hash: Hash = ''\n    const diviner = await this.getBoundWitnessDivinerForStore('stateStore')\n    const query = await new PayloadBuilder<BoundWitnessDivinerQueryPayload>({ schema: BoundWitnessDivinerQuerySchema })\n      .fields({\n        address: accountAddress,\n        limit: 1,\n        offset: 0,\n        order: 'desc',\n        payload_schemas: [ModuleStateSchema],\n      })\n      .build()\n    const boundWitnesses = await diviner.divine([query])\n    if (boundWitnesses.length > 0) {\n      const boundWitness = boundWitnesses[0]\n      if (isBoundWitness(boundWitness)) {\n        // Find the index for this address in the BoundWitness that is a ModuleState\n        hash = boundWitness.addresses\n          .map((address, index) => ({ address, index }))\n          .filter(({ address }) => address === accountAddress)\n          // eslint-disable-next-line unicorn/no-array-reduce\n          .reduce(\n            (prev, curr) => (boundWitness.payload_schemas?.[curr?.index] === ModuleStateSchema ? boundWitness.payload_hashes[curr?.index] : prev),\n            '' as Hash,\n          )\n      }\n    }\n\n    // If we able to located the last state\n    if (hash !== '') {\n      // Get last state\n      const archivist = await this.getArchivistForStore('stateStore')\n      const payload = (await archivist.get([hash])).find(isModuleState<IndexingDivinerState>)\n      if (payload) {\n        return payload as WithMeta<ModuleState<IndexingDivinerState>>\n      }\n    }\n    return undefined\n  }\n\n  protected override async startHandler(): Promise<boolean> {\n    await super.startHandler()\n    this.poll()\n    return true\n  }\n\n  protected override async stopHandler(_timeout?: number | undefined): Promise<boolean> {\n    if (this._pollId) {\n      clearTimeout(this._pollId)\n      this._pollId = undefined\n    }\n    return await super.stopHandler()\n  }\n\n  /**\n   * Runs the background divine process on a loop with a delay\n   * specified by the `config.pollFrequency`\n   */\n  private poll() {\n    this._pollId = setTimeoutEx(async () => {\n      try {\n        await Promise.resolve()\n        await this.backgroundDivine()\n      } catch (e) {\n        console.log(e)\n      } finally {\n        if (this._pollId) clearTimeoutEx(this._pollId)\n        this._pollId = undefined\n        this.poll()\n      }\n    }, this.pollFrequency)\n  }\n}\n"],"mappings":"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","names":["assertEx","clearTimeoutEx","setTimeoutEx","ArchivistWrapper","BoundWitnessBuilder","isBoundWitness","AbstractDiviner","BoundWitnessDivinerQuerySchema","IndexingDivinerConfigSchema","asDivinerInstance","DivinerWrapper","creatableModule","isModuleState","isModuleStateWithMeta","ModuleStateSchema","PayloadBuilder","moduleName","IndexingDiviner","AbstractDiviner","allowRandomAccount","configSchemas","IndexingDivinerConfigSchema","defaultConfigSchema","_lastState","_pollId","payloadDivinerLimit","config","pollFrequency","backgroundDivine","lastState","retrieveState","indexCandidateDiviner","getIndexingDivinerStage","results","divine","nextState","find","isModuleStateWithMeta","indexCandidates","filter","x","toIndexTransformDiviner","indexes","indexArchivist","getArchivistForStore","insert","commitState","state","offset","archivist","bw","BoundWitnessBuilder","payload","signer","account","build","divineHandler","payloads","indexPayloadDiviner","getPayloadDivinerForStore","divinerQueryToIndexQueryDiviner","indexQueryResponseToDivinerQueryResponseDiviner","Promise","all","map","indexQuery","indexedResults","response","flat","indexedResult","result","PayloadBuilder","store","name","assertEx","mod","resolve","ArchivistWrapper","wrap","getBoundWitnessDivinerForStore","boundWitnessDiviner","DivinerWrapper","transform","nameOrAddress","indexingDivinerStages","asDivinerInstance","payloadDiviner","accountAddress","address","hash","diviner","query","schema","BoundWitnessDivinerQuerySchema","fields","limit","order","payload_schemas","ModuleStateSchema","boundWitnesses","length","boundWitness","isBoundWitness","addresses","index","reduce","prev","curr","payload_hashes","get","isModuleState","undefined","startHandler","poll","stopHandler","_timeout","clearTimeout","setTimeoutEx","e","console","log","clearTimeoutEx"]}
+{"version":3,"sources":["../../src/Diviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Hash } from '@xylabs/hex'\nimport { clearTimeoutEx, setTimeoutEx } from '@xylabs/timer'\nimport { ArchivistWrapper } from '@xyo-network/archivist-wrapper'\nimport { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'\nimport { isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport { BoundWitnessDivinerQueryPayload, BoundWitnessDivinerQuerySchema } from '@xyo-network/diviner-boundwitness-model'\nimport {\n  IndexingDivinerConfig,\n  IndexingDivinerConfigSchema,\n  IndexingDivinerParams,\n  IndexingDivinerStage,\n  IndexingDivinerState,\n} from '@xyo-network/diviner-indexing-model'\nimport {\n  asDivinerInstance, DivinerInstance, DivinerModuleEventData,\n} from '@xyo-network/diviner-model'\nimport { DivinerWrapper } from '@xyo-network/diviner-wrapper'\nimport {\n  creatableModule, isModuleState, ModuleState, ModuleStateSchema,\n} from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, Schema } from '@xyo-network/payload-model'\n\nexport type ConfigStoreKey = 'indexStore' | 'stateStore'\n\nexport type ConfigStore = Extract<keyof IndexingDivinerConfig, ConfigStoreKey>\n\nconst moduleName = 'IndexingDiviner'\n\n@creatableModule<IndexingDiviner>()\nexport class IndexingDiviner<\n  TParams extends IndexingDivinerParams = IndexingDivinerParams,\n  TIn extends Payload = Payload,\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 AbstractDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly allowRandomAccount = false\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, IndexingDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = IndexingDivinerConfigSchema\n\n  private _lastState?: ModuleState<IndexingDivinerState>\n  private _pollId?: string\n\n  get payloadDivinerLimit() {\n    return this.config.payloadDivinerLimit ?? 1000\n  }\n\n  get pollFrequency() {\n    return this.config.pollFrequency ?? 10_000\n  }\n\n  /**\n   * Works via batched iteration of the source archivist to populate the index.\n   * @returns A promise that resolves when the background process is complete\n   */\n  protected backgroundDivine = async (): Promise<void> => {\n    // Load last state\n    const lastState = await this.retrieveState()\n    // Get next batch of results\n    const indexCandidateDiviner = await this.getIndexingDivinerStage('stateToIndexCandidateDiviner')\n    const results = lastState ? await indexCandidateDiviner.divine([lastState]) : await indexCandidateDiviner.divine()\n    // Filter next state out from results\n    const nextState = results.find(isModuleState<IndexingDivinerState>)\n    const indexCandidates = results.filter(x => !isModuleState(x))\n    // Transform candidates to indexes\n    const toIndexTransformDiviner = await this.getIndexingDivinerStage('indexCandidateToIndexDiviner')\n    const indexes = await toIndexTransformDiviner.divine(indexCandidates)\n    // Insert index results\n    const indexArchivist = await this.getArchivistForStore('indexStore')\n    await indexArchivist.insert(indexes)\n    // Update state\n    if (nextState) {\n      await this.commitState(nextState)\n    }\n  }\n\n  /**\n   * Commit the internal state of the Diviner process. This is similar\n   * to a transaction completion in a database and should only be called\n   * when results have been successfully persisted to the appropriate\n   * external stores.\n   * @param nextState The state to commit\n   */\n  protected async commitState(nextState: ModuleState<IndexingDivinerState>) {\n    // Don't commit state if no state has changed\n    if (nextState.state.offset === this._lastState?.state.offset) return\n    this._lastState = nextState\n    const archivist = await this.getArchivistForStore('stateStore')\n    const [bw] = await new BoundWitnessBuilder().payload(nextState).signer(this.account).build()\n    await archivist.insert([bw, nextState])\n  }\n\n  protected override async divineHandler(payloads: TIn[] = []): Promise<TOut[]> {\n    const indexPayloadDiviner = await this.getPayloadDivinerForStore('indexStore')\n    const divinerQueryToIndexQueryDiviner = await this.getIndexingDivinerStage('divinerQueryToIndexQueryDiviner')\n    const indexQueryResponseToDivinerQueryResponseDiviner = await this.getIndexingDivinerStage('indexQueryResponseToDivinerQueryResponseDiviner')\n    const results = (\n      await Promise.all(\n        payloads.map(async (payload) => {\n          const indexQuery = await divinerQueryToIndexQueryDiviner.divine([payload])\n          // Divine the results\n          const indexedResults = await indexPayloadDiviner.divine(indexQuery)\n          // Transform the results to the response shape\n          const response = await Promise.all(\n            indexedResults.flat().map(indexedResult => indexQueryResponseToDivinerQueryResponseDiviner.divine([payload, indexedResult])),\n          )\n          return response.flat()\n        }),\n      )\n    ).flat()\n    // TODO: Infer this type over casting to this type\n    return results as TOut[]\n  }\n\n  /**\n   * Retrieves the archivist for the specified store\n   * @param store The store to retrieve the archivist for\n   * @returns The archivist for the specified store\n   */\n  protected async getArchivistForStore(store: ConfigStore) {\n    const name = assertEx(this.config?.[store]?.archivist, () => `${moduleName}: Config for ${store}.archivist not specified`)\n    const mod = assertEx(await this.resolve(name), () => `${moduleName}: Failed to resolve ${store}.archivist [${name}]`)\n    return ArchivistWrapper.wrap(mod, this.account)\n  }\n\n  /**\n   * Retrieves the BoundWitness Diviner for the specified store\n   * @param store The store to retrieve the BoundWitness Diviner for\n   * @returns The BoundWitness Diviner for the specified store\n   */\n  protected async getBoundWitnessDivinerForStore(store: ConfigStore) {\n    const name = assertEx(this.config?.[store]?.boundWitnessDiviner, () => `${moduleName}: Config for ${store}.boundWitnessDiviner not specified`)\n    const mod = assertEx(await this.resolve(name), () => `${moduleName}: Failed to resolve ${store}.boundWitnessDiviner [${name}]`)\n    return DivinerWrapper.wrap(mod, this.account)\n  }\n\n  /**\n   * Gets the Diviner for the supplied Indexing Diviner stage\n   * @param transform The Indexing Diviner stage\n   * @returns The diviner corresponding to the Indexing Diviner stage\n   */\n  protected async getIndexingDivinerStage(transform: IndexingDivinerStage) {\n    const nameOrAddress = assertEx(\n      this.config?.indexingDivinerStages?.[transform],\n      () => `${moduleName}: Config for indexingDivinerStages.${transform} not specified`,\n    )\n    const mod = await this.resolve(nameOrAddress)\n    return assertEx(asDivinerInstance(mod), () => `${moduleName}: Failed to resolve indexing diviner stage for ${transform}`) as DivinerInstance\n  }\n\n  /**\n   * Retrieves the Payload Diviner for the specified store\n   * @param store The store to retrieve the Payload Diviner for\n   * @returns The Payload Diviner for the specified store\n   */\n  protected async getPayloadDivinerForStore(store: ConfigStore) {\n    const name = assertEx(this.config?.[store]?.payloadDiviner, () => `${moduleName}: Config for ${store}.payloadDiviner not specified`)\n    const mod = assertEx(await this.resolve(name), () => `${moduleName}: Failed to resolve ${store}.payloadDiviner [${name}]`)\n    return DivinerWrapper.wrap(mod, this.account)\n  }\n\n  /**\n   * Retrieves the last state of the Diviner process. Used to recover state after\n   * preemptions, reboots, etc.\n   */\n  protected async retrieveState(): Promise<ModuleState<IndexingDivinerState> | undefined> {\n    const accountAddress = this.account.address\n    if (this._lastState) return this._lastState\n    let hash: Hash = ''\n    const diviner = await this.getBoundWitnessDivinerForStore('stateStore')\n    const query = await new PayloadBuilder<BoundWitnessDivinerQueryPayload>({ schema: BoundWitnessDivinerQuerySchema })\n      .fields({\n        address: accountAddress,\n        limit: 1,\n        offset: 0,\n        order: 'desc',\n        payload_schemas: [ModuleStateSchema],\n      })\n      .build()\n    const boundWitnesses = await diviner.divine([query])\n    if (boundWitnesses.length > 0) {\n      const boundWitness = boundWitnesses[0]\n      if (isBoundWitness(boundWitness)) {\n        // Find the index for this address in the BoundWitness that is a ModuleState\n        hash = boundWitness.addresses\n          .map((address, index) => ({ address, index }))\n          .filter(({ address }) => address === accountAddress)\n          // eslint-disable-next-line unicorn/no-array-reduce\n          .reduce(\n            (prev, curr) => (boundWitness.payload_schemas?.[curr?.index] === ModuleStateSchema ? boundWitness.payload_hashes[curr?.index] : prev),\n            '' as Hash,\n          )\n      }\n    }\n\n    // If we able to located the last state\n    if (hash !== '') {\n      // Get last state\n      const archivist = await this.getArchivistForStore('stateStore')\n      const payload = (await archivist.get([hash])).find(isModuleState<IndexingDivinerState>)\n      if (payload) {\n        return payload as ModuleState<IndexingDivinerState>\n      }\n    }\n    return undefined\n  }\n\n  protected override async startHandler(): Promise<boolean> {\n    await super.startHandler()\n    this.poll()\n    return true\n  }\n\n  protected override async stopHandler(_timeout?: number | undefined): Promise<boolean> {\n    if (this._pollId) {\n      clearTimeout(this._pollId)\n      this._pollId = undefined\n    }\n    return await super.stopHandler()\n  }\n\n  /**\n   * Runs the background divine process on a loop with a delay\n   * specified by the `config.pollFrequency`\n   */\n  private poll() {\n    this._pollId = setTimeoutEx(async () => {\n      try {\n        await Promise.resolve()\n        await this.backgroundDivine()\n      } catch (e) {\n        console.log(e)\n      } finally {\n        if (this._pollId) clearTimeoutEx(this._pollId)\n        this._pollId = undefined\n        this.poll()\n      }\n    }, this.pollFrequency)\n  }\n}\n"],"mappings":"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","names":["assertEx","clearTimeoutEx","setTimeoutEx","ArchivistWrapper","BoundWitnessBuilder","isBoundWitness","AbstractDiviner","BoundWitnessDivinerQuerySchema","IndexingDivinerConfigSchema","asDivinerInstance","DivinerWrapper","creatableModule","isModuleState","ModuleStateSchema","PayloadBuilder","moduleName","IndexingDiviner","AbstractDiviner","allowRandomAccount","configSchemas","IndexingDivinerConfigSchema","defaultConfigSchema","_lastState","_pollId","payloadDivinerLimit","config","pollFrequency","backgroundDivine","lastState","retrieveState","indexCandidateDiviner","getIndexingDivinerStage","results","divine","nextState","find","isModuleState","indexCandidates","filter","x","toIndexTransformDiviner","indexes","indexArchivist","getArchivistForStore","insert","commitState","state","offset","archivist","bw","BoundWitnessBuilder","payload","signer","account","build","divineHandler","payloads","indexPayloadDiviner","getPayloadDivinerForStore","divinerQueryToIndexQueryDiviner","indexQueryResponseToDivinerQueryResponseDiviner","Promise","all","map","indexQuery","indexedResults","response","flat","indexedResult","store","name","assertEx","mod","resolve","ArchivistWrapper","wrap","getBoundWitnessDivinerForStore","boundWitnessDiviner","DivinerWrapper","transform","nameOrAddress","indexingDivinerStages","asDivinerInstance","payloadDiviner","accountAddress","address","hash","diviner","query","PayloadBuilder","schema","BoundWitnessDivinerQuerySchema","fields","limit","order","payload_schemas","ModuleStateSchema","boundWitnesses","length","boundWitness","isBoundWitness","addresses","index","reduce","prev","curr","payload_hashes","get","undefined","startHandler","poll","stopHandler","_timeout","clearTimeout","setTimeoutEx","e","console","log","clearTimeoutEx"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/diviner-indexing-memory",
-  "version": "3.5.2",
+  "version": "3.6.0-rc.1",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -29,20 +29,20 @@
   "module": "dist/neutral/index.mjs",
   "types": "dist/neutral/index.d.ts",
   "dependencies": {
-    "@xylabs/assert": "^4.4.9",
-    "@xylabs/hex": "^4.4.9",
-    "@xylabs/timer": "^4.4.9",
-    "@xyo-network/archivist-wrapper": "^3.5.2",
-    "@xyo-network/boundwitness-builder": "^3.5.2",
-    "@xyo-network/boundwitness-model": "^3.5.2",
-    "@xyo-network/diviner-abstract": "^3.5.2",
-    "@xyo-network/diviner-boundwitness-model": "^3.5.2",
-    "@xyo-network/diviner-indexing-model": "^3.5.2",
-    "@xyo-network/diviner-model": "^3.5.2",
-    "@xyo-network/diviner-wrapper": "^3.5.2",
-    "@xyo-network/module-model": "^3.5.2",
-    "@xyo-network/payload-builder": "^3.5.2",
-    "@xyo-network/payload-model": "^3.5.2"
+    "@xylabs/assert": "^4.4.12",
+    "@xylabs/hex": "^4.4.12",
+    "@xylabs/timer": "^4.4.12",
+    "@xyo-network/archivist-wrapper": "^3.6.0-rc.1",
+    "@xyo-network/boundwitness-builder": "^3.6.0-rc.1",
+    "@xyo-network/boundwitness-model": "^3.6.0-rc.1",
+    "@xyo-network/diviner-abstract": "^3.6.0-rc.1",
+    "@xyo-network/diviner-boundwitness-model": "^3.6.0-rc.1",
+    "@xyo-network/diviner-indexing-model": "^3.6.0-rc.1",
+    "@xyo-network/diviner-model": "^3.6.0-rc.1",
+    "@xyo-network/diviner-wrapper": "^3.6.0-rc.1",
+    "@xyo-network/module-model": "^3.6.0-rc.1",
+    "@xyo-network/payload-builder": "^3.6.0-rc.1",
+    "@xyo-network/payload-model": "^3.6.0-rc.1"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^4.2.4",
@@ -51,5 +51,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "stableVersion": "3.5.2"
 }

package/src/Diviner.ts

@@ -18,12 +18,10 @@ import {
 } from '@xyo-network/diviner-model'
 import { DivinerWrapper } from '@xyo-network/diviner-wrapper'
 import {
-  creatableModule, isModuleState, isModuleStateWithMeta, ModuleState, ModuleStateSchema,
+  creatableModule, isModuleState, ModuleState, ModuleStateSchema,
 } from '@xyo-network/module-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import {
-  Payload, Schema, WithMeta,
-} from '@xyo-network/payload-model'
+import { Payload, Schema } from '@xyo-network/payload-model'
 
 export type ConfigStoreKey = 'indexStore' | 'stateStore'
 
@@ -68,8 +66,8 @@ export class IndexingDiviner<
     const indexCandidateDiviner = await this.getIndexingDivinerStage('stateToIndexCandidateDiviner')
     const results = lastState ? await indexCandidateDiviner.divine([lastState]) : await indexCandidateDiviner.divine()
     // Filter next state out from results
-    const nextState = results.find(isModuleStateWithMeta<IndexingDivinerState>)
-    const indexCandidates = results.filter(x => !isModuleStateWithMeta(x))
+    const nextState = results.find(isModuleState<IndexingDivinerState>)
+    const indexCandidates = results.filter(x => !isModuleState(x))
     // Transform candidates to indexes
     const toIndexTransformDiviner = await this.getIndexingDivinerStage('indexCandidateToIndexDiviner')
     const indexes = await toIndexTransformDiviner.divine(indexCandidates)
@@ -98,7 +96,7 @@ export class IndexingDiviner<
     await archivist.insert([bw, nextState])
   }
 
-  protected override async divineHandler(payloads: TIn[] = []): Promise<WithMeta<TOut>[]> {
+  protected override async divineHandler(payloads: TIn[] = []): Promise<TOut[]> {
     const indexPayloadDiviner = await this.getPayloadDivinerForStore('indexStore')
     const divinerQueryToIndexQueryDiviner = await this.getIndexingDivinerStage('divinerQueryToIndexQueryDiviner')
     const indexQueryResponseToDivinerQueryResponseDiviner = await this.getIndexingDivinerStage('indexQueryResponseToDivinerQueryResponseDiviner')
@@ -117,7 +115,7 @@ export class IndexingDiviner<
       )
     ).flat()
     // TODO: Infer this type over casting to this type
-    return (await Promise.all(results.map(result => PayloadBuilder.build(result)))) as WithMeta<TOut>[]
+    return results as TOut[]
   }
 
   /**
@@ -207,7 +205,7 @@ export class IndexingDiviner<
       const archivist = await this.getArchivistForStore('stateStore')
       const payload = (await archivist.get([hash])).find(isModuleState<IndexingDivinerState>)
       if (payload) {
-        return payload as WithMeta<ModuleState<IndexingDivinerState>>
+        return payload as ModuleState<IndexingDivinerState>
       }
     }
     return undefined