@xyo-network/bridge-module-resolver 2.50.4 → 2.50.5

package/dist/esm/ProxyModule.js

@@ -1,9 +1,10 @@
 import { assertEx } from '@xylabs/assert';
-import { CompositeModuleResolver } from '@xyo-network/module';
+import { CompositeModuleResolver, ModuleQueriedEvent, } from '@xyo-network/module';
 export class ProxyModule {
     bridge;
     _address;
     upResolver = new CompositeModuleResolver();
+    moduleQueriedEventListeners = [];
     constructor(bridge, _address) {
         this.bridge = bridge;
         this._address = _address;
@@ -20,8 +21,19 @@ export class ProxyModule {
     get queries() {
         return this.bridge.targetQueries(this.address);
     }
+    on(event, listener) {
+        switch (event) {
+            case ModuleQueriedEvent:
+                this.moduleQueriedEventListeners?.push(listener);
+                break;
+        }
+        return this;
+    }
     async query(query, payloads) {
-        return assertEx(await this.bridge.targetQuery(this.address, query, payloads), 'Remote Query Failed');
+        const result = assertEx(await this.bridge.targetQuery(this.address, query, payloads), 'Remote Query Failed');
+        const args = { module: this, payloads, query, result };
+        this.moduleQueriedEventListeners?.map((listener) => listener(args));
+        return result;
     }
     async queryable(query, payloads, queryConfig) {
         return await this.bridge.targetQueryable(this.address, query, payloads, queryConfig);

package/dist/esm/ProxyModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProxyModule.js","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,uBAAuB,EAA+E,MAAM,qBAAqB,CAAA;AAG1I,MAAM,OAAO,WAAW;IAGS;IAAyC;IAF/D,UAAU,GAAG,IAAI,uBAAuB,EAAE,CAAA;IAEnD,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,YAAY;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAA;IACvC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,KAAK,CAAC,KAAK,CAAwD,KAAQ,EAAE,QAAuB;QAClG,OAAO,QAAQ,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,qBAAqB,CAAC,CAAA;IACtG,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":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EACL,uBAAuB,EAKvB,kBAAkB,GAInB,MAAM,qBAAqB,CAAA;AAG5B,MAAM,OAAO,WAAW;IAIS;IAAyC;IAH/D,UAAU,GAAG,IAAI,uBAAuB,EAAE,CAAA;IAChC,2BAA2B,GAA4C,EAAE,CAAA;IAE5F,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,YAAY;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAA;IACvC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,EAAE,CAAC,KAAyB,EAAE,QAAgD;QAC5E,QAAQ,KAAK,EAAE;YACb,KAAK,kBAAkB;gBACrB,IAAI,CAAC,2BAA2B,EAAE,IAAI,CAAC,QAAiD,CAAC,CAAA;gBACzF,MAAK;SACR;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,KAAK,CAAwD,KAAQ,EAAE,QAAuB;QAClG,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,qBAAqB,CAAC,CAAA;QAC5G,MAAM,IAAI,GAA2B,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;QAC9E,IAAI,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;QACnE,OAAO,MAAM,CAAA;IACf,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/ProxyModule.d.ts

@@ -1,15 +1,17 @@
 import { BridgeModule } from '@xyo-network/bridge-model';
-import { CompositeModuleResolver, Module, ModuleConfig, ModuleFilter, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module';
+import { CompositeModuleResolver, EventListener, Module, ModuleConfig, ModuleFilter, ModuleQueriedEvent, ModuleQueriedEventArgs, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
 export declare class ProxyModule implements Module {
     protected readonly bridge: BridgeModule;
     protected readonly _address: string;
     readonly upResolver: CompositeModuleResolver;
+    protected readonly moduleQueriedEventListeners: EventListener<ModuleQueriedEventArgs>[];
     constructor(bridge: BridgeModule, _address: string);
     get address(): string;
     get config(): ModuleConfig;
     get downResolver(): import("@xyo-network/module").ModuleResolver;
     get queries(): string[];
+    on(event: ModuleQueriedEvent, listener: (args: ModuleQueriedEventArgs) => void): this;
     query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayload[]): Promise<ModuleQueryResult>;
     queryable(query: XyoQueryBoundWitness, payloads?: XyoPayload[], queryConfig?: ModuleConfig): Promise<boolean>;
     resolve(filter?: ModuleFilter): Promise<Module[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"ProxyModule.d.ts","sourceRoot":"","sources":["../../src/ProxyModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1I,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,qBAAa,WAAY,YAAW,MAAM;IAG5B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;IAAE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAFxF,QAAQ,CAAC,UAAU,0BAAgC;gBAEpB,MAAM,EAAE,YAAY,EAAqB,QAAQ,EAAE,MAAM;IAExF,IAAI,OAAO,WAEV;IAED,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,IAAI,YAAY,iDAEf;IAED,IAAI,OAAO,aAEV;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":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EACL,uBAAuB,EACvB,aAAa,EACb,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,kBAAkB,EAClB,sBAAsB,EACtB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,qBAAa,WAAY,YAAW,MAAM;IAI5B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY;IAAE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAHxF,QAAQ,CAAC,UAAU,0BAAgC;IACnD,SAAS,CAAC,QAAQ,CAAC,2BAA2B,EAAE,aAAa,CAAC,sBAAsB,CAAC,EAAE,CAAK;gBAE7D,MAAM,EAAE,YAAY,EAAqB,QAAQ,EAAE,MAAM;IAExF,IAAI,OAAO,WAEV;IAED,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,IAAI,YAAY,iDAEf;IAED,IAAI,OAAO,aAEV;IAED,EAAE,CAAC,KAAK,EAAE,kBAAkB,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,sBAAsB,KAAK,IAAI,GAAG,IAAI;IAS/E,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAO3H,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

@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.7.4",
-    "@xyo-network/address-payload-plugin": "^2.50.4",
-    "@xyo-network/bridge-model": "^2.50.4",
-    "@xyo-network/module": "^2.50.4",
-    "@xyo-network/module-model": "^2.50.4",
-    "@xyo-network/payload-model": "^2.50.4",
+    "@xyo-network/address-payload-plugin": "^2.50.5",
+    "@xyo-network/bridge-model": "^2.50.5",
+    "@xyo-network/module": "^2.50.5",
+    "@xyo-network/module-model": "^2.50.5",
+    "@xyo-network/payload-model": "^2.50.5",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
@@ -56,5 +56,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.50.4"
+  "version": "2.50.5"
 }

package/src/ProxyModule.ts

@@ -1,10 +1,21 @@
 import { assertEx } from '@xylabs/assert'
 import { BridgeModule } from '@xyo-network/bridge-model'
-import { CompositeModuleResolver, Module, ModuleConfig, ModuleFilter, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module'
+import {
+  CompositeModuleResolver,
+  EventListener,
+  Module,
+  ModuleConfig,
+  ModuleFilter,
+  ModuleQueriedEvent,
+  ModuleQueriedEventArgs,
+  ModuleQueryResult,
+  XyoQueryBoundWitness,
+} from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload-model'
 
 export class ProxyModule implements Module {
   readonly upResolver = new CompositeModuleResolver()
+  protected readonly moduleQueriedEventListeners: EventListener<ModuleQueriedEventArgs>[] = []
 
   constructor(protected readonly bridge: BridgeModule, protected readonly _address: string) {}
 
@@ -24,8 +35,20 @@ export class ProxyModule implements Module {
     return this.bridge.targetQueries(this.address)
   }
 
+  on(event: ModuleQueriedEvent, listener: (args: ModuleQueriedEventArgs) => void): this {
+    switch (event) {
+      case ModuleQueriedEvent:
+        this.moduleQueriedEventListeners?.push(listener as EventListener<ModuleQueriedEventArgs>)
+        break
+    }
+    return this
+  }
+
   async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayload[]): Promise<ModuleQueryResult> {
-    return assertEx(await this.bridge.targetQuery(this.address, query, payloads), 'Remote Query Failed')
+    const result = assertEx(await this.bridge.targetQuery(this.address, query, payloads), 'Remote Query Failed')
+    const args: ModuleQueriedEventArgs = { module: this, payloads, query, result }
+    this.moduleQueriedEventListeners?.map((listener) => listener(args))
+    return result
   }
 
   async queryable(query: XyoQueryBoundWitness, payloads?: XyoPayload[], queryConfig?: ModuleConfig): Promise<boolean> {