@cimulate/copilot-sdk 2.0.5 → 2.2.0

package/src/copilot.ts

@@ -20,13 +20,17 @@ import { asyncGenerator } from "./generator";
 
 type SocketIOOptions = Partial<ManagerOptions & SocketOptions>;
 
-interface CimulateCopilotOptions {
-  apiKey: string;
+type ApiKeyAuth = { apiKey: string; apiToken?: never };
+type ApiTokenAuth = { apiToken: string; apiKey?: never };
+
+interface CommonOptions {
   baseUrl: string;
   namespace?: string;
   socketOptions?: Omit<SocketIOOptions, "withCredentials" | "parser">;
 }
 
+type CimulateCopilotOptions = (ApiKeyAuth | ApiTokenAuth) &  CommonOptions;
+
 const socketDefaults: SocketIOOptions = {
   path: "/api/v1/socket.io",
   autoConnect: false,
@@ -44,15 +48,30 @@ export default class CimulateCopilot<
   T extends ReturnedFields = ReturnedFields
 > {
   private socket: Socket;
+  private sessionIdKey: string = "x-cimulate-copilot-session-id";
 
   constructor({
     apiKey,
+    apiToken,
     baseUrl,
     namespace = "/copilot",
     socketOptions = {},
   }: CimulateCopilotOptions) {
+
+    if ((apiKey && apiToken) || (!apiKey && !apiToken)) {
+      throw new Error("Provide exactly one authentication method: either 'apiKey' or 'apiToken', but not both.");
+    }
+
     const socketioEndpoint = `${baseUrl}${namespace}`;
 
+    const extraHeaders: Record<string, string> = {};
+
+    if (apiKey) {
+      extraHeaders["x-cimulate-api-key"] = apiKey;
+    } else if (apiToken) {
+      extraHeaders["Authorization"] = apiToken;
+    }
+
     const options: SocketIOOptions[] = [
       socketDefaults,
       socketOptions,
@@ -60,11 +79,7 @@ export default class CimulateCopilot<
         parser: SnakeCaseParser,
         withCredentials: true, // enables cookies
         transportOptions: {
-          polling: {
-            extraHeaders: {
-              "x-cimulate-api-key": apiKey,
-            },
-          },
+          polling: { extraHeaders },
         },
       },
     ];
@@ -73,7 +88,24 @@ export default class CimulateCopilot<
   }
 
   connect() {
+
+    if (this.socket.auth && this.sessionIdKey in this.socket.auth) {
+      this.socket.auth = {};
+    }
+
     this.socket.connect();
+
+    this.on("connect_ack", (event) => {
+      this.socket.auth = {
+        [this.sessionIdKey]: event.sessionId
+      };
+    });
+  }
+
+  reconnect() {
+    if (!this.socket.active) {
+      this.socket.connect();
+    }
   }
 
   async search(

package/src/parser.ts

@@ -9,6 +9,8 @@ class SnakeCaseEncoder extends Encoder {
           ? [packet.data[0], encode(packet.data[1])]
           : packet.data?.length == 1
           ? [packet.data[0]]
+          : typeof packet.data == "object" && packet.data != null
+          ? packet.data
           : undefined,
     });
   }