@xyo-network/bridge 2.46.1 → 2.46.3

package/dist/esm/HttpBridge.js

@@ -1,26 +1,44 @@
 import { assertEx } from '@xylabs/assert';
 import { Account } from '@xyo-network/account';
 import { AxiosJson } from '@xyo-network/axios';
-import { AbstractModule, QueryBoundWitnessWrapper, XyoErrorBuilder, } from '@xyo-network/module';
+import { AbstractModule, ModuleDiscoverQuerySchema, ModuleWrapper, QueryBoundWitnessWrapper, XyoErrorBuilder, } from '@xyo-network/module';
+import { PayloadWrapper } from '@xyo-network/payload-wrapper';
+import { QuerySchema } from '@xyo-network/query-payload-plugin';
+import compact from 'lodash/compact';
 import { XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema } from './Queries';
-export const HttpBridgeConfigSchema = 'network.xyo.bridge.http.config';
+import { RemoteModuleResolver } from './RemoteModuleResolver';
 export class HttpBridge extends AbstractModule {
     axios;
+    remoteQueries = [];
+    remoteResolver;
     constructor(params) {
         super(params);
-        this.axios = new AxiosJson(this.config?.axios);
+        this.axios = params.axios ?? new AxiosJson();
+        this.remoteResolver = new RemoteModuleResolver(this);
     }
     get nodeUri() {
         return assertEx(this.config?.nodeUri, 'Missing nodeUri');
     }
+    get queries() {
+        return [...super.queries, ...this.remoteQueries];
+    }
     get targetAddress() {
         return this.config?.targetAddress;
     }
-    get targetAddressString() {
-        return this.targetAddress ?? '';
-    }
     static async create(params) {
-        return (await super.create(params));
+        const result = (await super.create(params));
+        const moduleWrapper = ModuleWrapper.wrap(result);
+        const discover = await moduleWrapper.discover();
+        result.remoteQueries = compact(discover.map((payload) => {
+            if (payload.schema === QuerySchema) {
+                const schemaPayload = payload;
+                return schemaPayload.query;
+            }
+            else {
+                return null;
+            }
+        }));
+        return result;
     }
     connect() {
         return true;
@@ -28,6 +46,10 @@ export class HttpBridge extends AbstractModule {
     disconnect() {
         return true;
     }
+    async discover() {
+        const queryPayload = PayloadWrapper.parse({ schema: ModuleDiscoverQuerySchema });
+        return (await this.forward(queryPayload))[1];
+    }
     async query(query, payloads) {
         const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
         const typedQuery = wrapper.query.payload;
@@ -45,10 +67,10 @@ export class HttpBridge extends AbstractModule {
                 }
                 default:
                     if (super.queries.find((schema) => schema === typedQuery.schema)) {
-                        return super.query(query, payloads);
+                        return await super.query(query, payloads);
                     }
                     else {
-                        return this.forward(query, payloads);
+                        return await this.forward(query, payloads);
                     }
             }
         }
@@ -56,13 +78,16 @@ export class HttpBridge extends AbstractModule {
             const error = ex;
             resultPayloads.push(new XyoErrorBuilder([wrapper.hash], error.message).build());
         }
-        return this.bindResult(resultPayloads, queryAccount);
+        return await this.bindResult(resultPayloads, queryAccount);
+    }
+    async resolve(filter) {
+        return [...(await super.resolve(filter)), ...(await this.remoteResolver.resolve(filter))];
     }
-    async forward(query, payloads) {
+    async forward(query, payloads = []) {
         try {
-            const boundQuery = this.bindQuery(query, payloads);
-            const result = await this.axios.post(`${this.nodeUri}/${this.address}`, [boundQuery, ...[query]]);
-            return result.data;
+            const boundQuery = await this.bindQuery(query, payloads);
+            const result = await this.axios.post(`${this.nodeUri}/address/${this.targetAddress}`, boundQuery);
+            return result.data.data;
         }
         catch (ex) {
             const error = ex;
@@ -72,6 +97,4 @@ export class HttpBridge extends AbstractModule {
         }
     }
 }
-export class XyoHttpBridge extends HttpBridge {
-}
 //# sourceMappingURL=HttpBridge.js.map

package/dist/esm/HttpBridge.js.map

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

package/dist/esm/HttpBridgeConfig.js

@@ -0,0 +1,2 @@
+export const HttpBridgeConfigSchema = 'network.xyo.bridge.http.config';
+//# sourceMappingURL=HttpBridgeConfig.js.map

package/dist/esm/HttpBridgeConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HttpBridgeConfig.js","sourceRoot":"","sources":["../../src/HttpBridgeConfig.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,sBAAsB,GAA2B,gCAAgC,CAAA"}

package/dist/esm/RemoteModuleResolver.js

@@ -0,0 +1,80 @@
+import { assertEx } from '@xylabs/assert';
+import { AddressSchema } from '@xyo-network/address-payload-plugin';
+import { CompositeModuleResolver, ModuleWrapper } from '@xyo-network/module';
+import compact from 'lodash/compact';
+import flatten from 'lodash/flatten';
+import { HttpBridge } from './HttpBridge';
+import { HttpBridgeConfigSchema } from './HttpBridgeConfig';
+export class RemoteModuleResolver extends CompositeModuleResolver {
+    bridge;
+    resolvedModules = {};
+    // TODO: Allow optional ctor param for supplying address for nested Nodes
+    // protected readonly address?: string,
+    constructor(bridge) {
+        super();
+        this.bridge = bridge;
+    }
+    get isModuleResolver() {
+        return true;
+    }
+    add(_module, _name) {
+        throw new Error('Method not implemented.');
+    }
+    remove(_address) {
+        throw new Error('Method not implemented.');
+    }
+    async resolve(filter) {
+        const mods = await Promise.all(flatten(await this.resolveRemoteModules(filter)));
+        return this.filterLocalModules(mods, filter);
+    }
+    filterLocalModules(mods, filter) {
+        // TODO: Handle filter?.query
+        if (filter?.query)
+            throw new Error('Filtering by query not yet implemented by this resolver');
+        const config = filter?.config;
+        const filtered = config?.length ? mods.filter((mod) => config.includes(mod.config.schema)) : mods;
+        return filtered;
+    }
+    async getRemoteAddresses() {
+        const nodeWrapper = assertEx(ModuleWrapper.wrap(this.bridge), 'nodeUri can not be wrapped');
+        const discover = await nodeWrapper.discover();
+        return compact(discover.map((payload) => {
+            if (payload.schema === AddressSchema) {
+                const schemaPayload = payload;
+                return schemaPayload.address;
+            }
+            else {
+                return null;
+            }
+        }));
+    }
+    async resolveByAddress(targetAddress) {
+        const cached = this.resolvedModules[targetAddress];
+        if (cached)
+            return cached;
+        const mod = await HttpBridge.create({
+            config: { nodeUri: this.bridge.nodeUri, schema: HttpBridgeConfigSchema, targetAddress },
+        });
+        this.resolvedModules[targetAddress] = mod;
+        return mod;
+    }
+    async resolveByName(name) {
+        const cached = this.resolvedModules[name];
+        if (cached)
+            return cached;
+        const mod = await HttpBridge.create({
+            config: { name, nodeUri: this.bridge.nodeUri, schema: HttpBridgeConfigSchema },
+        });
+        this.resolvedModules[name] = mod;
+        this.resolvedModules[mod.address] = mod;
+        return mod;
+    }
+    async resolveRemoteModules(filter) {
+        const addresses = filter ? filter?.address : await this.getRemoteAddresses();
+        const names = filter?.name;
+        const byAddress = await Promise.all(addresses?.map((address) => this.resolveByAddress(address)) ?? []);
+        const byName = await Promise.all(names?.map((name) => this.resolveByName(name)) ?? []);
+        return [...byAddress, ...byName];
+    }
+}
+//# sourceMappingURL=RemoteModuleResolver.js.map

package/dist/esm/RemoteModuleResolver.js.map

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

package/dist/types/Config.d.ts

@@ -2,8 +2,5 @@ import { ModuleConfig } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
 export type XyoBridgeConfigSchema = 'network.xyo.bridge.config';
 export declare const XyoBridgeConfigSchema: XyoBridgeConfigSchema;
-export type BridgeConfig<TConfig extends XyoPayload = XyoPayload> = ModuleConfig<{
-    nodeUri: string;
-    targetAddress?: string;
-} & TConfig>;
+export type BridgeConfig<TConfig extends XyoPayload = XyoPayload> = ModuleConfig<TConfig>;
 //# sourceMappingURL=Config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,qBAAqB,GAAG,2BAA2B,CAAA;AAC/D,eAAO,MAAM,qBAAqB,EAAE,qBAAmD,CAAA;AAEvF,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,YAAY,CAC9E;IACE,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,GAAG,OAAO,CACZ,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,qBAAqB,GAAG,2BAA2B,CAAA;AAC/D,eAAO,MAAM,qBAAqB,EAAE,qBAAmD,CAAA;AAEvF,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,YAAY,CAAC,OAAO,CAAC,CAAA"}

package/dist/types/HttpBridge.d.ts

@@ -1,31 +1,36 @@
-import { Axios, AxiosRequestHeaders, RawAxiosJsonRequestConfig } from '@xyo-network/axios';
-import { AbstractModule, ModuleParams, ModuleQueryResult, XyoQuery, XyoQueryBoundWitness } from '@xyo-network/module';
+import { AxiosJson } from '@xyo-network/axios';
+import { AbstractModule, ModuleFilter, ModuleParams, ModuleQueryResult, XyoQuery, XyoQueryBoundWitness } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
 import { BridgeModule } from './Bridge';
-import { BridgeConfig } from './Config';
-export type HttpBridgeConfigSchema = 'network.xyo.bridge.http.config';
-export declare const HttpBridgeConfigSchema: HttpBridgeConfigSchema;
-export type HttpBridgeConfig = BridgeConfig<{
-    axios?: RawAxiosJsonRequestConfig;
-    headers?: AxiosRequestHeaders;
-    schema: HttpBridgeConfigSchema;
-}>;
+import { HttpBridgeConfig } from './HttpBridgeConfig';
 export interface XyoHttpBridgeParams<TConfig extends HttpBridgeConfig = HttpBridgeConfig> extends ModuleParams<TConfig> {
-    axios: Axios;
+    axios?: AxiosJson;
 }
 export declare class HttpBridge<TConfig extends HttpBridgeConfig = HttpBridgeConfig> extends AbstractModule<TConfig> implements BridgeModule {
     private axios;
+    private remoteQueries;
+    private remoteResolver;
     protected constructor(params: XyoHttpBridgeParams<TConfig>);
     get nodeUri(): string;
+    get queries(): string[];
     get targetAddress(): string | undefined;
-    get targetAddressString(): string;
-    static create(params: XyoHttpBridgeParams): Promise<XyoHttpBridge>;
+    static create(params: XyoHttpBridgeParams): Promise<HttpBridge>;
     connect(): Promisable<boolean>;
     disconnect(): Promisable<boolean>;
+    discover(): Promise<(import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+        schema: string;
+    })[]>;
     query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayload[]): Promise<ModuleQueryResult>;
+    resolve(filter?: ModuleFilter): Promise<import("@xyo-network/module").Module<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+        name?: string | undefined;
+        security?: {
+            allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+            disallowed?: Record<string, string[]> | undefined;
+        } | undefined;
+    } & {
+        schema: string;
+    }>[]>;
     protected forward(query: XyoQuery, payloads?: XyoPayload[]): Promise<ModuleQueryResult>;
 }
