@xyo-network/node-wrapper 2.53.21 → 2.53.23

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.
@@ -1,29 +1,15 @@
1
- import { assertEx } from '@xylabs/assert';
2
1
  import { AddressSchema } from '@xyo-network/address-payload-plugin';
3
- import { ModuleWrapper } from '@xyo-network/module';
2
+ import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module';
4
3
  import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeRegisteredQuerySchema, } from '@xyo-network/node-model';
5
4
  import { isPayloadOfSchemaType } from '@xyo-network/payload-model';
6
5
  import { PayloadWrapper } from '@xyo-network/payload-wrapper';
6
+ constructableModuleWrapper();
7
7
  export class NodeWrapper extends ModuleWrapper {
8
8
  static requiredQueries = [XyoNodeAttachQuerySchema, ...ModuleWrapper.requiredQueries];
9
9
  static isNodeModule(module) {
10
10
  const missingRequiredQueries = this.missingRequiredQueries(module);
11
11
  return missingRequiredQueries.length === 0;
12
12
  }
13
- static tryWrap(module, account) {
14
- if (module) {
15
- const missingRequiredQueries = this.missingRequiredQueries(module);
16
- if (missingRequiredQueries.length > 0) {
17
- this.defaultLogger?.debug(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`);
18
- }
19
- else {
20
- return new NodeWrapper({ account, module });
21
- }
22
- }
23
- }
24
- static wrap(module, account) {
25
- return assertEx(this.tryWrap(module, account), 'Unable to wrap module as NodeWrapper');
26
- }
27
13
  async attach(address, external) {
28
14
  const queryPayload = PayloadWrapper.parse({ address, external, schema: XyoNodeAttachQuerySchema });
29
15
  await this.sendQuery(queryPayload);
@@ -1 +1 @@
1
- {"version":3,"file":"NodeWrapper.js","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"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"}
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,EAAU,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACvF,OAAO,EAGL,0BAA0B,EAE1B,wBAAwB,EAExB,wBAAwB,EAExB,4BAA4B,GAC7B,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,wBAAwB,EAAE,GAAG,aAAa,CAAC,eAAe,CAAC,CAAA;IAE9F,MAAM,CAAC,YAAY,CAAC,MAAc;QAChC,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;QAClE,OAAO,sBAAsB,CAAC,MAAM,KAAK,CAAC,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAe,EAAE,QAAkB;QAC9C,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAqB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAA;QACtH,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAuB,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC,CAAA;QACvG,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,OAAe;QAC1B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAA;QAC5G,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAyB,EAAE,MAAM,EAAE,4BAA4B,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,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IACvC,CAAC"}
@@ -1,11 +1,8 @@
1
- import { AccountInstance } from '@xyo-network/account-model';
2
1
  import { Module, ModuleWrapper } from '@xyo-network/module';
3
2
  import { NodeModule } from '@xyo-network/node-model';
4
3
  export declare class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends ModuleWrapper<TWrappedModule> {
5
4
  static requiredQueries: string[];
6
5
  static isNodeModule(module: Module): boolean;
7
- static tryWrap<TModule extends NodeModule = NodeModule>(module?: TModule, account?: AccountInstance): NodeWrapper<TModule> | undefined;
8
- static wrap<TModule extends NodeModule = NodeModule>(module?: TModule, account?: AccountInstance): NodeWrapper<TModule>;
9
6
  attach(address: string, external?: boolean): Promise<void>;
10
7
  attached(): Promise<string[]>;
11
8
  detach(address: string): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"NodeWrapper.d.ts","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EACL,UAAU,EASX,MAAM,yBAAyB,CAAA;AAIhC,qBAAa,WAAW,CAAC,cAAc,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,aAAa,CAAC,cAAc,CAAC;IAC5G,OAAgB,eAAe,WAA+D;IAE9F,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM;WAKlB,OAAO,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,SAAS;WAW/H,IAAI,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,WAAW,CAAC,OAAO,CAAC;IAI1H,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1D,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAM7B,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtC,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAKtC"}
1
+ {"version":3,"file":"NodeWrapper.d.ts","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAA8B,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACvF,OAAO,EACL,UAAU,EASX,MAAM,yBAAyB,CAAA;AAKhC,qBAAa,WAAW,CAAC,cAAc,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,aAAa,CAAC,cAAc,CAAC;IAC5G,OAAgB,eAAe,WAA+D;IAE9F,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM;IAK5B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1D,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAM7B,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtC,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAKtC"}
package/package.json CHANGED
@@ -11,12 +11,12 @@
11
11
  },
12
12
  "dependencies": {
13
13
  "@xylabs/assert": "^2.7.6",
14
- "@xyo-network/account-model": "^2.53.21",
15
- "@xyo-network/address-payload-plugin": "^2.53.21",
16
- "@xyo-network/module": "^2.53.21",
17
- "@xyo-network/node-model": "^2.53.21",
18
- "@xyo-network/payload-model": "^2.53.21",
19
- "@xyo-network/payload-wrapper": "^2.53.21"
14
+ "@xyo-network/account-model": "^2.53.23",
15
+ "@xyo-network/address-payload-plugin": "^2.53.23",
16
+ "@xyo-network/module": "^2.53.23",
17
+ "@xyo-network/node-model": "^2.53.23",
18
+ "@xyo-network/payload-model": "^2.53.23",
19
+ "@xyo-network/payload-wrapper": "^2.53.23"
20
20
  },
21
21
  "devDependencies": {
22
22
  "@xylabs/ts-scripts-yarn3": "^2.16.1",
@@ -56,5 +56,5 @@
56
56
  },
57
57
  "sideEffects": false,
58
58
  "types": "dist/types/index.d.ts",
59
- "version": "2.53.21"
59
+ "version": "2.53.23"
60
60
  }
@@ -1,7 +1,5 @@
1
- import { assertEx } from '@xylabs/assert'
2
- import { AccountInstance } from '@xyo-network/account-model'
3
1
  import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
4
- import { Module, ModuleWrapper } from '@xyo-network/module'
2
+ import { constructableModuleWrapper, Module, ModuleWrapper } from '@xyo-network/module'
5
3
  import {
6
4
  NodeModule,
7
5
  XyoNodeAttachedQuery,
@@ -16,6 +14,7 @@ import {
16
14
  import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
17
15
  import { PayloadWrapper } from '@xyo-network/payload-wrapper'
18
16
 
17
+ constructableModuleWrapper()
19
18
  export class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends ModuleWrapper<TWrappedModule> {
20
19
  static override requiredQueries = [XyoNodeAttachQuerySchema, ...ModuleWrapper.requiredQueries]
21
20
 
@@ -24,21 +23,6 @@ export class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends
24
23
  return missingRequiredQueries.length === 0
25
24
  }
26
25
 
27
- static override tryWrap<TModule extends NodeModule = NodeModule>(module?: TModule, account?: AccountInstance): NodeWrapper<TModule> | undefined {
28
- if (module) {
29
- const missingRequiredQueries = this.missingRequiredQueries(module)
30
- if (missingRequiredQueries.length > 0) {
31
- this.defaultLogger?.debug(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`)
32
- } else {
33
- return new NodeWrapper<TModule>({ account, module })
34
- }
35
- }
36
- }
37
-
38
- static override wrap<TModule extends NodeModule = NodeModule>(module?: TModule, account?: AccountInstance): NodeWrapper<TModule> {
39
- return assertEx(this.tryWrap(module, account), 'Unable to wrap module as NodeWrapper')
40
- }
41
-
42
26
  async attach(address: string, external?: boolean): Promise<void> {
43
27
  const queryPayload = PayloadWrapper.parse<XyoNodeAttachQuery>({ address, external, schema: XyoNodeAttachQuerySchema })
44
28
  await this.sendQuery(queryPayload)