@xyo-network/bridge-module-resolver 2.47.4 → 2.47.6

package/dist/esm/ModuleResolver.js

@@ -15,9 +15,16 @@ export class BridgeModuleResolver extends CompositeModuleResolver {
     get isModuleResolver() {
         return true;
     }
-    add(_module, _name) {
+    add(_module) {
         throw new Error('Method not implemented.');
     }
+    async currentResolvedModules() {
+        const result = {};
+        await Promise.all(Object.entries(this.resolvedModules).map(async ([key, value]) => {
+            result[key] = await value;
+        }));
+        return result;
+    }
     remove(_address) {
         throw new Error('Method not implemented.');
     }
@@ -36,26 +43,52 @@ export class BridgeModuleResolver extends CompositeModuleResolver {
             }
         }));
     }
-    resolveByAddress(targetAddress) {
+    async resolveByAddress(targetAddress) {
         const cached = this.resolvedModules[targetAddress];
         if (cached)
-            return cached;
-        const mod = new ProxyModule(this.bridge, targetAddress);
-        this.resolvedModules[targetAddress] = mod;
-        return mod;
+            return await cached;
+        this.resolvedModules[targetAddress] =
+            this.resolvedModules[targetAddress] ??
+                (async (address) => {
+                    const mod = new ProxyModule(this.bridge, address);
+                    //discover it to set the config in the bridge
+                    await this.bridge.targetDiscover(targetAddress);
+                    return mod;
+                })(targetAddress);
+        return await this.resolvedModules[targetAddress];
     }
-    resolveByName(name) {
-        const cached = this.resolvedModules[name];
-        if (cached)
-            return cached;
-        return undefined;
+    async resolveByName(name) {
+        return Object.values(await this.currentResolvedModules()).filter((module) => module.config.name === name);
+    }
+    async resolveByQuery(queries) {
+        return Object.values(await this.currentResolvedModules()).filter((module) => {
+            //filter out the requested queries
+            const found = module.queries.filter((query) => queries.find((q) => q === query));
+            //did we find all the requested queries?
+            return queries.length === found.length;
+        });
     }
     async resolveRemoteModules(filter) {
-        const addresses = filter ? filter?.address : await this.getRemoteAddresses();
-        const names = filter?.name;
-        const byAddress = compact(await Promise.all(addresses?.map((address) => this.resolveByAddress(address)) ?? []));
-        const byName = compact(await Promise.all(names?.map((name) => this.resolveByName(name)) ?? []));
-        return [...byAddress, ...byName];
+        if (filter?.address) {
+            return this.resolveRemoteModulesByAddress(filter);
+        }
+        if (filter?.name) {
+            return this.resolveRemoteModulesByName(filter);
+        }
+        if (filter?.query) {
+            return this.resolveRemoteModulesByQuery(filter);
+        }
+        //get all of them
+        return this.resolveRemoteModulesByAddress({ address: await this.getRemoteAddresses() });
+    }
+    async resolveRemoteModulesByAddress(filter) {
+        return compact(await Promise.all(filter.address.map((address) => this.resolveByAddress(address))));
+    }
+    async resolveRemoteModulesByName(filter) {
+        return compact((await Promise.all(filter.name.map(async (name) => await this.resolveByName(name)))).flat());
+    }
+    async resolveRemoteModulesByQuery(filter) {
+        return compact((await Promise.all(filter.query.map(async (query) => await this.resolveByQuery(query)))).flat());
     }
 }
 //# sourceMappingURL=ModuleResolver.js.map

package/dist/esm/ModuleResolver.js.map

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

package/dist/esm/ProxyModule.js

@@ -1,4 +1,3 @@
-import { ModuleConfigSchema } from '@xyo-network/module';
 export class ProxyModule {
     bridge;
     _address;
@@ -10,7 +9,7 @@ export class ProxyModule {
         return this._address;
     }
     get config() {
-        return { schema: ModuleConfigSchema };
+        return this.bridge.targetConfig(this.address);
     }
     get queries() {
         return this.bridge.targetQueries(this.address);

package/dist/esm/ProxyModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProxyModule.js","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,kBAAkB,EAAyD,MAAM,qBAAqB,CAAA;AAGrI,MAAM,OAAO,WAAW;IACS;IAAyC;IAAxE,YAA+B,MAAoB,EAAqB,QAAgB;QAAzD,WAAM,GAAN,MAAM,CAAc;QAAqB,aAAQ,GAAR,QAAQ,CAAQ;IAAG,CAAC;IAE5F,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAA;IACvC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAwD,KAAQ,EAAE,QAAuB;QAClG,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;IACrE,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAA2B,EAAE,QAAuB,EAAE,WAA0B;QAC9F,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;IACtF,CAAC;IAED,uGAAuG;IACvG,KAAK,CAAC,OAAO,CAAC,MAAqB;QACjC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC9D,CAAC;CACF"}
+{"version":3,"file":"ProxyModule.js","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,WAAW;IACS;IAAyC;IAAxE,YAA+B,MAAoB,EAAqB,QAAgB;QAAzD,WAAM,GAAN,MAAM,CAAc;QAAqB,aAAQ,GAAR,QAAQ,CAAQ;IAAG,CAAC;IAE5F,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC/C,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAwD,KAAQ,EAAE,QAAuB;QAClG,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;IACrE,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAA2B,EAAE,QAAuB,EAAE,WAA0B;QAC9F,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;IACtF,CAAC;IAED,uGAAuG;IACvG,KAAK,CAAC,OAAO,CAAC,MAAqB;QACjC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC9D,CAAC;CACF"}

package/dist/types/ModuleResolver.d.ts

@@ -7,15 +7,18 @@ export declare class BridgeModuleResolver extends CompositeModuleResolver {
     private resolvedModules;
     constructor(bridge: BridgeModule);
     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;
+    add(module: Module): this;
+    add(module: Module[]): this;
+    currentResolvedModules(): Promise<Record<string, ProxyModule>>;
+    remove(_address: string | string[]): this;
     resolve(filter?: ModuleFilter): Promise<ProxyModule[]>;
     private getRemoteAddresses;
     private resolveByAddress;
     private resolveByName;
+    private resolveByQuery;
     private resolveRemoteModules;
+    private resolveRemoteModulesByAddress;
+    private resolveRemoteModulesByName;
+    private resolveRemoteModulesByQuery;
 }
 //# sourceMappingURL=ModuleResolver.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ModuleResolver.d.ts","sourceRoot":"","sources":["../../src/ModuleResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAIhE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,qBAAa,oBAAqB,SAAQ,uBAAuB;IAKnD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;IAJnD,OAAO,CAAC,eAAe,CAAkC;gBAI1B,MAAM,EAAE,YAAY;IAInD,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,WAAW,EAAE,CAAC;YAI9C,kBAAkB;IAchC,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,aAAa;YAMP,oBAAoB;CAOnC"}
+{"version":3,"file":"ModuleResolver.d.ts","sourceRoot":"","sources":["../../src/ModuleResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,EAAuB,MAAM,EAAE,YAAY,EAAuC,MAAM,2BAA2B,CAAA;AAI1H,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,qBAAa,oBAAqB,SAAQ,uBAAuB;IAKnD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;IAJnD,OAAO,CAAC,eAAe,CAA2C;gBAInC,MAAM,EAAE,YAAY;IAInD,IAAW,gBAAgB,IAAI,OAAO,CAErC;IAED,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IACzB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI;IAKrB,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAWpE,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAInC,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;YAI9C,kBAAkB;YAclB,gBAAgB;YAkBhB,aAAa;YAIb,cAAc;YAUd,oBAAoB;YAiBpB,6BAA6B;YAI7B,0BAA0B;YAI1B,2BAA2B;CAG1C"}

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

@@ -1 +1 @@
-{"version":3,"file":"ProxyModule.d.ts","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,MAAM,EAAE,YAAY,EAAsB,YAAY,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AACrI,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,qBAAa,WAAY,YAAW,MAAM;IAC5B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;IAAE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;gBAAzD,MAAM,EAAE,YAAY,EAAqB,QAAQ,EAAE,MAAM;IAExF,IAAI,OAAO,WAEV;IAED,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,IAAI,OAAO,aAEV;IAED,IAAI,QAAQ;;;;;;;;;QAEX;IAEK,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAI3H,SAAS,CAAC,KAAK,EAAE,oBAAoB,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,EAAE,WAAW,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAK7G,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAGxD"}
+{"version":3,"file":"ProxyModule.d.ts","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AACjH,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,qBAAa,WAAY,YAAW,MAAM;IAC5B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;IAAE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;gBAAzD,MAAM,EAAE,YAAY,EAAqB,QAAQ,EAAE,MAAM;IAExF,IAAI,OAAO,WAEV;IAED,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,IAAI,OAAO,aAEV;IAED,IAAI,QAAQ;;;;;;;;;QAEX;IAEK,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAI3H,SAAS,CAAC,KAAK,EAAE,oBAAoB,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,EAAE,WAAW,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAK7G,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAGxD"}

package/package.json

@@ -10,16 +10,16 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/address-payload-plugin": "^2.47.4",
-    "@xyo-network/bridge-model": "^2.47.4",
-    "@xyo-network/module": "^2.47.4",
-    "@xyo-network/module-model": "^2.47.4",
-    "@xyo-network/payload-model": "^2.47.4",
+    "@xyo-network/address-payload-plugin": "^2.47.6",
+    "@xyo-network/bridge-model": "^2.47.6",
+    "@xyo-network/module": "^2.47.6",
+    "@xyo-network/module-model": "^2.47.6",
+    "@xyo-network/payload-model": "^2.47.6",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.14.15",
-    "@xylabs/tsconfig": "^2.14.15",
+    "@xylabs/ts-scripts-yarn3": "^2.14.16",
+    "@xylabs/tsconfig": "^2.14.16",
     "typescript": "^4.9.5"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -55,5 +55,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.47.4"
+  "version": "2.47.6"
 }

package/src/ModuleResolver.ts

@@ -1,14 +1,14 @@
 import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
 import { BridgeModule } from '@xyo-network/bridge-model'
 import { CompositeModuleResolver } from '@xyo-network/module'
-import { Module, ModuleFilter } from '@xyo-network/module-model'
+import { AddressModuleFilter, Module, ModuleFilter, NameModuleFilter, QueryModuleFilter } from '@xyo-network/module-model'
 import compact from 'lodash/compact'
 import flatten from 'lodash/flatten'
 
 import { ProxyModule } from './ProxyModule'
 
 export class BridgeModuleResolver extends CompositeModuleResolver {
-  private resolvedModules: Record<string, ProxyModule> = {}
+  private resolvedModules: Record<string, Promise<ProxyModule>> = {}
 
   // TODO: Allow optional ctor param for supplying address for nested Nodes
   // protected readonly address?: string,
@@ -20,16 +20,24 @@ export class BridgeModuleResolver extends CompositeModuleResolver {
     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 {
+  add(module: Module): this
+  add(module: Module[]): this
+  add(_module: Module | Module[]): this {
     throw new Error('Method not implemented.')
   }
 
-  remove(name: string | string[]): this
-  remove(address: string | string[]): this
-  remove(_address: unknown): this {
+  async currentResolvedModules(): Promise<Record<string, ProxyModule>> {
+    const result: Record<string, ProxyModule> = {}
+    await Promise.all(
+      Object.entries(this.resolvedModules).map(async ([key, value]) => {
+        result[key] = await value
+      }),
+    )
+
+    return result
+  }
+
+  remove(_address: string | string[]): this {
     throw new Error('Method not implemented.')
   }
 
@@ -51,25 +59,64 @@ export class BridgeModuleResolver extends CompositeModuleResolver {
     )
   }
 
-  private resolveByAddress(targetAddress: string): ProxyModule | undefined {
+  private async resolveByAddress(targetAddress: string): Promise<ProxyModule | undefined> {
     const cached = this.resolvedModules[targetAddress]
-    if (cached) return cached
-    const mod = new ProxyModule(this.bridge, targetAddress)
-    this.resolvedModules[targetAddress] = mod
-    return mod
+    if (cached) return await cached
+
+    this.resolvedModules[targetAddress] =
+      this.resolvedModules[targetAddress] ??
+      (async (address: string) => {
+        const mod = new ProxyModule(this.bridge, address)
+
+        //discover it to set the config in the bridge
+        await this.bridge.targetDiscover(targetAddress)
+
+        return mod
+      })(targetAddress)
+
+    return await this.resolvedModules[targetAddress]
   }
 
-  private resolveByName(name: string): ProxyModule | undefined {
-    const cached = this.resolvedModules[name]
-    if (cached) return cached
-    return undefined
+  private async resolveByName(name: string): Promise<ProxyModule[] | undefined> {
+    return Object.values(await this.currentResolvedModules()).filter((module) => module.config.name === name)
+  }
+
+  private async resolveByQuery(queries: string[]): Promise<ProxyModule[]> {
+    return Object.values(await this.currentResolvedModules()).filter((module) => {
+      //filter out the requested queries
+      const found = module.queries.filter((query) => queries.find((q) => q === query))
+
+      //did we find all the requested queries?
+      return queries.length === found.length
+    })
   }
 
   private async resolveRemoteModules(filter?: ModuleFilter): Promise<ProxyModule[]> {
-    const addresses = filter ? filter?.address : await this.getRemoteAddresses()
-    const names = filter?.name
-    const byAddress = compact(await Promise.all(addresses?.map((address) => this.resolveByAddress(address)) ?? []))
-    const byName = compact(await Promise.all(names?.map((name) => this.resolveByName(name)) ?? []))
-    return [...byAddress, ...byName]
+    if ((filter as AddressModuleFilter)?.address) {
+      return this.resolveRemoteModulesByAddress(filter as AddressModuleFilter)
+    }
+
+    if ((filter as NameModuleFilter)?.name) {
+      return this.resolveRemoteModulesByName(filter as NameModuleFilter)
+    }
+
+    if ((filter as QueryModuleFilter)?.query) {
+      return this.resolveRemoteModulesByQuery(filter as QueryModuleFilter)
+    }
+
+    //get all of them
+    return this.resolveRemoteModulesByAddress({ address: await this.getRemoteAddresses() })
+  }
+
+  private async resolveRemoteModulesByAddress(filter: AddressModuleFilter): Promise<ProxyModule[]> {
+    return compact(await Promise.all(filter.address.map((address) => this.resolveByAddress(address))))
+  }
+
+  private async resolveRemoteModulesByName(filter: NameModuleFilter): Promise<ProxyModule[]> {
+    return compact((await Promise.all(filter.name.map(async (name) => await this.resolveByName(name)))).flat())
+  }
+
+  private async resolveRemoteModulesByQuery(filter: QueryModuleFilter): Promise<ProxyModule[]> {
+    return compact((await Promise.all(filter.query.map(async (query) => await this.resolveByQuery(query)))).flat())
   }
 }

package/src/ProxyModule.ts

@@ -1,5 +1,5 @@
 import { BridgeModule } from '@xyo-network/bridge-model'
-import { Module, ModuleConfig, ModuleConfigSchema, ModuleFilter, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module'
+import { Module, ModuleConfig, ModuleFilter, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload-model'
 
 export class ProxyModule implements Module {
@@ -10,7 +10,7 @@ export class ProxyModule implements Module {
   }
 
   get config(): ModuleConfig {
-    return { schema: ModuleConfigSchema }
+    return this.bridge.targetConfig(this.address)
   }
 
   get queries() {