@xyo-network/node 2.41.11 → 2.42.0

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.
@@ -12,6 +12,7 @@ export declare abstract class AbstractNode<TConfig extends NodeConfig = NodeConf
12
12
  attached(): Promise<string[]>;
13
13
  attachedModules(): Promise<TModule[]>;
14
14
  description(): Promise<ModuleDescription>;
15
+ queries(): string[];
15
16
  query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayload[]): Promise<ModuleQueryResult>;
16
17
  register(_module: TModule): void;
17
18
  registered(): string[];
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractNode.d.ts","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EAGjB,SAAS,EACT,eAAe,EACf,iBAAiB,EACjB,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,SAAS,GAAG,SAAS,CAC/G,SAAQ,SAAS,CAAC,OAAO,CACzB,YAAW,UAAU;IAEd,gBAAgB,UAAO;IAE9B,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACtD,OAAO,CAAC,UAAU,CAAC,CAAQ;IAE3B,SAAS,aAAa,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC;WAK/E,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAI5F,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI7B,eAAe,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAI5B,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAMzC,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAmC1I,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,SAAS,GAAG,SAAS,CAAE,SAAQ,YAAY,CAChI,OAAO,EACP,OAAO,CACR;CAAG"}
1
+ {"version":3,"file":"AbstractNode.d.ts","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EAGjB,SAAS,EACT,eAAe,EACf,iBAAiB,EACjB,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,SAAS,GAAG,SAAS,CAC/G,SAAQ,SAAS,CAAC,OAAO,CACzB,YAAW,UAAU;IAEd,gBAAgB,UAAO;IAE9B,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACtD,OAAO,CAAC,UAAU,CAAC,CAAQ;IAE3B,SAAS,aAAa,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC;WAK/E,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAI5F,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,SAAS,GAAG,SAAS,CAAE,SAAQ,YAAY,CAChI,OAAO,EACP,OAAO,CACR;CAAG"}
@@ -1,5 +1,5 @@
1
1
  import { assertEx } from '@xylabs/assert';
2
- import { XyoAccount } from '@xyo-network/account';
2
+ import { Account } from '@xyo-network/account';
3
3
  import { QueryBoundWitnessWrapper, XyoErrorBuilder, XyoModule, XyoModuleResolver, } from '@xyo-network/module';
4
4
  import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeRegisteredQuerySchema } from './Queries';
