@kinotic-ai/core 1.2.2 → 1.3.1

package/dist/index.cjs

@@ -68,6 +68,7 @@ __export(exports_src, {
   Version: () => Version,
   TextEventFactory: () => TextEventFactory,
   Sort: () => Sort,
+  SessionKeepAliveMode: () => SessionKeepAliveMode,
   ServiceRegistry: () => ServiceRegistry,
   ServerInfo: () => ServerInfo,
   Scope: () => Scope,
@@ -95,7 +96,6 @@ __export(exports_src, {
   Context: () => Context,
   ConnectionInfo: () => ConnectionInfo,
   ConnectedInfo: () => ConnectedInfo,
-  ConnectHeaders: () => ConnectHeaders,
   CONTEXT_METADATA_KEY: () => CONTEXT_METADATA_KEY,
   AuthorizationError: () => AuthorizationError,
   AuthenticationError: () => AuthenticationError,
@@ -104,19 +104,22 @@ __export(exports_src, {
 module.exports = __toCommonJS(exports_src);
 
 // packages/core/src/api/ConnectionInfo.ts
-class ConnectHeaders {
-}
-
 class ServerInfo {
   host;
   port;
   useSSL;
 }
+var SessionKeepAliveMode;
+((SessionKeepAliveMode2) => {
+  SessionKeepAliveMode2["NONE"] = "NONE";
+  SessionKeepAliveMode2["ACTIVITY"] = "ACTIVITY";
+  SessionKeepAliveMode2["CONNECTION"] = "CONNECTION";
+})(SessionKeepAliveMode ||= {});
 
 class ConnectionInfo extends ServerInfo {
-  connectHeaders;
+  webSocketFactory;
   maxConnectionAttempts;
-  disableStickySession;
+  sessionKeepAlive = "ACTIVITY" /* ACTIVITY */;
 }
 // packages/core/src/api/errors/KinoticError.ts
 class KinoticError extends Error {
@@ -132,10 +135,8 @@ var EventConstants;
   EventConstants2["CONTENT_TYPE_HEADER"] = "content-type";
   EventConstants2["CONTENT_LENGTH_HEADER"] = "content-length";
   EventConstants2["REPLY_TO_HEADER"] = "reply-to";
-  EventConstants2["REPLY_TO_ID_HEADER"] = "reply-to-id";
-  EventConstants2["SESSION_HEADER"] = "session";
   EventConstants2["CONNECTED_INFO_HEADER"] = "connected-info";
-  EventConstants2["DISABLE_STICKY_SESSION_HEADER"] = "disable-sticky-session";
+  EventConstants2["SESSION_KEEP_ALIVE_HEADER"] = "session-keep-alive";
   EventConstants2["CORRELATION_ID_HEADER"] = "__correlation-id";
   EventConstants2["ERROR_HEADER"] = "error";
   EventConstants2["COMPLETE_HEADER"] = "complete";
@@ -148,6 +149,8 @@ var EventConstants;
   EventConstants2["SERVICE_DESTINATION_SCHEME"] = "srv";
   EventConstants2["STREAM_DESTINATION_PREFIX"] = "stream://";
   EventConstants2["STREAM_DESTINATION_SCHEME"] = "stream";
+  EventConstants2["REPLY_DESTINATION_PREFIX"] = "reply://";
+  EventConstants2["REPLY_DESTINATION_SCHEME"] = "reply";
   EventConstants2["CONTENT_JSON"] = "application/json";
   EventConstants2["CONTENT_TEXT"] = "text/plain";
   EventConstants2["TRACEPARENT_HEADER"] = "traceparent";
@@ -157,8 +160,8 @@ var EventConstants;
 // packages/core/src/internal/api/event/StompConnectionManager.ts
 var import_rx_stomp = require("@stomp/rx-stomp");
 var import_stompjs = require("@stomp/stompjs");
-var import_uuid = require("uuid");
 var import_debug = __toESM(require("debug"));
+var import_uuid = require("uuid");
 
 class StompConnectionManager {
   lastWebsocketError = null;
@@ -171,9 +174,10 @@ class StompConnectionManager {
   initialConnectionSuccessful = false;
   debugLogger = import_debug.default("kinoitc:stomp");
   uuidv4 = import_uuid.v4();
-  replyToId = import_uuid.v4();
-  _replyToCri = "srv://" /* SERVICE_DESTINATION_PREFIX */ + this.replyToId + ":" + this.uuidv4 + "@kinoitc.js.EventBus/replyHandler";
+  _replyToCri = null;
+  serverHeadersSubscription = null;
   deactivationHandler = null;
+  replyToCriChangedHandler = null;
   get active() {
     return !!this.rxStomp;
   }
@@ -201,31 +205,23 @@ 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 connectHeadersInternal = typeof connectionInfo.connectHeaders !== "function" && connectionInfo.connectHeaders != null ? connectionInfo.connectHeaders : {};
+      let preparedSocket = null;
+      const userWebSocketFactory = connectionInfo.webSocketFactory;
       const stompConfig = {
         brokerURL: url,
-        connectHeaders: connectHeadersInternal,
+        connectHeaders: {
+          ["session-keep-alive" /* SESSION_KEEP_ALIVE_HEADER */]: connectionInfo.sessionKeepAlive
+        },
         heartbeatIncoming: 120000,
         heartbeatOutgoing: 30000,
         reconnectDelay: this.INITIAL_RECONNECT_DELAY,
+        webSocketFactory: userWebSocketFactory ? () => preparedSocket : undefined,
         beforeConnect: async () => {
-          if (typeof connectionInfo.connectHeaders === "function") {
-            const headers = await connectionInfo.connectHeaders();
-            for (const key in headers) {
-              connectHeadersInternal[key] = headers[key];
-            }
-          }
-          if (connectionInfo.disableStickySession) {
-            connectHeadersInternal["disable-sticky-session" /* DISABLE_STICKY_SESSION_HEADER */] = "true";
-          }
-          if (connectHeadersInternal["reply-to-id" /* REPLY_TO_ID_HEADER */]) {
-            this.replyToId = connectHeadersInternal["reply-to-id" /* REPLY_TO_ID_HEADER */];
-            this._replyToCri = "srv://" /* SERVICE_DESTINATION_PREFIX */ + this.replyToId + ":" + this.uuidv4 + "@kinoitc.js.EventBus/replyHandler";
-          } else {
-            connectHeadersInternal["reply-to-id" /* REPLY_TO_ID_HEADER */] = this.replyToId;
-          }
           if (connectionInfo?.maxConnectionAttempts) {
             this.connectionAttempts++;
             if (this.connectionAttempts > connectionInfo.maxConnectionAttempts) {
@@ -235,12 +231,23 @@ class StompConnectionManager {
                 let message = this.lastWebsocketError?.message ? this.lastWebsocketError?.message : "UNKNOWN";
                 reject(`Max number of reconnection attempts reached. Last WS Error ${message}`);
               }
+              return;
             } else {
               await this.connectionJitterDelay();
             }
           } else {
             await this.connectionJitterDelay();
           }
+          if (userWebSocketFactory) {
+            try {
+              preparedSocket = await userWebSocketFactory();
+            } catch (e) {
+              await this.deactivate();
+              if (!this.initialConnectionSuccessful) {
+                reject(e);
+              }
+            }
+          }
         }
       };
       if (this.debugLogger.enabled) {
@@ -267,36 +274,29 @@ class StompConnectionManager {
         this.rxStomp = null;
         reject(message);
       });
-      const serverHeadersSubscription = this.rxStomp.serverHeaders$.subscribe((value) => {
-        let connectedInfoJson = value["connected-info" /* CONNECTED_INFO_HEADER */];
-        if (connectedInfoJson != null) {
-          const connectedInfo = JSON.parse(connectedInfoJson);
-          if (!connectionInfo.disableStickySession) {
-            serverHeadersSubscription.unsubscribe();
-            if (connectedInfo.sessionId != null && connectedInfo.replyToId != null) {
-              if (connectionInfo.connectHeaders != null) {
-                for (let key in connectHeadersInternal) {
-                  delete connectHeadersInternal[key];
-                }
-              }
-              connectHeadersInternal["session" /* SESSION_HEADER */] = connectedInfo.sessionId;
-              resolve(connectedInfo);
-            } else {
-              reject("Server did not return proper data for successful login");
-            }
-          } else if (typeof connectionInfo.connectHeaders === "function") {
-            for (let key in connectHeadersInternal) {
-              delete connectHeadersInternal[key];
-            }
-            if (!this.initialConnectionSuccessful) {
-              resolve(connectedInfo);
-            }
-          } else if (typeof connectionInfo.connectHeaders === "object") {
-            serverHeadersSubscription.unsubscribe();
-            resolve(connectedInfo);
+      this.serverHeadersSubscription = this.rxStomp.serverHeaders$.subscribe((value) => {
+        const connectedInfoJson = value["connected-info" /* CONNECTED_INFO_HEADER */];
+        const firstConnect = this._replyToCri == null;
+        if (connectedInfoJson == null) {
+          if (firstConnect) {
+            reject("Server did not return proper data for successful login");
           }
-        } else {
-          reject("Server did not return proper data for successful login");
+          return;
+        }
+        const connectedInfo = JSON.parse(connectedInfoJson);
+        if (connectedInfo.replyToId == null) {
+          if (firstConnect) {
+            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) {
+          this._replyToCri = newReplyToCri;
+          resolve(connectedInfo);
+        } else if (this._replyToCri !== newReplyToCri) {
+          this._replyToCri = newReplyToCri;
+          this.replyToCriChangedHandler?.(newReplyToCri);
         }
       });
       this.rxStomp.activate();
@@ -305,6 +305,8 @@ class StompConnectionManager {
   async deactivate(force) {
     if (this.rxStomp) {
       await this.rxStomp.deactivate({ force });
+      this.serverHeadersSubscription?.unsubscribe();
+      this.serverHeadersSubscription = null;
       if (this.deactivationHandler) {
         this.deactivationHandler();
       }
@@ -385,6 +387,10 @@ class EventBus {
     this.stompConnectionManager.deactivationHandler = () => {
       this.cleanup();
     };
+    this.stompConnectionManager.replyToCriChangedHandler = (replyToCri) => {
+      this.replyToCri = replyToCri;
+      this.resetRequestReplies("Reply destination changed");
+    };
   }
   isConnectionActive() {
     return this.stompConnectionManager.active;
@@ -452,7 +458,7 @@ class EventBus {
         })).subscribe({
           next(value) {
             if (value.hasHeader("control" /* CONTROL_HEADER */)) {
-              if (value.headers.get("control" /* CONTROL_HEADER */) === "complete") {
+              if (value.headers.get("control" /* CONTROL_HEADER */) === "complete" /* CONTROL_VALUE_COMPLETE */) {
                 serverSignaledCompletion = true;
                 subscriber.complete();
               } else {
@@ -496,8 +502,16 @@ class EventBus {
     return this._observe(cri);
   }
   cleanup() {
+    this.resetRequestReplies("Connection disconnected");
+    if (this.errorSubjectSubscription) {
+      this.errorSubjectSubscription.unsubscribe();
+      this.errorSubjectSubscription = null;
+    }
+    this.serverInfo = null;
+  }
+  resetRequestReplies(reason) {
     if (this.requestRepliesSubject != null) {
-      this.requestRepliesSubject.error(new Error("Connection disconnected"));
+      this.requestRepliesSubject.error(new Error(reason));
       if (this.requestRepliesSubscription != null) {
         this.requestRepliesSubscription.unsubscribe();
         this.requestRepliesSubscription = null;
@@ -505,11 +519,6 @@ class EventBus {
       this.requestRepliesSubject = null;
       this.requestRepliesObservable = null;
     }
-    if (this.errorSubjectSubscription) {
-      this.errorSubjectSubscription.unsubscribe();
-      this.errorSubjectSubscription = null;
-    }
-    this.serverInfo = null;
   }
   createSendUnavailableError() {
     let ret = "You must call connect on the event bus before sending any request";
@@ -993,7 +1002,7 @@ var import_operators2 = require("rxjs/operators");
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.2.2",
+  version: "1.3.1",
   type: "module",
   files: [
     "dist"
@@ -1487,7 +1496,6 @@ class AuthorizationError extends KinoticError {
 }
 // packages/core/src/api/security/ConnectedInfo.ts
 class ConnectedInfo {
-  sessionId;
   replyToId;
   participant;
 }

package/dist/index.d.cts

@@ -1,26 +1,54 @@
 /**
-* ConnectHeaders to use during connection to the kinoitc server
-* These headers will be sent as part of the STOMP CONNECT frame
-* This is typically used for authentication information, but any data can be sent
+* Structural shape of a WebSocket used by the underlying STOMP client.
+* Copied from the WebSocket interface to avoid pulling in the DOM typelib,
+* so this type stays usable in Node environments where `lib: dom` is not set.
 */
-declare class ConnectHeaders {
-	[key: string]: string;
+interface IWebSocket {
+	url: string;
+	binaryType?: string;
+	readyState: number;
+	onopen: ((ev?: any) => any) | undefined | null;
+	onclose: ((ev?: any) => any) | undefined | null;
+	onerror: ((ev: any) => any) | undefined | null;
+	onmessage: ((ev: any) => any) | undefined | null;
+	close(code?: number, reason?: string): void;
+	send(data: string | ArrayBuffer): void;
 }
+/**
+* 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). 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 | Promise<IWebSocket>;
 declare class ServerInfo {
 	host: string;
 	port?: number | null;
 	useSSL?: boolean | null;
 }
+declare enum SessionKeepAliveMode {
+	NONE = "NONE",
+	ACTIVITY = "ACTIVITY",
+	CONNECTION = "CONNECTION"
+}
 /**
-* ConnectionInfo provides the information needed to connect to the kinoitc server
+* ConnectionInfo provides the information needed to connect to the kinoitc server.
+*
+* Authentication is performed during the WebSocket upgrade (handshake), not in
+* the STOMP CONNECT frame. In the browser, log in via the REST endpoints first
+* and the established session cookie will be used. In Node, supply a
+* {@link WebSocketFactory} that attaches the required upgrade headers.
 */
 declare class ConnectionInfo extends ServerInfo {
 	/**
-	* The headers to send during the connection to the kinoitc server.
-	* If a function is provided, it will be called to get the headers each time the connection is established.
-	* This is useful for providing dynamic headers, such as a JWT token that expires.
+	* Optional factory used to create the underlying WebSocket. Use this in
+	* Node to attach custom headers (such as Authorization) to the upgrade
+	* request. If omitted, a default WebSocket is created and authentication
+	* is expected to come from the session cookie.
 	*/
-	connectHeaders?: ConnectHeaders | (() => Promise<ConnectHeaders>);
+	webSocketFactory?: WebSocketFactory;
 	/**
 	* The maximum number of connection attempts to make during the {@link IEventBus} initial connection request.
 	* If the limit is reached the {@link IEventBus} will return an error to the caller of {@link IEventBus#connect}
@@ -28,10 +56,11 @@ declare class ConnectionInfo extends ServerInfo {
 	*/
 	maxConnectionAttempts?: number | null;
 	/**
-	* If true, the session will not be kept alive after the connection is established and then disrupted.
-	* If false, the session will be kept alive after the connection is established and then disrupted, for a period of time.
+	* Controls whether session expiration is extended by gateway activity or by an active websocket connection.
+	* Defaults to {@link SessionKeepAliveMode.ACTIVITY}.
+	* Use {@link SessionKeepAliveMode.NONE} to remove the session when the websocket connection closes.
 	*/
-	disableStickySession?: boolean | null;
+	sessionKeepAlive: SessionKeepAliveMode;
 }
 import { Optional } from "typescript-optional";
 import { Observable } from "rxjs";
@@ -100,7 +129,6 @@ declare class Participant implements IParticipant {
 * Contains information about the connection that was established
 */
 declare class ConnectedInfo {
-	sessionId: string;
 	replyToId: string;
 	participant: Participant;
 }
@@ -253,22 +281,13 @@ declare enum EventConstants {
 	CONTENT_LENGTH_HEADER = "content-length",
 	REPLY_TO_HEADER = "reply-to",
 	/**
-	* This is the replyToId that will be supplied by the client, which will be used when sending replies to the client.
-	*/
-	REPLY_TO_ID_HEADER = "reply-to-id",
-	/**
-	* Header provided by the sever on connection to represent the user's session id
-	*/
-	SESSION_HEADER = "session",
-	/**
 	* Header provided by the server on connection to provide the {@link ConnectionInfo} as a JSON string
 	*/
 	CONNECTED_INFO_HEADER = "connected-info",
 	/**
-	* Header provided by the client on connection request to represent that the server
-	* should not keep the session alive after any network disconnection.
+	* Header provided by the client on connection request to choose how the session is kept alive.
 	*/
-	DISABLE_STICKY_SESSION_HEADER = "disable-sticky-session",
+	SESSION_KEEP_ALIVE_HEADER = "session-keep-alive",
 	/**
 	* Correlates a response with a given request
 	* Headers that start with __ will always be persisted between messages
@@ -297,6 +316,8 @@ declare enum EventConstants {
 	SERVICE_DESTINATION_SCHEME = "srv",
 	STREAM_DESTINATION_PREFIX = "stream://",
 	STREAM_DESTINATION_SCHEME = "stream",
+	REPLY_DESTINATION_PREFIX = "reply://",
+	REPLY_DESTINATION_SCHEME = "reply",
 	CONTENT_JSON = "application/json",
 	CONTENT_TEXT = "text/plain",
 	/**
@@ -1094,6 +1115,12 @@ declare class EventBus implements IEventBus {
 	observe(cri: string): Observable3<IEvent>;
 	private cleanup;
 	/**
+	* Tears down the shared request-replies stream so the next request rebuilds it against the
+	* current {@link replyToCri}. Any in-flight requests are failed with the given reason since
+	* their replies can no longer be delivered.
+	*/
+	private resetRequestReplies;
+	/**
 	* Creates the proper error to return if this.stompConnectionManager?.rxStomp is not available on a send request
 	*/
 	private createSendUnavailableError;
@@ -1117,4 +1144,4 @@ declare class ParticipantConstants {
 	static readonly PARTICIPANT_TYPE_NODE: string;
 	static readonly CLI_PARTICIPANT_ID: string;
 }
-export { createCRI, Version, TextEventFactory, Sort, ServiceRegistry, ServiceContext, ServerInfo, Scope, Publish, ParticipantConstants, Participant, Pageable, Page, Order, OffsetPageable, NullHandling, KinoticSingleton, KinoticPlugin, KinoticError, Kinotic, JsonEventFactory, IterablePage, Identifiable, 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, ConnectHeaders, 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, 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 };

package/dist/index.d.ts

@@ -1,26 +1,54 @@
 /**
-* ConnectHeaders to use during connection to the kinoitc server
-* These headers will be sent as part of the STOMP CONNECT frame
-* This is typically used for authentication information, but any data can be sent
+* Structural shape of a WebSocket used by the underlying STOMP client.
+* Copied from the WebSocket interface to avoid pulling in the DOM typelib,
+* so this type stays usable in Node environments where `lib: dom` is not set.
 */
-declare class ConnectHeaders {
-	[key: string]: string;
+interface IWebSocket {
+	url: string;
+	binaryType?: string;
+	readyState: number;
+	onopen: ((ev?: any) => any) | undefined | null;
+	onclose: ((ev?: any) => any) | undefined | null;
+	onerror: ((ev: any) => any) | undefined | null;
+	onmessage: ((ev: any) => any) | undefined | null;
+	close(code?: number, reason?: string): void;
+	send(data: string | ArrayBuffer): void;
 }
+/**
+* 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). 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 | Promise<IWebSocket>;
 declare class ServerInfo {
 	host: string;
 	port?: number | null;
 	useSSL?: boolean | null;
 }
+declare enum SessionKeepAliveMode {
+	NONE = "NONE",
+	ACTIVITY = "ACTIVITY",
+	CONNECTION = "CONNECTION"
+}
 /**
-* ConnectionInfo provides the information needed to connect to the kinoitc server
+* ConnectionInfo provides the information needed to connect to the kinoitc server.
+*
+* Authentication is performed during the WebSocket upgrade (handshake), not in
+* the STOMP CONNECT frame. In the browser, log in via the REST endpoints first
+* and the established session cookie will be used. In Node, supply a
+* {@link WebSocketFactory} that attaches the required upgrade headers.
 */
 declare class ConnectionInfo extends ServerInfo {
 	/**
-	* The headers to send during the connection to the kinoitc server.
-	* If a function is provided, it will be called to get the headers each time the connection is established.
-	* This is useful for providing dynamic headers, such as a JWT token that expires.
+	* Optional factory used to create the underlying WebSocket. Use this in
+	* Node to attach custom headers (such as Authorization) to the upgrade
+	* request. If omitted, a default WebSocket is created and authentication
+	* is expected to come from the session cookie.
 	*/
-	connectHeaders?: ConnectHeaders | (() => Promise<ConnectHeaders>);
+	webSocketFactory?: WebSocketFactory;
 	/**
 	* The maximum number of connection attempts to make during the {@link IEventBus} initial connection request.
 	* If the limit is reached the {@link IEventBus} will return an error to the caller of {@link IEventBus#connect}
@@ -28,10 +56,11 @@ declare class ConnectionInfo extends ServerInfo {
 	*/
 	maxConnectionAttempts?: number | null;
 	/**
-	* If true, the session will not be kept alive after the connection is established and then disrupted.
-	* If false, the session will be kept alive after the connection is established and then disrupted, for a period of time.
+	* Controls whether session expiration is extended by gateway activity or by an active websocket connection.
+	* Defaults to {@link SessionKeepAliveMode.ACTIVITY}.
+	* Use {@link SessionKeepAliveMode.NONE} to remove the session when the websocket connection closes.
 	*/
-	disableStickySession?: boolean | null;
+	sessionKeepAlive: SessionKeepAliveMode;
 }
 import { Optional } from "typescript-optional";
 import { Observable } from "rxjs";
@@ -100,7 +129,6 @@ declare class Participant implements IParticipant {
 * Contains information about the connection that was established
 */
 declare class ConnectedInfo {
-	sessionId: string;
 	replyToId: string;
 	participant: Participant;
 }
@@ -253,22 +281,13 @@ declare enum EventConstants {
 	CONTENT_LENGTH_HEADER = "content-length",
 	REPLY_TO_HEADER = "reply-to",
 	/**
-	* This is the replyToId that will be supplied by the client, which will be used when sending replies to the client.
-	*/
-	REPLY_TO_ID_HEADER = "reply-to-id",
-	/**
-	* Header provided by the sever on connection to represent the user's session id
-	*/
-	SESSION_HEADER = "session",
-	/**
 	* Header provided by the server on connection to provide the {@link ConnectionInfo} as a JSON string
 	*/
 	CONNECTED_INFO_HEADER = "connected-info",
 	/**
-	* Header provided by the client on connection request to represent that the server
-	* should not keep the session alive after any network disconnection.
+	* Header provided by the client on connection request to choose how the session is kept alive.
 	*/
-	DISABLE_STICKY_SESSION_HEADER = "disable-sticky-session",
+	SESSION_KEEP_ALIVE_HEADER = "session-keep-alive",
 	/**
 	* Correlates a response with a given request
 	* Headers that start with __ will always be persisted between messages
@@ -297,6 +316,8 @@ declare enum EventConstants {
 	SERVICE_DESTINATION_SCHEME = "srv",
 	STREAM_DESTINATION_PREFIX = "stream://",
 	STREAM_DESTINATION_SCHEME = "stream",
+	REPLY_DESTINATION_PREFIX = "reply://",
+	REPLY_DESTINATION_SCHEME = "reply",
 	CONTENT_JSON = "application/json",
 	CONTENT_TEXT = "text/plain",
 	/**
@@ -1094,6 +1115,12 @@ declare class EventBus implements IEventBus {
 	observe(cri: string): Observable3<IEvent>;
 	private cleanup;
 	/**
+	* Tears down the shared request-replies stream so the next request rebuilds it against the
+	* current {@link replyToCri}. Any in-flight requests are failed with the given reason since
+	* their replies can no longer be delivered.
+	*/
+	private resetRequestReplies;
+	/**
 	* Creates the proper error to return if this.stompConnectionManager?.rxStomp is not available on a send request
 	*/
 	private createSendUnavailableError;
@@ -1117,4 +1144,4 @@ declare class ParticipantConstants {
 	static readonly PARTICIPANT_TYPE_NODE: string;
 	static readonly CLI_PARTICIPANT_ID: string;
 }
-export { createCRI, Version, TextEventFactory, Sort, ServiceRegistry, ServiceContext, ServerInfo, Scope, Publish, ParticipantConstants, Participant, Pageable, Page, Order, OffsetPageable, NullHandling, KinoticSingleton, KinoticPlugin, KinoticError, Kinotic, JsonEventFactory, IterablePage, Identifiable, 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, ConnectHeaders, 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, 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 };

package/dist/index.js

@@ -2,19 +2,22 @@ import { createRequire } from "node:module";
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // packages/core/src/api/ConnectionInfo.ts
-class ConnectHeaders {
-}
-
 class ServerInfo {
   host;
   port;
   useSSL;
 }
+var SessionKeepAliveMode;
+((SessionKeepAliveMode2) => {
+  SessionKeepAliveMode2["NONE"] = "NONE";
+  SessionKeepAliveMode2["ACTIVITY"] = "ACTIVITY";
+  SessionKeepAliveMode2["CONNECTION"] = "CONNECTION";
+})(SessionKeepAliveMode ||= {});
 
 class ConnectionInfo extends ServerInfo {
-  connectHeaders;
+  webSocketFactory;
   maxConnectionAttempts;
-  disableStickySession;
+  sessionKeepAlive = "ACTIVITY" /* ACTIVITY */;
 }
 // packages/core/src/api/errors/KinoticError.ts
 class KinoticError extends Error {
@@ -30,10 +33,8 @@ var EventConstants;
   EventConstants2["CONTENT_TYPE_HEADER"] = "content-type";
   EventConstants2["CONTENT_LENGTH_HEADER"] = "content-length";
   EventConstants2["REPLY_TO_HEADER"] = "reply-to";
-  EventConstants2["REPLY_TO_ID_HEADER"] = "reply-to-id";
-  EventConstants2["SESSION_HEADER"] = "session";
   EventConstants2["CONNECTED_INFO_HEADER"] = "connected-info";
-  EventConstants2["DISABLE_STICKY_SESSION_HEADER"] = "disable-sticky-session";
+  EventConstants2["SESSION_KEEP_ALIVE_HEADER"] = "session-keep-alive";
   EventConstants2["CORRELATION_ID_HEADER"] = "__correlation-id";
   EventConstants2["ERROR_HEADER"] = "error";
   EventConstants2["COMPLETE_HEADER"] = "complete";
@@ -46,6 +47,8 @@ var EventConstants;
   EventConstants2["SERVICE_DESTINATION_SCHEME"] = "srv";
   EventConstants2["STREAM_DESTINATION_PREFIX"] = "stream://";
   EventConstants2["STREAM_DESTINATION_SCHEME"] = "stream";
+  EventConstants2["REPLY_DESTINATION_PREFIX"] = "reply://";
+  EventConstants2["REPLY_DESTINATION_SCHEME"] = "reply";
   EventConstants2["CONTENT_JSON"] = "application/json";
   EventConstants2["CONTENT_TEXT"] = "text/plain";
   EventConstants2["TRACEPARENT_HEADER"] = "traceparent";
@@ -55,8 +58,8 @@ var EventConstants;
 // packages/core/src/internal/api/event/StompConnectionManager.ts
 import { RxStomp } from "@stomp/rx-stomp";
 import { ReconnectionTimeMode } from "@stomp/stompjs";
-import { v4 as uuidv4 } from "uuid";
 import debug from "debug";
+import { v4 as uuidv4 } from "uuid";
 
 class StompConnectionManager {
   lastWebsocketError = null;
@@ -69,9 +72,10 @@ class StompConnectionManager {
   initialConnectionSuccessful = false;
   debugLogger = debug("kinoitc:stomp");
   uuidv4 = uuidv4();
-  replyToId = uuidv4();
-  _replyToCri = "srv://" /* SERVICE_DESTINATION_PREFIX */ + this.replyToId + ":" + this.uuidv4 + "@kinoitc.js.EventBus/replyHandler";
+  _replyToCri = null;
+  serverHeadersSubscription = null;
   deactivationHandler = null;
+  replyToCriChangedHandler = null;
   get active() {
     return !!this.rxStomp;
   }
@@ -99,31 +103,23 @@ 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 connectHeadersInternal = typeof connectionInfo.connectHeaders !== "function" && connectionInfo.connectHeaders != null ? connectionInfo.connectHeaders : {};
+      let preparedSocket = null;
+      const userWebSocketFactory = connectionInfo.webSocketFactory;
       const stompConfig = {
         brokerURL: url,
-        connectHeaders: connectHeadersInternal,
+        connectHeaders: {
+          ["session-keep-alive" /* SESSION_KEEP_ALIVE_HEADER */]: connectionInfo.sessionKeepAlive
+        },
         heartbeatIncoming: 120000,
         heartbeatOutgoing: 30000,
         reconnectDelay: this.INITIAL_RECONNECT_DELAY,
+        webSocketFactory: userWebSocketFactory ? () => preparedSocket : undefined,
         beforeConnect: async () => {
-          if (typeof connectionInfo.connectHeaders === "function") {
-            const headers = await connectionInfo.connectHeaders();
-            for (const key in headers) {
-              connectHeadersInternal[key] = headers[key];
-            }
-          }
-          if (connectionInfo.disableStickySession) {
-            connectHeadersInternal["disable-sticky-session" /* DISABLE_STICKY_SESSION_HEADER */] = "true";
-          }
-          if (connectHeadersInternal["reply-to-id" /* REPLY_TO_ID_HEADER */]) {
-            this.replyToId = connectHeadersInternal["reply-to-id" /* REPLY_TO_ID_HEADER */];
-            this._replyToCri = "srv://" /* SERVICE_DESTINATION_PREFIX */ + this.replyToId + ":" + this.uuidv4 + "@kinoitc.js.EventBus/replyHandler";
-          } else {
-            connectHeadersInternal["reply-to-id" /* REPLY_TO_ID_HEADER */] = this.replyToId;
-          }
           if (connectionInfo?.maxConnectionAttempts) {
             this.connectionAttempts++;
             if (this.connectionAttempts > connectionInfo.maxConnectionAttempts) {
@@ -133,12 +129,23 @@ class StompConnectionManager {
                 let message = this.lastWebsocketError?.message ? this.lastWebsocketError?.message : "UNKNOWN";
                 reject(`Max number of reconnection attempts reached. Last WS Error ${message}`);
               }
+              return;
             } else {
               await this.connectionJitterDelay();
             }
           } else {
             await this.connectionJitterDelay();
           }
+          if (userWebSocketFactory) {
+            try {
+              preparedSocket = await userWebSocketFactory();
+            } catch (e) {
+              await this.deactivate();
+              if (!this.initialConnectionSuccessful) {
+                reject(e);
+              }
+            }
+          }
         }
       };
       if (this.debugLogger.enabled) {
@@ -165,36 +172,29 @@ class StompConnectionManager {
         this.rxStomp = null;
         reject(message);
       });
-      const serverHeadersSubscription = this.rxStomp.serverHeaders$.subscribe((value) => {
-        let connectedInfoJson = value["connected-info" /* CONNECTED_INFO_HEADER */];
-        if (connectedInfoJson != null) {
-          const connectedInfo = JSON.parse(connectedInfoJson);
-          if (!connectionInfo.disableStickySession) {
-            serverHeadersSubscription.unsubscribe();
-            if (connectedInfo.sessionId != null && connectedInfo.replyToId != null) {
-              if (connectionInfo.connectHeaders != null) {
-                for (let key in connectHeadersInternal) {
-                  delete connectHeadersInternal[key];
-                }
-              }
-              connectHeadersInternal["session" /* SESSION_HEADER */] = connectedInfo.sessionId;
-              resolve(connectedInfo);
-            } else {
-              reject("Server did not return proper data for successful login");
-            }
-          } else if (typeof connectionInfo.connectHeaders === "function") {
-            for (let key in connectHeadersInternal) {
-              delete connectHeadersInternal[key];
-            }
-            if (!this.initialConnectionSuccessful) {
-              resolve(connectedInfo);
-            }
-          } else if (typeof connectionInfo.connectHeaders === "object") {
-            serverHeadersSubscription.unsubscribe();
-            resolve(connectedInfo);
+      this.serverHeadersSubscription = this.rxStomp.serverHeaders$.subscribe((value) => {
+        const connectedInfoJson = value["connected-info" /* CONNECTED_INFO_HEADER */];
+        const firstConnect = this._replyToCri == null;
+        if (connectedInfoJson == null) {
+          if (firstConnect) {
+            reject("Server did not return proper data for successful login");
           }
-        } else {
-          reject("Server did not return proper data for successful login");
+          return;
+        }
+        const connectedInfo = JSON.parse(connectedInfoJson);
+        if (connectedInfo.replyToId == null) {
+          if (firstConnect) {
+            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) {
+          this._replyToCri = newReplyToCri;
+          resolve(connectedInfo);
+        } else if (this._replyToCri !== newReplyToCri) {
+          this._replyToCri = newReplyToCri;
+          this.replyToCriChangedHandler?.(newReplyToCri);
         }
       });
       this.rxStomp.activate();
@@ -203,6 +203,8 @@ class StompConnectionManager {
   async deactivate(force) {
     if (this.rxStomp) {
       await this.rxStomp.deactivate({ force });
+      this.serverHeadersSubscription?.unsubscribe();
+      this.serverHeadersSubscription = null;
       if (this.deactivationHandler) {
         this.deactivationHandler();
       }
@@ -283,6 +285,10 @@ class EventBus {
     this.stompConnectionManager.deactivationHandler = () => {
       this.cleanup();
     };
+    this.stompConnectionManager.replyToCriChangedHandler = (replyToCri) => {
+      this.replyToCri = replyToCri;
+      this.resetRequestReplies("Reply destination changed");
+    };
   }
   isConnectionActive() {
     return this.stompConnectionManager.active;
@@ -350,7 +356,7 @@ class EventBus {
         })).subscribe({
           next(value) {
             if (value.hasHeader("control" /* CONTROL_HEADER */)) {
-              if (value.headers.get("control" /* CONTROL_HEADER */) === "complete") {
+              if (value.headers.get("control" /* CONTROL_HEADER */) === "complete" /* CONTROL_VALUE_COMPLETE */) {
                 serverSignaledCompletion = true;
                 subscriber.complete();
               } else {
@@ -394,8 +400,16 @@ class EventBus {
     return this._observe(cri);
   }
   cleanup() {
+    this.resetRequestReplies("Connection disconnected");
+    if (this.errorSubjectSubscription) {
+      this.errorSubjectSubscription.unsubscribe();
+      this.errorSubjectSubscription = null;
+    }
+    this.serverInfo = null;
+  }
+  resetRequestReplies(reason) {
     if (this.requestRepliesSubject != null) {
-      this.requestRepliesSubject.error(new Error("Connection disconnected"));
+      this.requestRepliesSubject.error(new Error(reason));
       if (this.requestRepliesSubscription != null) {
         this.requestRepliesSubscription.unsubscribe();
         this.requestRepliesSubscription = null;
@@ -403,11 +417,6 @@ class EventBus {
       this.requestRepliesSubject = null;
       this.requestRepliesObservable = null;
     }
-    if (this.errorSubjectSubscription) {
-      this.errorSubjectSubscription.unsubscribe();
-      this.errorSubjectSubscription = null;
-    }
-    this.serverInfo = null;
   }
   createSendUnavailableError() {
     let ret = "You must call connect on the event bus before sending any request";
@@ -894,7 +903,7 @@ import { first, map as map2 } from "rxjs/operators";
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.2.2",
+  version: "1.3.1",
   type: "module",
   files: [
     "dist"
@@ -1388,7 +1397,6 @@ class AuthorizationError extends KinoticError {
 }
 // packages/core/src/api/security/ConnectedInfo.ts
 class ConnectedInfo {
-  sessionId;
   replyToId;
   participant;
 }
@@ -1423,6 +1431,7 @@ export {
   Version,
   TextEventFactory,
   Sort,
+  SessionKeepAliveMode,
   ServiceRegistry,
   ServerInfo,
   Scope,
@@ -1450,7 +1459,6 @@ export {
   Context,
   ConnectionInfo,
   ConnectedInfo,
-  ConnectHeaders,
   CONTEXT_METADATA_KEY,
   AuthorizationError,
   AuthenticationError,

package/package.json

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