-export declare class XyoHttpBridge<TConfig extends HttpBridgeConfig = HttpBridgeConfig> extends HttpBridge<TConfig> {
-}
 //# sourceMappingURL=HttpBridge.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"HttpBridge.d.ts","sourceRoot":"","sources":["../../src/HttpBridge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAyB,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAA;AACjH,OAAO,EACL,cAAc,EACd,YAAY,EACZ,iBAAiB,EAGjB,QAAQ,EACR,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAGvC,MAAM,MAAM,sBAAsB,GAAG,gCAAgC,CAAA;AACrE,eAAO,MAAM,sBAAsB,EAAE,sBAAyD,CAAA;AAE9F,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC;IAC1C,KAAK,CAAC,EAAE,yBAAyB,CAAA;IACjC,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,MAAM,EAAE,sBAAsB,CAAA;CAC/B,CAAC,CAAA;AAEF,MAAM,WAAW,mBAAmB,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,YAAY,CAAC,OAAO,CAAC;IACrH,KAAK,EAAE,KAAK,CAAA;CACb;AAED,qBAAa,UAAU,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAE,YAAW,YAAY;IAClI,OAAO,CAAC,KAAK,CAAW;IAExB,SAAS,aAAa,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC;IAK1D,IAAW,OAAO,WAEjB;IAED,IAAW,aAAa,uBAEvB;IAED,IAAW,mBAAmB,WAE7B;WAEqB,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,aAAa,CAAC;IAIjF,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IAI9B,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;IAIlB,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;cA6B1H,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAY9F;AAED,qBAAa,aAAa,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,UAAU,CAAC,OAAO,CAAC;CAAG"}
