@kinotic-ai/core 1.5.0 → 1.6.1

package/dist/index.cjs

@@ -74,7 +74,6 @@ __export(exports_src, {
   Scope: () => Scope,
   Publish: () => Publish,
   ParticipantConstants: () => ParticipantConstants,
-  Participant: () => Participant,
   Pageable: () => Pageable,
   Order: () => Order,
   OffsetPageable: () => OffsetPageable,
@@ -303,14 +302,17 @@ class StompConnectionManager {
     });
   }
   async deactivate(force) {
-    if (this.rxStomp) {
-      await this.rxStomp.deactivate({ force });
-      this.serverHeadersSubscription?.unsubscribe();
-      this.serverHeadersSubscription = null;
-      this.stompErrorsSubscription?.unsubscribe();
-      this.stompErrorsSubscription = null;
-      this.rxStomp = null;
-      this._replyToCri = null;
+    const rxStomp = this.rxStomp;
+    if (rxStomp) {
+      await rxStomp.deactivate({ force });
+      if (this.rxStomp === rxStomp) {
+        this.serverHeadersSubscription?.unsubscribe();
+        this.serverHeadersSubscription = null;
+        this.stompErrorsSubscription?.unsubscribe();
+        this.stompErrorsSubscription = null;
+        this.rxStomp = null;
+        this._replyToCri = null;
+      }
     }
     return;
   }
@@ -375,6 +377,7 @@ class Event {
 class EventBus {
   serverInfo = null;
   stompConnectionManager = new StompConnectionManager;
+  connectionLifecycle = Promise.resolve();
   replyToCri = null;
   requestRepliesObservable = null;
   requestRepliesSubject = null;
@@ -395,23 +398,32 @@ class EventBus {
   isConnected() {
     return this.stompConnectionManager.connected;
   }
-  async connect(connectionInfo) {
-    if (!this.stompConnectionManager.active) {
+  connect(connectionInfo) {
+    return this.serializeLifecycle(async () => {
+      if (!this.stompConnectionManager.active) {
+        this.cleanup();
+        const connectedInfo = await this.stompConnectionManager.activate(connectionInfo);
+        this.serverInfo = new ServerInfo;
+        this.serverInfo.host = connectionInfo.host;
+        this.serverInfo.port = connectionInfo.port;
+        this.serverInfo.useSSL = connectionInfo.useSSL;
+        this.replyToCri = this.stompConnectionManager.replyToCri;
+        return connectedInfo;
+      } else {
+        throw new Error("Event Bus connection already active");
+      }
+    });
+  }
+  disconnect(force) {
+    return this.serializeLifecycle(async () => {
+      await this.stompConnectionManager.deactivate(force);
       this.cleanup();
-      const connectedInfo = await this.stompConnectionManager.activate(connectionInfo);
-      this.serverInfo = new ServerInfo;
-      this.serverInfo.host = connectionInfo.host;
-      this.serverInfo.port = connectionInfo.port;
-      this.serverInfo.useSSL = connectionInfo.useSSL;
-      this.replyToCri = this.stompConnectionManager.replyToCri;
-      return connectedInfo;
-    } else {
-      throw new Error("Event Bus connection already active");
-    }
+    });
   }
-  async disconnect(force) {
-    await this.stompConnectionManager.deactivate(force);
-    this.cleanup();
+  serializeLifecycle(operation) {
+    const result = this.connectionLifecycle.then(operation);
+    this.connectionLifecycle = result.catch(() => {});
+    return result;
   }
   send(event) {
     if (this.stompConnectionManager.rxStomp) {
@@ -994,7 +1006,7 @@ var import_operators2 = require("rxjs/operators");
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.5.0",
+  version: "1.6.1",
   type: "module",
   files: [
     "dist"
@@ -1477,23 +1489,6 @@ class ConnectedInfo {
   replyToId;
   participant;
 }
-// packages/core/src/api/security/Participant.ts
-class Participant {
-  id;
-  tenantId;
-  authScopeType;
-  authScopeId;
-  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 || [];
-  }
-}
 // packages/core/src/api/security/ParticipantConstants.ts
 class ParticipantConstants {
   static PARTICIPANT_TYPE_METADATA_KEY = "type";

package/dist/index.d.cts

@@ -72,59 +72,37 @@ interface Identifiable<T> {
 	id: T | null;
 }
 /**
+* Identifying information about a logged-in participant on the RPC layer.
+*
+* This is the base shape every participant shares, regardless of scope, and is what RPC-only
+* consumers work with directly. The Kinotic OS contract layers scope-typed participants on top
+* of it — see the participant types in {@code @kinotic-ai/os-api}.
+*
+* Mirrors the server {@code org.kinotic.core.api.security.Participant}.
+*
 * Created by Navíd Mitchell 🤪on 6/16/23.
 */
 interface IParticipant extends Identifiable<string> {
 	/**
-	* The identity of the participant
-	*
-	* @return the identity of the participant
+	* The identity of the participant.
 	*/
 	id: string;
 	/**
-	* The tenant that the participant belongs to
-	*
-	* @return the tenant or null if not using multi-tenancy
+	* Key/value pairs carrying additional information about the participant.
 	*/
-	tenantId?: string | null;
+	metadata: Record<string, string>;
 	/**
-	* 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
-	*/
-	metadata: Map<string, string>;
-	/**
-	* Roles are a list of strings that can be used to authorize a participant to perform certain actions
-	*
-	* @return a list of roles
+	* Roles used to authorize the participant to perform actions.
 	*/
 	roles: string[];
 }
 /**
+* A logged-in participant on the RPC layer. Alias of {@link IParticipant}; the Kinotic OS contract
+* ({@code @kinotic-ai/os-api}) narrows this to scope-typed participants.
+*
 * Created by Navid Mitchell on 6/2/20
 */
-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, authScopeType?: string, authScopeId?: string, metadata?: Map<string, string>, roles?: string[]);
-}
+type Participant = IParticipant;
 /**
 * Contains information about the connection that was established
 */
@@ -1084,6 +1062,7 @@ declare class Event implements IEvent {
 declare class EventBus implements IEventBus {
 	serverInfo: ServerInfo | null;
 	private stompConnectionManager;
+	private connectionLifecycle;
 	private replyToCri;
 	private requestRepliesObservable;
 	private requestRepliesSubject;
@@ -1094,6 +1073,8 @@ declare class EventBus implements IEventBus {
 	isConnected(): boolean;
 	connect(connectionInfo: ConnectionInfo): Promise<ConnectedInfo>;
 	disconnect(force?: boolean): Promise<void>;
+	/** Runs connect and disconnect one at a time so they never overlap on the shared socket. */
+	private serializeLifecycle;
 	send(event: IEvent): void;
 	request(event: IEvent): Promise<IEvent>;
 	requestStream(event: IEvent, sendControlEvents?: boolean): Observable3<IEvent>;

package/dist/index.d.ts

@@ -72,59 +72,37 @@ interface Identifiable<T> {
 	id: T | null;
 }
 /**
+* Identifying information about a logged-in participant on the RPC layer.
+*
+* This is the base shape every participant shares, regardless of scope, and is what RPC-only
+* consumers work with directly. The Kinotic OS contract layers scope-typed participants on top
+* of it — see the participant types in {@code @kinotic-ai/os-api}.
+*
+* Mirrors the server {@code org.kinotic.core.api.security.Participant}.
+*
 * Created by Navíd Mitchell 🤪on 6/16/23.
 */
 interface IParticipant extends Identifiable<string> {
 	/**
-	* The identity of the participant
-	*
-	* @return the identity of the participant
+	* The identity of the participant.
 	*/
 	id: string;
 	/**
-	* The tenant that the participant belongs to
-	*
-	* @return the tenant or null if not using multi-tenancy
+	* Key/value pairs carrying additional information about the participant.
 	*/
-	tenantId?: string | null;
+	metadata: Record<string, string>;
 	/**
-	* 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
-	*/
-	metadata: Map<string, string>;
-	/**
-	* Roles are a list of strings that can be used to authorize a participant to perform certain actions
-	*
-	* @return a list of roles
+	* Roles used to authorize the participant to perform actions.
 	*/
 	roles: string[];
 }
 /**
+* A logged-in participant on the RPC layer. Alias of {@link IParticipant}; the Kinotic OS contract
+* ({@code @kinotic-ai/os-api}) narrows this to scope-typed participants.
+*
 * Created by Navid Mitchell on 6/2/20
 */
-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, authScopeType?: string, authScopeId?: string, metadata?: Map<string, string>, roles?: string[]);
-}
+type Participant = IParticipant;
 /**
 * Contains information about the connection that was established
 */
@@ -1084,6 +1062,7 @@ declare class Event implements IEvent {
 declare class EventBus implements IEventBus {
 	serverInfo: ServerInfo | null;
 	private stompConnectionManager;
+	private connectionLifecycle;
 	private replyToCri;
 	private requestRepliesObservable;
 	private requestRepliesSubject;
@@ -1094,6 +1073,8 @@ declare class EventBus implements IEventBus {
 	isConnected(): boolean;
 	connect(connectionInfo: ConnectionInfo): Promise<ConnectedInfo>;
 	disconnect(force?: boolean): Promise<void>;
+	/** Runs connect and disconnect one at a time so they never overlap on the shared socket. */
+	private serializeLifecycle;
 	send(event: IEvent): void;
 	request(event: IEvent): Promise<IEvent>;
 	requestStream(event: IEvent, sendControlEvents?: boolean): Observable3<IEvent>;

package/dist/index.js

@@ -204,14 +204,17 @@ class StompConnectionManager {
     });
   }
   async deactivate(force) {
-    if (this.rxStomp) {
-      await this.rxStomp.deactivate({ force });
-      this.serverHeadersSubscription?.unsubscribe();
-      this.serverHeadersSubscription = null;
-      this.stompErrorsSubscription?.unsubscribe();
-      this.stompErrorsSubscription = null;
-      this.rxStomp = null;
-      this._replyToCri = null;
+    const rxStomp = this.rxStomp;
+    if (rxStomp) {
+      await rxStomp.deactivate({ force });
+      if (this.rxStomp === rxStomp) {
+        this.serverHeadersSubscription?.unsubscribe();
+        this.serverHeadersSubscription = null;
+        this.stompErrorsSubscription?.unsubscribe();
+        this.stompErrorsSubscription = null;
+        this.rxStomp = null;
+        this._replyToCri = null;
+      }
     }
     return;
   }
@@ -276,6 +279,7 @@ class Event {
 class EventBus {
   serverInfo = null;
   stompConnectionManager = new StompConnectionManager;
+  connectionLifecycle = Promise.resolve();
   replyToCri = null;
   requestRepliesObservable = null;
   requestRepliesSubject = null;
@@ -296,23 +300,32 @@ class EventBus {
   isConnected() {
     return this.stompConnectionManager.connected;
   }
-  async connect(connectionInfo) {
-    if (!this.stompConnectionManager.active) {
+  connect(connectionInfo) {
+    return this.serializeLifecycle(async () => {
+      if (!this.stompConnectionManager.active) {
+        this.cleanup();
+        const connectedInfo = await this.stompConnectionManager.activate(connectionInfo);
+        this.serverInfo = new ServerInfo;
+        this.serverInfo.host = connectionInfo.host;
+        this.serverInfo.port = connectionInfo.port;
+        this.serverInfo.useSSL = connectionInfo.useSSL;
+        this.replyToCri = this.stompConnectionManager.replyToCri;
+        return connectedInfo;
+      } else {
+        throw new Error("Event Bus connection already active");
+      }
+    });
+  }
+  disconnect(force) {
+    return this.serializeLifecycle(async () => {
+      await this.stompConnectionManager.deactivate(force);
       this.cleanup();
-      const connectedInfo = await this.stompConnectionManager.activate(connectionInfo);
-      this.serverInfo = new ServerInfo;
-      this.serverInfo.host = connectionInfo.host;
-      this.serverInfo.port = connectionInfo.port;
-      this.serverInfo.useSSL = connectionInfo.useSSL;
-      this.replyToCri = this.stompConnectionManager.replyToCri;
-      return connectedInfo;
-    } else {
-      throw new Error("Event Bus connection already active");
-    }
+    });
   }
-  async disconnect(force) {
-    await this.stompConnectionManager.deactivate(force);
-    this.cleanup();
+  serializeLifecycle(operation) {
+    const result = this.connectionLifecycle.then(operation);
+    this.connectionLifecycle = result.catch(() => {});
+    return result;
   }
   send(event) {
     if (this.stompConnectionManager.rxStomp) {
@@ -898,7 +911,7 @@ import { first, map as map2 } from "rxjs/operators";
 // packages/core/package.json
 var package_default = {
   name: "@kinotic-ai/core",
-  version: "1.5.0",
+  version: "1.6.1",
   type: "module",
   files: [
     "dist"
@@ -1381,23 +1394,6 @@ class ConnectedInfo {
   replyToId;
   participant;
 }
-// packages/core/src/api/security/Participant.ts
-class Participant {
-  id;
-  tenantId;
-  authScopeType;
-  authScopeId;
-  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 || [];
-  }
-}
 // packages/core/src/api/security/ParticipantConstants.ts
 class ParticipantConstants {
   static PARTICIPANT_TYPE_METADATA_KEY = "type";
@@ -1418,7 +1414,6 @@ export {
   Scope,
   Publish,
   ParticipantConstants,
-  Participant,
   Pageable,
   Order,
   OffsetPageable,

package/package.json

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