@absolutejs/voice 0.0.22-beta.657 → 0.0.22-beta.658

package/dist/index.js

@@ -39835,6 +39835,7 @@ var createVoiceMonitorRunnerRoutes = (options) => {
 };
 
 // src/core/plugin.ts
+var socketIdentity = (ws) => ws.raw && typeof ws.raw === "object" ? ws.raw : ws;
 var resolveQueryScenario = (query) => {
   if (typeof query?.scenarioId === "string" && query.scenarioId.trim()) {
     return query.scenarioId.trim();
@@ -39946,14 +39947,15 @@ var parseClientMessage = (raw) => {
 };
 var resolveSessionId3 = (runtime, ws) => {
   const query = ws.data && typeof ws.data === "object" && "query" in ws.data ? ws.data.query : undefined;
-  const existing = runtime.socketSessions.get(ws);
+  const identity = socketIdentity(ws);
+  const existing = runtime.socketSessions.get(identity);
   const providedSessionId = typeof query?.sessionId === "string" && query.sessionId.trim() ? query.sessionId.trim() : existing?.sessionId ?? createId();
   const scenarioId = resolveQueryScenario(query) ?? existing?.scenarioId ?? null;
   const resolved = {
     scenarioId,
     sessionId: providedSessionId
   };
-  runtime.socketSessions.set(ws, resolved);
+  runtime.socketSessions.set(identity, resolved);
   return resolved;
 };
 var resolveSocketQuery = (ws) => ws.data && typeof ws.data === "object" && ("query" in ws.data) ? ws.data.query ?? {} : {};
@@ -40158,30 +40160,48 @@ var voice = (config) => {
     socketSessions: new WeakMap
   };
   const authorizedSockets = new WeakSet;
-  const authorizeSocket = async (ws, sessionId, scenarioId) => {
-    if (!config.authorizeConnection) {
-      authorizedSockets.add(ws);
+  const pendingSocketAuthorizations = new WeakMap;
+  const authorizeSocket = (ws, sessionId, scenarioId) => {
+    const identity = socketIdentity(ws);
+    const existing = pendingSocketAuthorizations.get(identity);
+    if (existing)
+      return existing;
+    const authorization = (async () => {
+      if (!config.authorizeConnection) {
+        authorizedSockets.add(identity);
+        return true;
+      }
+      let authorized = false;
+      try {
+        authorized = await config.authorizeConnection({
+          context: ws.data,
+          headers: resolveSocketHeaders(ws),
+          path: config.path,
+          query: resolveSocketQuery(ws),
+          scenarioId,
+          sessionId
+        });
+      } catch (error) {
+        runtime.logger.warn?.(`[voice] connection authorization failed for session "${sessionId}": ${error instanceof Error ? error.message : String(error)}`);
+      }
+      if (!authorized) {
+        ws.close(4401, "unauthorized");
+        return false;
+      }
+      authorizedSockets.add(identity);
       return true;
-    }
-    let authorized = false;
-    try {
-      authorized = await config.authorizeConnection({
-        context: ws.data,
-        headers: resolveSocketHeaders(ws),
-        path: config.path,
-        query: resolveSocketQuery(ws),
-        scenarioId,
-        sessionId
-      });
-    } catch (error) {
-      runtime.logger.warn?.(`[voice] connection authorization failed for session "${sessionId}": ${error instanceof Error ? error.message : String(error)}`);
-    }
-    if (!authorized) {
-      ws.close(4401, "unauthorized");
+    })();
+    pendingSocketAuthorizations.set(identity, authorization);
+    return authorization;
+  };
+  const waitForSocketAuthorization = async (ws) => {
+    const identity = socketIdentity(ws);
+    if (authorizedSockets.has(identity))
+      return true;
+    const pending = pendingSocketAuthorizations.get(identity);
+    if (!pending)
       return false;
-    }
-    authorizedSockets.add(ws);
-    return true;
+    return pending;
   };
   const { monitor } = config;
   const registerMonitorSession = (sessionId, handle) => {
@@ -40491,8 +40511,9 @@ var voice = (config) => {
   };
   return new Elysia70({ name: "absolutejs-voice" }).ws(config.path, {
     close: async (ws, code, reason) => {
-      const socketState = runtime.socketSessions.get(ws);
-      if (!socketState || runtime.activeSockets.get(socketState.sessionId) !== ws) {
+      const identity = socketIdentity(ws);
+      const socketState = runtime.socketSessions.get(identity);
+      if (!socketState || runtime.activeSockets.get(socketState.sessionId) !== identity) {
         return;
       }
       runtime.activeSockets.delete(socketState.sessionId);
@@ -40509,7 +40530,7 @@ var voice = (config) => {
       }
     },
     message: async (ws, raw) => {
-      if (!authorizedSockets.has(ws)) {
+      if (!await waitForSocketAuthorization(ws)) {
         ws.close(4401, "unauthorized");
         return;
       }
@@ -40595,8 +40616,8 @@ var voice = (config) => {
             deregisterMonitorSession(sessionState.sessionId, "session-switch");
           }
           sessionState.sessionId = message.sessionId;
-          runtime.activeSockets.set(message.sessionId, ws);
-          runtime.socketSessions.set(ws, {
+          runtime.activeSockets.set(message.sessionId, socketIdentity(ws));
+          runtime.socketSessions.set(socketIdentity(ws), {
             ...sessionState,
             sessionId: message.sessionId,
             scenarioId: sessionState.scenarioId
@@ -40604,7 +40625,7 @@ var voice = (config) => {
         }
         if (message.type === "start" && message.scenarioId) {
           sessionState.scenarioId = message.scenarioId;
-          runtime.socketSessions.set(ws, {
+          runtime.socketSessions.set(socketIdentity(ws), {
             ...sessionState,
             scenarioId: message.scenarioId
           });
@@ -40624,7 +40645,7 @@ var voice = (config) => {
         return;
       }
       const existing = runtime.activeSessions.get(sessionState.sessionId);
-      runtime.activeSockets.set(sessionState.sessionId, ws);
+      runtime.activeSockets.set(sessionState.sessionId, socketIdentity(ws));
       if (existing) {
         await existing.disconnect({
           code: 1006,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@absolutejs/voice",
-  "version": "0.0.22-beta.657",
+  "version": "0.0.22-beta.658",
   "description": "Voice primitives and Elysia plugin for AbsoluteJS",
   "repository": {
     "type": "git",