+{"version":3,"file":"HttpBridge.d.ts","sourceRoot":"","sources":["../../src/HttpBridge.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,EACL,cAAc,EAGd,YAAY,EACZ,YAAY,EACZ,iBAAiB,EAKjB,QAAQ,EACR,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAIjD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAIrD,MAAM,WAAW,mBAAmB,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,YAAY,CAAC,OAAO,CAAC;IACrH,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB;AAED,qBAAa,UAAU,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAE,YAAW,YAAY;IAClI,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,cAAc,CAAgB;IAEtC,SAAS,aAAa,MAAM,EAAE,mBAAmB,CAAC,OAAO,CAAC;IAM1D,IAAW,OAAO,WAEjB;IAED,IAAoB,OAAO,aAE1B;IAED,IAAW,aAAa,uBAEvB;WAEqB,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC;IAiB9E,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IAI9B,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;IAIlB,QAAQ;;;IAKR,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA6B3H,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY;;;;;;;;;cAI5B,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAYlG"}

package/dist/types/HttpBridgeConfig.d.ts

@@ -0,0 +1,10 @@
+import { XyoPayload } from '@xyo-network/payload-model';
+import { BridgeConfig } from './Config';
+export type HttpBridgeConfigSchema = 'network.xyo.bridge.http.config';
+export declare const HttpBridgeConfigSchema: HttpBridgeConfigSchema;
+export type HttpBridgeConfig<TConfig extends XyoPayload = XyoPayload> = BridgeConfig<{
+    nodeUri: string;
+    schema: HttpBridgeConfigSchema;
+    targetAddress?: string;
+} & TConfig>;
+//# sourceMappingURL=HttpBridgeConfig.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"HttpBridgeConfig.d.ts","sourceRoot":"","sources":["../../src/HttpBridgeConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEvC,MAAM,MAAM,sBAAsB,GAAG,gCAAgC,CAAA;AACrE,eAAO,MAAM,sBAAsB,EAAE,sBAAyD,CAAA;AAE9F,MAAM,MAAM,gBAAgB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,YAAY,CAClF;IACE,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,sBAAsB,CAAA;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,GAAG,OAAO,CACZ,CAAA"}

package/dist/types/RemoteModuleResolver.d.ts

@@ -0,0 +1,21 @@
+import { AbstractModule, CompositeModuleResolver } from '@xyo-network/module';
+import { Module, ModuleFilter } from '@xyo-network/module-model';
+import { HttpBridge } from './HttpBridge';
+export declare class RemoteModuleResolver extends CompositeModuleResolver {
+    protected readonly bridge: HttpBridge;
+    private resolvedModules;
+    constructor(bridge: HttpBridge);
+    get isModuleResolver(): boolean;
+    add(module: Module, name?: string | undefined): this;
+    add(module: Module[], name?: string[] | undefined): this;
+    add(module: Module | Module[], name?: string | string[] | undefined): this;
+    remove(name: string | string[]): this;
+    remove(address: string | string[]): this;
+    resolve(filter?: ModuleFilter): Promise<AbstractModule[]>;
+    private filterLocalModules;
+    private getRemoteAddresses;
+    private resolveByAddress;
+    private resolveByName;
+    private resolveRemoteModules;
+}
+//# sourceMappingURL=RemoteModuleResolver.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RemoteModuleResolver.d.ts","sourceRoot":"","sources":["../../src/RemoteModuleResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,uBAAuB,EAAiB,MAAM,qBAAqB,CAAA;AAC5F,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAIhE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAazC,qBAAa,oBAAqB,SAAQ,uBAAuB;IAKnD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU;IAJjD,OAAO,CAAC,eAAe,CAAiC;gBAIzB,MAAM,EAAE,UAAU;IAIjD,IAAW,gBAAgB,IAAI,OAAO,CAErC;IAED,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IACpD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IACxD,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI;IAK1E,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IACrC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAKlC,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAK/D,OAAO,CAAC,kBAAkB;YAQZ,kBAAkB;YAelB,gBAAgB;YAUhB,aAAa;YAWb,oBAAoB;CAOnC"}

package/package.json

@@ -11,13 +11,17 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.7.1",
-    "@xyo-network/account": "^2.46.1",
-    "@xyo-network/axios": "^2.46.1",
-    "@xyo-network/module": "^2.46.1",
-    "@xyo-network/module-model": "^2.46.1",
-    "@xyo-network/payload-model": "^2.46.1",
-    "@xyo-network/payload-wrapper": "^2.46.1",
-    "@xyo-network/promise": "^2.46.1"
+    "@xyo-network/account": "^2.46.3",
+    "@xyo-network/address-payload-plugin": "^2.46.3",
+    "@xyo-network/api-models": "^2.46.3",
+    "@xyo-network/axios": "^2.46.3",
+    "@xyo-network/module": "^2.46.3",
+    "@xyo-network/module-model": "^2.46.3",
+    "@xyo-network/payload-model": "^2.46.3",
+    "@xyo-network/payload-wrapper": "^2.46.3",
+    "@xyo-network/promise": "^2.46.3",
+    "@xyo-network/query-payload-plugin": "^2.46.3",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.14.15",
@@ -57,5 +61,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.46.1"
+  "version": "2.46.3"
 }

