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

package/dist/node/AsyncQueryBus/AsyncQueryBusBase.d.ts

@@ -2,30 +2,24 @@ import { Address } from '@xylabs/hex';
 import { Base } from '@xylabs/object';
 import { ArchivistInstance } from '@xyo-network/archivist-model';
 import { DivinerInstance } from '@xyo-network/diviner-model';
-import { ModuleConfig } from '@xyo-network/module-model';
+import { ModuleConfig, ModuleInstance } from '@xyo-network/module-model';
 import { LRUCache } from 'lru-cache';
 import { AsyncQueryBusParams } from './model';
 export declare class AsyncQueryBusBase<TParams extends AsyncQueryBusParams = AsyncQueryBusParams> extends Base<TParams> {
     protected _lastState?: LRUCache<Address, number>;
     protected _targetConfigs: Record<Address, ModuleConfig>;
     protected _targetQueries: Record<Address, string[]>;
-    private _lastQueriesArchivistAttempt?;
-    private _lastQueriesDivinerAttempt?;
-    private _lastResponsesArchivistAttempt?;
-    private _lastResponsesDivinerAttempt?;
+    private _lastResolveAttempt;
     private _queriesArchivist?;
-    private _queriesArchivistMutex;
     private _queriesDiviner?;
-    private _queriesDivinerMutex;
     private _reResolveDelay;
+    private _resolveMutex;
     private _responsesArchivist?;
-    private _responsesArchivistMutex;
     private _responsesDiviner?;
-    private _responsesDivinerMutex;
     constructor(params: TParams);
     get config(): TParams['config'];
     get pollFrequencyConfig(): number;
-    get resolver(): import("@xyo-network/module-model").ModuleResolver<import("@xyo-network/module-model").ModuleInstance<import("@xylabs/object").BaseParamsFields & {
+    get resolver(): import("@xyo-network/module-model").ModuleResolver<ModuleInstance<import("@xylabs/object").BaseParamsFields & {
         account?: import("@xyo-network/account-model").AccountInstance | "random" | undefined;
         addToResolvers?: boolean | undefined;
         config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
@@ -84,37 +78,7 @@ export declare class AsyncQueryBusBase<TParams extends AsyncQueryBusParams = Asy
         schema: "network.xyo.boundwitness";
     }, "schema"> & {
         schema: "network.xyo.boundwitness";
-    }, import("@xyo-network/diviner-model").DivinerModuleEventData> | DivinerInstance<import("@xylabs/object").BaseParamsFields & {
-        account?: import("@xyo-network/account-model").AccountInstance | "random" | undefined;
-        addToResolvers?: boolean | undefined;
-        config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & {
-            schema: "network.xyo.diviner.config";
-        }, "schema"> & {
-            schema: "network.xyo.diviner.config";
-        }, "schema"> & {
-            schema: string;
-        };
-        ephemeralQueryAccountEnabled?: boolean | undefined;
-        moduleIdentifierTransformers?: import("@xyo-network/module-model").ModuleIdentifierTransformer[] | undefined;
-    }, {
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields, {
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields, import("@xyo-network/diviner-model").DivinerModuleEventData<import("@xyo-network/module-model").ModuleInstance<import("@xylabs/object").BaseParamsFields & {
-        account?: import("@xyo-network/account-model").AccountInstance | "random" | undefined;
-        addToResolvers?: boolean | undefined;
-        config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-            schema: "network.xyo.module.config";
-        }, "schema"> & {
-            schema: string;
-        };
-        ephemeralQueryAccountEnabled?: boolean | undefined;
-        moduleIdentifierTransformers?: import("@xyo-network/module-model").ModuleIdentifierTransformer[] | undefined;
-    }, import("@xyo-network/module-model").ModuleEventData<object>>, {
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields, {
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields>> | undefined>;
+    }, import("@xyo-network/diviner-model").DivinerModuleEventData>>;
     responsesArchivist(): Promise<ArchivistInstance<import("@xylabs/object").BaseParamsFields & {
         account?: import("@xyo-network/account-model").AccountInstance | "random" | undefined;
         addToResolvers?: boolean | undefined;
@@ -155,37 +119,7 @@ export declare class AsyncQueryBusBase<TParams extends AsyncQueryBusParams = Asy
         schema: "network.xyo.diviner.boundwitness.query";
     }, import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & import("@xyo-network/boundwitness-model").BoundWitnessFields & {
         schema: "network.xyo.boundwitness";
-    }, import("@xyo-network/diviner-model").DivinerModuleEventData> | DivinerInstance<import("@xylabs/object").BaseParamsFields & {
-        account?: import("@xyo-network/account-model").AccountInstance | "random" | undefined;
-        addToResolvers?: boolean | undefined;
-        config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & {
-            schema: "network.xyo.diviner.config";
-        }, "schema"> & {
-            schema: "network.xyo.diviner.config";
-        }, "schema"> & {
-            schema: string;
-        };
-        ephemeralQueryAccountEnabled?: boolean | undefined;
-        moduleIdentifierTransformers?: import("@xyo-network/module-model").ModuleIdentifierTransformer[] | undefined;
-    }, {
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields, {
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields, import("@xyo-network/diviner-model").DivinerModuleEventData<import("@xyo-network/module-model").ModuleInstance<import("@xylabs/object").BaseParamsFields & {
-        account?: import("@xyo-network/account-model").AccountInstance | "random" | undefined;
-        addToResolvers?: boolean | undefined;
-        config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-            schema: "network.xyo.module.config";
-        }, "schema"> & {
-            schema: string;
-        };
-        ephemeralQueryAccountEnabled?: boolean | undefined;
-        moduleIdentifierTransformers?: import("@xyo-network/module-model").ModuleIdentifierTransformer[] | undefined;
-    }, import("@xyo-network/module-model").ModuleEventData<object>>, {
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields, {
-        schema: string;
-    } & import("@xyo-network/payload-model").PayloadFields>> | undefined>;
+    }, import("@xyo-network/diviner-model").DivinerModuleEventData>>;
     /**
      * Commit the internal state of the process. This is similar
      * to a transaction completion in a database and should only be called
@@ -200,5 +134,6 @@ export declare class AsyncQueryBusBase<TParams extends AsyncQueryBusParams = Asy
      * preemptions, reboots, etc.
      */
     protected retrieveState(address: Address): Promise<number>;
+    private resolve;
 }
 //# sourceMappingURL=AsyncQueryBusBase.d.ts.map

package/dist/node/AsyncQueryBus/AsyncQueryBusBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AsyncQueryBusBase.d.ts","sourceRoot":"","sources":["../../../src/AsyncQueryBus/AsyncQueryBusBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,EAAE,IAAI,EAAgB,MAAM,gBAAgB,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAuB,MAAM,8BAA8B,CAAA;AAGrF,OAAO,EAAqB,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAE7C,qBAAa,iBAAiB,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB,CAAE,SAAQ,IAAI,CAAC,OAAO,CAAC;IAC7G,SAAS,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAChD,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAK;IAC5D,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAK;IAExD,OAAO,CAAC,4BAA4B,CAAC,CAAQ;IAC7C,OAAO,CAAC,0BAA0B,CAAC,CAAQ;IAC3C,OAAO,CAAC,8BAA8B,CAAC,CAAQ;IAC/C,OAAO,CAAC,4BAA4B,CAAC,CAAQ;IAC7C,OAAO,CAAC,iBAAiB,CAAC,CAAmB;IAC7C,OAAO,CAAC,sBAAsB,CAAc;IAC5C,OAAO,CAAC,eAAe,CAAC,CAAgG;IACxH,OAAO,CAAC,oBAAoB,CAAc;IAC1C,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,mBAAmB,CAAC,CAAmB;IAC/C,OAAO,CAAC,wBAAwB,CAAc;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAA2F;IACrH,OAAO,CAAC,sBAAsB,CAAc;gBAEhC,MAAM,EAAE,OAAO;IAI3B,IAAI,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,CAE9B;IAED,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,IAAI,QAAQ;;;;;;;;;;qEAEX;IAED;;OAEG;IACH,SAAS,KAAK,SAAS,IAAI,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAInD;IAEK,gBAAgB;;;;;;;;;;;;;;;;;;IAyBhB,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyBd,kBAAkB;;;;;;;;;;;;;;;;;;IAyBlB,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyBtB;;;;;;;OAOG;cACa,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM;IAQ/D;;;OAGG;cACa,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAajE"}
+{"version":3,"file":"AsyncQueryBusBase.d.ts","sourceRoot":"","sources":["../../../src/AsyncQueryBus/AsyncQueryBusBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,EAAE,IAAI,EAAa,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAuB,MAAM,8BAA8B,CAAA;AAGrF,OAAO,EAAE,eAAe,EAAqB,MAAM,4BAA4B,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAoB,cAAc,EAAyB,MAAM,2BAA2B,CAAA;AAEjH,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAE7C,qBAAa,iBAAiB,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB,CAAE,SAAQ,IAAI,CAAC,OAAO,CAAC;IAC7G,SAAS,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAChD,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAK;IAC5D,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAK;IAExD,OAAO,CAAC,mBAAmB,CAAuC;IAClE,OAAO,CAAC,iBAAiB,CAAC,CAAmB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAgG;IACxH,OAAO,CAAC,eAAe,CAAW;IAClC,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,mBAAmB,CAAC,CAAmB;IAC/C,OAAO,CAAC,iBAAiB,CAAC,CAA2F;gBAEzG,MAAM,EAAE,OAAO;IAI3B,IAAI,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,CAE9B;IAED,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,IAAI,QAAQ;;;;;;;;;;qEAEX;IAED;;OAEG;IACH,SAAS,KAAK,SAAS,IAAI,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAInD;IAEK,gBAAgB;;;;;;;;;;;;;;;;;;IAUhB,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;IAUd,kBAAkB;;;;;;;;;;;;;;;;;;IAUlB,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;IAUtB;;;;;;;OAOG;cACa,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM;IAQ/D;;;OAGG;cACa,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;YAclD,OAAO;CAqBtB"}

package/dist/node/index.cjs

@@ -47,7 +47,7 @@ __name(_AbstractModuleHost, "AbstractModuleHost");
 var AbstractModuleHost = _AbstractModuleHost;
 
 // src/AsyncQueryBus/AsyncQueryBusClient.ts
-var import_assert = require("@xylabs/assert");
+var import_assert2 = require("@xylabs/assert");
 var import_delay = require("@xylabs/delay");
 var import_forget = require("@xylabs/forget");
 var import_timer = require("@xylabs/timer");
@@ -57,28 +57,24 @@ var import_payload_builder = require("@xyo-network/payload-builder");
 var import_lru_cache2 = require("lru-cache");
 
 // src/AsyncQueryBus/AsyncQueryBusBase.ts
+var import_assert = require("@xylabs/assert");
 var import_object2 = require("@xylabs/object");
 var import_archivist_model = require("@xyo-network/archivist-model");
 var import_diviner_model = require("@xyo-network/diviner-model");
+var import_module_model = require("@xyo-network/module-model");
 var import_async_mutex = require("async-mutex");
 var import_lru_cache = require("lru-cache");
 var _AsyncQueryBusBase = class _AsyncQueryBusBase extends import_object2.Base {
   _lastState;
   _targetConfigs = {};
   _targetQueries = {};
-  _lastQueriesArchivistAttempt;
-  _lastQueriesDivinerAttempt;
-  _lastResponsesArchivistAttempt;
-  _lastResponsesDivinerAttempt;
+  _lastResolveAttempt = {};
   _queriesArchivist;
-  _queriesArchivistMutex = new import_async_mutex.Mutex();
   _queriesDiviner;
-  _queriesDivinerMutex = new import_async_mutex.Mutex();
-  _reResolveDelay = 5e4;
+  _reResolveDelay = 1e3 * 5;
+  _resolveMutex = new import_async_mutex.Mutex();
   _responsesArchivist;
-  _responsesArchivistMutex = new import_async_mutex.Mutex();
   _responsesDiviner;
-  _responsesDivinerMutex = new import_async_mutex.Mutex();
   constructor(params) {
     super(params);
   }
@@ -104,96 +100,24 @@ var _AsyncQueryBusBase = class _AsyncQueryBusBase extends import_object2.Base {
     return this._lastState;
   }
   async queriesArchivist() {
-    return await this._queriesArchivistMutex.runExclusive(async () => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
-      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((_c = (_b = (_a = this.config) == null ? void 0 : _a.intersect) == null ? void 0 : _b.queries) == null ? void 0 : _c.archivist);
-      if (resolved) {
-        const typedResolve = (0, import_archivist_model.asArchivistInstance)(resolved);
-        if (typedResolve) {
-          return typedResolve;
-        } else {
-          (_h = this.logger) == null ? void 0 : _h.warn(`Unable to resolve queriesArchivist as correct type [${(_f = (_e = (_d = this.config) == null ? void 0 : _d.intersect) == null ? void 0 : _e.queries) == null ? void 0 : _f.archivist}][${(_g = resolved == null ? void 0 : resolved.constructor) == null ? void 0 : _g.name}]: ${(0, import_object2.toJsonString)(resolved)}`);
-        }
-      } else {
-        (_l = this.logger) == null ? void 0 : _l.log(`Unable to resolve queriesArchivist [${(_k = (_j = (_i = this.config) == null ? void 0 : _i.intersect) == null ? void 0 : _j.queries) == null ? void 0 : _k.archivist}]`);
-      }
-    });
+    var _a, _b, _c;
+    this._queriesArchivist = this._queriesArchivist ?? await this.resolve((0, import_assert.assertEx)((_c = (_b = (_a = this.config) == null ? void 0 : _a.intersect) == null ? void 0 : _b.queries) == null ? void 0 : _c.archivist, () => "No queries Archivist defined"), import_archivist_model.isArchivistInstance);
+    return this._queriesArchivist;
   }
   async queriesDiviner() {
-    return await this._queriesDivinerMutex.runExclusive(async () => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
-      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((_c = (_b = (_a = this.config) == null ? void 0 : _a.intersect) == null ? void 0 : _b.queries) == null ? void 0 : _c.boundWitnessDiviner);
-      if (resolved) {
-        const typedResolve = (0, import_diviner_model.asDivinerInstance)(resolved);
-        if (typedResolve) {
-          return typedResolve;
-        } else {
-          (_h = this.logger) == null ? void 0 : _h.warn(`Unable to resolve queriesDiviner as correct type [${(_f = (_e = (_d = this.config) == null ? void 0 : _d.intersect) == null ? void 0 : _e.queries) == null ? void 0 : _f.boundWitnessDiviner}][${(_g = resolved == null ? void 0 : resolved.constructor) == null ? void 0 : _g.name}]: ${(0, import_object2.toJsonString)(resolved)}`);
-        }
-      } else {
-        (_l = this.logger) == null ? void 0 : _l.log(`Unable to resolve queriesDiviner [${(_k = (_j = (_i = this.config) == null ? void 0 : _i.intersect) == null ? void 0 : _j.queries) == null ? void 0 : _k.boundWitnessDiviner}]`);
-      }
-    });
+    var _a, _b, _c;
+    this._queriesDiviner = this._queriesDiviner ?? await this.resolve((0, import_assert.assertEx)((_c = (_b = (_a = this.config) == null ? void 0 : _a.intersect) == null ? void 0 : _b.queries) == null ? void 0 : _c.boundWitnessDiviner, () => "No queries Diviner defined"), import_diviner_model.isDivinerInstance);
+    return this._queriesDiviner;
   }
   async responsesArchivist() {
-    return await this._responsesArchivistMutex.runExclusive(async () => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
-      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((_c = (_b = (_a = this.config) == null ? void 0 : _a.intersect) == null ? void 0 : _b.responses) == null ? void 0 : _c.archivist);
-      if (resolved) {
-        const typedResolve = (0, import_archivist_model.asArchivistInstance)(resolved);
-        if (typedResolve) {
-          return typedResolve;
-        } else {
-          (_h = this.logger) == null ? void 0 : _h.warn(`Unable to resolve responseArchivist as correct type [${(_f = (_e = (_d = this.config) == null ? void 0 : _d.intersect) == null ? void 0 : _e.responses) == null ? void 0 : _f.archivist}][${(_g = resolved == null ? void 0 : resolved.constructor) == null ? void 0 : _g.name}]: ${(0, import_object2.toJsonString)(resolved)}`);
-        }
-      } else {
-        (_l = this.logger) == null ? void 0 : _l.log(`Unable to resolve responseArchivist [${(_k = (_j = (_i = this.config) == null ? void 0 : _i.intersect) == null ? void 0 : _j.responses) == null ? void 0 : _k.archivist}]`);
-      }
-    });
+    var _a, _b, _c;
+    this._responsesArchivist = this._responsesArchivist ?? await this.resolve((0, import_assert.assertEx)((_c = (_b = (_a = this.config) == null ? void 0 : _a.intersect) == null ? void 0 : _b.responses) == null ? void 0 : _c.archivist, () => "No responses Archivist defined"), import_archivist_model.isArchivistInstance);
+    return this._responsesArchivist;
   }
   async responsesDiviner() {
-    return await this._responsesDivinerMutex.runExclusive(async () => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
-      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((_c = (_b = (_a = this.config) == null ? void 0 : _a.intersect) == null ? void 0 : _b.responses) == null ? void 0 : _c.boundWitnessDiviner);
-      if (resolved) {
-        const typedResolve = (0, import_diviner_model.asDivinerInstance)(resolved);
-        if (typedResolve) {
-          return typedResolve;
-        } else {
-          (_h = this.logger) == null ? void 0 : _h.warn(`Unable to resolve responsesDiviner as correct type [${(_f = (_e = (_d = this.config) == null ? void 0 : _d.intersect) == null ? void 0 : _e.responses) == null ? void 0 : _f.boundWitnessDiviner}][${(_g = resolved == null ? void 0 : resolved.constructor) == null ? void 0 : _g.name}]: ${(0, import_object2.toJsonString)(resolved)}`);
-        }
-      } else {
-        (_l = this.logger) == null ? void 0 : _l.log(`Unable to resolve responsesDiviner [${(_k = (_j = (_i = this.config) == null ? void 0 : _i.intersect) == null ? void 0 : _j.responses) == null ? void 0 : _k.boundWitnessDiviner}]`);
-      }
-    });
+    var _a, _b, _c;
+    this._responsesDiviner = this._responsesDiviner ?? await this.resolve((0, import_assert.assertEx)((_c = (_b = (_a = this.config) == null ? void 0 : _a.intersect) == null ? void 0 : _b.responses) == null ? void 0 : _c.boundWitnessDiviner, () => "No responses Diviner defined"), import_diviner_model.isDivinerInstance);
+    return this._responsesDiviner;
   }
   /**
   * Commit the internal state of the process. This is similar
@@ -225,6 +149,28 @@ var _AsyncQueryBusBase = class _AsyncQueryBusBase extends import_object2.Base {
       return state;
     }
   }
+  async resolve(id, typeCheck) {
+    return await this._resolveMutex.runExclusive(async () => {
+      var _a, _b, _c;
+      if (this._queriesArchivist) {
+        return this._queriesArchivist;
+      }
+      if (Date.now() - (this._lastResolveAttempt[id] ?? 0) < this._reResolveDelay) {
+        return;
+      }
+      this._lastResolveAttempt[id] = Date.now();
+      const resolved = await this.resolver.resolve(id);
+      if (resolved) {
+        if (typeCheck(resolved)) {
+          return resolved;
+        } else {
+          (_b = this.logger) == null ? void 0 : _b.warn(`Unable to resolve responsesDiviner as correct type [${id}][${(_a = resolved == null ? void 0 : resolved.constructor) == null ? void 0 : _a.name}]: ${resolved.id}`);
+        }
+      } else {
+        (_c = this.logger) == null ? void 0 : _c.log(`Unable to resolve queriesArchivist [${id}] [${await (0, import_module_model.traceModuleIdentifier)(this.resolver, id)}]`);
+      }
+    });
+  }
 };
 __name(_AsyncQueryBusBase, "AsyncQueryBusBase");
 var AsyncQueryBusBase = _AsyncQueryBusBase;
@@ -284,7 +230,7 @@ var _AsyncQueryBusClient = class _AsyncQueryBusClient extends AsyncQueryBusBase
       ...query,
       $meta
     });
-    const queryArchivist = (0, import_assert.assertEx)(await this.queriesArchivist(), () => {
+    const queryArchivist = (0, import_assert2.assertEx)(await this.queriesArchivist(), () => {
       var _a2, _b2, _c2;
       return `Unable to contact queriesArchivist [${(_c2 = (_b2 = (_a2 = this.config) == null ? void 0 : _a2.intersect) == null ? void 0 : _b2.queries) == null ? void 0 : _c2.archivist}]`;
     });
@@ -421,11 +367,11 @@ var AsyncQueryBusClient = _AsyncQueryBusClient;
 
 // src/AsyncQueryBus/AsyncQueryBusHost.ts
 var import_array = require("@xylabs/array");
-var import_assert2 = require("@xylabs/assert");
+var import_assert3 = require("@xylabs/assert");
 var import_timer2 = require("@xylabs/timer");
 var import_boundwitness_model2 = require("@xyo-network/boundwitness-model");
 var import_diviner_boundwitness_model2 = require("@xyo-network/diviner-boundwitness-model");
-var import_module_model = require("@xyo-network/module-model");
+var import_module_model2 = require("@xyo-network/module-model");
 var import_payload_builder2 = require("@xyo-network/payload-builder");
 var _AsyncQueryBusHost = class _AsyncQueryBusHost extends AsyncQueryBusBase {
   _exposedAddresses = /* @__PURE__ */ new Set();
@@ -447,14 +393,14 @@ var _AsyncQueryBusHost = class _AsyncQueryBusHost extends AsyncQueryBusBase {
   async expose(id, options) {
     var _a;
     const { failOnAlreadyExposed, required = true } = options ?? {};
-    const module2 = (0, import_module_model.asModuleInstance)(await this.resolver.resolve(id, {
+    const module2 = (0, import_module_model2.asModuleInstance)(await this.resolver.resolve(id, {
       maxDepth: 10
     }));
     if (!module2 && required) {
       throw new Error(`Unable to resolve module to expose [${id}]`);
     }
     if (module2) {
-      (0, import_assert2.assertEx)(!failOnAlreadyExposed || !this._exposedAddresses.has(module2.address), () => `Address already exposed: ${id} [${module2.address}]`);
+      (0, import_assert3.assertEx)(!failOnAlreadyExposed || !this._exposedAddresses.has(module2.address), () => `Address already exposed: ${id} [${module2.address}]`);
       this._exposedAddresses.add(module2.address);
       this._exposeOptions[module2.address] = {
         ...options
@@ -469,7 +415,7 @@ var _AsyncQueryBusHost = class _AsyncQueryBusHost extends AsyncQueryBusBase {
       ...((_a = this.config) == null ? void 0 : _a.listeningModules) ?? [],
       ...this.exposedAddresses.values()
     ];
-    const mods = await Promise.all(exposedModules.map(async (exposedModule) => (0, import_assert2.assertEx)((0, import_module_model.asModuleInstance)(await this.resolver.resolve(exposedModule, {
+    const mods = await Promise.all(exposedModules.map(async (exposedModule) => (0, import_assert3.assertEx)((0, import_module_model2.asModuleInstance)(await this.resolver.resolve(exposedModule, {
       maxDepth: 10
     })), () => `Unable to resolve listeningModule [${exposedModule}]`)));
     return mods;
@@ -490,11 +436,11 @@ var _AsyncQueryBusHost = class _AsyncQueryBusHost extends AsyncQueryBusBase {
   }
   async unexpose(id, validate = true) {
     var _a;
-    const module2 = (0, import_module_model.asModuleInstance)(await this.resolver.resolve(id, {
+    const module2 = (0, import_module_model2.asModuleInstance)(await this.resolver.resolve(id, {
       maxDepth: 10
     }));
     if (module2) {
-      (0, import_assert2.assertEx)(!validate || this._exposedAddresses.has(module2.address), () => `Address not exposed [${module2.address}][${module2.id}]`);
+      (0, import_assert3.assertEx)(!validate || this._exposedAddresses.has(module2.address), () => `Address not exposed [${module2.address}][${module2.id}]`);
       this._exposedAddresses.delete(module2.address);
       delete this._exposeOptions[module2.address];
       (_a = this.logger) == null ? void 0 : _a.debug(`${module2.address} [${module2.id}] unexposed`);
@@ -504,11 +450,11 @@ var _AsyncQueryBusHost = class _AsyncQueryBusHost extends AsyncQueryBusBase {
   callLocalModule = async (localModule, query) => {
     var _a, _b, _c, _d, _e, _f, _g;
     const localModuleName = localModule.config.name ?? localModule.address;
-    const queryArchivist = (0, import_assert2.assertEx)(await this.queriesArchivist(), () => {
+    const queryArchivist = (0, import_assert3.assertEx)(await this.queriesArchivist(), () => {
       var _a2, _b2, _c2;
       return `Unable to contact queriesArchivist [${(_c2 = (_b2 = (_a2 = this.config) == null ? void 0 : _a2.intersect) == null ? void 0 : _b2.queries) == null ? void 0 : _c2.archivist}]`;
     });
-    const responsesArchivist = (0, import_assert2.assertEx)(await this.responsesArchivist(), () => {
+    const responsesArchivist = (0, import_assert3.assertEx)(await this.responsesArchivist(), () => {
       var _a2, _b2, _c2;
       return `Unable to contact responsesArchivist [${(_c2 = (_b2 = (_a2 = this.config) == null ? void 0 : _a2.intersect) == null ? void 0 : _b2.queries) == null ? void 0 : _c2.archivist}]`;
     });
@@ -530,7 +476,7 @@ var _AsyncQueryBusHost = class _AsyncQueryBusHost extends AsyncQueryBusBase {
             (_c = this.logger) == null ? void 0 : _c.debug(`Issuing query ${querySchema2} (${queryHash}) addressed to module: ${localModuleName}`);
             const response = await localModule.query(query, queryPayloads, {
               allowedQueries: (_d = this._exposeOptions[localModule.address]) == null ? void 0 : _d.allowedQueries,
-              schema: import_module_model.ModuleConfigSchema
+              schema: import_module_model2.ModuleConfigSchema
             });
             const [bw, payloads, errors] = response;
             (_e = this.logger) == null ? void 0 : _e.debug(`Replying to query ${queryHash} addressed to module: ${localModuleName}`);
@@ -680,18 +626,18 @@ var PubSubBridgeSchema = "network.xyo.bridge.pubsub";
 var PubSubBridgeConfigSchema = `${PubSubBridgeSchema}.config`;
 
 // src/PubSubBridge.ts
-var import_assert4 = require("@xylabs/assert");
+var import_assert5 = require("@xylabs/assert");
 var import_exists = require("@xylabs/exists");
 var import_abstract_bridge3 = require("@xyo-network/abstract-bridge");
-var import_module_model3 = require("@xyo-network/module-model");
+var import_module_model4 = require("@xyo-network/module-model");
 
 // src/PubSubBridgeModuleResolver.ts
-var import_assert3 = require("@xylabs/assert");
+var import_assert4 = require("@xylabs/assert");
 var import_hex = require("@xylabs/hex");
 var import_abstract_bridge2 = require("@xyo-network/abstract-bridge");
 var import_account = require("@xyo-network/account");
 var import_config_payload_plugin = require("@xyo-network/config-payload-plugin");
-var import_module_model2 = require("@xyo-network/module-model");
+var import_module_model3 = require("@xyo-network/module-model");
 var _PubSubBridgeModuleResolver = class _PubSubBridgeModuleResolver extends import_abstract_bridge2.AbstractBridgeModuleResolver {
   async resolveHandler(id, options) {
     var _a, _b;
@@ -701,14 +647,14 @@ var _PubSubBridgeModuleResolver = class _PubSubBridgeModuleResolver extends impo
     }
     const idParts = id.split(":");
     const firstPart = idParts.shift();
-    (0, import_assert3.assertEx)((0, import_hex.isAddress)(firstPart), () => `Invalid module address: ${firstPart}`);
+    (0, import_assert4.assertEx)((0, import_hex.isAddress)(firstPart), () => `Invalid module address: ${firstPart}`);
     const remainderParts = idParts.join(":");
     const account = import_account.Account.randomSync();
     const params = {
       account,
       busClient: this.params.busClient,
       config: {
-        schema: import_module_model2.ModuleConfigSchema
+        schema: import_module_model3.ModuleConfigSchema
       },
       host: this.params.bridge,
       moduleAddress: firstPart
@@ -718,13 +664,13 @@ var _PubSubBridgeModuleResolver = class _PubSubBridgeModuleResolver extends impo
       const state = await proxy.state();
       if (state) {
         const configSchema = (_a = state.find((payload) => payload.schema === import_config_payload_plugin.ConfigSchema)) == null ? void 0 : _a.config;
-        const config = (0, import_assert3.assertEx)(state.find((payload) => payload.schema === configSchema), () => "Unable to locate config");
+        const config = (0, import_assert4.assertEx)(state.find((payload) => payload.schema === configSchema), () => "Unable to locate config");
         proxy.setConfig(config);
       }
     }
     await ((_b = proxy.start) == null ? void 0 : _b.call(proxy));
     const wrapped = (0, import_abstract_bridge2.wrapModuleWithType)(proxy, account);
-    const as = (0, import_assert3.assertEx)((0, import_module_model2.asModuleInstance)(wrapped, {}), () => `Failed to asModuleInstance [${id}]`);
+    const as = (0, import_assert4.assertEx)((0, import_module_model3.asModuleInstance)(wrapped, {}), () => `Failed to asModuleInstance [${id}]`);
     proxy.upResolver.add(as);
     proxy.downResolver.add(as);
     this.add(as);
@@ -759,7 +705,7 @@ var _PubSubBridge = class _PubSubBridge extends import_abstract_bridge3.Abstract
   get resolver() {
     this._resolver = this._resolver ?? new PubSubBridgeModuleResolver({
       bridge: this,
-      busClient: (0, import_assert4.assertEx)(this.busClient(), () => "busClient not configured"),
+      busClient: (0, import_assert5.assertEx)(this.busClient(), () => "busClient not configured"),
       wrapperAccount: this.account
     });
     return this._resolver;
@@ -768,7 +714,7 @@ var _PubSubBridge = class _PubSubBridge extends import_abstract_bridge3.Abstract
     return `${this.config.name ?? moduleName}`;
   }
   get roots() {
-    return (0, import_assert4.assertEx)(this.config.roots, () => "roots not configured");
+    return (0, import_assert5.assertEx)(this.config.roots, () => "roots not configured");
   }
   async discoverRoots() {
     const rootInstances = (await Promise.all(this.roots.map(async (root) => await this.resolver.resolve(root)))).filter(import_exists.exists);
@@ -779,7 +725,7 @@ var _PubSubBridge = class _PubSubBridge extends import_abstract_bridge3.Abstract
   }
   async exposeHandler(id, options) {
     const { maxDepth = 2, direction = "all", required = true } = options ?? {};
-    const host = (0, import_assert4.assertEx)(this.busHost(), () => "Not configured as a host");
+    const host = (0, import_assert5.assertEx)(this.busHost(), () => "Not configured as a host");
     const module2 = await host.expose(id, {
       required
     });
@@ -814,7 +760,7 @@ var _PubSubBridge = class _PubSubBridge extends import_abstract_bridge3.Abstract
   }
   async unexposeHandler(id, options) {
     const { maxDepth = 2, direction = "all", required = true } = options ?? {};
-    const host = (0, import_assert4.assertEx)(this.busHost(), () => "Not configured as a host");
+    const host = (0, import_assert5.assertEx)(this.busHost(), () => "Not configured as a host");
     const module2 = await host.unexpose(id, required);
     if (module2) {
       const children = maxDepth > 0 ? await module2.resolve("*", {
@@ -865,7 +811,7 @@ __publicField(_PubSubBridge, "configSchemas", [
 ]);
 var PubSubBridge = _PubSubBridge;
 PubSubBridge = _ts_decorate([
-  (0, import_module_model3.creatableModule)()
+  (0, import_module_model4.creatableModule)()
 ], PubSubBridge);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {