@xyo-network/node 2.42.3 → 2.42.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.d.ts +6 -6
- package/dist/cjs/AbstractNode.d.ts.map +1 -1
- package/dist/cjs/AbstractNode.js +2 -2
- package/dist/cjs/AbstractNode.js.map +1 -1
- package/dist/cjs/Config.d.ts +2 -2
- package/dist/cjs/Config.d.ts.map +1 -1
- package/dist/cjs/MemoryNode.d.ts +3 -3
- package/dist/cjs/MemoryNode.d.ts.map +1 -1
- package/dist/cjs/MemoryNode.js.map +1 -1
- package/dist/cjs/NodeWrapper.d.ts +6 -6
- package/dist/cjs/NodeWrapper.d.ts.map +1 -1
- package/dist/cjs/NodeWrapper.js +1 -1
- package/dist/cjs/NodeWrapper.js.map +1 -1
- package/dist/cjs/Queries/index.d.ts +2 -2
- package/dist/cjs/Queries/index.d.ts.map +1 -1
- package/dist/docs.json +1814 -1646
- package/dist/esm/AbstractNode.d.ts +6 -6
- package/dist/esm/AbstractNode.d.ts.map +1 -1
- package/dist/esm/AbstractNode.js +3 -3
- package/dist/esm/AbstractNode.js.map +1 -1
- package/dist/esm/Config.d.ts +2 -2
- package/dist/esm/Config.d.ts.map +1 -1
- package/dist/esm/MemoryNode.d.ts +3 -3
- package/dist/esm/MemoryNode.d.ts.map +1 -1
- package/dist/esm/MemoryNode.js.map +1 -1
- package/dist/esm/NodeWrapper.d.ts +6 -6
- package/dist/esm/NodeWrapper.d.ts.map +1 -1
- package/dist/esm/NodeWrapper.js +1 -1
- package/dist/esm/NodeWrapper.js.map +1 -1
- package/dist/esm/Queries/index.d.ts +2 -2
- package/dist/esm/Queries/index.d.ts.map +1 -1
- package/package.json +7 -7
- package/src/AbstractNode.ts +10 -10
- package/src/Config.ts +2 -2
- package/src/MemoryNode.spec.ts +10 -10
- package/src/MemoryNode.ts +6 -3
- package/src/NodeWrapper.ts +7 -7
- package/src/Queries/index.ts +2 -2
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { ModuleDescription, ModuleFilter,
|
|
1
|
+
import { AbstractModule, ModuleDescription, ModuleFilter, ModuleParams, ModuleQueryResult, SimpleModuleResolver, XyoQueryBoundWitness } from '@xyo-network/module';
|
|
2
2
|
import { XyoPayload } from '@xyo-network/payload';
|
|
3
3
|
import { Promisable } from '@xyo-network/promise';
|
|
4
4
|
import { NodeConfig } from './Config';
|
|
5
5
|
import { NodeModule } from './NodeModule';
|
|
6
|
-
export declare abstract class AbstractNode<TConfig extends NodeConfig = NodeConfig, TModule extends
|
|
6
|
+
export declare abstract class AbstractNode<TConfig extends NodeConfig = NodeConfig, TModule extends AbstractModule = AbstractModule> extends AbstractModule<TConfig> implements NodeModule {
|
|
7
7
|
isModuleResolver: boolean;
|
|
8
|
-
protected internalResolver:
|
|
8
|
+
protected internalResolver: SimpleModuleResolver<TModule>;
|
|
9
9
|
private _archivist?;
|
|
10
|
-
protected constructor(params:
|
|
11
|
-
static create(params?: Partial<
|
|
10
|
+
protected constructor(params: ModuleParams<TConfig>, internalResolver?: SimpleModuleResolver<TModule>);
|
|
11
|
+
static create(params?: Partial<ModuleParams<NodeConfig>>): Promise<AbstractNode>;
|
|
12
12
|
attached(): Promise<string[]>;
|
|
13
13
|
attachedModules(): Promise<TModule[]>;
|
|
14
14
|
description(): Promise<ModuleDescription>;
|
|
@@ -25,6 +25,6 @@ export declare abstract class AbstractNode<TConfig extends NodeConfig = NodeConf
|
|
|
25
25
|
abstract tryResolve(filter?: ModuleFilter): Promisable<TModule[]>;
|
|
26
26
|
}
|
|
27
27
|
/** @deprecated use AbstractNode instead */
|
|
28
|
-
export declare abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule extends
|
|
28
|
+
export declare abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule extends AbstractModule = AbstractModule> extends AbstractNode<TConfig, TModule> {
|
|
29
29
|
}
|
|
30
30
|
//# sourceMappingURL=AbstractNode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractNode.d.ts","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"AbstractNode.d.ts","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EAEd,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,iBAAiB,EAEjB,oBAAoB,EAEpB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,8BAAsB,YAAY,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,cAAc,GAAG,cAAc,CACzH,SAAQ,cAAc,CAAC,OAAO,CAC9B,YAAW,UAAU;IAEd,gBAAgB,UAAO;IAE9B,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAA;IACzD,OAAO,CAAC,UAAU,CAAC,CAAQ;IAE3B,SAAS,aAAa,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,EAAE,oBAAoB,CAAC,OAAO,CAAC;WAK/E,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAIzF,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI7B,eAAe,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAI5B,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAMxC,OAAO;IAIR,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAoC1I,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIhC,UAAU,IAAI,MAAM,EAAE;IAItB,iBAAiB,IAAI,OAAO,EAAE;IAIf,KAAK;IAKpB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIlC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IACtC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IACtC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;IAC9D,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;CAClE;AAED,2CAA2C;AAC3C,8BAAsB,OAAO,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,YAAY,CAC1I,OAAO,EACP,OAAO,CACR;CAAG"}
|
package/dist/esm/AbstractNode.js
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert';
|
|
2
2
|
import { Account } from '@xyo-network/account';
|
|
3
|
-
import {
|
|
3
|
+
import { AbstractModule, QueryBoundWitnessWrapper, SimpleModuleResolver, XyoErrorBuilder, } from '@xyo-network/module';
|
|
4
4
|
import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeRegisteredQuerySchema } from './Queries';
|
|
5
|
-
export class AbstractNode extends
|
|
5
|
+
export class AbstractNode extends AbstractModule {
|
|
6
6
|
isModuleResolver = true;
|
|
7
7
|
internalResolver;
|
|
8
8
|
_archivist;
|
|
9
9
|
constructor(params, internalResolver) {
|
|
10
10
|
super(params);
|
|
11
|
-
this.internalResolver = internalResolver ?? new
|
|
11
|
+
this.internalResolver = internalResolver ?? new SimpleModuleResolver();
|
|
12
12
|
}
|
|
13
13
|
static async create(params) {
|
|
14
14
|
return (await super.create(params));
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/Config.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AbstractModuleConfig } from '@xyo-network/module';
|
|
2
2
|
import { XyoPayload } from '@xyo-network/payload';
|
|
3
3
|
export type NodeConfigSchema = 'network.xyo.node.config';
|
|
4
4
|
export declare const NodeConfigSchema: NodeConfigSchema;
|
|
5
|
-
export type NodeConfig<TConfig extends XyoPayload = XyoPayload> =
|
|
5
|
+
export type NodeConfig<TConfig extends XyoPayload = XyoPayload> = AbstractModuleConfig<{
|
|
6
6
|
archivist?: string;
|
|
7
7
|
} & TConfig>;
|
|
8
8
|
//# sourceMappingURL=Config.d.ts.map
|
package/dist/esm/Config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,MAAM,gBAAgB,GAAG,yBAAyB,CAAA;AACxD,eAAO,MAAM,gBAAgB,EAAE,gBAA4C,CAAA;AAE3E,MAAM,MAAM,UAAU,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,oBAAoB,CAAC;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,CAAA"}
|
package/dist/esm/MemoryNode.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AbstractModule, ModuleFilter, ModuleParams } from '@xyo-network/module';
|
|
2
2
|
import { AbstractNode } from './AbstractNode';
|
|
3
3
|
import { NodeConfig } from './Config';
|
|
4
|
-
export declare class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends
|
|
4
|
+
export declare class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends AbstractModule = AbstractModule> extends AbstractNode<TConfig, TModule> {
|
|
5
5
|
private registeredModuleMap;
|
|
6
|
-
static create(params?:
|
|
6
|
+
static create(params?: ModuleParams<NodeConfig>): Promise<MemoryNode>;
|
|
7
7
|
attach(address: string, name?: string): void;
|
|
8
8
|
detach(address: string): void;
|
|
9
9
|
register(module: TModule): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEhF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,qBAAa,UAAU,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,YAAY,CACpI,OAAO,EACP,OAAO,CACR;IACC,OAAO,CAAC,mBAAmB,CAA6B;WAElC,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAI3E,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAKrC,MAAM,CAAC,OAAO,EAAE,MAAM;IAItB,QAAQ,CAAC,MAAM,EAAE,OAAO;IAKxB,UAAU;IAMV,iBAAiB;IAMX,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAIlD,UAAU,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAI3D,UAAU,CAAC,MAAM,EAAE,OAAO;CAGpC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAGzC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAG7C,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAGzC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAG7C,MAAM,OAAO,UAAqG,SAAQ,YAGzH;IACS,mBAAmB,GAAG,IAAI,GAAG,EAAmB,CAAA;IAExD,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAiC;QAC5D,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAe,CAAA;IACnD,CAAC;IAEQ,MAAM,CAAC,OAAe,EAAE,IAAa;QAC5C,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,iCAAiC,CAAC,CAAA;QACjG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACzC,CAAC;IAEQ,MAAM,CAAC,OAAe;QAC7B,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACvC,CAAC;IAEQ,QAAQ,CAAC,MAAe;QAC/B,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAA;QACvC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACtD,CAAC;IAEQ,UAAU;QACjB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC7D,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,iBAAiB;QACxB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACjE,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,MAAqB;QAC1C,OAAO,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;IACtG,CAAC;IAEQ,KAAK,CAAC,UAAU,CAAC,MAAqB;QAC7C,OAAO,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;IAC5G,CAAC;IAEQ,UAAU,CAAC,MAAe;QACjC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACjD,CAAC;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ArchivistWrapper } from '@xyo-network/archivist';
|
|
2
|
-
import { Module, ModuleFilter, ModuleWrapper
|
|
2
|
+
import { AbstractModule, Module, ModuleFilter, ModuleWrapper } from '@xyo-network/module';
|
|
3
3
|
import { Promisable } from '@xyo-network/promise';
|
|
4
4
|
import { NodeModule } from './NodeModule';
|
|
5
5
|
export declare class NodeWrapper extends ModuleWrapper implements NodeModule {
|
|
@@ -8,14 +8,14 @@ export declare class NodeWrapper extends ModuleWrapper implements NodeModule {
|
|
|
8
8
|
get archivist(): ArchivistWrapper;
|
|
9
9
|
attach(address: string, name?: string): Promise<void>;
|
|
10
10
|
attached(): Promise<string[]>;
|
|
11
|
-
attachedModules(): Promise<
|
|
11
|
+
attachedModules(): Promise<AbstractModule[]>;
|
|
12
12
|
detach(address: string): Promise<void>;
|
|
13
|
-
find(_filter: ModuleFilter): Promisable<
|
|
13
|
+
find(_filter: ModuleFilter): Promisable<AbstractModule[]>;
|
|
14
14
|
register(_module: Module): void;
|
|
15
15
|
registered(): Promise<string[]>;
|
|
16
|
-
registeredModules(): Promise<
|
|
17
|
-
resolve(_filter: ModuleFilter): Promisable<
|
|
18
|
-
tryResolve(_filter: ModuleFilter): Promisable<
|
|
16
|
+
registeredModules(): Promise<AbstractModule[]>;
|
|
17
|
+
resolve(_filter: ModuleFilter): Promisable<AbstractModule[]>;
|
|
18
|
+
tryResolve(_filter: ModuleFilter): Promisable<AbstractModule[]>;
|
|
19
19
|
unregister(_module: Module): void;
|
|
20
20
|
}
|
|
21
21
|
/** @deprecated use NodeWrapper instead */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeWrapper.d.ts","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"NodeWrapper.d.ts","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEzF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAYzC,qBAAa,WAAY,SAAQ,aAAc,YAAW,UAAU;IAC3D,gBAAgB,UAAO;IAE9B,OAAO,CAAC,UAAU,CAAC,CAAkB;IAErC,IAAW,SAAS,qBAGnB;IAEK,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOrD,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ7B,eAAe,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAK5C,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5C,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC;IAIzD,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIzB,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAM/B,iBAAiB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAKpD,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC;IAI5D,UAAU,CAAC,OAAO,EAAE,YAAY,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC;IAI/D,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CAGlC;AAED,0CAA0C;AAC1C,qBAAa,cAAe,SAAQ,WAAW;CAAG"}
|
package/dist/esm/NodeWrapper.js
CHANGED
|
@@ -40,7 +40,7 @@ export class NodeWrapper extends ModuleWrapper {
|
|
|
40
40
|
async registered() {
|
|
41
41
|
const queryPayload = PayloadWrapper.parse({ schema: XyoNodeRegisteredQuerySchema });
|
|
42
42
|
const result = await this.sendQuery(queryPayload);
|
|
43
|
-
return compact(result
|
|
43
|
+
return compact(result.map((payload) => payload?.schema));
|
|
44
44
|
}
|
|
45
45
|
async registeredModules() {
|
|
46
46
|
const addresses = await this.registered();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeWrapper.js","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,
|
|
1
|
+
{"version":3,"file":"NodeWrapper.js","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AbstractModuleQuery, XyoQuery } from '@xyo-network/module';
|
|
2
2
|
import { XyoNodeAttachQuery } from './Attach';
|
|
3
3
|
import { XyoNodeAttachedQuery } from './Attached';
|
|
4
4
|
import { XyoNodeDetachQuery } from './Detach';
|
|
@@ -8,5 +8,5 @@ export * from './Attached';
|
|
|
8
8
|
export * from './Detach';
|
|
9
9
|
export * from './Registered';
|
|
10
10
|
export type XyoNodeQueryBase = XyoNodeAttachQuery | XyoNodeDetachQuery | XyoNodeAttachedQuery | XyoNodeRegisteredQuery;
|
|
11
|
-
export type XyoNodeQuery<T extends XyoQuery | void = void> =
|
|
11
|
+
export type XyoNodeQuery<T extends XyoQuery | void = void> = AbstractModuleQuery<T extends XyoQuery ? XyoNodeQueryBase | T : XyoNodeQueryBase>;
|
|
12
12
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAEnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAErD,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAE5B,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,oBAAoB,GAAG,sBAAsB,CAAA;AAEtH,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,mBAAmB,CAAC,CAAC,SAAS,QAAQ,GAAG,gBAAgB,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -10,12 +10,12 @@
|
|
|
10
10
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@xylabs/assert": "^2.6.
|
|
14
|
-
"@xyo-network/account": "^2.42.
|
|
15
|
-
"@xyo-network/archivist": "^2.42.
|
|
16
|
-
"@xyo-network/module": "^2.42.
|
|
17
|
-
"@xyo-network/payload": "^2.42.
|
|
18
|
-
"@xyo-network/promise": "^2.42.
|
|
13
|
+
"@xylabs/assert": "^2.6.10",
|
|
14
|
+
"@xyo-network/account": "^2.42.5",
|
|
15
|
+
"@xyo-network/archivist": "^2.42.5",
|
|
16
|
+
"@xyo-network/module": "^2.42.5",
|
|
17
|
+
"@xyo-network/payload": "^2.42.5",
|
|
18
|
+
"@xyo-network/promise": "^2.42.5",
|
|
19
19
|
"lodash": "^4.17.21",
|
|
20
20
|
"tslib": "^2.4.1"
|
|
21
21
|
},
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
},
|
|
61
61
|
"sideEffects": false,
|
|
62
62
|
"types": "dist/esm/index.d.ts",
|
|
63
|
-
"version": "2.42.
|
|
63
|
+
"version": "2.42.5"
|
|
64
64
|
}
|
package/src/AbstractNode.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert'
|
|
2
2
|
import { Account } from '@xyo-network/account'
|
|
3
3
|
import {
|
|
4
|
+
AbstractModule,
|
|
4
5
|
Module,
|
|
5
6
|
ModuleDescription,
|
|
6
7
|
ModuleFilter,
|
|
8
|
+
ModuleParams,
|
|
7
9
|
ModuleQueryResult,
|
|
8
10
|
QueryBoundWitnessWrapper,
|
|
11
|
+
SimpleModuleResolver,
|
|
9
12
|
XyoErrorBuilder,
|
|
10
|
-
XyoModule,
|
|
11
|
-
XyoModuleParams,
|
|
12
|
-
XyoModuleResolver,
|
|
13
13
|
XyoQueryBoundWitness,
|
|
14
14
|
} from '@xyo-network/module'
|
|
15
15
|
import { XyoPayload } from '@xyo-network/payload'
|
|
@@ -19,21 +19,21 @@ import { NodeConfig } from './Config'
|
|
|
19
19
|
import { NodeModule } from './NodeModule'
|
|
20
20
|
import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeQuery, XyoNodeRegisteredQuerySchema } from './Queries'
|
|
21
21
|
|
|
22
|
-
export abstract class AbstractNode<TConfig extends NodeConfig = NodeConfig, TModule extends
|
|
23
|
-
extends
|
|
22
|
+
export abstract class AbstractNode<TConfig extends NodeConfig = NodeConfig, TModule extends AbstractModule = AbstractModule>
|
|
23
|
+
extends AbstractModule<TConfig>
|
|
24
24
|
implements NodeModule
|
|
25
25
|
{
|
|
26
26
|
public isModuleResolver = true
|
|
27
27
|
|
|
28
|
-
protected internalResolver:
|
|
28
|
+
protected internalResolver: SimpleModuleResolver<TModule>
|
|
29
29
|
private _archivist?: Module
|
|
30
30
|
|
|
31
|
-
protected constructor(params:
|
|
31
|
+
protected constructor(params: ModuleParams<TConfig>, internalResolver?: SimpleModuleResolver<TModule>) {
|
|
32
32
|
super(params)
|
|
33
|
-
this.internalResolver = internalResolver ?? new
|
|
33
|
+
this.internalResolver = internalResolver ?? new SimpleModuleResolver<TModule>()
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
-
static override async create(params?: Partial<
|
|
36
|
+
static override async create(params?: Partial<ModuleParams<NodeConfig>>): Promise<AbstractNode> {
|
|
37
37
|
return (await super.create(params)) as AbstractNode
|
|
38
38
|
}
|
|
39
39
|
|
|
@@ -119,7 +119,7 @@ export abstract class AbstractNode<TConfig extends NodeConfig = NodeConfig, TMod
|
|
|
119
119
|
}
|
|
120
120
|
|
|
121
121
|
/** @deprecated use AbstractNode instead */
|
|
122
|
-
export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule extends
|
|
122
|
+
export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule extends AbstractModule = AbstractModule> extends AbstractNode<
|
|
123
123
|
TConfig,
|
|
124
124
|
TModule
|
|
125
125
|
> {}
|
package/src/Config.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AbstractModuleConfig } from '@xyo-network/module'
|
|
2
2
|
import { XyoPayload } from '@xyo-network/payload'
|
|
3
3
|
|
|
4
4
|
export type NodeConfigSchema = 'network.xyo.node.config'
|
|
5
5
|
export const NodeConfigSchema: NodeConfigSchema = 'network.xyo.node.config'
|
|
6
6
|
|
|
7
|
-
export type NodeConfig<TConfig extends XyoPayload = XyoPayload> =
|
|
7
|
+
export type NodeConfig<TConfig extends XyoPayload = XyoPayload> = AbstractModuleConfig<{ archivist?: string } & TConfig>
|
package/src/MemoryNode.spec.ts
CHANGED
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
XyoHuriPayload,
|
|
9
9
|
XyoHuriSchema,
|
|
10
10
|
} from '@xyo-network/diviner'
|
|
11
|
-
import {
|
|
11
|
+
import { AbstractModule, AbstractModuleResolver, ModuleDescription } from '@xyo-network/module'
|
|
12
12
|
import { Account, PayloadWrapper, XyoPayload, XyoPayloadBuilder, XyoPayloadSchema } from '@xyo-network/protocol'
|
|
13
13
|
|
|
14
14
|
import { NodeConfigSchema } from './Config'
|
|
@@ -30,9 +30,9 @@ describe('MemoryNode', () => {
|
|
|
30
30
|
const XyoMemoryArchivist = (await import('@xyo-network/archivist')).MemoryArchivist
|
|
31
31
|
const node: NodeModule = await MemoryNode.create()
|
|
32
32
|
const archivist = await XyoMemoryArchivist.create()
|
|
33
|
-
const diviner:
|
|
33
|
+
const diviner: AbstractModule = await ArchivistPayloadDiviner.create({
|
|
34
34
|
config: { archivist: archivist.address, schema: XyoArchivistPayloadDivinerConfigSchema },
|
|
35
|
-
resolver: new
|
|
35
|
+
resolver: new AbstractModuleResolver().add(archivist),
|
|
36
36
|
})
|
|
37
37
|
await node.register(archivist)
|
|
38
38
|
node.attach(archivist.address)
|
|
@@ -50,7 +50,7 @@ describe('MemoryNode', () => {
|
|
|
50
50
|
const foundArchivistWrapper = foundArchivist ? new ArchivistWrapper(foundArchivist) : undefined
|
|
51
51
|
await foundArchivistWrapper?.insert([testPayload])
|
|
52
52
|
|
|
53
|
-
/*const subscribeQuery:
|
|
53
|
+
/*const subscribeQuery: AbstractModuleSubscribeQuery = { payloads: [testPayload], schema: AbstractModuleSubscribeQuerySchema }
|
|
54
54
|
await foundArchivist?.query(subscribeQuery)*/
|
|
55
55
|
|
|
56
56
|
const payloads = await foundArchivistWrapper?.all()
|
|
@@ -89,7 +89,7 @@ describe('MemoryNode', () => {
|
|
|
89
89
|
})
|
|
90
90
|
})
|
|
91
91
|
describe('with modules registered', () => {
|
|
92
|
-
let module:
|
|
92
|
+
let module: AbstractModule
|
|
93
93
|
beforeEach(async () => {
|
|
94
94
|
module = await MemoryArchivist.create()
|
|
95
95
|
node.register(module)
|
|
@@ -102,7 +102,7 @@ describe('MemoryNode', () => {
|
|
|
102
102
|
})
|
|
103
103
|
})
|
|
104
104
|
describe('attach', () => {
|
|
105
|
-
let module:
|
|
105
|
+
let module: AbstractModule
|
|
106
106
|
beforeEach(async () => {
|
|
107
107
|
module = await MemoryArchivist.create()
|
|
108
108
|
node.register(module)
|
|
@@ -112,7 +112,7 @@ describe('MemoryNode', () => {
|
|
|
112
112
|
})
|
|
113
113
|
})
|
|
114
114
|
describe('attached', () => {
|
|
115
|
-
let module:
|
|
115
|
+
let module: AbstractModule
|
|
116
116
|
beforeEach(async () => {
|
|
117
117
|
module = await MemoryArchivist.create()
|
|
118
118
|
node.register(module)
|
|
@@ -136,7 +136,7 @@ describe('MemoryNode', () => {
|
|
|
136
136
|
})
|
|
137
137
|
})
|
|
138
138
|
describe('detach', () => {
|
|
139
|
-
let module:
|
|
139
|
+
let module: AbstractModule
|
|
140
140
|
beforeEach(async () => {
|
|
141
141
|
module = await MemoryArchivist.create()
|
|
142
142
|
node.register(module)
|
|
@@ -150,7 +150,7 @@ describe('MemoryNode', () => {
|
|
|
150
150
|
})
|
|
151
151
|
})
|
|
152
152
|
describe('registeredModules', () => {
|
|
153
|
-
let module:
|
|
153
|
+
let module: AbstractModule
|
|
154
154
|
beforeEach(async () => {
|
|
155
155
|
module = await MemoryArchivist.create()
|
|
156
156
|
})
|
|
@@ -229,7 +229,7 @@ describe('MemoryNode', () => {
|
|
|
229
229
|
nestedNode.register(mod)
|
|
230
230
|
nestedNode.attach(mod.address)
|
|
231
231
|
})
|
|
232
|
-
const rootModules:
|
|
232
|
+
const rootModules: AbstractModule[] = await Promise.all([await MemoryArchivist.create({ account: testAccount4, config: archivistConfig })])
|
|
233
233
|
rootModules.push(nestedNode)
|
|
234
234
|
rootModules.map((mod) => {
|
|
235
235
|
node.register(mod)
|
package/src/MemoryNode.ts
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert'
|
|
2
|
-
import {
|
|
2
|
+
import { AbstractModule, ModuleFilter, ModuleParams } from '@xyo-network/module'
|
|
3
3
|
|
|
4
4
|
import { AbstractNode } from './AbstractNode'
|
|
5
5
|
import { NodeConfig } from './Config'
|
|
6
6
|
|
|
7
|
-
export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends
|
|
7
|
+
export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends AbstractModule = AbstractModule> extends AbstractNode<
|
|
8
|
+
TConfig,
|
|
9
|
+
TModule
|
|
10
|
+
> {
|
|
8
11
|
private registeredModuleMap = new Map<string, TModule>()
|
|
9
12
|
|
|
10
|
-
static override async create(params?:
|
|
13
|
+
static override async create(params?: ModuleParams<NodeConfig>): Promise<MemoryNode> {
|
|
11
14
|
return (await super.create(params)) as MemoryNode
|
|
12
15
|
}
|
|
13
16
|
|
package/src/NodeWrapper.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ArchivistWrapper } from '@xyo-network/archivist'
|
|
2
|
-
import { Module, ModuleFilter, ModuleWrapper
|
|
2
|
+
import { AbstractModule, Module, ModuleFilter, ModuleWrapper } from '@xyo-network/module'
|
|
3
3
|
import { PayloadWrapper } from '@xyo-network/payload'
|
|
4
4
|
import { Promisable } from '@xyo-network/promise'
|
|
5
5
|
import compact from 'lodash/compact'
|
|
@@ -41,7 +41,7 @@ export class NodeWrapper extends ModuleWrapper implements NodeModule {
|
|
|
41
41
|
return compact(result[1].map((payload) => payload?.schema))
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
async attachedModules(): Promise<
|
|
44
|
+
async attachedModules(): Promise<AbstractModule[]> {
|
|
45
45
|
const addresses = await this.attached()
|
|
46
46
|
return compact(await this.resolve({ address: addresses }))
|
|
47
47
|
}
|
|
@@ -51,7 +51,7 @@ export class NodeWrapper extends ModuleWrapper implements NodeModule {
|
|
|
51
51
|
await this.sendQuery(queryPayload)
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
find(_filter: ModuleFilter): Promisable<
|
|
54
|
+
find(_filter: ModuleFilter): Promisable<AbstractModule[]> {
|
|
55
55
|
throw Error('Not implemented')
|
|
56
56
|
}
|
|
57
57
|
|
|
@@ -62,19 +62,19 @@ export class NodeWrapper extends ModuleWrapper implements NodeModule {
|
|
|
62
62
|
async registered(): Promise<string[]> {
|
|
63
63
|
const queryPayload = PayloadWrapper.parse<XyoNodeRegisteredQuery>({ schema: XyoNodeRegisteredQuerySchema })
|
|
64
64
|
const result = await this.sendQuery(queryPayload)
|
|
65
|
-
return compact(result
|
|
65
|
+
return compact(result.map((payload) => payload?.schema))
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
-
async registeredModules(): Promise<
|
|
68
|
+
async registeredModules(): Promise<AbstractModule[]> {
|
|
69
69
|
const addresses = await this.registered()
|
|
70
70
|
return compact(await this.resolve({ address: addresses }))
|
|
71
71
|
}
|
|
72
72
|
|
|
73
|
-
resolve(_filter: ModuleFilter): Promisable<
|
|
73
|
+
resolve(_filter: ModuleFilter): Promisable<AbstractModule[]> {
|
|
74
74
|
throw Error('Not implemented')
|
|
75
75
|
}
|
|
76
76
|
|
|
77
|
-
tryResolve(_filter: ModuleFilter): Promisable<
|
|
77
|
+
tryResolve(_filter: ModuleFilter): Promisable<AbstractModule[]> {
|
|
78
78
|
throw Error('Not implemented')
|
|
79
79
|
}
|
|
80
80
|
|
package/src/Queries/index.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AbstractModuleQuery, XyoQuery } from '@xyo-network/module'
|
|
2
2
|
|
|
3
3
|
import { XyoNodeAttachQuery } from './Attach'
|
|
4
4
|
import { XyoNodeAttachedQuery } from './Attached'
|
|
@@ -12,4 +12,4 @@ export * from './Registered'
|
|
|
12
12
|
|
|
13
13
|
export type XyoNodeQueryBase = XyoNodeAttachQuery | XyoNodeDetachQuery | XyoNodeAttachedQuery | XyoNodeRegisteredQuery
|
|
14
14
|
|
|
15
|
-
export type XyoNodeQuery<T extends XyoQuery | void = void> =
|
|
15
|
+
export type XyoNodeQuery<T extends XyoQuery | void = void> = AbstractModuleQuery<T extends XyoQuery ? XyoNodeQueryBase | T : XyoNodeQueryBase>
|