@xyo-network/node-wrapper 2.64.9 → 2.65.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.
Files changed (9) hide show
  1. package/dist/cjs/NodeWrapper.js +19 -4
  2. package/dist/cjs/NodeWrapper.js.map +1 -1
  3. package/dist/esm/NodeWrapper.js +17 -2
  4. package/dist/esm/NodeWrapper.js.map +1 -1
  5. package/dist/types/NodeWrapper.d.ts +5 -3
  6. package/dist/types/NodeWrapper.d.ts.map +1 -1
  7. package/package.json +9 -8
  8. package/src/NodeWrapper.ts +21 -2
  9. package/dist/docs.json +0 -9039
package/dist/cjs/NodeWrapper.js CHANGED
@@ -3,15 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.NodeWrapper = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const address_payload_plugin_1 = require("@xyo-network/address-payload-plugin");
6
- const module_1 = require("@xyo-network/module");
6
+ const module_wrapper_1 = require("@xyo-network/module-wrapper");
7
7
  const node_model_1 = require("@xyo-network/node-model");
8
8
  const payload_model_1 = require("@xyo-network/payload-model");
9
9
  const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
10
- (0, module_1.constructableModuleWrapper)();
11
- class NodeWrapper extends module_1.ModuleWrapper {
10
+ (0, module_wrapper_1.constructableModuleWrapper)();
11
+ class NodeWrapper extends module_wrapper_1.ModuleWrapper {
12
12
  attach(nameOrAddress, external) {
13
13
  var _a;
14
14
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
15
+ if ((0, node_model_1.isNodeInstance)(this.module)) {
16
+ return yield this.module.attach(nameOrAddress, external);
17
+ }
15
18
  const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ external, nameOrAddress, schema: node_model_1.NodeAttachQuerySchema });
16
19
  const payloads = (yield this.sendQuery(queryPayload)).filter((0, payload_model_1.isPayloadOfSchemaType)(address_payload_plugin_1.AddressSchema));
17
20
  return (_a = payloads.pop()) === null || _a === void 0 ? void 0 : _a.address;
@@ -19,6 +22,9 @@ class NodeWrapper extends module_1.ModuleWrapper {
19
22
  }
20
23
  attached() {
21
24
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
25
+ if ((0, node_model_1.isNodeInstance)(this.module)) {
26
+ return yield this.module.attached();
27
+ }
22
28
  const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ schema: node_model_1.NodeAttachedQuerySchema });
23
29
  const payloads = (yield this.sendQuery(queryPayload)).filter((0, payload_model_1.isPayloadOfSchemaType)(address_payload_plugin_1.AddressSchema));
24
30
  return payloads.map((p) => p.address);
@@ -27,13 +33,22 @@ class NodeWrapper extends module_1.ModuleWrapper {
27
33
  detach(nameOrAddress) {
28
34
  var _a;
29
35
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
36
+ if ((0, node_model_1.isNodeInstance)(this.module)) {
37
+ return yield this.module.detach(nameOrAddress);
38
+ }
30
39
  const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ nameOrAddress, schema: node_model_1.NodeDetachQuerySchema });
31
40
  const payloads = (yield this.sendQuery(queryPayload)).filter((0, payload_model_1.isPayloadOfSchemaType)(address_payload_plugin_1.AddressSchema));
32
41
  return (_a = payloads.pop()) === null || _a === void 0 ? void 0 : _a.address;
33
42
  });
34
43
  }
44
+ register(_module) {
45
+ throw Error('Not implemented');
46
+ }
35
47
  registered() {
36
48
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
49
+ if ((0, node_model_1.isNodeInstance)(this.module)) {
50
+ return yield this.module.registered();
51
+ }
37
52
  const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({ schema: node_model_1.NodeRegisteredQuerySchema });
38
53
  const payloads = (yield this.sendQuery(queryPayload)).filter((0, payload_model_1.isPayloadOfSchemaType)(address_payload_plugin_1.AddressSchema));
39
54
  return payloads.map((p) => p.address);
@@ -41,5 +56,5 @@ class NodeWrapper extends module_1.ModuleWrapper {
41
56
  }
42
57
  }
