@speechos/core 0.2.5 → 0.2.6

package/dist/index.d.cts

@@ -12,5 +12,5 @@ export { livekit, Deferred } from "./livekit.js";
 export { websocket } from "./websocket.js";
 export { getBackend } from "./backend.js";
 export type { VoiceBackend } from "./backend.js";
-export type { SpeechOSCoreConfig, SpeechOSState, SpeechOSAction, SpeechOSEventMap, StateChangeCallback, UnsubscribeFn, RecordingState, LiveKitTokenResponse, ServerErrorMessage, ErrorSource, UserVocabularyData, CommandArgument, CommandDefinition, CommandResult, SessionSettings, VoiceSessionOptions, } from "./types.js";
+export type { SpeechOSCoreConfig, SpeechOSState, SpeechOSAction, SpeechOSEventMap, StateChangeCallback, UnsubscribeFn, RecordingState, LiveKitTokenResponse, ServerErrorMessage, ErrorSource, UserVocabularyData, CommandArgument, CommandDefinition, CommandResult, SessionSettings, VoiceSessionOptions, WebSocketLike, WebSocketFactory, } from "./types.js";
 export declare const VERSION = "0.1.0";

package/dist/index.d.ts

@@ -12,5 +12,5 @@ export { livekit, Deferred } from "./livekit.js";
 export { websocket } from "./websocket.js";
 export { getBackend } from "./backend.js";
 export type { VoiceBackend } from "./backend.js";
-export type { SpeechOSCoreConfig, SpeechOSState, SpeechOSAction, SpeechOSEventMap, StateChangeCallback, UnsubscribeFn, RecordingState, LiveKitTokenResponse, ServerErrorMessage, ErrorSource, UserVocabularyData, CommandArgument, CommandDefinition, CommandResult, SessionSettings, VoiceSessionOptions, } from "./types.js";
+export type { SpeechOSCoreConfig, SpeechOSState, SpeechOSAction, SpeechOSEventMap, StateChangeCallback, UnsubscribeFn, RecordingState, LiveKitTokenResponse, ServerErrorMessage, ErrorSource, UserVocabularyData, CommandArgument, CommandDefinition, CommandResult, SessionSettings, VoiceSessionOptions, WebSocketLike, WebSocketFactory, } from "./types.js";
 export declare const VERSION = "0.1.0";

package/dist/index.js

@@ -12,7 +12,8 @@ const defaultConfig = {
 	apiKey: "",
 	userId: "",
 	host: DEFAULT_HOST,
-	debug: false
+	debug: false,
+	webSocketFactory: void 0
 };
 /**
 * Validates and merges user config with defaults
@@ -25,7 +26,8 @@ function validateConfig(userConfig) {
 		apiKey: userConfig.apiKey,
 		userId: userConfig.userId ?? defaultConfig.userId,
 		host: userConfig.host ?? defaultConfig.host,
-		debug: userConfig.debug ?? defaultConfig.debug
+		debug: userConfig.debug ?? defaultConfig.debug,
+		webSocketFactory: userConfig.webSocketFactory ?? defaultConfig.webSocketFactory
 	};
 }
 /**
@@ -1395,6 +1397,8 @@ const MESSAGE_TYPE_EDITED_TEXT = "edited_text";
 const MESSAGE_TYPE_EXECUTE_COMMAND = "execute_command";
 const MESSAGE_TYPE_COMMAND_RESULT = "command_result";
 const MESSAGE_TYPE_ERROR = "error";
+const WS_OPEN = 1;
+const WS_CLOSED = 3;
 /**
 * Response timeout in milliseconds.
 */
@@ -1513,7 +1517,10 @@ var WebSocketManager = class {
 		state.setMicEnabled(true);
 		const wsUrl = this.getWebSocketUrl();
 		if (config.debug) console.log("[SpeechOS] Connecting to WebSocket:", wsUrl);
-		this.ws = new WebSocket(wsUrl);
+		this.pendingAuth = new Deferred$1();
+		this.pendingAuth.setTimeout(RESPONSE_TIMEOUT_MS, "Connection timed out", "connection_timeout", "connection");
+		const factory = config.webSocketFactory ?? ((url) => new WebSocket(url));
+		this.ws = factory(wsUrl);
 		this.ws.onopen = () => {
 			if (config.debug) console.log("[SpeechOS] WebSocket connected, authenticating...");
 			this.authenticate();
@@ -1522,19 +1529,21 @@ var WebSocketManager = class {
 			this.handleMessage(event.data);
 		};
 		this.ws.onerror = (event) => {
-			console.error("[SpeechOS] WebSocket error:", event);
+			const isConnectionBlocked = this.ws?.readyState === WS_CLOSED;
+			const errorCode = isConnectionBlocked ? "connection_blocked" : "websocket_error";
+			const errorMessage = isConnectionBlocked ? "This site's CSP blocks the extension. Try embedded mode instead." : "WebSocket connection error";
+			console.error("[SpeechOS] WebSocket error:", event, { isConnectionBlocked });
 			events.emit("error", {
-				code: "websocket_error",
-				message: "WebSocket connection error",
+				code: errorCode,
+				message: errorMessage,
 				source: "connection"
 			});
+			if (this.pendingAuth) this.pendingAuth.reject(new Error(errorMessage));
 		};
 		this.ws.onclose = (event) => {
 			if (config.debug) console.log("[SpeechOS] WebSocket closed:", event.code, event.reason);
 			state.setConnected(false);
 		};
-		this.pendingAuth = new Deferred$1();
-		this.pendingAuth.setTimeout(RESPONSE_TIMEOUT_MS, "Connection timed out", "connection_timeout", "connection");
 		await this.pendingAuth.promise;
 		this.pendingAuth = null;
 		if (this.audioCapture) this.audioCapture.setReady();
@@ -1583,7 +1592,7 @@ var WebSocketManager = class {
 	* Actually send the audio chunk (async operation).
 	*/
 	async doSendAudioChunk(chunk) {
-		if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+		if (this.ws && this.ws.readyState === WS_OPEN) {
 			const arrayBuffer = await chunk.arrayBuffer();
 			this.ws.send(arrayBuffer);
 		}
@@ -1769,7 +1778,7 @@ var WebSocketManager = class {
 	* the transcript. Uses the same pattern as LiveKit's ReadableStream approach.
 	*/
 	async waitForBufferDrain() {
-		if (!this.ws || this.ws.readyState !== WebSocket.OPEN) return;
+		if (!this.ws || this.ws.readyState !== WS_OPEN) return;
 		const config = getConfig();
 		const startTime = Date.now();
 		while (this.ws.bufferedAmount > 0) {
@@ -1785,7 +1794,7 @@ var WebSocketManager = class {
 	* Send a JSON message over the WebSocket.
 	*/
 	sendMessage(message) {
-		if (this.ws && this.ws.readyState === WebSocket.OPEN) this.ws.send(JSON.stringify(message));
+		if (this.ws && this.ws.readyState === WS_OPEN) this.ws.send(JSON.stringify(message));
 	}
 	/**
 	* Disconnect from the WebSocket.
@@ -1827,7 +1836,7 @@ var WebSocketManager = class {
 	* Check if connected to WebSocket.
 	*/
 	isConnected() {
-		return this.ws !== null && this.ws.readyState === WebSocket.OPEN;
+		return this.ws !== null && this.ws.readyState === WS_OPEN;
 	}
 	/**
 	* Get the last input text from a command result.