@xyo-network/node 2.67.0-rc.1 → 2.67.0-rc.2
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 +5 -35
- package/dist/cjs/AbstractNode.js.map +1 -1
- package/dist/cjs/MemoryNode.js +0 -3
- package/dist/cjs/MemoryNode.js.map +1 -1
- package/dist/esm/AbstractNode.js +7 -26
- package/dist/esm/AbstractNode.js.map +1 -1
- package/dist/esm/MemoryNode.js +0 -3
- package/dist/esm/MemoryNode.js.map +1 -1
- package/dist/types/AbstractNode.d.ts +7 -11
- package/dist/types/AbstractNode.d.ts.map +1 -1
- package/dist/types/MemoryNode.d.ts +4 -6
- package/dist/types/MemoryNode.d.ts.map +1 -1
- package/package.json +14 -15
- package/src/AbstractNode.ts +29 -45
- package/src/MemoryNode.ts +8 -13
package/dist/cjs/AbstractNode.js
CHANGED
|
@@ -8,12 +8,11 @@ const address_payload_plugin_1 = require("@xyo-network/address-payload-plugin");
|
|
|
8
8
|
const boundwitness_builder_1 = require("@xyo-network/boundwitness-builder");
|
|
9
9
|
const error_1 = require("@xyo-network/error");
|
|
10
10
|
const manifest_model_1 = require("@xyo-network/manifest-model");
|
|
11
|
-
const module_1 = require("@xyo-network/module");
|
|
12
11
|
const module_abstract_1 = require("@xyo-network/module-abstract");
|
|
13
12
|
const module_model_1 = require("@xyo-network/module-model");
|
|
14
13
|
const node_model_1 = require("@xyo-network/node-model");
|
|
15
14
|
const payload_builder_1 = require("@xyo-network/payload-builder");
|
|
16
|
-
class AbstractNode extends module_abstract_1.
|
|
15
|
+
class AbstractNode extends module_abstract_1.AbstractModuleInstance {
|
|
17
16
|
constructor() {
|
|
18
17
|
super(...arguments);
|
|
19
18
|
this.privateResolver = new module_abstract_1.CompositeModuleResolver();
|
|
@@ -44,43 +43,14 @@ class AbstractNode extends module_abstract_1.AbstractIndirectModule {
|
|
|
44
43
|
attachedModules() {
|
|
45
44
|
var _a;
|
|
46
45
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
47
|
-
return (yield ((_a = this.
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
|
-
describe() {
|
|
51
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
52
|
-
yield this.started('throw');
|
|
53
|
-
return yield this.describeHandler();
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
discover() {
|
|
57
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
58
|
-
yield this.started('throw');
|
|
59
|
-
return yield this.discoverHandler();
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
loadAccount() {
|
|
63
|
-
const _super = Object.create(null, {
|
|
64
|
-
loadAccount: { get: () => super.loadAccount }
|
|
65
|
-
});
|
|
66
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
67
|
-
const account = yield _super.loadAccount.call(this);
|
|
68
|
-
this.downResolver.add(this);
|
|
69
|
-
return account;
|
|
46
|
+
return (yield ((_a = this.resolve()) !== null && _a !== void 0 ? _a : [])).filter((module) => module.address !== this.address);
|
|
70
47
|
});
|
|
71
48
|
}
|
|
72
49
|
manifest() {
|
|
73
50
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
74
|
-
yield this.started('throw');
|
|
75
51
|
return yield this.manifestHandler();
|
|
76
52
|
});
|
|
77
53
|
}
|
|
78
|
-
moduleAddress() {
|
|
79
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
80
|
-
yield this.started('throw');
|
|
81
|
-
return yield this.moduleAddressHandler();
|
|
82
|
-
});
|
|
83
|
-
}
|
|
84
54
|
register(_module) {
|
|
85
55
|
throw new Error('Method not implemented.');
|
|
86
56
|
}
|
|
@@ -146,7 +116,7 @@ class AbstractNode extends module_abstract_1.AbstractIndirectModule {
|
|
|
146
116
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
147
117
|
const manifest = Object.assign(Object.assign({}, (yield _super.manifestHandler.call(this))), { schema: manifest_model_1.NodeManifestPayloadSchema });
|
|
148
118
|
const notThisModule = (module) => module.address !== this.address;
|
|
149
|
-
const toManifest = (module) =>
|
|
119
|
+
const toManifest = (module) => module.manifest();
|
|
150
120
|
const privateModulesList = yield this.privateResolver.resolve();
|
|
151
121
|
const privateModules = yield Promise.all((yield this.privateResolver.resolve()).filter(notThisModule).map(toManifest));
|
|
152
122
|
console.log(`manifestHandler:privateModules:${privateModulesList.length}`);
|
|
@@ -154,8 +124,8 @@ class AbstractNode extends module_abstract_1.AbstractIndirectModule {
|
|
|
154
124
|
manifest.modules = (_a = manifest.modules) !== null && _a !== void 0 ? _a : {};
|
|
155
125
|
manifest.modules.private = privateModules;
|
|
156
126
|
}
|
|
157
|
-
const publicModulesList = yield this.
|
|
158
|
-
const publicModules = yield Promise.all((yield this.
|
|
127
|
+
const publicModulesList = yield this.resolve();
|
|
128
|
+
const publicModules = yield Promise.all((yield this.resolve()).filter(notThisModule).map(toManifest));
|
|
159
129
|
console.log(`manifestHandler:publicModules:${publicModulesList.length}`);
|
|
160
130
|
if (publicModules.length > 0) {
|
|
161
131
|
manifest.modules = (_b = manifest.modules) !== null && _b !== void 0 ? _b : {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAA8C;AAC9C,gFAAmF;AACnF,4EAA+F;AAC/F,8CAAqD;AACrD,gEAA4F;AAC5F,
|
|
1
|
+
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/MemoryNode.js
CHANGED
|
@@ -44,9 +44,6 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
|
|
|
44
44
|
return value;
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
|
-
subscribe(_queryAccount) {
|
|
48
|
-
return super.subscribeHandler();
|
|
49
|
-
}
|
|
50
47
|
unregister(module) {
|
|
51
48
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
52
49
|
yield this.started('throw');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;
|
|
1
|
+
{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/AbstractNode.js
CHANGED
|
@@ -4,12 +4,11 @@ import { AddressSchema } from '@xyo-network/address-payload-plugin';
|
|
|
4
4
|
import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder';
|
|
5
5
|
import { handleErrorAsync } from '@xyo-network/error';
|
|
6
6
|
import { NodeManifestPayloadSchema } from '@xyo-network/manifest-model';
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import { duplicateModules, isModuleInstance, } from '@xyo-network/module-model';
|
|
7
|
+
import { AbstractModuleInstance, CompositeModuleResolver, ModuleErrorBuilder } from '@xyo-network/module-abstract';
|
|
8
|
+
import { duplicateModules, } from '@xyo-network/module-model';
|
|
10
9
|
import { NodeAttachedQuerySchema, NodeAttachQuerySchema, NodeConfigSchema, NodeDetachQuerySchema, NodeRegisteredQuerySchema, } from '@xyo-network/node-model';
|
|
11
10
|
import { PayloadBuilder } from '@xyo-network/payload-builder';
|
|
12
|
-
export class AbstractNode extends
|
|
11
|
+
export class AbstractNode extends AbstractModuleInstance {
|
|
13
12
|
static configSchemas = [NodeConfigSchema];
|
|
14
13
|
privateResolver = new CompositeModuleResolver();
|
|
15
14
|
isNode = true;
|
|
@@ -34,29 +33,11 @@ export class AbstractNode extends AbstractIndirectModule {
|
|
|
34
33
|
return (await this.attachedModules()).map((module) => module.address);
|
|
35
34
|
}
|
|
36
35
|
async attachedModules() {
|
|
37
|
-
return (await (this.
|
|
38
|
-
}
|
|
39
|
-
async describe() {
|
|
40
|
-
await this.started('throw');
|
|
41
|
-
return await this.describeHandler();
|
|
42
|
-
}
|
|
43
|
-
async discover() {
|
|
44
|
-
await this.started('throw');
|
|
45
|
-
return await this.discoverHandler();
|
|
46
|
-
}
|
|
47
|
-
async loadAccount() {
|
|
48
|
-
const account = await super.loadAccount();
|
|
49
|
-
this.downResolver.add(this);
|
|
50
|
-
return account;
|
|
36
|
+
return (await (this.resolve() ?? [])).filter((module) => module.address !== this.address);
|
|
51
37
|
}
|
|
52
38
|
async manifest() {
|
|
53
|
-
await this.started('throw');
|
|
54
39
|
return await this.manifestHandler();
|
|
55
40
|
}
|
|
56
|
-
async moduleAddress() {
|
|
57
|
-
await this.started('throw');
|
|
58
|
-
return await this.moduleAddressHandler();
|
|
59
|
-
}
|
|
60
41
|
register(_module) {
|
|
61
42
|
throw new Error('Method not implemented.');
|
|
62
43
|
}
|
|
@@ -107,7 +88,7 @@ export class AbstractNode extends AbstractIndirectModule {
|
|
|
107
88
|
async manifestHandler() {
|
|
108
89
|
const manifest = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema };
|
|
109
90
|
const notThisModule = (module) => module.address !== this.address;
|
|
110
|
-
const toManifest = (module) =>
|
|
91
|
+
const toManifest = (module) => module.manifest();
|
|
111
92
|
const privateModulesList = await this.privateResolver.resolve();
|
|
112
93
|
const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest));
|
|
113
94
|
console.log(`manifestHandler:privateModules:${privateModulesList.length}`);
|
|
@@ -115,8 +96,8 @@ export class AbstractNode extends AbstractIndirectModule {
|
|
|
115
96
|
manifest.modules = manifest.modules ?? {};
|
|
116
97
|
manifest.modules.private = privateModules;
|
|
117
98
|
}
|
|
118
|
-
const publicModulesList = await this.
|
|
119
|
-
const publicModules = await Promise.all((await this.
|
|
99
|
+
const publicModulesList = await this.resolve();
|
|
100
|
+
const publicModules = await Promise.all((await this.resolve()).filter(notThisModule).map(toManifest));
|
|
120
101
|
console.log(`manifestHandler:publicModules:${publicModulesList.length}`);
|
|
121
102
|
if (publicModules.length > 0) {
|
|
122
103
|
manifest.modules = manifest.modules ?? {};
|
|
@@ -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,EAAqB,wBAAwB,EAAE,MAAM,mCAAmC,CAAA;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAuB,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAC5F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/MemoryNode.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-builder';
|
|
2
2
|
import { NodeManifestPayload } from '@xyo-network/manifest-model';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { AbstractModuleInstance, CompositeModuleResolver } from '@xyo-network/module-abstract';
|
|
4
|
+
import { Module, ModuleConfig, ModuleFilter, ModuleFilterOptions, ModuleInstance, ModuleQueryResult } from '@xyo-network/module-model';
|
|
5
5
|
import { NodeModule, NodeModuleEventData, NodeModuleParams, NodeQueryBase } from '@xyo-network/node-model';
|
|
6
6
|
import { Payload } from '@xyo-network/payload-model';
|
|
7
7
|
import { Promisable } from '@xyo-network/promise';
|
|
8
|
-
export declare abstract class AbstractNode<TParams extends NodeModuleParams = NodeModuleParams, TEventData extends NodeModuleEventData = NodeModuleEventData> extends
|
|
8
|
+
export declare abstract class AbstractNode<TParams extends NodeModuleParams = NodeModuleParams, TEventData extends NodeModuleEventData = NodeModuleEventData> extends AbstractModuleInstance<TParams, TEventData> implements NodeModule<TParams, TEventData>, Module<TParams, TEventData> {
|
|
9
9
|
static readonly configSchemas: string[];
|
|
10
10
|
protected readonly privateResolver: CompositeModuleResolver;
|
|
11
11
|
private readonly isNode;
|
|
@@ -15,17 +15,13 @@ export declare abstract class AbstractNode<TParams extends NodeModuleParams = No
|
|
|
15
15
|
static isNode(module: unknown): boolean;
|
|
16
16
|
attached(): Promise<string[]>;
|
|
17
17
|
attachedModules(): Promise<Module[]>;
|
|
18
|
-
describe(): Promise<ModuleDescriptionPayload>;
|
|
19
|
-
discover(): Promise<Payload[]>;
|
|
20
|
-
loadAccount(): Promise<import("@xyo-network/account-model").AccountInstance>;
|
|
21
18
|
manifest(): Promise<NodeManifestPayload>;
|
|
22
|
-
|
|
23
|
-
register(_module: Module): Promisable<void>;
|
|
19
|
+
register(_module: ModuleInstance): Promisable<void>;
|
|
24
20
|
registered(): Promisable<string[]>;
|
|
25
21
|
registeredModules(): Promisable<Module[]>;
|
|
26
|
-
resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<
|
|
27
|
-
resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<
|
|
28
|
-
unregister(_module:
|
|
22
|
+
resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>;
|
|
23
|
+
resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>;
|
|
24
|
+
unregister(_module: ModuleInstance): Promisable<this>;
|
|
29
25
|
protected discoverHandler(): Promise<Payload[]>;
|
|
30
26
|
protected manifestHandler(): Promise<NodeManifestPayload>;
|
|
31
27
|
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractNode.d.ts","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAA4B,MAAM,mCAAmC,CAAA;AAE/F,OAAO,EAAE,mBAAmB,EAA6B,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"AbstractNode.d.ts","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAA4B,MAAM,mCAAmC,CAAA;AAE/F,OAAO,EAAE,mBAAmB,EAA6B,MAAM,6BAA6B,CAAA;AAC5F,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAsB,MAAM,8BAA8B,CAAA;AAClH,OAAO,EAEL,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EAClB,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAKL,UAAU,EACV,mBAAmB,EACnB,gBAAgB,EAEhB,aAAa,EAEd,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAe,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,8BAAsB,YAAY,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EAAE,UAAU,SAAS,mBAAmB,GAAG,mBAAmB,CAClJ,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;IAEvE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAqB;IAErE,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,cAAuB,kBAAkB,IAAI,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAOnF;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,mBAAmB,CAAC;IAIvD,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;IAInD,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;IAIlC,iBAAiB,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;IAI1B,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IACxF,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAkCjH,UAAU,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;cAI5B,eAAe,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cASrC,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC;cAyB/C,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,iBAAiB,CAAC;YA2Df,UAAU;YAkBV,cAAc;IAkB5B,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1F,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;CACvE"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { AnyConfigSchema, Module } from '@xyo-network/module';
|
|
1
|
+
import { AnyConfigSchema, ModuleInstance } from '@xyo-network/module';
|
|
3
2
|
import { NodeConfig, NodeInstance, NodeModuleEventData, NodeModuleParams } from '@xyo-network/node-model';
|
|
4
3
|
import { AbstractNode } from './AbstractNode';
|
|
5
4
|
export type MemoryNodeParams = NodeModuleParams<AnyConfigSchema<NodeConfig>>;
|
|
@@ -8,11 +7,10 @@ export declare class MemoryNode<TParams extends MemoryNodeParams = MemoryNodePar
|
|
|
8
7
|
private registeredModuleMap;
|
|
9
8
|
attach(nameOrAddress: string, external?: boolean): Promise<string | undefined>;
|
|
10
9
|
detach(nameOrAddress: string): Promise<string | undefined>;
|
|
11
|
-
register(module:
|
|
10
|
+
register(module: ModuleInstance): Promise<void>;
|
|
12
11
|
registered(): string[];
|
|
13
|
-
registeredModules():
|
|
14
|
-
|
|
15
|
-
unregister(module: Module): Promise<this>;
|
|
12
|
+
registeredModules(): ModuleInstance[];
|
|
13
|
+
unregister(module: ModuleInstance): Promise<this>;
|
|
16
14
|
protected startHandler(): Promise<boolean>;
|
|
17
15
|
private attachUsingAddress;
|
|
18
16
|
private attachUsingName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAkD,cAAc,EAAkB,MAAM,qBAAqB,CAAA;AACrI,OAAO,EAAgB,UAAU,EAAoB,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAGzI,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAA;AAE5E,qBAAa,UAAU,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EAAE,UAAU,SAAS,mBAAmB,GAAG,mBAAmB,CACvI,SAAQ,YAAY,CAAC,OAAO,EAAE,UAAU,CACxC,YAAW,YAAY;IAEvB,OAAgB,aAAa,8BAAqB;IAElD,OAAO,CAAC,mBAAmB,CAAqC;IAEjD,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO;IAKhD,MAAM,CAAC,aAAa,EAAE,MAAM;IAK5B,QAAQ,CAAC,MAAM,EAAE,cAAc;IAQrC,UAAU;IAMV,iBAAiB;IAMX,UAAU,CAAC,MAAM,EAAE,cAAc;cAS7B,YAAY;YAIjB,kBAAkB;YAiFlB,eAAe;YAOf,kBAAkB;YA8ClB,eAAe;IAQ7B,OAAO,CAAC,qBAAqB;CAM9B"}
|
package/package.json
CHANGED
|
@@ -11,20 +11,19 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@xylabs/assert": "^2.9.3",
|
|
14
|
-
"@xyo-network/account": "~2.67.0-rc.
|
|
15
|
-
"@xyo-network/
|
|
16
|
-
"@xyo-network/
|
|
17
|
-
"@xyo-network/
|
|
18
|
-
"@xyo-network/
|
|
19
|
-
"@xyo-network/
|
|
20
|
-
"@xyo-network/module": "~2.67.0-rc.
|
|
21
|
-
"@xyo-network/module-
|
|
22
|
-
"@xyo-network/
|
|
23
|
-
"@xyo-network/node-
|
|
24
|
-
"@xyo-network/
|
|
25
|
-
"@xyo-network/payload-
|
|
26
|
-
"@xyo-network/
|
|
27
|
-
"@xyo-network/promise": "~2.67.0-rc.1",
|
|
14
|
+
"@xyo-network/account": "~2.67.0-rc.2",
|
|
15
|
+
"@xyo-network/address-payload-plugin": "~2.67.0-rc.2",
|
|
16
|
+
"@xyo-network/boundwitness-builder": "~2.67.0-rc.2",
|
|
17
|
+
"@xyo-network/error": "~2.67.0-rc.2",
|
|
18
|
+
"@xyo-network/manifest-model": "~2.67.0-rc.2",
|
|
19
|
+
"@xyo-network/module": "~2.67.0-rc.2",
|
|
20
|
+
"@xyo-network/module-abstract": "~2.67.0-rc.2",
|
|
21
|
+
"@xyo-network/module-model": "~2.67.0-rc.2",
|
|
22
|
+
"@xyo-network/node-model": "~2.67.0-rc.2",
|
|
23
|
+
"@xyo-network/node-wrapper": "~2.67.0-rc.2",
|
|
24
|
+
"@xyo-network/payload-builder": "~2.67.0-rc.2",
|
|
25
|
+
"@xyo-network/payload-model": "~2.67.0-rc.2",
|
|
26
|
+
"@xyo-network/promise": "~2.67.0-rc.2",
|
|
28
27
|
"lodash": "^4.17.21"
|
|
29
28
|
},
|
|
30
29
|
"devDependencies": {
|
|
@@ -66,6 +65,6 @@
|
|
|
66
65
|
},
|
|
67
66
|
"sideEffects": false,
|
|
68
67
|
"types": "dist/types/index.d.ts",
|
|
69
|
-
"version": "2.67.0-rc.
|
|
68
|
+
"version": "2.67.0-rc.2",
|
|
70
69
|
"stableVersion": "2.66.9"
|
|
71
70
|
}
|
package/src/AbstractNode.ts
CHANGED
|
@@ -4,17 +4,14 @@ import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plug
|
|
|
4
4
|
import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
|
|
5
5
|
import { handleErrorAsync } from '@xyo-network/error'
|
|
6
6
|
import { NodeManifestPayload, NodeManifestPayloadSchema } from '@xyo-network/manifest-model'
|
|
7
|
-
import {
|
|
8
|
-
import { AbstractIndirectModule, CompositeModuleResolver, ModuleErrorBuilder } from '@xyo-network/module-abstract'
|
|
7
|
+
import { AbstractModuleInstance, CompositeModuleResolver, ModuleErrorBuilder } from '@xyo-network/module-abstract'
|
|
9
8
|
import {
|
|
10
|
-
AddressPreviousHashPayload,
|
|
11
9
|
duplicateModules,
|
|
12
|
-
isModuleInstance,
|
|
13
10
|
Module,
|
|
14
11
|
ModuleConfig,
|
|
15
|
-
ModuleDescriptionPayload,
|
|
16
12
|
ModuleFilter,
|
|
17
13
|
ModuleFilterOptions,
|
|
14
|
+
ModuleInstance,
|
|
18
15
|
ModuleQueryResult,
|
|
19
16
|
} from '@xyo-network/module-model'
|
|
20
17
|
import {
|
|
@@ -34,7 +31,7 @@ import { ModuleError, Payload } from '@xyo-network/payload-model'
|
|
|
34
31
|
import { Promisable } from '@xyo-network/promise'
|
|
35
32
|
|
|
36
33
|
export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModuleParams, TEventData extends NodeModuleEventData = NodeModuleEventData>
|
|
37
|
-
extends
|
|
34
|
+
extends AbstractModuleInstance<TParams, TEventData>
|
|
38
35
|
implements NodeModule<TParams, TEventData>, Module<TParams, TEventData>
|
|
39
36
|
{
|
|
40
37
|
static override readonly configSchemas: string[] = [NodeConfigSchema]
|
|
@@ -69,36 +66,14 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
69
66
|
}
|
|
70
67
|
|
|
71
68
|
async attachedModules(): Promise<Module[]> {
|
|
72
|
-
return (await (this.
|
|
69
|
+
return (await (this.resolve() ?? [])).filter((module) => module.address !== this.address)
|
|
73
70
|
}
|
|
74
71
|
|
|
75
|
-
async
|
|
76
|
-
await this.started('throw')
|
|
77
|
-
return await this.describeHandler()
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
async discover(): Promise<Payload[]> {
|
|
81
|
-
await this.started('throw')
|
|
82
|
-
return await this.discoverHandler()
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
override async loadAccount() {
|
|
86
|
-
const account = await super.loadAccount()
|
|
87
|
-
this.downResolver.add(this)
|
|
88
|
-
return account
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
async manifest(): Promise<NodeManifestPayload> {
|
|
92
|
-
await this.started('throw')
|
|
72
|
+
override async manifest(): Promise<NodeManifestPayload> {
|
|
93
73
|
return await this.manifestHandler()
|
|
94
74
|
}
|
|
95
75
|
|
|
96
|
-
|
|
97
|
-
await this.started('throw')
|
|
98
|
-
return await this.moduleAddressHandler()
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
register(_module: Module): Promisable<void> {
|
|
76
|
+
register(_module: ModuleInstance): Promisable<void> {
|
|
102
77
|
throw new Error('Method not implemented.')
|
|
103
78
|
}
|
|
104
79
|
|
|
@@ -110,9 +85,12 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
110
85
|
throw new Error('Method not implemented.')
|
|
111
86
|
}
|
|
112
87
|
|
|
113
|
-
override async resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<
|
|
114
|
-
override async resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<
|
|
115
|
-
override async resolve(
|
|
88
|
+
override async resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>
|
|
89
|
+
override async resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>
|
|
90
|
+
override async resolve(
|
|
91
|
+
nameOrAddressOrFilter?: ModuleFilter | string,
|
|
92
|
+
options?: ModuleFilterOptions,
|
|
93
|
+
): Promise<ModuleInstance | ModuleInstance[] | undefined> {
|
|
116
94
|
//checking type of nameOrAddressOrFilter before calling other functions since TS seems
|
|
117
95
|
//to need help here narrowing before the call
|
|
118
96
|
if (typeof nameOrAddressOrFilter === 'string') {
|
|
@@ -142,7 +120,7 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
142
120
|
}
|
|
143
121
|
}
|
|
144
122
|
|
|
145
|
-
unregister(_module:
|
|
123
|
+
unregister(_module: ModuleInstance): Promisable<this> {
|
|
146
124
|
throw new Error('Method not implemented.')
|
|
147
125
|
}
|
|
148
126
|
|
|
@@ -158,8 +136,8 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
158
136
|
protected override async manifestHandler(): Promise<NodeManifestPayload> {
|
|
159
137
|
const manifest: NodeManifestPayload = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema }
|
|
160
138
|
|
|
161
|
-
const notThisModule = (module:
|
|
162
|
-
const toManifest = (module:
|
|
139
|
+
const notThisModule = (module: ModuleInstance) => module.address !== this.address
|
|
140
|
+
const toManifest = (module: ModuleInstance) => module.manifest()
|
|
163
141
|
|
|
164
142
|
const privateModulesList = await this.privateResolver.resolve()
|
|
165
143
|
const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest))
|
|
@@ -169,8 +147,8 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
169
147
|
manifest.modules.private = privateModules
|
|
170
148
|
}
|
|
171
149
|
|
|
172
|
-
const publicModulesList = await this.
|
|
173
|
-
const publicModules = await Promise.all((await this.
|
|
150
|
+
const publicModulesList = await this.resolve()
|
|
151
|
+
const publicModules = await Promise.all((await this.resolve()).filter(notThisModule).map(toManifest))
|
|
174
152
|
console.log(`manifestHandler:publicModules:${publicModulesList.length}`)
|
|
175
153
|
if (publicModules.length > 0) {
|
|
176
154
|
manifest.modules = manifest.modules ?? {}
|
|
@@ -243,9 +221,12 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
243
221
|
return (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0]
|
|
244
222
|
}
|
|
245
223
|
|
|
246
|
-
private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<
|
|
247
|
-
private async resolveAll(nameOrAddress: string, options?: ModuleFilterOptions): Promise<
|
|
248
|
-
private async resolveAll(
|
|
224
|
+
private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>
|
|
225
|
+
private async resolveAll(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>
|
|
226
|
+
private async resolveAll(
|
|
227
|
+
nameOrAddressOrFilter?: ModuleFilter | string,
|
|
228
|
+
options?: ModuleFilterOptions,
|
|
229
|
+
): Promise<ModuleInstance | ModuleInstance[] | undefined> {
|
|
249
230
|
switch (typeof nameOrAddressOrFilter) {
|
|
250
231
|
case 'string': {
|
|
251
232
|
return (await this.resolvePrivate(nameOrAddressOrFilter, options)) ?? (await super.resolve(nameOrAddressOrFilter, options))
|
|
@@ -258,9 +239,12 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
258
239
|
}
|
|
259
240
|
}
|
|
260
241
|
|
|
261
|
-
private async resolvePrivate(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<
|
|
262
|
-
private async resolvePrivate(nameOrAddress: string, options?: ModuleFilterOptions): Promise<
|
|
263
|
-
private async resolvePrivate(
|
|
242
|
+
private async resolvePrivate(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>
|
|
243
|
+
private async resolvePrivate(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>
|
|
244
|
+
private async resolvePrivate(
|
|
245
|
+
nameOrAddressOrFilter?: ModuleFilter | string,
|
|
246
|
+
options?: ModuleFilterOptions,
|
|
247
|
+
): Promise<ModuleInstance | ModuleInstance[] | undefined> {
|
|
264
248
|
const direction = options?.direction ?? 'all'
|
|
265
249
|
const down = direction === 'down' || direction === 'all'
|
|
266
250
|
switch (typeof nameOrAddressOrFilter) {
|
package/src/MemoryNode.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert'
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { isNodeModule, NodeConfig, NodeConfigSchema, NodeInstance, NodeModule, NodeModuleEventData, NodeModuleParams } from '@xyo-network/node-model'
|
|
2
|
+
import { AnyConfigSchema, CompositeModuleResolver, EventListener, Module, ModuleInstance, ModuleResolver } from '@xyo-network/module'
|
|
3
|
+
import { isNodeModule, NodeConfig, NodeConfigSchema, NodeInstance, NodeModuleEventData, NodeModuleParams } from '@xyo-network/node-model'
|
|
5
4
|
import compact from 'lodash/compact'
|
|
6
5
|
|
|
7
6
|
import { AbstractNode } from './AbstractNode'
|
|
@@ -14,7 +13,7 @@ export class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEv
|
|
|
14
13
|
{
|
|
15
14
|
static override configSchemas = [NodeConfigSchema]
|
|
16
15
|
|
|
17
|
-
private registeredModuleMap: Record<string,
|
|
16
|
+
private registeredModuleMap: Record<string, ModuleInstance> = {}
|
|
18
17
|
|
|
19
18
|
override async attach(nameOrAddress: string, external?: boolean) {
|
|
20
19
|
await this.started('throw')
|
|
@@ -26,7 +25,7 @@ export class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEv
|
|
|
26
25
|
return (await this.detachUsingAddress(nameOrAddress)) ?? (await this.detachUsingName(nameOrAddress))
|
|
27
26
|
}
|
|
28
27
|
|
|
29
|
-
override async register(module:
|
|
28
|
+
override async register(module: ModuleInstance) {
|
|
30
29
|
await this.started('throw')
|
|
31
30
|
assertEx(!this.registeredModuleMap[module.address], `Module already registered at that address[${module.address}]`)
|
|
32
31
|
this.registeredModuleMap[module.address] = module
|
|
@@ -46,11 +45,7 @@ export class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEv
|
|
|
46
45
|
})
|
|
47
46
|
}
|
|
48
47
|
|
|
49
|
-
|
|
50
|
-
return super.subscribeHandler()
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
override async unregister(module: Module) {
|
|
48
|
+
override async unregister(module: ModuleInstance) {
|
|
54
49
|
await this.started('throw')
|
|
55
50
|
await this.detach(module.address)
|
|
56
51
|
delete this.registeredModuleMap[module.address]
|
|
@@ -74,7 +69,7 @@ export class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEv
|
|
|
74
69
|
|
|
75
70
|
const notifiedAddresses: string[] = []
|
|
76
71
|
|
|
77
|
-
const getModulesToNotifyAbout = async (node:
|
|
72
|
+
const getModulesToNotifyAbout = async (node: ModuleInstance) => {
|
|
78
73
|
//send attach events for all existing attached modules
|
|
79
74
|
const childModules = await node.resolve(undefined, { direction: 'down' })
|
|
80
75
|
return compact(
|
|
@@ -102,7 +97,7 @@ export class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEv
|
|
|
102
97
|
module.upResolver.addResolver?.(this.privateResolver)
|
|
103
98
|
|
|
104
99
|
//give it public access
|
|
105
|
-
module.upResolver.addResolver?.(this.downResolver)
|
|
100
|
+
module.upResolver.addResolver?.(this.downResolver as CompositeModuleResolver)
|
|
106
101
|
|
|
107
102
|
//give it outside access
|
|
108
103
|
module.upResolver.addResolver?.(this.upResolver)
|
|
@@ -173,7 +168,7 @@ export class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEv
|
|
|
173
168
|
//notify of all sub node children detach
|
|
174
169
|
const notifiedAddresses: string[] = []
|
|
175
170
|
if (isNodeModule(module)) {
|
|
176
|
-
const notifyOfExistingModules = async (node:
|
|
171
|
+
const notifyOfExistingModules = async (node: ModuleInstance) => {
|
|
177
172
|
//send attach events for all existing attached modules
|
|
178
173
|
const childModules = await node.resolve(undefined, { direction: 'down' })
|
|
179
174
|
await Promise.all(
|