@xyo-network/node 2.66.3 → 2.66.5
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 +2 -5
- package/dist/cjs/AbstractNode.js.map +1 -1
- package/dist/cjs/MemoryNode.js +2 -2
- package/dist/cjs/MemoryNode.js.map +1 -1
- package/dist/docs.json +4875 -5489
- package/dist/esm/AbstractNode.js +3 -6
- package/dist/esm/AbstractNode.js.map +1 -1
- package/dist/esm/MemoryNode.js +3 -3
- package/dist/esm/MemoryNode.js.map +1 -1
- package/dist/types/AbstractNode.d.ts +4 -4
- package/dist/types/AbstractNode.d.ts.map +1 -1
- package/dist/types/MemoryNode.d.ts +2 -2
- package/dist/types/MemoryNode.d.ts.map +1 -1
- package/package.json +15 -15
- package/src/AbstractNode.ts +25 -35
- package/src/MemoryNode.ts +8 -16
package/dist/esm/AbstractNode.js
CHANGED
|
@@ -6,7 +6,7 @@ import { handleErrorAsync } from '@xyo-network/error';
|
|
|
6
6
|
import { NodeManifestPayloadSchema } from '@xyo-network/manifest-model';
|
|
7
7
|
import { ModuleWrapper } from '@xyo-network/module';
|
|
8
8
|
import { AbstractIndirectModule, CompositeModuleResolver, ModuleErrorBuilder } from '@xyo-network/module-abstract';
|
|
9
|
-
import { duplicateModules,
|
|
9
|
+
import { duplicateModules, isModuleInstance, } from '@xyo-network/module-model';
|
|
10
10
|
import { NodeAttachedQuerySchema, NodeAttachQuerySchema, NodeConfigSchema, NodeDetachQuerySchema, NodeRegisteredQuerySchema, } from '@xyo-network/node-model';
|
|
11
11
|
import { PayloadBuilder } from '@xyo-network/payload-builder';
|
|
12
12
|
export class AbstractNode extends AbstractIndirectModule {
|
|
@@ -86,7 +86,7 @@ export class AbstractNode extends AbstractIndirectModule {
|
|
|
86
86
|
async manifestHandler() {
|
|
87
87
|
const manifest = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema };
|
|
88
88
|
const notThisModule = (module) => module.address !== this.address;
|
|
89
|
-
const toManifest = (module) => (
|
|
89
|
+
const toManifest = (module) => (isModuleInstance(module) ? module.manifest() : ModuleWrapper.wrap(module, this.account).manifest());
|
|
90
90
|
const privateModulesList = await this.privateResolver.resolve();
|
|
91
91
|
const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest));
|
|
92
92
|
console.log(`manifestHandler:privateModules:${privateModulesList.length}`);
|
|
@@ -166,10 +166,7 @@ export class AbstractNode extends AbstractIndirectModule {
|
|
|
166
166
|
return (await this.resolvePrivate(nameOrAddressOrFilter, options)) ?? (await super.resolve(nameOrAddressOrFilter, options));
|
|
167
167
|
}
|
|
168
168
|
default: {
|
|
169
|
-
return [
|
|
170
|
-
...(await this.resolvePrivate(nameOrAddressOrFilter, options)),
|
|
171
|
-
...(await super.resolve(nameOrAddressOrFilter, options)),
|
|
172
|
-
].filter(duplicateModules);
|
|
169
|
+
return [...(await this.resolvePrivate(nameOrAddressOrFilter, options)), ...(await super.resolve(nameOrAddressOrFilter, options))].filter(duplicateModules);
|
|
173
170
|
}
|
|
174
171
|
}
|
|
175
172
|
}
|
|
@@ -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,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAClH,OAAO,EACL,gBAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/MemoryNode.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert';
|
|
2
|
-
import { isNodeModule, NodeConfigSchema
|
|
2
|
+
import { isNodeModule, NodeConfigSchema } from '@xyo-network/node-model';
|
|
3
3
|
import compact from 'lodash/compact';
|
|
4
4
|
import { AbstractNode } from './AbstractNode';
|
|
5
5
|
export class MemoryNode extends AbstractNode {
|
|
@@ -70,7 +70,7 @@ export class MemoryNode extends AbstractNode {
|
|
|
70
70
|
const notifiedAddresses = [];
|
|
71
71
|
const getModulesToNotifyAbout = async (node) => {
|
|
72
72
|
//send attach events for all existing attached modules
|
|
73
|
-
const childModules = await node.
|
|
73
|
+
const childModules = await node.resolve(undefined, { direction: 'down' });
|
|
74
74
|
return compact(childModules.map((child) => {
|
|
75
75
|
//don't report self
|
|
76
76
|
if (node.address === child.address) {
|
|
@@ -141,7 +141,7 @@ export class MemoryNode extends AbstractNode {
|
|
|
141
141
|
if (isNodeModule(module)) {
|
|
142
142
|
const notifyOfExistingModules = async (node) => {
|
|
143
143
|
//send attach events for all existing attached modules
|
|
144
|
-
const childModules = await node.
|
|
144
|
+
const childModules = await node.resolve(undefined, { direction: 'down' });
|
|
145
145
|
await Promise.all(childModules.map(async (child) => {
|
|
146
146
|
//don't report self
|
|
147
147
|
if (node.address === child.address) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAIzC,OAAO,
|
|
1
|
+
{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,10 @@ import { QueryBoundWitness } from '@xyo-network/boundwitness-builder';
|
|
|
2
2
|
import { NodeManifestPayload } from '@xyo-network/manifest-model';
|
|
3
3
|
import { AbstractIndirectModule, CompositeModuleResolver } from '@xyo-network/module-abstract';
|
|
4
4
|
import { Module, ModuleConfig, ModuleFilter, ModuleFilterOptions, ModuleQueryResult } from '@xyo-network/module-model';
|
|
5
|
-
import {
|
|
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 AbstractIndirectModule<TParams, TEventData> implements
|
|
8
|
+
export declare abstract class AbstractNode<TParams extends NodeModuleParams = NodeModuleParams, TEventData extends NodeModuleEventData = NodeModuleEventData> extends AbstractIndirectModule<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;
|
|
@@ -18,8 +18,8 @@ export declare abstract class AbstractNode<TParams extends NodeModuleParams = No
|
|
|
18
18
|
register(_module: Module): Promisable<void>;
|
|
19
19
|
registered(): Promisable<string[]>;
|
|
20
20
|
registeredModules(): Promisable<Module[]>;
|
|
21
|
-
resolve
|
|
22
|
-
resolve
|
|
21
|
+
resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<Module[]>;
|
|
22
|
+
resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<Module | undefined>;
|
|
23
23
|
unregister(_module: Module): Promisable<this>;
|
|
24
24
|
protected discoverHandler(): Promise<Payload[]>;
|
|
25
25
|
protected manifestHandler(): Promise<NodeManifestPayload>;
|
|
@@ -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;AAE5F,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAsB,MAAM,8BAA8B,CAAA;AAClH,OAAO,EAGL,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,2BAA2B,CAAA;AAClC,OAAO,
|
|
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;AAE5F,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAsB,MAAM,8BAA8B,CAAA;AAClH,OAAO,EAGL,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,mBAAmB,EACnB,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;IAI1C,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;IAI1B,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChF,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA+BzG,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC;cAIpB,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;YAeV,cAAc;IAe5B,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,11 +1,11 @@
|
|
|
1
1
|
import { AccountInstance } from '@xyo-network/account-model';
|
|
2
2
|
import { NodeManifestPayload } from '@xyo-network/manifest-model';
|
|
3
3
|
import { AddressPreviousHashPayload, AnyConfigSchema, Module, ModuleDescriptionPayload } from '@xyo-network/module';
|
|
4
|
-
import {
|
|
4
|
+
import { NodeConfig, NodeInstance, NodeModuleEventData, NodeModuleParams } from '@xyo-network/node-model';
|
|
5
5
|
import { Payload } from '@xyo-network/payload-model';
|
|
6
6
|
import { AbstractNode } from './AbstractNode';
|
|
7
7
|
export type MemoryNodeParams = NodeModuleParams<AnyConfigSchema<NodeConfig>>;
|
|
8
|
-
export declare class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData> extends AbstractNode<TParams, TEventData> implements
|
|
8
|
+
export declare class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData> extends AbstractNode<TParams, TEventData> implements NodeInstance {
|
|
9
9
|
static configSchemas: "network.xyo.node.config"[];
|
|
10
10
|
private registeredModuleMap;
|
|
11
11
|
attach(nameOrAddress: string, external?: boolean): Promise<string | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAiB,MAAM,EAAE,wBAAwB,
|
|
1
|
+
{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAiB,MAAM,EAAE,wBAAwB,EAAkB,MAAM,qBAAqB,CAAA;AAClJ,OAAO,EAAgB,UAAU,EAAoB,YAAY,EAAc,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AACrJ,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,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,CAA6B;IAEzC,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO;IAKzD,QAAQ,IAAI,OAAO,CAAC,wBAAwB,CAAC;IAKpC,MAAM,CAAC,aAAa,EAAE,MAAM;IAKrC,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAK9B,QAAQ,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKxC,aAAa,IAAI,OAAO,CAAC,0BAA0B,EAAE,CAAC;IAK7C,QAAQ,CAAC,MAAM,EAAE,MAAM;IAQ7B,UAAU;IAMV,iBAAiB;IAM1B,SAAS,CAAC,aAAa,CAAC,EAAE,eAAe;IAI1B,UAAU,CAAC,MAAM,EAAE,MAAM;cASrB,YAAY;YAIjB,kBAAkB;YAiFlB,eAAe;YAOf,kBAAkB;YA8ClB,eAAe;IAQ7B,OAAO,CAAC,qBAAqB;CAM9B"}
|
package/package.json
CHANGED
|
@@ -11,20 +11,20 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@xylabs/assert": "^2.9.3",
|
|
14
|
-
"@xyo-network/account": "
|
|
15
|
-
"@xyo-network/account-model": "
|
|
16
|
-
"@xyo-network/address-payload-plugin": "
|
|
17
|
-
"@xyo-network/boundwitness-builder": "
|
|
18
|
-
"@xyo-network/error": "
|
|
19
|
-
"@xyo-network/manifest-model": "
|
|
20
|
-
"@xyo-network/module": "
|
|
21
|
-
"@xyo-network/module-abstract": "
|
|
22
|
-
"@xyo-network/module-model": "
|
|
23
|
-
"@xyo-network/node-model": "
|
|
24
|
-
"@xyo-network/node-wrapper": "
|
|
25
|
-
"@xyo-network/payload-builder": "
|
|
26
|
-
"@xyo-network/payload-model": "
|
|
27
|
-
"@xyo-network/promise": "
|
|
14
|
+
"@xyo-network/account": "~2.66.5",
|
|
15
|
+
"@xyo-network/account-model": "~2.66.5",
|
|
16
|
+
"@xyo-network/address-payload-plugin": "~2.66.5",
|
|
17
|
+
"@xyo-network/boundwitness-builder": "~2.66.5",
|
|
18
|
+
"@xyo-network/error": "~2.66.5",
|
|
19
|
+
"@xyo-network/manifest-model": "~2.66.5",
|
|
20
|
+
"@xyo-network/module": "~2.66.5",
|
|
21
|
+
"@xyo-network/module-abstract": "~2.66.5",
|
|
22
|
+
"@xyo-network/module-model": "~2.66.5",
|
|
23
|
+
"@xyo-network/node-model": "~2.66.5",
|
|
24
|
+
"@xyo-network/node-wrapper": "~2.66.5",
|
|
25
|
+
"@xyo-network/payload-builder": "~2.66.5",
|
|
26
|
+
"@xyo-network/payload-model": "~2.66.5",
|
|
27
|
+
"@xyo-network/promise": "~2.66.5",
|
|
28
28
|
"lodash": "^4.17.21"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
},
|
|
67
67
|
"sideEffects": false,
|
|
68
68
|
"types": "dist/types/index.d.ts",
|
|
69
|
-
"version": "2.66.
|
|
69
|
+
"version": "2.66.5"
|
|
70
70
|
}
|
package/src/AbstractNode.ts
CHANGED
|
@@ -8,7 +8,7 @@ import { ModuleWrapper } from '@xyo-network/module'
|
|
|
8
8
|
import { AbstractIndirectModule, CompositeModuleResolver, ModuleErrorBuilder } from '@xyo-network/module-abstract'
|
|
9
9
|
import {
|
|
10
10
|
duplicateModules,
|
|
11
|
-
|
|
11
|
+
isModuleInstance,
|
|
12
12
|
Module,
|
|
13
13
|
ModuleConfig,
|
|
14
14
|
ModuleFilter,
|
|
@@ -16,11 +16,11 @@ import {
|
|
|
16
16
|
ModuleQueryResult,
|
|
17
17
|
} from '@xyo-network/module-model'
|
|
18
18
|
import {
|
|
19
|
-
IndirectNodeModule,
|
|
20
19
|
NodeAttachedQuerySchema,
|
|
21
20
|
NodeAttachQuerySchema,
|
|
22
21
|
NodeConfigSchema,
|
|
23
22
|
NodeDetachQuerySchema,
|
|
23
|
+
NodeModule,
|
|
24
24
|
NodeModuleEventData,
|
|
25
25
|
NodeModuleParams,
|
|
26
26
|
NodeQuery,
|
|
@@ -33,7 +33,7 @@ import { Promisable } from '@xyo-network/promise'
|
|
|
33
33
|
|
|
34
34
|
export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModuleParams, TEventData extends NodeModuleEventData = NodeModuleEventData>
|
|
35
35
|
extends AbstractIndirectModule<TParams, TEventData>
|
|
36
|
-
implements
|
|
36
|
+
implements NodeModule<TParams, TEventData>, Module<TParams, TEventData>
|
|
37
37
|
{
|
|
38
38
|
static override readonly configSchemas: string[] = [NodeConfigSchema]
|
|
39
39
|
|
|
@@ -82,36 +82,33 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
82
82
|
throw new Error('Method not implemented.')
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
-
override async resolve
|
|
86
|
-
override async resolve
|
|
87
|
-
override async resolve<
|
|
88
|
-
nameOrAddressOrFilter?: ModuleFilter | string,
|
|
89
|
-
options?: ModuleFilterOptions,
|
|
90
|
-
): Promise<TModule | TModule[] | undefined> {
|
|
85
|
+
override async resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<Module[]>
|
|
86
|
+
override async resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<Module | undefined>
|
|
87
|
+
override async resolve(nameOrAddressOrFilter?: ModuleFilter | string, options?: ModuleFilterOptions): Promise<Module | Module[] | undefined> {
|
|
91
88
|
//checking type of nameOrAddressOrFilter before calling other functions since TS seems
|
|
92
89
|
//to need help here narrowing before the call
|
|
93
90
|
if (typeof nameOrAddressOrFilter === 'string') {
|
|
94
91
|
switch (options?.visibility) {
|
|
95
92
|
case 'private': {
|
|
96
|
-
return await this.resolvePrivate
|
|
93
|
+
return await this.resolvePrivate(nameOrAddressOrFilter)
|
|
97
94
|
}
|
|
98
95
|
case 'all': {
|
|
99
|
-
return await this.resolveAll
|
|
96
|
+
return await this.resolveAll(nameOrAddressOrFilter)
|
|
100
97
|
}
|
|
101
98
|
default: {
|
|
102
|
-
return await super.resolve
|
|
99
|
+
return await super.resolve(nameOrAddressOrFilter, options)
|
|
103
100
|
}
|
|
104
101
|
}
|
|
105
102
|
} else {
|
|
106
103
|
switch (options?.visibility) {
|
|
107
104
|
case 'all': {
|
|
108
|
-
return await this.resolveAll
|
|
105
|
+
return await this.resolveAll(nameOrAddressOrFilter)
|
|
109
106
|
}
|
|
110
107
|
case 'private': {
|
|
111
|
-
return await this.resolvePrivate
|
|
108
|
+
return await this.resolvePrivate(nameOrAddressOrFilter)
|
|
112
109
|
}
|
|
113
110
|
default: {
|
|
114
|
-
return await super.resolve
|
|
111
|
+
return await super.resolve(nameOrAddressOrFilter, options)
|
|
115
112
|
}
|
|
116
113
|
}
|
|
117
114
|
}
|
|
@@ -134,7 +131,7 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
134
131
|
const manifest: NodeManifestPayload = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema }
|
|
135
132
|
|
|
136
133
|
const notThisModule = (module: Module) => module.address !== this.address
|
|
137
|
-
const toManifest = (module: Module) => (
|
|
134
|
+
const toManifest = (module: Module) => (isModuleInstance(module) ? module.manifest() : ModuleWrapper.wrap(module, this.account).manifest())
|
|
138
135
|
|
|
139
136
|
const privateModulesList = await this.privateResolver.resolve()
|
|
140
137
|
const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest))
|
|
@@ -218,39 +215,32 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
218
215
|
return (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0]
|
|
219
216
|
}
|
|
220
217
|
|
|
221
|
-
private async resolveAll
|
|
222
|
-
private async resolveAll
|
|
223
|
-
private async resolveAll<
|
|
224
|
-
nameOrAddressOrFilter?: ModuleFilter | string,
|
|
225
|
-
options?: ModuleFilterOptions,
|
|
226
|
-
): Promise<TModule | TModule[] | undefined> {
|
|
218
|
+
private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<Module[]>
|
|
219
|
+
private async resolveAll(nameOrAddress: string, options?: ModuleFilterOptions): Promise<Module | undefined>
|
|
220
|
+
private async resolveAll(nameOrAddressOrFilter?: ModuleFilter | string, options?: ModuleFilterOptions): Promise<Module | Module[] | undefined> {
|
|
227
221
|
switch (typeof nameOrAddressOrFilter) {
|
|
228
222
|
case 'string': {
|
|
229
|
-
return (await this.resolvePrivate
|
|
223
|
+
return (await this.resolvePrivate(nameOrAddressOrFilter, options)) ?? (await super.resolve(nameOrAddressOrFilter, options))
|
|
230
224
|
}
|
|
231
225
|
default: {
|
|
232
|
-
return [
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
].filter(duplicateModules)
|
|
226
|
+
return [...(await this.resolvePrivate(nameOrAddressOrFilter, options)), ...(await super.resolve(nameOrAddressOrFilter, options))].filter(
|
|
227
|
+
duplicateModules,
|
|
228
|
+
)
|
|
236
229
|
}
|
|
237
230
|
}
|
|
238
231
|
}
|
|
239
232
|
|
|
240
|
-
private async resolvePrivate
|
|
241
|
-
private async resolvePrivate
|
|
242
|
-
private async resolvePrivate<
|
|
243
|
-
nameOrAddressOrFilter?: ModuleFilter | string,
|
|
244
|
-
options?: ModuleFilterOptions,
|
|
245
|
-
): Promise<TModule | TModule[] | undefined> {
|
|
233
|
+
private async resolvePrivate(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<Module[]>
|
|
234
|
+
private async resolvePrivate(nameOrAddress: string, options?: ModuleFilterOptions): Promise<Module | undefined>
|
|
235
|
+
private async resolvePrivate(nameOrAddressOrFilter?: ModuleFilter | string, options?: ModuleFilterOptions): Promise<Module | Module[] | undefined> {
|
|
246
236
|
const direction = options?.direction ?? 'all'
|
|
247
237
|
const down = direction === 'down' || direction === 'all'
|
|
248
238
|
switch (typeof nameOrAddressOrFilter) {
|
|
249
239
|
case 'string': {
|
|
250
|
-
return down ? await this.privateResolver.resolve
|
|
240
|
+
return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined
|
|
251
241
|
}
|
|
252
242
|
default: {
|
|
253
|
-
return down ? await this.privateResolver.resolve
|
|
243
|
+
return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined
|
|
254
244
|
}
|
|
255
245
|
}
|
|
256
246
|
}
|
package/src/MemoryNode.ts
CHANGED
|
@@ -1,16 +1,8 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert'
|
|
2
2
|
import { AccountInstance } from '@xyo-network/account-model'
|
|
3
3
|
import { NodeManifestPayload } from '@xyo-network/manifest-model'
|
|
4
|
-
import { AddressPreviousHashPayload, AnyConfigSchema, EventListener, Module, ModuleDescriptionPayload } from '@xyo-network/module'
|
|
5
|
-
import {
|
|
6
|
-
DirectNodeModule,
|
|
7
|
-
isNodeModule,
|
|
8
|
-
NodeConfig,
|
|
9
|
-
NodeConfigSchema,
|
|
10
|
-
NodeModule,
|
|
11
|
-
NodeModuleEventData,
|
|
12
|
-
NodeModuleParams,
|
|
13
|
-
} from '@xyo-network/node-model'
|
|
4
|
+
import { AddressPreviousHashPayload, AnyConfigSchema, EventListener, Module, ModuleDescriptionPayload, ModuleResolver } from '@xyo-network/module'
|
|
5
|
+
import { isNodeModule, NodeConfig, NodeConfigSchema, NodeInstance, NodeModule, NodeModuleEventData, NodeModuleParams } from '@xyo-network/node-model'
|
|
14
6
|
import { Payload } from '@xyo-network/payload-model'
|
|
15
7
|
import compact from 'lodash/compact'
|
|
16
8
|
|
|
@@ -20,7 +12,7 @@ export type MemoryNodeParams = NodeModuleParams<AnyConfigSchema<NodeConfig>>
|
|
|
20
12
|
|
|
21
13
|
export class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>
|
|
22
14
|
extends AbstractNode<TParams, TEventData>
|
|
23
|
-
implements
|
|
15
|
+
implements NodeInstance
|
|
24
16
|
{
|
|
25
17
|
static override configSchemas = [NodeConfigSchema]
|
|
26
18
|
|
|
@@ -106,7 +98,7 @@ export class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEv
|
|
|
106
98
|
|
|
107
99
|
const getModulesToNotifyAbout = async (node: Module) => {
|
|
108
100
|
//send attach events for all existing attached modules
|
|
109
|
-
const childModules = await node.
|
|
101
|
+
const childModules = await node.resolve(undefined, { direction: 'down' })
|
|
110
102
|
return compact(
|
|
111
103
|
childModules.map((child) => {
|
|
112
104
|
//don't report self
|
|
@@ -139,9 +131,9 @@ export class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEv
|
|
|
139
131
|
|
|
140
132
|
if (external) {
|
|
141
133
|
//expose it externally
|
|
142
|
-
this.downResolver.addResolver(module.downResolver)
|
|
134
|
+
this.downResolver.addResolver(module.downResolver as ModuleResolver)
|
|
143
135
|
} else {
|
|
144
|
-
this.privateResolver.addResolver(module.downResolver)
|
|
136
|
+
this.privateResolver.addResolver(module.downResolver as ModuleResolver)
|
|
145
137
|
}
|
|
146
138
|
|
|
147
139
|
const args = { module, name: module.config.name }
|
|
@@ -195,7 +187,7 @@ export class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEv
|
|
|
195
187
|
module.upResolver?.removeResolver?.(this.upResolver)
|
|
196
188
|
|
|
197
189
|
//remove external exposure
|
|
198
|
-
this.downResolver.removeResolver(module.downResolver)
|
|
190
|
+
this.downResolver.removeResolver(module.downResolver as ModuleResolver)
|
|
199
191
|
|
|
200
192
|
const args = { module, name: module.config.name }
|
|
201
193
|
await this.emit('moduleDetached', args)
|
|
@@ -205,7 +197,7 @@ export class MemoryNode<TParams extends MemoryNodeParams = MemoryNodeParams, TEv
|
|
|
205
197
|
if (isNodeModule(module)) {
|
|
206
198
|
const notifyOfExistingModules = async (node: NodeModule) => {
|
|
207
199
|
//send attach events for all existing attached modules
|
|
208
|
-
const childModules = await node.
|
|
200
|
+
const childModules = await node.resolve(undefined, { direction: 'down' })
|
|
209
201
|
await Promise.all(
|
|
210
202
|
childModules.map(async (child) => {
|
|
211
203
|
//don't report self
|