@xyo-network/node 2.53.1 → 2.53.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/cjs/AbstractNode.js +3 -3
- package/dist/cjs/AbstractNode.js.map +1 -1
- package/dist/cjs/NodeWrapper.js +2 -2
- package/dist/cjs/NodeWrapper.js.map +1 -1
- package/dist/docs.json +611 -620
- package/dist/esm/AbstractNode.js +4 -4
- package/dist/esm/AbstractNode.js.map +1 -1
- package/dist/esm/NodeWrapper.js +3 -3
- package/dist/esm/NodeWrapper.js.map +1 -1
- package/dist/types/AbstractNode.d.ts +3 -3
- package/dist/types/AbstractNode.d.ts.map +1 -1
- package/package.json +11 -11
- package/src/AbstractNode.ts +8 -8
- package/src/NodeWrapper.ts +3 -3
package/dist/esm/AbstractNode.js
CHANGED
|
@@ -3,7 +3,7 @@ import { Account } from '@xyo-network/account';
|
|
|
3
3
|
import { AddressSchema } from '@xyo-network/address-payload-plugin';
|
|
4
4
|
import { AbstractModule, CompositeModuleResolver, duplicateModules, QueryBoundWitnessWrapper, XyoErrorBuilder, } from '@xyo-network/module';
|
|
5
5
|
import { NodeConfigSchema, XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeRegisteredQuerySchema, } from '@xyo-network/node-model';
|
|
6
|
-
import {
|
|
6
|
+
import { PayloadBuilder } from '@xyo-network/payload-builder';
|
|
7
7
|
export class AbstractNode extends AbstractModule {
|
|
8
8
|
static configSchema = NodeConfigSchema;
|
|
9
9
|
privateResolver = new CompositeModuleResolver();
|
|
@@ -25,7 +25,7 @@ export class AbstractNode extends AbstractModule {
|
|
|
25
25
|
}
|
|
26
26
|
async discover() {
|
|
27
27
|
const childMods = await this.attachedModules();
|
|
28
|
-
const childModAddresses = childMods.map((mod) => new
|
|
28
|
+
const childModAddresses = childMods.map((mod) => new PayloadBuilder({ schema: AddressSchema }).fields({ address: mod.address, name: mod.config.name }).build());
|
|
29
29
|
return [...(await super.discover()), ...childModAddresses];
|
|
30
30
|
}
|
|
31
31
|
async query(query, payloads, queryConfig) {
|
|
@@ -47,7 +47,7 @@ export class AbstractNode extends AbstractModule {
|
|
|
47
47
|
case XyoNodeAttachedQuerySchema: {
|
|
48
48
|
const addresses = await this.attached();
|
|
49
49
|
for (const address of addresses) {
|
|
50
|
-
const payload = new
|
|
50
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build();
|
|
51
51
|
resultPayloads.push(payload);
|
|
52
52
|
}
|
|
53
53
|
break;
|
|
@@ -55,7 +55,7 @@ export class AbstractNode extends AbstractModule {
|
|
|
55
55
|
case XyoNodeRegisteredQuerySchema: {
|
|
56
56
|
const addresses = await this.registered();
|
|
57
57
|
for (const address of addresses) {
|
|
58
|
-
const payload = new
|
|
58
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build();
|
|
59
59
|
resultPayloads.push(payload);
|
|
60
60
|
}
|
|
61
61
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAkB,aAAa,EAAE,MAAM,qCAAqC,CAAA;AACnF,OAAO,EACL,cAAc,EACd,uBAAuB,EACvB,gBAAgB,EAKhB,wBAAwB,EACxB,eAAe,GAEhB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACL,gBAAgB,EAIhB,0BAA0B,EAC1B,wBAAwB,EACxB,wBAAwB,EAExB,4BAA4B,GAC7B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/NodeWrapper.js
CHANGED
|
@@ -3,7 +3,7 @@ import { AddressSchema } from '@xyo-network/address-payload-plugin';
|
|
|
3
3
|
import { ArchivistWrapper } from '@xyo-network/archivist-wrapper';
|
|
4
4
|
import { ModuleWrapper } from '@xyo-network/module';
|
|
5
5
|
import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeRegisteredQuerySchema, } from '@xyo-network/node-model';
|
|
6
|
-
import {
|
|
6
|
+
import { isPayloadOfSchemaType } from '@xyo-network/payload-model';
|
|
7
7
|
import { PayloadWrapper } from '@xyo-network/payload-wrapper';
|
|
8
8
|
export class NodeWrapper extends ModuleWrapper {
|
|
9
9
|
static requiredQueries = [XyoNodeAttachQuerySchema, ...ModuleWrapper.requiredQueries];
|
|
@@ -36,7 +36,7 @@ export class NodeWrapper extends ModuleWrapper {
|
|
|
36
36
|
}
|
|
37
37
|
async attached() {
|
|
38
38
|
const queryPayload = PayloadWrapper.parse({ schema: XyoNodeAttachedQuerySchema });
|
|
39
|
-
const payloads = (await this.sendQuery(queryPayload)).filter(
|
|
39
|
+
const payloads = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType(AddressSchema));
|
|
40
40
|
return payloads.map((p) => p.address);
|
|
41
41
|
}
|
|
42
42
|
async detach(address) {
|
|
@@ -45,7 +45,7 @@ export class NodeWrapper extends ModuleWrapper {
|
|
|
45
45
|
}
|
|
46
46
|
async registered() {
|
|
47
47
|
const queryPayload = PayloadWrapper.parse({ schema: XyoNodeRegisteredQuerySchema });
|
|
48
|
-
const payloads = (await this.sendQuery(queryPayload)).filter(
|
|
48
|
+
const payloads = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType(AddressSchema));
|
|
49
49
|
return payloads.map((p) => p.address);
|
|
50
50
|
}
|
|
51
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeWrapper.js","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAkB,aAAa,EAAE,MAAM,qCAAqC,CAAA;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,EAAU,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAGL,0BAA0B,EAE1B,wBAAwB,EAExB,wBAAwB,EAExB,4BAA4B,GAC7B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"NodeWrapper.js","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AbstractModule, CompositeModuleResolver, Module, ModuleConfig, ModuleFilter, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module';
|
|
2
2
|
import { NodeModule, NodeModuleEventData, NodeModuleParams } from '@xyo-network/node-model';
|
|
3
|
-
import {
|
|
3
|
+
import { Payload } from '@xyo-network/payload-model';
|
|
4
4
|
import { Promisable } from '@xyo-network/promise';
|
|
5
5
|
export declare abstract class AbstractNode<TParams extends NodeModuleParams = NodeModuleParams, TEventData extends NodeModuleEventData = NodeModuleEventData> extends AbstractModule<TParams, TEventData> implements NodeModule<TParams, TEventData>, Module<TParams, TEventData> {
|
|
6
6
|
static readonly configSchema: "network.xyo.node.config";
|
|
@@ -11,8 +11,8 @@ export declare abstract class AbstractNode<TParams extends NodeModuleParams = No
|
|
|
11
11
|
static isNode(module: unknown): boolean;
|
|
12
12
|
attached(): Promise<string[]>;
|
|
13
13
|
attachedModules(): Promise<Module[]>;
|
|
14
|
-
discover(): Promise<
|
|
15
|
-
query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?:
|
|
14
|
+
discover(): Promise<Payload[]>;
|
|
15
|
+
query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
|
|
16
16
|
register(_module: Module): Promisable<this>;
|
|
17
17
|
registered(): Promisable<string[]>;
|
|
18
18
|
registeredModules(): Promisable<Module[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractNode.d.ts","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,uBAAuB,EAEvB,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAEL,UAAU,EACV,mBAAmB,EACnB,gBAAgB,EAMjB,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AbstractNode.d.ts","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,uBAAuB,EAEvB,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAEL,UAAU,EACV,mBAAmB,EACnB,gBAAgB,EAMjB,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,8BAAsB,YAAY,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EAAE,UAAU,SAAS,mBAAmB,GAAG,mBAAmB,CAClJ,SAAQ,cAAc,CAAC,OAAO,EAAE,UAAU,CAC1C,YAAW,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;IAEvE,gBAAyB,YAAY,4BAAmB;IAExD,SAAS,CAAC,QAAQ,CAAC,eAAe,0BAAgC;IAElE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAO;IAE9B,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO;IAIvB,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI7B,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI3B,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAS9B,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EACrH,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;IA0C7B,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC;IAI3C,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;IAIlC,iBAAiB,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;IAIzC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC;cAIpB,OAAO,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAI5G,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC;IACtE,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC;CACnD"}
|
package/package.json
CHANGED
|
@@ -13,16 +13,16 @@
|
|
|
13
13
|
"@xylabs/assert": "^2.7.4",
|
|
14
14
|
"@xylabs/exists": "^2.7.4",
|
|
15
15
|
"@xylabs/promise": "^2.7.4",
|
|
16
|
-
"@xyo-network/account": "^2.53.
|
|
17
|
-
"@xyo-network/account-model": "^2.53.
|
|
18
|
-
"@xyo-network/address-payload-plugin": "^2.53.
|
|
19
|
-
"@xyo-network/archivist-wrapper": "^2.53.
|
|
20
|
-
"@xyo-network/module": "^2.53.
|
|
21
|
-
"@xyo-network/node-model": "^2.53.
|
|
22
|
-
"@xyo-network/payload-builder": "^2.53.
|
|
23
|
-
"@xyo-network/payload-model": "^2.53.
|
|
24
|
-
"@xyo-network/payload-wrapper": "^2.53.
|
|
25
|
-
"@xyo-network/promise": "^2.53.
|
|
16
|
+
"@xyo-network/account": "^2.53.3",
|
|
17
|
+
"@xyo-network/account-model": "^2.53.3",
|
|
18
|
+
"@xyo-network/address-payload-plugin": "^2.53.3",
|
|
19
|
+
"@xyo-network/archivist-wrapper": "^2.53.3",
|
|
20
|
+
"@xyo-network/module": "^2.53.3",
|
|
21
|
+
"@xyo-network/node-model": "^2.53.3",
|
|
22
|
+
"@xyo-network/payload-builder": "^2.53.3",
|
|
23
|
+
"@xyo-network/payload-model": "^2.53.3",
|
|
24
|
+
"@xyo-network/payload-wrapper": "^2.53.3",
|
|
25
|
+
"@xyo-network/promise": "^2.53.3",
|
|
26
26
|
"lodash": "^4.17.21"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
@@ -64,5 +64,5 @@
|
|
|
64
64
|
},
|
|
65
65
|
"sideEffects": false,
|
|
66
66
|
"types": "dist/types/index.d.ts",
|
|
67
|
-
"version": "2.53.
|
|
67
|
+
"version": "2.53.3"
|
|
68
68
|
}
|
package/src/AbstractNode.ts
CHANGED
|
@@ -24,8 +24,8 @@ import {
|
|
|
24
24
|
XyoNodeQuery,
|
|
25
25
|
XyoNodeRegisteredQuerySchema,
|
|
26
26
|
} from '@xyo-network/node-model'
|
|
27
|
-
import {
|
|
28
|
-
import {
|
|
27
|
+
import { PayloadBuilder } from '@xyo-network/payload-builder'
|
|
28
|
+
import { Payload } from '@xyo-network/payload-model'
|
|
29
29
|
import { Promisable } from '@xyo-network/promise'
|
|
30
30
|
|
|
31
31
|
export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModuleParams, TEventData extends NodeModuleEventData = NodeModuleEventData>
|
|
@@ -58,10 +58,10 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
58
58
|
return await (this.privateResolver.resolve() ?? [])
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
override async discover(): Promise<
|
|
61
|
+
override async discover(): Promise<Payload[]> {
|
|
62
62
|
const childMods = await this.attachedModules()
|
|
63
63
|
const childModAddresses = childMods.map((mod) =>
|
|
64
|
-
new
|
|
64
|
+
new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address: mod.address, name: mod.config.name }).build(),
|
|
65
65
|
)
|
|
66
66
|
|
|
67
67
|
return [...(await super.discover()), ...childModAddresses]
|
|
@@ -69,14 +69,14 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
69
69
|
|
|
70
70
|
override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
|
|
71
71
|
query: T,
|
|
72
|
-
payloads?:
|
|
72
|
+
payloads?: Payload[],
|
|
73
73
|
queryConfig?: TConfig,
|
|
74
74
|
): Promise<ModuleQueryResult> {
|
|
75
75
|
const wrapper = QueryBoundWitnessWrapper.parseQuery<XyoNodeQuery>(query, payloads)
|
|
76
76
|
const typedQuery = wrapper.query.payload
|
|
77
77
|
assertEx(this.queryable(query, payloads, queryConfig))
|
|
78
78
|
const queryAccount = new Account()
|
|
79
|
-
const resultPayloads:
|
|
79
|
+
const resultPayloads: Payload[] = []
|
|
80
80
|
try {
|
|
81
81
|
switch (typedQuery.schema) {
|
|
82
82
|
case XyoNodeAttachQuerySchema: {
|
|
@@ -90,7 +90,7 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
90
90
|
case XyoNodeAttachedQuerySchema: {
|
|
91
91
|
const addresses = await this.attached()
|
|
92
92
|
for (const address of addresses) {
|
|
93
|
-
const payload = new
|
|
93
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
|
|
94
94
|
resultPayloads.push(payload)
|
|
95
95
|
}
|
|
96
96
|
break
|
|
@@ -98,7 +98,7 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
98
98
|
case XyoNodeRegisteredQuerySchema: {
|
|
99
99
|
const addresses = await this.registered()
|
|
100
100
|
for (const address of addresses) {
|
|
101
|
-
const payload = new
|
|
101
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
|
|
102
102
|
resultPayloads.push(payload)
|
|
103
103
|
}
|
|
104
104
|
break
|
package/src/NodeWrapper.ts
CHANGED
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
XyoNodeRegisteredQuery,
|
|
15
15
|
XyoNodeRegisteredQuerySchema,
|
|
16
16
|
} from '@xyo-network/node-model'
|
|
17
|
-
import {
|
|
17
|
+
import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
|
|
18
18
|
import { PayloadWrapper } from '@xyo-network/payload-wrapper'
|
|
19
19
|
|
|
20
20
|
export class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends ModuleWrapper<TWrappedModule> {
|
|
@@ -54,7 +54,7 @@ export class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends
|
|
|
54
54
|
|
|
55
55
|
async attached(): Promise<string[]> {
|
|
56
56
|
const queryPayload = PayloadWrapper.parse<XyoNodeAttachedQuery>({ schema: XyoNodeAttachedQuerySchema })
|
|
57
|
-
const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(
|
|
57
|
+
const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType<AddressPayload>(AddressSchema))
|
|
58
58
|
return payloads.map((p) => p.address)
|
|
59
59
|
}
|
|
60
60
|
|
|
@@ -65,7 +65,7 @@ export class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends
|
|
|
65
65
|
|
|
66
66
|
async registered(): Promise<string[]> {
|
|
67
67
|
const queryPayload = PayloadWrapper.parse<XyoNodeRegisteredQuery>({ schema: XyoNodeRegisteredQuerySchema })
|
|
68
|
-
const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(
|
|
68
|
+
const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType<AddressPayload>(AddressSchema))
|
|
69
69
|
return payloads.map((p) => p.address)
|
|
70
70
|
}
|
|
71
71
|
}
|