package/src/Config.ts

@@ -4,9 +4,4 @@ import { XyoPayload } from '@xyo-network/payload-model'
 export type XyoBridgeConfigSchema = 'network.xyo.bridge.config'
 export const XyoBridgeConfigSchema: XyoBridgeConfigSchema = 'network.xyo.bridge.config'
 
-export type BridgeConfig<TConfig extends XyoPayload = XyoPayload> = ModuleConfig<
-  {
-    nodeUri: string
-    targetAddress?: string
-  } & TConfig
->
+export type BridgeConfig<TConfig extends XyoPayload = XyoPayload> = ModuleConfig<TConfig>

package/src/HttpBridge.ts

@@ -1,57 +1,74 @@
 import { assertEx } from '@xylabs/assert'
 import { Account } from '@xyo-network/account'
-import { Axios, AxiosError, AxiosJson, AxiosRequestHeaders, RawAxiosJsonRequestConfig } from '@xyo-network/axios'
+import { XyoApiEnvelope } from '@xyo-network/api-models'
+import { AxiosError, AxiosJson } from '@xyo-network/axios'
 import {
   AbstractModule,
+  ModuleDiscoverQuery,
+  ModuleDiscoverQuerySchema,
+  ModuleFilter,
   ModuleParams,
   ModuleQueryResult,
+  ModuleResolver,
+  ModuleWrapper,
   QueryBoundWitnessWrapper,
   XyoErrorBuilder,
   XyoQuery,
   XyoQueryBoundWitness,
 } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload-model'
