@kinotic-ai/core 1.6.2 → 1.8.0

package/dist/index.cjs

@@ -65,6 +65,7 @@ var __export = (target, all) => {
 var exports_src = {};
 __export(exports_src, {
   createCRI: () => createCRI,
+  createAuthenticatedWebSocketFactory: () => createAuthenticatedWebSocketFactory,
   Version: () => Version,
   TextEventFactory: () => TextEventFactory,
   Sort: () => Sort,
@@ -95,6 +96,8 @@ __export(exports_src, {
   ConnectionInfo: () => ConnectionInfo,
   ConnectedInfo: () => ConnectedInfo,
   CONTEXT_METADATA_KEY: () => CONTEXT_METADATA_KEY,
+  BearerTokenAuthProvider: () => BearerTokenAuthProvider,
+  BasicAuthProvider: () => BasicAuthProvider,
   AbstractIterablePage: () => AbstractIterablePage
 });
 module.exports = __toCommonJS(exports_src);
@@ -145,13 +148,41 @@ var EventConstants;
   EventConstants2["TRACESTATE_HEADER"] = "tracestate";
 })(EventConstants ||= {});
 
+// packages/core/src/internal/api/Util.ts
+class Util {
+  static createReplyEvent(incomingHeaders, headers, body) {
+    if (!incomingHeaders) {
+      throw new Error("incomingHeaders cannot be null");
+    }
+    const replyCRI = incomingHeaders.get("reply-to" /* REPLY_TO_HEADER */);
+    if (!replyCRI || replyCRI.trim() === "") {
+      throw new Error("No reply-to header found, cannot create outgoing message");
+    }
+    const newHeaders = new Map;
+    for (const [key, value] of incomingHeaders) {
+      if (key.startsWith("__")) {
+        newHeaders.set(key, value);
+      }
+    }
+    if (headers) {
+      for (const [key, value] of headers) {
+        newHeaders.set(key, value);
+      }
+    }
+    return new Event(replyCRI, newHeaders, body || undefined);
+  }
+  static buildBrokerUrl(serverInfo) {
+    return "ws" + (serverInfo.useSSL ? "s" : "") + "://" + serverInfo.host + (serverInfo.port ? ":" + serverInfo.port : "") + "/v1";
+  }
+}
+
 // packages/core/src/internal/api/event/StompConnectionManager.ts
 var import_rx_stomp = require("@stomp/rx-stomp");
 var import_stompjs = require("@stomp/stompjs");
 var import_debug = __toESM(require("debug"));
 var import_rxjs = require("rxjs");
 var import_uuid = require("uuid");
-var SESSION_CHECK_PATH = "/api/me";
+var SESSION_CHECK_PATH = "/api/auth/me";
 
 class StompConnectionManager {
   lastWebsocketError = null;
@@ -200,7 +231,7 @@ class StompConnectionManager {
       this.initialConnectionSuccessful = false;
       this.lastWebsocketError = null;
       this.maxConnectionAttemptsReached = false;
-      const url = "ws" + (connectionInfo.useSSL ? "s" : "") + "://" + connectionInfo.host + (connectionInfo.port ? ":" + connectionInfo.port : "") + "/v1";
+      const url = Util.buildBrokerUrl(connectionInfo);
       this.rxStomp = new import_rx_stomp.RxStomp;
       let preparedSocket = null;
       const userWebSocketFactory = connectionInfo.webSocketFactory;
@@ -698,35 +729,10 @@ class JsonArgumentResolver {
   }
 }
 
-// packages/core/src/internal/api/EventUtil.ts
-class EventUtil {
-  static createReplyEvent(incomingHeaders, headers, body) {
-    if (!incomingHeaders) {
-      throw new Error("incomingHeaders cannot be null");
-    }
-    const replyCRI = incomingHeaders.get("reply-to" /* REPLY_TO_HEADER */);
-    if (!replyCRI || replyCRI.trim() === "") {
-      throw new Error("No reply-to header found, cannot create outgoing message");
-    }
-    const newHeaders = new Map;
-    for (const [key, value] of incomingHeaders) {
-      if (key.startsWith("__")) {
-        newHeaders.set(key, value);
-      }
-    }
-    if (headers) {
-      for (const [key, value] of headers) {
-        newHeaders.set(key, value);
-      }
-    }
-    return new Event(replyCRI, newHeaders, body || undefined);
-  }
-}
-
 // packages/core/src/internal/api/ReturnValueConverter.ts
 class BasicReturnValueConverter {
   convert(incomingMetadata, returnValue) {
-    return EventUtil.createReplyEvent(incomingMetadata, new Map([["content-type" /* CONTENT_TYPE_HEADER */, "application/json"]]), new TextEncoder().encode(JSON.stringify(returnValue)));
+    return Util.createReplyEvent(incomingMetadata, new Map([["content-type" /* CONTENT_TYPE_HEADER */, "application/json"]]), new TextEncoder().encode(JSON.stringify(returnValue)));
   }
 }
 
@@ -973,7 +979,7 @@ class ServiceInvocationSupervisor {
     this._eventBus.send(outgoingEvent);
   }
   handleException(event, error) {
-    const errorEvent = EventUtil.createReplyEvent(event.headers, new Map([
+    const errorEvent = Util.createReplyEvent(event.headers, new Map([
       ["error" /* ERROR_HEADER */, error.message || "Unknown error"],
       ["content-type" /* CONTENT_TYPE_HEADER */, "application/json"]
     ]), new TextEncoder().encode(JSON.stringify({ message: error.message })));
@@ -1004,7 +1010,7 @@ var import_operators2 = require("rxjs/operators");
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.6.2",
+  version: "1.8.0",
   type: "module",
   files: [
     "dist"
@@ -1032,7 +1038,7 @@ var package_default = {
   },
   scripts: {
     "type-check": "tsc --noEmit",
-    test: "vitest run --mode development",
+    test: "vitest run",
     coverage: "vitest run --coverage",
     "ui-test": "vitest --ui --coverage.enabled=true --mode development"
   },
@@ -1482,6 +1488,37 @@ class Order {
 class Sort {
   orders = [];
 }
+// packages/core/src/api/security/AuthenticatedWebSocketFactory.ts
+function createAuthenticatedWebSocketFactory(serverInfo, authProvider) {
+  const brokerUrl = Util.buildBrokerUrl(serverInfo);
+  return async () => {
+    const headers = await authProvider.getAuthHeaders();
+    const WS = WebSocket;
+    return new WS(brokerUrl, { headers });
+  };
+}
+// packages/core/src/api/security/BasicAuthProvider.ts
+class BasicAuthProvider {
+  authHeader;
+  constructor(login, passcode) {
+    const encoded = Buffer.from(`${login}:${passcode}`).toString("base64");
+    this.authHeader = `Basic ${encoded}`;
+  }
+  getAuthHeaders() {
+    return { Authorization: this.authHeader };
+  }
+}
+// packages/core/src/api/security/BearerTokenAuthProvider.ts
+class BearerTokenAuthProvider {
+  token;
+  constructor(token) {
+    this.token = token;
+  }
+  async getAuthHeaders() {
+    const token = typeof this.token === "function" ? await this.token() : this.token;
+    return { Authorization: `Bearer ${token}` };
+  }
+}
 // packages/core/src/api/security/ConnectedInfo.ts
 class ConnectedInfo {
   replyToId;

package/dist/index.d.cts

@@ -1100,6 +1100,52 @@ declare class EventBus implements IEventBus {
 	private _observe;
 }
 /**
+* Supplies the headers attached to the WebSocket upgrade request when a Node/Bun
+* client authenticates during the handshake. Implementations are consulted on every
+* (re)connect, so a provider backing short-lived credentials can refresh them each time.
+*/
+interface IAuthProvider {
+	/**
+	* Returns the headers to attach to the WebSocket upgrade request.
+	* Invoked on every (re)connect.
+	*/
+	getAuthHeaders(): Promise<Record<string, string>> | Record<string, string>;
+}
+/**
+* Builds a {@link WebSocketFactory} that authenticates during the WebSocket upgrade
+* by attaching the headers from {@link IAuthProvider#getAuthHeaders} to the request.
+* The provider is consulted on every (re)connect, so short-lived credentials are
+* refreshed each time. Supply the result as {@link ConnectionInfo#webSocketFactory}.
+*
+* For Node/Bun callers: the returned factory creates the socket with the runtime
+* WebSocket's `headers` option, which the DOM `WebSocket` typings omit and the
+* browser WebSocket does not support. Browser callers continue to omit
+* `webSocketFactory` and authenticate via the session cookie from a prior REST login.
+*/
+declare function createAuthenticatedWebSocketFactory(serverInfo: ServerInfo, authProvider: IAuthProvider): WebSocketFactory;
+/**
+* {@link IAuthProvider} that authenticates with HTTP Basic, sending
+* `Authorization: Basic base64(login:passcode)` on every (re)connect.
+*/
+declare class BasicAuthProvider implements IAuthProvider {
+	private readonly authHeader;
+	constructor(login: string, passcode: string);
+	getAuthHeaders(): Record<string, string>;
+}
+/**
+* {@link IAuthProvider} that authenticates with a bearer token, sending
+* `Authorization: Bearer <token>` on every (re)connect.
+*
+* Pass a string for a static token, or a supplier when the token is short-lived
+* and must be refreshed before each connect (for example, an OAuth device-grant
+* access token). The supplier may be async and is invoked on every (re)connect.
+*/
+declare class BearerTokenAuthProvider implements IAuthProvider {
+	private readonly token;
+	constructor(token: string | (() => Promise<string> | string));
+	getAuthHeaders(): Promise<Record<string, string>>;
+}
+/**
 * Some common constants used for the {@link Participant} and {@link Participant#getMetadata()}
 * Created by navid on 2/3/20
 */
@@ -1111,4 +1157,4 @@ declare class ParticipantConstants {
 	static readonly PARTICIPANT_TYPE_NODE: string;
 	static readonly CLI_PARTICIPANT_ID: string;
 }
-export { createCRI, WebSocketFactory, Version, TextEventFactory, Sort, SessionKeepAliveMode, ServiceRegistry, ServiceContext, ServerInfo, Scope, Publish, ParticipantConstants, Participant, Pageable, Page, Order, OffsetPageable, NullHandling, KinoticSingleton, KinoticPlugin, Kinotic, JsonEventFactory, IterablePage, Identifiable, IWebSocket, IServiceRegistry, IServiceProxy, IParticipant, IKinotic, IEventFactory, IEventBus, IEvent, IEditableDataSource, IDataSource, ICrudServiceProxyFactory, ICrudServiceProxy, FunctionalIterablePage, EventConstants, EventBus, Event, Direction, DefaultCRI, DataSourceUtils, CursorPageable, CrudServiceProxyFactory, CrudServiceProxy, ContextInterceptor, Context, ConnectionInfo, ConnectedInfo, CRI, CONTEXT_METADATA_KEY, AbstractIterablePage };
+export { createCRI, createAuthenticatedWebSocketFactory, WebSocketFactory, Version, TextEventFactory, Sort, SessionKeepAliveMode, ServiceRegistry, ServiceContext, ServerInfo, Scope, Publish, ParticipantConstants, Participant, Pageable, Page, Order, OffsetPageable, NullHandling, KinoticSingleton, KinoticPlugin, Kinotic, JsonEventFactory, IterablePage, Identifiable, IWebSocket, IServiceRegistry, IServiceProxy, IParticipant, IKinotic, IEventFactory, IEventBus, IEvent, IEditableDataSource, IDataSource, ICrudServiceProxyFactory, ICrudServiceProxy, IAuthProvider, FunctionalIterablePage, EventConstants, EventBus, Event, Direction, DefaultCRI, DataSourceUtils, CursorPageable, CrudServiceProxyFactory, CrudServiceProxy, ContextInterceptor, Context, ConnectionInfo, ConnectedInfo, CRI, CONTEXT_METADATA_KEY, BearerTokenAuthProvider, BasicAuthProvider, AbstractIterablePage };

package/dist/index.d.ts

@@ -1100,6 +1100,52 @@ declare class EventBus implements IEventBus {
 	private _observe;
 }
 /**
+* Supplies the headers attached to the WebSocket upgrade request when a Node/Bun
+* client authenticates during the handshake. Implementations are consulted on every
+* (re)connect, so a provider backing short-lived credentials can refresh them each time.
+*/
+interface IAuthProvider {
+	/**
+	* Returns the headers to attach to the WebSocket upgrade request.
+	* Invoked on every (re)connect.
+	*/
+	getAuthHeaders(): Promise<Record<string, string>> | Record<string, string>;
+}
+/**
+* Builds a {@link WebSocketFactory} that authenticates during the WebSocket upgrade
+* by attaching the headers from {@link IAuthProvider#getAuthHeaders} to the request.
+* The provider is consulted on every (re)connect, so short-lived credentials are
+* refreshed each time. Supply the result as {@link ConnectionInfo#webSocketFactory}.
+*
+* For Node/Bun callers: the returned factory creates the socket with the runtime
+* WebSocket's `headers` option, which the DOM `WebSocket` typings omit and the
+* browser WebSocket does not support. Browser callers continue to omit
+* `webSocketFactory` and authenticate via the session cookie from a prior REST login.
+*/
+declare function createAuthenticatedWebSocketFactory(serverInfo: ServerInfo, authProvider: IAuthProvider): WebSocketFactory;
+/**
+* {@link IAuthProvider} that authenticates with HTTP Basic, sending
+* `Authorization: Basic base64(login:passcode)` on every (re)connect.
+*/
+declare class BasicAuthProvider implements IAuthProvider {
+	private readonly authHeader;
+	constructor(login: string, passcode: string);
+	getAuthHeaders(): Record<string, string>;
+}
+/**
+* {@link IAuthProvider} that authenticates with a bearer token, sending
+* `Authorization: Bearer <token>` on every (re)connect.
+*
+* Pass a string for a static token, or a supplier when the token is short-lived
+* and must be refreshed before each connect (for example, an OAuth device-grant
+* access token). The supplier may be async and is invoked on every (re)connect.
+*/
+declare class BearerTokenAuthProvider implements IAuthProvider {
+	private readonly token;
+	constructor(token: string | (() => Promise<string> | string));
+	getAuthHeaders(): Promise<Record<string, string>>;
+}
+/**
 * Some common constants used for the {@link Participant} and {@link Participant#getMetadata()}
 * Created by navid on 2/3/20
 */
@@ -1111,4 +1157,4 @@ declare class ParticipantConstants {
 	static readonly PARTICIPANT_TYPE_NODE: string;
 	static readonly CLI_PARTICIPANT_ID: string;
 }
-export { createCRI, WebSocketFactory, Version, TextEventFactory, Sort, SessionKeepAliveMode, ServiceRegistry, ServiceContext, ServerInfo, Scope, Publish, ParticipantConstants, Participant, Pageable, Page, Order, OffsetPageable, NullHandling, KinoticSingleton, KinoticPlugin, Kinotic, JsonEventFactory, IterablePage, Identifiable, IWebSocket, IServiceRegistry, IServiceProxy, IParticipant, IKinotic, IEventFactory, IEventBus, IEvent, IEditableDataSource, IDataSource, ICrudServiceProxyFactory, ICrudServiceProxy, FunctionalIterablePage, EventConstants, EventBus, Event, Direction, DefaultCRI, DataSourceUtils, CursorPageable, CrudServiceProxyFactory, CrudServiceProxy, ContextInterceptor, Context, ConnectionInfo, ConnectedInfo, CRI, CONTEXT_METADATA_KEY, AbstractIterablePage };
+export { createCRI, createAuthenticatedWebSocketFactory, WebSocketFactory, Version, TextEventFactory, Sort, SessionKeepAliveMode, ServiceRegistry, ServiceContext, ServerInfo, Scope, Publish, ParticipantConstants, Participant, Pageable, Page, Order, OffsetPageable, NullHandling, KinoticSingleton, KinoticPlugin, Kinotic, JsonEventFactory, IterablePage, Identifiable, IWebSocket, IServiceRegistry, IServiceProxy, IParticipant, IKinotic, IEventFactory, IEventBus, IEvent, IEditableDataSource, IDataSource, ICrudServiceProxyFactory, ICrudServiceProxy, IAuthProvider, FunctionalIterablePage, EventConstants, EventBus, Event, Direction, DefaultCRI, DataSourceUtils, CursorPageable, CrudServiceProxyFactory, CrudServiceProxy, ContextInterceptor, Context, ConnectionInfo, ConnectedInfo, CRI, CONTEXT_METADATA_KEY, BearerTokenAuthProvider, BasicAuthProvider, AbstractIterablePage };

package/dist/index.js

@@ -47,13 +47,41 @@ var EventConstants;
   EventConstants2["TRACESTATE_HEADER"] = "tracestate";
 })(EventConstants ||= {});
 
+// packages/core/src/internal/api/Util.ts
+class Util {
+  static createReplyEvent(incomingHeaders, headers, body) {
+    if (!incomingHeaders) {
+      throw new Error("incomingHeaders cannot be null");
+    }
+    const replyCRI = incomingHeaders.get("reply-to" /* REPLY_TO_HEADER */);
+    if (!replyCRI || replyCRI.trim() === "") {
+      throw new Error("No reply-to header found, cannot create outgoing message");
+    }
+    const newHeaders = new Map;
+    for (const [key, value] of incomingHeaders) {
+      if (key.startsWith("__")) {
+        newHeaders.set(key, value);
+      }
+    }
+    if (headers) {
+      for (const [key, value] of headers) {
+        newHeaders.set(key, value);
+      }
+    }
+    return new Event(replyCRI, newHeaders, body || undefined);
+  }
+  static buildBrokerUrl(serverInfo) {
+    return "ws" + (serverInfo.useSSL ? "s" : "") + "://" + serverInfo.host + (serverInfo.port ? ":" + serverInfo.port : "") + "/v1";
+  }
+}
+
 // packages/core/src/internal/api/event/StompConnectionManager.ts
 import { RxStomp } from "@stomp/rx-stomp";
 import { ReconnectionTimeMode } from "@stomp/stompjs";
 import debug from "debug";
 import { Subject } from "rxjs";
 import { v4 as uuidv4 } from "uuid";
-var SESSION_CHECK_PATH = "/api/me";
+var SESSION_CHECK_PATH = "/api/auth/me";
 
 class StompConnectionManager {
   lastWebsocketError = null;
@@ -102,7 +130,7 @@ class StompConnectionManager {
       this.initialConnectionSuccessful = false;
       this.lastWebsocketError = null;
       this.maxConnectionAttemptsReached = false;
-      const url = "ws" + (connectionInfo.useSSL ? "s" : "") + "://" + connectionInfo.host + (connectionInfo.port ? ":" + connectionInfo.port : "") + "/v1";
+      const url = Util.buildBrokerUrl(connectionInfo);
       this.rxStomp = new RxStomp;
       let preparedSocket = null;
       const userWebSocketFactory = connectionInfo.webSocketFactory;
@@ -600,35 +628,10 @@ class JsonArgumentResolver {
   }
 }
 
-// packages/core/src/internal/api/EventUtil.ts
-class EventUtil {
-  static createReplyEvent(incomingHeaders, headers, body) {
-    if (!incomingHeaders) {
-      throw new Error("incomingHeaders cannot be null");
-    }
-    const replyCRI = incomingHeaders.get("reply-to" /* REPLY_TO_HEADER */);
-    if (!replyCRI || replyCRI.trim() === "") {
-      throw new Error("No reply-to header found, cannot create outgoing message");
-    }
-    const newHeaders = new Map;
-    for (const [key, value] of incomingHeaders) {
-      if (key.startsWith("__")) {
-        newHeaders.set(key, value);
-      }
-    }
-    if (headers) {
-      for (const [key, value] of headers) {
-        newHeaders.set(key, value);
-      }
-    }
-    return new Event(replyCRI, newHeaders, body || undefined);
-  }
-}
-
 // packages/core/src/internal/api/ReturnValueConverter.ts
 class BasicReturnValueConverter {
   convert(incomingMetadata, returnValue) {
-    return EventUtil.createReplyEvent(incomingMetadata, new Map([["content-type" /* CONTENT_TYPE_HEADER */, "application/json"]]), new TextEncoder().encode(JSON.stringify(returnValue)));
+    return Util.createReplyEvent(incomingMetadata, new Map([["content-type" /* CONTENT_TYPE_HEADER */, "application/json"]]), new TextEncoder().encode(JSON.stringify(returnValue)));
   }
 }
 
@@ -875,7 +878,7 @@ class ServiceInvocationSupervisor {
     this._eventBus.send(outgoingEvent);
   }
   handleException(event, error) {
-    const errorEvent = EventUtil.createReplyEvent(event.headers, new Map([
+    const errorEvent = Util.createReplyEvent(event.headers, new Map([
       ["error" /* ERROR_HEADER */, error.message || "Unknown error"],
       ["content-type" /* CONTENT_TYPE_HEADER */, "application/json"]
     ]), new TextEncoder().encode(JSON.stringify({ message: error.message })));
@@ -909,7 +912,7 @@ import { first, map as map2 } from "rxjs/operators";
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.6.2",
+  version: "1.8.0",
   type: "module",
   files: [
     "dist"
@@ -937,7 +940,7 @@ var package_default = {
   },
   scripts: {
     "type-check": "tsc --noEmit",
-    test: "vitest run --mode development",
+    test: "vitest run",
     coverage: "vitest run --coverage",
     "ui-test": "vitest --ui --coverage.enabled=true --mode development"
   },
@@ -1387,6 +1390,37 @@ class Order {
 class Sort {
   orders = [];
 }
+// packages/core/src/api/security/AuthenticatedWebSocketFactory.ts
+function createAuthenticatedWebSocketFactory(serverInfo, authProvider) {
+  const brokerUrl = Util.buildBrokerUrl(serverInfo);
+  return async () => {
+    const headers = await authProvider.getAuthHeaders();
+    const WS = WebSocket;
+    return new WS(brokerUrl, { headers });
+  };
+}
+// packages/core/src/api/security/BasicAuthProvider.ts
+class BasicAuthProvider {
+  authHeader;
+  constructor(login, passcode) {
+    const encoded = Buffer.from(`${login}:${passcode}`).toString("base64");
+    this.authHeader = `Basic ${encoded}`;
+  }
+  getAuthHeaders() {
+    return { Authorization: this.authHeader };
+  }
+}
+// packages/core/src/api/security/BearerTokenAuthProvider.ts
+class BearerTokenAuthProvider {
+  token;
+  constructor(token) {
+    this.token = token;
+  }
+  async getAuthHeaders() {
+    const token = typeof this.token === "function" ? await this.token() : this.token;
+    return { Authorization: `Bearer ${token}` };
+  }
+}
 // packages/core/src/api/security/ConnectedInfo.ts
 class ConnectedInfo {
   replyToId;
@@ -1403,6 +1437,7 @@ class ParticipantConstants {
 }
 export {
   createCRI,
+  createAuthenticatedWebSocketFactory,
   Version,
   TextEventFactory,
   Sort,
@@ -1433,5 +1468,7 @@ export {
   ConnectionInfo,
   ConnectedInfo,
   CONTEXT_METADATA_KEY,
+  BearerTokenAuthProvider,
+  BasicAuthProvider,
   AbstractIterablePage
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kinotic-ai/core",
-  "version": "1.6.2",
+  "version": "1.8.0",
   "type": "module",
   "files": [
     "dist"
@@ -28,7 +28,7 @@
   },
   "scripts": {
     "type-check": "tsc --noEmit",
-    "test": "vitest run --mode development",
+    "test": "vitest run",
     "coverage": "vitest run --coverage",
     "ui-test": "vitest --ui --coverage.enabled=true --mode development"
   },