43
58
  exports.NodeWrapper = NodeWrapper;
44
- NodeWrapper.requiredQueries = [node_model_1.NodeAttachQuerySchema, ...module_1.ModuleWrapper.requiredQueries];
59
+ NodeWrapper.requiredQueries = [node_model_1.NodeAttachQuerySchema, ...module_wrapper_1.ModuleWrapper.requiredQueries];
45
60
  //# sourceMappingURL=NodeWrapper.js.map
package/dist/cjs/NodeWrapper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NodeWrapper.js","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":";;;;AAAA,gFAAmF;AACnF,gDAA+E;AAC/E,wDAUgC;AAChC,8DAAkE;AAClE,kEAA6D;AAE7D,IAAA,mCAA0B,GAAE,CAAA;AAC5B,MAAa,WAA4D,SAAQ,sBAA6B;IAGtG,MAAM,CAAC,aAAqB,EAAE,QAAkB;;;YACpD,MAAM,YAAY,GAAG,gCAAc,CAAC,IAAI,CAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,kCAAqB,EAAE,CAAC,CAAA;YACrH,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAA,qCAAqB,EAAiB,sCAAa,CAAC,CAAC,CAAA;YACpI,OAAO,MAAA,QAAQ,CAAC,GAAG,EAAE,0CAAE,OAAO,CAAA;;KAC/B;IAEK,QAAQ;;YACZ,MAAM,YAAY,GAAG,gCAAc,CAAC,IAAI,CAAoB,EAAE,MAAM,EAAE,oCAAuB,EAAE,CAAC,CAAA;YAChG,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAA,qCAAqB,EAAiB,sCAAa,CAAC,CAAC,CAAA;YACpI,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QACvC,CAAC;KAAA;IAEK,MAAM,CAAC,aAAqB;;;YAChC,MAAM,YAAY,GAAG,gCAAc,CAAC,IAAI,CAAkB,EAAE,aAAa,EAAE,MAAM,EAAE,kCAAqB,EAAE,CAAC,CAAA;YAC3G,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAA,qCAAqB,EAAiB,sCAAa,CAAC,CAAC,CAAA;YACpI,OAAO,MAAA,QAAQ,CAAC,GAAG,EAAE,0CAAE,OAAO,CAAA;;KAC/B;IAEK,UAAU;;YACd,MAAM,YAAY,GAAG,gCAAc,CAAC,IAAI,CAAsB,EAAE,MAAM,EAAE,sCAAyB,EAAE,CAAC,CAAA;YACpG,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAA,qCAAqB,EAAiB,sCAAa,CAAC,CAAC,CAAA;YACpI,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QACvC,CAAC;KAAA;;AAzBH,kCA0BC;AAzBiB,2BAAe,GAAG,CAAC,kCAAqB,EAAE,GAAG,sBAAa,CAAC,eAAe,CAAC,CAAA"}
1
+ {"version":3,"file":"NodeWrapper.js","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":";;;;AAAA,gFAAmF;AAEnF,gEAAuF;AACvF,wDAYgC;AAChC,8DAAkE;AAClE,kEAA6D;AAE7D,IAAA,2CAA0B,GAAE,CAAA;AAC5B,MAAa,WAA4D,SAAQ,8BAA6B;IAGtG,MAAM,CAAC,aAAqB,EAAE,QAAkB;;;YACpD,IAAI,IAAA,2BAAc,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAC/B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAA;aACzD;YACD,MAAM,YAAY,GAAG,gCAAc,CAAC,IAAI,CAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,kCAAqB,EAAE,CAAC,CAAA;YACrH,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAA,qCAAqB,EAAiB,sCAAa,CAAC,CAAC,CAAA;YACpI,OAAO,MAAA,QAAQ,CAAC,GAAG,EAAE,0CAAE,OAAO,CAAA;;KAC/B;IAEK,QAAQ;;YACZ,IAAI,IAAA,2BAAc,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAC/B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAA;aACpC;YACD,MAAM,YAAY,GAAG,gCAAc,CAAC,IAAI,CAAoB,EAAE,MAAM,EAAE,oCAAuB,EAAE,CAAC,CAAA;YAChG,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAA,qCAAqB,EAAiB,sCAAa,CAAC,CAAC,CAAA;YACpI,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QACvC,CAAC;KAAA;IAEK,MAAM,CAAC,aAAqB;;;YAChC,IAAI,IAAA,2BAAc,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAC/B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;aAC/C;YACD,MAAM,YAAY,GAAG,gCAAc,CAAC,IAAI,CAAkB,EAAE,aAAa,EAAE,MAAM,EAAE,kCAAqB,EAAE,CAAC,CAAA;YAC3G,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAA,qCAAqB,EAAiB,sCAAa,CAAC,CAAC,CAAA;YACpI,OAAO,MAAA,QAAQ,CAAC,GAAG,EAAE,0CAAE,OAAO,CAAA;;KAC/B;IAED,QAAQ,CAAC,OAAe;QACtB,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAEK,UAAU;;YACd,IAAI,IAAA,2BAAc,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAC/B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAA;aACtC;YACD,MAAM,YAAY,GAAG,gCAAc,CAAC,IAAI,CAAsB,EAAE,MAAM,EAAE,sCAAyB,EAAE,CAAC,CAAA;YACpG,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAA,qCAAqB,EAAiB,sCAAa,CAAC,CAAC,CAAA;YACpI,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QACvC,CAAC;KAAA;;AAzCH,kCA0CC;AAzCiB,2BAAe,GAAG,CAAC,kCAAqB,EAAE,GAAG,8BAAa,CAAC,eAAe,CAAC,CAAA"}
package/dist/esm/NodeWrapper.js CHANGED
@@ -1,27 +1,42 @@
1
1
  import { AddressSchema } from '@xyo-network/address-payload-plugin';
