@xyo-network/bridge 2.34.0 → 2.36.0-rc.1

package/dist/esm/XyoBridge.d.ts

@@ -1,5 +1,5 @@
 import { XyoBoundWitness } from '@xyo-network/boundwitness';
-import { XyoModule, XyoQuery } from '@xyo-network/module';
+import { XyoModule, XyoQuery, XyoQueryBoundWitness } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { BridgeModule } from './Bridge';
@@ -9,7 +9,7 @@ export declare abstract class XyoBridge<TConfig extends XyoBridgeConfig = XyoBri
     abstract connect(): Promisable<boolean>;
     abstract disconnect(): Promisable<boolean>;
     abstract forward(query: XyoQuery): Promise<[XyoBoundWitness, (XyoPayload | null)[]]>;
-    query<T extends XyoQuery = XyoQuery>(bw: XyoBoundWitness, query: T): Promise<import("@xyo-network/module").XyoModuleQueryResult<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+    query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T): Promise<import("@xyo-network/module").ModuleQueryResult<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
         schema: string;
     }>>;
 }

package/dist/esm/XyoBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoBridge.d.ts","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAG1C,8BAAsB,SAAS,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,CAAE,SAAQ,SAAS,CAAC,OAAO,CAAE,YAAW,YAAY;IAC1H,OAAO;IAIhB,QAAQ,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IACvC,QAAQ,CAAC,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;IAE1C,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IAErE,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;;;CAwBlF"}
+{"version":3,"file":"XyoBridge.d.ts","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAA4B,SAAS,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AACzG,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAG1C,8BAAsB,SAAS,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,CAAE,SAAQ,SAAS,CAAC,OAAO,CAAE,YAAW,YAAY;IAC1H,OAAO;IAIhB,QAAQ,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IACvC,QAAQ,CAAC,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;IAE1C,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IAErE,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC;;;CA0BrF"}

package/dist/esm/XyoBridge.js

@@ -1,16 +1,17 @@
 import { assertEx } from '@xylabs/assert';
 import { XyoAccount } from '@xyo-network/account';
