@xyo-network/node-wrapper 2.61.1 → 2.61.2

package/dist/esm/NodeWrapper.js

@@ -1,32 +1,32 @@
 import { AddressSchema } from '@xyo-network/address-payload-plugin';
 import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module';
-import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeRegisteredQuerySchema, } from '@xyo-network/node-model';
+import { NodeAttachedQuerySchema, NodeAttachQuerySchema, NodeDetachQuerySchema, NodeRegisteredQuerySchema, } from '@xyo-network/node-model';
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 constructableModuleWrapper();
 export class NodeWrapper extends ModuleWrapper {
-    static requiredQueries = [XyoNodeAttachQuerySchema, ...ModuleWrapper.requiredQueries];
+    static requiredQueries = [NodeAttachQuerySchema, ...ModuleWrapper.requiredQueries];
     static isNodeModule(module) {
         const missingRequiredQueries = this.missingRequiredQueries(module);
         return missingRequiredQueries.length === 0;
     }
     async attach(nameOrAddress, external) {
-        const queryPayload = PayloadWrapper.parse({ external, nameOrAddress, schema: XyoNodeAttachQuerySchema });
+        const queryPayload = PayloadWrapper.wrap({ external, nameOrAddress, schema: NodeAttachQuerySchema });
         const payloads = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType(AddressSchema));
         return payloads.pop()?.address;
     }
     async attached() {
-        const queryPayload = PayloadWrapper.parse({ schema: XyoNodeAttachedQuerySchema });
+        const queryPayload = PayloadWrapper.wrap({ schema: NodeAttachedQuerySchema });
         const payloads = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType(AddressSchema));
         return payloads.map((p) => p.address);
     }
     async detach(nameOrAddress) {
-        const queryPayload = PayloadWrapper.parse({ nameOrAddress, schema: XyoNodeDetachQuerySchema });
+        const queryPayload = PayloadWrapper.wrap({ nameOrAddress, schema: NodeDetachQuerySchema });
         const payloads = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType(AddressSchema));
         return payloads.pop()?.address;
     }
     async registered() {
-        const queryPayload = PayloadWrapper.parse({ schema: XyoNodeRegisteredQuerySchema });
+        const queryPayload = PayloadWrapper.wrap({ schema: NodeRegisteredQuerySchema });
         const payloads = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType(AddressSchema));
         return payloads.map((p) => p.address);
     }

package/dist/esm/NodeWrapper.js.map

@@ -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,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,aAAqB,EAAE,QAAkB;QACpD,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAqB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAA;QAC5H,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,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,aAAqB;QAChC,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAqB,EAAE,aAAa,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAA;QAClH,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,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"}
+{"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,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,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,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"}

package/dist/types/NodeWrapper.d.ts.map

@@ -1 +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,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"}
+{"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,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;IAE3F,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM;IAK5B,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"}

package/package.json

@@ -10,11 +10,11 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/address-payload-plugin": "^2.61.1",
-    "@xyo-network/module": "^2.61.1",
-    "@xyo-network/node-model": "^2.61.1",
-    "@xyo-network/payload-model": "^2.61.1",
-    "@xyo-network/payload-wrapper": "^2.61.1"
+    "@xyo-network/address-payload-plugin": "^2.61.2",
+    "@xyo-network/module": "^2.61.2",
+    "@xyo-network/node-model": "^2.61.2",
+    "@xyo-network/payload-model": "^2.61.2",
+    "@xyo-network/payload-wrapper": "^2.61.2"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.17.13",
@@ -54,5 +54,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.61.1"
+  "version": "2.61.2"
 }

package/src/NodeWrapper.ts

@@ -1,22 +1,22 @@
 import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
 import { constructableModuleWrapper, Module, ModuleWrapper } from '@xyo-network/module'
 import {
+  NodeAttachedQuery,
+  NodeAttachedQuerySchema,
+  NodeAttachQuery,
+  NodeAttachQuerySchema,
+  NodeDetachQuery,
+  NodeDetachQuerySchema,
   NodeModule,
-  XyoNodeAttachedQuery,
-  XyoNodeAttachedQuerySchema,
-  XyoNodeAttachQuery,
-  XyoNodeAttachQuerySchema,
-  XyoNodeDetachQuery,
-  XyoNodeDetachQuerySchema,
-  XyoNodeRegisteredQuery,
-  XyoNodeRegisteredQuerySchema,
+  NodeRegisteredQuery,
+  NodeRegisteredQuerySchema,
 } from '@xyo-network/node-model'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
 constructableModuleWrapper()
 export class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends ModuleWrapper<TWrappedModule> {
-  static override requiredQueries = [XyoNodeAttachQuerySchema, ...ModuleWrapper.requiredQueries]
+  static override requiredQueries = [NodeAttachQuerySchema, ...ModuleWrapper.requiredQueries]
 
   static isNodeModule(module: Module) {
     const missingRequiredQueries = this.missingRequiredQueries(module)
@@ -24,25 +24,25 @@ export class NodeWrapper<TWrappedModule extends NodeModule = NodeModule> extends
   }
 
   async attach(nameOrAddress: string, external?: boolean): Promise<string | undefined> {
-    const queryPayload = PayloadWrapper.parse<XyoNodeAttachQuery>({ external, nameOrAddress, schema: XyoNodeAttachQuerySchema })
+    const queryPayload = PayloadWrapper.wrap<NodeAttachQuery>({ external, nameOrAddress, schema: NodeAttachQuerySchema })
     const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType<AddressPayload>(AddressSchema))
     return payloads.pop()?.address
   }
 
   async attached(): Promise<string[]> {
-    const queryPayload = PayloadWrapper.parse<XyoNodeAttachedQuery>({ schema: XyoNodeAttachedQuerySchema })
+    const queryPayload = PayloadWrapper.wrap<NodeAttachedQuery>({ schema: NodeAttachedQuerySchema })
     const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType<AddressPayload>(AddressSchema))
     return payloads.map((p) => p.address)
   }
 
   async detach(nameOrAddress: string): Promise<string | undefined> {
-    const queryPayload = PayloadWrapper.parse<XyoNodeDetachQuery>({ nameOrAddress, schema: XyoNodeDetachQuerySchema })
+    const queryPayload = PayloadWrapper.wrap<NodeDetachQuery>({ nameOrAddress, schema: NodeDetachQuerySchema })
     const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType<AddressPayload>(AddressSchema))
     return payloads.pop()?.address
   }
 
   async registered(): Promise<string[]> {
-    const queryPayload = PayloadWrapper.parse<XyoNodeRegisteredQuery>({ schema: XyoNodeRegisteredQuerySchema })
+    const queryPayload = PayloadWrapper.wrap<NodeRegisteredQuery>({ schema: NodeRegisteredQuerySchema })
     const payloads: AddressPayload[] = (await this.sendQuery(queryPayload)).filter(isPayloadOfSchemaType<AddressPayload>(AddressSchema))
     return payloads.map((p) => p.address)
   }