2
- import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module';
3
- import { NodeAttachedQuerySchema, NodeAttachQuerySchema, NodeDetachQuerySchema, NodeRegisteredQuerySchema, } from '@xyo-network/node-model';
2
+ import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module-wrapper';
3
+ import { isNodeInstance, NodeAttachedQuerySchema, NodeAttachQuerySchema, NodeDetachQuerySchema, NodeRegisteredQuerySchema, } from '@xyo-network/node-model';
4
4
  import { isPayloadOfSchemaType } from '@xyo-network/payload-model';
5
5
  import { PayloadWrapper } from '@xyo-network/payload-wrapper';
6
6
  constructableModuleWrapper();
7
7
  export class NodeWrapper extends ModuleWrapper {
8
8
  static requiredQueries = [NodeAttachQuerySchema, ...ModuleWrapper.requiredQueries];
9
9
  async attach(nameOrAddress, external) {
10
+ if (isNodeInstance(this.module)) {
11
+ return await this.module.attach(nameOrAddress, external);
12
+ }
10
13
  const queryPayload = PayloadWrapper.wrap({ external, nameOrAddress, schema: NodeAttachQuerySchema });
11
14
  const payloads = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType(AddressSchema));
12
15
  return payloads.pop()?.address;
13
16
  }
14
17
  async attached() {
18
+ if (isNodeInstance(this.module)) {
19
+ return await this.module.attached();
20
+ }
15
21
  const queryPayload = PayloadWrapper.wrap({ schema: NodeAttachedQuerySchema });
16
22
  const payloads = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType(AddressSchema));
17
23
  return payloads.map((p) => p.address);
18
24
  }
19
25
  async detach(nameOrAddress) {
26
+ if (isNodeInstance(this.module)) {
27
+ return await this.module.detach(nameOrAddress);
28
+ }
20
29
  const queryPayload = PayloadWrapper.wrap({ nameOrAddress, schema: NodeDetachQuerySchema });
21
30
  const payloads = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType(AddressSchema));
22
31
  return payloads.pop()?.address;
23
32
  }
33
+ register(_module) {
34
+ throw Error('Not implemented');
35
+ }
24
36
  async registered() {
37
+ if (isNodeInstance(this.module)) {
38
+ return await this.module.registered();
39
+ }
25
40
  const queryPayload = PayloadWrapper.wrap({ schema: NodeRegisteredQuerySchema });
26
41
  const payloads = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType(AddressSchema));
