@xyo-network/bridge-pub-sub 2.91.2 → 2.91.3

package/package.json

@@ -10,40 +10,40 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/array": "^3.0.3",
-    "@xylabs/assert": "^3.0.3",
-    "@xylabs/delay": "^3.0.3",
-    "@xylabs/forget": "^3.0.3",
-    "@xylabs/hex": "^3.0.3",
-    "@xylabs/lodash": "^3.0.3",
-    "@xylabs/object": "^3.0.3",
-    "@xylabs/promise": "^3.0.3",
-    "@xylabs/timer": "^3.0.3",
-    "@xyo-network/abstract-bridge": "~2.91.2",
-    "@xyo-network/account-model": "~2.91.2",
-    "@xyo-network/archivist-model": "~2.91.2",
-    "@xyo-network/boundwitness-builder": "~2.91.2",
-    "@xyo-network/boundwitness-model": "~2.91.2",
-    "@xyo-network/boundwitness-wrapper": "~2.91.2",
-    "@xyo-network/bridge-model": "~2.91.2",
-    "@xyo-network/diviner-boundwitness-model": "~2.91.2",
-    "@xyo-network/diviner-model": "~2.91.2",
-    "@xyo-network/manifest-model": "~2.91.2",
-    "@xyo-network/module-events": "~2.91.2",
-    "@xyo-network/module-model": "~2.91.2",
-    "@xyo-network/payload-builder": "~2.91.2",
-    "@xyo-network/payload-model": "~2.91.2",
+    "@xylabs/array": "^3.0.5",
+    "@xylabs/assert": "^3.0.5",
+    "@xylabs/delay": "^3.0.5",
+    "@xylabs/forget": "^3.0.5",
+    "@xylabs/hex": "^3.0.5",
+    "@xylabs/lodash": "^3.0.5",
+    "@xylabs/object": "^3.0.5",
+    "@xylabs/promise": "^3.0.5",
+    "@xylabs/timer": "^3.0.5",
+    "@xyo-network/abstract-bridge": "~2.91.3",
+    "@xyo-network/account-model": "~2.91.3",
+    "@xyo-network/archivist-model": "~2.91.3",
+    "@xyo-network/boundwitness-builder": "~2.91.3",
+    "@xyo-network/boundwitness-model": "~2.91.3",
+    "@xyo-network/boundwitness-wrapper": "~2.91.3",
+    "@xyo-network/bridge-model": "~2.91.3",
+    "@xyo-network/diviner-boundwitness-model": "~2.91.3",
+    "@xyo-network/diviner-model": "~2.91.3",
+    "@xyo-network/manifest-model": "~2.91.3",
+    "@xyo-network/module-events": "~2.91.3",
+    "@xyo-network/module-model": "~2.91.3",
+    "@xyo-network/payload-builder": "~2.91.3",
+    "@xyo-network/payload-model": "~2.91.3",
     "lru-cache": "^10.2.0"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.4.1",
     "@xylabs/tsconfig": "^3.4.1",
-    "@xyo-network/account": "~2.91.2",
-    "@xyo-network/archivist-memory": "~2.91.2",
-    "@xyo-network/boundwitness-builder": "~2.91.2",
-    "@xyo-network/diviner-boundwitness-memory": "~2.91.2",
-    "@xyo-network/module-abstract": "~2.91.2",
-    "@xyo-network/node-memory": "~2.91.2",
+    "@xyo-network/account": "~2.91.3",
+    "@xyo-network/archivist-memory": "~2.91.3",
+    "@xyo-network/boundwitness-builder": "~2.91.3",
+    "@xyo-network/diviner-boundwitness-memory": "~2.91.3",
+    "@xyo-network/module-abstract": "~2.91.3",
+    "@xyo-network/node-memory": "~2.91.3",
     "typescript": "^5.3.3"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -85,6 +85,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.91.2",
+  "version": "2.91.3",
   "type": "module"
 }

package/src/AsyncQueryBus/AsyncQueryBusBase.ts

