@xyo-network/bridge 2.33.12 → 2.33.14

package/dist/esm/Bridge.d.ts

@@ -1,10 +1,9 @@
 import { Module } from '@xyo-network/module';
 import { Promisable } from '@xyo-network/promise';
-import { XyoBridgeQuery } from './Queries';
 export interface Bridge {
     connect: () => Promisable<boolean>;
     disconnect: () => Promisable<boolean>;
 }
-export interface BridgeModule<TQuery extends XyoBridgeQuery = XyoBridgeQuery> extends Bridge, Module<TQuery> {
+export interface BridgeModule extends Bridge, Module {
 }
 //# sourceMappingURL=Bridge.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Bridge.d.ts","sourceRoot":"","sources":["../../src/Bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAE1C,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;IAClC,UAAU,EAAE,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;CACtC;AAED,MAAM,WAAW,YAAY,CAAC,MAAM,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;CAAG"}
+{"version":3,"file":"Bridge.d.ts","sourceRoot":"","sources":["../../src/Bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;IAClC,UAAU,EAAE,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;CACtC;AAED,MAAM,WAAW,YAAa,SAAQ,MAAM,EAAE,MAAM;CAAG"}

package/dist/esm/Queries/index.d.ts

@@ -3,7 +3,6 @@ import { XyoBridgeConnectQuery } from './Connect';
 import { XyoBridgeDisconnectQuery } from './Disconnect';
 export * from './Connect';
 export * from './Disconnect';
-export declare type XyoBridgeQueryBase = XyoBridgeConnectQuery | XyoBridgeDisconnectQuery | XyoModuleQuery;
-export declare type XyoBridgeQuery<T extends XyoQuery = XyoQuery> = T extends XyoQuery ? XyoBridgeQueryBase | T : XyoBridgeQueryBase;
-export declare type XyoBridgeQuerySchema = XyoBridgeQuery['schema'];
+export declare type XyoBridgeQueryBase = XyoBridgeConnectQuery | XyoBridgeDisconnectQuery;
+export declare type XyoBridgeQuery<T extends XyoQuery | void = void> = XyoModuleQuery<T extends XyoQuery ? XyoBridgeQueryBase | T : XyoBridgeQueryBase>;
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/Queries/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAEvD,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAE5B,oBAAY,kBAAkB,GAAG,qBAAqB,GAAG,wBAAwB,GAAG,cAAc,CAAA;AAClG,oBAAY,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,CAAC,SAAS,QAAQ,GAAG,kBAAkB,GAAG,CAAC,GAAG,kBAAkB,CAAA;AAE5H,oBAAY,oBAAoB,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAEvD,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAE5B,oBAAY,kBAAkB,GAAG,qBAAqB,GAAG,wBAAwB,CAAA;AACjF,oBAAY,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,kBAAkB,GAAG,CAAC,GAAG,kBAAkB,CAAC,CAAA"}

package/dist/esm/XyoBridge.d.ts

@@ -1,22 +1,15 @@
 import { XyoBoundWitness } from '@xyo-network/boundwitness';
-import { XyoModule } from '@xyo-network/module';
+import { XyoModule, XyoQuery } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { BridgeModule } from './Bridge';
 import { XyoBridgeConfig } from './Config';
-import { XyoBridgeQuery } from './Queries';
-export declare abstract class XyoBridge<TConfig extends XyoBridgeConfig = XyoBridgeConfig, TQuery extends XyoBridgeQuery = XyoBridgeQuery> extends XyoModule<TQuery, TConfig> implements BridgeModule<TQuery> {
-    queries(): ("network.xyo.query.bridge.connect" | "network.xyo.query.bridge.disconnect" | TQuery["schema"])[];
+export declare abstract class XyoBridge<TConfig extends XyoBridgeConfig = XyoBridgeConfig> extends XyoModule<TConfig> implements BridgeModule {
+    queries(): string[];
     abstract connect(): Promisable<boolean>;
     abstract disconnect(): Promisable<boolean>;
-    abstract forward(query: TQuery): Promise<[XyoBoundWitness, (XyoPayload | null)[]]>;
-    query(query: TQuery): Promise<import("@xyo-network/module").XyoModuleQueryResult<{
-        schema: string;
-    } & {
-        previousHash?: string | undefined;
-        sources?: string[] | undefined;
-        timestamp?: number | undefined;
-    } & {
+    abstract forward(query: XyoQuery): Promise<[XyoBoundWitness, (XyoPayload | null)[]]>;
+    query(query: XyoQuery): Promise<import("@xyo-network/module").XyoModuleQueryResult<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":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,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;AAC1C,OAAO,EAA+D,cAAc,EAAE,MAAM,WAAW,CAAA;AAEvG,8BAAsB,SAAS,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,EAAE,MAAM,SAAS,cAAc,GAAG,cAAc,CAC/H,SAAQ,SAAS,CAAC,MAAM,EAAE,OAAO,CACjC,YAAW,YAAY,CAAC,MAAM,CAAC;IAEtB,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,MAAM,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IAEnE,KAAK,CAAC,KAAK,EAAE,MAAM;;;;;;;;;CAqBnC"}
+{"version":3,"file":"XyoBridge.d.ts","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":"AACA,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,KAAK,EAAE,QAAQ;;;CAsBrC"}

package/dist/esm/XyoBridge.js

@@ -8,7 +8,8 @@ export class XyoBridge extends XyoModule {
     async query(query) {
         const payloads = [];
         const queryAccount = new XyoAccount();
-        switch (query.schema) {
+        const typedQuery = query;
+        switch (typedQuery.schema) {
             case XyoBridgeConnectQuerySchema: {
                 await this.connect();
                 break;
@@ -18,11 +19,11 @@ export class XyoBridge extends XyoModule {
                 break;
             }
             default:
-                if (super.queries().find((schema) => schema === query.schema)) {
-                    return super.query(query);
+                if (super.queries().find((schema) => schema === typedQuery.schema)) {
+                    return super.query(typedQuery);
                 }
                 else {
-                    return this.forward(query);
+                    return this.forward(typedQuery);
                 }
         }
         return this.bindPayloads(payloads, queryAccount);

package/dist/esm/XyoBridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoBridge.js","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAM/C,OAAO,EAAE,2BAA2B,EAAE,8BAA8B,EAAkB,MAAM,WAAW,CAAA;AAEvG,MAAM,OAAgB,SACpB,SAAQ,SAA0B;IAGzB,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,8BAA8B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1F,CAAC;IAOQ,KAAK,CAAC,KAAK,CAAC,KAAa;QAChC,MAAM,QAAQ,GAA0B,EAAE,CAAA;QAC1C,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,QAAQ,KAAK,CAAC,MAAM,EAAE;YACpB,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,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE;oBAC7D,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;iBAC1B;qBAAM;oBACL,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;iBAC3B;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,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,CAAC,KAAe;QAClC,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,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,CAAC,EAAE;oBAClE,OAAO,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;iBAC/B;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"}

package/dist/esm/XyoHttpBridge.d.ts

@@ -1,5 +1,5 @@
 import { XyoBoundWitness } from '@xyo-network/boundwitness';
-import { XyoModule } from '@xyo-network/module';
+import { XyoModule, XyoQuery } from '@xyo-network/module';
 import { XyoPayloads } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { AxiosRequestHeaders } from 'axios';
@@ -7,7 +7,6 @@ import { AxiosJsonRequestConfig } from './AxiosJson';
 import { BridgeModule } from './Bridge';
 import { XyoBridgeConfig } from './Config';
 import { PartialBridgeConfig } from './PartialConfig';
-import { XyoBridgeQuery } from './Queries';
 export declare type XyoHttpBridgeConfigSchema = 'network.xyo.bridge.http.config';
 export declare const XyoHttpBridgeConfigSchema: XyoHttpBridgeConfigSchema;
 export declare type XyoHttpBridgeConfig = XyoBridgeConfig<{
@@ -15,7 +14,7 @@ export declare type XyoHttpBridgeConfig = XyoBridgeConfig<{
     headers?: AxiosRequestHeaders;
     axios?: AxiosJsonRequestConfig;
 }>;
-export declare class XyoHttpBridge<TQuery extends XyoBridgeQuery = XyoBridgeQuery> extends XyoModule<TQuery, XyoHttpBridgeConfig> implements BridgeModule<TQuery> {
+export declare class XyoHttpBridge extends XyoModule<XyoHttpBridgeConfig> implements BridgeModule {
     private axios;
     constructor(config: PartialBridgeConfig<XyoHttpBridgeConfig>);
     get nodeUri(): string;
@@ -23,14 +22,8 @@ export declare class XyoHttpBridge<TQuery extends XyoBridgeQuery = XyoBridgeQuer
     get targetAddressString(): string;
     connect(): Promisable<boolean>;
     disconnect(): Promisable<boolean>;
-    protected forward(query: TQuery): Promise<[XyoBoundWitness, XyoPayloads]>;
-    query(query: TQuery): Promise<import("@xyo-network/module").XyoModuleQueryResult<{
-        schema: string;
-    } & {
-        previousHash?: string | undefined;
-        sources?: string[] | undefined;
-        timestamp?: number | undefined;
-    } & {
+    protected forward(query: XyoQuery): Promise<[XyoBoundWitness, XyoPayloads]>;
+    query(query: XyoQuery): Promise<import("@xyo-network/module").XyoModuleQueryResult<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
         schema: string;
     }>>;
 }

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,MAAM,qBAAqB,CAAA;AAC/C,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;AACrD,OAAO,EAA+D,cAAc,EAAE,MAAM,WAAW,CAAA;AAEvG,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,aAAa,CAAC,MAAM,SAAS,cAAc,GAAG,cAAc,CACvE,SAAQ,SAAS,CAAC,MAAM,EAAE,mBAAmB,CAC7C,YAAW,YAAY,CAAC,MAAM,CAAC;IAE/B,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,MAAM,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAehE,KAAK,CAAC,KAAK,EAAE,MAAM;;;;;;;;;CAqBnC"}
+{"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,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACzD,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;IAelE,KAAK,CAAC,KAAK,EAAE,QAAQ;;;CAqBrC"}

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,12 +11,11 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.6.7",
-    "@xyo-network/account": "^2.33.12",
-    "@xyo-network/archivist": "^2.33.12",
-    "@xyo-network/boundwitness": "^2.33.12",
-    "@xyo-network/module": "^2.33.12",
-    "@xyo-network/payload": "^2.33.12",
-    "@xyo-network/promise": "^2.33.12",
+    "@xyo-network/account": "^2.33.14",
+    "@xyo-network/boundwitness": "^2.33.14",
+    "@xyo-network/module": "^2.33.14",
+    "@xyo-network/payload": "^2.33.14",
+    "@xyo-network/promise": "^2.33.14",
     "pako": "^2.0.4",
     "tslib": "^2.4.0"
   },
@@ -56,5 +55,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.33.12"
+  "version": "2.33.14"
 }

package/src/Bridge.ts

@@ -1,11 +1,9 @@
 import { Module } from '@xyo-network/module'
 import { Promisable } from '@xyo-network/promise'
 
-import { XyoBridgeQuery } from './Queries'
-
 export interface Bridge {
   connect: () => Promisable<boolean>
   disconnect: () => Promisable<boolean>
 }
 
-export interface BridgeModule<TQuery extends XyoBridgeQuery = XyoBridgeQuery> extends Bridge, Module<TQuery> {}
+export interface BridgeModule extends Bridge, Module {}

package/src/Queries/index.ts

@@ -6,7 +6,5 @@ import { XyoBridgeDisconnectQuery } from './Disconnect'
 export * from './Connect'
 export * from './Disconnect'
 
-export type XyoBridgeQueryBase = XyoBridgeConnectQuery | XyoBridgeDisconnectQuery | XyoModuleQuery
-export type XyoBridgeQuery<T extends XyoQuery = XyoQuery> = T extends XyoQuery ? XyoBridgeQueryBase | T : XyoBridgeQueryBase
-
-export type XyoBridgeQuerySchema = XyoBridgeQuery['schema']
+export type XyoBridgeQueryBase = XyoBridgeConnectQuery | XyoBridgeDisconnectQuery
+export type XyoBridgeQuery<T extends XyoQuery | void = void> = XyoModuleQuery<T extends XyoQuery ? XyoBridgeQueryBase | T : XyoBridgeQueryBase>

package/src/XyoBridge.ts

@@ -1,6 +1,6 @@
 import { XyoAccount } from '@xyo-network/account'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
-import { XyoModule } from '@xyo-network/module'
+import { XyoModule, XyoQuery } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
 import { Promisable } from '@xyo-network/promise'
 
@@ -8,10 +8,7 @@ import { BridgeModule } from './Bridge'
 import { XyoBridgeConfig } from './Config'
 import { XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema, XyoBridgeQuery } from './Queries'
 
-export abstract class XyoBridge<TConfig extends XyoBridgeConfig = XyoBridgeConfig, TQuery extends XyoBridgeQuery = XyoBridgeQuery>
-  extends XyoModule<TQuery, TConfig>
-  implements BridgeModule<TQuery>
-{
+export abstract class XyoBridge<TConfig extends XyoBridgeConfig = XyoBridgeConfig> extends XyoModule<TConfig> implements BridgeModule {
   override queries() {
     return [XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema, ...super.queries()]
   }
@@ -19,12 +16,13 @@ export abstract class XyoBridge<TConfig extends XyoBridgeConfig = XyoBridgeConfi
   abstract connect(): Promisable<boolean>
   abstract disconnect(): Promisable<boolean>
 
-  abstract forward(query: TQuery): Promise<[XyoBoundWitness, (XyoPayload | null)[]]>
+  abstract forward(query: XyoQuery): Promise<[XyoBoundWitness, (XyoPayload | null)[]]>
 
-  override async query(query: TQuery) {
+  override async query(query: XyoQuery) {
     const payloads: (XyoPayload | null)[] = []
     const queryAccount = new XyoAccount()
-    switch (query.schema) {
+    const typedQuery = query as XyoBridgeQuery
+    switch (typedQuery.schema) {
       case XyoBridgeConnectQuerySchema: {
         await this.connect()
         break
@@ -34,10 +32,10 @@ export abstract class XyoBridge<TConfig extends XyoBridgeConfig = XyoBridgeConfi
         break
       }
       default:
-        if (super.queries().find((schema) => schema === query.schema)) {
-          return super.query(query)
+        if (super.queries().find((schema) => schema === typedQuery.schema)) {
+          return super.query(typedQuery)
         } else {
-          return this.forward(query)
+          return this.forward(typedQuery)
         }
     }
     return this.bindPayloads(payloads, queryAccount)

package/src/XyoHttpBridge.spec.ts

@@ -2,12 +2,12 @@ import { XyoArchivistWrapper } from '@xyo-network/archivist'
 import { uuid } from '@xyo-network/core'
 import { PayloadWrapper } from '@xyo-network/payload'
 
-import { XyoArchivistHttpBridge } from './XyoArchivistHttpBridge'
+import { XyoHttpBridge } from './XyoHttpBridge'
 
 test('XyoHttpBridge', async () => {
   const nodeUri = `${process.env.API_DOMAIN}` ?? 'https://beta.api.archivist.xyo.network'
   const targetAddress = 'temp'
-  const bridge = new XyoArchivistHttpBridge({ nodeUri, targetAddress })
+  const bridge = new XyoHttpBridge({ nodeUri, targetAddress })
   const wrapper = new XyoArchivistWrapper(bridge)
   const debugPayload = {
     nonce: uuid(),

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 } from '@xyo-network/module'
+import { XyoModule, XyoQuery } 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, XyoBridgeQuery } from './Queries'
+import { XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema } from './Queries'
 
 export type XyoHttpBridgeConfigSchema = 'network.xyo.bridge.http.config'
 export const XyoHttpBridgeConfigSchema: XyoHttpBridgeConfigSchema = 'network.xyo.bridge.http.config'
@@ -21,10 +21,7 @@ export type XyoHttpBridgeConfig = XyoBridgeConfig<{
   axios?: AxiosJsonRequestConfig
 }>
 
-export class XyoHttpBridge<TQuery extends XyoBridgeQuery = XyoBridgeQuery>
-  extends XyoModule<TQuery, XyoHttpBridgeConfig>
-  implements BridgeModule<TQuery>
-{
+export class XyoHttpBridge extends XyoModule<XyoHttpBridgeConfig> implements BridgeModule {
   private axios: AxiosJson
 
   constructor(config: PartialBridgeConfig<XyoHttpBridgeConfig>) {
@@ -52,7 +49,7 @@ export class XyoHttpBridge<TQuery extends XyoBridgeQuery = XyoBridgeQuery>
     return true
   }
 
-  protected async forward(query: TQuery): Promise<[XyoBoundWitness, XyoPayloads]> {
+  protected async forward(query: XyoQuery): Promise<[XyoBoundWitness, XyoPayloads]> {
     try {
       const boundQuery = this.bindPayloads([query])
       const result = await this.axios.post<[XyoBoundWitness, XyoPayloads]>(`${this.nodeUri}/${this.address}`, [boundQuery, ...[query]])
@@ -67,7 +64,7 @@ export class XyoHttpBridge<TQuery extends XyoBridgeQuery = XyoBridgeQuery>
     }
   }
 
-  override async query(query: TQuery) {
+  override async query(query: XyoQuery) {
     const queryAccount = new XyoAccount()
     const payloads: (XyoPayload | null)[] = []
     switch (query.schema) {

package/dist/cjs/XyoArchivistHttpBridge.d.ts

@@ -1,6 +0,0 @@
-import { XyoArchivistQuery } from '@xyo-network/archivist';
-import { XyoBridgeQuery } from './Queries';
-import { XyoHttpBridge } from './XyoHttpBridge';
-export declare class XyoArchivistHttpBridge<TQuery extends XyoBridgeQuery<XyoArchivistQuery> = XyoBridgeQuery<XyoArchivistQuery>> extends XyoHttpBridge<TQuery> {
-}
-//# sourceMappingURL=XyoArchivistHttpBridge.d.ts.map

package/dist/cjs/XyoArchivistHttpBridge.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"XyoArchivistHttpBridge.d.ts","sourceRoot":"","sources":["../../src/XyoArchivistHttpBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,qBAAa,sBAAsB,CACjC,MAAM,SAAS,cAAc,CAAC,iBAAiB,CAAC,GAAG,cAAc,CAAC,iBAAiB,CAAC,CACpF,SAAQ,aAAa,CAAC,MAAM,CAAC;CAAG"}

package/dist/cjs/XyoArchivistHttpBridge.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XyoArchivistHttpBridge = void 0;
-const XyoHttpBridge_1 = require("./XyoHttpBridge");
-class XyoArchivistHttpBridge extends XyoHttpBridge_1.XyoHttpBridge {
-}
-exports.XyoArchivistHttpBridge = XyoArchivistHttpBridge;
-//# sourceMappingURL=XyoArchivistHttpBridge.js.map

package/dist/cjs/XyoArchivistHttpBridge.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"XyoArchivistHttpBridge.js","sourceRoot":"","sources":["../../src/XyoArchivistHttpBridge.ts"],"names":[],"mappings":";;;AAGA,mDAA+C;AAE/C,MAAa,sBAEX,SAAQ,6BAAqB;CAAG;AAFlC,wDAEkC"}

package/dist/esm/XyoArchivistHttpBridge.d.ts

@@ -1,6 +0,0 @@
-import { XyoArchivistQuery } from '@xyo-network/archivist';
-import { XyoBridgeQuery } from './Queries';
-import { XyoHttpBridge } from './XyoHttpBridge';
-export declare class XyoArchivistHttpBridge<TQuery extends XyoBridgeQuery<XyoArchivistQuery> = XyoBridgeQuery<XyoArchivistQuery>> extends XyoHttpBridge<TQuery> {
-}
-//# sourceMappingURL=XyoArchivistHttpBridge.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"XyoArchivistHttpBridge.d.ts","sourceRoot":"","sources":["../../src/XyoArchivistHttpBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,qBAAa,sBAAsB,CACjC,MAAM,SAAS,cAAc,CAAC,iBAAiB,CAAC,GAAG,cAAc,CAAC,iBAAiB,CAAC,CACpF,SAAQ,aAAa,CAAC,MAAM,CAAC;CAAG"}

package/dist/esm/XyoArchivistHttpBridge.js

@@ -1,4 +0,0 @@
-import { XyoHttpBridge } from './XyoHttpBridge';
-export class XyoArchivistHttpBridge extends XyoHttpBridge {
-}
-//# sourceMappingURL=XyoArchivistHttpBridge.js.map

package/dist/esm/XyoArchivistHttpBridge.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"XyoArchivistHttpBridge.js","sourceRoot":"","sources":["../../src/XyoArchivistHttpBridge.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,MAAM,OAAO,sBAEX,SAAQ,aAAqB;CAAG"}

package/src/XyoArchivistHttpBridge.ts

@@ -1,8 +0,0 @@
-import { XyoArchivistQuery } from '@xyo-network/archivist'
-
-import { XyoBridgeQuery } from './Queries'
-import { XyoHttpBridge } from './XyoHttpBridge'
-
-export class XyoArchivistHttpBridge<
-  TQuery extends XyoBridgeQuery<XyoArchivistQuery> = XyoBridgeQuery<XyoArchivistQuery>,
-> extends XyoHttpBridge<TQuery> {}