27
42
  return payloads.map((p) => p.address);
package/dist/esm/NodeWrapper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NodeWrapper.js","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAE,MAAM,qCAAqC,CAAA;AACnF,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAEL,uBAAuB,EAEvB,qBAAqB,EAErB,qBAAqB,EAGrB,yBAAyB,GAC1B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,0BAA0B,EAAE,CAAA;AAC5B,MAAM,OAAO,WAA4D,SAAQ,aAA6B;IAC5G,MAAM,CAAU,eAAe,GAAG,CAAC,qBAAqB,EAAE,GAAG,aAAa,CAAC,eAAe,CAAC,CAAA;IAE3F,KAAK,CAAC,MAAM,CAAC,aAAqB,EAAE,QAAkB;QACpD,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAA;QACrH,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAiB,aAAa,CAAC,CAAC,CAAA;QACpI,OAAO,QAAQ,CAAC,GAAG,EAAE,EAAE,OAAO,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAoB,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAA;QAChG,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAiB,aAAa,CAAC,CAAC,CAAA;QACpI,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IACvC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,aAAqB;QAChC,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAkB,EAAE,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAA;QAC3G,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAiB,aAAa,CAAC,CAAC,CAAA;QACpI,OAAO,QAAQ,CAAC,GAAG,EAAE,EAAE,OAAO,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAsB,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC,CAAA;QACpG,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAiB,aAAa,CAAC,CAAC,CAAA;QACpI,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IACvC,CAAC"}
1
+ {"version":3,"file":"NodeWrapper.js","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"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"}
package/dist/types/NodeWrapper.d.ts CHANGED
@@ -1,10 +1,12 @@
1
- import { ModuleWrapper } from '@xyo-network/module';
2
- import { NodeModule } from '@xyo-network/node-model';
3
- export declare class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends ModuleWrapper<TWrappedModule> {
1
+ import { Module } from '@xyo-network/module-model';
2
+ import { ModuleWrapper } from '@xyo-network/module-wrapper';
3
+ import { DirectNodeModule, NodeModule } from '@xyo-network/node-model';
4
+ export declare class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends ModuleWrapper<TWrappedModule> implements DirectNodeModule {
4
5
  static requiredQueries: string[];
5
6
  attach(nameOrAddress: string, external?: boolean): Promise<string | undefined>;
6
7
  attached(): Promise<string[]>;
7
8
  detach(nameOrAddress: string): Promise<string | undefined>;
9
+ register(_module: Module): void;
8
10
  registered(): Promise<string[]>;
9
11
  }
10
12
  //# sourceMappingURL=NodeWrapper.d.ts.map
package/dist/types/NodeWrapper.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NodeWrapper.d.ts","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAA8B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAOL,UAAU,EAGX,MAAM,yBAAyB,CAAA;AAKhC,qBAAa,WAAW,CAAC,cAAc,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,aAAa,CAAC,cAAc,CAAC;IAC5G,OAAgB,eAAe,WAA4D;IAErF,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAM9E,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAM7B,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAM1D,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAKtC"}
1
+ {"version":3,"file":"NodeWrapper.d.ts","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAClD,OAAO,EAA8B,aAAa,EAAE,MAAM,6BAA6B,CAAA;AACvF,OAAO,EACL,gBAAgB,EAQhB,UAAU,EAGX,MAAM,yBAAyB,CAAA;AAKhC,qBAAa,WAAW,CAAC,cAAc,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,aAAa,CAAC,cAAc,CAAE,YAAW,gBAAgB;IACxI,OAAgB,eAAe,WAA4D;IAErF,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAS9E,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAS7B,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAShE,QAAQ,CAAC,OAAO,EAAE,MAAM;IAIlB,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAQtC"}
package/package.json CHANGED
@@ -10,15 +10,16 @@
10
10
  "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
11
11
  },
12
12
  "dependencies": {
13
- "@xyo-network/address-payload-plugin": "^2.64.9",
14
- "@xyo-network/module": "^2.64.9",
15
- "@xyo-network/node-model": "^2.64.9",
16
- "@xyo-network/payload-model": "^2.64.9",
17
- "@xyo-network/payload-wrapper": "^2.64.9"
13
+ "@xyo-network/address-payload-plugin": "^2.65.0",
14
+ "@xyo-network/module-model": "^2.65.0",
15
+ "@xyo-network/module-wrapper": "^2.65.0",
16
+ "@xyo-network/node-model": "^2.65.0",
17
+ "@xyo-network/payload-model": "^2.65.0",
18
+ "@xyo-network/payload-wrapper": "^2.65.0"
18
19
  },
19
20
  "devDependencies": {
20
- "@xylabs/ts-scripts-yarn3": "^2.18.7",
21
- "@xylabs/tsconfig": "^2.18.7",
21
+ "@xylabs/ts-scripts-yarn3": "^2.18.10",
22
+ "@xylabs/tsconfig": "^2.18.10",
22
23
  "typescript": "^5.1.6"
23
24
  },
24
25
  "description": "Primary SDK for using XYO Protocol 2.0",
@@ -54,5 +55,5 @@
54
55
  },
