mediasfu-shared 1.3.0 → 1.3.1

package/dist/{updateParticipantAudioDecibels-Dni8i6AY.cjs → updateParticipantAudioDecibels-CbCP1PDs.cjs}

@@ -767,6 +767,24 @@ async function compareScreenStates({
     console.log("compareScreenStates error", error);
   }
 }
+function stopReconnectingWhenRefused(socket) {
+  const onRejected = (payload) => {
+    const refusal = new audioProcessing.MediaSocketConnectError({
+      phase: "rejected",
+      reason: audioProcessing.normalizeRejectionReason(payload?.reason),
+      stage: typeof payload?.stage === "string" ? payload.stage : void 0,
+      elapsedMs: 0
+    });
+    if (refusal.retryable) return;
+    socket.off("connection-rejected", onRejected);
+    console.warn(`MediaSFU media socket: reconnect refused (${refusal.reason}); not retrying.`);
+    try {
+      socket.disconnect();
+    } catch {
+    }
+  };
+  socket.on("connection-rejected", onRejected);
+}
 async function validateApiKeyToken(value) {
   if (!/^[a-z0-9]{64}$/i.test(value)) {
     throw new Error("Invalid API key or token.");
@@ -854,7 +872,10 @@ async function connectSocket({ apiUserName, apiKey, apiToken, link }) {
       } catch {
       }
       console.log(`Connected to ${conn} socket with ID: ${socketId}`);
-      settle(() => resolve(socket));
+      settle(() => {
+        stopReconnectingWhenRefused(socket);
+        resolve(socket);
+      });
     };
     const handleConnectError = (error) => {
       settle(() => {
@@ -1915,6 +1936,36 @@ const connectSendTransport = async ({ option, targetOption = "all", parameters }
     console.log("connectSendTransport error", error);
   }
 };
+const pendingCreations = /* @__PURE__ */ new WeakMap();
+const pendingSendTransportCreation = (socket) => socket ? pendingCreations.get(socket) : void 0;
+const trackSendTransportCreation = (socket, create) => {
+  if (!socket) return create();
+  const running = create();
+  pendingCreations.set(socket, running);
+  const release = () => {
+    if (pendingCreations.get(socket) === running) pendingCreations.delete(socket);
+  };
+  running.then(release, release);
+  return running;
+};
+const isOpen = (item) => Boolean(item && !item.closed);
+const pendingProduces = /* @__PURE__ */ new WeakMap();
+const produceOnce$1 = async (transport, key, produce) => {
+  let byKey = pendingProduces.get(transport);
+  if (!byKey) {
+    byKey = /* @__PURE__ */ new Map();
+    pendingProduces.set(transport, byKey);
+  }
+  const inFlight = byKey.get(key);
+  if (inFlight) return { producer: await inFlight, joined: true };
+  const running = produce();
+  byKey.set(key, running);
+  try {
+    return { producer: await running, joined: false };
+  } finally {
+    if (byKey.get(key) === running) byKey.delete(key);
+  }
+};
 const connectLocalSendTransportAudio = async ({
   parameters,
   audioParams
@@ -1927,7 +1978,7 @@ const connectLocalSendTransportAudio = async ({
       updateLocalProducerTransport
     } = parameters;
     if (localProducerTransport) {
-      localAudioProducer = await localProducerTransport.produce(audioParams);
+      localAudioProducer = (await produceOnce$1(localProducerTransport, "audio", () => localProducerTransport.produce(audioParams))).producer;
       updateLocalAudioProducer?.(localAudioProducer);
       updateLocalProducerTransport?.(localProducerTransport);
     }
@@ -1965,8 +2016,9 @@ const connectSendTransportAudio = async ({
       updateProducerTransport
     } = parameters;
     if (targetOption === "all" || targetOption === "remote") {
-      audioProducer = await producerTransport.produce(audioParams);
-      updateMicLevel(audioProducer, parameters.updateAudioLevel);
+      const produced = await produceOnce$1(producerTransport, "audio", () => producerTransport.produce(audioParams));
+      audioProducer = produced.producer;
+      if (!produced.joined) updateMicLevel(audioProducer, parameters.updateAudioLevel);
       updateAudioProducer(audioProducer);
       updateProducerTransport(producerTransport);
     }
@@ -2004,11 +2056,11 @@ const connectLocalSendTransportScreen = async ({
       (codec2) => codec2.mimeType.toLowerCase() === "video/vp9"
     );
     if (localProducerTransport) {
-      localScreenProducer = await localProducerTransport.produce({
+      localScreenProducer = (await produceOnce$1(localProducerTransport, "screen", () => localProducerTransport.produce({
         track: stream.getVideoTracks()[0],
         codec,
         appData: { mediaTag: "screen-video" }
-      });
+      }))).producer;
       updateLocalScreenProducer?.(localScreenProducer);
       updateLocalProducerTransport?.(localProducerTransport);
     }
@@ -2038,12 +2090,12 @@ const connectSendTransportScreen = async ({
       (codec2) => codec2.mimeType.toLowerCase() === "video/vp9"
     );
     if (targetOption === "remote" || targetOption === "all") {
-      screenProducer = await producerTransport.produce({
+      screenProducer = (await produceOnce$1(producerTransport, "screen", () => producerTransport.produce({
         track: stream.getVideoTracks()[0],
         ...params,
         codec,
         appData: { mediaTag: "screen-video" }
-      });
+      }))).producer;
       updateScreenProducer(screenProducer);
       updateProducerTransport(producerTransport);
     }
@@ -2071,7 +2123,7 @@ const connectLocalSendTransportVideo = async ({
       updateLocalProducerTransport
     } = parameters;
     if (localProducerTransport) {
-      localVideoProducer = await localProducerTransport.produce(videoParams);
+      localVideoProducer = (await produceOnce$1(localProducerTransport, "video", () => localProducerTransport.produce(videoParams))).producer;
       updateLocalVideoProducer?.(localVideoProducer);
       updateLocalProducerTransport?.(localProducerTransport);
     }
@@ -2096,7 +2148,7 @@ const connectSendTransportVideo = async ({
       updateUpdateMainWindow
     } = parameters;
     if (targetOption === "all" || targetOption === "remote") {
-      videoProducer = await producerTransport.produce(videoParams);
+      videoProducer = (await produceOnce$1(producerTransport, "video", () => producerTransport.produce(videoParams))).producer;
       if (islevel === "2") {
         updateMainWindow = true;
       }
@@ -2216,7 +2268,7 @@ const createLocalSendTransport = async ({
     console.error("Error creating local send transport:", error);
   }
 };
-const createSendTransport = async ({
+const createSendTransportNow = async ({
   option,
   parameters
 }) => {
@@ -2246,67 +2298,109 @@ const createSendTransport = async ({
     } catch (error) {
       console.log("Error creating local send transport:", error);
     }
-    socket.emit(
+    await new Promise((resolve, reject) => socket.emit(
       "createWebRtcTransport",
       { consumer: false, islevel },
       async ({ params }) => {
-        if (params && params.error) {
-          console.error("Error in createWebRtcTransport:", params.error);
-          return;
-        }
-        const resolvedDevice = parameters.getCurrentParams ? parameters.getCurrentParams().device : device ?? null;
-        if (!resolvedDevice) {
-          return;
-        }
-        const createdProducerTransport = await resolvedDevice.createSendTransport(params);
-        updateProducerTransport(createdProducerTransport);
-        createdProducerTransport.on(
-          "connect",
-          async ({ dtlsParameters }, callback, errback) => {
-            try {
-              socket.emit("transport-connect", { dtlsParameters });
-              callback();
-            } catch (error) {
-              errback(error);
-            }
-          }
-        );
-        createdProducerTransport.on(
-          "produce",
-          async (parameters2, callback, errback) => {
-            try {
-              socket.emit(
-                "transport-produce",
-                {
-                  kind: parameters2.kind,
-                  rtpParameters: parameters2.rtpParameters,
-                  appData: parameters2.appData,
-                  islevel,
-                  name: member
-                },
-                async ({ id }) => {
-                  callback({ id });
-                }
-              );
-            } catch (error) {
-              errback(error);
-            }
+        try {
+          if (params && params.error) {
+            console.error("Error in createWebRtcTransport:", params.error);
+            reject(new Error(String(params.error)));
+            return;
           }
-        );
-        attachTransportRecovery(createdProducerTransport, socket, () => clearFailedSendState(parameters, createdProducerTransport));
-        transportCreated = true;
-        parameters = parameters.getCurrentParams?.() ?? parameters;
-        await connectSendTransport2({
-          targetOption: "remote",
-          option,
-          parameters: {
-            ...parameters,
-            producerTransport: createdProducerTransport
+          const resolvedDevice = parameters.getCurrentParams ? parameters.getCurrentParams().device : device ?? null;
+          if (!resolvedDevice) {
+            resolve();
+            return;
           }
-        });
-        updateTransportCreated(transportCreated);
+          const createdProducerTransport = await resolvedDevice.createSendTransport(params);
+          updateProducerTransport(createdProducerTransport);
+          createdProducerTransport.on(
+            "connect",
+            async ({ dtlsParameters }, callback, errback) => {
+              try {
+                socket.emit("transport-connect", { dtlsParameters });
+                callback();
+              } catch (error) {
+                errback(error);
+              }
+            }
+          );
+          createdProducerTransport.on(
+            "produce",
+            async (parameters2, callback, errback) => {
+              try {
+                socket.emit(
+                  "transport-produce",
+                  {
+                    kind: parameters2.kind,
+                    rtpParameters: parameters2.rtpParameters,
+                    appData: parameters2.appData,
+                    islevel,
+                    name: member
+                  },
+                  async ({ id }) => {
+                    callback({ id });
+                  }
+                );
+              } catch (error) {
+                errback(error);
+              }
+            }
+          );
+          attachTransportRecovery(createdProducerTransport, socket, () => clearFailedSendState(parameters, createdProducerTransport));
+          transportCreated = true;
+          parameters = parameters.getCurrentParams?.() ?? parameters;
+          await connectSendTransport2({
+            targetOption: "remote",
+            option,
+            parameters: {
+              ...parameters,
+              producerTransport: createdProducerTransport
+            }
+          });
+          updateTransportCreated(transportCreated);
+          resolve();
+        } catch (error) {
+          reject(error);
+        }
       }
-    );
+    ));
+  } catch (error) {
+    console.log("Error creating send transport:", error);
+  }
+};
+const producerFor = (params, option) => {
+  if (option === "audio") return isOpen(params.audioProducer);
+  if (option === "video") return isOpen(params.videoProducer);
+  if (option === "screen") return isOpen(params.screenProducer);
+  return isOpen(params.audioProducer) && isOpen(params.videoProducer);
+};
+const createSendTransport = async ({
+  option,
+  parameters
+}) => {
+  try {
+    const current = parameters.getCurrentParams?.() ?? parameters.getUpdatedAllParams?.() ?? parameters;
+    const socket = current.socket;
+    const pending = pendingSendTransportCreation(socket);
+    if (!pending && !(current.transportCreated && isOpen(current.producerTransport))) {
+      await trackSendTransportCreation(socket, () => createSendTransportNow({ option, parameters }));
+      return;
+    }
+    if (pending) await pending.catch(() => void 0);
+    const latest = parameters.getCurrentParams?.() ?? parameters.getUpdatedAllParams?.() ?? parameters;
+    if (!isOpen(latest.producerTransport)) {
+      await createSendTransport({ option, parameters });
+      return;
+    }
+    if (producerFor(latest, option)) return;
+    const connectSendTransport2 = latest.connectSendTransport ?? parameters.connectSendTransport;
+    await connectSendTransport2({
+      targetOption: "all",
+      option,
+      parameters: { ...latest, producerTransport: latest.producerTransport }
+    });
   } catch (error) {
     console.log("Error creating send transport:", error);
   }
@@ -5927,6 +6021,7 @@ exports.setScreenAudioVolume = setScreenAudioVolume;
 exports.shouldShareScreenAudio = shouldShareScreenAudio;
 exports.signalNewConsumerTransport = signalNewConsumerTransport;
 exports.startShareScreen = startShareScreen;
+exports.stopReconnectingWhenRefused = stopReconnectingWhenRefused;
 exports.stopShareScreen = stopShareScreen;
 exports.streamSuccessAudio = streamSuccessAudio;
 exports.streamSuccessAudioSwitch = streamSuccessAudioSwitch;
@@ -5940,4 +6035,4 @@ exports.trigger = trigger;
 exports.updateMicLevel = updateMicLevel;
 exports.updateMiniCardsGrid = updateMiniCardsGrid;
 exports.updateParticipantAudioDecibels = updateParticipantAudioDecibels;
-//# sourceMappingURL=updateParticipantAudioDecibels-Dni8i6AY.cjs.map
+//# sourceMappingURL=updateParticipantAudioDecibels-CbCP1PDs.cjs.map