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

package/dist/node/index.js

@@ -27,6 +27,7 @@ import { LRUCache as LRUCache2 } from "lru-cache";
 import { Base as Base2, toJsonString } from "@xylabs/object";
 import { asArchivistInstance } from "@xyo-network/archivist-model";
 import { asDivinerInstance } from "@xyo-network/diviner-model";
+import { Mutex } from "async-mutex";
 import { LRUCache } from "lru-cache";
 var _AsyncQueryBusBase = class _AsyncQueryBusBase extends Base2 {
   _lastState;
@@ -37,10 +38,14 @@ var _AsyncQueryBusBase = class _AsyncQueryBusBase extends Base2 {
   _lastResponsesArchivistAttempt;
   _lastResponsesDivinerAttempt;
   _queriesArchivist;
+  _queriesArchivistMutex = new Mutex();
   _queriesDiviner;
+  _queriesDivinerMutex = new Mutex();
   _reResolveDelay = 5e4;
   _responsesArchivist;
+  _responsesArchivistMutex = new Mutex();
   _responsesDiviner;
+  _responsesDivinerMutex = new Mutex();
   constructor(params) {
     super(params);
   }
@@ -66,88 +71,96 @@ var _AsyncQueryBusBase = class _AsyncQueryBusBase extends Base2 {
     return this._lastState;
   }
   async queriesArchivist() {
-    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 = asArchivistInstance(resolved);
-      if (typedResolve) {
-        return typedResolve;
+    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 = 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}]: ${toJsonString(resolved)}`);
+        }
       } 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}]: ${toJsonString(resolved)}`);
+        (_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}]`);
       }
-    } 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}]`);
-    }
+    });
   }
   async queriesDiviner() {
-    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 = asDivinerInstance(resolved);
-      if (typedResolve) {
-        return typedResolve;
+    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 = 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}]: ${toJsonString(resolved)}`);
+        }
       } 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}]: ${toJsonString(resolved)}`);
+        (_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}]`);
       }
-    } 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}]`);
-    }
+    });
   }
   async responsesArchivist() {
-    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 = asArchivistInstance(resolved);
-      if (typedResolve) {
-        return typedResolve;
+    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 = 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}]: ${toJsonString(resolved)}`);
+        }
       } 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}]: ${toJsonString(resolved)}`);
+        (_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}]`);
       }
-    } 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}]`);
-    }
+    });
   }
   async responsesDiviner() {
-    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 = asDivinerInstance(resolved);
-      if (typedResolve) {
-        return typedResolve;
+    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 = 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}]: ${toJsonString(resolved)}`);
+        }
       } 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}]: ${toJsonString(resolved)}`);