55
56
  "sideEffects": false,
56
57
  "types": "dist/types/index.d.ts",
57
- "version": "2.64.9"
58
+ "version": "2.65.0"
58
59
  }
package/src/NodeWrapper.ts CHANGED
@@ -1,6 +1,9 @@
1
1
  import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
2
- import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module'
2
+ import { Module } from '@xyo-network/module-model'
3
+ import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module-wrapper'
3
4
  import {
5
+ DirectNodeModule,
6
+ isNodeInstance,
4
7
  NodeAttachedQuery,
5
8
  NodeAttachedQuerySchema,
6
9
  NodeAttachQuery,
@@ -15,28 +18,44 @@ import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
15
18
  import { PayloadWrapper } from '@xyo-network/payload-wrapper'
16
19
 
17
20
  constructableModuleWrapper()
18
- export class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends ModuleWrapper<TWrappedModule> {
21
+ export class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends ModuleWrapper<TWrappedModule> implements DirectNodeModule {
19
22
  static override requiredQueries = [NodeAttachQuerySchema, ...ModuleWrapper.requiredQueries]
20
23
 
21
24
  async attach(nameOrAddress: string, external?: boolean): Promise<string | undefined> {
25
+ if (isNodeInstance(this.module)) {
26
+ return await this.module.attach(nameOrAddress, external)
27
+ }
22
28
  const queryPayload = PayloadWrapper.wrap<NodeAttachQuery>({ external, nameOrAddress, schema: NodeAttachQuerySchema })
23
29
  const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType<AddressPayload>(AddressSchema))
24
30
  return payloads.pop()?.address
25
31
  }
26
32
 
27
33
  async attached(): Promise<string[]> {
34
+ if (isNodeInstance(this.module)) {
35
+ return await this.module.attached()
36
+ }
28
37
  const queryPayload = PayloadWrapper.wrap<NodeAttachedQuery>({ schema: NodeAttachedQuerySchema })
29
38
  const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType<AddressPayload>(AddressSchema))
30
39
  return payloads.map((p) => p.address)
31
40
  }
32
41
 
33
42
  async detach(nameOrAddress: string): Promise<string | undefined> {
43
+ if (isNodeInstance(this.module)) {
44
+ return await this.module.detach(nameOrAddress)
45
+ }
34
46
  const queryPayload = PayloadWrapper.wrap<NodeDetachQuery>({ nameOrAddress, schema: NodeDetachQuerySchema })
35
47
  const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType<AddressPayload>(AddressSchema))
36
48
  return payloads.pop()?.address
37
49
  }
38
50
 
51
+ register(_module: Module) {
52
+ throw Error('Not implemented')
53
+ }
54
+
39
55
  async registered(): Promise<string[]> {
56
+ if (isNodeInstance(this.module)) {
57
+ return await this.module.registered()
58
+ }
40
59
  const queryPayload = PayloadWrapper.wrap<NodeRegisteredQuery>({ schema: NodeRegisteredQuerySchema })
41
60
  const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType<AddressPayload>(AddressSchema))
42
61
  return payloads.map((p) => p.address)