@kinotic-ai/core 1.2.1 → 1.3.0

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,
@@ -79,7 +80,6 @@ __export(exports_src, {
   OffsetPageable: () => OffsetPageable,
   NullHandling: () => NullHandling,
   KinoticSingleton: () => KinoticSingleton,
-  KinoticProjectConfig: () => KinoticProjectConfig,
   KinoticError: () => KinoticError,
   Kinotic: () => Kinotic,
   JsonEventFactory: () => JsonEventFactory,
@@ -96,7 +96,6 @@ __export(exports_src, {
   Context: () => Context,
   ConnectionInfo: () => ConnectionInfo,
   ConnectedInfo: () => ConnectedInfo,
-  ConnectHeaders: () => ConnectHeaders,
   CONTEXT_METADATA_KEY: () => CONTEXT_METADATA_KEY,
   AuthorizationError: () => AuthorizationError,
   AuthenticationError: () => AuthenticationError,
@@ -105,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 {
@@ -133,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";
@@ -149,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";
@@ -158,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;
@@ -172,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;
   }
@@ -202,31 +205,21 @@ 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 : {};
       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: connectionInfo.webSocketFactory,
         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) {
@@ -268,36 +261,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();
@@ -306,6 +292,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();
       }
@@ -386,6 +374,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;
@@ -453,7 +445,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 {
@@ -497,8 +489,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;
@@ -506,11 +506,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";
@@ -994,7 +989,7 @@ var import_operators2 = require("rxjs/operators");
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.2.1",
+  version: "1.3.0",
   type: "module",
   files: [
     "dist"
@@ -1022,44 +1017,44 @@ var package_default = {
   },
   scripts: {
     "type-check": "tsc --noEmit",
-    test: "vitest run",
+    test: "vitest run --mode development",
     coverage: "vitest run --coverage",
     "ui-test": "vitest --ui --coverage.enabled=true --mode development"
   },
   devDependencies: {
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.212.0",
-    "@opentelemetry/resources": "^2.5.1",
-    "@opentelemetry/sdk-metrics": "^2.5.1",
-    "@opentelemetry/sdk-node": "^0.212.0",
-    "@opentelemetry/sdk-trace-node": "^2.5.1",
-    "@types/node": "^25.3.2",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.214.0",
+    "@opentelemetry/resources": "^2.6.1",
+    "@opentelemetry/sdk-metrics": "^2.6.1",
+    "@opentelemetry/sdk-node": "^0.214.0",
+    "@opentelemetry/sdk-trace-node": "^2.6.1",
+    "@types/node": "^25.6.0",
     "@types/uuid": "^11.0.0",
     "@types/ws": "^8.18.1",
-    "@vitest/coverage-v8": "^4.0.18",
-    "@vitest/runner": "^4.0.18",
-    "@vitest/ui": "^4.0.18",
-    allure: "^3.3.1",
-    "allure-vitest": "^3.5.0",
-    dotenv: "^17.3.1",
-    "properties-file": "^3.6.4",
-    testcontainers: "^11.12.0",
+    "@vitest/coverage-v8": "^4.1.4",
+    "@vitest/runner": "^4.1.4",
+    "@vitest/ui": "^4.1.4",
+    allure: "^3.4.1",
+    "allure-vitest": "^3.7.1",
+    dotenv: "^17.4.1",
+    "properties-file": "^4.0.0",
+    testcontainers: "^11.14.0",
     tslib: "^2.8.1",
-    typescript: "^5.9.3",
-    vitest: "^4.0.18",
-    ws: "^8.19.0"
+    typescript: "^6.0.2",
+    vitest: "^4.1.4",
+    ws: "^8.20.0"
   },
   dependencies: {
-    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/semantic-conventions": "^1.40.0",
     "@stomp/rx-stomp": "^2.3.0",
     "@stomp/stompjs": "^7.3.0",
-    "@types/debug": "^4.1.12",
+    "@types/debug": "^4.1.13",
     debug: "^4.4.3",
     "p-tap": "^4.0.0",
     "reflect-metadata": "^0.2.2",
     rxjs: "^7.8.2",
     "typescript-optional": "3.0.0-alpha.3",
-    uuid: "^11.0.0"
+    uuid: "^13.0.0"
   },
   peerDependenciesMeta: {
     typescript: {
@@ -1243,16 +1238,6 @@ class KinoticSingleton {
   }
 }
 var Kinotic = new KinoticSingleton;
-// packages/core/src/api/KinoticProjectConfig.ts
-class KinoticProjectConfig {
-  name;
-  description;
-  application;
-  entitiesPaths;
-  generatedPath;
-  fileExtensionForImports = ".js";
-  validate;
-}
 // packages/core/src/api/crud/AbstractIterablePage.ts
 class AbstractIterablePage {
   pageable;
@@ -1354,6 +1339,9 @@ class CrudServiceProxy {
   create(entity) {
     return this.serviceProxy.invoke("create", [entity]);
   }
+  createSync(entity) {
+    return this.serviceProxy.invoke("createSync", [entity]);
+  }
   deleteById(id) {
     return this.serviceProxy.invoke("deleteById", [id]);
   }
@@ -1495,7 +1483,6 @@ class AuthorizationError extends KinoticError {
 }
 // packages/core/src/api/security/ConnectedInfo.ts
 class ConnectedInfo {
-  sessionId;
   replyToId;
   participant;
 }
@@ -1503,11 +1490,15 @@ class ConnectedInfo {
 class Participant {
   id;
   tenantId;
+  authScopeType;
+  authScopeId;
   metadata;
   roles;
-  constructor(id, tenantId, metadata, roles) {
+  constructor(id, tenantId, authScopeType, authScopeId, metadata, roles) {
     this.id = id;
     this.tenantId = tenantId;
+    this.authScopeType = authScopeType;
+    this.authScopeId = authScopeId;
     this.metadata = metadata || new Map;
     this.roles = roles || [];
   }

package/dist/index.d.cts

@@ -1,26 +1,53 @@
 /**
-* 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). Browser callers
+* normally leave this unset and rely on the session cookie established by a
+* prior REST login.
+*/
+type WebSocketFactory = () => 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 +55,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";
@@ -59,6 +87,19 @@ interface IParticipant extends Identifiable<string> {
 	*/
 	tenantId?: string | null;
 	/**
+	* The scope layer this participant authenticated against.
+	* Well-known values are "SYSTEM", "ORGANIZATION", and "APPLICATION",
+	* but custom values are allowed for extensibility.
+	*/
+	authScopeType?: string | null;
+	/**
+	* The identifier of the specific scope this participant belongs to.
+	* For example, "kinotic" for system scope, an organization ID, or an application ID.
+	* Together with {@link authScopeType}, uniquely identifies which user pool
+	* this participant was authenticated from.
+	*/
+	authScopeId?: string | null;
+	/**
 	* Metadata is a map of key value pairs that can be used to store additional information about a participant
 	*
 	* @return a map of key value pairs
@@ -77,15 +118,16 @@ interface IParticipant extends Identifiable<string> {
 declare class Participant implements IParticipant {
 	id: string;
 	tenantId?: string | null;
+	authScopeType?: string | null;
+	authScopeId?: string | null;
 	metadata: Map<string, string>;
 	roles: string[];
-	constructor(id: string, tenantId?: string, metadata?: Map<string, string>, roles?: string[]);
+	constructor(id: string, tenantId?: string, authScopeType?: string, authScopeId?: string, metadata?: Map<string, string>, roles?: string[]);
 }
 /**
 * Contains information about the connection that was established
 */
 declare class ConnectedInfo {
-	sessionId: string;
 	replyToId: string;
 	participant: Participant;
 }
@@ -238,22 +280,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
@@ -282,6 +315,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",
 	/**
@@ -641,66 +676,6 @@ declare function Version(version: string): (target: Function) => void;
 declare function Context(): (target: any, propertyKey: string, parameterIndex: number) => void;
 declare function Publish(namespace: string, name?: string): (target: Function) => any;
 /**
-* Configuration for a single entities path and its corresponding repository output.
-*/
-type EntitiesPathConfig = {
-	/**
-	* The path to search for classes decorated with @Entity.
-	*/
-	path: string;
-	/**
-	* The path where generated Repository classes will be placed.
-	*/
-	repositoryPath: string;
-	/**
-	* If true, the subfolder structure under the entities path will be mirrored under the repository path.
-	* For example, if entitiesPath is "src/model" and contains "payments/Payment.ts",
-	* the generated repository will be placed in "repositoryPath/payments/".
-	* If false, all generated repositories are placed directly in the repositoryPath.
-	* Defaults to true.
-	*/
-	mirrorFolderStructure?: boolean;
-};
-/**
-* The project configuration for a Kinotic project.
-*/
-declare class KinoticProjectConfig {
-	/**
-	* The name of the project or undefined if a project name is used.
-	* i.e. if the project is typescript the package.json name will be used.
-	*/
-	name?: string;
-	/**
-	* The description of the project.
-	*/
-	description?: string;
-	/**
-	* The Kinotic Application that this project belongs to.
-	*/
-	application: string;
-	/**
-	* The paths to search for classes decorated with @Entity that Kinotic will be created for.
-	* Each entry can be a string (simple path) or an {@link EntitiesPathConfig} object for full control
-	* over where repository classes are generated.
-	*
-	* When a plain string is provided, the {@link generatedPath} will be used as the repository output path.
-	*/
-	entitiesPaths: (string | EntitiesPathConfig)[];
-	/**
-	* The default path to where generated files will be placed when entitiesPaths contains plain strings.
-	* Ignored for entitiesPaths entries that use {@link EntitiesPathConfig}.
-	*/
-	generatedPath?: string;
-	/**
-	* The file extension to use for imports in generated files.
-	*/
-	fileExtensionForImports: string;
-	/**
-	* If true the generated Repository classes will validate all data before sending to the server.
-	*/
-	validate?: boolean;
-}
-/**
 * A page is a sublist of a list of objects.
 * @author Navid Mitchell
 */
@@ -949,6 +924,15 @@ interface ICrudServiceProxy<T extends Identifiable<string>> extends IEditableDat
 	*/
 	create(entity: T): Promise<T>;
 	/**
+	* Creates a new entity if one does not already exist for the given id, and waits for the
+	* change to be visible in search results before returning.
+	* Use this when you need read-your-write consistency immediately after creation.
+	*
+	* @param entity to create if one does not already exist
+	* @return a {@link Promise} containing the new entity after it is searchable, or an error if an exception occurred
+	*/
+	createSync(entity: T): Promise<T>;
+	/**
 	* Saves a given entity. Use the returned instance for further operations as the save operation might have changed the
 	* entity instance completely.
 	*
@@ -1017,6 +1001,7 @@ declare class CrudServiceProxy<T extends Identifiable<string>> implements ICrudS
 	constructor(serviceProxy: IServiceProxy);
 	count(): Promise<number>;
 	create(entity: T): Promise<T>;
+	createSync(entity: T): Promise<T>;
 	deleteById(id: string): Promise<void>;
 	findAll(pageable: Pageable): Promise<IterablePage<T>>;
 	findAllSinglePage(pageable: Pageable): Promise<Page<T>>;
@@ -1129,6 +1114,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;
@@ -1152,4 +1143,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, KinoticProjectConfig, KinoticPlugin, KinoticError, Kinotic, JsonEventFactory, IterablePage, Identifiable, IServiceRegistry, IServiceProxy, IParticipant, IKinotic, IEventFactory, IEventBus, IEvent, IEditableDataSource, IDataSource, ICrudServiceProxyFactory, ICrudServiceProxy, FunctionalIterablePage, EventConstants, EventBus, Event, EntitiesPathConfig, 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,53 @@
 /**
-* 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). Browser callers
+* normally leave this unset and rely on the session cookie established by a
+* prior REST login.
+*/
+type WebSocketFactory = () => 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 +55,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";
@@ -59,6 +87,19 @@ interface IParticipant extends Identifiable<string> {
 	*/
 	tenantId?: string | null;
 	/**
+	* The scope layer this participant authenticated against.
+	* Well-known values are "SYSTEM", "ORGANIZATION", and "APPLICATION",
+	* but custom values are allowed for extensibility.
+	*/
+	authScopeType?: string | null;
+	/**
+	* The identifier of the specific scope this participant belongs to.
+	* For example, "kinotic" for system scope, an organization ID, or an application ID.
+	* Together with {@link authScopeType}, uniquely identifies which user pool
+	* this participant was authenticated from.
+	*/
+	authScopeId?: string | null;
+	/**
 	* Metadata is a map of key value pairs that can be used to store additional information about a participant
 	*
 	* @return a map of key value pairs
@@ -77,15 +118,16 @@ interface IParticipant extends Identifiable<string> {
 declare class Participant implements IParticipant {
 	id: string;
 	tenantId?: string | null;
+	authScopeType?: string | null;
+	authScopeId?: string | null;
 	metadata: Map<string, string>;
 	roles: string[];
-	constructor(id: string, tenantId?: string, metadata?: Map<string, string>, roles?: string[]);
+	constructor(id: string, tenantId?: string, authScopeType?: string, authScopeId?: string, metadata?: Map<string, string>, roles?: string[]);
 }
 /**
 * Contains information about the connection that was established
 */
 declare class ConnectedInfo {
-	sessionId: string;
 	replyToId: string;
 	participant: Participant;
 }
@@ -238,22 +280,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
@@ -282,6 +315,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",
 	/**
@@ -641,66 +676,6 @@ declare function Version(version: string): (target: Function) => void;
 declare function Context(): (target: any, propertyKey: string, parameterIndex: number) => void;
 declare function Publish(namespace: string, name?: string): (target: Function) => any;
 /**
-* Configuration for a single entities path and its corresponding repository output.
-*/
-type EntitiesPathConfig = {
-	/**
-	* The path to search for classes decorated with @Entity.
-	*/
-	path: string;
-	/**
-	* The path where generated Repository classes will be placed.
-	*/
-	repositoryPath: string;
-	/**
-	* If true, the subfolder structure under the entities path will be mirrored under the repository path.
-	* For example, if entitiesPath is "src/model" and contains "payments/Payment.ts",
-	* the generated repository will be placed in "repositoryPath/payments/".
-	* If false, all generated repositories are placed directly in the repositoryPath.
-	* Defaults to true.
-	*/
-	mirrorFolderStructure?: boolean;
-};
-/**
-* The project configuration for a Kinotic project.
-*/
-declare class KinoticProjectConfig {
-	/**
-	* The name of the project or undefined if a project name is used.
-	* i.e. if the project is typescript the package.json name will be used.
-	*/
-	name?: string;
-	/**
-	* The description of the project.
-	*/
-	description?: string;
-	/**
-	* The Kinotic Application that this project belongs to.
-	*/
-	application: string;
-	/**
-	* The paths to search for classes decorated with @Entity that Kinotic will be created for.
-	* Each entry can be a string (simple path) or an {@link EntitiesPathConfig} object for full control
-	* over where repository classes are generated.
-	*
-	* When a plain string is provided, the {@link generatedPath} will be used as the repository output path.
-	*/
-	entitiesPaths: (string | EntitiesPathConfig)[];
-	/**
-	* The default path to where generated files will be placed when entitiesPaths contains plain strings.
-	* Ignored for entitiesPaths entries that use {@link EntitiesPathConfig}.
-	*/
-	generatedPath?: string;
-	/**
-	* The file extension to use for imports in generated files.
-	*/
-	fileExtensionForImports: string;
-	/**
-	* If true the generated Repository classes will validate all data before sending to the server.
-	*/
-	validate?: boolean;
-}
-/**
 * A page is a sublist of a list of objects.
 * @author Navid Mitchell
 */
@@ -949,6 +924,15 @@ interface ICrudServiceProxy<T extends Identifiable<string>> extends IEditableDat
 	*/
 	create(entity: T): Promise<T>;
 	/**
+	* Creates a new entity if one does not already exist for the given id, and waits for the
+	* change to be visible in search results before returning.
+	* Use this when you need read-your-write consistency immediately after creation.
+	*
+	* @param entity to create if one does not already exist
+	* @return a {@link Promise} containing the new entity after it is searchable, or an error if an exception occurred
+	*/
+	createSync(entity: T): Promise<T>;
+	/**
 	* Saves a given entity. Use the returned instance for further operations as the save operation might have changed the
 	* entity instance completely.
 	*
@@ -1017,6 +1001,7 @@ declare class CrudServiceProxy<T extends Identifiable<string>> implements ICrudS
 	constructor(serviceProxy: IServiceProxy);
 	count(): Promise<number>;
 	create(entity: T): Promise<T>;
+	createSync(entity: T): Promise<T>;
 	deleteById(id: string): Promise<void>;
 	findAll(pageable: Pageable): Promise<IterablePage<T>>;
 	findAllSinglePage(pageable: Pageable): Promise<Page<T>>;
@@ -1129,6 +1114,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;
@@ -1152,4 +1143,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, KinoticProjectConfig, KinoticPlugin, KinoticError, Kinotic, JsonEventFactory, IterablePage, Identifiable, IServiceRegistry, IServiceProxy, IParticipant, IKinotic, IEventFactory, IEventBus, IEvent, IEditableDataSource, IDataSource, ICrudServiceProxyFactory, ICrudServiceProxy, FunctionalIterablePage, EventConstants, EventBus, Event, EntitiesPathConfig, 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,21 @@ 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 : {};
       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: connectionInfo.webSocketFactory,
         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) {
@@ -165,36 +159,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 +190,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 +272,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 +343,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 +387,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 +404,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 +890,7 @@ import { first, map as map2 } from "rxjs/operators";
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.2.1",
+  version: "1.3.0",
   type: "module",
   files: [
     "dist"
@@ -922,44 +918,44 @@ var package_default = {
   },
   scripts: {
     "type-check": "tsc --noEmit",
-    test: "vitest run",
+    test: "vitest run --mode development",
     coverage: "vitest run --coverage",
     "ui-test": "vitest --ui --coverage.enabled=true --mode development"
   },
   devDependencies: {
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.212.0",
-    "@opentelemetry/resources": "^2.5.1",
-    "@opentelemetry/sdk-metrics": "^2.5.1",
-    "@opentelemetry/sdk-node": "^0.212.0",
-    "@opentelemetry/sdk-trace-node": "^2.5.1",
-    "@types/node": "^25.3.2",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.214.0",
+    "@opentelemetry/resources": "^2.6.1",
+    "@opentelemetry/sdk-metrics": "^2.6.1",
+    "@opentelemetry/sdk-node": "^0.214.0",
+    "@opentelemetry/sdk-trace-node": "^2.6.1",
+    "@types/node": "^25.6.0",
     "@types/uuid": "^11.0.0",
     "@types/ws": "^8.18.1",
-    "@vitest/coverage-v8": "^4.0.18",
-    "@vitest/runner": "^4.0.18",
-    "@vitest/ui": "^4.0.18",
-    allure: "^3.3.1",
-    "allure-vitest": "^3.5.0",
-    dotenv: "^17.3.1",
-    "properties-file": "^3.6.4",
-    testcontainers: "^11.12.0",
+    "@vitest/coverage-v8": "^4.1.4",
+    "@vitest/runner": "^4.1.4",
+    "@vitest/ui": "^4.1.4",
+    allure: "^3.4.1",
+    "allure-vitest": "^3.7.1",
+    dotenv: "^17.4.1",
+    "properties-file": "^4.0.0",
+    testcontainers: "^11.14.0",
     tslib: "^2.8.1",
-    typescript: "^5.9.3",
-    vitest: "^4.0.18",
-    ws: "^8.19.0"
+    typescript: "^6.0.2",
+    vitest: "^4.1.4",
+    ws: "^8.20.0"
   },
   dependencies: {
-    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/semantic-conventions": "^1.40.0",
     "@stomp/rx-stomp": "^2.3.0",
     "@stomp/stompjs": "^7.3.0",
-    "@types/debug": "^4.1.12",
+    "@types/debug": "^4.1.13",
     debug: "^4.4.3",
     "p-tap": "^4.0.0",
     "reflect-metadata": "^0.2.2",
     rxjs: "^7.8.2",
     "typescript-optional": "3.0.0-alpha.3",
-    uuid: "^11.0.0"
+    uuid: "^13.0.0"
   },
   peerDependenciesMeta: {
     typescript: {
@@ -1143,16 +1139,6 @@ class KinoticSingleton {
   }
 }
 var Kinotic = new KinoticSingleton;
-// packages/core/src/api/KinoticProjectConfig.ts
-class KinoticProjectConfig {
-  name;
-  description;
-  application;
-  entitiesPaths;
-  generatedPath;
-  fileExtensionForImports = ".js";
-  validate;
-}
 // packages/core/src/api/crud/AbstractIterablePage.ts
 class AbstractIterablePage {
   pageable;
@@ -1254,6 +1240,9 @@ class CrudServiceProxy {
   create(entity) {
     return this.serviceProxy.invoke("create", [entity]);
   }
+  createSync(entity) {
+    return this.serviceProxy.invoke("createSync", [entity]);
+  }
   deleteById(id) {
     return this.serviceProxy.invoke("deleteById", [id]);
   }
@@ -1395,7 +1384,6 @@ class AuthorizationError extends KinoticError {
 }
 // packages/core/src/api/security/ConnectedInfo.ts
 class ConnectedInfo {
-  sessionId;
   replyToId;
   participant;
 }
@@ -1403,11 +1391,15 @@ class ConnectedInfo {
 class Participant {
   id;
   tenantId;
+  authScopeType;
+  authScopeId;
   metadata;
   roles;
-  constructor(id, tenantId, metadata, roles) {
+  constructor(id, tenantId, authScopeType, authScopeId, metadata, roles) {
     this.id = id;
     this.tenantId = tenantId;
+    this.authScopeType = authScopeType;
+    this.authScopeId = authScopeId;
     this.metadata = metadata || new Map;
     this.roles = roles || [];
   }
@@ -1426,6 +1418,7 @@ export {
   Version,
   TextEventFactory,
   Sort,
+  SessionKeepAliveMode,
   ServiceRegistry,
   ServerInfo,
   Scope,
@@ -1437,7 +1430,6 @@ export {
   OffsetPageable,
   NullHandling,
   KinoticSingleton,
-  KinoticProjectConfig,
   KinoticError,
   Kinotic,
   JsonEventFactory,
@@ -1454,7 +1446,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.1",
+  "version": "1.3.0",
   "type": "module",
   "files": [
     "dist"
@@ -28,44 +28,44 @@
   },
   "scripts": {
     "type-check": "tsc --noEmit",
-    "test": "vitest run",
+    "test": "vitest run --mode development",
     "coverage": "vitest run --coverage",
     "ui-test": "vitest --ui --coverage.enabled=true --mode development"
   },
   "devDependencies": {
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.212.0",
-    "@opentelemetry/resources": "^2.5.1",
-    "@opentelemetry/sdk-metrics": "^2.5.1",
-    "@opentelemetry/sdk-node": "^0.212.0",
-    "@opentelemetry/sdk-trace-node": "^2.5.1",
-    "@types/node": "^25.3.2",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.214.0",
+    "@opentelemetry/resources": "^2.6.1",
+    "@opentelemetry/sdk-metrics": "^2.6.1",
+    "@opentelemetry/sdk-node": "^0.214.0",
+    "@opentelemetry/sdk-trace-node": "^2.6.1",
+    "@types/node": "^25.6.0",
     "@types/uuid": "^11.0.0",
     "@types/ws": "^8.18.1",
-    "@vitest/coverage-v8": "^4.0.18",
-    "@vitest/runner": "^4.0.18",
-    "@vitest/ui": "^4.0.18",
-    "allure": "^3.3.1",
-    "allure-vitest": "^3.5.0",
-    "dotenv": "^17.3.1",
-    "properties-file": "^3.6.4",
-    "testcontainers": "^11.12.0",
+    "@vitest/coverage-v8": "^4.1.4",
+    "@vitest/runner": "^4.1.4",
+    "@vitest/ui": "^4.1.4",
+    "allure": "^3.4.1",
+    "allure-vitest": "^3.7.1",
+    "dotenv": "^17.4.1",
+    "properties-file": "^4.0.0",
+    "testcontainers": "^11.14.0",
     "tslib": "^2.8.1",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.18",
-    "ws": "^8.19.0"
+    "typescript": "^6.0.2",
+    "vitest": "^4.1.4",
+    "ws": "^8.20.0"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/semantic-conventions": "^1.40.0",
     "@stomp/rx-stomp": "^2.3.0",
     "@stomp/stompjs": "^7.3.0",
-    "@types/debug": "^4.1.12",
+    "@types/debug": "^4.1.13",
     "debug": "^4.4.3",
     "p-tap": "^4.0.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.2",
     "typescript-optional": "3.0.0-alpha.3",
-    "uuid": "^11.0.0"
+    "uuid": "^13.0.0"
   },
   "peerDependenciesMeta": {
     "typescript": {