@xyo-network/diviner-abstract 2.88.2 → 2.88.3
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.
- package/dist/browser/AbstractDiviner.d.cts +2 -1
- package/dist/browser/AbstractDiviner.d.cts.map +1 -1
- package/dist/browser/AbstractDiviner.d.mts +2 -1
- package/dist/browser/AbstractDiviner.d.mts.map +1 -1
- package/dist/browser/AbstractDiviner.d.ts +2 -1
- package/dist/browser/AbstractDiviner.d.ts.map +1 -1
- package/dist/browser/index.cjs +4 -2
- package/dist/browser/index.cjs.map +1 -1
- package/dist/browser/index.js +4 -2
- package/dist/browser/index.js.map +1 -1
- package/dist/node/AbstractDiviner.d.cts +2 -1
- package/dist/node/AbstractDiviner.d.cts.map +1 -1
- package/dist/node/AbstractDiviner.d.mts +2 -1
- package/dist/node/AbstractDiviner.d.mts.map +1 -1
- package/dist/node/AbstractDiviner.d.ts +2 -1
- package/dist/node/AbstractDiviner.d.ts.map +1 -1
- package/dist/node/index.cjs +4 -2
- package/dist/node/index.cjs.map +1 -1
- package/dist/node/index.js +4 -2
- package/dist/node/index.js.map +1 -1
- package/package.json +11 -10
- package/src/AbstractDiviner.ts +4 -2
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Promisable } from '@xylabs/promise';
|
|
2
|
+
import { RetryConfigWithComplete } from '@xylabs/retry';
|
|
2
3
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
3
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
4
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
@@ -10,7 +11,7 @@ export declare abstract class AbstractDiviner<TParams extends DivinerParams = Di
|
|
|
10
11
|
get queries(): string[];
|
|
11
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
12
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
13
|
-
divine(payloads?: TIn[]): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
15
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
16
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAYlF,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;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Promisable } from '@xylabs/promise';
|
|
2
|
+
import { RetryConfigWithComplete } from '@xylabs/retry';
|
|
2
3
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
3
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
4
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
@@ -10,7 +11,7 @@ export declare abstract class AbstractDiviner<TParams extends DivinerParams = Di
|
|
|
10
11
|
get queries(): string[];
|
|
11
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
12
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
13
|
-
divine(payloads?: TIn[]): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
15
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
16
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAYlF,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;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Promisable } from '@xylabs/promise';
|
|
2
|
+
import { RetryConfigWithComplete } from '@xylabs/retry';
|
|
2
3
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
3
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
4
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
@@ -10,7 +11,7 @@ export declare abstract class AbstractDiviner<TParams extends DivinerParams = Di
|
|
|
10
11
|
get queries(): string[];
|
|
11
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
12
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
13
|
-
divine(payloads?: TIn[]): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
15
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
16
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAYlF,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;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
package/dist/browser/index.cjs
CHANGED
|
@@ -27,6 +27,7 @@ module.exports = __toCommonJS(src_exports);
|
|
|
27
27
|
|
|
28
28
|
// src/AbstractDiviner.ts
|
|
29
29
|
var import_assert = require("@xylabs/assert");
|
|
30
|
+
var import_retry = require("@xylabs/retry");
|
|
30
31
|
var import_boundwitness_builder = require("@xyo-network/boundwitness-builder");
|
|
31
32
|
var import_diviner_model = require("@xyo-network/diviner-model");
|
|
32
33
|
var import_hash = require("@xyo-network/hash");
|
|
@@ -51,15 +52,16 @@ var AbstractDiviner = class extends import_module_abstract.AbstractModuleInstanc
|
|
|
51
52
|
};
|
|
52
53
|
}
|
|
53
54
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
54
|
-
divine(payloads) {
|
|
55
|
+
divine(payloads, retryConfigIn) {
|
|
55
56
|
this._noOverride("divine");
|
|
56
57
|
return this.busy(async () => {
|
|
58
|
+
const retryConfig = retryConfigIn ?? this.config.retry;
|
|
57
59
|
await this.started("throw");
|
|
58
60
|
await this.emit("divineStart", {
|
|
59
61
|
inPayloads: payloads,
|
|
60
62
|
module: this
|
|
61
63
|
});
|
|
62
|
-
const resultPayloads = await this.divineHandler(payloads);
|
|
64
|
+
const resultPayloads = (retryConfig ? await (0, import_retry.retry)(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? [];
|
|
63
65
|
await this.emit("divineStart", {
|
|
64
66
|
inPayloads: payloads,
|
|
65
67
|
module: this,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/AbstractDiviner.ts"],"sourcesContent":["export * from './AbstractDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-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<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[]): Promise<TOut[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = await this.divineHandler(payloads)\n await this.emit('divineStart', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return resultPayloads\n })\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<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadHasher.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(this.queryable(query, payloads, queryConfig))\n const resultPayloads: 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 resultPayloads\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":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AAEzB,kCAAyC;AAEzC,2BASO;AACP,kBAA8B;AAC9B,6BAAuC;AAIhC,IAAeA,kBAAf,cAMGC,8CAAAA;
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/AbstractDiviner.ts"],"sourcesContent":["export * from './AbstractDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-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<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n const retryConfig = retryConfigIn ?? this.config.retry\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []\n await this.emit('divineStart', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return resultPayloads\n })\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<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadHasher.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(this.queryable(query, payloads, queryConfig))\n const resultPayloads: 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 resultPayloads\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":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AAEzB,mBAA+C;AAC/C,kCAAyC;AAEzC,2BASO;AACP,kBAA8B;AAC9B,6BAAuC;AAIhC,IAAeA,kBAAf,cAMGC,8CAAAA;EA1BV,OA0BUA;;;EAGR,OAAyBC,gBAA0B;IAACC;;EACpD,OAAOC;EAEP,IAAaC,UAAoB;AAC/B,WAAO;MAACC;SAA6B,MAAMD;;EAC7C;EAEA,IAAuBE,qBAAiE;AACtF,WAAO;MACL,oCAAoC;IACtC;EACF;;EAGAC,OAAOC,UAAkBC,eAA0D;AACjF,SAAKC,YAAY,QAAA;AACjB,WAAO,KAAKC,KAAK,YAAA;AACf,YAAMC,cAAcH,iBAAiB,KAAKI,OAAOC;AACjD,YAAM,KAAKC,QAAQ,OAAA;AACnB,YAAM,KAAKC,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;MAAK,CAAA;AACpE,YAAMC,kBAAkBP,cAAc,UAAME,oBAAM,MAAM,KAAKM,cAAcZ,QAAAA,GAAWI,WAAAA,IAAe,MAAM,KAAKQ,cAAcZ,QAAAA,MAAc,CAAA;AAC5I,YAAM,KAAKQ,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;QAAMG,aAAaF;MAAe,CAAA;AACjG,aAAOA;IACT,CAAA;EACF;;EAGA,MAAyBG,aACvBC,OACAf,UACAgB,aACmC;AACnC,UAAMC,UAAUC,qDAAyBC,WAAyBJ,OAAOf,QAAAA;AAEzE,UAAMoB,gBAAgB,MAAMC,0BAAcC,cAActB,UAAUe,MAAMA,KAAK;AAC7E,UAAMQ,eAAe,MAAMN,QAAQO,SAAQ;AAC3CC,gCAAS,KAAKC,UAAUX,OAAOf,UAAUgB,WAAAA,CAAAA;AACzC,UAAML,iBAA4B,CAAA;AAClC,YAAQY,aAAaI,QAAM;MACzB,KAAK9B,+CAA0B;AAC7Bc,uBAAeiB,KAAI,GAAK,MAAM,KAAK7B,OAAOqB,aAAAA,CAAAA;AAC1C;MACF;MACA,SAAS;AACP,eAAO,MAAMN,aAAaC,OAAOf,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;","names":["AbstractDiviner","AbstractModuleInstance","configSchemas","DivinerConfigSchema","targetSchema","queries","DivinerDivineQuerySchema","_queryAccountPaths","divine","payloads","retryConfigIn","_noOverride","busy","retryConfig","config","retry","started","emit","inPayloads","module","resultPayloads","divineHandler","outPayloads","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","cleanPayloads","PayloadHasher","filterExclude","queryPayload","getQuery","assertEx","queryable","schema","push"]}
|
package/dist/browser/index.js
CHANGED
|
@@ -3,6 +3,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
|
|
|
3
3
|
|
|
4
4
|
// src/AbstractDiviner.ts
|
|
5
5
|
import { assertEx } from "@xylabs/assert";
|
|
6
|
+
import { retry } from "@xylabs/retry";
|
|
6
7
|
import { QueryBoundWitnessWrapper } from "@xyo-network/boundwitness-builder";
|
|
7
8
|
import { DivinerConfigSchema, DivinerDivineQuerySchema } from "@xyo-network/diviner-model";
|
|
8
9
|
import { PayloadHasher } from "@xyo-network/hash";
|
|
@@ -27,15 +28,16 @@ var AbstractDiviner = class extends AbstractModuleInstance {
|
|
|
27
28
|
};
|
|
28
29
|
}
|
|
29
30
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
30
|
-
divine(payloads) {
|
|
31
|
+
divine(payloads, retryConfigIn) {
|
|
31
32
|
this._noOverride("divine");
|
|
32
33
|
return this.busy(async () => {
|
|
34
|
+
const retryConfig = retryConfigIn ?? this.config.retry;
|
|
33
35
|
await this.started("throw");
|
|
34
36
|
await this.emit("divineStart", {
|
|
35
37
|
inPayloads: payloads,
|
|
36
38
|
module: this
|
|
37
39
|
});
|
|
38
|
-
const resultPayloads = await this.divineHandler(payloads);
|
|
40
|
+
const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? [];
|
|
39
41
|
await this.emit("divineStart", {
|
|
40
42
|
inPayloads: payloads,
|
|
41
43
|
module: this,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-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<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[]): Promise<TOut[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = await this.divineHandler(payloads)\n await this.emit('divineStart', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return resultPayloads\n })\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<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadHasher.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(this.queryable(query, payloads, queryConfig))\n const resultPayloads: 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 resultPayloads\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":";;;;AAAA,SAASA,gBAAgB;AAEzB,SAASC,gCAAgC;AAEzC,SAEEC,qBACAC,gCAMK;AACP,SAASC,qBAAqB;AAC9B,SAASC,8BAA8B;AAIhC,IAAeC,kBAAf,cAMGC,uBAAAA;
|
|
1
|
+
{"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-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<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n const retryConfig = retryConfigIn ?? this.config.retry\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []\n await this.emit('divineStart', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return resultPayloads\n })\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<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadHasher.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(this.queryable(query, payloads, queryConfig))\n const resultPayloads: 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 resultPayloads\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":";;;;AAAA,SAASA,gBAAgB;AAEzB,SAASC,aAAsC;AAC/C,SAASC,gCAAgC;AAEzC,SAEEC,qBACAC,gCAMK;AACP,SAASC,qBAAqB;AAC9B,SAASC,8BAA8B;AAIhC,IAAeC,kBAAf,cAMGC,uBAAAA;EA1BV,OA0BUA;;;EAGR,OAAyBC,gBAA0B;IAACC;;EACpD,OAAOC;EAEP,IAAaC,UAAoB;AAC/B,WAAO;MAACC;SAA6B,MAAMD;;EAC7C;EAEA,IAAuBE,qBAAiE;AACtF,WAAO;MACL,oCAAoC;IACtC;EACF;;EAGAC,OAAOC,UAAkBC,eAA0D;AACjF,SAAKC,YAAY,QAAA;AACjB,WAAO,KAAKC,KAAK,YAAA;AACf,YAAMC,cAAcH,iBAAiB,KAAKI,OAAOC;AACjD,YAAM,KAAKC,QAAQ,OAAA;AACnB,YAAM,KAAKC,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;MAAK,CAAA;AACpE,YAAMC,kBAAkBP,cAAc,MAAME,MAAM,MAAM,KAAKM,cAAcZ,QAAAA,GAAWI,WAAAA,IAAe,MAAM,KAAKQ,cAAcZ,QAAAA,MAAc,CAAA;AAC5I,YAAM,KAAKQ,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;QAAMG,aAAaF;MAAe,CAAA;AACjG,aAAOA;IACT,CAAA;EACF;;EAGA,MAAyBG,aACvBC,OACAf,UACAgB,aACmC;AACnC,UAAMC,UAAUC,yBAAyBC,WAAyBJ,OAAOf,QAAAA;AAEzE,UAAMoB,gBAAgB,MAAMC,cAAcC,cAActB,UAAUe,MAAMA,KAAK;AAC7E,UAAMQ,eAAe,MAAMN,QAAQO,SAAQ;AAC3CC,aAAS,KAAKC,UAAUX,OAAOf,UAAUgB,WAAAA,CAAAA;AACzC,UAAML,iBAA4B,CAAA;AAClC,YAAQY,aAAaI,QAAM;MACzB,KAAK9B,0BAA0B;AAC7Bc,uBAAeiB,KAAI,GAAK,MAAM,KAAK7B,OAAOqB,aAAAA,CAAAA;AAC1C;MACF;MACA,SAAS;AACP,eAAO,MAAMN,aAAaC,OAAOf,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;","names":["assertEx","retry","QueryBoundWitnessWrapper","DivinerConfigSchema","DivinerDivineQuerySchema","PayloadHasher","AbstractModuleInstance","AbstractDiviner","AbstractModuleInstance","configSchemas","DivinerConfigSchema","targetSchema","queries","DivinerDivineQuerySchema","_queryAccountPaths","divine","payloads","retryConfigIn","_noOverride","busy","retryConfig","config","retry","started","emit","inPayloads","module","resultPayloads","divineHandler","outPayloads","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","cleanPayloads","PayloadHasher","filterExclude","queryPayload","getQuery","assertEx","queryable","schema","push"]}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Promisable } from '@xylabs/promise';
|
|
2
|
+
import { RetryConfigWithComplete } from '@xylabs/retry';
|
|
2
3
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
3
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
4
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
@@ -10,7 +11,7 @@ export declare abstract class AbstractDiviner<TParams extends DivinerParams = Di
|
|
|
10
11
|
get queries(): string[];
|
|
11
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
12
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
13
|
-
divine(payloads?: TIn[]): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
15
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
16
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAYlF,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;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Promisable } from '@xylabs/promise';
|
|
2
|
+
import { RetryConfigWithComplete } from '@xylabs/retry';
|
|
2
3
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
3
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
4
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
@@ -10,7 +11,7 @@ export declare abstract class AbstractDiviner<TParams extends DivinerParams = Di
|
|
|
10
11
|
get queries(): string[];
|
|
11
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
12
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
13
|
-
divine(payloads?: TIn[]): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
15
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
16
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAYlF,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;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Promisable } from '@xylabs/promise';
|
|
2
|
+
import { RetryConfigWithComplete } from '@xylabs/retry';
|
|
2
3
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
|
|
3
4
|
import { CustomDivinerModule, DivinerModule, DivinerModuleEventData, DivinerParams, DivinerQueryBase } from '@xyo-network/diviner-model';
|
|
4
5
|
import { AbstractModuleInstance } from '@xyo-network/module-abstract';
|
|
@@ -10,7 +11,7 @@ export declare abstract class AbstractDiviner<TParams extends DivinerParams = Di
|
|
|
10
11
|
get queries(): string[];
|
|
11
12
|
protected get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string>;
|
|
12
13
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
13
|
-
divine(payloads?: TIn[]): Promise<TOut[]>;
|
|
14
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]>;
|
|
14
15
|
/** @function queryHandler Calls divine for a divine query. Override to support additional queries. */
|
|
15
16
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
16
17
|
/** @function divineHandler Implement or override to add custom functionality to a diviner */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAS,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACb,sBAAsB,EACtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAE1I,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAE9D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,sJAAsJ;IACtJ,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAYlF,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;IAmBpC,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACvE"}
|
package/dist/node/index.cjs
CHANGED
|
@@ -32,6 +32,7 @@ module.exports = __toCommonJS(src_exports);
|
|
|
32
32
|
|
|
33
33
|
// src/AbstractDiviner.ts
|
|
34
34
|
var import_assert = require("@xylabs/assert");
|
|
35
|
+
var import_retry = require("@xylabs/retry");
|
|
35
36
|
var import_boundwitness_builder = require("@xyo-network/boundwitness-builder");
|
|
36
37
|
var import_diviner_model = require("@xyo-network/diviner-model");
|
|
37
38
|
var import_hash = require("@xyo-network/hash");
|
|
@@ -49,15 +50,16 @@ var _AbstractDiviner = class _AbstractDiviner extends import_module_abstract.Abs
|
|
|
49
50
|
};
|
|
50
51
|
}
|
|
51
52
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
52
|
-
divine(payloads) {
|
|
53
|
+
divine(payloads, retryConfigIn) {
|
|
53
54
|
this._noOverride("divine");
|
|
54
55
|
return this.busy(async () => {
|
|
56
|
+
const retryConfig = retryConfigIn ?? this.config.retry;
|
|
55
57
|
await this.started("throw");
|
|
56
58
|
await this.emit("divineStart", {
|
|
57
59
|
inPayloads: payloads,
|
|
58
60
|
module: this
|
|
59
61
|
});
|
|
60
|
-
const resultPayloads = await this.divineHandler(payloads);
|
|
62
|
+
const resultPayloads = (retryConfig ? await (0, import_retry.retry)(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? [];
|
|
61
63
|
await this.emit("divineStart", {
|
|
62
64
|
inPayloads: payloads,
|
|
63
65
|
module: this,
|
package/dist/node/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/AbstractDiviner.ts"],"sourcesContent":["export * from './AbstractDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-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<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[]): Promise<TOut[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = await this.divineHandler(payloads)\n await this.emit('divineStart', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return resultPayloads\n })\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<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadHasher.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(this.queryable(query, payloads, queryConfig))\n const resultPayloads: 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 resultPayloads\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":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AAEzB,kCAAyC;AAEzC,2BASO;AACP,kBAA8B;AAC9B,6BAAuC;AAIhC,IAAeA,mBAAf,MAAeA,yBAMZC,8CAAAA;EAMR,IAAaC,UAAoB;AAC/B,WAAO;MAACC;SAA6B,MAAMD;;EAC7C;EAEA,IAAuBE,qBAAiE;AACtF,WAAO;MACL,oCAAoC;IACtC;EACF;;EAGAC,OAAOC,
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/AbstractDiviner.ts"],"sourcesContent":["export * from './AbstractDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-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<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n const retryConfig = retryConfigIn ?? this.config.retry\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []\n await this.emit('divineStart', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return resultPayloads\n })\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<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadHasher.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(this.queryable(query, payloads, queryConfig))\n const resultPayloads: 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 resultPayloads\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":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AAEzB,mBAA+C;AAC/C,kCAAyC;AAEzC,2BASO;AACP,kBAA8B;AAC9B,6BAAuC;AAIhC,IAAeA,mBAAf,MAAeA,yBAMZC,8CAAAA;EAMR,IAAaC,UAAoB;AAC/B,WAAO;MAACC;SAA6B,MAAMD;;EAC7C;EAEA,IAAuBE,qBAAiE;AACtF,WAAO;MACL,oCAAoC;IACtC;EACF;;EAGAC,OAAOC,UAAkBC,eAA0D;AACjF,SAAKC,YAAY,QAAA;AACjB,WAAO,KAAKC,KAAK,YAAA;AACf,YAAMC,cAAcH,iBAAiB,KAAKI,OAAOC;AACjD,YAAM,KAAKC,QAAQ,OAAA;AACnB,YAAM,KAAKC,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;MAAK,CAAA;AACpE,YAAMC,kBAAkBP,cAAc,UAAME,oBAAM,MAAM,KAAKM,cAAcZ,QAAAA,GAAWI,WAAAA,IAAe,MAAM,KAAKQ,cAAcZ,QAAAA,MAAc,CAAA;AAC5I,YAAM,KAAKQ,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;QAAMG,aAAaF;MAAe,CAAA;AACjG,aAAOA;IACT,CAAA;EACF;;EAGA,MAAyBG,aACvBC,OACAf,UACAgB,aACmC;AACnC,UAAMC,UAAUC,qDAAyBC,WAAyBJ,OAAOf,QAAAA;AAEzE,UAAMoB,gBAAgB,MAAMC,0BAAcC,cAActB,UAAUe,MAAMA,KAAK;AAC7E,UAAMQ,eAAe,MAAMN,QAAQO,SAAQ;AAC3CC,gCAAS,KAAKC,UAAUX,OAAOf,UAAUgB,WAAAA,CAAAA;AACzC,UAAML,iBAA4B,CAAA;AAClC,YAAQY,aAAaI,QAAM;MACzB,KAAK9B,+CAA0B;AAC7Bc,uBAAeiB,KAAI,GAAK,MAAM,KAAK7B,OAAOqB,aAAAA,CAAAA;AAC1C;MACF;MACA,SAAS;AACP,eAAO,MAAMN,aAAaC,OAAOf,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;AAvDUhB;AAGR,cAToBD,kBASKmC,iBAA0B;EAACC;;AACpD,cAVoBpC,kBAUbqC;AAVF,IAAerC,kBAAf;","names":["AbstractDiviner","AbstractModuleInstance","queries","DivinerDivineQuerySchema","_queryAccountPaths","divine","payloads","retryConfigIn","_noOverride","busy","retryConfig","config","retry","started","emit","inPayloads","module","resultPayloads","divineHandler","outPayloads","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","cleanPayloads","PayloadHasher","filterExclude","queryPayload","getQuery","assertEx","queryable","schema","push","configSchemas","DivinerConfigSchema","targetSchema"]}
|
package/dist/node/index.js
CHANGED
|
@@ -8,6 +8,7 @@ var __publicField = (obj, key, value) => {
|
|
|
8
8
|
|
|
9
9
|
// src/AbstractDiviner.ts
|
|
10
10
|
import { assertEx } from "@xylabs/assert";
|
|
11
|
+
import { retry } from "@xylabs/retry";
|
|
11
12
|
import { QueryBoundWitnessWrapper } from "@xyo-network/boundwitness-builder";
|
|
12
13
|
import { DivinerConfigSchema, DivinerDivineQuerySchema } from "@xyo-network/diviner-model";
|
|
13
14
|
import { PayloadHasher } from "@xyo-network/hash";
|
|
@@ -25,15 +26,16 @@ var _AbstractDiviner = class _AbstractDiviner extends AbstractModuleInstance {
|
|
|
25
26
|
};
|
|
26
27
|
}
|
|
27
28
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
28
|
-
divine(payloads) {
|
|
29
|
+
divine(payloads, retryConfigIn) {
|
|
29
30
|
this._noOverride("divine");
|
|
30
31
|
return this.busy(async () => {
|
|
32
|
+
const retryConfig = retryConfigIn ?? this.config.retry;
|
|
31
33
|
await this.started("throw");
|
|
32
34
|
await this.emit("divineStart", {
|
|
33
35
|
inPayloads: payloads,
|
|
34
36
|
module: this
|
|
35
37
|
});
|
|
36
|
-
const resultPayloads = await this.divineHandler(payloads);
|
|
38
|
+
const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? [];
|
|
37
39
|
await this.emit("divineStart", {
|
|
38
40
|
inPayloads: payloads,
|
|
39
41
|
module: this,
|
package/dist/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-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<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[]): Promise<TOut[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = await this.divineHandler(payloads)\n await this.emit('divineStart', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return resultPayloads\n })\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<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadHasher.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(this.queryable(query, payloads, queryConfig))\n const resultPayloads: 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 resultPayloads\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":";;;;;;;;;AAAA,SAASA,gBAAgB;AAEzB,SAASC,gCAAgC;AAEzC,SAEEC,qBACAC,gCAMK;AACP,SAASC,qBAAqB;AAC9B,SAASC,8BAA8B;AAIhC,IAAeC,mBAAf,MAAeA,yBAMZC,uBAAAA;EAMR,IAAaC,UAAoB;AAC/B,WAAO;MAACC;SAA6B,MAAMD;;EAC7C;EAEA,IAAuBE,qBAAiE;AACtF,WAAO;MACL,oCAAoC;IACtC;EACF;;EAGAC,OAAOC,
|
|
1
|
+
{"version":3,"sources":["../../src/AbstractDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { retry, RetryConfigWithComplete } from '@xylabs/retry'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport {\n CustomDivinerModule,\n DivinerConfigSchema,\n DivinerDivineQuerySchema,\n DivinerModule,\n DivinerModuleEventData,\n DivinerParams,\n DivinerQuery,\n DivinerQueryBase,\n} from '@xyo-network/diviner-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-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<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n >\n extends AbstractModuleInstance<TParams, TEventData>\n implements CustomDivinerModule<TParams, TIn, TOut, TEventData>\n{\n static override readonly configSchemas: string[] = [DivinerConfigSchema]\n static targetSchema: string\n\n override get queries(): string[] {\n return [DivinerDivineQuerySchema, ...super.queries]\n }\n\n protected override get _queryAccountPaths(): Record<DivinerQueryBase['schema'], string> {\n return {\n 'network.xyo.query.diviner.divine': '1/1',\n }\n }\n\n /** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */\n divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]> {\n this._noOverride('divine')\n return this.busy(async () => {\n const retryConfig = retryConfigIn ?? this.config.retry\n await this.started('throw')\n await this.emit('divineStart', { inPayloads: payloads, module: this })\n const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []\n await this.emit('divineStart', { inPayloads: payloads, module: this, outPayloads: resultPayloads })\n return resultPayloads\n })\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<DivinerQuery>(query, payloads)\n //remove the query payload\n const cleanPayloads = await PayloadHasher.filterExclude(payloads, query.query)\n const queryPayload = await wrapper.getQuery()\n assertEx(this.queryable(query, payloads, queryConfig))\n const resultPayloads: 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 resultPayloads\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":";;;;;;;;;AAAA,SAASA,gBAAgB;AAEzB,SAASC,aAAsC;AAC/C,SAASC,gCAAgC;AAEzC,SAEEC,qBACAC,gCAMK;AACP,SAASC,qBAAqB;AAC9B,SAASC,8BAA8B;AAIhC,IAAeC,mBAAf,MAAeA,yBAMZC,uBAAAA;EAMR,IAAaC,UAAoB;AAC/B,WAAO;MAACC;SAA6B,MAAMD;;EAC7C;EAEA,IAAuBE,qBAAiE;AACtF,WAAO;MACL,oCAAoC;IACtC;EACF;;EAGAC,OAAOC,UAAkBC,eAA0D;AACjF,SAAKC,YAAY,QAAA;AACjB,WAAO,KAAKC,KAAK,YAAA;AACf,YAAMC,cAAcH,iBAAiB,KAAKI,OAAOC;AACjD,YAAM,KAAKC,QAAQ,OAAA;AACnB,YAAM,KAAKC,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;MAAK,CAAA;AACpE,YAAMC,kBAAkBP,cAAc,MAAME,MAAM,MAAM,KAAKM,cAAcZ,QAAAA,GAAWI,WAAAA,IAAe,MAAM,KAAKQ,cAAcZ,QAAAA,MAAc,CAAA;AAC5I,YAAM,KAAKQ,KAAK,eAAe;QAAEC,YAAYT;QAAUU,QAAQ;QAAMG,aAAaF;MAAe,CAAA;AACjG,aAAOA;IACT,CAAA;EACF;;EAGA,MAAyBG,aACvBC,OACAf,UACAgB,aACmC;AACnC,UAAMC,UAAUC,yBAAyBC,WAAyBJ,OAAOf,QAAAA;AAEzE,UAAMoB,gBAAgB,MAAMC,cAAcC,cAActB,UAAUe,MAAMA,KAAK;AAC7E,UAAMQ,eAAe,MAAMN,QAAQO,SAAQ;AAC3CC,aAAS,KAAKC,UAAUX,OAAOf,UAAUgB,WAAAA,CAAAA;AACzC,UAAML,iBAA4B,CAAA;AAClC,YAAQY,aAAaI,QAAM;MACzB,KAAK9B,0BAA0B;AAC7Bc,uBAAeiB,KAAI,GAAK,MAAM,KAAK7B,OAAOqB,aAAAA,CAAAA;AAC1C;MACF;MACA,SAAS;AACP,eAAO,MAAMN,aAAaC,OAAOf,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;AAvDUhB;AAGR,cAToBD,kBASKmC,iBAA0B;EAACC;;AACpD,cAVoBpC,kBAUbqC;AAVF,IAAerC,kBAAf;","names":["assertEx","retry","QueryBoundWitnessWrapper","DivinerConfigSchema","DivinerDivineQuerySchema","PayloadHasher","AbstractModuleInstance","AbstractDiviner","AbstractModuleInstance","queries","DivinerDivineQuerySchema","_queryAccountPaths","divine","payloads","retryConfigIn","_noOverride","busy","retryConfig","config","retry","started","emit","inPayloads","module","resultPayloads","divineHandler","outPayloads","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","cleanPayloads","PayloadHasher","filterExclude","queryPayload","getQuery","assertEx","queryable","schema","push","configSchemas","DivinerConfigSchema","targetSchema"]}
|
package/package.json
CHANGED
|
@@ -10,15 +10,16 @@
|
|
|
10
10
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@xylabs/assert": "^2.13.
|
|
14
|
-
"@xylabs/promise": "^2.13.
|
|
15
|
-
"@
|
|
16
|
-
"@xyo-network/boundwitness-
|
|
17
|
-
"@xyo-network/
|
|
18
|
-
"@xyo-network/
|
|
19
|
-
"@xyo-network/
|
|
20
|
-
"@xyo-network/module-
|
|
21
|
-
"@xyo-network/
|
|
13
|
+
"@xylabs/assert": "^2.13.29",
|
|
14
|
+
"@xylabs/promise": "^2.13.29",
|
|
15
|
+
"@xylabs/retry": "^2.13.29",
|
|
16
|
+
"@xyo-network/boundwitness-builder": "~2.88.3",
|
|
17
|
+
"@xyo-network/boundwitness-model": "~2.88.3",
|
|
18
|
+
"@xyo-network/diviner-model": "~2.88.3",
|
|
19
|
+
"@xyo-network/hash": "~2.88.3",
|
|
20
|
+
"@xyo-network/module-abstract": "~2.88.3",
|
|
21
|
+
"@xyo-network/module-model": "~2.88.3",
|
|
22
|
+
"@xyo-network/payload-model": "~2.88.3"
|
|
22
23
|
},
|
|
23
24
|
"devDependencies": {
|
|
24
25
|
"@xylabs/ts-scripts-yarn3": "^3.2.42",
|
|
@@ -64,6 +65,6 @@
|
|
|
64
65
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
|
|
65
66
|
},
|
|
66
67
|
"sideEffects": false,
|
|
67
|
-
"version": "2.88.
|
|
68
|
+
"version": "2.88.3",
|
|
68
69
|
"type": "module"
|
|
69
70
|
}
|
package/src/AbstractDiviner.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert'
|
|
2
2
|
import { Promisable } from '@xylabs/promise'
|
|
3
|
+
import { retry, RetryConfigWithComplete } from '@xylabs/retry'
|
|
3
4
|
import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
|
|
4
5
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-model'
|
|
5
6
|
import {
|
|
@@ -40,12 +41,13 @@ export abstract class AbstractDiviner<
|
|
|
40
41
|
}
|
|
41
42
|
|
|
42
43
|
/** @function divine The main entry point for a diviner. Do not override this function. Implement/override divineHandler for custom functionality */
|
|
43
|
-
divine(payloads?: TIn[]): Promise<TOut[]> {
|
|
44
|
+
divine(payloads?: TIn[], retryConfigIn?: RetryConfigWithComplete): Promise<TOut[]> {
|
|
44
45
|
this._noOverride('divine')
|
|
45
46
|
return this.busy(async () => {
|
|
47
|
+
const retryConfig = retryConfigIn ?? this.config.retry
|
|
46
48
|
await this.started('throw')
|
|
47
49
|
await this.emit('divineStart', { inPayloads: payloads, module: this })
|
|
48
|
-
const resultPayloads = await this.divineHandler(payloads)
|
|
50
|
+
const resultPayloads = (retryConfig ? await retry(() => this.divineHandler(payloads), retryConfig) : await this.divineHandler(payloads)) ?? []
|
|
49
51
|
await this.emit('divineStart', { inPayloads: payloads, module: this, outPayloads: resultPayloads })
|
|
50
52
|
return resultPayloads
|
|
51
53
|
})
|