@mindignited/continuum-client 2.14.7 → 2.14.9

package/dist/continuum.js

@@ -1,21 +1,21 @@
 import { RxStomp as k } from "@stomp/rx-stomp";
 import { ReconnectionTimeMode as B } from "@stomp/stompjs";
-import { v4 as S } from "uuid";
-import q from "debug";
-import b, { propagation as F, context as $, SpanKind as U, SpanStatusCode as Y } from "@opentelemetry/api";
-import { Subject as A, firstValueFrom as V, Observable as j, throwError as N } from "rxjs";
+import { v4 as m } from "uuid";
+import I from "debug";
+import b, { propagation as F, context as $, SpanKind as q, SpanStatusCode as Y } from "@opentelemetry/api";
+import { Subject as A, firstValueFrom as U, Observable as V, throwError as j } from "rxjs";
 import { map as R, multicast as J, filter as X, first as W } from "rxjs/operators";
 import { Optional as C } from "typescript-optional";
 import "reflect-metadata";
 import { ATTR_SERVER_ADDRESS as G, ATTR_SERVER_PORT as K } from "@opentelemetry/semantic-conventions";
 class Le {
 }
-class w {
+class N {
   host;
   port;
   useSSL;
 }
-class Me extends w {
+class Me extends N {
   /**
    * The headers to send during the connection to the continuum server.
    * If a function is provided, it will be called to get the headers each time the connection is established.
@@ -34,9 +34,9 @@ class Me extends w {
    */
   disableStickySession;
 }
-class m extends Error {
+class v extends Error {
   constructor(e) {
-    super(e), Object.setPrototypeOf(this, m.prototype);
+    super(e), Object.setPrototypeOf(this, v.prototype);
   }
 }
 var o = /* @__PURE__ */ ((s) => (s.CONTENT_TYPE_HEADER = "content-type", s.CONTENT_LENGTH_HEADER = "content-length", s.REPLY_TO_HEADER = "reply-to", s.REPLY_TO_ID_HEADER = "reply-to-id", s.SESSION_HEADER = "session", s.CONNECTED_INFO_HEADER = "connected-info", s.DISABLE_STICKY_SESSION_HEADER = "disable-sticky-session", s.CORRELATION_ID_HEADER = "__correlation-id", s.ERROR_HEADER = "error", s.COMPLETE_HEADER = "complete", s.CONTROL_HEADER = "control", s.CONTROL_VALUE_COMPLETE = "complete", s.CONTROL_VALUE_CANCEL = "cancel", s.CONTROL_VALUE_SUSPEND = "suspend", s.CONTROL_VALUE_RESUME = "resume", s.SERVICE_DESTINATION_PREFIX = "srv://", s.SERVICE_DESTINATION_SCHEME = "srv", s.STREAM_DESTINATION_PREFIX = "stream://", s.STREAM_DESTINATION_SCHEME = "stream", s.CONTENT_JSON = "application/json", s.CONTENT_TEXT = "text/plain", s.TRACEPARENT_HEADER = "traceparent", s.TRACESTATE_HEADER = "tracestate", s))(o || {});
@@ -53,9 +53,9 @@ class z {
   JITTER_MAX = 5e3;
   connectionAttempts = 0;
   initialConnectionSuccessful = !1;
-  debugLogger = q("continuum:stomp");
-  replyToId = S();
-  replyToCri = o.SERVICE_DESTINATION_PREFIX + this.replyToId + ":" + S() + "@continuum.js.EventBus/replyHandler";
+  debugLogger = I("continuum:stomp");
+  replyToId = m();
+  _replyToCri = o.SERVICE_DESTINATION_PREFIX + this.replyToId + ":" + m() + "@continuum.js.EventBus/replyHandler";
   deactivationHandler = null;
   /**
    * @return true if this {@link StompConnectionManager} is actively trying to maintain a connection to the Stomp server, false if not.
@@ -63,6 +63,9 @@ class z {
   get active() {
     return !!this.rxStomp;
   }
+  get replyToCri() {
+    return this._replyToCri;
+  }
   /**
    * return true if this {@link StompConnectionManager} is active and has a connection to the stomp server
    */
@@ -84,12 +87,12 @@ class z {
         return;
       }
       this.connectionAttempts = 0, this.initialConnectionSuccessful = !1, this.lastWebsocketError = null, this.maxConnectionAttemptsReached = !1;
-      const n = "ws" + (e.useSSL ? "s" : "") + "://" + e.host + (e.port ? ":" + e.port : "") + "/v1";
+      const i = "ws" + (e.useSSL ? "s" : "") + "://" + e.host + (e.port ? ":" + e.port : "") + "/v1";
       this.rxStomp = new k();
-      let i = typeof e.connectHeaders != "function" && e.connectHeaders != null ? e.connectHeaders : {};
+      let n = typeof e.connectHeaders != "function" && e.connectHeaders != null ? e.connectHeaders : {};
       const c = {
-        brokerURL: n,
-        connectHeaders: i,
+        brokerURL: i,
+        connectHeaders: n,
         heartbeatIncoming: 12e4,
         heartbeatOutgoing: 3e4,
         reconnectDelay: this.INITIAL_RECONNECT_DELAY,
@@ -97,9 +100,9 @@ class z {
           if (typeof e.connectHeaders == "function") {
             const u = await e.connectHeaders();
             for (const l in u)
-              i[l] = u[l];
+              n[l] = u[l];
           }
-          if (e.disableStickySession && (i[o.DISABLE_STICKY_SESSION_HEADER] = "true"), i[o.REPLY_TO_ID_HEADER] = this.replyToId, e?.maxConnectionAttempts)
+          if (e.disableStickySession && (n[o.DISABLE_STICKY_SESSION_HEADER] = "true"), n[o.REPLY_TO_ID_HEADER] ? (this.replyToId = n[o.REPLY_TO_ID_HEADER], this._replyToCri = o.SERVICE_DESTINATION_PREFIX + this.replyToId + ":" + m() + "@continuum.js.EventBus/replyHandler") : n[o.REPLY_TO_ID_HEADER] = this.replyToId, e?.maxConnectionAttempts)
             if (this.connectionAttempts++, this.connectionAttempts > e.maxConnectionAttempts) {
               if (this.maxConnectionAttemptsReached = !0, await this.deactivate(), !this.initialConnectionSuccessful) {
                 let u = this.lastWebsocketError?.message ? this.lastWebsocketError?.message : "UNKNOWN";
@@ -128,15 +131,15 @@ class z {
           const d = JSON.parse(l);
           if (e.disableStickySession)
             if (typeof e.connectHeaders == "function") {
-              for (let v in i)
-                delete i[v];
+              for (let S in n)
+                delete n[S];
               this.initialConnectionSuccessful || t(d);
             } else typeof e.connectHeaders == "object" && (p.unsubscribe(), t(d));
           else if (p.unsubscribe(), d.sessionId != null && d.replyToId != null) {
             if (e.connectHeaders != null)
-              for (let v in i)
-                delete i[v];
-            i[o.SESSION_HEADER] = d.sessionId, t(d);
+              for (let S in n)
+                delete n[S];
+            n[o.SESSION_HEADER] = d.sessionId, t(d);
           } else
             r("Server did not return proper data for successful login");
         } else
@@ -199,7 +202,7 @@ class Z {
   constructor() {
     this.fatalErrors = this.errorSubject.pipe(R((e) => (this.disconnect().catch((t) => {
       console && console.error("Error disconnecting from Stomp: " + t);
-    }), new m(e.headers.message)))), this.stompConnectionManager.deactivationHandler = () => {
+    }), new v(e.headers.message)))), this.stompConnectionManager.deactivationHandler = () => {
       this.cleanup();
     };
   }
@@ -215,7 +218,7 @@ class Z {
     {
       this.cleanup();
       const t = await this.stompConnectionManager.activate(e);
-      return this.serverInfo = new w(), this.serverInfo.host = e.host, this.serverInfo.port = e.port, this.serverInfo.useSSL = e.useSSL, this.replyToCri = this.stompConnectionManager.replyToCri, this.errorSubjectSubscription = this.stompConnectionManager.rxStomp?.stompErrors$.subscribe(this.errorSubject), t;
+      return this.serverInfo = new N(), this.serverInfo.host = e.host, this.serverInfo.port = e.port, this.serverInfo.useSSL = e.useSSL, this.replyToCri = this.stompConnectionManager.replyToCri, this.errorSubjectSubscription = this.stompConnectionManager.rxStomp?.stompErrors$.subscribe(this.errorSubject), t;
     }
   }
   async disconnect(e) {
@@ -224,8 +227,8 @@ class Z {
   send(e) {
     if (this.stompConnectionManager.rxStomp) {
       const t = {};
-      for (const [n, i] of e.headers.entries())
-        t[n] = i;
+      for (const [i, n] of e.headers.entries())
+        t[i] = n;
       const r = {};
       F.inject($.active(), r), r.traceparent && (t[o.TRACEPARENT_HEADER] = r.traceparent), r.tracestate && (t[o.TRACESTATE_HEADER] = r.tracestate), this.stompConnectionManager.rxStomp.publish({
         destination: e.cri,
@@ -236,20 +239,20 @@ class Z {
       throw this.createSendUnavailableError();
   }
   request(e) {
-    return V(this.requestStream(e, !1));
+    return U(this.requestStream(e, !1));
   }
   requestStream(e, t = !0) {
-    return this.stompConnectionManager?.rxStomp ? new j((r) => {
+    return this.stompConnectionManager?.rxStomp ? new V((r) => {
       this.requestRepliesObservable == null && (this.requestRepliesSubject = new A(), this.requestRepliesObservable = this._observe(this.replyToCri).pipe(J(this.requestRepliesSubject)), this.requestRepliesSubscription = this.requestRepliesObservable.connect());
-      let n = !1;
-      const i = S(), c = this.requestRepliesObservable.pipe(X((a) => a.headers.get(o.CORRELATION_ID_HEADER) === i)).subscribe({
+      let i = !1;
+      const n = m(), c = this.requestRepliesObservable.pipe(X((a) => a.headers.get(o.CORRELATION_ID_HEADER) === n)).subscribe({
         next(a) {
           if (a.hasHeader(o.CONTROL_HEADER))
             if (a.headers.get(o.CONTROL_HEADER) === "complete")
-              n = !0, r.complete();
+              i = !0, r.complete();
             else
               throw new Error("Control Header " + a.headers.get(o.CONTROL_HEADER) + " is not supported");
-          else a.hasHeader(o.ERROR_HEADER) ? (n = !0, r.error(new Error(a.getHeader(o.ERROR_HEADER)))) : r.next(a);
+          else a.hasHeader(o.ERROR_HEADER) ? (i = !0, r.error(new Error(a.getHeader(o.ERROR_HEADER)))) : r.next(a);
         },
         error(a) {
           r.error(a);
@@ -258,13 +261,16 @@ class Z {
           r.complete();
         }
       });
-      return r.add(c), e.setHeader(o.REPLY_TO_HEADER, this.replyToCri), e.setHeader(o.CORRELATION_ID_HEADER, i), this.send(e), () => {
-        if (t && !n) {
+      return r.add(c), e.setHeader(o.REPLY_TO_HEADER, this.replyToCri), e.setHeader(o.CORRELATION_ID_HEADER, n), this.send(e), () => {
+        if (t && !i) {
           const a = new g(e.cri);
-          a.setHeader(o.CONTROL_HEADER, o.CONTROL_VALUE_CANCEL), a.setHeader(o.CORRELATION_ID_HEADER, i), this.send(a);
+          a.setHeader(o.CONTROL_HEADER, o.CONTROL_VALUE_CANCEL), a.setHeader(o.CORRELATION_ID_HEADER, n), this.send(a);
         }
       };
-    }) : N(() => this.createSendUnavailableError());
+    }) : j(() => this.createSendUnavailableError());
+  }
+  listen(e) {
+    return Promise.reject("Not implemented");
   }
   observe(e) {
     return this._observe(e);
@@ -286,13 +292,15 @@ class Z {
    * @return the cold {@link Observable<IEvent>} for the given destination
    */
   _observe(e) {
-    return this.stompConnectionManager?.rxStomp ? this.stompConnectionManager.rxStomp.watch(e).pipe(R((t) => {
-      const r = /* @__PURE__ */ new Map();
-      let n = "";
-      for (const i of Object.keys(t.headers))
-        i === "destination" ? n = t.headers[i] : r.set(i, t.headers[i]);
-      return new g(n, r, t.binaryBody);
-    })) : N(() => this.createSendUnavailableError());
+    if (this.stompConnectionManager?.rxStomp)
+      return this.stompConnectionManager.rxStomp.watch(e).pipe(R((t) => {
+        const r = /* @__PURE__ */ new Map();
+        let i = "";
+        for (const n of Object.keys(t.headers))
+          n === "destination" ? i = t.headers[n] : r.set(n, t.headers[n]);
+        return new g(i, r, t.binaryBody);
+      }));
+    throw this.createSendUnavailableError();
   }
 }
 class E {
@@ -310,8 +318,8 @@ class E {
       const r = E.parseRaw(t);
       this._scheme = r.scheme, this._scope = r.scope, this._resourceName = r.resourceName, this._path = r.path, this._version = r.version, this._raw = t;
     } else if (e.length === 5) {
-      const [t, r, n, i, c] = e;
-      this._scheme = t, this._scope = r, this._resourceName = n, this._path = i, this._version = c, this._raw = E.buildRaw(t, r, n, i, c);
+      const [t, r, i, n, c] = e;
+      this._scheme = t, this._scope = r, this._resourceName = i, this._path = n, this._version = c, this._raw = E.buildRaw(t, r, i, n, c);
     } else
       throw new Error("Invalid constructor arguments for DefaultCRI");
     if (!this._scheme || !this._resourceName)
@@ -363,22 +371,22 @@ class E {
     const t = /^([^:]+):\/\/(?:([^@]+)@)?([^\/#]+)(\/[^#]*)?(?:#(.+))?$/, r = e.match(t);
     if (!r)
       throw new Error(`Invalid CRI format: ${e}`);
-    const [, n, i, c, a, h] = r;
+    const [, i, n, c, a, h] = r;
     return {
-      scheme: n,
-      scope: i || null,
+      scheme: i,
+      scope: n || null,
       resourceName: c,
       path: a ? a.substring(1) : null,
       version: h || null
     };
   }
   // Helper to build a raw CRI string
-  static buildRaw(e, t, r, n, i) {
+  static buildRaw(e, t, r, i, n) {
     let c = `${e}://`;
-    return t && (c += `${t}@`), c += r, n && (c += `/${n}`), i && (c += `#${i}`), c;
+    return t && (c += `${t}@`), c += r, i && (c += `/${i}`), n && (c += `#${n}`), c;
   }
 }
-function I(...s) {
+function w(...s) {
   if (s.length === 1) return new E(s[0]);
   if (s.length === 2) return new E(s[0], null, s[1], null, null);
   if (s.length === 3) return new E(s[0], s[1], s[2], null, null);
@@ -402,16 +410,16 @@ class O {
   static createReplyEvent(e, t, r) {
     if (!e)
       throw new Error("incomingHeaders cannot be null");
-    const n = e.get(o.REPLY_TO_HEADER);
-    if (!n || n.trim() === "")
+    const i = e.get(o.REPLY_TO_HEADER);
+    if (!i || i.trim() === "")
       throw new Error("No reply-to header found, cannot create outgoing message");
-    const i = /* @__PURE__ */ new Map();
+    const n = /* @__PURE__ */ new Map();
     for (const [c, a] of e)
-      c.startsWith("__") && i.set(c, a);
+      c.startsWith("__") && n.set(c, a);
     if (t)
       for (const [c, a] of t)
-        i.set(c, a);
-    return new g(n, i, r || void 0);
+        n.set(c, a);
+    return new g(i, n, r || void 0);
   }
 }
 class ee {
@@ -460,7 +468,7 @@ class re {
    * @return the cri for this {@link ServiceIdentifier}
    */
   cri() {
-    return this._cri == null && (this._cri = I(
+    return this._cri == null && (this._cri = w(
       o.SERVICE_DESTINATION_SCHEME,
       // scheme
       this.scope || null,
@@ -474,7 +482,7 @@ class re {
     )), this._cri;
   }
 }
-const P = /* @__PURE__ */ Symbol("scope"), x = /* @__PURE__ */ Symbol("version"), T = /* @__PURE__ */ Symbol("context");
+const P = /* @__PURE__ */ Symbol("scope"), x = /* @__PURE__ */ Symbol("version"), _ = /* @__PURE__ */ Symbol("context");
 function ke(s, e, t) {
   Reflect.defineMetadata(P, e, s);
 }
@@ -485,23 +493,23 @@ function Be(s) {
     Reflect.defineMetadata(x, s, e);
   };
 }
-function qe() {
+function Fe() {
   return function(s, e, t) {
-    const r = Reflect.getMetadata(T, s, e) || [];
-    r.push(t), Reflect.defineMetadata(T, r, s, e);
+    const r = Reflect.getMetadata(_, s, e) || [];
+    r.push(t), Reflect.defineMetadata(_, r, s, e);
   };
 }
-function Fe(s, e) {
+function $e(s, e) {
   return function(t) {
-    const r = t, n = new re(s, e || t.name), i = Reflect.getMetadata(x, t);
-    i && (n.version = i);
+    const r = t, i = new re(s, e || t.name), n = Reflect.getMetadata(x, t);
+    n && (i.version = n);
     const c = function(...a) {
       const h = Reflect.construct(r, a), p = Reflect.getMetadata(P, t.prototype);
       if (p) {
         const u = h[p];
-        n.scope = typeof u == "function" ? u.call(h) : u;
+        i.scope = typeof u == "function" ? u.call(h) : u;
       }
-      return D.serviceRegistry.register(n, h), h;
+      return D.serviceRegistry.register(i, h), h;
     };
     return c.prototype = r.prototype, c;
   };
@@ -509,7 +517,7 @@ function Fe(s, e) {
 class se {
   log;
   active = !1;
-  eventBusService;
+  _eventBus;
   interceptorProvider;
   argumentResolver;
   returnValueConverter;
@@ -517,22 +525,30 @@ class se {
   serviceInstance;
   methodSubscription = null;
   methodMap;
-  constructor(e, t, r, n, i = {}) {
+  constructor(e, t, r, i, n = {}) {
     if (!e) throw new Error("ServiceIdentifier must not be null");
     if (!t) throw new Error("Service instance must not be null");
-    if (!r) throw new Error("EventBusService must not be null");
-    if (!n) throw new Error("interceptorProvider must not be null");
-    this.serviceIdentifier = e, this.serviceInstance = t, this.eventBusService = r, this.interceptorProvider = n, this.log = i.logger || te("continuum:ServiceInvocationSupervisor"), this.argumentResolver = i.argumentResolver || new Q(), this.returnValueConverter = i.returnValueConverter || new ee(), this.methodMap = this.buildMethodMap(t);
+    if (!r) throw new Error("IEventBus must not be null");
+    if (!i) throw new Error("interceptorProvider must not be null");
+    this.serviceIdentifier = e, this.serviceInstance = t, this._eventBus = r, this.interceptorProvider = i, this.log = n.logger || te("continuum:ServiceInvocationSupervisor"), this.argumentResolver = n.argumentResolver || new Q(), this.returnValueConverter = n.returnValueConverter || new ee(), this.methodMap = this.buildMethodMap(t);
   }
   isActive() {
     return this.active;
   }
+  /**
+   * The {@link IEventBus} that this supervisor uses to listen for service invocation events
+   * This can be changed at runtime, the supervisor will restart to use the new event bus
+   * @param eventBus the new IEventBus to use
+   */
+  set eventBus(e) {
+    this.active ? (this.stop(), this._eventBus = e, this.start()) : this._eventBus = e;
+  }
   start() {
     if (this.active)
       throw new Error("Service already started");
     this.active = !0;
     const e = this.serviceIdentifier.cri().baseResource();
-    this.methodSubscription = this.eventBusService.observe(e).subscribe({
+    this.methodSubscription = this._eventBus.observe(e).subscribe({
       next: async (t) => {
         await this.processEvent(t);
       },
@@ -552,8 +568,8 @@ class se {
   buildMethodMap(e) {
     const t = {};
     for (const r of Object.getOwnPropertyNames(Object.getPrototypeOf(e))) {
-      const n = e[r];
-      typeof n == "function" && r !== "constructor" && (t[r] = n.bind(e));
+      const i = e[r];
+      typeof i == "function" && r !== "constructor" && (t[r] = i.bind(e));
     }
     return t;
   }
@@ -573,13 +589,13 @@ class se {
     this.log.trace(`Processing control event for correlationId: ${t}`);
   }
   async processInvocationRequest(e) {
-    const t = I(e.cri).path();
+    const t = w(e.cri).path();
     if (!t)
       throw new Error("The methodId must not be blank");
     const r = this.methodMap[t];
     if (!r)
       throw new Error(`No method resolved for methodId ${t}`);
-    const n = t, i = this.argumentResolver.resolveArguments(e), c = Reflect.getMetadata(T, this.serviceInstance, n) || [];
+    const i = t, n = this.argumentResolver.resolveArguments(e), c = Reflect.getMetadata(_, this.serviceInstance, i) || [];
     let a = {};
     const h = this.interceptorProvider();
     if (h)
@@ -590,13 +606,13 @@ class se {
         return;
       }
     for (const l of c)
-      i[l] = a;
+      n[l] = a;
     const p = r.length;
-    if (i.length !== p)
-      throw new Error(`Argument count mismatch for method ${t}: expected ${p}, got ${i.length}`);
+    if (n.length !== p)
+      throw new Error(`Argument count mismatch for method ${t}: expected ${p}, got ${n.length}`);
     let u;
     try {
-      u = r(...i), u instanceof Promise ? u.then(
+      u = r(...n), u instanceof Promise ? u.then(
         (l) => this.processMethodInvocationResult(e, l),
         (l) => this.handleException(e, l)
       ) : this.processMethodInvocationResult(e, u);
@@ -606,7 +622,7 @@ class se {
   }
   processMethodInvocationResult(e, t) {
     const r = this.returnValueConverter.convert(e.headers, t);
-    this.eventBusService.send(r);
+    this._eventBus.send(r);
   }
   handleException(e, t) {
     const r = O.createReplyEvent(
@@ -617,15 +633,15 @@ class se {
       ]),
       new TextEncoder().encode(JSON.stringify({ message: t.message }))
     );
-    this.eventBusService.send(r);
+    this._eventBus.send(r);
   }
   validateReplyTo(e) {
     const t = e.getHeader(o.REPLY_TO_HEADER);
     return t ? t.trim() === "" ? (this.log.warn("Reply-to header must not be blank"), !1) : t.startsWith(`${o.SERVICE_DESTINATION_SCHEME}:`) ? !0 : (this.log.warn("Reply-to header must be a valid service destination"), !1) : (this.log.warn("No reply-to header found in event"), !1);
   }
 }
-const ne = "2.14.7", ie = {
-  version: ne
+const ie = "2.14.9", ne = {
+  version: ie
 };
 class oe {
   create(e, t) {
@@ -633,44 +649,54 @@ class oe {
     return r.setHeader(o.CONTENT_TYPE_HEADER, o.CONTENT_JSON), t != null && r.setDataString(JSON.stringify(t)), r;
   }
 }
-class $e {
+class qe {
   create(e, t) {
     const r = new g(e);
     if (r.setHeader(o.CONTENT_TYPE_HEADER, o.CONTENT_TEXT), t != null) {
-      let n = "", i = 0;
+      let i = "", n = 0;
       for (const c of t)
-        i > 0 && (n = n + `
-`), n = n + c, i++;
-      n.length > 0 && r.setDataString(n);
+        n > 0 && (i = i + `
+`), i = i + c, n++;
+      i.length > 0 && r.setDataString(i);
     }
     return r;
   }
 }
 class ce {
-  eventBus;
+  _eventBus;
   supervisors = /* @__PURE__ */ new Map();
   contextInterceptor = null;
+  debugLogger = I("continuum:serviceRegistry");
   constructor(e) {
-    this.eventBus = e;
+    this._eventBus = e;
+  }
+  set eventBus(e) {
+    this._eventBus = e;
+    for (const t of this.supervisors.values())
+      t.eventBus = e;
+  }
+  get eventBus() {
+    return this._eventBus;
   }
   serviceProxy(e) {
-    return new ue(e, this.eventBus);
+    return new ue(e, this);
   }
   register(e, t) {
     const r = e.cri().raw();
     if (!this.supervisors.has(r)) {
-      const n = new se(
+      this.debugLogger(`Registering service for CRI: ${r}`);
+      const i = new se(
         e,
         t,
         this.eventBus,
         () => this.contextInterceptor
       );
-      this.supervisors.set(r, n), n.start();
+      this.supervisors.set(r, i), i.start();
     }
   }
   unRegister(e) {
     const t = e.cri().raw(), r = this.supervisors.get(t);
-    r && (r.stop(), this.supervisors.delete(t));
+    r && (this.debugLogger(`Unregistering service for CRI: ${t}`), r.stop(), this.supervisors.delete(t));
   }
   registerContextInterceptor(e) {
     this.contextInterceptor = e;
@@ -679,38 +705,38 @@ class ce {
 const ae = new oe();
 class ue {
   serviceIdentifier;
-  eventBus;
+  serviceRegistry;
   tracer;
   constructor(e, t) {
     if (typeof e > "u" || e.length === 0)
       throw new Error("The serviceIdentifier provided must contain a value");
-    this.serviceIdentifier = e, this.eventBus = t, this.tracer = b.trace.getTracer(
+    this.serviceIdentifier = e, this.serviceRegistry = t, this.tracer = b.trace.getTracer(
       "continuum.client",
-      ie.version
+      ne.version
     );
   }
-  invoke(e, t, r, n) {
+  invoke(e, t, r, i) {
     return this.tracer.startActiveSpan(
       `${this.serviceIdentifier}/${e}`,
       {
-        kind: U.CLIENT
+        kind: q.CLIENT
       },
-      async (i) => (r && i.setAttribute("continuum.scope", r), i.setAttribute("rpc.system", "continuum"), i.setAttribute("rpc.service", this.serviceIdentifier), i.setAttribute("rpc.method", e), this.__invokeStream(!1, e, t, r, n).pipe(W()).toPromise().then(
-        async (c) => (i.end(), c),
+      async (n) => (r && n.setAttribute("continuum.scope", r), n.setAttribute("rpc.system", "continuum"), n.setAttribute("rpc.service", this.serviceIdentifier), n.setAttribute("rpc.method", e), this.__invokeStream(!1, e, t, r, i).pipe(W()).toPromise().then(
+        async (c) => (n.end(), c),
         async (c) => {
-          throw i.recordException(c), i.setStatus({ code: Y.ERROR }), i.end(), c;
+          throw n.recordException(c), n.setStatus({ code: Y.ERROR }), n.end(), c;
         }
       ))
     );
   }
-  invokeStream(e, t, r, n) {
-    return this.__invokeStream(!0, e, t, r, n);
+  invokeStream(e, t, r, i) {
+    return this.__invokeStream(!0, e, t, r, i);
   }
-  __invokeStream(e, t, r, n, i) {
-    const c = o.SERVICE_DESTINATION_PREFIX + (n != null ? n + "@" : "") + this.serviceIdentifier + "/" + t;
+  __invokeStream(e, t, r, i, n) {
+    const c = o.SERVICE_DESTINATION_PREFIX + (i != null ? i + "@" : "") + this.serviceIdentifier + "/" + t;
     let a = ae;
-    i ? a = i : f.getEventFactory() && (a = f.getEventFactory());
-    let h = this.eventBus;
+    n ? a = n : f.getEventFactory() && (a = f.getEventFactory());
+    let h = this.serviceRegistry.eventBus;
     f.getContinuumInstance() && (h = f.getContinuumInstance().eventBus);
     const p = b.trace.getActiveSpan();
     p && (p.setAttribute(G, h.serverInfo?.host || "unknown"), p.setAttribute(K, h.serverInfo?.port || "unknown"));
@@ -728,7 +754,7 @@ class ue {
     }));
   }
 }
-class _ {
+class T {
   pageable;
   currentPage;
   firstPage = !0;
@@ -773,7 +799,7 @@ class _ {
     return this.currentPage.content;
   }
 }
-class le extends _ {
+class le extends T {
   crudServiceProxy;
   constructor(e, t, r) {
     super(e, t), this.crudServiceProxy = r;
@@ -782,11 +808,11 @@ class le extends _ {
     return this.crudServiceProxy.findAllSinglePage(e);
   }
 }
-class he extends _ {
+class he extends T {
   searchText;
   crudServiceProxy;
-  constructor(e, t, r, n) {
-    super(e, t), this.searchText = r, this.crudServiceProxy = n;
+  constructor(e, t, r, i) {
+    super(e, t), this.searchText = r, this.crudServiceProxy = i;
   }
   findNext(e) {
     return this.crudServiceProxy.searchSinglePage(this.searchText, e);
@@ -868,7 +894,7 @@ class fe {
   /**
    * The {@link IEventBus} that is used to communicate with the Continuum server
    */
-  eventBus;
+  _eventBus;
   /**
    * The {@link ServiceRegistry} that is used to manage the services that are available
    */
@@ -878,7 +904,13 @@ class fe {
    */
   crudServiceProxyFactory;
   constructor() {
-    this.eventBus = new Z(), this.serviceRegistry = new ce(this.eventBus), this.crudServiceProxyFactory = new de(this.serviceRegistry);
+    this._eventBus = new Z(), this.serviceRegistry = new ce(this._eventBus), this.crudServiceProxyFactory = new de(this.serviceRegistry);
+  }
+  get eventBus() {
+    return this._eventBus;
+  }
+  set eventBus(e) {
+    this._eventBus = e, this.serviceRegistry.eventBus = e;
   }
   /**
    * Requests a connection to the given Stomp url
@@ -886,14 +918,14 @@ class fe {
    * @return Promise containing the result of the initial connection attempt
    */
   connect(e) {
-    return this.eventBus.connect(e);
+    return this._eventBus.connect(e);
   }
   /**
    * Disconnects the client from the server
    * This will clear any subscriptions and close the connection
    */
   disconnect(e) {
-    return this.eventBus.disconnect(e);
+    return this._eventBus.disconnect(e);
   }
   /**
    * Creates a new service proxy that can be used to access the desired service.
@@ -922,13 +954,13 @@ class fe {
   async execute(e, t) {
     const r = f;
     r.push({ instance: this, eventFactory: t });
-    let n;
+    let i;
     try {
-      n = await e();
+      i = await e();
     } finally {
       r.pop();
     }
-    return n;
+    return i;
   }
 }
 const D = new fe();
@@ -936,13 +968,13 @@ var ge = /* @__PURE__ */ ((s) => (s.TRACE = "TRACE", s.DEBUG = "DEBUG", s.INFO =
 class y {
   configuredLevel;
 }
-class me extends y {
+class ve extends y {
   members = [];
 }
-class ve extends y {
+class me extends y {
   effectiveLevel;
 }
-class Ue {
+class Ye {
   levels = [];
   loggerLevels = /* @__PURE__ */ new Map();
   groups = /* @__PURE__ */ new Map();
@@ -957,20 +989,20 @@ class Se {
   }
   async loggerLevels(e, t) {
     const r = await this.serviceProxy.invoke("loggerLevels", [t], e);
-    let n = null;
-    return r.hasOwnProperty("members") ? n = new me() : r.hasOwnProperty("effectiveLevel") ? n = new ve() : n = new y(), Object.assign(n, r), n;
+    let i = null;
+    return r.hasOwnProperty("members") ? i = new ve() : r.hasOwnProperty("effectiveLevel") ? i = new me() : i = new y(), Object.assign(i, r), i;
   }
   configureLogLevel(e, t, r) {
     return this.serviceProxy.invoke("configureLogLevel", [t, r], e);
   }
 }
-const Ye = new Se();
-class H extends m {
+const Ue = new Se();
+class H extends v {
   constructor(e) {
     super(e), Object.setPrototypeOf(this, H.prototype);
   }
 }
-class L extends m {
+class L extends v {
   constructor(e) {
     super(e), Object.setPrototypeOf(this, L.prototype);
   }
@@ -985,8 +1017,8 @@ class je {
   tenantId;
   metadata;
   roles;
-  constructor(e, t, r, n) {
-    this.id = e, this.tenantId = t, this.metadata = r || /* @__PURE__ */ new Map(), this.roles = n || [];
+  constructor(e, t, r, i) {
+    this.id = e, this.tenantId = t, this.metadata = r || /* @__PURE__ */ new Map(), this.roles = i || [];
   }
 }
 class Je {
@@ -1009,7 +1041,7 @@ class Xe {
     return this.value !== null && this.value !== void 0;
   }
 }
-class We extends _ {
+class We extends T {
   pageFunction;
   constructor(e, t, r) {
     super(e, t), this.pageFunction = r;
@@ -1039,7 +1071,7 @@ class M {
    * @param sort the sorting parameters (optional).
    */
   static create(e, t, r) {
-    return new Te(e, t, r);
+    return new _e(e, t, r);
   }
   /**
    * Creates a {@link Pageable} that uses Cursor based pagination.
@@ -1048,10 +1080,10 @@ class M {
    * @param sort the sorting parameters (optional).
    */
   static createWithCursor(e, t, r) {
-    return new _e(e, t, r);
+    return new Te(e, t, r);
   }
 }
-class Te extends M {
+class _e extends M {
   /**
    * Returns the page to be returned.
    */
@@ -1066,7 +1098,7 @@ class Te extends M {
     super(), this.pageNumber = e, this.pageSize = t, this.sort = r;
   }
 }
-class _e extends M {
+class Te extends M {
   /**
    * The cursor to be used for subsequent retrieval of data, or null if this is the first page.
    */
@@ -1106,21 +1138,21 @@ class ze {
   orders = [];
 }
 export {
-  _ as AbstractIterablePage,
+  T as AbstractIterablePage,
   H as AuthenticationError,
   L as AuthorizationError,
-  T as CONTEXT_METADATA_KEY,
+  _ as CONTEXT_METADATA_KEY,
   Le as ConnectHeaders,
   Ve as ConnectedInfo,
   Me as ConnectionInfo,
-  qe as Context,
+  Fe as Context,
   D as Continuum,
   f as ContinuumContextStack,
-  m as ContinuumError,
+  v as ContinuumError,
   fe as ContinuumSingleton,
   pe as CrudServiceProxy,
   de as CrudServiceProxyFactory,
-  _e as CursorPageable,
+  Te as CursorPageable,
   Ge as DataSourceUtils,
   E as DefaultCRI,
   ye as Direction,
@@ -1128,29 +1160,29 @@ export {
   Z as EventBus,
   o as EventConstants,
   We as FunctionalIterablePage,
-  me as GroupLoggerLevelsDescriptor,
+  ve as GroupLoggerLevelsDescriptor,
   oe as JsonEventFactory,
   ge as LogLevel,
   Se as LogManager,
   y as LoggerLevelsDescriptor,
-  Ue as LoggersDescriptor,
+  Ye as LoggersDescriptor,
   be as NullHandling,
-  Te as OffsetPageable,
+  _e as OffsetPageable,
   Ke as Order,
   M as Pageable,
   je as Participant,
   Je as ParticipantConstants,
-  Fe as Publish,
+  $e as Publish,
   ke as Scope,
-  w as ServerInfo,
+  N as ServerInfo,
   ce as ServiceRegistry,
-  ve as SingleLoggerLevelsDescriptor,
+  me as SingleLoggerLevelsDescriptor,
   ze as Sort,
   Xe as StreamData,
   Re as StreamOperation,
-  $e as TextEventFactory,
+  qe as TextEventFactory,
   Be as Version,
-  I as createCRI,
-  Ye as logManager
+  w as createCRI,
+  Ue as logManager
 };
 //# sourceMappingURL=continuum.js.map