mediasfu-shared 1.2.1 → 1.2.3

package/dist/{updateParticipantAudioDecibels-bZ6R8WHj.cjs → updateParticipantAudioDecibels-QZyahisU.cjs}

@@ -766,6 +766,7 @@ async function validateApiKeyToken(value) {
   }
   return true;
 }
+const CONNECT_TIMEOUT_MS = 12e3;
 async function connectSocket({ apiUserName, apiKey, apiToken, link }) {
   if (!apiUserName) {
     throw new Error("API username required.");
@@ -809,7 +810,21 @@ async function connectSocket({ apiUserName, apiKey, apiToken, link }) {
         }
       });
     }
-    socket.on("connection-success", ({ socketId }) => {
+    let settled = false;
+    let timeoutHandle;
+    const cleanupHandshake = () => {
+      if (timeoutHandle) clearTimeout(timeoutHandle);
+      socket.off("connection-success", handleConnectionSuccess);
+      socket.off("connect_error", handleConnectError);
+      socket.off("disconnect", handleDisconnectBeforeReady);
+    };
+    const settle = (action) => {
+      if (settled) return;
+      settled = true;
+      cleanupHandshake();
+      action();
+    };
+    const handleConnectionSuccess = ({ socketId }) => {
       let conn = "media";
       try {
         if (link.includes("mediasfu.com") && (link.match(/c/g)?.length ?? 0) > 1) {
@@ -818,11 +833,35 @@ async function connectSocket({ apiUserName, apiKey, apiToken, link }) {
       } catch {
       }
       console.log(`Connected to ${conn} socket with ID: ${socketId}`);
-      resolve(socket);
-    });
-    socket.on("connect_error", (error) => {
-      reject(new Error("Error connecting to media socket: " + error.message));
-    });
+      settle(() => resolve(socket));
+    };
+    const handleConnectError = (error) => {
+      settle(() => {
+        socket.disconnect();
+        reject(new Error("Error connecting to media socket: " + error.message));
+      });
+    };
+    const handleDisconnectBeforeReady = (reason) => {
+      settle(
+        () => reject(
+          new Error(
+            "Media socket closed before the room was ready (" + reason + ")."
+          )
+        )
+      );
+    };
+    socket.on("connection-success", handleConnectionSuccess);
+    socket.on("connect_error", handleConnectError);
+    socket.on("disconnect", handleDisconnectBeforeReady);
+    timeoutHandle = setTimeout(() => {
+      settle(() => {
+        try {
+          socket.disconnect();
+        } catch {
+        }
+        reject(new Error("Timed out connecting to media socket."));
+      });
+    }, CONNECT_TIMEOUT_MS);
   });
 }
 async function connectLocalSocket({ link }) {
@@ -1194,10 +1233,19 @@ const joinConsumeRoom = async ({
 };
 const pendingConsumeConnections = /* @__PURE__ */ new WeakMap();
 const normalizeConsumeEndpoint = (ip) => ip.trim().toLowerCase().replace(/\.$/, "");
-const hasConsumeEndpoint = (consumeSockets, endpoint) => consumeSockets.some((socketObj) => {
-  const ip = Object.keys(socketObj)[0];
-  return Boolean(ip) && normalizeConsumeEndpoint(ip) === endpoint;
-});
+const hasConsumeEndpoint = (consumeSockets, endpoint) => {
+  for (let index = consumeSockets.length - 1; index >= 0; index -= 1) {
+    const socketObj = consumeSockets[index];
+    const ip = Object.keys(socketObj)[0];
+    if (!ip || normalizeConsumeEndpoint(ip) !== endpoint) continue;
+    const socket = socketObj[ip];
+    if (socket?.connected && socket.id) return true;
+    socket?.removeAllListeners?.();
+    socket?.disconnect?.();
+    consumeSockets.splice(index, 1);
+  }
+  return false;
+};
 async function reserveConsumeEndpoint(consumeSockets, ip, reservationOwner = consumeSockets) {
   const endpoint = normalizeConsumeEndpoint(ip);
   if (!endpoint || endpoint === "none") return null;
@@ -1221,6 +1269,9 @@ async function reserveConsumeEndpoint(consumeSockets, ip, reservationOwner = con
     return (didConnect = false) => {
       if (pendingForSockets?.get(endpoint) === reservation) {
         pendingForSockets.delete(endpoint);
+        if (pendingForSockets.size === 0) {
+          pendingConsumeConnections.delete(reservationOwner);
+        }
       }
       resolvePending(didConnect === true);
     };
@@ -1257,8 +1308,9 @@ const connectIps = async ({
       );
       if (!releaseReservation) continue;
       let connected = false;
+      let remote_sock = null;
       try {
-        const remote_sock = await connectSocket({ apiUserName, apiKey, apiToken, link: `https://${ip}.mediasfu.com` });
+        remote_sock = await connectSocket({ apiUserName, apiKey, apiToken, link: `https://${ip}.mediasfu.com` });
         if (remote_sock.id) {
           if (!roomRecvIPs.includes(ip)) {
             roomRecvIPs.push(ip);
@@ -1289,16 +1341,36 @@ const connectIps = async ({
               parameters
             });
             if (!data.rtpCapabilities) {
-              return [consume_sockets, roomRecvIPs];
+              throw new Error(`Consume room ${ip} did not return RTP capabilities.`);
             }
           }
           consume_sockets.push({ [ip]: remote_sock });
           updateConsume_sockets(consume_sockets);
           connected = true;
+          remote_sock.on("disconnect", () => {
+            const socketIndex = consume_sockets.findIndex(
+              (socketObj) => socketObj[ip] === remote_sock
+            );
+            if (socketIndex >= 0) {
+              consume_sockets.splice(socketIndex, 1);
+              updateConsume_sockets(consume_sockets);
+            }
+            const recvIndex = roomRecvIPs.indexOf(ip);
+            if (recvIndex >= 0) {
+              roomRecvIPs.splice(recvIndex, 1);
+              updateRoomRecvIPs(roomRecvIPs);
+            }
+            remote_sock?.removeAllListeners?.();
+            remote_sock?.disconnect();
+          });
         }
       } catch (error) {
         console.log("connectIps error", error);
       } finally {
+        if (!connected && remote_sock) {
+          remote_sock.removeAllListeners?.();
+          remote_sock.disconnect();
+        }
         releaseReservation(connected);
       }
     }
@@ -5428,4 +5500,4 @@ exports.trigger = trigger;
 exports.updateMicLevel = updateMicLevel;
 exports.updateMiniCardsGrid = updateMiniCardsGrid;
 exports.updateParticipantAudioDecibels = updateParticipantAudioDecibels;
-//# sourceMappingURL=updateParticipantAudioDecibels-bZ6R8WHj.cjs.map
+//# sourceMappingURL=updateParticipantAudioDecibels-QZyahisU.cjs.map