@besovideo/webrtc-player 0.9.82 → 0.9.83

package/dist/main.browser.js

@@ -117,7 +117,7 @@ var bvPlayerCore = (() => {
   var define_processenv_default;
   var init_define_processenv = __esm({
     "<define:processenv>"() {
-      define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.9.82", PROJECT_NAMESPACE: "bvplayer" };
+      define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.9.83", PROJECT_NAMESPACE: "bvplayer" };
     }
   });
 
@@ -15971,10 +15971,16 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
         let iCount = 1;
         const intervalToken = setInterval(() => {
           if (pc.connectionState == "connected") {
-            invokeTrack();
-            r();
+            try {
+              invokeTrack();
+              r();
+            } catch (e) {
+            }
           } else if (iCount > 500) {
-            closeDialog2 && closeDialog2();
+            try {
+              closeDialog2 && closeDialog2();
+            } catch (e) {
+            }
             j(t("connect-failed"));
           } else {
             iCount++;
@@ -20013,6 +20019,9 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
           if (!stream)
             return;
           logger_default.debug("webrtc\u6D41", stream, stream.getVideoTracks());
+          if (!this._video) {
+            return;
+          }
           this._video.srcObject = stream;
           const videoTrack = stream.getTracks()[0];
           videoTrack.onended = (e) => {
@@ -20035,6 +20044,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
           (_b = (_a = this.panel) == null ? void 0 : _a.controller.RecordButton) == null ? void 0 : _b.dispatch("click");
         }
         this.dispatch("close");
+        this.clearEventListener("close");
         this.closeWebrtc();
       });
     }
@@ -23536,6 +23546,57 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
     return instanceState;
   }
 
+  // src/components/dialogManager.ts
+  init_define_processenv();
+  init_jsx_shim();
+  var DialogManager = class {
+    constructor() {
+      this.dialogState = 4 /* CLOSED */;
+      this.waitPromisesInvoke = [];
+    }
+    tryInOpening(force) {
+      if (this.dialogState == 4 /* CLOSED */ || force) {
+        this.dialogState = 1 /* OPENING */;
+        return true;
+      }
+      return false;
+    }
+    enterOpeningCanClose() {
+      if (this.dialogState == 1 /* OPENING */) {
+        this.dialogState = 1.1 /* OPENING_CAN_CLOSE */;
+        return this.invokeWaitPromises();
+      }
+      return false;
+    }
+    enterClosed() {
+      this.dialogState = 4 /* CLOSED */;
+    }
+    invokeWaitPromises() {
+      if (this.dialogState != 1 /* OPENING */) {
+        if (this.waitPromisesInvoke.length > 0) {
+          this.waitPromisesInvoke.forEach((resolve) => {
+            try {
+              resolve();
+            } catch (e) {
+            }
+          });
+          this.waitPromisesInvoke.splice(0, this.waitPromisesInvoke.length);
+          return true;
+        }
+      }
+      return false;
+    }
+    waitForCanClose() {
+      return new Promise((resolve) => {
+        if (this.dialogState == 1 /* OPENING */) {
+          this.waitPromisesInvoke.push(resolve);
+        } else {
+          resolve();
+        }
+      });
+    }
+  };
+
   // src/components/puPlayer.tsx
   var createProductRemoteSdp = (puOption, tempToken, callBack, signal) => (localDescription) => __async(void 0, null, function* () {
     if (localDescription.type !== "offer")
@@ -23788,6 +23849,7 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
             player.mask.visible = true;
             player.mask.text = t("lost-connection");
             player.close();
+            dlgMgr.enterClosed();
             onDisConnected && onDisConnected();
             useRecntMgr == null ? void 0 : useRecntMgr.reconnect();
           },
@@ -23834,8 +23896,10 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
         return;
       }
       logger_default.debug("PuPlayer close", dialogId);
-      player.mask.visible = true;
-      player.mask.text = t("video-closed");
+      if (player.mask) {
+        player.mask.visible = true;
+        player.mask.text = t("video-closed");
+      }
       onClose && onClose();
       if (dialogId) {
         try {
@@ -23853,6 +23917,7 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
         throw err;
       }
     }
+    const dlgMgr = new DialogManager();
     const instance2 = {
       getVideoElement: () => {
         const el = player.video.getVideoEl();
@@ -23866,6 +23931,9 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
       open: function() {
         return __async(this, arguments, function* (muted2 = false, protocol = type) {
           var _a2, _b;
+          if (!dlgMgr.tryInOpening()) {
+            return;
+          }
           muted2 = arguments.length == 0 ? currentMuted : muted2;
           console.log("open with muted: ", muted2);
           player.clearEventListener("close");
@@ -23876,8 +23944,10 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
           yield handleClose();
           player.addEventListener("close", () => __async(this, null, function* () {
             console.log("\u5173\u95ED\u89C6\u9891");
+            yield dlgMgr.waitForCanClose();
             abortController.abort();
             yield handleClose();
+            dlgMgr.enterClosed();
           }));
           logger_default.debug("PuPlayer close before open");
           player.mask.visible = false;
@@ -23886,11 +23956,15 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
           let hplayer = null;
           try {
             if (protocol === "ws-bvrtc") {
+              dlgMgr.enterClosed();
               throw "protocol == ws-bvrtc";
             }
             player.enableCanvas(false);
             this.protocol = "webrtc";
             yield player.prepareWebrtc();
+            if (dlgMgr.enterOpeningCanClose()) {
+              return;
+            }
             if (noVideoRendeAudioWaveform && player.video.srcObject && !defaultMediaOption.video) {
               audioWaveShow.setMediaStream(player.video.srcObject);
               audioWaveShow.setEle(playerEl);
@@ -23911,8 +23985,14 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
               player.mask.visible = true;
               player.mask.text = e.toString();
               onConnectedFailed && onConnectedFailed();
+              if (dlgMgr.enterOpeningCanClose()) {
+                return;
+              }
+              dlgMgr.enterClosed();
               reconnectMgr == null ? void 0 : reconnectMgr.reconnect();
               return;
+            } else {
+              dlgMgr.enterClosed();
             }
             try {
               let DisplayVolumn2 = function(volume) {
@@ -23927,6 +24007,9 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
                 }
               };
               var DisplayVolumn = DisplayVolumn2;
+              if (!dlgMgr.tryInOpening()) {
+                return;
+              }
               logger_default.debug("error\u7684\u7C7B\u578B", e.name, e instanceof OpenDialogError);
               if (e instanceof OpenDialogError)
                 throw e;
@@ -23946,6 +24029,9 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
                 hplayer.setPrefix(apiPrefix);
               }
               yield hplayer.open(5e3, 3, "");
+              if (dlgMgr.enterOpeningCanClose()) {
+                return;
+              }
               if (typeof bvrtcConfig.realTimeLevel == "number") {
                 if (bvrtcConfig.realTimeLevel >= 0 && bvrtcConfig.realTimeLevel <= 10) {
                   yield hplayer.setRealTimeIndex(bvrtcConfig.realTimeLevel);
@@ -23992,6 +24078,9 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
                 }
                 throw t("da-kai-shi-bai");
               }
+              if (dlgMgr.enterOpeningCanClose()) {
+                return;
+              }
               player.statsInfosV1 = () => {
                 return GetBvrtcIStatsInfosV1(hplayer);
               };
@@ -24102,6 +24191,7 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
               player.mask.text = e2.toString();
               hplayer == null ? void 0 : hplayer.close();
               onConnectedFailed && onConnectedFailed();
+              dlgMgr.enterClosed();
               reconnectMgr == null ? void 0 : reconnectMgr.reconnect();
               throw e2;
             }

package/dist/main.es.js

@@ -111,7 +111,7 @@ var __async = (__this, __arguments, generator) => {
 var define_processenv_default;
 var init_define_processenv = __esm({
   "<define:processenv>"() {
-    define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.9.82", PROJECT_NAMESPACE: "bvplayer" };
+    define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.9.83", PROJECT_NAMESPACE: "bvplayer" };
   }
 });
 
@@ -15955,10 +15955,16 @@ var connect = (param, onGotStream) => __async(void 0, null, function* () {
       let iCount = 1;
       const intervalToken = setInterval(() => {
         if (pc.connectionState == "connected") {
-          invokeTrack();
-          r();
+          try {
+            invokeTrack();
+            r();
+          } catch (e) {
+          }
         } else if (iCount > 500) {
-          closeDialog2 && closeDialog2();
+          try {
+            closeDialog2 && closeDialog2();
+          } catch (e) {
+          }
           j(t("connect-failed"));
         } else {
           iCount++;
@@ -19997,6 +20003,9 @@ var PlayerPlugin = class extends Plugin {
         if (!stream)
           return;
         logger_default.debug("webrtc\u6D41", stream, stream.getVideoTracks());
+        if (!this._video) {
+          return;
+        }
         this._video.srcObject = stream;
         const videoTrack = stream.getTracks()[0];
         videoTrack.onended = (e) => {
@@ -20019,6 +20028,7 @@ var PlayerPlugin = class extends Plugin {
         (_b = (_a = this.panel) == null ? void 0 : _a.controller.RecordButton) == null ? void 0 : _b.dispatch("click");
       }
       this.dispatch("close");
+      this.clearEventListener("close");
       this.closeWebrtc();
     });
   }
@@ -23520,6 +23530,57 @@ function CreatePlayerState(player) {
   return instanceState;
 }
 
+// src/components/dialogManager.ts
+init_define_processenv();
+init_jsx_shim();
+var DialogManager = class {
+  constructor() {
+    this.dialogState = 4 /* CLOSED */;
+    this.waitPromisesInvoke = [];
+  }
+  tryInOpening(force) {
+    if (this.dialogState == 4 /* CLOSED */ || force) {
+      this.dialogState = 1 /* OPENING */;
+      return true;
+    }
+    return false;
+  }
+  enterOpeningCanClose() {
+    if (this.dialogState == 1 /* OPENING */) {
+      this.dialogState = 1.1 /* OPENING_CAN_CLOSE */;
+      return this.invokeWaitPromises();
+    }
+    return false;
+  }
+  enterClosed() {
+    this.dialogState = 4 /* CLOSED */;
+  }
+  invokeWaitPromises() {
+    if (this.dialogState != 1 /* OPENING */) {
+      if (this.waitPromisesInvoke.length > 0) {
+        this.waitPromisesInvoke.forEach((resolve) => {
+          try {
+            resolve();
+          } catch (e) {
+          }
+        });
+        this.waitPromisesInvoke.splice(0, this.waitPromisesInvoke.length);
+        return true;
+      }
+    }
+    return false;
+  }
+  waitForCanClose() {
+    return new Promise((resolve) => {
+      if (this.dialogState == 1 /* OPENING */) {
+        this.waitPromisesInvoke.push(resolve);
+      } else {
+        resolve();
+      }
+    });
+  }
+};
+
 // src/components/puPlayer.tsx
 var createProductRemoteSdp = (puOption, tempToken, callBack, signal) => (localDescription) => __async(void 0, null, function* () {
   if (localDescription.type !== "offer")
@@ -23772,6 +23833,7 @@ var PuPlayer = (props) => {
           player.mask.visible = true;
           player.mask.text = t("lost-connection");
           player.close();
+          dlgMgr.enterClosed();
           onDisConnected && onDisConnected();
           useRecntMgr == null ? void 0 : useRecntMgr.reconnect();
         },
@@ -23818,8 +23880,10 @@ var PuPlayer = (props) => {
       return;
     }
     logger_default.debug("PuPlayer close", dialogId);
-    player.mask.visible = true;
-    player.mask.text = t("video-closed");
+    if (player.mask) {
+      player.mask.visible = true;
+      player.mask.text = t("video-closed");
+    }
     onClose && onClose();
     if (dialogId) {
       try {
@@ -23837,6 +23901,7 @@ var PuPlayer = (props) => {
       throw err;
     }
   }
+  const dlgMgr = new DialogManager();
   const instance2 = {
     getVideoElement: () => {
       const el = player.video.getVideoEl();
@@ -23850,6 +23915,9 @@ var PuPlayer = (props) => {
     open: function() {
       return __async(this, arguments, function* (muted2 = false, protocol = type) {
         var _a2, _b;
+        if (!dlgMgr.tryInOpening()) {
+          return;
+        }
         muted2 = arguments.length == 0 ? currentMuted : muted2;
         console.log("open with muted: ", muted2);
         player.clearEventListener("close");
@@ -23860,8 +23928,10 @@ var PuPlayer = (props) => {
         yield handleClose();
         player.addEventListener("close", () => __async(this, null, function* () {
           console.log("\u5173\u95ED\u89C6\u9891");
+          yield dlgMgr.waitForCanClose();
           abortController.abort();
           yield handleClose();
+          dlgMgr.enterClosed();
         }));
         logger_default.debug("PuPlayer close before open");
         player.mask.visible = false;
@@ -23870,11 +23940,15 @@ var PuPlayer = (props) => {
         let hplayer = null;
         try {
           if (protocol === "ws-bvrtc") {
+            dlgMgr.enterClosed();
             throw "protocol == ws-bvrtc";
           }
           player.enableCanvas(false);
           this.protocol = "webrtc";
           yield player.prepareWebrtc();
+          if (dlgMgr.enterOpeningCanClose()) {
+            return;
+          }
           if (noVideoRendeAudioWaveform && player.video.srcObject && !defaultMediaOption.video) {
             audioWaveShow.setMediaStream(player.video.srcObject);
             audioWaveShow.setEle(playerEl);
@@ -23895,8 +23969,14 @@ var PuPlayer = (props) => {
             player.mask.visible = true;
             player.mask.text = e.toString();
             onConnectedFailed && onConnectedFailed();
+            if (dlgMgr.enterOpeningCanClose()) {
+              return;
+            }
+            dlgMgr.enterClosed();
             reconnectMgr == null ? void 0 : reconnectMgr.reconnect();
             return;
+          } else {
+            dlgMgr.enterClosed();
           }
           try {
             let DisplayVolumn2 = function(volume) {
@@ -23911,6 +23991,9 @@ var PuPlayer = (props) => {
               }
             };
             var DisplayVolumn = DisplayVolumn2;
+            if (!dlgMgr.tryInOpening()) {
+              return;
+            }
             logger_default.debug("error\u7684\u7C7B\u578B", e.name, e instanceof OpenDialogError);
             if (e instanceof OpenDialogError)
               throw e;
@@ -23930,6 +24013,9 @@ var PuPlayer = (props) => {
               hplayer.setPrefix(apiPrefix);
             }
             yield hplayer.open(5e3, 3, "");
+            if (dlgMgr.enterOpeningCanClose()) {
+              return;
+            }
             if (typeof bvrtcConfig.realTimeLevel == "number") {
               if (bvrtcConfig.realTimeLevel >= 0 && bvrtcConfig.realTimeLevel <= 10) {
                 yield hplayer.setRealTimeIndex(bvrtcConfig.realTimeLevel);
@@ -23976,6 +24062,9 @@ var PuPlayer = (props) => {
               }
               throw t("da-kai-shi-bai");
             }
+            if (dlgMgr.enterOpeningCanClose()) {
+              return;
+            }
             player.statsInfosV1 = () => {
               return GetBvrtcIStatsInfosV1(hplayer);
             };
@@ -24086,6 +24175,7 @@ var PuPlayer = (props) => {
             player.mask.text = e2.toString();
             hplayer == null ? void 0 : hplayer.close();
             onConnectedFailed && onConnectedFailed();
+            dlgMgr.enterClosed();
             reconnectMgr == null ? void 0 : reconnectMgr.reconnect();
             throw e2;
           }

package/dist/types/components/dialogManager.d.ts

@@ -0,0 +1,10 @@
+export declare class DialogManager {
+    private dialogState;
+    constructor();
+    tryInOpening(force?: boolean): boolean;
+    enterOpeningCanClose(): boolean;
+    enterClosed(): void;
+    private waitPromisesInvoke;
+    private invokeWaitPromises;
+    waitForCanClose(): Promise<void>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@besovideo/webrtc-player",
-  "version": "0.9.82",
+  "version": "0.9.83",
   "description": "@besovideo/webrtc-player desc",
   "type": "module",
   "types": "./dist/types/main.d.ts",