@@ -8,7 +8,7 @@ import { asDivinerInstance, DivinerInstance } from '@xyo-network/diviner-model'
 import { ModuleConfig } from '@xyo-network/module-model'
 import { LRUCache } from 'lru-cache'
 
-import { AsyncQueryBusParams } from './Params'
+import { AsyncQueryBusParams } from './model'
 
 export class AsyncQueryBusBase<TParams extends AsyncQueryBusParams = AsyncQueryBusParams> extends Base<TParams> {
   protected _lastState?: LRUCache<Address, number>
@@ -42,29 +42,29 @@ export class AsyncQueryBusBase<TParams extends AsyncQueryBusParams = AsyncQueryB
 
   async queriesArchivist() {
     return assertEx(
-      asArchivistInstance(await this.resolver.resolve(this.config?.clearingHouse?.queries?.archivist)),
-      () => `Unable to resolve queriesArchivist [${this.config?.clearingHouse?.queries?.archivist}]`,
+      asArchivistInstance(await this.resolver.resolve(this.config?.intersect?.queries?.archivist)),
+      () => `Unable to resolve queriesArchivist [${this.config?.intersect?.queries?.archivist}]`,
     )
   }
 
   async queriesDiviner() {
     return assertEx(
-      asDivinerInstance(await this.resolver.resolve(this.config?.clearingHouse?.queries?.boundWitnessDiviner)),
-      () => `Unable to resolve queriesDiviner [${this.config?.clearingHouse?.queries?.boundWitnessDiviner}]`,
+      asDivinerInstance(await this.resolver.resolve(this.config?.intersect?.queries?.boundWitnessDiviner)),
+      () => `Unable to resolve queriesDiviner [${this.config?.intersect?.queries?.boundWitnessDiviner}]`,
     ) as DivinerInstance<BoundWitnessDivinerParams, BoundWitnessDivinerQueryPayload, QueryBoundWitness>
   }
 
   async responsesArchivist() {
     return assertEx(
-      asArchivistInstance(await this.resolver.resolve(this.config?.clearingHouse?.responses?.archivist)),
-      () => `Unable to resolve responsesArchivist [${this.config?.clearingHouse?.responses?.archivist}]`,
+      asArchivistInstance(await this.resolver.resolve(this.config?.intersect?.responses?.archivist)),
+      () => `Unable to resolve responsesArchivist [${this.config?.intersect?.responses?.archivist}]`,
     )
   }
 
   async responsesDiviner() {
     return assertEx(
-      asDivinerInstance(await this.resolver.resolve(this.config?.clearingHouse?.responses?.boundWitnessDiviner)),
-      () => `Unable to resolve responsesDiviner [${this.config?.clearingHouse?.responses?.boundWitnessDiviner}]`,
+      asDivinerInstance(await this.resolver.resolve(this.config?.intersect?.responses?.boundWitnessDiviner)),
+      () => `Unable to resolve responsesDiviner [${this.config?.intersect?.responses?.boundWitnessDiviner}]`,
     ) as DivinerInstance<BoundWitnessDivinerParams, BoundWitnessDivinerQueryPayload, BoundWitness>
   }
 

package/src/AsyncQueryBus/AsyncQueryBusClient.ts

@@ -11,8 +11,7 @@ import { ModuleError, Payload, PayloadWithMeta, WithMeta } from '@xyo-network/pa
 import { LRUCache } from 'lru-cache'
 
 import { AsyncQueryBusBase } from './AsyncQueryBusBase'
-import { Pending } from './Config'
-import { AsyncQueryBusClientParams } from './Params'
+import { AsyncQueryBusClientParams, Pending } from './model'
 
 export class AsyncQueryBusClient<TParams extends AsyncQueryBusClientParams = AsyncQueryBusClientParams> extends AsyncQueryBusBase<TParams> {
   protected _queryCache?: LRUCache<Address, Pending | ModuleQueryResult>

package/src/AsyncQueryBus/AsyncQueryBusHost.ts

@@ -9,7 +9,7 @@ import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { WithMeta } from '@xyo-network/payload-model'
 
 import { AsyncQueryBusBase } from './AsyncQueryBusBase'
-import { AsyncQueryBusHostParams } from './Params'
+import { AsyncQueryBusHostParams } from './model'
 
 export class AsyncQueryBusHost<TParams extends AsyncQueryBusHostParams = AsyncQueryBusHostParams> extends AsyncQueryBusBase<TParams> {
   private _pollId?: string

package/src/AsyncQueryBus/ModuleHost/ModuleHost.ts

@@ -1,6 +1,6 @@
 import { AbstractModuleHost, ModuleHostParams } from '../../AbstractModuleHost'
 import { AsyncQueryBusHost } from '../AsyncQueryBusHost'
-import { AsyncQueryBusHostConfig } from '../Config'
+import { AsyncQueryBusHostConfig } from '../model/HostConfig'
 
 export type AsyncQueryBusModuleHostParams = ModuleHostParams & {
   config: AsyncQueryBusHostConfig

package/src/AsyncQueryBus/ModuleProxy/ModuleProxy.ts

@@ -6,7 +6,7 @@ import { AbstractModuleProxy, ModuleProxyParams } from '../../AbstractModuleProx
 import { AsyncQueryBusClient } from '../AsyncQueryBusClient'
 
 export type AsyncQueryBusModuleProxyParams = ModuleProxyParams & {
-  bridgeClient: AsyncQueryBusClient
+  busClient: AsyncQueryBusClient
 }
 
 export class AsyncQueryBusModuleProxy<TWrappedModule extends Module = Module>
@@ -14,6 +14,6 @@ export class AsyncQueryBusModuleProxy<TWrappedModule extends Module = Module>
   implements ModuleInstance<TWrappedModule['params'], TWrappedModule['eventData']>
 {
   async query<T extends QueryBoundWitness = QueryBoundWitness>(query: T, payloads?: Payload[]): Promise<ModuleQueryResult> {
-    return await this.proxyParams.bridgeClient.send(this.address, query, payloads)
+    return await this.proxyParams.busClient.send(this.address, query, payloads)
   }
 }

package/src/AsyncQueryBus/index.ts

@@ -1,6 +1,5 @@
 export * from './AsyncQueryBusClient'
 export * from './AsyncQueryBusHost'
-export * from './Config'
+export * from './model'
 export * from './ModuleHost'
 export * from './ModuleProxy'
-export * from './Params'

package/src/AsyncQueryBus/model/BaseConfig.ts

@@ -0,0 +1,16 @@
+import { AsyncQueryBusIntersectConfig } from './IntersectConfig'
+import { SearchableStorage } from './SearchableStorage'
+
+export interface AsyncQueryBusBaseConfig {
+  intersect?: AsyncQueryBusIntersectConfig
+
+  /**
+   * How often to poll for new queries/responses
+   */
+  pollFrequency?: number
+
+  /**
+   * Where the archivist should persist its internal state
+   */
+  stateStore?: SearchableStorage
+}

package/src/AsyncQueryBus/model/ClientConfig.ts

@@ -0,0 +1,10 @@
+import { CacheConfig } from '@xyo-network/bridge-model'
+
+import { AsyncQueryBusBaseConfig } from './BaseConfig'
+
+export interface AsyncQueryBusClientConfig extends AsyncQueryBusBaseConfig {
+  /**
+   * Configuration for intermediary response storage
+   */
+  queryCache?: CacheConfig | true
+}

package/src/AsyncQueryBus/model/HostConfig.ts

@@ -0,0 +1,15 @@
+import { AsyncQueryBusBaseConfig } from './BaseConfig'
+
+export interface AsyncQueryBusHostConfig extends AsyncQueryBusBaseConfig {
+  /**
+   * Modules that should be exposed via this host
+   */
+
+  listeningModules?: string[]
+
+  /**
+   * How many queries to process at once when retrieving queries
+   * for an address
+   */
+  perAddressBatchQueryLimit?: number
+}

package/src/AsyncQueryBus/model/IntersectConfig.ts

@@ -0,0 +1,13 @@
+import { SearchableStorage } from './SearchableStorage'
+
+export interface AsyncQueryBusIntersectConfig {
+  /**
+   * Configuration for intermediary query storage
+   */
+  queries?: SearchableStorage
+
+  /**
+   * Configuration for intermediary response storage
+   */
+  responses?: SearchableStorage
+}

package/src/AsyncQueryBus/{Params.ts → model/Params.ts}

@@ -1,7 +1,9 @@
 import { BaseParams } from '@xylabs/object'
 import { ModuleResolver } from '@xyo-network/module-model'
 
-import { AsyncQueryBusBaseConfig, AsyncQueryBusClientConfig, AsyncQueryBusHostConfig } from './Config'
+import { AsyncQueryBusBaseConfig } from './BaseConfig'
+import { AsyncQueryBusClientConfig } from './ClientConfig'
+import { AsyncQueryBusHostConfig } from './HostConfig'
 
 export type AsyncQueryBusParams<TConfig extends AsyncQueryBusBaseConfig = AsyncQueryBusBaseConfig> = BaseParams<{
   config?: TConfig

package/src/AsyncQueryBus/model/QueryStatus.ts

@@ -0,0 +1,2 @@
+export const Pending = 'pending' as const
+export type Pending = typeof Pending

package/src/AsyncQueryBus/model/SearchableStorage.ts

@@ -0,0 +1,15 @@
+import { ModuleIdentifier } from '@xyo-network/module-model'
+
+/**
+ * Configuration for searchable storage of local state
+ */
+export interface SearchableStorage {
+  /**
+   * Name/Address of the archivist where intermediate communications are stored
+   */
+  archivist: ModuleIdentifier
+  /**
+   * Name/Address of the diviner where intermediate communications are filtered
+   */
+  boundWitnessDiviner: ModuleIdentifier
+}

package/src/AsyncQueryBus/model/index.ts

@@ -0,0 +1,7 @@
+export * from './BaseConfig'
+export * from './ClientConfig'
+export * from './HostConfig'
+export * from './IntersectConfig'
+export * from './Params'
+export * from './QueryStatus'
+export * from './SearchableStorage'

package/src/PubSubBridge.ts

@@ -1,21 +1,35 @@
 import { assertEx } from '@xylabs/assert'
-import { Address } from '@xylabs/hex'
+import { forget } from '@xylabs/forget'
+import { Address, isAddress } from '@xylabs/hex'
+import { compact } from '@xylabs/lodash'
+import { Promisable } from '@xylabs/promise'
 import { AbstractBridge } from '@xyo-network/abstract-bridge'
+import { Account } from '@xyo-network/account'
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model'
-import { BridgeModule, CacheConfig } from '@xyo-network/bridge-model'
+import { BridgeModule } from '@xyo-network/bridge-model'
 import { ModuleManifestPayload, ModuleManifestPayloadSchema } from '@xyo-network/manifest-model'
 import {
   creatableModule,
   ModuleConfig,
+  ModuleConfigSchema,
   ModuleEventData,
-  ModuleManifestQuery,
-  ModuleManifestQuerySchema,
+  ModuleFilter,
+  ModuleFilterOptions,
+  ModuleIdentifier,
+  ModuleInstance,
   ModuleQueryResult,
 } from '@xyo-network/module-model'
-import { isPayloadOfSchemaType, Payload, WithMeta } from '@xyo-network/payload-model'
+import { NodeAttachQuerySchema } from '@xyo-network/node-model'
+import { Payload } from '@xyo-network/payload-model'
 import { LRUCache } from 'lru-cache'
 
-import { AsyncQueryBusClient, AsyncQueryBusHost } from './AsyncQueryBus'
+import {
+  AsyncQueryBusClient,
+  AsyncQueryBusClientParams,
+  AsyncQueryBusHost,
+  AsyncQueryBusModuleProxy,
+  AsyncQueryBusModuleProxyParams,
+} from './AsyncQueryBus'
 import { PubSubBridgeConfigSchema } from './Config'
 import { PubSubBridgeParams } from './Params'
 
@@ -31,25 +45,11 @@ export class PubSubBridge<TParams extends PubSubBridgeParams = PubSubBridgeParam
   protected _configRootAddress: Address = ''
   protected _configStateStoreArchivist: string = ''
   protected _configStateStoreBoundWitnessDiviner: string = ''
-  protected _discoverCache?: LRUCache<string, Payload[]>
   protected _lastState?: LRUCache<string, number>
-  protected _targetConfigs: Record<string, ModuleConfig> = {}
-  protected _targetQueries: Record<string, string[]> = {}
 
   private _busClient?: AsyncQueryBusClient
   private _busHost?: AsyncQueryBusHost
 
-  get discoverCache() {
-    const config = this.discoverCacheConfig
-    this._discoverCache = this._discoverCache ?? new LRUCache<string, Payload[]>({ ttlAutopurge: true, ...config })
-    return this._discoverCache
-  }
-
-  get discoverCacheConfig(): LRUCache.Options<string, Payload[], unknown> {
-    const discoverCacheConfig: CacheConfig | undefined = this.config.discoverCache === true ? {} : this.config.discoverCache
-    return { max: 100, ttl: 1000 * 60 * 5, ...discoverCacheConfig }
-  }
-
   protected get moduleName() {
     return `${this.config.name ?? moduleName}`
   }
@@ -58,49 +58,9 @@ export class PubSubBridge<TParams extends PubSubBridgeParams = PubSubBridgeParam
     return this._configRootAddress
   }
 
-  // protected get stateStoreArchivistConfig() {
-  //   return this._configStateStoreArchivist
-  // }
-
-  // protected get stateStoreBoundWitnessDivinerConfig() {
-  //   return this._configStateStoreBoundWitnessDiviner
-  // }
-
   connect() {
-    //await super.startHandler()
     this.connected = true
-    return true
-    // const rootTargetDownResolver = this.targetDownResolver()
-    // if (rootTargetDownResolver) {
-    //   this.downResolver.addResolver(rootTargetDownResolver)
-    //   await this.targetDiscover(this.rootAddress)
-
-    //   const childAddresses = await rootTargetDownResolver.getRemoteAddresses()
-
-    //   const children = compact(
-    //     await Promise.all(
-    //       childAddresses.map(async (address) => {
-    //         const resolved = await rootTargetDownResolver.resolve({ address: [address] })
-    //         return resolved[0]
-    //       }),
-    //     ),
-    //   )
-
-    //   // Discover all to load cache
-    //   await Promise.all(children.map((child) => assertEx(child.discover())))
-
-    //   const parentNodes = await this.upResolver.resolve({ query: [[NodeAttachQuerySchema]] })
-    //   //notify parents of child modules
-    //   //TODO: this needs to be thought through. If this the correct direction for data flow and how do we 'un-attach'?
-    //   for (const node of parentNodes) for (const child of children) forget(node.emit('moduleAttached', { module: child }))
-    //   // console.log(`Started HTTP Bridge in ${Date.now() - start}ms`)
-    //   this.connected = true
-
-    //   return true
-    // } else {
-    //   this.connected = false
-    //   return false
-    // }
+    return this.connected
   }
 
   async disconnect(): Promise<boolean> {
@@ -113,69 +73,49 @@ export class PubSubBridge<TParams extends PubSubBridgeParams = PubSubBridgeParam
     return this.rootAddress
   }
 
-  override targetConfig(address: Address): ModuleConfig {
-    return assertEx(this._targetConfigs[address], () => `targetConfig not set [${address}]`)
+  override async resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>
+  override async resolve<T extends ModuleInstance = ModuleInstance>(id: ModuleIdentifier, options?: ModuleFilterOptions<T>): Promise<T | undefined>
+  override async resolve<T extends ModuleInstance = ModuleInstance>(
+    idOrFilter?: ModuleFilter<T> | ModuleIdentifier,
+    _options?: ModuleFilterOptions<T>,
+  ): Promise<T | T[] | undefined> {
+    if (idOrFilter === undefined) {
+      return []
+    }
+    if (typeof idOrFilter === 'string') {
+      const upResolve = await this.upResolver.resolve<T>(idOrFilter)
+      if (upResolve) return upResolve
+      assertEx(!isAddress(idOrFilter), 'Name resolutions not supported')
+      const params: AsyncQueryBusModuleProxyParams = {
+        account: Account.randomSync(),
+        busClient: assertEx(this.busClient(), 'Bus client not initialized'),
+        moduleAddress: idOrFilter as Address,
+        queries: [],
+      }
+      // eslint-disable-next-line unicorn/no-useless-promise-resolve-reject
+      return await Promise.resolve(new AsyncQueryBusModuleProxy<T>(params) as unknown as T)
+    } else {
+      throw new TypeError('Filter not Supported')
+    }
   }
 
-  override async targetDiscover(address?: Address | undefined, _maxDepth?: number | undefined): Promise<Payload[]> {
-    if (!this.connected) throw new Error('Not connected')
-    //if caching, return cached result if exists
-    const cachedResult = this.discoverCache?.get(address ?? 'root ')
-    if (cachedResult) {
-      return cachedResult
-    }
-    await this.started('throw')
-    const addressToDiscover = address ?? (await this.getRootAddress())
-    this.logger?.debug(`${this.moduleName}: Begin issuing targetDiscover to: ${addressToDiscover}`)
-    // const queryPayload: ModuleDiscoverQuery = { maxDepth, schema: ModuleDiscoverQuerySchema }
-    // const boundQuery = await this.bindQuery(queryPayload)
-    // const discover = assertEx(await this.targetQuery(addressToDiscover, boundQuery[0], boundQuery[1]), () => `Unable to resolve [${address}]`)[1]
-    // this._targetQueries[addressToDiscover] = compact(
-    //   discover?.map((payload) => {
-    //     if (payload.schema === QuerySchema) {
-    //       const schemaPayload = payload as QueryPayload
-    //       return schemaPayload.query
-    //     } else {
-    //       return null
-    //     }
-    //   }) ?? [],
-    // )
-    // const targetConfigSchema = assertEx(
-    //   discover.find(isPayloadOfSchemaType<WithMeta<ConfigPayload>>(ConfigSchema)),
-    //   () => `Discover did not return a [${ConfigSchema}] payload`,
-    // ).config
-
-    // this._targetConfigs[addressToDiscover] = assertEx(
-    //   discover.find(isPayloadOfSchemaType(targetConfigSchema)) as ModuleConfig,
-    //   () => `Discover did not return a [${targetConfigSchema}] payload`,
-    // )
-    // if caching, set entry
-    // this.discoverCache?.set(address ?? 'root', discover)
-    // return discover
-    return []
+  override targetConfig(_address: Address): ModuleConfig {
+    return { schema: ModuleConfigSchema }
   }
 
-  override async targetManifest(address: Address, maxDepth?: number | undefined): Promise<ModuleManifestPayload> {
-    const addressToCall = address ?? this.getRootAddress()
-    const queryPayload: ModuleManifestQuery = { maxDepth, schema: ModuleManifestQuerySchema }
-    const boundQuery = await this.bindQuery(queryPayload)
-    const manifest = assertEx(await this.targetQuery(addressToCall, boundQuery[0], boundQuery[1]), () => `Unable to resolve [${address}]`)[1]
-    return assertEx(
-      manifest.find(isPayloadOfSchemaType<WithMeta<ModuleManifestPayload>>(ModuleManifestPayloadSchema)),
-      'Did not receive manifest',
-    ) as ModuleManifestPayload
+  override targetManifest(_address: Address, _maxDepth?: number | undefined): Promisable<ModuleManifestPayload> {
+    return { config: { name: '', schema: ModuleConfigSchema }, schema: ModuleManifestPayloadSchema }
   }
 
-  override targetQueries(address: Address): string[] {
-    if (!this.connected) throw new Error('Not connected')
-    return assertEx(this._targetQueries[address], () => `targetQueries not set [${address}]`)
+  override targetQueries(_address: Address): string[] {
+    return []
   }
 
   override async targetQuery(address: Address, query: QueryBoundWitness, payloads?: Payload[] | undefined): Promise<ModuleQueryResult> {
     if (!this.connected) throw new Error('Not connected')
     await this.started('throw')
-    const bus = this.busClient()
-    return bus.send(address, query, payloads)
+    const bus = assertEx(this.busClient(), 'Client not configured')
+    return bus?.send(address, query, payloads)
   }
 
   override targetQueryable(_address: Address, _query: QueryBoundWitness, _payloads?: Payload[], _queryConfig?: ModuleConfig): boolean {
@@ -183,7 +123,7 @@ export class PubSubBridge<TParams extends PubSubBridgeParams = PubSubBridgeParam
   }
 
   protected busClient() {
-    if (!this._busClient) {
+    if (!this._busClient && this.config.client) {
       this._busClient = new AsyncQueryBusClient({
         config: this.config.client,
         logger: this.logger,
@@ -194,7 +134,7 @@ export class PubSubBridge<TParams extends PubSubBridgeParams = PubSubBridgeParam
   }
 
   protected busHost() {
-    if (!this._busHost) {
+    if (!this._busHost && this.config.host) {
       this._busHost = new AsyncQueryBusHost({
         config: this.config.host,
         logger: this.logger,
@@ -206,12 +146,12 @@ export class PubSubBridge<TParams extends PubSubBridgeParams = PubSubBridgeParam
 
   protected override async startHandler(): Promise<boolean> {
     await Promise.resolve(this.connect())
-    this.busHost().start()
+    this.busHost()?.start()
     return true
   }
 
   protected override stopHandler(_timeout?: number | undefined) {
-    this.busHost().stop()
+    this.busHost()?.stop()
     return true
   }
 }

package/dist/browser/AsyncQueryBus/Config.d.cts

@@ -1,53 +0,0 @@
-import { CacheConfig } from '@xyo-network/bridge-model';
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export declare const Pending: "pending";
-export type Pending = typeof Pending;
-/**
- * Configuration for searchable storage of local state
- */
-export interface SearchableStorage {
-    /**
-     * Name/Address of the archivist where intermediate communications are stored
-     */
-    archivist: ModuleIdentifier;
-    /**
-     * Name/Address of the diviner where intermediate communications are filtered
-     */
-    boundWitnessDiviner: ModuleIdentifier;
-}
-export interface AsyncQueryBusClearingHouseConfig {
-    /**
-     * Configuration for intermediary query storage
-     */
-    queries?: SearchableStorage;
-    /**
-     * Configuration for intermediary response storage
-     */
-    responses?: SearchableStorage;
-}
-export interface AsyncQueryBusBaseConfig {
-    clearingHouse?: AsyncQueryBusClearingHouseConfig;
-    /**
-     * How often to poll for new queries/responses
-     */
-    pollFrequency?: number;
-    /**
-     * Where the archivist should persist its internal state
-     */
-    stateStore?: SearchableStorage;
-}
-export interface AsyncQueryBusClientConfig extends AsyncQueryBusBaseConfig {
-    /**
-     * Configuration for intermediary response storage
-     */
-    queryCache?: CacheConfig | true;
-}
-export interface AsyncQueryBusHostConfig extends AsyncQueryBusBaseConfig {
-    listeningModules?: string[];
-    /**
-     * How many queries to process at once when retrieving queries
-     * for an address
-     */
-    perAddressBatchQueryLimit?: number;
-}
-//# sourceMappingURL=Config.d.ts.map

package/dist/browser/AsyncQueryBus/Config.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../../src/AsyncQueryBus/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,eAAO,MAAM,OAAO,WAAqB,CAAA;AACzC,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAA;AAEpC;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,SAAS,EAAE,gBAAgB,CAAA;IAC3B;;OAEG;IACH,mBAAmB,EAAE,gBAAgB,CAAA;CACtC;AAED,MAAM,WAAW,gCAAgC;IAC/C;;OAEG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAE3B;;OAEG;IACH,SAAS,CAAC,EAAE,iBAAiB,CAAA;CAC9B;AAED,MAAM,WAAW,uBAAuB;IACtC,aAAa,CAAC,EAAE,gCAAgC,CAAA;IAEhD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB;;OAEG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAA;CAC/B;AAED,MAAM,WAAW,yBAA0B,SAAQ,uBAAuB;IACxE;;OAEG;IACH,UAAU,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;CAChC;AAED,MAAM,WAAW,uBAAwB,SAAQ,uBAAuB;IACtE,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAA;IAE3B;;;OAGG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAA;CACnC"}

package/dist/browser/AsyncQueryBus/Config.d.mts

@@ -1,53 +0,0 @@
-import { CacheConfig } from '@xyo-network/bridge-model';
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export declare const Pending: "pending";
-export type Pending = typeof Pending;
-/**
- * Configuration for searchable storage of local state
- */
-export interface SearchableStorage {
-    /**
-     * Name/Address of the archivist where intermediate communications are stored
-     */
-    archivist: ModuleIdentifier;
-    /**
-     * Name/Address of the diviner where intermediate communications are filtered
-     */
-    boundWitnessDiviner: ModuleIdentifier;
-}
-export interface AsyncQueryBusClearingHouseConfig {
-    /**
-     * Configuration for intermediary query storage
-     */
-    queries?: SearchableStorage;
-    /**
-     * Configuration for intermediary response storage
-     */
-    responses?: SearchableStorage;
-}
-export interface AsyncQueryBusBaseConfig {
-    clearingHouse?: AsyncQueryBusClearingHouseConfig;
-    /**
-     * How often to poll for new queries/responses
-     */
-    pollFrequency?: number;
-    /**
-     * Where the archivist should persist its internal state
-     */
-    stateStore?: SearchableStorage;
-}
-export interface AsyncQueryBusClientConfig extends AsyncQueryBusBaseConfig {
-    /**
-     * Configuration for intermediary response storage
-     */
-    queryCache?: CacheConfig | true;
-}
-export interface AsyncQueryBusHostConfig extends AsyncQueryBusBaseConfig {
-    listeningModules?: string[];
-    /**
-     * How many queries to process at once when retrieving queries
-     * for an address
-     */
-    perAddressBatchQueryLimit?: number;
-}
-//# sourceMappingURL=Config.d.ts.map

package/dist/browser/AsyncQueryBus/Config.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../../src/AsyncQueryBus/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,eAAO,MAAM,OAAO,WAAqB,CAAA;AACzC,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAA;AAEpC;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,SAAS,EAAE,gBAAgB,CAAA;IAC3B;;OAEG;IACH,mBAAmB,EAAE,gBAAgB,CAAA;CACtC;AAED,MAAM,WAAW,gCAAgC;IAC/C;;OAEG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAE3B;;OAEG;IACH,SAAS,CAAC,EAAE,iBAAiB,CAAA;CAC9B;AAED,MAAM,WAAW,uBAAuB;IACtC,aAAa,CAAC,EAAE,gCAAgC,CAAA;IAEhD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB;;OAEG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAA;CAC/B;AAED,MAAM,WAAW,yBAA0B,SAAQ,uBAAuB;IACxE;;OAEG;IACH,UAAU,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;CAChC;AAED,MAAM,WAAW,uBAAwB,SAAQ,uBAAuB;IACtE,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAA;IAE3B;;;OAGG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAA;CACnC"}