hume 0.14.2-beta.3 → 0.14.2-beta.5

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

@@ -5,7 +5,7 @@ import * as Hume from "../../../../../index.js";
 import { ChatSocket } from "./Socket.js";
 export declare namespace Chat {
     interface Options {
-        environment?: core.Supplier<environments.HumeEnvironment | environments.HumeEnvironmentUrls>;
+        environment?: core.Supplier<environments.HumeEnvironment | environments.HumeEnvironmentUrls | string>;
         /** Specify a custom URL to connect the client to. */
         baseUrl?: core.Supplier<string>;
         apiKey?: core.Supplier<string | undefined>;

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

@@ -40,12 +40,21 @@ const core = __importStar(require("../../../../../../core/index.js"));
 const headers_js_1 = require("../../../../../../core/headers.js");
 const serializers = __importStar(require("../../../../../../serialization/index.js"));
 const Socket_js_1 = require("./Socket.js");
+function createHostnameWithProtocol(url) {
+    const protocol = /(https|http|wss|ws):\/\//.exec(url);
+    if (protocol) {
+        return url.replace("https://", "wss://").replace("http://", "ws://");
+    }
+    else {
+        return `wss://${url}`;
+    }
+}
 class Chat {
     constructor(_options = {}) {
         this._options = _options;
     }
     connect(args = {}) {
-        var _a, _b;
+        var _a;
         const { accessToken, configId, configVersion, eventLimit, resumedChatGroupId, verboseTranscription, voiceId, apiKey, sessionSettings, queryParams, headers, debug, reconnectAttempts, } = args;
         const _queryParams = {};
         if (accessToken != null) {
@@ -89,8 +98,24 @@ class Chat {
             }
         }
         let _headers = (0, headers_js_1.mergeHeaders)((0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, this._getCustomAuthorizationHeaders())), headers);
+        // Construct WebSocket URL with protocol conversion
+        const baseUrl = core.Supplier.get(this._options["baseUrl"]);
+        const environment = (_a = core.Supplier.get(this._options["environment"])) !== null && _a !== void 0 ? _a : environments.HumeEnvironment.Prod;
+        let websocketUrl;
+        if (baseUrl) {
+            // baseUrl takes precedence - apply protocol conversion
+            websocketUrl = core.url.join(createHostnameWithProtocol(baseUrl), "/v0/evi/chat");
+        }
+        else if (typeof environment === "string") {
+            // String environment - apply protocol conversion
+            websocketUrl = core.url.join(createHostnameWithProtocol(environment), "/v0/evi/chat");
+        }
+        else {
+            // Structured environment object - use .evi property directly
+            websocketUrl = core.url.join(environment.evi, "/chat");
+        }
         const socket = new core.ReconnectingWebSocket({
-            url: core.url.join((_a = core.Supplier.get(this._options["baseUrl"])) !== null && _a !== void 0 ? _a : ((_b = core.Supplier.get(this._options["environment"])) !== null && _b !== void 0 ? _b : environments.HumeEnvironment.Prod).evi, "/chat"),
+            url: websocketUrl,
             protocols: [],
             queryParameters: _queryParams,
             headers: _headers,

package/core/fetcher/Supplier.d.ts

@@ -2,5 +2,5 @@
 export type Supplier<T> = T | (() => T);
 export declare const Supplier: {
     get: <T>(supplier: Supplier<T>) => T;
-    map: <T, U>(supplier: Supplier<T>, f: (value: T) => U) => Supplier<U>;
+    map: <T, U, R = U>(supplier: Supplier<T>, f: (value: T) => R) => Supplier<R>;
 };

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

@@ -5,7 +5,7 @@ import * as Hume from "../../../../../index.js";
 import { ChatSocket } from "./Socket.js";
 export declare namespace Chat {
     interface Options {
-        environment?: core.Supplier<environments.HumeEnvironment | environments.HumeEnvironmentUrls>;
+        environment?: core.Supplier<environments.HumeEnvironment | environments.HumeEnvironmentUrls | string>;
         /** Specify a custom URL to connect the client to. */
         baseUrl?: core.Supplier<string>;
         apiKey?: core.Supplier<string | undefined>;

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

@@ -40,12 +40,21 @@ const core = __importStar(require("../../../../../../core/index.js"));
 const headers_js_1 = require("../../../../../../core/headers.js");
 const serializers = __importStar(require("../../../../../../serialization/index.js"));
 const Socket_js_1 = require("./Socket.js");
+function createHostnameWithProtocol(url) {
+    const protocol = /(https|http|wss|ws):\/\//.exec(url);
+    if (protocol) {
+        return url.replace("https://", "wss://").replace("http://", "ws://");
+    }
+    else {
+        return `wss://${url}`;
+    }
+}
 class Chat {
     constructor(_options = {}) {
         this._options = _options;
     }
     connect(args = {}) {
-        var _a, _b;
+        var _a;
         const { accessToken, configId, configVersion, eventLimit, resumedChatGroupId, verboseTranscription, voiceId, apiKey, sessionSettings, queryParams, headers, debug, reconnectAttempts, } = args;
         const _queryParams = {};
         if (accessToken != null) {
@@ -89,8 +98,24 @@ class Chat {
             }
         }
         let _headers = (0, headers_js_1.mergeHeaders)((0, headers_js_1.mergeOnlyDefinedHeaders)(Object.assign({}, this._getCustomAuthorizationHeaders())), headers);
+        // Construct WebSocket URL with protocol conversion
+        const baseUrl = core.Supplier.get(this._options["baseUrl"]);
+        const environment = (_a = core.Supplier.get(this._options["environment"])) !== null && _a !== void 0 ? _a : environments.HumeEnvironment.Prod;
+        let websocketUrl;
+        if (baseUrl) {
+            // baseUrl takes precedence - apply protocol conversion
+            websocketUrl = core.url.join(createHostnameWithProtocol(baseUrl), "/v0/evi/chat");
+        }
+        else if (typeof environment === "string") {
+            // String environment - apply protocol conversion
+            websocketUrl = core.url.join(createHostnameWithProtocol(environment), "/v0/evi/chat");
+        }
+        else {
+            // Structured environment object - use .evi property directly
+            websocketUrl = core.url.join(environment.evi, "/chat");
+        }
         const socket = new core.ReconnectingWebSocket({
-            url: core.url.join((_a = core.Supplier.get(this._options["baseUrl"])) !== null && _a !== void 0 ? _a : ((_b = core.Supplier.get(this._options["environment"])) !== null && _b !== void 0 ? _b : environments.HumeEnvironment.Prod).evi, "/chat"),
+            url: websocketUrl,
             protocols: [],
             queryParameters: _queryParams,
             headers: _headers,

package/dist/core/fetcher/Supplier.d.ts

@@ -2,5 +2,5 @@
 export type Supplier<T> = T | (() => T);
 export declare const Supplier: {
     get: <T>(supplier: Supplier<T>) => T;
-    map: <T, U>(supplier: Supplier<T>, f: (value: T) => U) => Supplier<U>;
+    map: <T, U, R = U>(supplier: Supplier<T>, f: (value: T) => R) => Supplier<R>;
 };

package/dist/wrapper/HumeClient.d.ts

@@ -1,15 +1,18 @@
 import { HumeClient as FernClient } from "../Client";
 import * as core from "../core/index.js";
 import { ExpressionMeasurement } from "./expressionMeasurement/ExpressionMeasurementClient";
+import * as environments from "../environments.js";
 export declare namespace HumeClient {
-    type Options = FernClient.Options & {
+    type Options = Omit<FernClient.Options, 'environment'> & {
         secretKey?: string;
         accessToken?: string;
     } & ({
         accessToken: NonNullable<core.Supplier<string>>;
     } | {
         apiKey: NonNullable<FernClient.Options["apiKey"]>;
-    });
+    }) & {
+        environment: core.Supplier<environments.HumeEnvironment | environments.HumeEnvironmentUrls | string>;
+    };
 }
 export declare class HumeClient extends FernClient {
     constructor(_options: HumeClient.Options);

package/dist/wrapper/HumeClient.js

@@ -32,6 +32,17 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HumeClient = void 0;
 const Client_1 = require("../Client");
@@ -39,6 +50,10 @@ const core = __importStar(require("../core/index.js"));
 const ExpressionMeasurementClient_1 = require("./expressionMeasurement/ExpressionMeasurementClient");
 class HumeClient extends Client_1.HumeClient {
     constructor(_options) {
+        var _a;
+        let options;
+        let oldEnvironment;
+        (_a = _options || {}, { environment: oldEnvironment } = _a, options = __rest(_a, ["environment"]));
         // Check if both accessToken and Authorization header are provided (case-insensitive)
         if (_options.accessToken && _options.headers) {
             const hasAuthHeader = Object.keys(_options.headers).some((key) => key.toLowerCase() === "authorization");
@@ -46,12 +61,43 @@ class HumeClient extends Client_1.HumeClient {
                 throw new Error("Cannot provide both 'accessToken' and 'headers.Authorization'. Please use only one.");
             }
         }
-        // If accessToken is provided, add Authorization header
-        let optionsWithAuth = _options || {};
         if (_options.accessToken) {
-            optionsWithAuth = Object.assign(Object.assign({}, _options), { headers: Object.assign(Object.assign({}, _options.headers), { Authorization: core.Supplier.map(_options.accessToken, (token) => `Bearer ${token}`) }) });
+            options.headers = Object.assign(Object.assign({}, options.headers), { Authorization: core.Supplier.map(_options.accessToken, (token) => `Bearer ${token}`) });
+        }
+        // Allow setting a single url http://... or https://... for environment'
+        if (oldEnvironment) {
+            const environment = _options.environment ? core.Supplier.map(_options.environment, (e) => {
+                if (typeof e === "string") {
+                    if (e.startsWith("http://")) {
+                        return {
+                            base: e,
+                            evi: e.replace('http://', 'ws://') + "/v0/evi",
+                            tts: e.replace('http://', 'ws://') + "/v0/tts",
+                            stream: e.replace('http://', 'ws://') + "/v0/stream",
+                        };
+                    }
+                    if (e.startsWith("https://")) {
+                        return {
+                            base: e,
+                            evi: e.replace('https://', 'wss://') + "/v0/evi",
+                            tts: e.replace('https://', 'wss://') + "/v0/tts",
+                            stream: e.replace('https://', 'wss://') + "/v0/stream",
+                        };
+                    }
+                    return {
+                        base: 'https://' + e,
+                        evi: 'wss://' + e + "/v0/evi",
+                        tts: 'wss://' + e + "/v0/tts",
+                        stream: 'wss://' + e + "/v0/stream",
+                    };
+                }
+                else {
+                    return e;
+                }
+            }) : undefined;
+            options.environment = environment;
         }
-        super(optionsWithAuth);
+        super(options);
     }
     get expressionMeasurement() {
         var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hume",
-    "version": "0.14.2-beta.3",
+    "version": "0.14.2-beta.5",
     "private": false,
     "repository": "https://github.com/HumeAI/hume-typescript-sdk",
     "main": "./index.js",

package/wrapper/HumeClient.d.ts

@@ -1,15 +1,18 @@
 import { HumeClient as FernClient } from "../Client";
 import * as core from "../core/index.js";
 import { ExpressionMeasurement } from "./expressionMeasurement/ExpressionMeasurementClient";
+import * as environments from "../environments.js";
 export declare namespace HumeClient {
-    type Options = FernClient.Options & {
+    type Options = Omit<FernClient.Options, 'environment'> & {
         secretKey?: string;
         accessToken?: string;
     } & ({
         accessToken: NonNullable<core.Supplier<string>>;
     } | {
         apiKey: NonNullable<FernClient.Options["apiKey"]>;
-    });
+    }) & {
+        environment: core.Supplier<environments.HumeEnvironment | environments.HumeEnvironmentUrls | string>;
+    };
 }
 export declare class HumeClient extends FernClient {
     constructor(_options: HumeClient.Options);

package/wrapper/HumeClient.js

@@ -32,6 +32,17 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HumeClient = void 0;
 const Client_1 = require("../Client");
@@ -39,6 +50,10 @@ const core = __importStar(require("../core/index.js"));
 const ExpressionMeasurementClient_1 = require("./expressionMeasurement/ExpressionMeasurementClient");
 class HumeClient extends Client_1.HumeClient {
     constructor(_options) {
+        var _a;
+        let options;
+        let oldEnvironment;
+        (_a = _options || {}, { environment: oldEnvironment } = _a, options = __rest(_a, ["environment"]));
         // Check if both accessToken and Authorization header are provided (case-insensitive)
         if (_options.accessToken && _options.headers) {
             const hasAuthHeader = Object.keys(_options.headers).some((key) => key.toLowerCase() === "authorization");
@@ -46,12 +61,43 @@ class HumeClient extends Client_1.HumeClient {
                 throw new Error("Cannot provide both 'accessToken' and 'headers.Authorization'. Please use only one.");
             }
         }
-        // If accessToken is provided, add Authorization header
-        let optionsWithAuth = _options || {};
         if (_options.accessToken) {
-            optionsWithAuth = Object.assign(Object.assign({}, _options), { headers: Object.assign(Object.assign({}, _options.headers), { Authorization: core.Supplier.map(_options.accessToken, (token) => `Bearer ${token}`) }) });
+            options.headers = Object.assign(Object.assign({}, options.headers), { Authorization: core.Supplier.map(_options.accessToken, (token) => `Bearer ${token}`) });
+        }
+        // Allow setting a single url http://... or https://... for environment'
+        if (oldEnvironment) {
+            const environment = _options.environment ? core.Supplier.map(_options.environment, (e) => {
+                if (typeof e === "string") {
+                    if (e.startsWith("http://")) {
+                        return {
+                            base: e,
+                            evi: e.replace('http://', 'ws://') + "/v0/evi",
+                            tts: e.replace('http://', 'ws://') + "/v0/tts",
+                            stream: e.replace('http://', 'ws://') + "/v0/stream",
+                        };
+                    }
+                    if (e.startsWith("https://")) {
+                        return {
+                            base: e,
+                            evi: e.replace('https://', 'wss://') + "/v0/evi",
+                            tts: e.replace('https://', 'wss://') + "/v0/tts",
+                            stream: e.replace('https://', 'wss://') + "/v0/stream",
+                        };
+                    }
+                    return {
+                        base: 'https://' + e,
+                        evi: 'wss://' + e + "/v0/evi",
+                        tts: 'wss://' + e + "/v0/tts",
+                        stream: 'wss://' + e + "/v0/stream",
+                    };
+                }
+                else {
+                    return e;
+                }
+            }) : undefined;
+            options.environment = environment;
         }
-        super(optionsWithAuth);
+        super(options);
     }
     get expressionMeasurement() {
         var _a;