@xyo-network/bridge-pub-sub 2.94.16 → 2.94.18

package/dist/browser/index.js

@@ -10,7 +10,7 @@ var AbstractModuleHost = class extends Base {
 };
 
 // src/AsyncQueryBus/AsyncQueryBusClient.ts
-import { assertEx } from "@xylabs/assert";
+import { assertEx as assertEx2 } from "@xylabs/assert";
 import { delay } from "@xylabs/delay";
 import { forget } from "@xylabs/forget";
 import { clearTimeoutEx, setTimeoutEx } from "@xylabs/timer";
@@ -20,9 +20,11 @@ import { PayloadBuilder } from "@xyo-network/payload-builder";
 import { LRUCache as LRUCache2 } from "lru-cache";
 
 // src/AsyncQueryBus/AsyncQueryBusBase.ts
-import { Base as Base2, toJsonString } from "@xylabs/object";
-import { asArchivistInstance } from "@xyo-network/archivist-model";
-import { asDivinerInstance } from "@xyo-network/diviner-model";
+import { assertEx } from "@xylabs/assert";
+import { Base as Base2 } from "@xylabs/object";
+import { isArchivistInstance } from "@xyo-network/archivist-model";
+import { isDivinerInstance } from "@xyo-network/diviner-model";
+import { resolveModuleIdentifier, traceModuleIdentifier } from "@xyo-network/module-model";
 import { Mutex } from "async-mutex";
 import { LRUCache } from "lru-cache";
 var AsyncQueryBusBase = class extends Base2 {
@@ -32,19 +34,13 @@ var AsyncQueryBusBase = class extends Base2 {
   _lastState;
   _targetConfigs = {};
   _targetQueries = {};
-  _lastQueriesArchivistAttempt;
-  _lastQueriesDivinerAttempt;
-  _lastResponsesArchivistAttempt;
-  _lastResponsesDivinerAttempt;
+  _lastResolveAttempt = {};
   _queriesArchivist;
-  _queriesArchivistMutex = new Mutex();
   _queriesDiviner;
-  _queriesDivinerMutex = new Mutex();
-  _reResolveDelay = 5e4;
+  _reResolveDelay = 1e3 * 5;
+  _resolveMutex = new Mutex();
   _responsesArchivist;
-  _responsesArchivistMutex = new Mutex();
   _responsesDiviner;
-  _responsesDivinerMutex = new Mutex();
   constructor(params) {
     super(params);
   }
@@ -69,92 +65,20 @@ var AsyncQueryBusBase = class extends Base2 {
     return this._lastState;
   }
   async queriesArchivist() {
-    return await this._queriesArchivistMutex.runExclusive(async () => {
-      if (this._queriesArchivist) {
-        return this._queriesArchivist;
-      }
-      if (Date.now() - (this._lastQueriesArchivistAttempt ?? 0) < this._reResolveDelay) {
-        return;
-      }
-      this._lastQueriesArchivistAttempt = Date.now();
-      const resolved = await this.resolver.resolve(this.config?.intersect?.queries?.archivist);
-      if (resolved) {
-        const typedResolve = asArchivistInstance(resolved);
-        if (typedResolve) {
-          return typedResolve;
-        } else {
-          this.logger?.warn(`Unable to resolve queriesArchivist as correct type [${this.config?.intersect?.queries?.archivist}][${resolved?.constructor?.name}]: ${toJsonString(resolved)}`);
-        }
-      } else {
-        this.logger?.log(`Unable to resolve queriesArchivist [${this.config?.intersect?.queries?.archivist}]`);
-      }
-    });
+    this._queriesArchivist = this._queriesArchivist ?? await this.resolve(assertEx(this.config?.intersect?.queries?.archivist, () => "No queries Archivist defined"), isArchivistInstance);
+    return this._queriesArchivist;
   }
   async queriesDiviner() {
-    return await this._queriesDivinerMutex.runExclusive(async () => {
-      if (this._queriesDiviner) {
-        return this._queriesDiviner;
-      }
-      if (Date.now() - (this._lastQueriesDivinerAttempt ?? 0) < this._reResolveDelay) {
-        return;
-      }
-      this._lastQueriesDivinerAttempt = Date.now();
-      const resolved = await this.resolver.resolve(this.config?.intersect?.queries?.boundWitnessDiviner);
-      if (resolved) {
-        const typedResolve = asDivinerInstance(resolved);
-        if (typedResolve) {
-          return typedResolve;
-        } else {
-          this.logger?.warn(`Unable to resolve queriesDiviner as correct type [${this.config?.intersect?.queries?.boundWitnessDiviner}][${resolved?.constructor?.name}]: ${toJsonString(resolved)}`);
-        }
-      } else {
-        this.logger?.log(`Unable to resolve queriesDiviner [${this.config?.intersect?.queries?.boundWitnessDiviner}]`);
-      }
-    });
+    this._queriesDiviner = this._queriesDiviner ?? await this.resolve(assertEx(this.config?.intersect?.queries?.boundWitnessDiviner, () => "No queries Diviner defined"), isDivinerInstance);
+    return this._queriesDiviner;
   }
   async responsesArchivist() {
-    return await this._responsesArchivistMutex.runExclusive(async () => {
-      if (this._responsesArchivist) {
-        return this._responsesArchivist;
-      }
-      if (Date.now() - (this._lastResponsesArchivistAttempt ?? 0) < this._reResolveDelay) {
-        return;
-      }
-      this._lastResponsesArchivistAttempt = Date.now();
-      const resolved = await this.resolver.resolve(this.config?.intersect?.responses?.archivist);
-      if (resolved) {
-        const typedResolve = asArchivistInstance(resolved);
-        if (typedResolve) {
-          return typedResolve;
-        } else {
-          this.logger?.warn(`Unable to resolve responseArchivist as correct type [${this.config?.intersect?.responses?.archivist}][${resolved?.constructor?.name}]: ${toJsonString(resolved)}`);
-        }
-      } else {
-        this.logger?.log(`Unable to resolve responseArchivist [${this.config?.intersect?.responses?.archivist}]`);
-      }
-    });
+    this._responsesArchivist = this._responsesArchivist ?? await this.resolve(assertEx(this.config?.intersect?.responses?.archivist, () => "No responses Archivist defined"), isArchivistInstance);
+    return this._responsesArchivist;
   }
   async responsesDiviner() {
-    return await this._responsesDivinerMutex.runExclusive(async () => {
-      if (this._responsesDiviner) {
-        return this._responsesDiviner;
-      }
-      if (Date.now() - (this._lastResponsesDivinerAttempt ?? 0) < this._reResolveDelay) {
-        return;
-      }
-      this._lastResponsesDivinerAttempt = Date.now();
-      const resolved = await this.resolver.resolve(this.config?.intersect?.responses?.boundWitnessDiviner);
-      if (resolved) {
-        const typedResolve = asDivinerInstance(resolved);
-        if (typedResolve) {
-          return typedResolve;
-        } else {
-          this.logger?.warn(`Unable to resolve responsesDiviner as correct type [${this.config?.intersect?.responses?.boundWitnessDiviner}][${resolved?.constructor?.name}]: ${toJsonString(resolved)}`);
-        }
-      } else {
-        this.logger?.log(`Unable to resolve responsesDiviner [${this.config?.intersect?.responses?.boundWitnessDiviner}]`);
-      }
-    });
+    this._responsesDiviner = this._responsesDiviner ?? await this.resolve(assertEx(this.config?.intersect?.responses?.boundWitnessDiviner, () => "No responses Diviner defined"), isDivinerInstance);
+    return this._responsesDiviner;
   }
   /**
   * Commit the internal state of the process. This is similar
@@ -186,6 +110,27 @@ var AsyncQueryBusBase = class extends Base2 {
       return state;
     }
   }
+  async resolve(id, typeCheck) {
+    return await this._resolveMutex.runExclusive(async () => {
+      if (this._queriesArchivist) {
+        return this._queriesArchivist;
+      }
+      if (Date.now() - (this._lastResolveAttempt[id] ?? 0) < this._reResolveDelay) {
+        return;
+      }
+      this._lastResolveAttempt[id] = Date.now();
+      const resolved = await resolveModuleIdentifier(this.resolver, id);
+      if (resolved) {
+        if (typeCheck(resolved)) {
+          return resolved;
+        } else {
+          this.logger?.warn(`Unable to resolve responsesDiviner as correct type [${id}][${resolved?.constructor?.name}]: ${resolved.id}`);
+        }
+      } else {
+        this.logger?.debug(`Unable to resolve queriesArchivist [${id}] [${await traceModuleIdentifier(this.resolver, id)}]`);
+      }
+    });
+  }
 };
 
 // src/AsyncQueryBus/model/QueryStatus.ts
@@ -243,7 +188,7 @@ var AsyncQueryBusClient = class extends AsyncQueryBusBase {
       ...query,
       $meta
     });
-    const queryArchivist = assertEx(await this.queriesArchivist(), () => `Unable to contact queriesArchivist [${this.config?.intersect?.queries?.archivist}]`);
+    const queryArchivist = assertEx2(await this.queriesArchivist(), () => `Unable to contact queriesArchivist [${this.config?.intersect?.queries?.archivist}]`);
     const routedQueryHash = (
       // Trust the signed hash if it's there
       routedQuery?.$hash ?? // TODO: What is the right way to find the dataHash
@@ -371,11 +316,11 @@ var AsyncQueryBusClient = class extends AsyncQueryBusBase {
 
 // src/AsyncQueryBus/AsyncQueryBusHost.ts
 import { containsAll } from "@xylabs/array";
-import { assertEx as assertEx2 } from "@xylabs/assert";
+import { assertEx as assertEx3 } from "@xylabs/assert";
 import { clearTimeoutEx as clearTimeoutEx2, setTimeoutEx as setTimeoutEx2 } from "@xylabs/timer";
 import { isQueryBoundWitnessWithMeta } from "@xyo-network/boundwitness-model";
 import { BoundWitnessDivinerQuerySchema as BoundWitnessDivinerQuerySchema2 } from "@xyo-network/diviner-boundwitness-model";
-import { asModuleInstance, ModuleConfigSchema } from "@xyo-network/module-model";
+import { asModuleInstance, ModuleConfigSchema, traceModuleIdentifier as traceModuleIdentifier2 } from "@xyo-network/module-model";
 import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
 var AsyncQueryBusHost = class extends AsyncQueryBusBase {
   static {
@@ -405,7 +350,7 @@ var AsyncQueryBusHost = class extends AsyncQueryBusBase {
       throw new Error(`Unable to resolve module to expose [${id}]`);
     }
     if (module) {
-      assertEx2(!failOnAlreadyExposed || !this._exposedAddresses.has(module.address), () => `Address already exposed: ${id} [${module.address}]`);
+      assertEx3(!failOnAlreadyExposed || !this._exposedAddresses.has(module.address), () => `Address already exposed: ${id} [${module.address}]`);
       this._exposedAddresses.add(module.address);
       this._exposeOptions[module.address] = {
         ...options
@@ -419,7 +364,7 @@ var AsyncQueryBusHost = class extends AsyncQueryBusBase {
       ...this.config?.listeningModules ?? [],
       ...this.exposedAddresses.values()
     ];
-    const mods = await Promise.all(exposedModules.map(async (exposedModule) => assertEx2(asModuleInstance(await this.resolver.resolve(exposedModule, {
+    const mods = await Promise.all(exposedModules.map(async (exposedModule) => assertEx3(asModuleInstance(await this.resolver.resolve(exposedModule, {
       maxDepth: 10
     })), () => `Unable to resolve listeningModule [${exposedModule}]`)));
     return mods;
@@ -443,7 +388,7 @@ var AsyncQueryBusHost = class extends AsyncQueryBusBase {
       maxDepth: 10
     }));
     if (module) {
-      assertEx2(!validate || this._exposedAddresses.has(module.address), () => `Address not exposed [${module.address}][${module.id}]`);
+      assertEx3(!validate || this._exposedAddresses.has(module.address), () => `Address not exposed [${module.address}][${module.id}]`);
       this._exposedAddresses.delete(module.address);
       delete this._exposeOptions[module.address];
       this.logger?.debug(`${module.address} [${module.id}] unexposed`);
@@ -452,8 +397,8 @@ var AsyncQueryBusHost = class extends AsyncQueryBusBase {
   }
   callLocalModule = async (localModule, query) => {
     const localModuleName = localModule.config.name ?? localModule.address;
-    const queryArchivist = assertEx2(await this.queriesArchivist(), () => `Unable to contact queriesArchivist [${this.config?.intersect?.queries?.archivist}]`);
-    const responsesArchivist = assertEx2(await this.responsesArchivist(), () => `Unable to contact responsesArchivist [${this.config?.intersect?.queries?.archivist}]`);
+    const queryArchivist = assertEx3(await this.queriesArchivist(), () => `Unable to contact queriesArchivist [${this.config?.intersect?.queries?.archivist}]`);
+    const responsesArchivist = assertEx3(await this.responsesArchivist(), () => `Unable to contact responsesArchivist [${this.config?.intersect?.queries?.archivist}]`);
     const queryDestination = query.$meta?.destination;
     if (queryDestination && queryDestination?.includes(localModule.address)) {
       const queryIndex = query.payload_hashes.indexOf(query.query);
@@ -500,8 +445,9 @@ var AsyncQueryBusHost = class extends AsyncQueryBusBase {
   * @param address The address to find commands for
   */
   findQueriesToAddress = async (address) => {
-    const queryBoundWitnessDiviner = await this.queriesDiviner();
-    if (queryBoundWitnessDiviner) {
+    const queriesDivinerId = assertEx3(this.config?.intersect?.queries?.boundWitnessDiviner, () => "No queries Diviner defined");
+    const queriesBoundWitnessDiviner = await this.queriesDiviner();
+    if (queriesBoundWitnessDiviner) {
       const timestamp = await this.retrieveState(address);
       const destination = [
         address
@@ -514,7 +460,7 @@ var AsyncQueryBusHost = class extends AsyncQueryBusBase {
         sort: "asc",
         timestamp
       };
-      const result = await queryBoundWitnessDiviner.divine([
+      const result = await queriesBoundWitnessDiviner.divine([
         divinerQuery
       ]);
       const queries = result.filter(isQueryBoundWitnessWithMeta);
@@ -522,7 +468,7 @@ var AsyncQueryBusHost = class extends AsyncQueryBusBase {
       await this.commitState(address, nextState);
       return queries;
     } else {
-      this.logger?.warn(`Unable to resolve queryBoundWitnessDiviner [${this.config?.intersect?.queries?.boundWitnessDiviner}]`);
+      this.logger?.warn(`Unable to resolve queriesBoundWitnessDiviner [${queriesDivinerId}] [${await traceModuleIdentifier2(this.resolver, queriesDivinerId)}]`);
     }
   };
   /**
@@ -616,13 +562,13 @@ var PubSubBridgeSchema = "network.xyo.bridge.pubsub";
 var PubSubBridgeConfigSchema = `${PubSubBridgeSchema}.config`;
 
 // src/PubSubBridge.ts
-import { assertEx as assertEx4 } from "@xylabs/assert";
+import { assertEx as assertEx5 } from "@xylabs/assert";
 import { exists } from "@xylabs/exists";
 import { AbstractBridge } from "@xyo-network/abstract-bridge";
 import { creatableModule } from "@xyo-network/module-model";
 
 // src/PubSubBridgeModuleResolver.ts
-import { assertEx as assertEx3 } from "@xylabs/assert";
+import { assertEx as assertEx4 } from "@xylabs/assert";
 import { isAddress } from "@xylabs/hex";
 import { AbstractBridgeModuleResolver, wrapModuleWithType } from "@xyo-network/abstract-bridge";
 import { Account } from "@xyo-network/account";
@@ -639,7 +585,7 @@ var PubSubBridgeModuleResolver = class extends AbstractBridgeModuleResolver {
     }
     const idParts = id.split(":");
     const firstPart = idParts.shift();
-    assertEx3(isAddress(firstPart), () => `Invalid module address: ${firstPart}`);
+    assertEx4(isAddress(firstPart), () => `Invalid module address: ${firstPart}`);
     const remainderParts = idParts.join(":");
     const account = Account.randomSync();
     const params = {
@@ -656,13 +602,13 @@ var PubSubBridgeModuleResolver = class extends AbstractBridgeModuleResolver {
       const state = await proxy.state();
       if (state) {
         const configSchema = state.find((payload) => payload.schema === ConfigSchema)?.config;
-        const config = assertEx3(state.find((payload) => payload.schema === configSchema), () => "Unable to locate config");
+        const config = assertEx4(state.find((payload) => payload.schema === configSchema), () => "Unable to locate config");
         proxy.setConfig(config);
       }
     }
     await proxy.start?.();
     const wrapped = wrapModuleWithType(proxy, account);
-    const as = assertEx3(asModuleInstance2(wrapped, {}), () => `Failed to asModuleInstance [${id}]`);
+    const as = assertEx4(asModuleInstance2(wrapped, {}), () => `Failed to asModuleInstance [${id}]`);
     proxy.upResolver.add(as);
     proxy.downResolver.add(as);
     this.add(as);
@@ -701,7 +647,7 @@ var PubSubBridge = class extends AbstractBridge {
   get resolver() {
     this._resolver = this._resolver ?? new PubSubBridgeModuleResolver({
       bridge: this,
-      busClient: assertEx4(this.busClient(), () => "busClient not configured"),
+      busClient: assertEx5(this.busClient(), () => "busClient not configured"),
       wrapperAccount: this.account
     });
     return this._resolver;
@@ -710,7 +656,7 @@ var PubSubBridge = class extends AbstractBridge {
     return `${this.config.name ?? moduleName}`;
   }
   get roots() {
-    return assertEx4(this.config.roots, () => "roots not configured");
+    return assertEx5(this.config.roots, () => "roots not configured");
   }
   async discoverRoots() {
     const rootInstances = (await Promise.all(this.roots.map(async (root) => await this.resolver.resolve(root)))).filter(exists);
@@ -721,7 +667,7 @@ var PubSubBridge = class extends AbstractBridge {
   }
   async exposeHandler(id, options) {
     const { maxDepth = 2, direction = "all", required = true } = options ?? {};
-    const host = assertEx4(this.busHost(), () => "Not configured as a host");
+    const host = assertEx5(this.busHost(), () => "Not configured as a host");
     const module = await host.expose(id, {
       required
     });
@@ -754,7 +700,7 @@ var PubSubBridge = class extends AbstractBridge {
   }
   async unexposeHandler(id, options) {
     const { maxDepth = 2, direction = "all", required = true } = options ?? {};
-    const host = assertEx4(this.busHost(), () => "Not configured as a host");
+    const host = assertEx5(this.busHost(), () => "Not configured as a host");
     const module = await host.unexpose(id, required);
     if (module) {
       const children = maxDepth > 0 ? await module.resolve("*", {