+        (_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}]`);
       }
-    } 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}]`);
-    }
+    });
   }
   /**
   * Commit the internal state of the process. This is similar
@@ -398,15 +411,24 @@ var _AsyncQueryBusHost = class _AsyncQueryBusHost extends AsyncQueryBusBase {
   get started() {
     return !!this._pollId;
   }
-  expose(address, options = {}) {
+  async expose(id, options) {
     var _a;
-    const { failOnAlreadyExposed } = options;
-    assertEx2(!failOnAlreadyExposed || !this._exposedAddresses.has(address), () => `Address already exposed [${address}]`);
-    this._exposedAddresses.add(address);
-    this._exposeOptions[address] = {
-      ...options
-    };
-    (_a = this.logger) == null ? void 0 : _a.debug(`${address} exposed`);
+    const { failOnAlreadyExposed, required = true } = options ?? {};
+    const module = asModuleInstance(await this.resolver.resolve(id, {
+      maxDepth: 10
+    }));
+    if (!module && required) {
+      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}]`);
+      this._exposedAddresses.add(module.address);
+      this._exposeOptions[module.address] = {
+        ...options
+      };
+      (_a = this.logger) == null ? void 0 : _a.debug(`${id} exposed [${module.address}]`);
+      return module;
+    }
   }
   async listeningModules() {
     var _a;
@@ -414,7 +436,9 @@ 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 (listeningModule) => assertEx2(asModuleInstance(await this.resolver.resolve(listeningModule)), () => `Unable to resolve listeningModule [${listeningModule}]`)));
+    const mods = await Promise.all(exposedModules.map(async (exposedModule) => assertEx2(asModuleInstance(await this.resolver.resolve(exposedModule, {
+      maxDepth: 10
+    })), () => `Unable to resolve listeningModule [${exposedModule}]`)));
     return mods;
   }
   start() {
@@ -431,12 +455,18 @@ var _AsyncQueryBusHost = class _AsyncQueryBusHost extends AsyncQueryBusBase {
       clearTimeoutEx2(this._pollId);
     this._pollId = void 0;
   }
-  unexpose(address, validate = true) {
+  async unexpose(id, validate = true) {
     var _a;
-    assertEx2(!validate || this._exposedAddresses.has(address), () => `Address not exposed [${address}]`);
-    this._exposedAddresses.delete(address);
-    delete this._exposeOptions[address];
-    (_a = this.logger) == null ? void 0 : _a.debug(`${address} unexposed`);
+    const module = asModuleInstance(await this.resolver.resolve(id, {
+      maxDepth: 10
+    }));
+    if (module) {
+      assertEx2(!validate || this._exposedAddresses.has(module.address), () => `Address not exposed [${module.address}][${module.id}]`);
+      this._exposedAddresses.delete(module.address);
+      delete this._exposeOptions[module.address];
+      (_a = this.logger) == null ? void 0 : _a.debug(`${module.address} [${module.id}] unexposed`);
+    }
+    return module;
   }
   callLocalModule = async (localModule, query) => {
     var _a, _b, _c, _d, _e, _f, _g;
@@ -715,22 +745,24 @@ var _PubSubBridge = class _PubSubBridge extends AbstractBridge {
     return rootInstances;
   }
   async exposeHandler(id, options) {
-    const { maxDepth = 2, direction = "all" } = options ?? {};
-    const module = assertEx4(await super.resolve(id), () => `Expose failed to locate module [${id}]`);
+    const { maxDepth = 2, direction = "all", required = true } = options ?? {};
+    const host = assertEx4(this.busHost(), () => "Not configured as a host");
+    const module = await host.expose(id, {
+      required
+    });
     if (module) {
-      const host = assertEx4(this.busHost(), () => "Not configured as a host");
-      host.expose(module.address);
-      const children = await module.resolve("*", {
+      const children = maxDepth > 0 ? await module.resolve("*", {
         direction,
         maxDepth,
         visibility: "public"
-      });
-      for (const child of children) {
-        host.expose(child.address);
-      }
+      }) : [];
+      const exposedChildren = (await Promise.all(children.map((child) => this.exposeHandler(child.address, {
+        maxDepth: maxDepth - 1,
+        required: false
+      })))).flat().filter(exists);
       return [
         module,
-        ...children
+        ...exposedChildren
       ];
     }
     return [];
@@ -748,25 +780,22 @@ var _PubSubBridge = class _PubSubBridge extends AbstractBridge {
     return await super.startHandler();
   }
   async unexposeHandler(id, options) {
-    const { maxDepth = 10, direction } = options ?? {};
-    const filterOptions = {
-      direction
-    };
-    const module = await super.resolve(id, filterOptions);
+    const { maxDepth = 2, direction = "all", required = true } = options ?? {};
+    const host = assertEx4(this.busHost(), () => "Not configured as a host");
+    const module = await host.unexpose(id, required);
     if (module) {
-      const host = assertEx4(this.busHost(), () => "Not configured as a host");
-      host.unexpose(module.address);
-      const children = await module.resolve("*", {
+      const children = maxDepth > 0 ? await module.resolve("*", {
         direction,
         maxDepth,
         visibility: "public"
-      });
-      for (const child of children) {
-        host.unexpose(child.address);
-      }
+      }) : [];
+      const exposedChildren = (await Promise.all(children.map((child) => this.unexposeHandler(child.address, {
+        maxDepth: maxDepth - 1,
+        required: false
+      })))).flat().filter(exists);
       return [
         module,
-        ...children
+        ...exposedChildren
       ];
     }
     return [];