quickvo-sdk-js 0.4.5 → 0.4.7

package/dist/index.js

@@ -7350,9 +7350,9 @@ class CallsWebSocket {
   }
 }
 yt = new WeakMap(), lt = new WeakMap(), gt = new WeakMap(), ft = new WeakMap(), dt = new WeakMap(), Et = new WeakMap(), xt = new WeakMap(), Nt = new WeakMap(), At = new WeakMap(), $t = new WeakMap(), qt = new WeakMap(), Dt = new WeakMap(), Ct = new WeakMap();
-var p = Object.defineProperty, x = (_) => {
+var p = Object.defineProperty, y = (_) => {
   throw TypeError(_);
-}, g = (_, q, k) => q in _ ? p(_, q, { enumerable: !0, configurable: !0, writable: !0, value: k }) : _[q] = k, h = (_, q, k) => g(_, typeof q != "symbol" ? q + "" : q, k), y = (_, q, k) => q.has(_) || x("Cannot " + k), n = (_, q, k) => (y(_, q, "read from private field"), k ? k.call(_) : q.get(_)), a = (_, q, k) => q.has(_) ? x("Cannot add the same private member more than once") : q instanceof WeakSet ? q.add(_) : q.set(_, k), b = (_, q, k, D) => (y(_, q, "write to private field"), q.set(_, k), k), d, o, f;
+}, g = (_, q, k) => q in _ ? p(_, q, { enumerable: !0, configurable: !0, writable: !0, value: k }) : _[q] = k, h = (_, q, k) => g(_, typeof q != "symbol" ? q + "" : q, k), x = (_, q, k) => q.has(_) || y("Cannot " + k), n = (_, q, k) => (x(_, q, "read from private field"), k ? k.call(_) : q.get(_)), f = (_, q, k) => q.has(_) ? y("Cannot add the same private member more than once") : q instanceof WeakSet ? q.add(_) : q.set(_, k), b = (_, q, k, D) => (x(_, q, "write to private field"), q.set(_, k), k), a, o, d;
 class K {
   // 任务 index
   /**
@@ -7361,8 +7361,8 @@ class K {
    * @param conditionKeys 条件keys string[]
    */
   constructor(q) {
-    a(this, d, /* @__PURE__ */ new Map()), a(this, o, []), h(this, "index"), h(this, "setCondition", (k, D) => {
-      n(this, d).set(k, D), D && n(this, f).call(this);
+    f(this, a, /* @__PURE__ */ new Map()), f(this, o, []), h(this, "index"), h(this, "setCondition", (k, D) => {
+      n(this, a).set(k, D), D && n(this, d).call(this);
     }), h(this, "addTask", (k, D, $ = {}) => {
       const I = { key: "", strict: !1, describe: "", ...$ };
       let { key: e, strict: u, describe: N } = I;
@@ -7371,7 +7371,7 @@ class K {
         const A = { key: e, func: k, conditionKeys: D, describe: N, strict: u };
         n(this, o).unshift(A);
       }
-      return n(this, f).call(this), e;
+      return n(this, d).call(this), e;
     }), h(this, "clear", (k = []) => {
       if (k.length === 0) {
         b(this, o, []);
@@ -7381,7 +7381,7 @@ class K {
         const $ = n(this, o).findIndex((I) => I.key === D);
         $ !== -1 && n(this, o).splice($, 1);
       }
-    }), h(this, "getConditions", () => Object.fromEntries(n(this, d))), h(this, "getTasks", () => {
+    }), h(this, "getConditions", () => Object.fromEntries(n(this, a))), h(this, "getTasks", () => {
       const k = [];
       for (const D of n(this, o)) {
         const { key: $, describe: I, conditionKeys: e } = D;
@@ -7391,18 +7391,18 @@ class K {
     }), h(this, "checkConditions", (k) => {
       let D = !0;
       for (const $ of k)
-        if (n(this, d).get($) === !1) {
+        if (n(this, a).get($) === !1) {
           D = !1;
           break;
         }
       return D;
-    }), a(this, f, () => {
+    }), f(this, d, async () => {
       const k = n(this, o).length;
       for (let D = k; D > 0; D--) {
         const $ = D - 1, I = n(this, o)[$], { conditionKeys: e, func: u, strict: N } = I, A = this.checkConditions(e);
         {
           if (!A) return;
-          u();
+          await u();
         }
         {
           if (N) return;
@@ -7411,10 +7411,10 @@ class K {
       }
     }), this.index = 0;
     for (const k of q)
-      n(this, d).set(k, !1);
+      n(this, a).set(k, !1);
   }
 }
-d = /* @__PURE__ */ new WeakMap(), o = /* @__PURE__ */ new WeakMap(), f = /* @__PURE__ */ new WeakMap();
+a = /* @__PURE__ */ new WeakMap(), o = /* @__PURE__ */ new WeakMap(), d = /* @__PURE__ */ new WeakMap();
 class RoomBase {
   constructor() {
     H(this, "options", {
@@ -7430,7 +7430,7 @@ class RoomBase {
     // 是否禁止通知
     H(this, "isEarly", !1);
     // 是否提前建连
-    H(this, "taskQueue", new K(["createWs", "createSession", "ice", "joinRoom", "createTrack", "subscribe", "closeTrack", "publish"]));
+    H(this, "taskQueue", new K(["createWs", "createSession", "ice", "joinRoom", "createTrack", "subscribe", "closeTrack"]));
     // 条件队列
     H(this, "roomState", "ready");
     // 房间状态
@@ -7450,7 +7450,7 @@ class RoomBase {
       screenSharing_audio: ""
     });
     H(this, "initAsyncQueue", () => {
-      this.taskQueue.clear(), this.taskQueue.setCondition("joinRoom", !0), this.taskQueue.setCondition("createTrack", !0), this.taskQueue.setCondition("closeTrack", !0), this.taskQueue.setCondition("subscribe", !0), this.taskQueue.setCondition("publish", !0);
+      this.taskQueue.clear(), this.taskQueue.setCondition("createSession", !0), this.taskQueue.setCondition("ice", !0), this.taskQueue.setCondition("joinRoom", !0), this.taskQueue.setCondition("createTrack", !0), this.taskQueue.setCondition("closeTrack", !0), this.taskQueue.setCondition("subscribe", !0);
     });
     /**
      * 获取房间信息
@@ -8262,7 +8262,7 @@ class RoomPeer extends RoomUsers {
       };
       this.peerIns.onconnectionstatechange = () => {
         const $ = this.peerIns.connectionState;
-        switch (clearTimeout(k), this.taskQueue.setCondition("ice", !1), $) {
+        switch (clearTimeout(k), $) {
           // 连接完成
           case "connected":
             this.taskQueue.setCondition("ice", !0), this.options.debug && console.log("\x1B[38;2;0;151;255m%c%s\x1B[0m", "color:#00b60f;", `------->quickvo: connectionState:${$}`);
@@ -8592,7 +8592,7 @@ class RoomCalls extends RoomPeer {
     H(this, "publish", (k) => new Promise(async (D, $) => {
       const I = async () => {
         try {
-          this.taskQueue.setCondition("publish", !1), k.includes("screenSharing_audio") && !k.includes("screenSharing_video") && (k = [...k, "screenSharing_video"]), await this.replaceSenderStream(k, !1);
+          k.includes("screenSharing_audio") && !k.includes("screenSharing_video") && (k = [...k, "screenSharing_video"]), await this.replaceSenderStream(k, !1);
           const e = await this.getCaller();
           for (const L of k)
             this.getUserStream(e.id, L).getTracks().length === 0 && await this.setLocalStream(L, !0);
@@ -8605,16 +8605,16 @@ class RoomCalls extends RoomPeer {
           {
             await this.emitNotifyUpdateUsers();
             const L = await this.getCaller();
-            this.taskQueue.setCondition("publish", !0), D(L);
+            D(L);
           }
         } catch (e) {
           console.log("\x1B[38;2;0;151;255m%c%s\x1B[0m", "color:#0097ff;", "------->Breathe: error", e);
           for (const u of k)
             await this.setLocalStream(u, !1);
-          this.taskQueue.setCondition("publish", !0), $(`publish is error: ${e.message || e}`);
+          $(`publish is error: ${e.message || e}`);
         }
       };
-      this.taskQueue.addTask(I, ["createWs", "createSession", "ice", "createTrack", "subscribe", "publish"], { describe: "replaceSenderStream" });
+      this.taskQueue.addTask(I, ["createWs", "createSession", "ice", "createTrack", "subscribe"], { describe: "replaceSenderStream" });
     }));
     /**
      * 停止发布流
@@ -8825,19 +8825,27 @@ class RoomCalls extends RoomPeer {
     /**
      * 创建cf会话
      */
-    H(this, "createSession", () => new Promise((k) => {
-      if (["connecting", "connected"].includes(this.roomState)) return k(!0);
-      const D = async () => (this.taskQueue.setCondition("ice", !1), this.taskQueue.setCondition("createSession", !1), this.setRoomState("connecting"), await this.addSenders(), this.cwsIns.sendMessage({
-        event: "connectCF",
-        data: { sdp: this.getSdp() }
-      }).then(async ($) => {
-        const { code: I = 0, desc: e, data: u } = $;
-        if (I !== 200) throw new Error(e);
-        const { remoteSdp: N } = u;
-        await this.setRemoteDescription({ type: "answer", sdp: N }), this.taskQueue.setCondition("createSession", !0), k(!0);
-      }));
-      this.taskQueue.addTask(D, ["createWs"], { describe: "createSession" });
-    }));
+    H(this, "createSession", () => {
+      if (!["connecting", "connected"].includes(this.roomState))
+        return this.setRoomState("connecting"), new Promise((k) => {
+          const D = async () => {
+            try {
+              this.taskQueue.setCondition("createSession", !1), await this.addSenders(), await this.cwsIns.sendMessage({
+                event: "connectCF",
+                data: { sdp: this.getSdp() }
+              }).then(async ($) => {
+                const { code: I = 0, desc: e, data: u } = $;
+                if (I !== 200) throw new Error(e);
+                const { remoteSdp: N } = u;
+                this.taskQueue.setCondition("ice", !1), await this.setRemoteDescription({ type: "answer", sdp: N }), this.taskQueue.setCondition("createSession", !0), k(!0);
+              });
+            } catch ($) {
+              this.taskQueue.setCondition("createSession", !0), console.log("\x1B[38;2;0;151;255m%c%s\x1B[0m", "color:#0097ff;", "------->quickvo create session is error.", $);
+            }
+          };
+          this.taskQueue.addTask(D, ["createWs", "createSession", "ice"], { key: "createSession", describe: "createSession" });
+        });
+    });
     /**
      * 创建媒体轨道
      */