+import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { Promisable } from '@xyo-network/promise'
+import { QueryPayload, QuerySchema } from '@xyo-network/query-payload-plugin'
+import compact from 'lodash/compact'
 
 import { BridgeModule } from './Bridge'
-import { BridgeConfig } from './Config'
+import { HttpBridgeConfig } from './HttpBridgeConfig'
 import { XyoBridgeConnectQuerySchema, XyoBridgeDisconnectQuerySchema, XyoBridgeQuery } from './Queries'
-
-export type HttpBridgeConfigSchema = 'network.xyo.bridge.http.config'
-export const HttpBridgeConfigSchema: HttpBridgeConfigSchema = 'network.xyo.bridge.http.config'
-
-export type HttpBridgeConfig = BridgeConfig<{
-  axios?: RawAxiosJsonRequestConfig
-  headers?: AxiosRequestHeaders
-  schema: HttpBridgeConfigSchema
-}>
+import { RemoteModuleResolver } from './RemoteModuleResolver'
 
 export interface XyoHttpBridgeParams<TConfig extends HttpBridgeConfig = HttpBridgeConfig> extends ModuleParams<TConfig> {
-  axios: Axios
+  axios?: AxiosJson
 }
 
 export class HttpBridge<TConfig extends HttpBridgeConfig = HttpBridgeConfig> extends AbstractModule<TConfig> implements BridgeModule {
   private axios: AxiosJson
+  private remoteQueries: string[] = []
+  private remoteResolver: ModuleResolver
 
   protected constructor(params: XyoHttpBridgeParams<TConfig>) {
     super(params)
-    this.axios = new AxiosJson(this.config?.axios)
+    this.axios = params.axios ?? new AxiosJson()
+    this.remoteResolver = new RemoteModuleResolver(this)
   }
 
   public get nodeUri() {
     return assertEx(this.config?.nodeUri, 'Missing nodeUri')
   }
 
-  public get targetAddress() {
-    return this.config?.targetAddress
+  public override get queries() {
+    return [...super.queries, ...this.remoteQueries]
   }
 
-  public get targetAddressString() {
-    return this.targetAddress ?? ''
+  public get targetAddress() {
+    return this.config?.targetAddress
   }
 
-  static override async create(params: XyoHttpBridgeParams): Promise<XyoHttpBridge> {
-    return (await super.create(params)) as XyoHttpBridge
+  static override async create(params: XyoHttpBridgeParams): Promise<HttpBridge> {
+    const result = (await super.create(params)) as HttpBridge
+    const moduleWrapper = ModuleWrapper.wrap(result)
+    const discover = await moduleWrapper.discover()
+    result.remoteQueries = compact(
+      discover.map((payload) => {
+        if (payload.schema === QuerySchema) {
+          const schemaPayload = payload as QueryPayload
+          return schemaPayload.query
+        } else {
+          return null
+        }
+      }),
+    )
+    return result
   }
 
   connect(): Promisable<boolean> {
@@ -62,6 +79,11 @@ export class HttpBridge<TConfig extends HttpBridgeConfig = HttpBridgeConfig> ext
     return true
   }
 
+  override async discover() {
+    const queryPayload = PayloadWrapper.parse<ModuleDiscoverQuery>({ schema: ModuleDiscoverQuerySchema })
+    return (await this.forward(queryPayload))[1]
+  }
+
   override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayload[]): Promise<ModuleQueryResult> {
     const wrapper = QueryBoundWitnessWrapper.parseQuery<XyoBridgeQuery>(query, payloads)
     const typedQuery = wrapper.query.payload
@@ -79,23 +101,27 @@ export class HttpBridge<TConfig extends HttpBridgeConfig = HttpBridgeConfig> ext
         }
         default:
           if (super.queries.find((schema) => schema === typedQuery.schema)) {
-            return super.query(query, payloads)
+            return await super.query(query, payloads)
           } else {
-            return this.forward(query, payloads)
+            return await this.forward(query, payloads)
           }
       }
     } catch (ex) {
       const error = ex as Error
       resultPayloads.push(new XyoErrorBuilder([wrapper.hash], error.message).build())
     }
-    return this.bindResult(resultPayloads, queryAccount)
+    return await this.bindResult(resultPayloads, queryAccount)
   }
 
