@kinotic-ai/core 1.6.0 → 1.6.2

package/dist/index.cjs

@@ -302,14 +302,17 @@ class StompConnectionManager {
     });
   }
   async deactivate(force) {
-    if (this.rxStomp) {
-      await this.rxStomp.deactivate({ force });
-      this.serverHeadersSubscription?.unsubscribe();
-      this.serverHeadersSubscription = null;
-      this.stompErrorsSubscription?.unsubscribe();
-      this.stompErrorsSubscription = null;
-      this.rxStomp = null;
-      this._replyToCri = null;
+    const rxStomp = this.rxStomp;
+    if (rxStomp) {
+      await rxStomp.deactivate({ force });
+      if (this.rxStomp === rxStomp) {
+        this.serverHeadersSubscription?.unsubscribe();
+        this.serverHeadersSubscription = null;
+        this.stompErrorsSubscription?.unsubscribe();
+        this.stompErrorsSubscription = null;
+        this.rxStomp = null;
+        this._replyToCri = null;
+      }
     }
     return;
   }
@@ -321,9 +324,7 @@ class StompConnectionManager {
     }
   }
   async signalFatal(err) {
-    if (console) {
-      console.error("StompConnectionManager fatal error, deactivating connection", err);
-    }
+    this.debugLogger("Fatal error, deactivating connection: %O", err);
     await this.deactivate();
     this.fatalErrorsSubject.next(err);
   }
