@kinotic-ai/core 1.3.0 → 1.4.0

package/dist/index.cjs

@@ -80,7 +80,6 @@ __export(exports_src, {
   OffsetPageable: () => OffsetPageable,
   NullHandling: () => NullHandling,
   KinoticSingleton: () => KinoticSingleton,
-  KinoticError: () => KinoticError,
   Kinotic: () => Kinotic,
   JsonEventFactory: () => JsonEventFactory,
   FunctionalIterablePage: () => FunctionalIterablePage,
@@ -97,8 +96,6 @@ __export(exports_src, {
   ConnectionInfo: () => ConnectionInfo,
   ConnectedInfo: () => ConnectedInfo,
   CONTEXT_METADATA_KEY: () => CONTEXT_METADATA_KEY,
-  AuthorizationError: () => AuthorizationError,
-  AuthenticationError: () => AuthenticationError,
   AbstractIterablePage: () => AbstractIterablePage
 });
 module.exports = __toCommonJS(exports_src);
@@ -121,14 +118,6 @@ class ConnectionInfo extends ServerInfo {
   maxConnectionAttempts;
   sessionKeepAlive = "ACTIVITY" /* ACTIVITY */;
 }
-// packages/core/src/api/errors/KinoticError.ts
-class KinoticError extends Error {
-  constructor(message) {
-    super(message);
-    Object.setPrototypeOf(this, KinoticError.prototype);
-  }
-}
-
 // packages/core/src/api/event/IEventBus.ts
 var EventConstants;
 ((EventConstants2) => {
@@ -161,32 +150,38 @@ var EventConstants;
 var import_rx_stomp = require("@stomp/rx-stomp");
 var import_stompjs = require("@stomp/stompjs");
 var import_debug = __toESM(require("debug"));
+var import_rxjs = require("rxjs");
 var import_uuid = require("uuid");
 
 class StompConnectionManager {
   lastWebsocketError = null;
   maxConnectionAttemptsReached = false;
+  replyToCriChangedHandler = null;
   rxStomp = null;
   INITIAL_RECONNECT_DELAY = 2000;
-  MAX_RECONNECT_DELAY = 120000;
   JITTER_MAX = 5000;
+  MAX_RECONNECT_DELAY = 120000;
   connectionAttempts = 0;
-  initialConnectionSuccessful = false;
   debugLogger = import_debug.default("kinoitc:stomp");
+  fatalErrorsSubject = new import_rxjs.Subject;
+  _fatalErrors = this.fatalErrorsSubject.asObservable();
+  initialConnectionSuccessful = false;
+  serverHeadersSubscription = null;
+  stompErrorsSubscription = null;
   uuidv4 = import_uuid.v4();
   _replyToCri = null;
-  serverHeadersSubscription = null;
-  deactivationHandler = null;
-  replyToCriChangedHandler = null;
-  get active() {
-    return !!this.rxStomp;
-  }
   get replyToCri() {
     return this._replyToCri;
   }
+  get active() {
+    return !!this.rxStomp;
+  }
   get connected() {
     return this.rxStomp != null && this.rxStomp.connected();
   }
+  get fatalErrors() {
+    return this._fatalErrors;
+  }
   activate(connectionInfo) {
     return new Promise((resolve, reject) => {
       if (!connectionInfo) {
@@ -205,11 +200,10 @@ class StompConnectionManager {
       this.initialConnectionSuccessful = false;
       this.lastWebsocketError = null;
       this.maxConnectionAttemptsReached = false;
-      this._replyToCri = null;
-      this.serverHeadersSubscription?.unsubscribe();
-      this.serverHeadersSubscription = null;
       const url = "ws" + (connectionInfo.useSSL ? "s" : "") + "://" + connectionInfo.host + (connectionInfo.port ? ":" + connectionInfo.port : "") + "/v1";
       this.rxStomp = new import_rx_stomp.RxStomp;
+      let preparedSocket = null;
+      const userWebSocketFactory = connectionInfo.webSocketFactory;
       const stompConfig = {
         brokerURL: url,
         connectHeaders: {
@@ -218,23 +212,29 @@ class StompConnectionManager {
         heartbeatIncoming: 120000,
         heartbeatOutgoing: 30000,
         reconnectDelay: this.INITIAL_RECONNECT_DELAY,
-        webSocketFactory: connectionInfo.webSocketFactory,
+        maxReconnectDelay: this.MAX_RECONNECT_DELAY,
+        reconnectTimeMode: import_stompjs.ReconnectionTimeMode.EXPONENTIAL,
+        webSocketFactory: userWebSocketFactory ? () => preparedSocket : undefined,
         beforeConnect: async () => {
           if (connectionInfo?.maxConnectionAttempts) {
             this.connectionAttempts++;
             if (this.connectionAttempts > connectionInfo.maxConnectionAttempts) {
               this.maxConnectionAttemptsReached = true;
-              await this.deactivate();
-              if (!this.initialConnectionSuccessful) {
-                let message = this.lastWebsocketError?.message ? this.lastWebsocketError?.message : "UNKNOWN";
-                reject(`Max number of reconnection attempts reached. Last WS Error ${message}`);
-              }
+              await this.signalFatal(new Error("Max number of reconnection attempts reached", { cause: this.lastWebsocketError ?? undefined }));
+              return;
             } else {
               await this.connectionJitterDelay();
             }
           } else {
             await this.connectionJitterDelay();
           }
+          if (userWebSocketFactory) {
+            try {
+              preparedSocket = await userWebSocketFactory();
+            } catch (e) {
+              await this.signalFatal(new Error("WebSocket factory failed", { cause: e }));
+            }
+          }
         }
       };
       if (this.debugLogger.enabled) {
@@ -243,42 +243,44 @@ class StompConnectionManager {
         };
       }
       this.rxStomp.configure(stompConfig);
-      this.rxStomp.stompClient.maxReconnectDelay = this.MAX_RECONNECT_DELAY;
-      this.rxStomp.stompClient.reconnectTimeMode = import_stompjs.ReconnectionTimeMode.EXPONENTIAL;
       this.rxStomp.webSocketErrors$.subscribe((value) => {
         this.lastWebsocketError = value;
       });
+      this.stompErrorsSubscription = this.rxStomp.stompErrors$.subscribe(async (frame) => {
+        const stompError = new Error(frame.headers["message"], { cause: frame });
+        await this.signalFatal(new Error("STOMP connection error", { cause: stompError }));
+      });
       const connectedSubscription = this.rxStomp.connected$.subscribe(() => {
         connectedSubscription.unsubscribe();
+        initialFailureSubscription.unsubscribe();
         if (!this.initialConnectionSuccessful) {
           this.initialConnectionSuccessful = true;
         }
       });
-      const errorSubscription = this.rxStomp.stompErrors$.subscribe((value) => {
-        errorSubscription.unsubscribe();
-        const message = value.headers["message"];
-        this.rxStomp?.deactivate();
-        this.rxStomp = null;
-        reject(message);
+      const initialFailureSubscription = this.fatalErrorsSubject.subscribe((err) => {
+        connectedSubscription.unsubscribe();
+        initialFailureSubscription.unsubscribe();
+        reject(err.message);
       });
-      this.serverHeadersSubscription = this.rxStomp.serverHeaders$.subscribe((value) => {
+      this.serverHeadersSubscription = this.rxStomp.serverHeaders$.subscribe(async (value) => {
         const connectedInfoJson = value["connected-info" /* CONNECTED_INFO_HEADER */];
-        const firstConnect = this._replyToCri == null;
         if (connectedInfoJson == null) {
-          if (firstConnect) {
+          if (!this.initialConnectionSuccessful) {
+            await this.deactivate();
             reject("Server did not return proper data for successful login");
           }
           return;
         }
         const connectedInfo = JSON.parse(connectedInfoJson);
         if (connectedInfo.replyToId == null) {
-          if (firstConnect) {
+          if (!this.initialConnectionSuccessful) {
+            await this.deactivate();
             reject("Server did not return a replyToId for successful login");
           }
           return;
         }
         const newReplyToCri = "reply://" /* REPLY_DESTINATION_PREFIX */ + connectedInfo.replyToId + ":" + this.uuidv4 + "@kinoitc.js.EventBus/replyHandler";
-        if (firstConnect) {
+        if (!this.initialConnectionSuccessful) {
           this._replyToCri = newReplyToCri;
           resolve(connectedInfo);
         } else if (this._replyToCri !== newReplyToCri) {
@@ -294,10 +296,10 @@ class StompConnectionManager {
       await this.rxStomp.deactivate({ force });
       this.serverHeadersSubscription?.unsubscribe();
       this.serverHeadersSubscription = null;
-      if (this.deactivationHandler) {
-        this.deactivationHandler();
-      }
+      this.stompErrorsSubscription?.unsubscribe();
+      this.stompErrorsSubscription = null;
       this.rxStomp = null;
+      this._replyToCri = null;
     }
     return;
   }
@@ -308,11 +310,18 @@ class StompConnectionManager {
       return new Promise((resolve) => setTimeout(resolve, randomJitter));
     }
   }
+  async signalFatal(err) {
+    if (console) {
+      console.error("StompConnectionManager fatal error, deactivating connection", err);
+    }
+    await this.deactivate();
+    this.fatalErrorsSubject.next(err);
+  }
 }
 
 // packages/core/src/api/event/EventBus.ts
 var import_api = require("@opentelemetry/api");
-var import_rxjs = require("rxjs");
+var import_rxjs2 = require("rxjs");
 var import_operators = require("rxjs/operators");
 var import_typescript_optional = require("typescript-optional");
 var import_uuid2 = require("uuid");
@@ -353,32 +362,22 @@ class Event {
 }
 
 class EventBus {
-  fatalErrors;
   serverInfo = null;
   stompConnectionManager = new StompConnectionManager;
   replyToCri = null;
   requestRepliesObservable = null;
   requestRepliesSubject = null;
   requestRepliesSubscription = null;
-  errorSubject = new import_rxjs.Subject;
-  errorSubjectSubscription = null;
   constructor() {
-    this.fatalErrors = this.errorSubject.pipe(import_operators.map((frame) => {
-      this.disconnect().catch((error) => {
-        if (console) {
-          console.error("Error disconnecting from Stomp: " + error);
-        }
-      });
-      return new KinoticError(frame.headers["message"]);
-    }));
-    this.stompConnectionManager.deactivationHandler = () => {
-      this.cleanup();
-    };
+    this.stompConnectionManager.fatalErrors.subscribe(() => this.cleanup());
     this.stompConnectionManager.replyToCriChangedHandler = (replyToCri) => {
       this.replyToCri = replyToCri;
       this.resetRequestReplies("Reply destination changed");
     };
   }
+  get fatalErrors() {
+    return this.stompConnectionManager.fatalErrors;
+  }
   isConnectionActive() {
     return this.stompConnectionManager.active;
   }
@@ -394,7 +393,6 @@ class EventBus {
       this.serverInfo.port = connectionInfo.port;
       this.serverInfo.useSSL = connectionInfo.useSSL;
       this.replyToCri = this.stompConnectionManager.replyToCri;
-      this.errorSubjectSubscription = this.stompConnectionManager.rxStomp?.stompErrors$.subscribe(this.errorSubject);
       return connectedInfo;
     } else {
       throw new Error("Event Bus connection already active");
@@ -428,13 +426,13 @@ class EventBus {
     }
   }
   request(event) {
-    return import_rxjs.firstValueFrom(this.requestStream(event, false));
+    return import_rxjs2.firstValueFrom(this.requestStream(event, false));
   }
   requestStream(event, sendControlEvents = true) {
     if (this.stompConnectionManager?.rxStomp) {
-      return new import_rxjs.Observable((subscriber) => {
+      return new import_rxjs2.Observable((subscriber) => {
         if (this.requestRepliesObservable == null) {
-          this.requestRepliesSubject = new import_rxjs.Subject;
+          this.requestRepliesSubject = new import_rxjs2.Subject;
           this.requestRepliesObservable = this._observe(this.replyToCri).pipe(import_operators.multicast(this.requestRepliesSubject));
           this.requestRepliesSubscription = this.requestRepliesObservable.connect();
         }
@@ -479,7 +477,7 @@ class EventBus {
         };
       });
     } else {
-      return import_rxjs.throwError(() => this.createSendUnavailableError());
+      return import_rxjs2.throwError(() => this.createSendUnavailableError());
     }
   }
   listen(_serverInfo) {
@@ -490,10 +488,6 @@ class EventBus {
   }
   cleanup() {
     this.resetRequestReplies("Connection disconnected");
-    if (this.errorSubjectSubscription) {
-      this.errorSubjectSubscription.unsubscribe();
-      this.errorSubjectSubscription = null;
-    }
     this.serverInfo = null;
   }
   resetRequestReplies(reason) {
@@ -989,7 +983,7 @@ var import_operators2 = require("rxjs/operators");
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.3.0",
+  version: "1.4.0",
   type: "module",
   files: [
     "dist"
@@ -1467,20 +1461,6 @@ class Order {
 class Sort {
   orders = [];
 }
-// packages/core/src/api/errors/AuthenticationError.ts
-class AuthenticationError extends KinoticError {
-  constructor(message) {
-    super(message);
-    Object.setPrototypeOf(this, AuthenticationError.prototype);
-  }
-}
-// packages/core/src/api/errors/AuthorizationError.ts
-class AuthorizationError extends KinoticError {
-  constructor(message) {
-    super(message);
-    Object.setPrototypeOf(this, AuthorizationError.prototype);
-  }
-}
 // packages/core/src/api/security/ConnectedInfo.ts
 class ConnectedInfo {
   replyToId;

package/dist/index.d.cts

@@ -17,11 +17,12 @@ interface IWebSocket {
 /**
 * Factory invoked on every (re)connect to produce the WebSocket the STOMP
 * client will use. Supply this in Node when you need to set headers on the
-* upgrade request (for example, an Authorization header). Browser callers
-* normally leave this unset and rely on the session cookie established by a
-* prior REST login.
+* upgrade request (for example, an Authorization header). It may be async —
+* for example, to refresh a short-lived access token before each connect.
+* Browser callers normally leave this unset and rely on the session cookie
+* established by a prior REST login.
 */
-type WebSocketFactory = () => IWebSocket;
+type WebSocketFactory = () => IWebSocket | Promise<IWebSocket>;
 declare class ServerInfo {
 	host: string;
 	port?: number | null;
@@ -132,12 +133,6 @@ declare class ConnectedInfo {
 	participant: Participant;
 }
 /**
-* Base error class for all Kinoitc errors
-*/
-declare class KinoticError extends Error {
-	constructor(message: string);
-}
-/**
 * Part of the low level portion of kinoitc representing data to be processed
 *
 * This is similar to a Stomp Frame but with more required information and no control plane semantics.
@@ -204,7 +199,7 @@ interface IEventBus {
 	* Any errors emitted by this observable will be fatal and the connection will be closed.
 	* You will need to resolve the problem and reconnect.
 	*/
-	fatalErrors: Observable<KinoticError>;
+	fatalErrors: Observable<Error>;
 	/**
 	* The {@link ServerInfo} used when connecting, if connected or null
 	*/
@@ -1035,12 +1030,6 @@ declare class FunctionalIterablePage<T> extends AbstractIterablePage<T> {
 	constructor(pageable: Pageable, page: Page<T>, pageFunction: (pageable: Pageable) => Promise<Page<T>>);
 	protected findNext(pageable: Pageable): Promise<Page<T>>;
 }
-declare class AuthenticationError extends KinoticError {
-	constructor(message: string);
-}
-declare class AuthorizationError extends KinoticError {
-	constructor(message: string);
-}
 /**
 * Default implementation of the `CRI` interface.
 *
@@ -1093,16 +1082,14 @@ declare class Event implements IEvent {
 * Default implementation of {@link IEventBus}
 */
 declare class EventBus implements IEventBus {
-	fatalErrors: Observable3<Error>;
 	serverInfo: ServerInfo | null;
 	private stompConnectionManager;
 	private replyToCri;
 	private requestRepliesObservable;
 	private requestRepliesSubject;
 	private requestRepliesSubscription;
-	private errorSubject;
-	private errorSubjectSubscription;
 	constructor();
+	get fatalErrors(): Observable3<Error>;
 	isConnectionActive(): boolean;
 	isConnected(): boolean;
 	connect(connectionInfo: ConnectionInfo): Promise<ConnectedInfo>;
@@ -1143,4 +1130,4 @@ declare class ParticipantConstants {
 	static readonly PARTICIPANT_TYPE_NODE: string;
 	static readonly CLI_PARTICIPANT_ID: string;
 }
-export { createCRI, WebSocketFactory, Version, TextEventFactory, Sort, SessionKeepAliveMode, ServiceRegistry, ServiceContext, ServerInfo, Scope, Publish, ParticipantConstants, Participant, Pageable, Page, Order, OffsetPageable, NullHandling, KinoticSingleton, KinoticPlugin, KinoticError, Kinotic, JsonEventFactory, IterablePage, Identifiable, IWebSocket, IServiceRegistry, IServiceProxy, IParticipant, IKinotic, IEventFactory, IEventBus, IEvent, IEditableDataSource, IDataSource, ICrudServiceProxyFactory, ICrudServiceProxy, FunctionalIterablePage, EventConstants, EventBus, Event, Direction, DefaultCRI, DataSourceUtils, CursorPageable, CrudServiceProxyFactory, CrudServiceProxy, ContextInterceptor, Context, ConnectionInfo, ConnectedInfo, CRI, CONTEXT_METADATA_KEY, AuthorizationError, AuthenticationError, AbstractIterablePage };
+export { createCRI, WebSocketFactory, Version, TextEventFactory, Sort, SessionKeepAliveMode, ServiceRegistry, ServiceContext, ServerInfo, Scope, Publish, ParticipantConstants, Participant, Pageable, Page, Order, OffsetPageable, NullHandling, KinoticSingleton, KinoticPlugin, Kinotic, JsonEventFactory, IterablePage, Identifiable, IWebSocket, IServiceRegistry, IServiceProxy, IParticipant, IKinotic, IEventFactory, IEventBus, IEvent, IEditableDataSource, IDataSource, ICrudServiceProxyFactory, ICrudServiceProxy, FunctionalIterablePage, EventConstants, EventBus, Event, Direction, DefaultCRI, DataSourceUtils, CursorPageable, CrudServiceProxyFactory, CrudServiceProxy, ContextInterceptor, Context, ConnectionInfo, ConnectedInfo, CRI, CONTEXT_METADATA_KEY, AbstractIterablePage };

package/dist/index.d.ts

@@ -17,11 +17,12 @@ interface IWebSocket {
 /**
 * Factory invoked on every (re)connect to produce the WebSocket the STOMP
 * client will use. Supply this in Node when you need to set headers on the
-* upgrade request (for example, an Authorization header). Browser callers
-* normally leave this unset and rely on the session cookie established by a
-* prior REST login.
+* upgrade request (for example, an Authorization header). It may be async —
+* for example, to refresh a short-lived access token before each connect.
+* Browser callers normally leave this unset and rely on the session cookie
+* established by a prior REST login.
 */
-type WebSocketFactory = () => IWebSocket;
+type WebSocketFactory = () => IWebSocket | Promise<IWebSocket>;
 declare class ServerInfo {
 	host: string;
 	port?: number | null;
@@ -132,12 +133,6 @@ declare class ConnectedInfo {
 	participant: Participant;
 }
 /**
-* Base error class for all Kinoitc errors
-*/
-declare class KinoticError extends Error {
-	constructor(message: string);
-}
-/**
 * Part of the low level portion of kinoitc representing data to be processed
 *
 * This is similar to a Stomp Frame but with more required information and no control plane semantics.
@@ -204,7 +199,7 @@ interface IEventBus {
 	* Any errors emitted by this observable will be fatal and the connection will be closed.
 	* You will need to resolve the problem and reconnect.
 	*/
-	fatalErrors: Observable<KinoticError>;
+	fatalErrors: Observable<Error>;
 	/**
 	* The {@link ServerInfo} used when connecting, if connected or null
 	*/
@@ -1035,12 +1030,6 @@ declare class FunctionalIterablePage<T> extends AbstractIterablePage<T> {
 	constructor(pageable: Pageable, page: Page<T>, pageFunction: (pageable: Pageable) => Promise<Page<T>>);
 	protected findNext(pageable: Pageable): Promise<Page<T>>;
 }
-declare class AuthenticationError extends KinoticError {
-	constructor(message: string);
-}
-declare class AuthorizationError extends KinoticError {
-	constructor(message: string);
-}
 /**
 * Default implementation of the `CRI` interface.
 *
@@ -1093,16 +1082,14 @@ declare class Event implements IEvent {
 * Default implementation of {@link IEventBus}
 */
 declare class EventBus implements IEventBus {
-	fatalErrors: Observable3<Error>;
 	serverInfo: ServerInfo | null;
 	private stompConnectionManager;
 	private replyToCri;
 	private requestRepliesObservable;
 	private requestRepliesSubject;
 	private requestRepliesSubscription;
-	private errorSubject;
-	private errorSubjectSubscription;
 	constructor();
+	get fatalErrors(): Observable3<Error>;
 	isConnectionActive(): boolean;
 	isConnected(): boolean;
 	connect(connectionInfo: ConnectionInfo): Promise<ConnectedInfo>;
@@ -1143,4 +1130,4 @@ declare class ParticipantConstants {
 	static readonly PARTICIPANT_TYPE_NODE: string;
 	static readonly CLI_PARTICIPANT_ID: string;
 }
-export { createCRI, WebSocketFactory, Version, TextEventFactory, Sort, SessionKeepAliveMode, ServiceRegistry, ServiceContext, ServerInfo, Scope, Publish, ParticipantConstants, Participant, Pageable, Page, Order, OffsetPageable, NullHandling, KinoticSingleton, KinoticPlugin, KinoticError, Kinotic, JsonEventFactory, IterablePage, Identifiable, IWebSocket, IServiceRegistry, IServiceProxy, IParticipant, IKinotic, IEventFactory, IEventBus, IEvent, IEditableDataSource, IDataSource, ICrudServiceProxyFactory, ICrudServiceProxy, FunctionalIterablePage, EventConstants, EventBus, Event, Direction, DefaultCRI, DataSourceUtils, CursorPageable, CrudServiceProxyFactory, CrudServiceProxy, ContextInterceptor, Context, ConnectionInfo, ConnectedInfo, CRI, CONTEXT_METADATA_KEY, AuthorizationError, AuthenticationError, AbstractIterablePage };
+export { createCRI, WebSocketFactory, Version, TextEventFactory, Sort, SessionKeepAliveMode, ServiceRegistry, ServiceContext, ServerInfo, Scope, Publish, ParticipantConstants, Participant, Pageable, Page, Order, OffsetPageable, NullHandling, KinoticSingleton, KinoticPlugin, Kinotic, JsonEventFactory, IterablePage, Identifiable, IWebSocket, IServiceRegistry, IServiceProxy, IParticipant, IKinotic, IEventFactory, IEventBus, IEvent, IEditableDataSource, IDataSource, ICrudServiceProxyFactory, ICrudServiceProxy, FunctionalIterablePage, EventConstants, EventBus, Event, Direction, DefaultCRI, DataSourceUtils, CursorPageable, CrudServiceProxyFactory, CrudServiceProxy, ContextInterceptor, Context, ConnectionInfo, ConnectedInfo, CRI, CONTEXT_METADATA_KEY, AbstractIterablePage };

package/dist/index.js

@@ -19,14 +19,6 @@ class ConnectionInfo extends ServerInfo {
   maxConnectionAttempts;
   sessionKeepAlive = "ACTIVITY" /* ACTIVITY */;
 }
-// packages/core/src/api/errors/KinoticError.ts
-class KinoticError extends Error {
-  constructor(message) {
-    super(message);
-    Object.setPrototypeOf(this, KinoticError.prototype);
-  }
-}
-
 // packages/core/src/api/event/IEventBus.ts
 var EventConstants;
 ((EventConstants2) => {
@@ -59,32 +51,38 @@ var EventConstants;
 import { RxStomp } from "@stomp/rx-stomp";
 import { ReconnectionTimeMode } from "@stomp/stompjs";
 import debug from "debug";
+import { Subject } from "rxjs";
 import { v4 as uuidv4 } from "uuid";
 
 class StompConnectionManager {
   lastWebsocketError = null;
   maxConnectionAttemptsReached = false;
+  replyToCriChangedHandler = null;
   rxStomp = null;
   INITIAL_RECONNECT_DELAY = 2000;
-  MAX_RECONNECT_DELAY = 120000;
   JITTER_MAX = 5000;
+  MAX_RECONNECT_DELAY = 120000;
   connectionAttempts = 0;
-  initialConnectionSuccessful = false;
   debugLogger = debug("kinoitc:stomp");
+  fatalErrorsSubject = new Subject;
+  _fatalErrors = this.fatalErrorsSubject.asObservable();
+  initialConnectionSuccessful = false;
+  serverHeadersSubscription = null;
+  stompErrorsSubscription = null;
   uuidv4 = uuidv4();
   _replyToCri = null;
-  serverHeadersSubscription = null;
-  deactivationHandler = null;
-  replyToCriChangedHandler = null;
-  get active() {
-    return !!this.rxStomp;
-  }
   get replyToCri() {
     return this._replyToCri;
   }
+  get active() {
+    return !!this.rxStomp;
+  }
   get connected() {
     return this.rxStomp != null && this.rxStomp.connected();
   }
+  get fatalErrors() {
+    return this._fatalErrors;
+  }
   activate(connectionInfo) {
     return new Promise((resolve, reject) => {
       if (!connectionInfo) {
@@ -103,11 +101,10 @@ class StompConnectionManager {
       this.initialConnectionSuccessful = false;
       this.lastWebsocketError = null;
       this.maxConnectionAttemptsReached = false;
-      this._replyToCri = null;
-      this.serverHeadersSubscription?.unsubscribe();
-      this.serverHeadersSubscription = null;
       const url = "ws" + (connectionInfo.useSSL ? "s" : "") + "://" + connectionInfo.host + (connectionInfo.port ? ":" + connectionInfo.port : "") + "/v1";
       this.rxStomp = new RxStomp;
+      let preparedSocket = null;
+      const userWebSocketFactory = connectionInfo.webSocketFactory;
       const stompConfig = {
         brokerURL: url,
         connectHeaders: {
@@ -116,23 +113,29 @@ class StompConnectionManager {
         heartbeatIncoming: 120000,
         heartbeatOutgoing: 30000,
         reconnectDelay: this.INITIAL_RECONNECT_DELAY,
-        webSocketFactory: connectionInfo.webSocketFactory,
+        maxReconnectDelay: this.MAX_RECONNECT_DELAY,
+        reconnectTimeMode: ReconnectionTimeMode.EXPONENTIAL,
+        webSocketFactory: userWebSocketFactory ? () => preparedSocket : undefined,
         beforeConnect: async () => {
           if (connectionInfo?.maxConnectionAttempts) {
             this.connectionAttempts++;
             if (this.connectionAttempts > connectionInfo.maxConnectionAttempts) {
               this.maxConnectionAttemptsReached = true;
-              await this.deactivate();
-              if (!this.initialConnectionSuccessful) {
-                let message = this.lastWebsocketError?.message ? this.lastWebsocketError?.message : "UNKNOWN";
-                reject(`Max number of reconnection attempts reached. Last WS Error ${message}`);
-              }
+              await this.signalFatal(new Error("Max number of reconnection attempts reached", { cause: this.lastWebsocketError ?? undefined }));
+              return;
             } else {
               await this.connectionJitterDelay();
             }
           } else {
             await this.connectionJitterDelay();
           }
+          if (userWebSocketFactory) {
+            try {
+              preparedSocket = await userWebSocketFactory();
+            } catch (e) {
+              await this.signalFatal(new Error("WebSocket factory failed", { cause: e }));
+            }
+          }
         }
       };
       if (this.debugLogger.enabled) {
@@ -141,42 +144,44 @@ class StompConnectionManager {
         };
       }
       this.rxStomp.configure(stompConfig);
-      this.rxStomp.stompClient.maxReconnectDelay = this.MAX_RECONNECT_DELAY;
-      this.rxStomp.stompClient.reconnectTimeMode = ReconnectionTimeMode.EXPONENTIAL;
       this.rxStomp.webSocketErrors$.subscribe((value) => {
         this.lastWebsocketError = value;
       });
+      this.stompErrorsSubscription = this.rxStomp.stompErrors$.subscribe(async (frame) => {
+        const stompError = new Error(frame.headers["message"], { cause: frame });
+        await this.signalFatal(new Error("STOMP connection error", { cause: stompError }));
+      });
       const connectedSubscription = this.rxStomp.connected$.subscribe(() => {
         connectedSubscription.unsubscribe();
+        initialFailureSubscription.unsubscribe();
         if (!this.initialConnectionSuccessful) {
           this.initialConnectionSuccessful = true;
         }
       });
-      const errorSubscription = this.rxStomp.stompErrors$.subscribe((value) => {
-        errorSubscription.unsubscribe();
-        const message = value.headers["message"];
-        this.rxStomp?.deactivate();
-        this.rxStomp = null;
-        reject(message);
+      const initialFailureSubscription = this.fatalErrorsSubject.subscribe((err) => {
+        connectedSubscription.unsubscribe();
+        initialFailureSubscription.unsubscribe();
+        reject(err.message);
       });
-      this.serverHeadersSubscription = this.rxStomp.serverHeaders$.subscribe((value) => {
+      this.serverHeadersSubscription = this.rxStomp.serverHeaders$.subscribe(async (value) => {
         const connectedInfoJson = value["connected-info" /* CONNECTED_INFO_HEADER */];
-        const firstConnect = this._replyToCri == null;
         if (connectedInfoJson == null) {
-          if (firstConnect) {
+          if (!this.initialConnectionSuccessful) {
+            await this.deactivate();
             reject("Server did not return proper data for successful login");
           }
           return;
         }
         const connectedInfo = JSON.parse(connectedInfoJson);
         if (connectedInfo.replyToId == null) {
-          if (firstConnect) {
+          if (!this.initialConnectionSuccessful) {
+            await this.deactivate();
             reject("Server did not return a replyToId for successful login");
           }
           return;
         }
         const newReplyToCri = "reply://" /* REPLY_DESTINATION_PREFIX */ + connectedInfo.replyToId + ":" + this.uuidv4 + "@kinoitc.js.EventBus/replyHandler";
-        if (firstConnect) {
+        if (!this.initialConnectionSuccessful) {
           this._replyToCri = newReplyToCri;
           resolve(connectedInfo);
         } else if (this._replyToCri !== newReplyToCri) {
@@ -192,10 +197,10 @@ class StompConnectionManager {
       await this.rxStomp.deactivate({ force });
       this.serverHeadersSubscription?.unsubscribe();
       this.serverHeadersSubscription = null;
-      if (this.deactivationHandler) {
-        this.deactivationHandler();
-      }
+      this.stompErrorsSubscription?.unsubscribe();
+      this.stompErrorsSubscription = null;
       this.rxStomp = null;
+      this._replyToCri = null;
     }
     return;
   }
@@ -206,11 +211,18 @@ class StompConnectionManager {
       return new Promise((resolve) => setTimeout(resolve, randomJitter));
     }
   }
+  async signalFatal(err) {
+    if (console) {
+      console.error("StompConnectionManager fatal error, deactivating connection", err);
+    }
+    await this.deactivate();
+    this.fatalErrorsSubject.next(err);
+  }
 }
 
 // packages/core/src/api/event/EventBus.ts
 import { context, propagation } from "@opentelemetry/api";
-import { firstValueFrom, Observable, Subject, throwError } from "rxjs";
+import { firstValueFrom, Observable as Observable2, Subject as Subject2, throwError } from "rxjs";
 import { filter, map, multicast } from "rxjs/operators";
 import { Optional } from "typescript-optional";
 import { v4 as uuidv42 } from "uuid";
@@ -251,32 +263,22 @@ class Event {
 }
 
 class EventBus {
-  fatalErrors;
   serverInfo = null;
   stompConnectionManager = new StompConnectionManager;
   replyToCri = null;
   requestRepliesObservable = null;
   requestRepliesSubject = null;
   requestRepliesSubscription = null;
-  errorSubject = new Subject;
-  errorSubjectSubscription = null;
   constructor() {
-    this.fatalErrors = this.errorSubject.pipe(map((frame) => {
-      this.disconnect().catch((error) => {
-        if (console) {
-          console.error("Error disconnecting from Stomp: " + error);
-        }
-      });
-      return new KinoticError(frame.headers["message"]);
-    }));
-    this.stompConnectionManager.deactivationHandler = () => {
-      this.cleanup();
-    };
+    this.stompConnectionManager.fatalErrors.subscribe(() => this.cleanup());
     this.stompConnectionManager.replyToCriChangedHandler = (replyToCri) => {
       this.replyToCri = replyToCri;
       this.resetRequestReplies("Reply destination changed");
     };
   }
+  get fatalErrors() {
+    return this.stompConnectionManager.fatalErrors;
+  }
   isConnectionActive() {
     return this.stompConnectionManager.active;
   }
@@ -292,7 +294,6 @@ class EventBus {
       this.serverInfo.port = connectionInfo.port;
       this.serverInfo.useSSL = connectionInfo.useSSL;
       this.replyToCri = this.stompConnectionManager.replyToCri;
-      this.errorSubjectSubscription = this.stompConnectionManager.rxStomp?.stompErrors$.subscribe(this.errorSubject);
       return connectedInfo;
     } else {
       throw new Error("Event Bus connection already active");
@@ -330,9 +331,9 @@ class EventBus {
   }
   requestStream(event, sendControlEvents = true) {
     if (this.stompConnectionManager?.rxStomp) {
-      return new Observable((subscriber) => {
+      return new Observable2((subscriber) => {
         if (this.requestRepliesObservable == null) {
-          this.requestRepliesSubject = new Subject;
+          this.requestRepliesSubject = new Subject2;
           this.requestRepliesObservable = this._observe(this.replyToCri).pipe(multicast(this.requestRepliesSubject));
           this.requestRepliesSubscription = this.requestRepliesObservable.connect();
         }
@@ -388,10 +389,6 @@ class EventBus {
   }
   cleanup() {
     this.resetRequestReplies("Connection disconnected");
-    if (this.errorSubjectSubscription) {
-      this.errorSubjectSubscription.unsubscribe();
-      this.errorSubjectSubscription = null;
-    }
     this.serverInfo = null;
   }
   resetRequestReplies(reason) {
@@ -890,7 +887,7 @@ import { first, map as map2 } from "rxjs/operators";
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.3.0",
+  version: "1.4.0",
   type: "module",
   files: [
     "dist"
@@ -1368,20 +1365,6 @@ class Order {
 class Sort {
   orders = [];
 }
-// packages/core/src/api/errors/AuthenticationError.ts
-class AuthenticationError extends KinoticError {
-  constructor(message) {
-    super(message);
-    Object.setPrototypeOf(this, AuthenticationError.prototype);
-  }
-}
-// packages/core/src/api/errors/AuthorizationError.ts
-class AuthorizationError extends KinoticError {
-  constructor(message) {
-    super(message);
-    Object.setPrototypeOf(this, AuthorizationError.prototype);
-  }
-}
 // packages/core/src/api/security/ConnectedInfo.ts
 class ConnectedInfo {
   replyToId;
@@ -1430,7 +1413,6 @@ export {
   OffsetPageable,
   NullHandling,
   KinoticSingleton,
-  KinoticError,
   Kinotic,
   JsonEventFactory,
   FunctionalIterablePage,
@@ -1447,7 +1429,5 @@ export {
   ConnectionInfo,
   ConnectedInfo,
   CONTEXT_METADATA_KEY,
-  AuthorizationError,
-  AuthenticationError,
   AbstractIterablePage
 };

package/package.json

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