-import { XyoModule } from '@xyo-network/module';
+import { QueryBoundWitnessWrapper, XyoModule } from '@xyo-network/module';
 import { XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema } from './Queries';
 export class XyoBridge extends XyoModule {
     queries() {
         return [XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema, ...super.queries()];
     }
-    async query(bw, query) {
-        assertEx(this.queryable(query.schema, bw.addresses));
+    async query(query) {
+        const wrapper = QueryBoundWitnessWrapper.parseQuery(query);
+        const typedQuery = wrapper.query.payload;
+        assertEx(this.queryable(typedQuery.schema, wrapper.addresses));
         const payloads = [];
         const queryAccount = new XyoAccount();
-        const typedQuery = query;
         switch (typedQuery.schema) {
             case XyoBridgeConnectQuerySchema: {
                 await this.connect();
@@ -21,14 +22,14 @@ export class XyoBridge extends XyoModule {
                 break;
             }
             default:
-                if (super.queries().includes(query.schema)) {
-                    return super.query(bw, query);
+                if (super.queries().includes(typedQuery.schema)) {
+                    return super.query(query);
                 }
                 else {
                     return this.forward(typedQuery);
                 }
         }
-        return this.bindPayloads(payloads, queryAccount);
+        return this.bindResult(payloads, queryAccount);
     }
 }
 //# sourceMappingURL=XyoBridge.js.map

package/dist/esm/XyoBridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoBridge.js","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,SAAS,EAAY,MAAM,qBAAqB,CAAA;AAMzD,OAAO,EAAE,2BAA2B,EAAE,8BAA8B,EAAkB,MAAM,WAAW,CAAA;AAEvG,MAAM,OAAgB,SAA6D,SAAQ,SAAkB;IAClG,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,8BAA8B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1F,CAAC;IAOQ,KAAK,CAAC,KAAK,CAAgC,EAAmB,EAAE,KAAQ;QAC/E,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;QAEpD,MAAM,QAAQ,GAA0B,EAAE,CAAA;QAC1C,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,MAAM,UAAU,GAAG,KAAuB,CAAA;QAC1C,QAAQ,UAAU,CAAC,MAAM,EAAE;YACzB,KAAK,2BAA2B,CAAC,CAAC;gBAChC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;gBACpB,MAAK;aACN;YACD,KAAK,8BAA8B,CAAC,CAAC;gBACnC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;gBACvB,MAAK;aACN;YACD;gBACE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;oBAC1C,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;iBAC9B;qBAAM;oBACL,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;iBAChC;SACJ;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IAClD,CAAC;CACF"}
+{"version":3,"file":"XyoBridge.js","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,wBAAwB,EAAE,SAAS,EAAkC,MAAM,qBAAqB,CAAA;AAMzG,OAAO,EAAE,2BAA2B,EAAE,8BAA8B,EAAkB,MAAM,WAAW,CAAA;AAEvG,MAAM,OAAgB,SAA6D,SAAQ,SAAkB;IAClG,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,8BAA8B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1F,CAAC;IAOQ,KAAK,CAAC,KAAK,CAAwD,KAAQ;QAClF,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAiB,KAAK,CAAC,CAAA;QAC1E,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,QAAQ,GAA0B,EAAE,CAAA;QAC1C,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QAErC,QAAQ,UAAU,CAAC,MAAM,EAAE;YACzB,KAAK,2BAA2B,CAAC,CAAC;gBAChC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;gBACpB,MAAK;aACN;YACD,KAAK,8BAA8B,CAAC,CAAC;gBACnC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;gBACvB,MAAK;aACN;YACD;gBACE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;oBAC/C,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;iBAC1B;qBAAM;oBACL,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;iBAChC;SACJ;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IAChD,CAAC;CACF"}

package/dist/esm/XyoBridgeWrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoBridgeWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoBridgeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAGjC,qBAAa,gBAAiB,SAAQ,gBAAiB,YAAW,MAAM;IAChE,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOvC,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAMjD"}
+{"version":3,"file":"XyoBridgeWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoBridgeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAGjC,qBAAa,gBAAiB,SAAQ,gBAAiB,YAAW,MAAM;IAChE,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOvC,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAMjD"}

package/dist/esm/XyoBridgeWrapper.js

@@ -1,16 +1,17 @@
 import { XyoModuleWrapper } from '@xyo-network/module';
+import { PayloadWrapper } from '@xyo-network/payload';
 import { XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema } from './Queries';
 export class XyoBridgeWrapper extends XyoModuleWrapper {
     async connect(uri) {
-        const query = { schema: XyoBridgeConnectQuerySchema, uri };
-        const bw = (await this.bindPayloads([query]))[0];
-        await this.module.query(bw, query);
+        const queryPayload = PayloadWrapper.parse({ schema: XyoBridgeConnectQuerySchema, uri });
+        const query = await this.bindQuery([queryPayload.body], queryPayload.hash);
+        await this.module.query(query[0], query[1]);
         return true;
     }
     async disconnect(uri) {
-        const query = { schema: XyoBridgeDisconnectQuerySchema, uri };
-        const bw = (await this.bindPayloads([query]))[0];
-        await this.module.query(bw, query);
+        const queryPayload = PayloadWrapper.parse({ schema: XyoBridgeDisconnectQuerySchema, uri });
+        const query = await this.bindQuery([queryPayload.body], queryPayload.hash);
+        await this.module.query(query[0], query[1]);
         return true;
     }
 }

package/dist/esm/XyoBridgeWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoBridgeWrapper.js","sourceRoot":"","sources":["../../src/XyoBridgeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,EAAE,2BAA2B,EAAE,8BAA8B,EAAkB,MAAM,WAAW,CAAA;AAEvG,MAAM,OAAO,gBAAiB,SAAQ,gBAAgB;IACpD,KAAK,CAAC,OAAO,CAAC,GAAY;QACxB,MAAM,KAAK,GAAmB,EAAE,MAAM,EAAE,2BAA2B,EAAE,GAAG,EAAE,CAAA;QAC1E,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAChD,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QAClC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAY;QAC3B,MAAM,KAAK,GAAmB,EAAE,MAAM,EAAE,8BAA8B,EAAE,GAAG,EAAE,CAAA;QAC7E,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAChD,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QAClC,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}
+{"version":3,"file":"XyoBridgeWrapper.js","sourceRoot":"","sources":["../../src/XyoBridgeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,2BAA2B,EAAE,8BAA8B,EAAkB,MAAM,WAAW,CAAA;AAEvG,MAAM,OAAO,gBAAiB,SAAQ,gBAAgB;IACpD,KAAK,CAAC,OAAO,CAAC,GAAY;QACxB,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAiB,EAAE,MAAM,EAAE,2BAA2B,EAAE,GAAG,EAAE,CAAC,CAAA;QACvG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,CAAA;QAC1E,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC3C,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAY;QAC3B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAiB,EAAE,MAAM,EAAE,8BAA8B,EAAE,GAAG,EAAE,CAAC,CAAA;QAC1G,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,CAAA;QAC1E,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC3C,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}

package/dist/esm/XyoHttpBridge.d.ts

@@ -1,5 +1,5 @@
 import { XyoBoundWitness } from '@xyo-network/boundwitness';
-import { XyoModule, XyoModuleQueryResult, XyoQuery } from '@xyo-network/module';
+import { ModuleQueryResult, XyoModule, XyoQuery, XyoQueryBoundWitness } from '@xyo-network/module';
 import { XyoPayloads } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { AxiosRequestHeaders } from 'axios';
@@ -22,7 +22,7 @@ export declare class XyoHttpBridge extends XyoModule<XyoHttpBridgeConfig> implem
     get targetAddressString(): string;
     connect(): Promisable<boolean>;
     disconnect(): Promisable<boolean>;
-    protected forward(query: XyoQuery): Promise<[XyoBoundWitness, XyoPayloads]>;
-    query<T extends XyoQuery = XyoQuery>(bw: XyoBoundWitness, query: T): Promise<XyoModuleQueryResult>;
+    protected forward(query: XyoQuery, _payloads?: XyoPayloads): Promise<[XyoBoundWitness, XyoPayloads]>;
+    query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayloads): Promise<ModuleQueryResult>;
 }
 //# sourceMappingURL=XyoHttpBridge.d.ts.map

package/dist/esm/XyoHttpBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoHttpBridge.d.ts","sourceRoot":"","sources":["../../src/XyoHttpBridge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAc,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAc,mBAAmB,EAAE,MAAM,OAAO,CAAA;AAEvD,OAAO,EAAa,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAGrD,oBAAY,yBAAyB,GAAG,gCAAgC,CAAA;AACxE,eAAO,MAAM,yBAAyB,EAAE,yBAA4D,CAAA;AAEpG,oBAAY,mBAAmB,GAAG,eAAe,CAAC;IAChD,MAAM,EAAE,yBAAyB,CAAA;IACjC,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,KAAK,CAAC,EAAE,sBAAsB,CAAA;CAC/B,CAAC,CAAA;AAEF,qBAAa,aAAc,SAAQ,SAAS,CAAC,mBAAmB,CAAE,YAAW,YAAY;IACvF,OAAO,CAAC,KAAK,CAAW;gBAEZ,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAC;IAK5D,IAAW,OAAO,WAEjB;IAED,IAAW,aAAa,uBAEvB;IAED,IAAW,mBAAmB,WAE7B;IAED,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IAI9B,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;cAIjB,OAAO,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAalE,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAsBlH"}
+{"version":3,"file":"XyoHttpBridge.d.ts","sourceRoot":"","sources":["../../src/XyoHttpBridge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAA4B,SAAS,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC5H,OAAO,EAAc,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAc,mBAAmB,EAAE,MAAM,OAAO,CAAA;AAEvD,OAAO,EAAa,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAGrD,oBAAY,yBAAyB,GAAG,gCAAgC,CAAA;AACxE,eAAO,MAAM,yBAAyB,EAAE,yBAA4D,CAAA;AAEpG,oBAAY,mBAAmB,GAAG,eAAe,CAAC;IAChD,MAAM,EAAE,yBAAyB,CAAA;IACjC,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,KAAK,CAAC,EAAE,sBAAsB,CAAA;CAC/B,CAAC,CAAA;AAEF,qBAAa,aAAc,SAAQ,SAAS,CAAC,mBAAmB,CAAE,YAAW,YAAY;IACvF,OAAO,CAAC,KAAK,CAAW;gBAEZ,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAC;IAK5D,IAAW,OAAO,WAEjB;IAED,IAAW,aAAa,uBAEvB;IAED,IAAW,mBAAmB,WAE7B;IAED,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IAI9B,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;cAIjB,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAa3F,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAwB1I"}

package/dist/esm/XyoHttpBridge.js

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert';
 import { XyoAccount } from '@xyo-network/account';
-import { XyoModule } from '@xyo-network/module';
+import { QueryBoundWitnessWrapper, XyoModule } from '@xyo-network/module';
 import { AxiosJson } from './AxiosJson';
 import { XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema } from './Queries';
 export const XyoHttpBridgeConfigSchema = 'network.xyo.bridge.http.config';
@@ -25,9 +25,9 @@ export class XyoHttpBridge extends XyoModule {
     disconnect() {
         return true;
     }
-    async forward(query) {
+    async forward(query, _payloads) {
         try {
-            const boundQuery = this.bindPayloads([query]);
+            const boundQuery = this.bindQuery([query]);
             const result = await this.axios.post(`${this.nodeUri}/${this.address}`, [boundQuery, ...[query]]);
             return result.data;
         }
@@ -38,11 +38,13 @@ export class XyoHttpBridge extends XyoModule {
             throw error;
         }
     }
-    async query(bw, query) {
-        assertEx(this.queryable(query.schema, bw.addresses));
+    async query(query, payloads) {
+        const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
+        const typedQuery = wrapper.query.payload;
+        assertEx(this.queryable(typedQuery.schema, wrapper.addresses));
         const queryAccount = new XyoAccount();
-        const payloads = [];
-        switch (query.schema) {
+        const resultPayloads = [];
+        switch (typedQuery.schema) {
             case XyoBridgeConnectQuerySchema: {
                 await this.connect();
                 break;
@@ -52,14 +54,14 @@ export class XyoHttpBridge extends XyoModule {
                 break;
             }
             default:
-                if (super.queries().find((schema) => schema === query.schema)) {
-                    return super.query(bw, query);
+                if (super.queries().find((schema) => schema === typedQuery.schema)) {
+                    return super.query(query, payloads);
                 }
                 else {
-                    return this.forward(query);
+                    return this.forward(query, payloads);
                 }
         }
-        return this.bindPayloads(payloads, queryAccount);
+        return this.bindResult(resultPayloads, queryAccount);
     }
 }
 //# sourceMappingURL=XyoHttpBridge.js.map

package/dist/esm/XyoHttpBridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoHttpBridge.js","sourceRoot":"","sources":["../../src/XyoHttpBridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"XyoHttpBridge.js","sourceRoot":"","sources":["../../src/XyoHttpBridge.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.6.7",
-    "@xyo-network/account": "^2.34.0",
-    "@xyo-network/boundwitness": "^2.34.0",
-    "@xyo-network/module": "^2.34.0",
-    "@xyo-network/payload": "^2.34.0",
-    "@xyo-network/promise": "^2.34.0",
+    "@xyo-network/account": "^2.36.0-rc.1",
+    "@xyo-network/boundwitness": "^2.36.0-rc.1",
+    "@xyo-network/module": "^2.36.0-rc.1",
+    "@xyo-network/payload": "^2.36.0-rc.1",
+    "@xyo-network/promise": "^2.36.0-rc.1",
     "pako": "^2.0.4",
     "tslib": "^2.4.0"
   },
@@ -55,5 +55,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.34.0"
+  "version": "2.36.0-rc.1",
+  "stableVersion": "2.35.0"
 }

package/src/XyoBridge.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import { XyoAccount } from '@xyo-network/account'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
-import { XyoModule, XyoQuery } from '@xyo-network/module'
+import { QueryBoundWitnessWrapper, XyoModule, XyoQuery, XyoQueryBoundWitness } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
 import { Promisable } from '@xyo-network/promise'
 
@@ -19,12 +19,14 @@ export abstract class XyoBridge<TConfig extends XyoBridgeConfig = XyoBridgeConfi
 
   abstract forward(query: XyoQuery): Promise<[XyoBoundWitness, (XyoPayload | null)[]]>
 
-  override async query<T extends XyoQuery = XyoQuery>(bw: XyoBoundWitness, query: T) {
-    assertEx(this.queryable(query.schema, bw.addresses))
+  override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T) {
+    const wrapper = QueryBoundWitnessWrapper.parseQuery<XyoBridgeQuery>(query)
+    const typedQuery = wrapper.query.payload
+    assertEx(this.queryable(typedQuery.schema, wrapper.addresses))
 
     const payloads: (XyoPayload | null)[] = []
     const queryAccount = new XyoAccount()
-    const typedQuery = query as XyoBridgeQuery
+
     switch (typedQuery.schema) {
       case XyoBridgeConnectQuerySchema: {
         await this.connect()
@@ -35,12 +37,12 @@ export abstract class XyoBridge<TConfig extends XyoBridgeConfig = XyoBridgeConfi
         break
       }
       default:
-        if (super.queries().includes(query.schema)) {
-          return super.query(bw, query)
+        if (super.queries().includes(typedQuery.schema)) {
+          return super.query(query)
         } else {
           return this.forward(typedQuery)
         }
     }
-    return this.bindPayloads(payloads, queryAccount)
+    return this.bindResult(payloads, queryAccount)
   }
 }

package/src/XyoBridgeWrapper.ts

@@ -1,20 +1,21 @@
 import { XyoModuleWrapper } from '@xyo-network/module'
+import { PayloadWrapper } from '@xyo-network/payload'
 
 import { Bridge } from './Bridge'
 import { XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema, XyoBridgeQuery } from './Queries'
 
 export class XyoBridgeWrapper extends XyoModuleWrapper implements Bridge {
   async connect(uri?: string): Promise<boolean> {
-    const query: XyoBridgeQuery = { schema: XyoBridgeConnectQuerySchema, uri }
-    const bw = (await this.bindPayloads([query]))[0]
-    await this.module.query(bw, query)
+    const queryPayload = PayloadWrapper.parse<XyoBridgeQuery>({ schema: XyoBridgeConnectQuerySchema, uri })
+    const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+    await this.module.query(query[0], query[1])
     return true
   }
 
   async disconnect(uri?: string): Promise<boolean> {
-    const query: XyoBridgeQuery = { schema: XyoBridgeDisconnectQuerySchema, uri }
-    const bw = (await this.bindPayloads([query]))[0]
-    await this.module.query(bw, query)
+    const queryPayload = PayloadWrapper.parse<XyoBridgeQuery>({ schema: XyoBridgeDisconnectQuerySchema, uri })
+    const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+    await this.module.query(query[0], query[1])
     return true
   }
 }

package/src/XyoHttpBridge.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import { XyoAccount } from '@xyo-network/account'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
-import { XyoModule, XyoModuleQueryResult, XyoQuery } from '@xyo-network/module'
+import { ModuleQueryResult, QueryBoundWitnessWrapper, XyoModule, XyoQuery, XyoQueryBoundWitness } from '@xyo-network/module'
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload'
 import { Promisable } from '@xyo-network/promise'
 import { AxiosError, AxiosRequestHeaders } from 'axios'
@@ -10,7 +10,7 @@ import { AxiosJson, AxiosJsonRequestConfig } from './AxiosJson'
 import { BridgeModule } from './Bridge'
 import { XyoBridgeConfig } from './Config'
 import { PartialBridgeConfig } from './PartialConfig'
-import { XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema } from './Queries'
+import { XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema, XyoBridgeQuery } from './Queries'
 
 export type XyoHttpBridgeConfigSchema = 'network.xyo.bridge.http.config'
 export const XyoHttpBridgeConfigSchema: XyoHttpBridgeConfigSchema = 'network.xyo.bridge.http.config'
@@ -49,9 +49,9 @@ export class XyoHttpBridge extends XyoModule<XyoHttpBridgeConfig> implements Bri
     return true
   }
 
-  protected async forward(query: XyoQuery): Promise<[XyoBoundWitness, XyoPayloads]> {
+  protected async forward(query: XyoQuery, _payloads?: XyoPayloads): Promise<[XyoBoundWitness, XyoPayloads]> {
     try {
-      const boundQuery = this.bindPayloads([query])
+      const boundQuery = this.bindQuery([query])
       const result = await this.axios.post<[XyoBoundWitness, XyoPayloads]>(`${this.nodeUri}/${this.address}`, [boundQuery, ...[query]])
       return result.data
     } catch (ex) {
@@ -62,11 +62,13 @@ export class XyoHttpBridge extends XyoModule<XyoHttpBridgeConfig> implements Bri
     }
   }
 
-  override async query<T extends XyoQuery = XyoQuery>(bw: XyoBoundWitness, query: T): Promise<XyoModuleQueryResult> {
-    assertEx(this.queryable(query.schema, bw.addresses))
+  override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayloads): Promise<ModuleQueryResult> {
+    const wrapper = QueryBoundWitnessWrapper.parseQuery<XyoBridgeQuery>(query, payloads)
+    const typedQuery = wrapper.query.payload
+    assertEx(this.queryable(typedQuery.schema, wrapper.addresses))
     const queryAccount = new XyoAccount()
-    const payloads: (XyoPayload | null)[] = []
-    switch (query.schema) {
+    const resultPayloads: (XyoPayload | null)[] = []
+    switch (typedQuery.schema) {
       case XyoBridgeConnectQuerySchema: {
         await this.connect()
         break
@@ -76,12 +78,12 @@ export class XyoHttpBridge extends XyoModule<XyoHttpBridgeConfig> implements Bri
         break
       }
       default:
-        if (super.queries().find((schema) => schema === query.schema)) {
-          return super.query(bw, query)
+        if (super.queries().find((schema) => schema === typedQuery.schema)) {
+          return super.query(query, payloads)
         } else {
-          return this.forward(query)
+          return this.forward(query, payloads)
         }
     }
-    return this.bindPayloads(payloads, queryAccount)
+    return this.bindResult(resultPayloads, queryAccount)
   }
 }