@xyo-network/bridge-pub-sub 2.94.11 → 2.94.13

package/src/AsyncQueryBus/AsyncQueryBusHost.ts

@@ -141,24 +141,25 @@ export class AsyncQueryBusHost<TParams extends AsyncQueryBusHostParams = AsyncQu
    * @param address The address to find commands for
    */
   protected findQueriesToAddress = async (address: Address) => {
-    const queryBoundWitnessDiviner = assertEx(
-      await this.queriesDiviner(),
-      () => `Unable to resolve queriesDiviner [${this.config?.intersect?.queries?.boundWitnessDiviner}]`,
-    )
-    // Retrieve last offset from state store
-    const timestamp = await this.retrieveState(address)
-    const destination = [address]
-    const limit = this.perAddressBatchQueryLimit
-    // Filter for commands to us by destination address
-    const divinerQuery = { destination, limit, schema: BoundWitnessDivinerQuerySchema, sort: 'asc', timestamp }
-    const result = await queryBoundWitnessDiviner.divine([divinerQuery])
-    const queries = result.filter(isQueryBoundWitnessWithMeta)
-    const nextState = queries.length > 0 ? Math.max(...queries.map((c) => c.timestamp ?? 0)) + 1 : timestamp
-    // TODO: This needs to be thought through as we can't use a distributed timestamp
-    // because of collisions. We need to use the timestamp of the store so there's no
-    // chance of multiple commands at the same time
-    await this.commitState(address, nextState)
-    return queries
+    const queryBoundWitnessDiviner = await this.queriesDiviner()
+    if (queryBoundWitnessDiviner) {
+      // Retrieve last offset from state store
+      const timestamp = await this.retrieveState(address)
+      const destination = [address]
+      const limit = this.perAddressBatchQueryLimit
+      // Filter for commands to us by destination address
+      const divinerQuery = { destination, limit, schema: BoundWitnessDivinerQuerySchema, sort: 'asc', timestamp }
+      const result = await queryBoundWitnessDiviner.divine([divinerQuery])
+      const queries = result.filter(isQueryBoundWitnessWithMeta)
+      const nextState = queries.length > 0 ? Math.max(...queries.map((c) => c.timestamp ?? 0)) + 1 : timestamp
+      // TODO: This needs to be thought through as we can't use a distributed timestamp
+      // because of collisions. We need to use the timestamp of the store so there's no
+      // chance of multiple commands at the same time
+      await this.commitState(address, nextState)
+      return queries
+    } else {
+      this.logger?.warn(`Unable to resolve queryBoundWitnessDiviner [${this.config?.intersect?.queries?.boundWitnessDiviner}]`)
+    }
   }
 
   /**
@@ -193,7 +194,7 @@ export class AsyncQueryBusHost<TParams extends AsyncQueryBusHostParams = AsyncQu
         try {
           const localModuleName = localModule.config.name ?? localModule.address
           this.logger?.debug(`Checking for inbound queries to ${localModuleName} [${localModule.address}]`)
-          const queries = await this.findQueriesToAddress(localModule.address)
+          const queries = (await this.findQueriesToAddress(localModule.address)) ?? []
           if (queries.length === 0) return
           this.logger?.debug(`Found queries addressed to local module: ${localModuleName}`)
           for (const query of queries) {

package/src/PubSubBridgeModuleResolver.ts

@@ -1,17 +1,17 @@
 import { assertEx } from '@xylabs/assert'
 import { Address, isAddress } from '@xylabs/hex'
-import { AbstractBridgeModuleResolver, BridgeModuleResolverOptions, wrapModuleWithType } from '@xyo-network/abstract-bridge'
+import { AbstractBridgeModuleResolver, BridgeModuleResolverParams, wrapModuleWithType } from '@xyo-network/abstract-bridge'
 import { Account } from '@xyo-network/account'
 import { ConfigPayload, ConfigSchema } from '@xyo-network/config-payload-plugin'
 import { asModuleInstance, ModuleConfig, ModuleConfigSchema, ModuleFilterOptions, ModuleIdentifier, ModuleInstance } from '@xyo-network/module-model'
 
 import { AsyncQueryBusClient, AsyncQueryBusModuleProxy, AsyncQueryBusModuleProxyParams } from './AsyncQueryBus'
 
-export interface PubSubBridgeModuleResolverOptions extends BridgeModuleResolverOptions {
+export interface PubSubBridgeModuleResolverParams extends BridgeModuleResolverParams {
   busClient: AsyncQueryBusClient
 }
 
-export class PubSubBridgeModuleResolver extends AbstractBridgeModuleResolver<PubSubBridgeModuleResolverOptions> {
+export class PubSubBridgeModuleResolver extends AbstractBridgeModuleResolver<PubSubBridgeModuleResolverParams> {
   override async resolveHandler<T extends ModuleInstance = ModuleInstance>(
     id: ModuleIdentifier,
     options?: ModuleFilterOptions<T>,
@@ -27,9 +27,9 @@ export class PubSubBridgeModuleResolver extends AbstractBridgeModuleResolver<Pub
     const account = Account.randomSync()
     const params: AsyncQueryBusModuleProxyParams = {
       account,
-      busClient: this.options.busClient,
+      busClient: this.params.busClient,
       config: { schema: ModuleConfigSchema },
-      host: this.options.bridge,
+      host: this.params.bridge,
       moduleAddress: firstPart as Address,
     }
     const proxy = new AsyncQueryBusModuleProxy<T, AsyncQueryBusModuleProxyParams>(params)