@@ -374,6 +375,7 @@ class Event {
 class EventBus {
   serverInfo = null;
   stompConnectionManager = new StompConnectionManager;
+  connectionLifecycle = Promise.resolve();
   replyToCri = null;
   requestRepliesObservable = null;
   requestRepliesSubject = null;
@@ -394,23 +396,32 @@ class EventBus {
   isConnected() {
     return this.stompConnectionManager.connected;
   }
-  async connect(connectionInfo) {
-    if (!this.stompConnectionManager.active) {
+  connect(connectionInfo) {
+    return this.serializeLifecycle(async () => {
+      if (!this.stompConnectionManager.active) {
+        this.cleanup();
+        const connectedInfo = await this.stompConnectionManager.activate(connectionInfo);
+        this.serverInfo = new ServerInfo;
+        this.serverInfo.host = connectionInfo.host;
+        this.serverInfo.port = connectionInfo.port;
+        this.serverInfo.useSSL = connectionInfo.useSSL;
+        this.replyToCri = this.stompConnectionManager.replyToCri;
+        return connectedInfo;
+      } else {
+        throw new Error("Event Bus connection already active");
+      }
+    });
+  }
+  disconnect(force) {
+    return this.serializeLifecycle(async () => {
+      await this.stompConnectionManager.deactivate(force);
       this.cleanup();
-      const connectedInfo = await this.stompConnectionManager.activate(connectionInfo);
-      this.serverInfo = new ServerInfo;
-      this.serverInfo.host = connectionInfo.host;
-      this.serverInfo.port = connectionInfo.port;
-      this.serverInfo.useSSL = connectionInfo.useSSL;
-      this.replyToCri = this.stompConnectionManager.replyToCri;
-      return connectedInfo;
-    } else {
-      throw new Error("Event Bus connection already active");
-    }
+    });
   }
-  async disconnect(force) {
-    await this.stompConnectionManager.deactivate(force);
-    this.cleanup();
+  serializeLifecycle(operation) {
+    const result = this.connectionLifecycle.then(operation);
+    this.connectionLifecycle = result.catch(() => {});
+    return result;
   }
   send(event) {
     if (this.stompConnectionManager.rxStomp) {
@@ -993,7 +1004,7 @@ var import_operators2 = require("rxjs/operators");
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.6.0",
+  version: "1.6.2",
   type: "module",
   files: [
     "dist"

package/dist/index.d.cts

@@ -1062,6 +1062,7 @@ declare class Event implements IEvent {
 declare class EventBus implements IEventBus {
 	serverInfo: ServerInfo | null;
 	private stompConnectionManager;
+	private connectionLifecycle;
 	private replyToCri;
 	private requestRepliesObservable;
 	private requestRepliesSubject;
@@ -1072,6 +1073,8 @@ declare class EventBus implements IEventBus {
 	isConnected(): boolean;
 	connect(connectionInfo: ConnectionInfo): Promise<ConnectedInfo>;
 	disconnect(force?: boolean): Promise<void>;
+	/** Runs connect and disconnect one at a time so they never overlap on the shared socket. */
+	private serializeLifecycle;
 	send(event: IEvent): void;
 	request(event: IEvent): Promise<IEvent>;
 	requestStream(event: IEvent, sendControlEvents?: boolean): Observable3<IEvent>;

package/dist/index.d.ts

@@ -1062,6 +1062,7 @@ declare class Event implements IEvent {
 declare class EventBus implements IEventBus {
 	serverInfo: ServerInfo | null;
 	private stompConnectionManager;
+	private connectionLifecycle;
 	private replyToCri;
 	private requestRepliesObservable;
 	private requestRepliesSubject;
@@ -1072,6 +1073,8 @@ declare class EventBus implements IEventBus {
 	isConnected(): boolean;
 	connect(connectionInfo: ConnectionInfo): Promise<ConnectedInfo>;
 	disconnect(force?: boolean): Promise<void>;
+	/** Runs connect and disconnect one at a time so they never overlap on the shared socket. */
+	private serializeLifecycle;
 	send(event: IEvent): void;
 	request(event: IEvent): Promise<IEvent>;
 	requestStream(event: IEvent, sendControlEvents?: boolean): Observable3<IEvent>;

package/dist/index.js

@@ -204,14 +204,17 @@ class StompConnectionManager {
     });
   }
   async deactivate(force) {
-    if (this.rxStomp) {
-      await this.rxStomp.deactivate({ force });
-      this.serverHeadersSubscription?.unsubscribe();
-      this.serverHeadersSubscription = null;
-      this.stompErrorsSubscription?.unsubscribe();
-      this.stompErrorsSubscription = null;
-      this.rxStomp = null;
-      this._replyToCri = null;
+    const rxStomp = this.rxStomp;
+    if (rxStomp) {
+      await rxStomp.deactivate({ force });
+      if (this.rxStomp === rxStomp) {
+        this.serverHeadersSubscription?.unsubscribe();
+        this.serverHeadersSubscription = null;
+        this.stompErrorsSubscription?.unsubscribe();
+        this.stompErrorsSubscription = null;
+        this.rxStomp = null;
+        this._replyToCri = null;
+      }
     }
     return;
   }
@@ -223,9 +226,7 @@ class StompConnectionManager {
     }
   }
   async signalFatal(err) {
-    if (console) {
-      console.error("StompConnectionManager fatal error, deactivating connection", err);
-    }
+    this.debugLogger("Fatal error, deactivating connection: %O", err);
     await this.deactivate();
     this.fatalErrorsSubject.next(err);
   }
@@ -276,6 +277,7 @@ class Event {
 class EventBus {
   serverInfo = null;
   stompConnectionManager = new StompConnectionManager;
+  connectionLifecycle = Promise.resolve();
   replyToCri = null;
   requestRepliesObservable = null;
   requestRepliesSubject = null;
@@ -296,23 +298,32 @@ class EventBus {
   isConnected() {
     return this.stompConnectionManager.connected;
   }
-  async connect(connectionInfo) {
-    if (!this.stompConnectionManager.active) {
+  connect(connectionInfo) {
+    return this.serializeLifecycle(async () => {
+      if (!this.stompConnectionManager.active) {
+        this.cleanup();
+        const connectedInfo = await this.stompConnectionManager.activate(connectionInfo);
+        this.serverInfo = new ServerInfo;
+        this.serverInfo.host = connectionInfo.host;
+        this.serverInfo.port = connectionInfo.port;
+        this.serverInfo.useSSL = connectionInfo.useSSL;
+        this.replyToCri = this.stompConnectionManager.replyToCri;
+        return connectedInfo;
+      } else {
+        throw new Error("Event Bus connection already active");
+      }
+    });
+  }
+  disconnect(force) {
+    return this.serializeLifecycle(async () => {
+      await this.stompConnectionManager.deactivate(force);
       this.cleanup();
-      const connectedInfo = await this.stompConnectionManager.activate(connectionInfo);
-      this.serverInfo = new ServerInfo;
-      this.serverInfo.host = connectionInfo.host;
-      this.serverInfo.port = connectionInfo.port;
-      this.serverInfo.useSSL = connectionInfo.useSSL;
-      this.replyToCri = this.stompConnectionManager.replyToCri;
-      return connectedInfo;
-    } else {
-      throw new Error("Event Bus connection already active");
-    }
+    });
   }
-  async disconnect(force) {
-    await this.stompConnectionManager.deactivate(force);
-    this.cleanup();
+  serializeLifecycle(operation) {
+    const result = this.connectionLifecycle.then(operation);
+    this.connectionLifecycle = result.catch(() => {});
+    return result;
   }
   send(event) {
     if (this.stompConnectionManager.rxStomp) {
@@ -898,7 +909,7 @@ import { first, map as map2 } from "rxjs/operators";
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.6.0",
+  version: "1.6.2",
   type: "module",
   files: [
     "dist"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kinotic-ai/core",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "type": "module",
   "files": [
     "dist"