-  protected async forward(query: XyoQuery, payloads?: XyoPayload[]): Promise<ModuleQueryResult> {
+  override async resolve(filter?: ModuleFilter) {
+    return [...(await super.resolve(filter)), ...(await this.remoteResolver.resolve(filter))]
+  }
+
+  protected async forward(query: XyoQuery, payloads: XyoPayload[] = []): Promise<ModuleQueryResult> {
     try {
-      const boundQuery = this.bindQuery(query, payloads)
-      const result = await this.axios.post<ModuleQueryResult>(`${this.nodeUri}/${this.address}`, [boundQuery, ...[query]])
-      return result.data
+      const boundQuery = await this.bindQuery(query, payloads)
+      const result = await this.axios.post<XyoApiEnvelope<ModuleQueryResult>>(`${this.nodeUri}/address/${this.targetAddress}`, boundQuery)
+      return result.data.data
     } catch (ex) {
       const error = ex as AxiosError
       console.log(`Error Status: ${error.status}`)
@@ -104,5 +130,3 @@ export class HttpBridge<TConfig extends HttpBridgeConfig = HttpBridgeConfig> ext
     }
   }
 }
-
-export class XyoHttpBridge<TConfig extends HttpBridgeConfig = HttpBridgeConfig> extends HttpBridge<TConfig> {}

package/src/HttpBridgeConfig.ts

