quickvo-sdk-js 0.6.5 → 0.6.7

package/dist/index.js

@@ -7782,7 +7782,6 @@ class RoomMedias extends RoomBase {
         // 麦克风
         case "microphoneCamera_audio":
           {
-            this.removeUserMediaStreamContext(E, "microphoneCamera_audio");
             const _ = J(this, bt).get("audioinput"), k = J(this, _t).get("microphoneCamera_audio"), e = await navigator.mediaDevices.getUserMedia({ audio: { deviceId: _, ...k }, video: !1 });
             J(this, St).push(e), await this.initUserMediaStreamContext(E, "microphoneCamera_audio", e);
           }
@@ -7790,7 +7789,6 @@ class RoomMedias extends RoomBase {
         // 摄像头
         case "microphoneCamera_video":
           {
-            this.removeUserMediaStreamContext(E, "microphoneCamera_video");
             const _ = J(this, bt).get("videoinput"), k = J(this, _t).get("microphoneCamera_video"), e = await navigator.mediaDevices.getUserMedia({ audio: !1, video: { deviceId: _, ...k } });
             J(this, St).push(e), await this.initUserMediaStreamContext(E, "microphoneCamera_video", e);
           }
@@ -7798,15 +7796,25 @@ class RoomMedias extends RoomBase {
         // 麦克风 + 摄像头
         case "microphoneCamera":
           {
-            this.removeUserMediaStreamContext(E, "microphoneCamera_audio"), this.removeUserMediaStreamContext(E, "microphoneCamera_video");
             const _ = J(this, bt).get("audioinput"), k = J(this, bt).get("videoinput"), e = J(this, _t).get("microphoneCamera_audio"), n = J(this, _t).get("microphoneCamera_video"), O = await navigator.mediaDevices.getUserMedia({ audio: { deviceId: _, ...e }, video: { deviceId: k, ...n } });
-            J(this, St).push(O), await this.initUserMediaStreamContext(E, "microphoneCamera_audio", O);
+            J(this, St).push(O);
+            const $ = O.getTracks();
+            for (const N of $) {
+              const { kind: D } = N;
+              if (D === "audio") {
+                const q = new MediaStream();
+                q.addTrack(N), await this.initUserMediaStreamContext(E, "microphoneCamera_audio", q);
+              }
+              if (D === "video") {
+                const q = new MediaStream();
+                q.addTrack(N), await this.initUserMediaStreamContext(E, "microphoneCamera_video", q);
+              }
+            }
           }
           break;
         // 屏幕共享 音频
         case "screenSharing_audio":
           {
-            this.removeUserMediaStreamContext(E, "screenSharing_audio");
             const _ = J(this, _t).get("screenSharing_audio"), k = await navigator.mediaDevices.getDisplayMedia({ audio: !0, video: !0, ..._ });
             J(this, St).push(k);
             const e = k.getTracks();
@@ -7822,7 +7830,6 @@ class RoomMedias extends RoomBase {
         // 屏幕共享 视频
         case "screenSharing_video":
           {
-            this.removeUserMediaStreamContext(E, u);
             const _ = J(this, _t).get(u), k = await navigator.mediaDevices.getDisplayMedia({ audio: !1, video: !0, ..._ });
             J(this, St).push(k);
             const e = k.getTracks();
@@ -7838,7 +7845,6 @@ class RoomMedias extends RoomBase {
         // 屏幕共享 音频+视频
         case "screenSharing":
           {
-            this.removeUserMediaStreamContext(E, "screenSharing_audio"), this.removeUserMediaStreamContext(E, "screenSharing_video");
             const _ = J(this, _t).get("screenSharing_audio"), k = J(this, _t).get("screenSharing_video"), e = await navigator.mediaDevices.getDisplayMedia({ audio: !0, video: !0, ..._, ...k });
             J(this, St).push(e);
             const n = e.getTracks();
@@ -8448,13 +8454,13 @@ class RoomPeer extends RoomUsers {
     Z(this, "closeUserTracks", async (u, E = [], _ = !1) => {
       const k = [];
       for (const $ of E) {
-        const { trackName: N, msid: D } = $;
-        k.push(N), D && k.push(D);
+        const { mid: N, trackName: D, msid: q } = $;
+        k.push(D), N && k.push(N), q && k.push(q);
       }
       const e = ($) => k.includes($), n = this.peerIns.getTransceivers();
       for (const $ of n) {
-        const { sender: N, receiver: D } = $;
-        N.track && e(N.track.id) && (console.log("\x1B[38;2;0;151;255m%c%s\x1B[0m", "color:#0097ff;", `------->quickvo: sender: ${N.track.id} is stop.`, $), $.stop()), D.track && e(D.track.id) && (console.log("\x1B[38;2;0;151;255m%c%s\x1B[0m", "color:#0097ff;", `------->quickvo: receiver: ${D.track.id} is stop.`, $), $.stop());
+        const { mid: N } = $;
+        N && e(N) && ($.stop(), console.log("\x1B[38;2;0;151;255m%c%s\x1B[0m", "color:#0097ff;", `------->quickvo: transceiver: ${N} is stop.`, $));
       }
       const O = await this.getUser(u);
       if (O) {
@@ -8747,7 +8753,7 @@ class RoomCalls extends RoomPeer {
         typeof u == "string" && (u = [u]);
         const { userId: e = "" } = this.options;
         for (const O of u)
-          this.removeUserMediaStreamContext(e, O), this.setLocalStreamActiveMap.set(O, E);
+          this.setLocalStreamActiveMap.set(O, !1), E === !1 && this.removeUserMediaStreamContext(e, O);
         if (E) {
           if (u.includes("microphoneCamera_audio") && u.includes("microphoneCamera_video") ? await this.initLocalStream("microphoneCamera") : u.includes("microphoneCamera_audio") ? await this.initLocalStream("microphoneCamera_audio") : u.includes("microphoneCamera_video") ? await this.initLocalStream("microphoneCamera_video") : u.includes("screenSharing_audio") && u.includes("screenSharing_video") ? await this.initLocalStream("screenSharing") : u.includes("screenSharing_audio") && !u.includes("screenSharing_video") ? await this.initLocalStream("screenSharing_audio") : u.includes("screenSharing_video") && !u.includes("screenSharing_audio") && await this.initLocalStream("screenSharing_video"), u.includes("screenSharing_audio")) {
             const $ = this.getUserStream(e, "screenSharing_audio").getTracks();
@@ -8899,7 +8905,7 @@ class RoomCalls extends RoomPeer {
           for (const q of u)
             this.getUserStream(e.id, q).getTracks().length === 0 && n.push(q);
           const O = u.filter((q) => !n.includes(q) || ["microphoneCamera_audio", "microphoneCamera_video"].includes(q));
-          await J(this, Ct).call(this, O);
+          await this.replaceSenderStream(u, !1), await J(this, Ct).call(this, O);
           const $ = await this.getSenderTracks(O), N = [...e.tracks, ...$];
           await this.updateUsertracks(e.id, N, !0);
           const D = await this.getCallAction(N);
@@ -8933,7 +8939,7 @@ class RoomCalls extends RoomPeer {
             await this.emitNotifyUpdateUsers(), E($);
           };
           if (n.length === 0) return O();
-          await this.closeUserTracks(e.id, n, !0), await this.removeSenders(u);
+          await this.replaceSenderStream(u, !0), await this.closeUserTracks(e.id, n, !0), await this.removeSenders(u);
           {
             const $ = await this.getCallAction(e.tracks);
             await J(this, Et).call(this, $);