@xyo-network/diviner-abstract 3.15.6 → 3.15.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/neutral/index.mjs +55 -35
  2. package/dist/neutral/index.mjs.map +1 -1
  3. package/dist/types/AbstractDiviner.d.ts.map +1 -1
  4. package/package.json +21 -17
  5. package/src/AbstractDiviner.ts +65 -37
package/dist/neutral/index.mjs CHANGED
@@ -1,8 +1,11 @@
1
1
  // src/AbstractDiviner.ts
2
2
  import { assertEx } from "@xylabs/assert";
3
3
  import { globallyUnique } from "@xylabs/base";
4
+ import { delay } from "@xylabs/delay";
5
+ import { forget } from "@xylabs/forget";
4
6
  import { retry } from "@xylabs/retry";
5
7
  import { spanAsync } from "@xylabs/telemetry";
8
+ import { isDefined, isNull } from "@xylabs/typeof";
6
9
  import { isArchivistInstance } from "@xyo-network/archivist-model";
7
10
  import { QueryBoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
8
11
  import {
@@ -13,6 +16,22 @@ import {
13
16
  import { AbstractModuleInstance } from "@xyo-network/module-abstract";
14
17
  import { PayloadBuilder } from "@xyo-network/payload-builder";
15
18
  import { isWitnessInstance } from "@xyo-network/witness-model";
19
+ var delayedResolve = async (parent, id, closure, timeout = 3e4, logger) => {
20
+ const start = Date.now();
21
+ let result;
22
+ while (result) {
23
+ result = await parent.resolve(id);
24
+ if (isDefined(result)) {
25
+ closure(result);
26
+ break;
27
+ }
28
+ if (Date.now() - start > timeout) {
29
+ logger?.error(`Timed out waiting for ${id} to resolve`);
30
+ closure(null);
31
+ }
32
+ await delay(500);
33
+ }
34
+ };
16
35
  var AbstractDiviner = class _AbstractDiviner extends AbstractModuleInstance {
17
36
  static configSchemas = [...super.configSchemas, DivinerConfigSchema];
18
37
  static defaultConfigSchema = DivinerConfigSchema;
@@ -79,43 +98,44 @@ var AbstractDiviner = class _AbstractDiviner extends AbstractModuleInstance {
79
98
  sourceModule,
80
99
  targetModuleFunction
81
100
  } = subscription;
82
- const sourceModuleInstance = await this.resolve(sourceModule);
83
- if (sourceModuleInstance) {
84
- if (targetModuleFunction === "divine") {
85
- if (isArchivistInstance(sourceModuleInstance)) {
86
- if (sourceEvent === "inserted") {
87
- this._eventUnsubscribeFunctions.push(
88
- sourceModuleInstance.on(sourceEvent, async ({ outPayloads, payloads }) => {
89
- await this.divine(outPayloads ?? payloads);
90
- })
91
- );
92
- } else {
93
- this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`);
94
- }
95
- } else if (isDivinerInstance(sourceModuleInstance)) {
96
- if (sourceEvent === "divineEnd") {
97
- this._eventUnsubscribeFunctions.push(
98
- sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {
99
- await this.divine(outPayloads);
100
- })
101
- );
102
- } else {
103
- this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`);
104
- }
105
- } else if (isWitnessInstance(sourceModuleInstance)) {
106
- if (sourceEvent === "observeEnd") {
107
- this._eventUnsubscribeFunctions.push(
108
- sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {
109
- await this.divine(outPayloads);
110
- })
111
- );
112
- } else {
113
- this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`);
101
+ if (targetModuleFunction === "divine") {
102
+ forget(delayedResolve(this, sourceModule, (sourceModuleInstance) => {
103
+ if (isNull(sourceModuleInstance)) {
104
+ this.logger?.error(`Failed to resolve ${sourceModule} for ${this.modName}`);
105
+ } else {
106
+ if (isArchivistInstance(sourceModuleInstance)) {
107
+ if (sourceEvent === "inserted") {
108
+ this._eventUnsubscribeFunctions.push(
109
+ sourceModuleInstance.on(sourceEvent, async ({ outPayloads, payloads }) => {
110
+ await this.divine(outPayloads ?? payloads);
111
+ })
112
+ );
113
+ } else {
114
+ this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`);
115
+ }
116
+ } else if (isDivinerInstance(sourceModuleInstance)) {
117
+ if (sourceEvent === "divineEnd") {
118
+ this._eventUnsubscribeFunctions.push(
119
+ sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {
120
+ await this.divine(outPayloads);
121
+ })
122
+ );
123
+ } else {
124
+ this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`);
125
+ }
126
+ } else if (isWitnessInstance(sourceModuleInstance)) {
127
+ if (sourceEvent === "observeEnd") {
128
+ this._eventUnsubscribeFunctions.push(
129
+ sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {
130
+ await this.divine(outPayloads);
131
+ })
132
+ );
133
+ } else {
134
+ this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`);
135
+ }
114
136
  }
115
137
  }