5
5
  export class AbstractNode extends XyoModule {
@@ -24,11 +24,14 @@ export class AbstractNode extends XyoModule {
24
24
  const children = await Promise.all((await this.attachedModules()).map((mod) => mod.description()));
25
25
  return { ...desc, children };
26
26
  }
27
+ queries() {
28
+ return [XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeAttachedQuerySchema, XyoNodeRegisteredQuerySchema, ...super.queries()];
29
+ }
27
30
  async query(query, payloads) {
28
- const wrapper = QueryBoundWitnessWrapper.parseQuery(query);
31
+ const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
29
32
  const typedQuery = wrapper.query.payload;
30
33
  assertEx(this.queryable(typedQuery.schema, wrapper.addresses));
31
- const queryAccount = new XyoAccount();
34
+ const queryAccount = new Account();
32
35
  const resultPayloads = [];
33
36
  try {
34
37
  switch (typedQuery.schema) {
@@ -45,6 +48,7 @@ export class AbstractNode extends XyoModule {
45
48
  break;
46
49
  }
47
50
  case XyoNodeRegisteredQuerySchema: {
51
+ // TODO: Make address payload, return array of them via BW
48
52
  this.registered();
49
53
  break;
50
54
  }
@@ -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,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAKL,wBAAwB,EACxB,eAAe,EACf,SAAS,EAET,iBAAiB,GAElB,MAAM,qBAAqB,CAAA;AAM5B,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,wBAAwB,EAAgB,4BAA4B,EAAE,MAAM,WAAW,CAAA;AAEtJ,MAAM,OAAgB,YACpB,SAAQ,SAAkB;IAGnB,gBAAgB,GAAG,IAAI,CAAA;IAEpB,gBAAgB,CAA4B;IAC9C,UAAU,CAAS;IAE3B,YAAsB,MAAgC,EAAE,gBAA6C;QACnG,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,IAAI,iBAAiB,EAAW,CAAA;IAC9E,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAA6C;QACxE,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAiB,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,CAAC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,OAAO,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IACtD,CAAC;IAEQ,KAAK,CAAC,WAAW;QACxB,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,CAAA;QACtC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;QAClG,OAAO,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,CAAA;IAC9B,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAwD,KAAQ,EAAE,QAAuB;QAC3G,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAe,KAAK,CAAC,CAAA;QACxE,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;QACxC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;QAE9D,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,MAAM,cAAc,GAAiB,EAAE,CAAA;QACvC,IAAI;YACF,QAAQ,UAAU,CAAC,MAAM,EAAE;gBACzB,KAAK,wBAAwB,CAAC,CAAC;oBAC7B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;oBAC/B,MAAK;iBACN;gBACD,KAAK,wBAAwB,CAAC,CAAC;oBAC7B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;oBAC/B,MAAK;iBACN;gBACD,KAAK,0BAA0B,CAAC,CAAC;oBAC/B,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;oBACrB,MAAK;iBACN;gBACD,KAAK,4BAA4B,CAAC,CAAC;oBACjC,IAAI,CAAC,UAAU,EAAE,CAAA;oBACjB,MAAK;iBACN;gBACD;oBACE,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;aAC5C;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,EAAW,CAAA;YACzB,cAAc,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;SAChF;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;IACtD,CAAC;IAED,QAAQ,CAAC,OAAgB;QACvB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,UAAU;QACR,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,iBAAiB;QACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAEQ,KAAK,CAAC,KAAK;QAClB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,UAAU,CAAC,OAAgB;QACzB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;CAMF;AAED,2CAA2C;AAC3C,MAAM,OAAgB,OAAwF,SAAQ,YAGrH;CAAG"}
1
+ {"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,6 @@ export declare class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule
6
6
  static create(params?: XyoModuleParams<NodeConfig>): Promise<MemoryNode>;
7
7
  attach(address: string, name?: string): void;
8
8
  detach(address: string): void;
9
- queries(): string[];
10
9
  register(module: TModule): void;
11
10
  registered(): string[];
12
11
  registeredModules(): TModule[];
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAE9E,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAGrC,qBAAa,UAAU,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC;IAC5I,OAAO,CAAC,mBAAmB,CAA6B;WAElC,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAI9E,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAKrC,MAAM,CAAC,OAAO,EAAE,MAAM;IAIf,OAAO,IAAI,MAAM,EAAE;IAI1B,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
+ {"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAE9E,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,SAAS,GAAG,SAAS,CAAE,SAAQ,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC;IAC5I,OAAO,CAAC,mBAAmB,CAA6B;WAElC,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAI9E,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,6 +1,5 @@
1
1
  import { assertEx } from '@xylabs/assert';
2
2
  import { AbstractNode } from './AbstractNode';
3
- import { XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema } from './Queries';
4
3
  export class MemoryNode extends AbstractNode {
5
4
  registeredModuleMap = new Map();
6
5
  static async create(params) {
@@ -13,9 +12,6 @@ export class MemoryNode extends AbstractNode {
13
12
  detach(address) {
14
13
  this.internalResolver.remove(address);
15
14
  }
16
- queries() {
17
- return [XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, ...super.queries()];
18
- }
19
15
  register(module) {
20
16
  module.resolver = this.internalResolver;
21
17
  this.registeredModuleMap.set(module.address, module);
@@ -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;AAE7C,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAE9E,MAAM,OAAO,UAA2F,SAAQ,YAA8B;IACpI,mBAAmB,GAAG,IAAI,GAAG,EAAmB,CAAA;IAExD,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAoC;QAC/D,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;IAEe,OAAO;QACrB,OAAO,CAAC,wBAAwB,EAAE,wBAAwB,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IACjF,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
+ {"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,UAA2F,SAAQ,YAA8B;IACpI,mBAAmB,GAAG,IAAI,GAAG,EAAmB,CAAA;IAExD,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAoC;QAC/D,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"}
package/package.json CHANGED
@@ -11,20 +11,20 @@
11
11
  },
12
12
  "dependencies": {
13
13
  "@xylabs/assert": "^2.6.9",
14
- "@xyo-network/account": "^2.41.11",
15
- "@xyo-network/archivist": "^2.41.11",
16
- "@xyo-network/module": "^2.41.11",
17
- "@xyo-network/payload": "^2.41.11",
18
- "@xyo-network/promise": "^2.41.11",
14
+ "@xyo-network/account": "^2.42.0",
15
+ "@xyo-network/archivist": "^2.42.0",
16
+ "@xyo-network/module": "^2.42.0",
17
+ "@xyo-network/payload": "^2.42.0",
18
+ "@xyo-network/promise": "^2.42.0",
19
19
  "lodash": "^4.17.21",
20
20
  "tslib": "^2.4.1"
21
21
  },
22
22
  "devDependencies": {
23
- "axios": "~1.1.3",
23
+ "axios": "~1.2.1",
24
24
  "pako": "^2.1.0"
25
25
  },
26
26
  "peerDependencies": {
27
- "axios": "~1.1.3",
27
+ "axios": "~1.2.1",
28
28
  "pako": "^2.1.0"
29
29
  },
30
30
  "description": "Primary SDK for using XYO Protocol 2.0",
@@ -60,5 +60,5 @@
60
60
  },
61
61
  "sideEffects": false,
62
62
  "types": "dist/esm/index.d.ts",
63
- "version": "2.41.11"
63
+ "version": "2.42.0"
64
64
  }
@@ -1,5 +1,5 @@
1
1
  import { assertEx } from '@xylabs/assert'
2
- import { XyoAccount } from '@xyo-network/account'
2
+ import { Account } from '@xyo-network/account'
3
3
  import {
4
4
  Module,
5
5
  ModuleDescription,
@@ -51,12 +51,16 @@ export abstract class AbstractNode<TConfig extends NodeConfig = NodeConfig, TMod
51
51
  return { ...desc, children }
52
52
  }
53
53
 
54
+ public override queries() {
55
+ return [XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeAttachedQuerySchema, XyoNodeRegisteredQuerySchema, ...super.queries()]
56
+ }
57
+
54
58
  override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayload[]): Promise<ModuleQueryResult> {
55
- const wrapper = QueryBoundWitnessWrapper.parseQuery<XyoNodeQuery>(query)
59
+ const wrapper = QueryBoundWitnessWrapper.parseQuery<XyoNodeQuery>(query, payloads)
56
60
  const typedQuery = wrapper.query.payload
57
61
  assertEx(this.queryable(typedQuery.schema, wrapper.addresses))
58
62
 
59
- const queryAccount = new XyoAccount()
63
+ const queryAccount = new Account()
60
64
  const resultPayloads: XyoPayload[] = []
61
65
  try {
62
66
  switch (typedQuery.schema) {
@@ -73,6 +77,7 @@ export abstract class AbstractNode<TConfig extends NodeConfig = NodeConfig, TMod
73
77
  break
74
78
  }
75
79
  case XyoNodeRegisteredQuerySchema: {
80
+ // TODO: Make address payload, return array of them via BW
76
81
  this.registered()
77
82
  break
78
83
  }
@@ -9,17 +9,17 @@ import {
9
9
  XyoHuriSchema,
10
10
  } from '@xyo-network/diviner'
11
11
  import { ModuleDescription, XyoModule, XyoModuleResolver } from '@xyo-network/module'
12
- import { PayloadWrapper, XyoAccount, XyoPayload, XyoPayloadBuilder, XyoPayloadSchema } from '@xyo-network/protocol'
12
+ import { Account, PayloadWrapper, XyoPayload, XyoPayloadBuilder, XyoPayloadSchema } from '@xyo-network/protocol'
13
13
 
14
14
  import { NodeConfigSchema } from './Config'
15
15
  import { MemoryNode } from './MemoryNode'
16
16
  import { NodeModule } from './NodeModule'
17
17
 
18
18
  describe('MemoryNode', () => {
19
- const testAccount1 = new XyoAccount({ phrase: 'testPhrase1' })
20
- const testAccount2 = new XyoAccount({ phrase: 'testPhrase2' })
21
- const testAccount3 = new XyoAccount({ phrase: 'testPhrase3' })
22
- const testAccount4 = new XyoAccount({ phrase: 'testPhrase4' })
19
+ const testAccount1 = new Account({ phrase: 'testPhrase1' })
20
+ const testAccount2 = new Account({ phrase: 'testPhrase2' })
21
+ const testAccount3 = new Account({ phrase: 'testPhrase3' })
22
+ const testAccount4 = new Account({ phrase: 'testPhrase4' })
23
23
  const nodeConfig = { schema: NodeConfigSchema }
24
24
  let node: MemoryNode
25
25
  beforeEach(async () => {
package/src/MemoryNode.ts CHANGED
@@ -3,7 +3,6 @@ import { ModuleFilter, XyoModule, XyoModuleParams } from '@xyo-network/module'
3
3
 
4
4
  import { AbstractNode } from './AbstractNode'
5
5
  import { NodeConfig } from './Config'
6
- import { XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema } from './Queries'
7
6
 
8
7
  export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends XyoModule = XyoModule> extends AbstractNode<TConfig, TModule> {
9
8
  private registeredModuleMap = new Map<string, TModule>()
@@ -21,10 +20,6 @@ export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends
21
20
  this.internalResolver.remove(address)
22
21
  }
23
22
 
24
- public override queries(): string[] {
25
- return [XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, ...super.queries()]
26
- }
27
-
28
23
  override register(module: TModule) {
29
24
  module.resolver = this.internalResolver
30
25
  this.registeredModuleMap.set(module.address, module)
@@ -6,6 +6,8 @@ exports[`MemoryNode description node with child modules serializes to JSON consi
6
6
  "queries": [
7
7
  "network.xyo.query.node.attach",
8
8
  "network.xyo.query.node.detach",
9
+ "network.xyo.query.node.attached",
10
+ "network.xyo.query.node.registered",
9
11
  "network.xyo.query.module.discover",
10
12
  "network.xyo.query.module.subscribe"
11
13
  ],
@@ -48,6 +50,8 @@ exports[`MemoryNode description node with nested nodes and modules serializes to
48
50
  "queries": [
49
51
  "network.xyo.query.node.attach",
50
52
  "network.xyo.query.node.detach",
53
+ "network.xyo.query.node.attached",
54
+ "network.xyo.query.node.registered",
51
55
  "network.xyo.query.module.discover",
52
56
  "network.xyo.query.module.subscribe"
53
57
  ],
@@ -71,6 +75,8 @@ exports[`MemoryNode description node with nested nodes and modules serializes to
71
75
  "queries": [
72
76
  "network.xyo.query.node.attach",
73
77
  "network.xyo.query.node.detach",
78
+ "network.xyo.query.node.attached",
79
+ "network.xyo.query.node.registered",
74
80
  "network.xyo.query.module.discover",
75
81
  "network.xyo.query.module.subscribe"
76
82
  ],
@@ -101,6 +107,8 @@ exports[`MemoryNode description node without child modules serializes to JSON co
101
107
  "queries": [
102
108
  "network.xyo.query.node.attach",
103
109
  "network.xyo.query.node.detach",
110
+ "network.xyo.query.node.attached",
111
+ "network.xyo.query.node.registered",
104
112
  "network.xyo.query.module.discover",
105
113
  "network.xyo.query.module.subscribe"
106
114
  ],