mediasfu-shared 1.0.2 → 1.0.4

package/dist/index.d.ts

@@ -10427,7 +10427,7 @@ export declare interface TranslationSubscribedOptions {
     data: TranslationSubscribedData;
     updateListenPreferences?: (updater: (prev: Map<string, string>) => Map<string, string>) => void;
     updateTranslationProducerMap?: (updater: (prev: TranslationProducerMap) => TranslationProducerMap) => void;
-    startConsumingTranslation?: (producerId: string, speakerId: string, language: string) => Promise<void>;
+    startConsumingTranslation?: (producerId: string, speakerId: string, language: string, originalProducerId?: string) => Promise<void>;
     showAlert?: ShowAlert;
 }
 

package/dist/index.js

@@ -1241,13 +1241,15 @@ const connectIps = async ({
             roomRecvIPs.push(ip);
             updateRoomRecvIPs(roomRecvIPs);
           }
-          remote_sock.on("new-pipe-producer", async ({ producerId, islevel }) => {
+          remote_sock.on("new-pipe-producer", async ({ producerId, islevel, isTranslation, translationMeta }) => {
             if (newProducerMethod) {
               await newProducerMethod({
                 producerId,
                 islevel,
                 nsock: remote_sock,
-                parameters
+                parameters,
+                isTranslation,
+                translationMeta
               });
             }
           });
@@ -1288,13 +1290,15 @@ const connectLocalIps = async ({
   parameters
 }) => {
   try {
-    socket.on("new-producer", async ({ producerId, islevel }) => {
+    socket.on("new-producer", async ({ producerId, islevel, isTranslation, translationMeta }) => {
       if (newProducerMethod) {
         await newProducerMethod({
           producerId,
           islevel,
           nsock: socket,
-          parameters
+          parameters,
+          isTranslation,
+          translationMeta
         });
       }
     });
@@ -1308,6 +1312,47 @@ const connectLocalIps = async ({
     console.log("ConnectLocalIps error", error);
   }
 };
+const getSpeakerNameForProducerId$1 = (producerId, parameters) => {
+  const participants = parameters.participants;
+  const participant = participants?.find((candidate) => candidate.audioID === producerId);
+  if (participant?.name) {
+    return participant.name;
+  }
+  const audStreamName = parameters.audStreamNames?.find((stream) => stream.producerId === producerId && typeof stream.name === "string");
+  if (audStreamName?.name) {
+    return audStreamName.name;
+  }
+  return parameters.allAudioStreams?.find((stream) => stream.producerId === producerId && typeof stream.name === "string")?.name;
+};
+const isOriginalAudioSuppressedByTranslation$1 = (producerId, parameters) => {
+  const activeTranslationProducerIds = parameters.activeTranslationProducerIds;
+  if (activeTranslationProducerIds?.has(producerId)) {
+    return false;
+  }
+  const speakerTranslationStates = parameters.speakerTranslationStates;
+  if (!speakerTranslationStates?.size) {
+    return false;
+  }
+  const speakerName = getSpeakerNameForProducerId$1(producerId, parameters);
+  if (speakerName) {
+    const speakerState = speakerTranslationStates.get(speakerName);
+    if (speakerState?.enabled) {
+      return true;
+    }
+  }
+  return Array.from(speakerTranslationStates.values()).some((speakerState) => {
+    if (!speakerState?.enabled) {
+      return false;
+    }
+    if (speakerState.originalProducerId === producerId) {
+      return true;
+    }
+    if (!speakerName) {
+      return false;
+    }
+    return speakerState.speakerId === speakerName || speakerState.speakerName === speakerName;
+  });
+};
 const connectRecvTransport = async ({
   consumerTransport,
   remoteProducerId,
@@ -1369,24 +1414,15 @@ const connectRecvTransport = async ({
                   if (params.kind === "audio") {
                     try {
                       const updatedParams = parameters.getUpdatedAllParams();
-                      const speakerTranslationStates = updatedParams.speakerTranslationStates;
-                      const participants = updatedParams.participants;
-                      if (speakerTranslationStates && speakerTranslationStates.size > 0 && participants?.length) {
-                        const participant = participants.find(
-                          (candidate) => candidate.audioID === remoteProducerId
-                        );
-                        if (participant?.name) {
-                          const speakerState = speakerTranslationStates.get(participant.name);
-                          if (speakerState?.enabled && speakerState.originalProducerId === remoteProducerId) {
-                            consumer.pause();
-                            nsock.emit(
-                              "consumer-pause",
-                              { serverConsumerId: params.serverConsumerId },
-                              () => {
-                              }
-                            );
+                      if (isOriginalAudioSuppressedByTranslation$1(remoteProducerId, updatedParams)) {
+                        consumer.pause();
+                        nsock.emit(
+                          "consumer-pause",
+                          { serverConsumerId: params.serverConsumerId },
+                          () => {
                           }
-                        }
+                        );
+                        return;
                       }
                     } catch {
                     }
@@ -2647,6 +2683,50 @@ async function processConsumerTransports({
 const getProducerId$1 = (value) => {
   return value?.producerId;
 };
+const getSpeakerNameForProducerId = (producerId, parameters) => {
+  const participants = parameters.participants;
+  const participant = participants?.find((candidate) => candidate.audioID === producerId);
+  if (participant?.name) {
+    return participant.name;
+  }
+  const audStreamName = parameters.audStreamNames?.find((stream) => stream.producerId === producerId && typeof stream.name === "string");
+  if (audStreamName?.name) {
+    return audStreamName.name;
+  }
+  return parameters.allAudioStreams?.find((stream) => stream.producerId === producerId && typeof stream.name === "string")?.name;
+};
+const isOriginalAudioSuppressedByTranslation = (producerId, parameters) => {
+  if (!producerId) {
+    return false;
+  }
+  const activeTranslationProducerIds = parameters.activeTranslationProducerIds;
+  if (activeTranslationProducerIds?.has(producerId)) {
+    return false;
+  }
+  const speakerTranslationStates = parameters.speakerTranslationStates;
+  if (!speakerTranslationStates?.size) {
+    return false;
+  }
+  const speakerName = getSpeakerNameForProducerId(producerId, parameters);
+  if (speakerName) {
+    const speakerState = speakerTranslationStates.get(speakerName);
+    if (speakerState?.enabled) {
+      return true;
+    }
+  }
+  return Array.from(speakerTranslationStates.values()).some((speakerState) => {
+    if (!speakerState?.enabled) {
+      return false;
+    }
+    if (speakerState.originalProducerId === producerId) {
+      return true;
+    }
+    if (!speakerName) {
+      return false;
+    }
+    return speakerState.speakerId === speakerName || speakerState.speakerName === speakerName;
+  });
+};
 const processConsumerTransportsAudio = async ({
   consumerTransports,
   lStreams,
@@ -2660,12 +2740,12 @@ const processConsumerTransportsAudio = async ({
       });
     };
     const consumerTransportsToResume = consumerTransports.filter(
-      (transport) => isValidProducerId(transport.producerId, lStreams) && transport.consumer?.paused === true && transport.consumer?.kind === "audio"
+      (transport) => isValidProducerId(transport.producerId, lStreams) && !isOriginalAudioSuppressedByTranslation(transport.producerId, parameters) && transport.consumer?.paused === true && transport.consumer?.kind === "audio"
     );
     const consumerTransportsToPause = consumerTransports.filter(
-      (transport) => transport.producerId && transport.producerId !== null && transport.producerId !== "" && !lStreams.some(
+      (transport) => transport.producerId && transport.producerId !== null && transport.producerId !== "" && (isOriginalAudioSuppressedByTranslation(transport.producerId, parameters) || !lStreams.some(
         (stream) => getProducerId$1(stream) === transport.producerId
-      ) && transport.consumer && transport.consumer?.kind && transport.consumer.paused !== true && transport.consumer.kind === "audio"
+      )) && transport.consumer && transport.consumer?.kind && transport.consumer.paused !== true && transport.consumer.kind === "audio"
     );
     await sleep2({ ms: 100 });
     for (const transport of consumerTransportsToPause) {
@@ -2678,6 +2758,9 @@ const processConsumerTransportsAudio = async ({
       );
     }
     for (const transport of consumerTransportsToResume) {
+      if (isOriginalAudioSuppressedByTranslation(transport.producerId, parameters)) {
+        continue;
+      }
       transport.socket_.emit(
         "consumer-resume",
         { serverConsumerId: transport.serverConsumerTransportId },
@@ -4133,7 +4216,9 @@ const clickVideo = async ({ parameters }) => {
         audioSetting,
         videoSetting,
         screenshareSetting,
-        chatSetting
+        chatSetting,
+        permissionConfig: parameters.permissionConfig,
+        participantLevel: islevel
       });
     } else {
       response = 0;
@@ -5288,11 +5373,17 @@ const hostRequestResponse = async ({
   updateChatRequestTime,
   updateRequestIntervalSeconds
 }) => {
+  const requestType = requestResponse.type ?? requestResponse.icon;
   const filteredRequests = requestList.filter(
-    (request) => request.id !== requestResponse.id && request.icon !== requestResponse.type && request.name !== requestResponse.name && request.username !== requestResponse.username
+    (request) => {
+      const matchesId = request.id === requestResponse.id;
+      const matchesType = requestType == null || request.icon === requestType;
+      const matchesName = requestResponse.name == null || request.name === requestResponse.name;
+      const matchesUsername = requestResponse.username == null || request.username === requestResponse.username;
+      return !(matchesId && matchesType && matchesName && matchesUsername);
+    }
   );
   updateRequestList(filteredRequests);
-  const requestType = requestResponse.type;
   if (requestResponse.action === "accepted") {
     switch (requestType) {
       case "fa-microphone":
@@ -6258,11 +6349,20 @@ const updateRoomParametersClient = ({ parameters }) => {
   }
 };
 const DEFAULT_MEDIA_SFU_ROOM_API_URL = "https://mediasfu.com/v1/rooms/";
+const normalizeManagedRoomApi = (normalizedLink) => {
+  if (normalizedLink.includes("/v1/rooms")) {
+    return `${normalizedLink.replace(/\/$/, "")}/`;
+  }
+  return `${normalizedLink.replace(/\/$/, "")}/v1/rooms/`;
+};
 const resolveMediaSFURoomApi = (localLink, action) => {
   const normalizedLink = localLink?.trim();
-  if (!normalizedLink || normalizedLink.includes("mediasfu.com")) {
+  if (!normalizedLink) {
     return DEFAULT_MEDIA_SFU_ROOM_API_URL;
   }
+  if (normalizedLink.includes("mediasfu.com")) {
+    return normalizeManagedRoomApi(normalizedLink);
+  }
   return `${normalizedLink.replace(/\/$/, "")}/${action}`;
 };
 const readResponseError$1 = async (response) => {
@@ -7336,15 +7436,22 @@ const pauseOriginalProducer = async ({
     const transport = consumerTransports.find(
       (t) => t.producerId === originalProducerId && t.consumer?.kind === "audio"
     );
-    if (transport && transport.consumer && !transport.consumer.paused) {
-      transport.consumer.pause();
-      transport.socket_?.emit(
-        "consumer-pause",
-        { serverConsumerId: transport.serverConsumerTransportId },
-        async () => {
-        }
-      );
+    if (!transport?.consumer) {
+      return;
+    }
+    if (transport.consumer.track) {
+      transport.consumer.track.enabled = false;
+    }
+    if (transport.consumer.paused) {
+      return;
     }
+    transport.consumer.pause();
+    transport.socket_?.emit(
+      "consumer-pause",
+      { serverConsumerId: transport.serverConsumerTransportId },
+      async () => {
+      }
+    );
   } catch (error) {
     console.error("[TranslationSwitch] Error pausing original producer:", error);
   }
@@ -7362,17 +7469,27 @@ const resumeOriginalProducer = async ({
     const transport = consumerTransports.find(
       (t) => t.producerId === originalProducerId && t.consumer?.kind === "audio"
     );
-    if (transport && transport.consumer && transport.consumer.paused) {
-      transport.socket_?.emit(
-        "consumer-resume",
-        { serverConsumerId: transport.serverConsumerTransportId },
-        async ({ resumed }) => {
-          if (resumed) {
-            transport.consumer.resume();
+    if (!transport?.consumer) {
+      return;
+    }
+    if (!transport.consumer.paused) {
+      if (transport.consumer.track) {
+        transport.consumer.track.enabled = true;
+      }
+      return;
+    }
+    transport.socket_?.emit(
+      "consumer-resume",
+      { serverConsumerId: transport.serverConsumerTransportId },
+      async ({ resumed }) => {
+        if (resumed) {
+          if (transport.consumer.track) {
+            transport.consumer.track.enabled = true;
           }
+          transport.consumer.resume();
         }
-      );
-    }
+      }
+    );
   } catch (error) {
     console.error("[TranslationSwitch] Error resuming original producer:", error);
   }
@@ -12219,7 +12336,7 @@ const translationSubscribed = async ({
       }));
     }
     if (producerId && startConsumingTranslation) {
-      await startConsumingTranslation(producerId, speakerId, language);
+      await startConsumingTranslation(producerId, speakerId, language, originalProducerId);
     }
     if (showAlert && channelCreated) {
       showAlert({