@@ -0,0 +1,14 @@
+import { XyoPayload } from '@xyo-network/payload-model'
+
+import { BridgeConfig } from './Config'
+
+export type HttpBridgeConfigSchema = 'network.xyo.bridge.http.config'
+export const HttpBridgeConfigSchema: HttpBridgeConfigSchema = 'network.xyo.bridge.http.config'
+
+export type HttpBridgeConfig<TConfig extends XyoPayload = XyoPayload> = BridgeConfig<
+  {
+    nodeUri: string
+    schema: HttpBridgeConfigSchema
+    targetAddress?: string
+  } & TConfig
+>

package/src/RemoteModuleResolver.ts

@@ -0,0 +1,103 @@
+import { assertEx } from '@xylabs/assert'
+import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
+import { AbstractModule, CompositeModuleResolver, ModuleWrapper } from '@xyo-network/module'
+import { Module, ModuleFilter } from '@xyo-network/module-model'
+import compact from 'lodash/compact'
+import flatten from 'lodash/flatten'
+
+import { HttpBridge } from './HttpBridge'
+import { HttpBridgeConfigSchema } from './HttpBridgeConfig'
+
+interface LocalModuleFilter {
+  config?: string[]
+  query?: string[][]
+}
+
+interface RemoteModuleFilter {
+  address?: string[]
+  name?: string[]
+}
+
+export class RemoteModuleResolver extends CompositeModuleResolver {
+  private resolvedModules: Record<string, HttpBridge> = {}
+
+  // TODO: Allow optional ctor param for supplying address for nested Nodes
+  // protected readonly address?: string,
+  constructor(protected readonly bridge: HttpBridge) {
+    super()
+  }
+
+  public get isModuleResolver(): boolean {
+    return true
+  }
+
+  add(module: Module, name?: string | undefined): this
+  add(module: Module[], name?: string[] | undefined): this
+  add(module: Module | Module[], name?: string | string[] | undefined): this
+  add(_module: unknown, _name?: unknown): this {
+    throw new Error('Method not implemented.')
+  }
+
+  remove(name: string | string[]): this
+  remove(address: string | string[]): this
+  remove(_address: unknown): this {
+    throw new Error('Method not implemented.')
+  }
+
+  async resolve(filter?: ModuleFilter): Promise<AbstractModule[]> {
+    const mods = await Promise.all(flatten(await this.resolveRemoteModules(filter)))
+    return this.filterLocalModules(mods, filter)
+  }
+
+  private filterLocalModules(mods: AbstractModule[], filter?: LocalModuleFilter): AbstractModule[] {
+    // TODO: Handle filter?.query
+    if (filter?.query) throw new Error('Filtering by query not yet implemented by this resolver')
+    const config = filter?.config
+    const filtered = config?.length ? mods.filter((mod) => config.includes(mod.config.schema)) : mods
+    return filtered
+  }
+
+  private async getRemoteAddresses() {
+    const nodeWrapper = assertEx(ModuleWrapper.wrap(this.bridge), 'nodeUri can not be wrapped')
+    const discover = await nodeWrapper.discover()
+    return compact(
+      discover.map((payload) => {
+        if (payload.schema === AddressSchema) {
+          const schemaPayload = payload as AddressPayload
+          return schemaPayload.address
+        } else {
+          return null
+        }
+      }),
+    )
+  }
+
+  private async resolveByAddress(targetAddress: string): Promise<HttpBridge> {
+    const cached = this.resolvedModules[targetAddress]
+    if (cached) return cached
+    const mod = await HttpBridge.create({
+      config: { nodeUri: this.bridge.nodeUri, schema: HttpBridgeConfigSchema, targetAddress },
+    })
+    this.resolvedModules[targetAddress] = mod
+    return mod
+  }
+
+  private async resolveByName(name: string): Promise<HttpBridge> {
+    const cached = this.resolvedModules[name]
+    if (cached) return cached
+    const mod = await HttpBridge.create({
+      config: { name, nodeUri: this.bridge.nodeUri, schema: HttpBridgeConfigSchema },
+    })
+    this.resolvedModules[name] = mod
+    this.resolvedModules[mod.address] = mod
+    return mod
+  }
+
+  private async resolveRemoteModules(filter?: RemoteModuleFilter): Promise<HttpBridge[]> {
+    const addresses = filter ? filter?.address : await this.getRemoteAddresses()
+    const names = filter?.name
+    const byAddress = await Promise.all(addresses?.map((address) => this.resolveByAddress(address)) ?? [])
+    const byName = await Promise.all(names?.map((name) => this.resolveByName(name)) ?? [])
+    return [...byAddress, ...byName]
+  }
+}