@absolutejs/voice 0.0.22-beta.647 → 0.0.22-beta.649

package/dist/svelte/index.js

@@ -525,29 +525,34 @@ var createMicrophoneCapture = (options) => {
     if (!AudioContextCtor) {
       throw new Error("Browser microphone capture requires AudioContext support.");
     }
-    mediaStream = options.stream ?? await navigator.mediaDevices.getUserMedia({
-      audio: {
-        autoGainControl: true,
-        channelCount: options.channelCount ?? 1,
-        echoCancellation: true,
-        noiseSuppression: true
+    try {
+      mediaStream = options.stream ?? await navigator.mediaDevices.getUserMedia({
+        audio: {
+          autoGainControl: true,
+          channelCount: options.channelCount ?? 1,
+          echoCancellation: true,
+          noiseSuppression: true
+        }
+      });
+      audioContext = new AudioContextCtor;
+      if (audioContext.state === "suspended") {
+        await audioContext.resume();
       }
-    });
-    audioContext = new AudioContextCtor;
-    if (audioContext.state === "suspended") {
-      await audioContext.resume();
-    }
-    sourceNode = audioContext.createMediaStreamSource(mediaStream);
-    processorNode = audioContext.createScriptProcessor(4096, 1, 1);
-    processorNode.onaudioprocess = (event) => {
-      const channel = event.inputBuffer.getChannelData(0);
-      const downsampled = downsampleBuffer(channel, audioContext?.sampleRate ?? 48000, options.sampleRateHz ?? 16000);
-      const pcm = floatTo16BitPCM(downsampled);
-      options.onLevel?.(getPcmLevel(pcm));
-      options.onAudio(pcm);
-    };
-    sourceNode.connect(processorNode);
-    processorNode.connect(audioContext.destination);
+      sourceNode = audioContext.createMediaStreamSource(mediaStream);
+      processorNode = audioContext.createScriptProcessor(4096, 1, 1);
+      processorNode.onaudioprocess = (event) => {
+        const channel = event.inputBuffer.getChannelData(0);
+        const downsampled = downsampleBuffer(channel, audioContext?.sampleRate ?? 48000, options.sampleRateHz ?? 16000);
+        const pcm = floatTo16BitPCM(downsampled);
+        options.onLevel?.(getPcmLevel(pcm));
+        options.onAudio(pcm);
+      };
+      sourceNode.connect(processorNode);
+      processorNode.connect(audioContext.destination);
+    } catch (error) {
+      stop();
+      throw error;
+    }
   };
   const stop = () => {
     processorNode?.disconnect();
@@ -767,6 +772,7 @@ var noopUnsubscribe = () => noop;
 var NOOP_CONNECTION = {
   callControl: noop,
   close: noop,
+  disconnect: noop,
   endTurn: noop,
   send: noop,
   sendAudio: noop,
@@ -778,7 +784,7 @@ var NOOP_CONNECTION = {
   start: () => {}
 };
 var createSessionId = () => crypto.randomUUID();
-var buildWsUrl = (path, sessionId, scenarioId) => {
+var buildWsUrl = (path, sessionId, scenarioId, query) => {
   const { hostname, port, protocol } = window.location;
   const wsProtocol = protocol === "https:" ? "wss:" : "ws:";
   const portSuffix = port ? `:${port}` : "";
@@ -787,6 +793,11 @@ var buildWsUrl = (path, sessionId, scenarioId) => {
   if (scenarioId) {
     url.searchParams.set(DEFAULT_SCENARIO_QUERY_PARAM, scenarioId);
   }
+  for (const [key, value] of Object.entries(query)) {
+    if (key !== "sessionId" && key !== DEFAULT_SCENARIO_QUERY_PARAM && value) {
+      url.searchParams.set(key, value);
+    }
+  }
   return url.toString();
 };
 var isVoiceServerMessage = (value) => {
@@ -896,7 +907,7 @@ var createVoiceConnection = (path, options = {}) => {
     }, delayMs);
   };
   const connect = () => {
-    const ws = new WebSocket(buildWsUrl(path, state.sessionId, state.scenarioId));
+    const ws = new WebSocket(buildWsUrl(path, state.sessionId, state.scenarioId, options.query ?? {}));
     ws.binaryType = "arraybuffer";
     ws.onopen = () => {
       const wasReconnecting = state.reconnectAttempts > 0;
@@ -992,7 +1003,19 @@ var createVoiceConnection = (path, options = {}) => {
       type: "call_control"
     });
   };
-  const close = () => {
+  const close = (reason = "client-close") => {
+    clearTimers();
+    if (state.ws) {
+      if (state.ws.readyState === WS_OPEN) {
+        state.ws.send(JSON.stringify({ reason, type: "close" }));
+      }
+      state.ws.close(WS_NORMAL_CLOSURE);
+      state.ws = null;
+    }
+    state.isConnected = false;
+    listeners.clear();
+  };
+  const disconnect = () => {
     clearTimers();
     if (state.ws) {
       state.ws.close(WS_NORMAL_CLOSURE);
@@ -1016,6 +1039,7 @@ var createVoiceConnection = (path, options = {}) => {
   return {
     callControl,
     close,
+    disconnect,
     endTurn,
     send,
     sendAudio,
@@ -1296,10 +1320,17 @@ var createVoiceStream = (path, options = {}) => {
     callControl(message) {
       connection.callControl(message);
     },
-    close() {
+    close(reason) {
       unsubscribeConnection();
       browserMediaReporter?.close();
-      connection.close();
+      connection.close(reason);
+      store.dispatch({ type: "disconnected" });
+      notify();
+    },
+    disconnect() {
+      unsubscribeConnection();
+      browserMediaReporter?.close();
+      connection.disconnect();
       store.dispatch({ type: "disconnected" });
       notify();
     },
@@ -1781,6 +1812,7 @@ var createVoiceController = (path, options = {}) => {
       };
       notify();
     } catch (error) {
+      capture?.stop();
       capture = null;
       state = {
         ...state,
@@ -1791,13 +1823,19 @@ var createVoiceController = (path, options = {}) => {
       throw error;
     }
   };
-  const close = () => {
+  const close = (reason) => {
+    unsubscribeStream();
+    stopRecording();
+    stream.close(reason);
+  };
+  const disconnect = () => {
     unsubscribeStream();
     stopRecording();
-    stream.close();
+    stream.disconnect();
   };
   return {
     close,
+    disconnect,
     startRecording,
     stopRecording,
     get assistantAudio() {

package/dist/testing/index.js

@@ -2746,29 +2746,34 @@ var createMicrophoneCapture = (options) => {
     if (!AudioContextCtor) {
       throw new Error("Browser microphone capture requires AudioContext support.");
     }
-    mediaStream = options.stream ?? await navigator.mediaDevices.getUserMedia({
-      audio: {
-        autoGainControl: true,
-        channelCount: options.channelCount ?? 1,
-        echoCancellation: true,
-        noiseSuppression: true
-      }
-    });
-    audioContext = new AudioContextCtor;
-    if (audioContext.state === "suspended") {
-      await audioContext.resume();
-    }
-    sourceNode = audioContext.createMediaStreamSource(mediaStream);
-    processorNode = audioContext.createScriptProcessor(4096, 1, 1);
-    processorNode.onaudioprocess = (event) => {
-      const channel = event.inputBuffer.getChannelData(0);
-      const downsampled = downsampleBuffer(channel, audioContext?.sampleRate ?? 48000, options.sampleRateHz ?? 16000);
-      const pcm = floatTo16BitPCM(downsampled);
-      options.onLevel?.(getPcmLevel(pcm));
-      options.onAudio(pcm);
-    };
-    sourceNode.connect(processorNode);
-    processorNode.connect(audioContext.destination);
+    try {
+      mediaStream = options.stream ?? await navigator.mediaDevices.getUserMedia({
+        audio: {
+          autoGainControl: true,
+          channelCount: options.channelCount ?? 1,
+          echoCancellation: true,
+          noiseSuppression: true
+        }
+      });
+      audioContext = new AudioContextCtor;
+      if (audioContext.state === "suspended") {
+        await audioContext.resume();
+      }
+      sourceNode = audioContext.createMediaStreamSource(mediaStream);
+      processorNode = audioContext.createScriptProcessor(4096, 1, 1);
+      processorNode.onaudioprocess = (event) => {
+        const channel = event.inputBuffer.getChannelData(0);
+        const downsampled = downsampleBuffer(channel, audioContext?.sampleRate ?? 48000, options.sampleRateHz ?? 16000);
+        const pcm = floatTo16BitPCM(downsampled);
+        options.onLevel?.(getPcmLevel(pcm));
+        options.onAudio(pcm);
+      };
+      sourceNode.connect(processorNode);
+      processorNode.connect(audioContext.destination);
+    } catch (error) {
+      stop();
+      throw error;
+    }
   };
   const stop = () => {
     processorNode?.disconnect();
@@ -2988,6 +2993,7 @@ var noopUnsubscribe = () => noop;
 var NOOP_CONNECTION = {
   callControl: noop,
   close: noop,
+  disconnect: noop,
   endTurn: noop,
   send: noop,
   sendAudio: noop,
@@ -2999,7 +3005,7 @@ var NOOP_CONNECTION = {
   start: () => {}
 };
 var createSessionId = () => crypto.randomUUID();
-var buildWsUrl = (path, sessionId, scenarioId) => {
+var buildWsUrl = (path, sessionId, scenarioId, query) => {
   const { hostname, port, protocol } = window.location;
   const wsProtocol = protocol === "https:" ? "wss:" : "ws:";
   const portSuffix = port ? `:${port}` : "";
@@ -3008,6 +3014,11 @@ var buildWsUrl = (path, sessionId, scenarioId) => {
   if (scenarioId) {
     url.searchParams.set(DEFAULT_SCENARIO_QUERY_PARAM, scenarioId);
   }
+  for (const [key, value] of Object.entries(query)) {
+    if (key !== "sessionId" && key !== DEFAULT_SCENARIO_QUERY_PARAM && value) {
+      url.searchParams.set(key, value);
+    }
+  }
   return url.toString();
 };
 var isVoiceServerMessage = (value) => {
@@ -3117,7 +3128,7 @@ var createVoiceConnection = (path, options = {}) => {
     }, delayMs);
   };
   const connect = () => {
-    const ws = new WebSocket(buildWsUrl(path, state.sessionId, state.scenarioId));
+    const ws = new WebSocket(buildWsUrl(path, state.sessionId, state.scenarioId, options.query ?? {}));
     ws.binaryType = "arraybuffer";
     ws.onopen = () => {
       const wasReconnecting = state.reconnectAttempts > 0;
@@ -3213,7 +3224,19 @@ var createVoiceConnection = (path, options = {}) => {
       type: "call_control"
     });
   };
-  const close = () => {
+  const close = (reason = "client-close") => {
+    clearTimers();
+    if (state.ws) {
+      if (state.ws.readyState === WS_OPEN) {
+        state.ws.send(JSON.stringify({ reason, type: "close" }));
+      }
+      state.ws.close(WS_NORMAL_CLOSURE);
+      state.ws = null;
+    }
+    state.isConnected = false;
+    listeners.clear();
+  };
+  const disconnect = () => {
     clearTimers();
     if (state.ws) {
       state.ws.close(WS_NORMAL_CLOSURE);
@@ -3237,6 +3260,7 @@ var createVoiceConnection = (path, options = {}) => {
   return {
     callControl,
     close,
+    disconnect,
     endTurn,
     send,
     sendAudio,
@@ -3517,10 +3541,17 @@ var createVoiceStream = (path, options = {}) => {
     callControl(message) {
       connection.callControl(message);
     },
-    close() {
+    close(reason) {
+      unsubscribeConnection();
+      browserMediaReporter?.close();
+      connection.close(reason);
+      store.dispatch({ type: "disconnected" });
+      notify();
+    },
+    disconnect() {
       unsubscribeConnection();
       browserMediaReporter?.close();
-      connection.close();
+      connection.disconnect();
       store.dispatch({ type: "disconnected" });
       notify();
     },
@@ -4002,6 +4033,7 @@ var createVoiceController = (path, options = {}) => {
       };
       notify();
     } catch (error) {
+      capture?.stop();
       capture = null;
       state = {
         ...state,
@@ -4012,13 +4044,19 @@ var createVoiceController = (path, options = {}) => {
       throw error;
     }
   };
-  const close = () => {
+  const close = (reason) => {
     unsubscribeStream();
     stopRecording();
-    stream.close();
+    stream.close(reason);
+  };
+  const disconnect = () => {
+    unsubscribeStream();
+    stopRecording();
+    stream.disconnect();
   };
   return {
     close,
+    disconnect,
     startRecording,
     stopRecording,
     get assistantAudio() {
@@ -7702,7 +7740,7 @@ var createVoiceSession = (options) => {
     clearSilenceTimer();
     let didFail = false;
     const session = await writeSession((currentSession) => {
-      if (currentSession.status === "failed") {
+      if (currentSession.status === "completed" || currentSession.status === "failed") {
         return;
       }
       didFail = true;

package/dist/vue/index.js

@@ -10840,6 +10840,7 @@ var noopUnsubscribe = () => noop;
 var NOOP_CONNECTION = {
   callControl: noop,
   close: noop,
+  disconnect: noop,
   endTurn: noop,
   send: noop,
   sendAudio: noop,
@@ -10851,7 +10852,7 @@ var NOOP_CONNECTION = {
   start: () => {}
 };
 var createSessionId = () => crypto.randomUUID();
-var buildWsUrl = (path, sessionId, scenarioId) => {
+var buildWsUrl = (path, sessionId, scenarioId, query) => {
   const { hostname, port, protocol } = window.location;
   const wsProtocol = protocol === "https:" ? "wss:" : "ws:";
   const portSuffix = port ? `:${port}` : "";
@@ -10860,6 +10861,11 @@ var buildWsUrl = (path, sessionId, scenarioId) => {
   if (scenarioId) {
     url.searchParams.set(DEFAULT_SCENARIO_QUERY_PARAM, scenarioId);
   }
+  for (const [key, value] of Object.entries(query)) {
+    if (key !== "sessionId" && key !== DEFAULT_SCENARIO_QUERY_PARAM && value) {
+      url.searchParams.set(key, value);
+    }
+  }
   return url.toString();
 };
 var isVoiceServerMessage = (value) => {
@@ -10969,7 +10975,7 @@ var createVoiceConnection = (path, options = {}) => {
     }, delayMs);
   };
   const connect = () => {
-    const ws = new WebSocket(buildWsUrl(path, state.sessionId, state.scenarioId));
+    const ws = new WebSocket(buildWsUrl(path, state.sessionId, state.scenarioId, options.query ?? {}));
     ws.binaryType = "arraybuffer";
     ws.onopen = () => {
       const wasReconnecting = state.reconnectAttempts > 0;
@@ -11065,7 +11071,19 @@ var createVoiceConnection = (path, options = {}) => {
       type: "call_control"
     });
   };
-  const close = () => {
+  const close = (reason = "client-close") => {
+    clearTimers();
+    if (state.ws) {
+      if (state.ws.readyState === WS_OPEN) {
+        state.ws.send(JSON.stringify({ reason, type: "close" }));
+      }
+      state.ws.close(WS_NORMAL_CLOSURE);
+      state.ws = null;
+    }
+    state.isConnected = false;
+    listeners.clear();
+  };
+  const disconnect = () => {
     clearTimers();
     if (state.ws) {
       state.ws.close(WS_NORMAL_CLOSURE);
@@ -11089,6 +11107,7 @@ var createVoiceConnection = (path, options = {}) => {
   return {
     callControl,
     close,
+    disconnect,
     endTurn,
     send,
     sendAudio,
@@ -11369,10 +11388,17 @@ var createVoiceStream = (path, options = {}) => {
     callControl(message) {
       connection.callControl(message);
     },
-    close() {
+    close(reason) {
+      unsubscribeConnection();
+      browserMediaReporter?.close();
+      connection.close(reason);
+      store.dispatch({ type: "disconnected" });
+      notify();
+    },
+    disconnect() {
       unsubscribeConnection();
       browserMediaReporter?.close();
-      connection.close();
+      connection.disconnect();
       store.dispatch({ type: "disconnected" });
       notify();
     },
@@ -11596,29 +11622,34 @@ var createMicrophoneCapture = (options) => {
     if (!AudioContextCtor) {
       throw new Error("Browser microphone capture requires AudioContext support.");
     }
-    mediaStream = options.stream ?? await navigator.mediaDevices.getUserMedia({
-      audio: {
-        autoGainControl: true,
-        channelCount: options.channelCount ?? 1,
-        echoCancellation: true,
-        noiseSuppression: true
+    try {
+      mediaStream = options.stream ?? await navigator.mediaDevices.getUserMedia({
+        audio: {
+          autoGainControl: true,
+          channelCount: options.channelCount ?? 1,
+          echoCancellation: true,
+          noiseSuppression: true
+        }
+      });
+      audioContext = new AudioContextCtor;
+      if (audioContext.state === "suspended") {
+        await audioContext.resume();
       }
-    });
-    audioContext = new AudioContextCtor;
-    if (audioContext.state === "suspended") {
-      await audioContext.resume();
-    }
-    sourceNode = audioContext.createMediaStreamSource(mediaStream);
-    processorNode = audioContext.createScriptProcessor(4096, 1, 1);
-    processorNode.onaudioprocess = (event) => {
-      const channel = event.inputBuffer.getChannelData(0);
-      const downsampled = downsampleBuffer(channel, audioContext?.sampleRate ?? 48000, options.sampleRateHz ?? 16000);
-      const pcm = floatTo16BitPCM(downsampled);
-      options.onLevel?.(getPcmLevel(pcm));
-      options.onAudio(pcm);
-    };
-    sourceNode.connect(processorNode);
-    processorNode.connect(audioContext.destination);
+      sourceNode = audioContext.createMediaStreamSource(mediaStream);
+      processorNode = audioContext.createScriptProcessor(4096, 1, 1);
+      processorNode.onaudioprocess = (event) => {
+        const channel = event.inputBuffer.getChannelData(0);
+        const downsampled = downsampleBuffer(channel, audioContext?.sampleRate ?? 48000, options.sampleRateHz ?? 16000);
+        const pcm = floatTo16BitPCM(downsampled);
+        options.onLevel?.(getPcmLevel(pcm));
+        options.onAudio(pcm);
+      };
+      sourceNode.connect(processorNode);
+      processorNode.connect(audioContext.destination);
+    } catch (error) {
+      stop();
+      throw error;
+    }
   };
   const stop = () => {
     processorNode?.disconnect();
@@ -12061,6 +12092,7 @@ var createVoiceController = (path, options = {}) => {
       };
       notify();
     } catch (error) {
+      capture?.stop();
       capture = null;
       state = {
         ...state,
@@ -12071,13 +12103,19 @@ var createVoiceController = (path, options = {}) => {
       throw error;
     }
   };
-  const close = () => {
+  const close = (reason) => {
     unsubscribeStream();
     stopRecording();
-    stream.close();
+    stream.close(reason);
+  };
+  const disconnect = () => {
+    unsubscribeStream();
+    stopRecording();
+    stream.disconnect();
   };
   return {
     close,
+    disconnect,
     startRecording,
     stopRecording,
     get assistantAudio() {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@absolutejs/voice",
-  "version": "0.0.22-beta.647",
+  "version": "0.0.22-beta.649",
   "description": "Voice primitives and Elysia plugin for AbsoluteJS",
   "repository": {
     "type": "git",
-    "url": "https://github.com/absolutejs/voice.git"
+    "url": "git+https://github.com/absolutejs/voice.git"
   },
   "homepage": "https://github.com/absolutejs/voice",
   "bugs": {