@xyo-network/bridge-pub-sub 2.100.3 → 2.100.5

package/src/AsyncQueryBus/model/Params.ts

@@ -1,4 +1,5 @@
 import { BaseParams } from '@xylabs/object'
+import { QueryFulfillFinishedEventArgs, QueryFulfillStartedEventArgs } from '@xyo-network/bridge-model'
 import { ModuleInstance } from '@xyo-network/module-model'
 
 import { AsyncQueryBusBaseConfig } from './BaseConfig'
@@ -11,4 +12,7 @@ export type AsyncQueryBusParams<TConfig extends AsyncQueryBusBaseConfig = AsyncQ
 }>
 
 export type AsyncQueryBusClientParams = AsyncQueryBusParams<AsyncQueryBusClientConfig>
-export type AsyncQueryBusHostParams = AsyncQueryBusParams<AsyncQueryBusHostConfig>
+export type AsyncQueryBusHostParams = AsyncQueryBusParams<AsyncQueryBusHostConfig> & {
+  onQueryFulfillFinished?: (args: Omit<QueryFulfillFinishedEventArgs, 'module'>) => void
+  onQueryFulfillStarted?: (args: Omit<QueryFulfillStartedEventArgs, 'module'>) => void
+}

package/src/PubSubBridge.ts

@@ -5,7 +5,15 @@ import { Address } from '@xylabs/hex'
 import { toJsonString } from '@xylabs/object'
 import { AbstractBridge } from '@xyo-network/abstract-bridge'
 import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
-import { BridgeExposeOptions, BridgeModule, BridgeUnexposeOptions, QueryFinishedEventArgs, QueryStartedEventArgs } from '@xyo-network/bridge-model'
+import {
+  BridgeExposeOptions,
+  BridgeModule,
+  BridgeUnexposeOptions,
+  QueryFulfillFinishedEventArgs,
+  QueryFulfillStartedEventArgs,
+  QuerySendFinishedEventArgs,
+  QuerySendStartedEventArgs,
+} from '@xyo-network/bridge-model'
 import { creatableModule, ModuleIdentifier, ModuleInstance, resolveAddressToInstanceUp, ResolveHelper } from '@xyo-network/module-model'
 import { asNodeInstance } from '@xyo-network/node-model'
 import { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'
@@ -39,11 +47,11 @@ export class PubSubBridge<TParams extends PubSubBridgeParams = PubSubBridgeParam
       new PubSubBridgeModuleResolver({
         bridge: this,
         busClient: assertEx(this.busClient(), () => 'busClient not configured'),
-        onQueryFinished: (args: QueryFinishedEventArgs) => {
-          forget(this.emit('queryFinished', args))
+        onQuerySendFinished: (args: Omit<QuerySendFinishedEventArgs, 'module'>) => {
+          forget(this.emit('querySendFinished', { module: this, ...args }))
         },
-        onQueryStarted: (args: QueryStartedEventArgs) => {
-          forget(this.emit('queryStarted', args))
+        onQuerySendStarted: (args: Omit<QuerySendStartedEventArgs, 'module'>) => {
+          forget(this.emit('querySendStarted', { module: this, ...args }))
         },
         root: this,
         wrapperAccount: this.account,
@@ -98,7 +106,7 @@ export class PubSubBridge<TParams extends PubSubBridgeParams = PubSubBridgeParam
     if (module) {
       host.expose(module)
       const children = maxDepth > 0 ? (await module.publicChildren?.()) ?? [] : []
-      console.log(`childrenToExpose [${module.id}]: ${toJsonString(children.map((child) => child.id))}`)
+      this.logger.log(`childrenToExpose [${module.id}][${module.address}]: ${toJsonString(children.map((child) => child.id))}`)
       const exposedChildren = (
         await Promise.all(children.map((child) => this.exposeHandler(child.address, { maxDepth: maxDepth - 1, required: false })))
       )
@@ -155,6 +163,12 @@ export class PubSubBridge<TParams extends PubSubBridgeParams = PubSubBridgeParam
       this._busHost = new AsyncQueryBusHost({
         config: this.config.host,
         logger: this.logger,
+        onQueryFulfillFinished: (args: Omit<QueryFulfillFinishedEventArgs, 'module'>) => {
+          forget(this.emit('queryFulfillFinished', { module: this, ...args }))
+        },
+        onQueryFulfillStarted: (args: Omit<QueryFulfillStartedEventArgs, 'module'>) => {
+          forget(this.emit('queryFulfillStarted', { module: this, ...args }))
+        },
         rootModule: this,
       })
     }

package/src/PubSubBridgeModuleResolver.ts

@@ -31,8 +31,8 @@ export class PubSubBridgeModuleResolver extends AbstractBridgeModuleResolver<Pub
       config: { schema: ModuleConfigSchema },
       host: this.params.bridge,
       moduleAddress: firstPart as Address,
-      onQueryFinished: this.params.onQueryFinished,
-      onQueryStarted: this.params.onQueryStarted,
+      onQuerySendFinished: this.params.onQuerySendFinished,
+      onQuerySendStarted: this.params.onQuerySendStarted,
     }
     const proxy = new AsyncQueryBusModuleProxy<T, AsyncQueryBusModuleProxyParams>(finalParams)
     if (proxy) {