hume 0.8.1-beta7 → 0.8.1-beta9

package/Client.d.ts

@@ -9,6 +9,7 @@ export declare namespace HumeClient {
     interface Options {
         environment?: core.Supplier<environments.HumeEnvironment | string>;
         apiKey?: core.Supplier<string | undefined>;
+        accessToken?: core.Supplier<string | undefined>;
         fetcher?: core.FetchFunction;
     }
     interface RequestOptions {

package/api/resources/empathicVoice/client/Client.d.ts

@@ -13,6 +13,7 @@ export declare namespace EmpathicVoice {
     interface Options {
         environment?: core.Supplier<environments.HumeEnvironment | string>;
         apiKey?: core.Supplier<string | undefined>;
+        accessToken?: core.Supplier<string | undefined>;
         fetcher?: core.FetchFunction;
     }
     interface RequestOptions {

package/api/resources/empathicVoice/resources/chat/client/Client.js

@@ -35,13 +35,13 @@ class Chat {
         this._options = _options;
     }
     connect(args = {}) {
-        var _a;
+        var _a, _b;
         const queryParams = {};
         if (this._options.accessToken != null) {
-            queryParams["accessToken"] = core.Supplier.get(this._options.accessToken);
+            queryParams["accessToken"] = this._options.accessToken;
         }
         else if (this._options.apiKey != null) {
-            queryParams["apiKey"] = core.Supplier.get(this._options.apiKey);
+            queryParams["apiKey"] = this._options.apiKey;
         }
         if (args.configId != null) {
             queryParams["config_id"] = args.configId;
@@ -58,9 +58,8 @@ class Chat {
             }
         }
         const socket = new core.ReconnectingWebSocket(`wss://api.hume.ai/v0/evi/chat?${qs_1.default.stringify(queryParams)}`, [], {
-            startClosed: true,
             debug: (_a = args.debug) !== null && _a !== void 0 ? _a : false,
-            maxRetries: args.reconnectAttempts,
+            maxRetries: (_b = args.reconnectAttempts) !== null && _b !== void 0 ? _b : 30,
         });
         return new Socket_1.ChatSocket({
             socket,

package/api/resources/empathicVoice/resources/chat/client/Socket.d.ts

@@ -67,13 +67,14 @@ export declare class ChatSocket {
     /**
      * @name connect
      * @description
-     * Connect to the websocket.
+     * Connect to the core.ReconnectingWebSocket.
      */
     connect(): ChatSocket;
     /**
      * Closes the underlying socket.
      */
     close(): void;
+    tillSocketOpen(): Promise<core.ReconnectingWebSocket>;
     private assertSocketIsOpen;
     private sendJson;
     private handleOpen;

package/api/resources/empathicVoice/resources/chat/client/Socket.js

@@ -22,8 +22,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatSocket = void 0;
+const core = __importStar(require("../../../../../../core"));
 const errors = __importStar(require("../../../../../../errors"));
 const serializers = __importStar(require("../../../../../../serialization/index"));
 class ChatSocket {
@@ -55,7 +65,7 @@ class ChatSocket {
         };
         this.handleError = (event) => {
             var _a, _b, _c;
-            const message = (_a = event.message) !== null && _a !== void 0 ? _a : 'WebSocket error';
+            const message = (_a = event.message) !== null && _a !== void 0 ? _a : 'core.ReconnectingWebSocket error';
             (_c = (_b = this.eventHandlers).error) === null || _c === void 0 ? void 0 : _c.call(_b, new Error(message));
         };
         this.socket = socket;
@@ -142,7 +152,7 @@ class ChatSocket {
     /**
      * @name connect
      * @description
-     * Connect to the websocket.
+     * Connect to the core.ReconnectingWebSocket.
      */
     connect() {
         this.socket.reconnect();
@@ -163,11 +173,26 @@ class ChatSocket {
         this.socket.removeEventListener('close', this.handleClose);
         this.socket.removeEventListener('error', this.handleError);
     }
+    tillSocketOpen() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.socket.readyState === core.ReconnectingWebSocket.OPEN) {
+                return this.socket;
+            }
+            return new Promise((resolve, reject) => {
+                this.socket.addEventListener("open", () => {
+                    resolve(this.socket);
+                });
+                this.socket.addEventListener("error", (event) => {
+                    reject(event);
+                });
+            });
+        });
+    }
     assertSocketIsOpen() {
         if (!this.socket) {
             throw new errors.HumeError({ message: 'Socket is not connected.' });
         }
-        if (this.socket.readyState !== WebSocket.OPEN) {
+        if (this.socket.readyState !== core.ReconnectingWebSocket.OPEN) {
             throw new errors.HumeError({ message: 'Socket is not open.' });
         }
     }

package/core/websocket/ws.js

@@ -25,11 +25,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReconnectingWebSocket = void 0;
 const Events = __importStar(require("./events"));
+const ws_1 = require("ws");
 const getGlobalWebSocket = () => {
-    if (typeof WebSocket !== 'undefined') {
-        // @ts-ignore
-        return WebSocket;
-    }
+    var _a;
+    var _b;
+    return (_a = (_b = global).WebSocket) !== null && _a !== void 0 ? _a : (_b.WebSocket = ws_1.WebSocket);
 };
 /**
  * Returns true if given argument looks like a WebSocket class

package/dist/Client.d.ts

@@ -9,6 +9,7 @@ export declare namespace HumeClient {
     interface Options {
         environment?: core.Supplier<environments.HumeEnvironment | string>;
         apiKey?: core.Supplier<string | undefined>;
+        accessToken?: core.Supplier<string | undefined>;
         fetcher?: core.FetchFunction;
     }
     interface RequestOptions {

package/dist/api/resources/empathicVoice/client/Client.d.ts

@@ -13,6 +13,7 @@ export declare namespace EmpathicVoice {
     interface Options {
         environment?: core.Supplier<environments.HumeEnvironment | string>;
         apiKey?: core.Supplier<string | undefined>;
+        accessToken?: core.Supplier<string | undefined>;
         fetcher?: core.FetchFunction;
     }
     interface RequestOptions {

package/dist/api/resources/empathicVoice/resources/chat/client/Client.js

@@ -35,13 +35,13 @@ class Chat {
         this._options = _options;
     }
     connect(args = {}) {
-        var _a;
+        var _a, _b;
         const queryParams = {};
         if (this._options.accessToken != null) {
-            queryParams["accessToken"] = core.Supplier.get(this._options.accessToken);
+            queryParams["accessToken"] = this._options.accessToken;
         }
         else if (this._options.apiKey != null) {
-            queryParams["apiKey"] = core.Supplier.get(this._options.apiKey);
+            queryParams["apiKey"] = this._options.apiKey;
         }
         if (args.configId != null) {
             queryParams["config_id"] = args.configId;
@@ -58,9 +58,8 @@ class Chat {
             }
         }
         const socket = new core.ReconnectingWebSocket(`wss://api.hume.ai/v0/evi/chat?${qs_1.default.stringify(queryParams)}`, [], {
-            startClosed: true,
             debug: (_a = args.debug) !== null && _a !== void 0 ? _a : false,
-            maxRetries: args.reconnectAttempts,
+            maxRetries: (_b = args.reconnectAttempts) !== null && _b !== void 0 ? _b : 30,
         });
         return new Socket_1.ChatSocket({
             socket,

package/dist/api/resources/empathicVoice/resources/chat/client/Socket.d.ts

@@ -67,13 +67,14 @@ export declare class ChatSocket {
     /**
      * @name connect
      * @description
-     * Connect to the websocket.
+     * Connect to the core.ReconnectingWebSocket.
      */
     connect(): ChatSocket;
     /**
      * Closes the underlying socket.
      */
     close(): void;
+    tillSocketOpen(): Promise<core.ReconnectingWebSocket>;
     private assertSocketIsOpen;
     private sendJson;
     private handleOpen;

package/dist/api/resources/empathicVoice/resources/chat/client/Socket.js

@@ -22,8 +22,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatSocket = void 0;
+const core = __importStar(require("../../../../../../core"));
 const errors = __importStar(require("../../../../../../errors"));
 const serializers = __importStar(require("../../../../../../serialization/index"));
 class ChatSocket {
@@ -55,7 +65,7 @@ class ChatSocket {
         };
         this.handleError = (event) => {
             var _a, _b, _c;
-            const message = (_a = event.message) !== null && _a !== void 0 ? _a : 'WebSocket error';
+            const message = (_a = event.message) !== null && _a !== void 0 ? _a : 'core.ReconnectingWebSocket error';
             (_c = (_b = this.eventHandlers).error) === null || _c === void 0 ? void 0 : _c.call(_b, new Error(message));
         };
         this.socket = socket;
@@ -142,7 +152,7 @@ class ChatSocket {
     /**
      * @name connect
      * @description
-     * Connect to the websocket.
+     * Connect to the core.ReconnectingWebSocket.
      */
     connect() {
         this.socket.reconnect();
@@ -163,11 +173,26 @@ class ChatSocket {
         this.socket.removeEventListener('close', this.handleClose);
         this.socket.removeEventListener('error', this.handleError);
     }
+    tillSocketOpen() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.socket.readyState === core.ReconnectingWebSocket.OPEN) {
+                return this.socket;
+            }
+            return new Promise((resolve, reject) => {
+                this.socket.addEventListener("open", () => {
+                    resolve(this.socket);
+                });
+                this.socket.addEventListener("error", (event) => {
+                    reject(event);
+                });
+            });
+        });
+    }
     assertSocketIsOpen() {
         if (!this.socket) {
             throw new errors.HumeError({ message: 'Socket is not connected.' });
         }
-        if (this.socket.readyState !== WebSocket.OPEN) {
+        if (this.socket.readyState !== core.ReconnectingWebSocket.OPEN) {
             throw new errors.HumeError({ message: 'Socket is not open.' });
         }
     }

package/dist/core/websocket/ws.js

@@ -25,11 +25,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReconnectingWebSocket = void 0;
 const Events = __importStar(require("./events"));
+const ws_1 = require("ws");
 const getGlobalWebSocket = () => {
-    if (typeof WebSocket !== 'undefined') {
-        // @ts-ignore
-        return WebSocket;
-    }
+    var _a;
+    var _b;
+    return (_a = (_b = global).WebSocket) !== null && _a !== void 0 ? _a : (_b.WebSocket = ws_1.WebSocket);
 };
 /**
  * Returns true if given argument looks like a WebSocket class

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hume",
-    "version": "0.8.1-beta7",
+    "version": "0.8.1-beta9",
     "private": false,
     "repository": "https://github.com/HumeAI/hume-typescript-sdk",
     "main": "./index.js",