quickvo-sdk-js 0.5.1 → 0.5.3

package/dist/index.js

@@ -7425,6 +7425,7 @@ class RoomBase {
       debug: !1,
       newPublishAutoSubscribe: !0
     });
+    Z(this, "localStreamActiveMap", /* @__PURE__ */ new Map());
     Z(this, "prohibitNotify", !1);
     // 是否禁止通知
     Z(this, "isEarly", !1);
@@ -7546,7 +7547,7 @@ class RoomBase {
     /**
      * 处理为应用层数据
      */
-    Z(this, "usersFilter", (I) => ft(I, ["id", "isSelf", "joinTime", "tracks", "callAction", "callActionStr", "callActionMap", "network", "updateStreams", "permissions", "isPublished"]).sort((_, k) => _.id.localeCompare(k.id, "en")));
+    Z(this, "usersFilter", (I) => ft(I, ["id", "isSelf", "joinTime", "tracks", "callAction", "callActionStr", "callActionMap", "network", "permissions", "isPublished", "updateStreams"]).sort((_, k) => _.id.localeCompare(k.id, "en")));
     this.initAsyncQueue();
   }
 }
@@ -7766,9 +7767,8 @@ class RoomMedias extends RoomBase {
           break;
       }
       {
-        this.emitNotifyUpdateUsersStreams([{ userId: E, updateStreams: { [u]: !0 } }]);
         const k = this.getUserStreams(E);
-        this.cwsIns.emitNotify("onLocalStream", { code: 200, data: k, desc: "local stream is change." });
+        this.cwsIns.emitNotify("onLocalStream", { code: 200, data: k, desc: "local stream is change." }), this.emitNotifyUpdateUsersStreams([{ userId: E, updateStreams: { [u]: !0 } }]);
       }
     });
     /**
@@ -8153,15 +8153,10 @@ class RoomPeer extends RoomUsers {
      */
     Z(this, "setMediaDeviceKind", async (u, E) => {
       await this.setDeviceKind(u, E);
-      const _ = await this.getCaller(), { id: k, tracks: e = [] } = _;
-      switch (u) {
-        case "audioinput":
-          this.getUserMediaStreamContext(k, "microphoneCamera_audio") && await this.initLocalStream("microphoneCamera_audio"), e.find(($) => $.mediaType === "microphoneCamera_audio") && await this.replaceSenderStream(["microphoneCamera_audio"], !0);
-          break;
-        case "videoinput":
-          this.getUserMediaStreamContext(k, "microphoneCamera_video") && await this.initLocalStream("microphoneCamera_video"), e.find(($) => $.mediaType === "microphoneCamera_video") && await this.replaceSenderStream(["microphoneCamera_video"], !0);
-          break;
-      }
+      const _ = await this.getCaller(), { tracks: k = [] } = _, e = async (n) => {
+        this.localStreamActiveMap.get(n) && await this.initLocalStream(n), k.find(($) => $.mediaType === n) && await this.replaceSenderStream([n], !0);
+      };
+      u === "audioinput" && await e("microphoneCamera_audio"), u === "videoinput" && await e("microphoneCamera_video");
     });
     /**
      * 替换发射器媒体流
@@ -8502,7 +8497,7 @@ class RoomCalls extends RoomPeer {
     Z(this, "setLocalStream", (u, E) => new Promise(async (_, k) => {
       try {
         const { userId: e } = this.options;
-        if (E ? await this.initLocalStream(u) : this.removeUserMediaStreamContext(e, u), u === "screenSharing_audio" || u === "screenSharing_video") {
+        if (E ? (this.localStreamActiveMap.set(u, !0), await this.initLocalStream(u)) : (this.localStreamActiveMap.set(u, !1), this.removeUserMediaStreamContext(e, u)), u === "screenSharing_audio" || u === "screenSharing_video") {
           {
             const $ = this.getUserStream(e, "screenSharing_audio").getTracks();
             for (const N of $)
@@ -8515,7 +8510,7 @@ class RoomCalls extends RoomPeer {
           }
         }
         const n = this.getUserStreams(e);
-        this.cwsIns.emitNotify("onLocalStream", { code: 200, data: n, desc: "local stream is change." }), _(n);
+        _(n);
       } catch (e) {
         k(e);
       }
@@ -8628,13 +8623,18 @@ class RoomCalls extends RoomPeer {
           u.includes("screenSharing_audio") && !u.includes("screenSharing_video") && (u = [...u, "screenSharing_video"]);
           const e = await this.getCaller();
           for (const D of u)
-            this.getUserStream(e.id, D).getTracks().length === 0 && await this.setLocalStream(D, !0);
+            if (this.getUserStream(e.id, D).getTracks().length === 0)
+              try {
+                await this.setLocalStream(D, !0);
+              } catch (j) {
+                console.log("\x1B[38;2;0;151;255m%c%s\x1B[0m", "color:#0097ff;", "------->quickvo: setLocalStream is error.", j);
+              }
           const n = [];
           for (const D of u)
             this.getUserStream(e.id, D).getTracks().length !== 0 && n.push(D);
-          await this.createTrack(n), await this.replaceSenderStream(n, !0);
+          await this.createTrack(n), await this.replaceSenderStream(n, !1);
           const O = this.getSenderTracks(u), $ = [...e.tracks, ...O], N = await this.getCallAction($);
-          await this.updateUsertracks(e.id, $, !0), V(this, zt).call(this, u), await V(this, Tt).call(this, N);
+          await this.updateUsertracks(e.id, $, !0), V(this, zt).call(this, u), await V(this, Tt).call(this, N), await this.replaceSenderStream(n, !0);
           {
             await this.emitNotifyUpdateUsers();
             const D = await this.getCaller();
@@ -8647,7 +8647,7 @@ class RoomCalls extends RoomPeer {
           _(`publish is error: ${e.message || e}`);
         }
       };
-      this.taskQueue.addTask(k, ["createWs", "createSession", "ice", "createTrack", "subscribe"], { describe: "replaceSenderStream" });
+      this.taskQueue.addTask(k, ["createWs", "createSession", "ice", "joinRoom", "createTrack", "subscribe"], { describe: "replaceSenderStream" });
     }));
     /**
      * 停止发布流