@absolutejs/voice 0.0.22-beta.654 → 0.0.22-beta.656

package/dist/angular/index.js

@@ -593,6 +593,13 @@ var RECONNECT_BASE_DELAY_MS = 500;
 var DEFAULT_RECONNECT_MAX_DELAY_MS = 8000;
 var computeVoiceReconnectDelayMs = (attempt, baseMs, maxDelayMs) => Math.min(maxDelayMs, baseMs * 2 ** (Math.max(1, attempt) - 1));
 var DEFAULT_SCENARIO_QUERY_PARAM = "scenarioId";
+
+class VoiceReconnectRejectedError extends Error {
+  constructor(message = "Voice authorization could not be renewed.") {
+    super(message);
+    this.name = "VoiceReconnectRejectedError";
+  }
+}
 var noop = () => {};
 var noopAsync = () => Promise.resolve();
 var noopUnsubscribe = () => noop;
@@ -672,6 +679,8 @@ var createVoiceConnection = (path, options = {}) => {
   const reconnectMaxDelayMs = options.reconnectMaxDelayMs ?? DEFAULT_RECONNECT_MAX_DELAY_MS;
   const pingInterval = options.pingInterval ?? DEFAULT_PING_INTERVAL;
   const reconnectResetAfterMs = options.reconnectResetAfterMs ?? DEFAULT_RECONNECT_RESET_AFTER_MS;
+  let lifecycleGeneration = 0;
+  let disposed = false;
   const computeReconnectDelayMs = (attempt) => computeVoiceReconnectDelayMs(attempt, RECONNECT_BASE_DELAY_MS, reconnectMaxDelayMs);
   const state = {
     isConnected: false,
@@ -687,6 +696,21 @@ var createVoiceConnection = (path, options = {}) => {
   const emitConnection = (reconnect) => {
     listeners.forEach((listener) => listener(reconnect));
   };
+  const emitTerminalFailure = (message) => {
+    listeners.forEach((listener) => listener({
+      message,
+      recoverable: false,
+      type: "error"
+    }));
+    emitConnection({
+      reconnect: {
+        attempts: state.reconnectAttempts,
+        maxAttempts: maxReconnectAttempts,
+        status: "exhausted"
+      },
+      type: "connection"
+    });
+  };
   const clearTimers = () => {
     if (state.pingInterval) {
       clearInterval(state.pingInterval);
@@ -720,6 +744,9 @@ var createVoiceConnection = (path, options = {}) => {
     pendingCallControls.clear();
   };
   const scheduleReconnect = () => {
+    if (disposed)
+      return;
+    const scheduledGeneration = lifecycleGeneration;
     state.reconnectAttempts += 1;
     const delayMs = computeReconnectDelayMs(state.reconnectAttempts);
     const nextAttemptAt = Date.now() + delayMs;
@@ -734,15 +761,10 @@ var createVoiceConnection = (path, options = {}) => {
       type: "connection"
     });
     state.reconnectTimeout = setTimeout(async () => {
+      if (disposed || lifecycleGeneration !== scheduledGeneration)
+        return;
       if (state.reconnectAttempts > maxReconnectAttempts) {
-        emitConnection({
-          reconnect: {
-            attempts: state.reconnectAttempts,
-            maxAttempts: maxReconnectAttempts,
-            status: "exhausted"
-          },
-          type: "connection"
-        });
+        emitTerminalFailure("Voice connection could not be restored.");
         return;
       }
       try {
@@ -752,25 +774,28 @@ var createVoiceConnection = (path, options = {}) => {
           scenarioId: state.scenarioId,
           sessionId: state.sessionId
         });
-      } catch {
+      } catch (error) {
+        if (disposed || lifecycleGeneration !== scheduledGeneration)
+          return;
+        if (error instanceof VoiceReconnectRejectedError) {
+          emitTerminalFailure(error.message);
+          return;
+        }
         if (state.reconnectAttempts < maxReconnectAttempts) {
           scheduleReconnect();
         } else {
-          emitConnection({
-            reconnect: {
-              attempts: state.reconnectAttempts,
-              maxAttempts: maxReconnectAttempts,
-              status: "exhausted"
-            },
-            type: "connection"
-          });
+          emitTerminalFailure("Voice authorization could not be renewed for reconnect.");
         }
         return;
       }
+      if (disposed || lifecycleGeneration !== scheduledGeneration)
+        return;
       connect();
     }, delayMs);
   };
   const connect = () => {
+    if (disposed)
+      return;
     const ws = new WebSocket(buildWsUrl(path, state.sessionId, state.scenarioId, options.query ?? {}));
     ws.binaryType = "arraybuffer";
     ws.onopen = () => {
@@ -841,6 +866,7 @@ var createVoiceConnection = (path, options = {}) => {
       state.ws = null;
       state.isConnected = false;
       clearTimers();
+      rejectPendingCallControls("Voice connection interrupted");
       const reconnectable = shouldReconnect && event.code !== WS_NORMAL_CLOSURE && event.code !== WS_UNAUTHORIZED && event.code !== WS_FORBIDDEN && state.reconnectAttempts < maxReconnectAttempts;
       const authorizationFailure = event.code === WS_UNAUTHORIZED || event.code === WS_FORBIDDEN;
       if (authorizationFailure) {
@@ -853,15 +879,19 @@ var createVoiceConnection = (path, options = {}) => {
       if (reconnectable) {
         scheduleReconnect();
       } else if (shouldReconnect && event.code !== WS_NORMAL_CLOSURE) {
-        emitConnection({
-          reconnect: {
-            attempts: state.reconnectAttempts,
-            lastDisconnectAt: Date.now(),
-            maxAttempts: maxReconnectAttempts,
-            status: "exhausted"
-          },
-          type: "connection"
-        });
+        if (authorizationFailure) {
+          emitConnection({
+            reconnect: {
+              attempts: state.reconnectAttempts,
+              lastDisconnectAt: Date.now(),
+              maxAttempts: maxReconnectAttempts,
+              status: "exhausted"
+            },
+            type: "connection"
+          });
+        } else {
+          emitTerminalFailure("Voice connection could not be restored.");
+        }
       }
     };
     state.ws = ws;
@@ -902,6 +932,9 @@ var createVoiceConnection = (path, options = {}) => {
     send({ type: "end_turn" });
   };
   const callControl = (message) => {
+    if (state.ws?.readyState !== WS_OPEN) {
+      return Promise.reject(new Error(`${message.action} is unavailable while disconnected`));
+    }
     const requestId = crypto.randomUUID();
     const { promise, reject, resolve } = Promise.withResolvers();
     const timeout = setTimeout(() => {
@@ -909,16 +942,19 @@ var createVoiceConnection = (path, options = {}) => {
       reject(new Error(`${message.action} acknowledgement timed out`));
     }, DEFAULT_CALL_CONTROL_ACK_TIMEOUT_MS);
     pendingCallControls.set(requestId, { reject, resolve, timeout });
-    send({
+    state.ws.send(JSON.stringify({
       ...message,
       requestId,
       type: "call_control"
-    });
+    }));
     return promise;
   };
   const close = (reason = "client-close") => {
+    disposed = true;
+    lifecycleGeneration += 1;
     clearTimers();
     rejectPendingCallControls("Voice connection closed");
+    state.pendingMessages.length = 0;
     if (state.ws) {
       const ws = state.ws;
       state.ws = null;
@@ -931,8 +967,11 @@ var createVoiceConnection = (path, options = {}) => {
     listeners.clear();
   };
   const disconnect = () => {
+    disposed = true;
+    lifecycleGeneration += 1;
     clearTimers();
     rejectPendingCallControls("Voice connection disconnected");
+    state.pendingMessages.length = 0;
     if (state.ws) {
       const ws = state.ws;
       state.ws = null;

package/dist/client/connection.d.ts

@@ -22,5 +22,8 @@ type VoiceConnectionHandle = {
     simulateDisconnect: () => void;
     subscribe: (callback: (message: VoiceServerMessage) => void) => () => void;
 };
+export declare class VoiceReconnectRejectedError extends Error {
+    constructor(message?: string);
+}
 export declare const createVoiceConnection: (path: string, options?: VoiceConnectionOptions) => VoiceConnectionHandle;
 export {};

package/dist/client/htmxBootstrap.js

@@ -510,6 +510,13 @@ var RECONNECT_BASE_DELAY_MS = 500;
 var DEFAULT_RECONNECT_MAX_DELAY_MS = 8000;
 var computeVoiceReconnectDelayMs = (attempt, baseMs, maxDelayMs) => Math.min(maxDelayMs, baseMs * 2 ** (Math.max(1, attempt) - 1));
 var DEFAULT_SCENARIO_QUERY_PARAM = "scenarioId";
+
+class VoiceReconnectRejectedError extends Error {
+  constructor(message = "Voice authorization could not be renewed.") {
+    super(message);
+    this.name = "VoiceReconnectRejectedError";
+  }
+}
 var noop = () => {};
 var noopAsync = () => Promise.resolve();
 var noopUnsubscribe = () => noop;
@@ -589,6 +596,8 @@ var createVoiceConnection = (path, options = {}) => {
   const reconnectMaxDelayMs = options.reconnectMaxDelayMs ?? DEFAULT_RECONNECT_MAX_DELAY_MS;
   const pingInterval = options.pingInterval ?? DEFAULT_PING_INTERVAL;
   const reconnectResetAfterMs = options.reconnectResetAfterMs ?? DEFAULT_RECONNECT_RESET_AFTER_MS;
+  let lifecycleGeneration = 0;
+  let disposed = false;
   const computeReconnectDelayMs = (attempt) => computeVoiceReconnectDelayMs(attempt, RECONNECT_BASE_DELAY_MS, reconnectMaxDelayMs);
   const state = {
     isConnected: false,
@@ -604,6 +613,21 @@ var createVoiceConnection = (path, options = {}) => {
   const emitConnection = (reconnect) => {
     listeners.forEach((listener) => listener(reconnect));
   };
+  const emitTerminalFailure = (message) => {
+    listeners.forEach((listener) => listener({
+      message,
+      recoverable: false,
+      type: "error"
+    }));
+    emitConnection({
+      reconnect: {
+        attempts: state.reconnectAttempts,
+        maxAttempts: maxReconnectAttempts,
+        status: "exhausted"
+      },
+      type: "connection"
+    });
+  };
   const clearTimers = () => {
     if (state.pingInterval) {
       clearInterval(state.pingInterval);
@@ -637,6 +661,9 @@ var createVoiceConnection = (path, options = {}) => {
     pendingCallControls.clear();
   };
   const scheduleReconnect = () => {
+    if (disposed)
+      return;
+    const scheduledGeneration = lifecycleGeneration;
     state.reconnectAttempts += 1;
     const delayMs = computeReconnectDelayMs(state.reconnectAttempts);
     const nextAttemptAt = Date.now() + delayMs;
@@ -651,15 +678,10 @@ var createVoiceConnection = (path, options = {}) => {
       type: "connection"
     });
     state.reconnectTimeout = setTimeout(async () => {
+      if (disposed || lifecycleGeneration !== scheduledGeneration)
+        return;
       if (state.reconnectAttempts > maxReconnectAttempts) {
-        emitConnection({
-          reconnect: {
-            attempts: state.reconnectAttempts,
-            maxAttempts: maxReconnectAttempts,
-            status: "exhausted"
-          },
-          type: "connection"
-        });
+        emitTerminalFailure("Voice connection could not be restored.");
         return;
       }
       try {
@@ -669,25 +691,28 @@ var createVoiceConnection = (path, options = {}) => {
           scenarioId: state.scenarioId,
           sessionId: state.sessionId
         });
-      } catch {
+      } catch (error) {
+        if (disposed || lifecycleGeneration !== scheduledGeneration)
+          return;
+        if (error instanceof VoiceReconnectRejectedError) {
+          emitTerminalFailure(error.message);
+          return;
+        }
         if (state.reconnectAttempts < maxReconnectAttempts) {
           scheduleReconnect();
         } else {
-          emitConnection({
-            reconnect: {
-              attempts: state.reconnectAttempts,
-              maxAttempts: maxReconnectAttempts,
-              status: "exhausted"
-            },
-            type: "connection"
-          });
+          emitTerminalFailure("Voice authorization could not be renewed for reconnect.");
         }
         return;
       }
+      if (disposed || lifecycleGeneration !== scheduledGeneration)
+        return;
       connect();
     }, delayMs);
   };
   const connect = () => {
+    if (disposed)
+      return;
     const ws = new WebSocket(buildWsUrl(path, state.sessionId, state.scenarioId, options.query ?? {}));
     ws.binaryType = "arraybuffer";
     ws.onopen = () => {
@@ -758,6 +783,7 @@ var createVoiceConnection = (path, options = {}) => {
       state.ws = null;
       state.isConnected = false;
       clearTimers();
+      rejectPendingCallControls("Voice connection interrupted");
       const reconnectable = shouldReconnect && event.code !== WS_NORMAL_CLOSURE && event.code !== WS_UNAUTHORIZED && event.code !== WS_FORBIDDEN && state.reconnectAttempts < maxReconnectAttempts;
       const authorizationFailure = event.code === WS_UNAUTHORIZED || event.code === WS_FORBIDDEN;
       if (authorizationFailure) {
@@ -770,15 +796,19 @@ var createVoiceConnection = (path, options = {}) => {
       if (reconnectable) {
         scheduleReconnect();
       } else if (shouldReconnect && event.code !== WS_NORMAL_CLOSURE) {
-        emitConnection({
-          reconnect: {
-            attempts: state.reconnectAttempts,
-            lastDisconnectAt: Date.now(),
-            maxAttempts: maxReconnectAttempts,
-            status: "exhausted"
-          },
-          type: "connection"
-        });
+        if (authorizationFailure) {
+          emitConnection({
+            reconnect: {
+              attempts: state.reconnectAttempts,
+              lastDisconnectAt: Date.now(),
+              maxAttempts: maxReconnectAttempts,
+              status: "exhausted"
+            },
+            type: "connection"
+          });
+        } else {
+          emitTerminalFailure("Voice connection could not be restored.");
+        }
       }
     };
     state.ws = ws;
@@ -819,6 +849,9 @@ var createVoiceConnection = (path, options = {}) => {
     send({ type: "end_turn" });
   };
   const callControl = (message) => {
+    if (state.ws?.readyState !== WS_OPEN) {
+      return Promise.reject(new Error(`${message.action} is unavailable while disconnected`));
+    }
     const requestId = crypto.randomUUID();
     const { promise, reject, resolve } = Promise.withResolvers();
     const timeout = setTimeout(() => {
@@ -826,16 +859,19 @@ var createVoiceConnection = (path, options = {}) => {
       reject(new Error(`${message.action} acknowledgement timed out`));
     }, DEFAULT_CALL_CONTROL_ACK_TIMEOUT_MS);
     pendingCallControls.set(requestId, { reject, resolve, timeout });
-    send({
+    state.ws.send(JSON.stringify({
       ...message,
       requestId,
       type: "call_control"
-    });
+    }));
     return promise;
   };
   const close = (reason = "client-close") => {
+    disposed = true;
+    lifecycleGeneration += 1;
     clearTimers();
     rejectPendingCallControls("Voice connection closed");
+    state.pendingMessages.length = 0;
     if (state.ws) {
       const ws = state.ws;
       state.ws = null;
@@ -848,8 +884,11 @@ var createVoiceConnection = (path, options = {}) => {
     listeners.clear();
   };
   const disconnect = () => {
+    disposed = true;
+    lifecycleGeneration += 1;
     clearTimers();
     rejectPendingCallControls("Voice connection disconnected");
+    state.pendingMessages.length = 0;
     if (state.ws) {
       const ws = state.ws;
       state.ws = null;

package/dist/client/index.d.ts

@@ -1,6 +1,6 @@
 export { bindVoiceReactiveSource, voiceSseReactiveSource, } from "./reactiveSource";
 export type { VoiceReactiveSource, VoiceSseReactiveSourceOptions, } from "./reactiveSource";
-export { createVoiceConnection } from "./connection";
+export { createVoiceConnection, VoiceReconnectRejectedError, } from "./connection";
 export { checkBrowserVoiceSupport, probeBrowserVoiceSupport, } from "./browserVoiceSupport";
 export type { BrowserVoiceSupportProbe, BrowserVoiceSupportReport, } from "./browserVoiceSupport";
 export { createVoiceAudioPlayer, decodeVoiceAudioChunk } from "./audioPlayer";

package/dist/client/index.js

@@ -115,6 +115,13 @@ var RECONNECT_BASE_DELAY_MS = 500;
 var DEFAULT_RECONNECT_MAX_DELAY_MS = 8000;
 var computeVoiceReconnectDelayMs = (attempt, baseMs, maxDelayMs) => Math.min(maxDelayMs, baseMs * 2 ** (Math.max(1, attempt) - 1));
 var DEFAULT_SCENARIO_QUERY_PARAM = "scenarioId";
+
+class VoiceReconnectRejectedError extends Error {
+  constructor(message = "Voice authorization could not be renewed.") {
+    super(message);
+    this.name = "VoiceReconnectRejectedError";
+  }
+}
 var noop = () => {};
 var noopAsync = () => Promise.resolve();
 var noopUnsubscribe = () => noop;
@@ -194,6 +201,8 @@ var createVoiceConnection = (path, options = {}) => {
   const reconnectMaxDelayMs = options.reconnectMaxDelayMs ?? DEFAULT_RECONNECT_MAX_DELAY_MS;
   const pingInterval = options.pingInterval ?? DEFAULT_PING_INTERVAL;
   const reconnectResetAfterMs = options.reconnectResetAfterMs ?? DEFAULT_RECONNECT_RESET_AFTER_MS;
+  let lifecycleGeneration = 0;
+  let disposed = false;
   const computeReconnectDelayMs = (attempt) => computeVoiceReconnectDelayMs(attempt, RECONNECT_BASE_DELAY_MS, reconnectMaxDelayMs);
   const state = {
     isConnected: false,
@@ -209,6 +218,21 @@ var createVoiceConnection = (path, options = {}) => {
   const emitConnection = (reconnect) => {
     listeners.forEach((listener) => listener(reconnect));
   };
+  const emitTerminalFailure = (message) => {
+    listeners.forEach((listener) => listener({
+      message,
+      recoverable: false,
+      type: "error"
+    }));
+    emitConnection({
+      reconnect: {
+        attempts: state.reconnectAttempts,
+        maxAttempts: maxReconnectAttempts,
+        status: "exhausted"
+      },
+      type: "connection"
+    });
+  };
   const clearTimers = () => {
     if (state.pingInterval) {
       clearInterval(state.pingInterval);
@@ -242,6 +266,9 @@ var createVoiceConnection = (path, options = {}) => {
     pendingCallControls.clear();
   };
   const scheduleReconnect = () => {
+    if (disposed)
+      return;
+    const scheduledGeneration = lifecycleGeneration;
     state.reconnectAttempts += 1;
     const delayMs = computeReconnectDelayMs(state.reconnectAttempts);
     const nextAttemptAt = Date.now() + delayMs;
@@ -256,15 +283,10 @@ var createVoiceConnection = (path, options = {}) => {
       type: "connection"
     });
     state.reconnectTimeout = setTimeout(async () => {
+      if (disposed || lifecycleGeneration !== scheduledGeneration)
+        return;
       if (state.reconnectAttempts > maxReconnectAttempts) {
-        emitConnection({
-          reconnect: {
-            attempts: state.reconnectAttempts,
-            maxAttempts: maxReconnectAttempts,
-            status: "exhausted"
-          },
-          type: "connection"
-        });
+        emitTerminalFailure("Voice connection could not be restored.");
         return;
       }
       try {
@@ -274,25 +296,28 @@ var createVoiceConnection = (path, options = {}) => {
           scenarioId: state.scenarioId,
           sessionId: state.sessionId
         });
-      } catch {
+      } catch (error) {
+        if (disposed || lifecycleGeneration !== scheduledGeneration)
+          return;
+        if (error instanceof VoiceReconnectRejectedError) {
+          emitTerminalFailure(error.message);
+          return;
+        }
         if (state.reconnectAttempts < maxReconnectAttempts) {
           scheduleReconnect();
         } else {
-          emitConnection({
-            reconnect: {
-              attempts: state.reconnectAttempts,
-              maxAttempts: maxReconnectAttempts,
-              status: "exhausted"
-            },
-            type: "connection"
-          });
+          emitTerminalFailure("Voice authorization could not be renewed for reconnect.");
         }
         return;
       }
+      if (disposed || lifecycleGeneration !== scheduledGeneration)
+        return;
       connect();
     }, delayMs);
   };
   const connect = () => {
+    if (disposed)
+      return;
     const ws = new WebSocket(buildWsUrl(path, state.sessionId, state.scenarioId, options.query ?? {}));
     ws.binaryType = "arraybuffer";
     ws.onopen = () => {
@@ -363,6 +388,7 @@ var createVoiceConnection = (path, options = {}) => {
       state.ws = null;
       state.isConnected = false;
       clearTimers();
+      rejectPendingCallControls("Voice connection interrupted");
       const reconnectable = shouldReconnect && event.code !== WS_NORMAL_CLOSURE && event.code !== WS_UNAUTHORIZED && event.code !== WS_FORBIDDEN && state.reconnectAttempts < maxReconnectAttempts;
       const authorizationFailure = event.code === WS_UNAUTHORIZED || event.code === WS_FORBIDDEN;
       if (authorizationFailure) {
@@ -375,15 +401,19 @@ var createVoiceConnection = (path, options = {}) => {
       if (reconnectable) {
         scheduleReconnect();
       } else if (shouldReconnect && event.code !== WS_NORMAL_CLOSURE) {
-        emitConnection({
-          reconnect: {
-            attempts: state.reconnectAttempts,
-            lastDisconnectAt: Date.now(),
-            maxAttempts: maxReconnectAttempts,
-            status: "exhausted"
-          },
-          type: "connection"
-        });
+        if (authorizationFailure) {
+          emitConnection({
+            reconnect: {
+              attempts: state.reconnectAttempts,
+              lastDisconnectAt: Date.now(),
+              maxAttempts: maxReconnectAttempts,
+              status: "exhausted"
+            },
+            type: "connection"
+          });
+        } else {
+          emitTerminalFailure("Voice connection could not be restored.");
+        }
       }
     };
     state.ws = ws;
@@ -424,6 +454,9 @@ var createVoiceConnection = (path, options = {}) => {
     send({ type: "end_turn" });
   };
   const callControl = (message) => {
+    if (state.ws?.readyState !== WS_OPEN) {
+      return Promise.reject(new Error(`${message.action} is unavailable while disconnected`));
+    }
     const requestId = crypto.randomUUID();
     const { promise, reject, resolve } = Promise.withResolvers();
     const timeout = setTimeout(() => {
@@ -431,16 +464,19 @@ var createVoiceConnection = (path, options = {}) => {
       reject(new Error(`${message.action} acknowledgement timed out`));
     }, DEFAULT_CALL_CONTROL_ACK_TIMEOUT_MS);
     pendingCallControls.set(requestId, { reject, resolve, timeout });
-    send({
+    state.ws.send(JSON.stringify({
       ...message,
       requestId,
       type: "call_control"
-    });
+    }));
     return promise;
   };
   const close = (reason = "client-close") => {
+    disposed = true;
+    lifecycleGeneration += 1;
     clearTimers();
     rejectPendingCallControls("Voice connection closed");
+    state.pendingMessages.length = 0;
     if (state.ws) {
       const ws = state.ws;
       state.ws = null;
@@ -453,8 +489,11 @@ var createVoiceConnection = (path, options = {}) => {
     listeners.clear();
   };
   const disconnect = () => {
+    disposed = true;
+    lifecycleGeneration += 1;
     clearTimers();
     rejectPendingCallControls("Voice connection disconnected");
+    state.pendingMessages.length = 0;
     if (state.ws) {
       const ws = state.ws;
       state.ws = null;
@@ -12835,5 +12874,6 @@ export {
   bindVoiceReactiveSource,
   bindVoiceProviderSimulationControls,
   bindVoiceHTMX,
-  bindVoiceBargeIn
+  bindVoiceBargeIn,
+  VoiceReconnectRejectedError
 };