116
- } else {
117
- this.logger?.warn(`Unsupported targetModuleFunction ${targetModuleFunction} for ${this.modName}`);
118
- }
138
+ }));
119
139
  }
120
140
  }
121
141
  return await super.startHandler(timeout);
package/dist/neutral/index.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/base'\nimport type { Promisable } from '@xylabs/promise'\nimport type { RetryConfig, RetryConfigWithComplete } from '@xylabs/retry'\nimport { retry } from '@xylabs/retry'\nimport { spanAsync } from '@xylabs/telemetry'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport { isArchivistInstance } from '@xyo-network/archivist-model'\nimport type { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type {\n AttachableDivinerInstance,\n DivinerDivineQuery,\n DivinerDivineResult,\n DivinerInstance,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQueries,\n} from '@xyo-network/diviner-model'\nimport {\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n isDivinerInstance,\n} from '@xyo-network/diviner-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport type { EventUnsubscribeFunction } from '@xyo-network/module-events'\nimport type {\n ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult,\n} from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n Payload, Schema, WithoutPrivateStorageMeta,\n} from '@xyo-network/payload-model'\nimport { isWitnessInstance } from '@xyo-network/witness-model'\n\nexport abstract class AbstractDiviner<\n TParams extends DivinerParams = DivinerParams,\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>\n extends AbstractModuleInstance<TParams, TEventData>\n implements AttachableDivinerInstance<TParams, TIn, TOut, TEventData> {\n static override readonly configSchemas: Schema[] = [...super.configSchemas, DivinerConfigSchema]\n static override readonly defaultConfigSchema: Schema = DivinerConfigSchema\n static readonly targetSchema: string\n static override readonly uniqueName = globallyUnique('AbstractDiviner', AbstractDiviner, 'xyo')\n\n private _eventUnsubscribeFunctions: EventUnsubscribeFunction[] = []\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n async divine(payloads: TIn[] = [], retryConfigIn?: RetryConfigWithComplete): Promise<DivinerDivineResult<TOut>[]> {\n this._noOverride('divine')\n return await spanAsync('divine', async () => {\n if (this.reentrancy?.scope === 'global' && this.reentrancy.action === 'skip' && this.globalReentrancyMutex?.isLocked()) {\n return []\n }\n try {\n await this.globalReentrancyMutex?.acquire()\n return await this.busy(async () => {\n const retryConfig = retryConfigIn ?? this.config.retry\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, mod: this })\n const resultPayloads\n = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []\n await this.emit('divineEnd', {\n errors: [], inPayloads: payloads, mod: this, outPayloads: resultPayloads,\n })\n return PayloadBuilder.omitPrivateStorageMeta(resultPayloads)\n })\n } finally {\n this.globalReentrancyMutex?.release()\n }\n }, this.tracer)\n }\n\n async divineQuery(payloads?: TIn[], account?: AccountInstance, _retry?: RetryConfig): Promise<ModuleQueryResult<TOut>> {\n const queryPayload: DivinerDivineQuery = { schema: DivinerDivineQuerySchema }\n return await this.sendQueryRaw(queryPayload, payloads, account)\n }\n\n /** @function queryHandler Calls divine for a divine query. Override to support additional queries. */\n protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n query: T,\n payloads?: Payload[],\n queryConfig?: TConfig,\n ): Promise<ModuleQueryHandlerResult> {\n const wrapper = QueryBoundWitnessWrapper.parseQuery<DivinerQueries>(query, payloads)\n // remove the query payload\n const cleanPayloads = await PayloadBuilder.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(await this.queryable(query, payloads, queryConfig))\n const resultPayloads: WithoutPrivateStorageMeta<Payload>[] = []\n switch (queryPayload.schema) {\n case DivinerDivineQuerySchema: {\n resultPayloads.push(...(await this.divine(cleanPayloads as TIn[])))\n break\n }\n default: {\n return super.queryHandler(query, payloads)\n }\n }\n return PayloadBuilder.omitPrivateStorageMeta(resultPayloads)\n }\n\n protected override async startHandler(timeout?: number) {\n const { eventSubscriptions = [] } = this.config\n\n for (const subscription of eventSubscriptions) {\n const {\n sourceEvent, sourceModule, targetModuleFunction,\n } = subscription\n const sourceModuleInstance = await this.resolve(sourceModule)\n if (sourceModuleInstance) {\n if (targetModuleFunction === 'divine') {\n if (isArchivistInstance(sourceModuleInstance)) {\n if (sourceEvent === 'inserted') {\n this._eventUnsubscribeFunctions.push(\n sourceModuleInstance.on(sourceEvent, async ({ outPayloads, payloads }) => {\n await this.divine((outPayloads ?? payloads) as Payload[] as TIn[])\n }),\n )\n } else {\n this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)\n }\n } else if (isDivinerInstance(sourceModuleInstance)) {\n if (sourceEvent === 'divineEnd') {\n this._eventUnsubscribeFunctions.push(\n sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {\n await this.divine(outPayloads as Payload[] as TIn[])\n }),\n )\n } else {\n this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)\n }\n } else if (isWitnessInstance(sourceModuleInstance)) {\n if (sourceEvent === 'observeEnd') {\n this._eventUnsubscribeFunctions.push(\n sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {\n await this.divine(outPayloads as Payload[] as TIn[])\n }),\n )\n } else {\n this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)\n }\n }\n } else {\n this.logger?.warn(`Unsupported targetModuleFunction ${targetModuleFunction} for ${this.modName}`)\n }\n }\n }\n\n return await super.startHandler(timeout)\n }\n\n protected override async stopHandler(timeout?: number) {\n for (const unsubscribe of this._eventUnsubscribeFunctions) {\n unsubscribe()\n }\n this._eventUnsubscribeFunctions = []\n this._eventUnsubscribeFunctions = []\n return await super.stopHandler(timeout)\n }\n\n /** @function divineHandler Implement or override to add custom functionality to a diviner */\n protected abstract divineHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":"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","names":[]}
1
+ {"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/base'\nimport { delay } from '@xylabs/delay'\nimport type { EventUnsubscribeFunction } from '@xylabs/events'\nimport { forget } from '@xylabs/forget'\nimport type { Logger } from '@xylabs/logger'\nimport type { Promisable } from '@xylabs/promise'\nimport type { RetryConfig, RetryConfigWithComplete } from '@xylabs/retry'\nimport { retry } from '@xylabs/retry'\nimport { spanAsync } from '@xylabs/telemetry'\nimport { isDefined, isNull } from '@xylabs/typeof'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport { isArchivistInstance } from '@xyo-network/archivist-model'\nimport type { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type {\n AttachableDivinerInstance,\n DivinerDivineQuery,\n DivinerDivineResult,\n DivinerInstance,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQueries,\n} from '@xyo-network/diviner-model'\nimport {\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n isDivinerInstance,\n} from '@xyo-network/diviner-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport type {\n ModuleConfig, ModuleIdentifier, ModuleInstance, ModuleQueryHandlerResult, ModuleQueryResult,\n} from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n Payload, Schema, WithoutPrivateStorageMeta,\n} from '@xyo-network/payload-model'\nimport { isWitnessInstance } from '@xyo-network/witness-model'\n\nconst delayedResolve = async (\n parent: ModuleInstance,\n id: ModuleIdentifier,\n closure: (mod: ModuleInstance | null) => void,\n timeout = 30_000,\n logger?: Logger,\n) => {\n const start = Date.now()\n let result: ModuleInstance | undefined\n while (result) {\n result = await parent.resolve(id)\n if (isDefined(result)) {\n closure(result)\n break\n }\n if (Date.now() - start > timeout) {\n logger?.error(`Timed out waiting for ${id} to resolve`)\n closure(null)\n }\n await delay(500)\n }\n}\n\nexport abstract class AbstractDiviner<\n TParams extends DivinerParams = DivinerParams,\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>\n extends AbstractModuleInstance<TParams, TEventData>\n implements AttachableDivinerInstance<TParams, TIn, TOut, TEventData> {\n static override readonly configSchemas: Schema[] = [...super.configSchemas, DivinerConfigSchema]\n static override readonly defaultConfigSchema: Schema = DivinerConfigSchema\n static readonly targetSchema: string\n static override readonly uniqueName = globallyUnique('AbstractDiviner', AbstractDiviner, 'xyo')\n\n private _eventUnsubscribeFunctions: EventUnsubscribeFunction[] = []\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n async divine(payloads: TIn[] = [], retryConfigIn?: RetryConfigWithComplete): Promise<DivinerDivineResult<TOut>[]> {\n this._noOverride('divine')\n return await spanAsync('divine', async () => {\n if (this.reentrancy?.scope === 'global' && this.reentrancy.action === 'skip' && this.globalReentrancyMutex?.isLocked()) {\n return []\n }\n try {\n await this.globalReentrancyMutex?.acquire()\n return await this.busy(async () => {\n const retryConfig = retryConfigIn ?? this.config.retry\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, mod: this })\n const resultPayloads\n = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []\n await this.emit('divineEnd', {\n errors: [], inPayloads: payloads, mod: this, outPayloads: resultPayloads,\n })\n return PayloadBuilder.omitPrivateStorageMeta(resultPayloads)\n })\n } finally {\n this.globalReentrancyMutex?.release()\n }\n }, this.tracer)\n }\n\n async divineQuery(payloads?: TIn[], account?: AccountInstance, _retry?: RetryConfig): Promise<ModuleQueryResult<TOut>> {\n const queryPayload: DivinerDivineQuery = { schema: DivinerDivineQuerySchema }\n return await this.sendQueryRaw(queryPayload, payloads, account)\n }\n\n /** @function queryHandler Calls divine for a divine query. Override to support additional queries. */\n protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n query: T,\n payloads?: Payload[],\n queryConfig?: TConfig,\n ): Promise<ModuleQueryHandlerResult> {\n const wrapper = QueryBoundWitnessWrapper.parseQuery<DivinerQueries>(query, payloads)\n // remove the query payload\n const cleanPayloads = await PayloadBuilder.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(await this.queryable(query, payloads, queryConfig))\n const resultPayloads: WithoutPrivateStorageMeta<Payload>[] = []\n switch (queryPayload.schema) {\n case DivinerDivineQuerySchema: {\n resultPayloads.push(...(await this.divine(cleanPayloads as TIn[])))\n break\n }\n default: {\n return super.queryHandler(query, payloads)\n }\n }\n return PayloadBuilder.omitPrivateStorageMeta(resultPayloads)\n }\n\n protected override async startHandler(timeout?: number) {\n const { eventSubscriptions = [] } = this.config\n\n for (const subscription of eventSubscriptions) {\n const {\n sourceEvent, sourceModule, targetModuleFunction,\n } = subscription\n if (targetModuleFunction === 'divine') {\n forget(delayedResolve(this, sourceModule, (sourceModuleInstance: ModuleInstance | null) => {\n if (isNull(sourceModuleInstance)) {\n this.logger?.error(`Failed to resolve ${sourceModule} for ${this.modName}`)\n } else {\n if (isArchivistInstance(sourceModuleInstance)) {\n if (sourceEvent === 'inserted') {\n this._eventUnsubscribeFunctions.push(\n sourceModuleInstance.on(sourceEvent, async ({ outPayloads, payloads }) => {\n await this.divine((outPayloads ?? payloads) as Payload[] as TIn[])\n }),\n )\n } else {\n this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)\n }\n } else if (isDivinerInstance(sourceModuleInstance)) {\n if (sourceEvent === 'divineEnd') {\n this._eventUnsubscribeFunctions.push(\n sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {\n await this.divine(outPayloads as Payload[] as TIn[])\n }),\n )\n } else {\n this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)\n }\n } else if (isWitnessInstance(sourceModuleInstance)) {\n if (sourceEvent === 'observeEnd') {\n this._eventUnsubscribeFunctions.push(\n sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {\n await this.divine(outPayloads as Payload[] as TIn[])\n }),\n )\n } else {\n this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)\n }\n }\n }\n }))\n }\n }\n\n return await super.startHandler(timeout)\n }\n\n protected override async stopHandler(timeout?: number) {\n for (const unsubscribe of this._eventUnsubscribeFunctions) {\n unsubscribe()\n }\n this._eventUnsubscribeFunctions = []\n this._eventUnsubscribeFunctions = []\n return await super.stopHandler(timeout)\n }\n\n /** @function divineHandler Implement or override to add custom functionality to a diviner */\n protected abstract divineHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":"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","names":[]}
package/dist/types/AbstractDiviner.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAGzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAEjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAExE,OAAO,KAAK,EACV,yBAAyB,EAEzB,mBAAmB,EACnB,eAAe,EACf,sBAAsB,EACtB,aAAa,EAEd,MAAM,4BAA4B,CAAA;AAMnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AAErE,OAAO,KAAK,EACV,YAAY,EAAE,wBAAwB,EAAE,iBAAiB,EAC1D,MAAM,2BAA2B,CAAA;AAElC,OAAO,KAAK,EACV,OAAO,EAAE,MAAM,EAChB,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACnC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,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,CAED,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACpE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAgD;IAChG,gBAAyB,mBAAmB,EAAE,MAAM,CAAsB;IAC1E,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IACpC,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,0BAA0B,CAAiC;IAEnE,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,sJAAsJ;IAChJ,MAAM,CAAC,QAAQ,GAAE,GAAG,EAAO,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;IAyB3G,WAAW,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAKtH,uGAAuG;cAC9E,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,wBAAwB,CAAC;cAmBX,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM;cAkD7B,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM;IASrD,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
1
+ {"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAIzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAEjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAExE,OAAO,KAAK,EACV,yBAAyB,EAEzB,mBAAmB,EACnB,eAAe,EACf,sBAAsB,EACtB,aAAa,EAEd,MAAM,4BAA4B,CAAA;AAMnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,KAAK,EACV,YAAY,EAAoC,wBAAwB,EAAE,iBAAiB,EAC5F,MAAM,2BAA2B,CAAA;AAElC,OAAO,KAAK,EACV,OAAO,EAAE,MAAM,EAChB,MAAM,4BAA4B,CAAA;AA0BnC,8BAAsB,eAAe,CACnC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,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,CAED,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACpE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAgD;IAChG,gBAAyB,mBAAmB,EAAE,MAAM,CAAsB;IAC1E,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IACpC,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,0BAA0B,CAAiC;IAEnE,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,sJAAsJ;IAChJ,MAAM,CAAC,QAAQ,GAAE,GAAG,EAAO,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;IAyB3G,WAAW,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAKtH,uGAAuG;cAC9E,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,wBAAwB,CAAC;cAmBX,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM;cAmD7B,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM;IASrD,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@xyo-network/diviner-abstract",
3
- "version": "3.15.6",
3
+ "version": "3.15.7",
4
4
  "description": "Primary SDK for using XYO Protocol 2.0",
5
5
  "homepage": "https://xyo.network",
6
6
  "bugs": {
@@ -29,26 +29,30 @@
29
29
  "module": "dist/neutral/index.mjs",
30
30
  "types": "dist/types/index.d.ts",
31
31
  "dependencies": {
32
- "@xylabs/assert": "^4.9.8",
33
- "@xylabs/base": "^4.9.8",
34
- "@xylabs/promise": "^4.9.8",
35
- "@xylabs/retry": "^4.9.8",
36
- "@xylabs/telemetry": "^4.9.8",
37
- "@xyo-network/account-model": "^3.15.6",
38
- "@xyo-network/archivist-model": "^3.15.6",
39
- "@xyo-network/boundwitness-model": "^3.15.6",
40
- "@xyo-network/boundwitness-wrapper": "^3.15.6",
41
- "@xyo-network/diviner-model": "^3.15.6",
42
- "@xyo-network/module-abstract": "^3.15.6",
43
- "@xyo-network/module-model": "^3.15.6",
44
- "@xyo-network/payload-builder": "^3.15.6",
45
- "@xyo-network/payload-model": "^3.15.6",
46
- "@xyo-network/witness-model": "^3.15.6"
32
+ "@xylabs/assert": "^4.9.17",
33
+ "@xylabs/base": "^4.9.17",
34
+ "@xylabs/delay": "^4.9.17",
35
+ "@xylabs/logger": "^4.9.17",
36
+ "@xylabs/promise": "^4.9.17",
37
+ "@xylabs/retry": "^4.9.17",
38
+ "@xylabs/telemetry": "^4.9.17",
39
+ "@xylabs/typeof": "^4.9.17",
40
+ "@xyo-network/account-model": "^3.15.7",
41
+ "@xyo-network/archivist-model": "^3.15.7",
42
+ "@xyo-network/boundwitness-model": "^3.15.7",
43
+ "@xyo-network/boundwitness-wrapper": "^3.15.7",
44
+ "@xyo-network/diviner-model": "^3.15.7",
45
+ "@xyo-network/module-abstract": "^3.15.7",
46
+ "@xyo-network/module-model": "^3.15.7",
47
+ "@xyo-network/payload-builder": "^3.15.7",
48
+ "@xyo-network/payload-model": "^3.15.7",
49
+ "@xyo-network/witness-model": "^3.15.7"
47
50
  },
48
51
  "devDependencies": {
52
+ "@xylabs/events": "^4.9.17",
49
53
  "@xylabs/ts-scripts-yarn3": "^6.5.5",
50
54
  "@xylabs/tsconfig": "^6.5.5",
51
- "@xyo-network/module-events": "^3.15.6",
55
+ "@xyo-network/module-events": "^3.15.7",
52
56
  "typescript": "^5.8.3"
53
57
  },
54
58
  "publishConfig": {
package/src/AbstractDiviner.ts CHANGED
@@ -1,9 +1,14 @@
1
1
  import { assertEx } from '@xylabs/assert'
2
2
  import { globallyUnique } from '@xylabs/base'
3
+ import { delay } from '@xylabs/delay'
4
+ import type { EventUnsubscribeFunction } from '@xylabs/events'
5
+ import { forget } from '@xylabs/forget'
6
+ import type { Logger } from '@xylabs/logger'
3
7
  import type { Promisable } from '@xylabs/promise'
4
8
  import type { RetryConfig, RetryConfigWithComplete } from '@xylabs/retry'
5
9
  import { retry } from '@xylabs/retry'
6
10
  import { spanAsync } from '@xylabs/telemetry'
11
+ import { isDefined, isNull } from '@xylabs/typeof'
7
12
  import type { AccountInstance } from '@xyo-network/account-model'
8
13
  import { isArchivistInstance } from '@xyo-network/archivist-model'
9
14
  import type { QueryBoundWitness } from '@xyo-network/boundwitness-model'
@@ -23,9 +28,8 @@ import {
23
28
  isDivinerInstance,
24
29
  } from '@xyo-network/diviner-model'
25
30
  import { AbstractModuleInstance } from '@xyo-network/module-abstract'
26
- import type { EventUnsubscribeFunction } from '@xyo-network/module-events'
27
31
  import type {
28
- ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult,
32
+ ModuleConfig, ModuleIdentifier, ModuleInstance, ModuleQueryHandlerResult, ModuleQueryResult,
29
33
  } from '@xyo-network/module-model'
30
34
  import { PayloadBuilder } from '@xyo-network/payload-builder'
31
35
  import type {
@@ -33,6 +37,29 @@ import type {
33
37
  } from '@xyo-network/payload-model'
34
38
  import { isWitnessInstance } from '@xyo-network/witness-model'
35
39
 
40
+ const delayedResolve = async (
41
+ parent: ModuleInstance,
42
+ id: ModuleIdentifier,
43
+ closure: (mod: ModuleInstance | null) => void,
44
+ timeout = 30_000,
45
+ logger?: Logger,
46
+ ) => {
47
+ const start = Date.now()
48
+ let result: ModuleInstance | undefined
49
+ while (result) {
50
+ result = await parent.resolve(id)
51
+ if (isDefined(result)) {
52
+ closure(result)
53
+ break
54
+ }
55
+ if (Date.now() - start > timeout) {
56
+ logger?.error(`Timed out waiting for ${id} to resolve`)
57
+ closure(null)
58
+ }
59
+ await delay(500)
60
+ }
61
+ }
62
+
36
63
  export abstract class AbstractDiviner<
37
64
  TParams extends DivinerParams = DivinerParams,
38
65
  TIn extends Payload = Payload,
@@ -118,43 +145,44 @@ export abstract class AbstractDiviner<
118
145
  const {
119
146
  sourceEvent, sourceModule, targetModuleFunction,
120
147
  } = subscription
121
- const sourceModuleInstance = await this.resolve(sourceModule)
122
- if (sourceModuleInstance) {
123
- if (targetModuleFunction === 'divine') {
124
- if (isArchivistInstance(sourceModuleInstance)) {
125
- if (sourceEvent === 'inserted') {
126
- this._eventUnsubscribeFunctions.push(
127
- sourceModuleInstance.on(sourceEvent, async ({ outPayloads, payloads }) => {
128
- await this.divine((outPayloads ?? payloads) as Payload[] as TIn[])
129
- }),
130
- )
131
- } else {
132
- this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)
133
- }
134
- } else if (isDivinerInstance(sourceModuleInstance)) {
135
- if (sourceEvent === 'divineEnd') {
136
- this._eventUnsubscribeFunctions.push(
137
- sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {
138
- await this.divine(outPayloads as Payload[] as TIn[])
139
- }),
140
- )
141
- } else {
142
- this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)
143
- }
144
- } else if (isWitnessInstance(sourceModuleInstance)) {
145
- if (sourceEvent === 'observeEnd') {
146
- this._eventUnsubscribeFunctions.push(
147
- sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {
148
- await this.divine(outPayloads as Payload[] as TIn[])
149
- }),
150
- )
151
- } else {
152
- this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)
148
+ if (targetModuleFunction === 'divine') {
149
+ forget(delayedResolve(this, sourceModule, (sourceModuleInstance: ModuleInstance | null) => {
150
+ if (isNull(sourceModuleInstance)) {
151
+ this.logger?.error(`Failed to resolve ${sourceModule} for ${this.modName}`)
152
+ } else {
153
+ if (isArchivistInstance(sourceModuleInstance)) {
154
+ if (sourceEvent === 'inserted') {
155
+ this._eventUnsubscribeFunctions.push(
156
+ sourceModuleInstance.on(sourceEvent, async ({ outPayloads, payloads }) => {
157
+ await this.divine((outPayloads ?? payloads) as Payload[] as TIn[])
158
+ }),
159
+ )
160
+ } else {
161
+ this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)
162
+ }
163
+ } else if (isDivinerInstance(sourceModuleInstance)) {
164
+ if (sourceEvent === 'divineEnd') {
165
+ this._eventUnsubscribeFunctions.push(
166
+ sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {
167
+ await this.divine(outPayloads as Payload[] as TIn[])
168
+ }),
169
+ )
170
+ } else {
171
+ this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)
172
+ }
173
+ } else if (isWitnessInstance(sourceModuleInstance)) {
174
+ if (sourceEvent === 'observeEnd') {
175
+ this._eventUnsubscribeFunctions.push(
176
+ sourceModuleInstance.on(sourceEvent, async ({ outPayloads }) => {
177
+ await this.divine(outPayloads as Payload[] as TIn[])
178
+ }),
179
+ )
180
+ } else {
181
+ this.logger?.warn(`Unsupported sourceEvent ${sourceEvent} for ${sourceModuleInstance.modName}`)
182
+ }
153
183
  }
154
184
  }
155
- } else {
156
- this.logger?.warn(`Unsupported targetModuleFunction ${targetModuleFunction} for ${this.modName}`)
157
- }
185
+ }))
158
186
  }
159
187
  }
160
188