@besovideo/webrtc-player 0.10.5 → 0.10.7

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.10.5", PROJECT_NAMESPACE: "bvplayer" };
+      define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.10.7", PROJECT_NAMESPACE: "bvplayer" };
     }
   });
 
@@ -15271,16 +15271,18 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
     };
     return handle2;
   }
-  var _onIcon, _offIcon, _doingIcon, _isBusy, _talk, _intercom, _type, _onTalkStart, onTalkStart_fn, _onTalkEnd, onTalkEnd_fn;
+  var _onIcon, _offIcon, _doingIcon, _currentIcon, _isBusy, _talk, _intercom, _type, _onTalkStart, onTalkStart_fn, _onTalkEnd, onTalkEnd_fn, _setIcon, setIcon_fn;
   var MikeButton = class extends HTMLElement {
     constructor() {
       super();
       __privateAdd(this, _onTalkStart);
       __privateAdd(this, _onTalkEnd);
+      __privateAdd(this, _setIcon);
       // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes/Private_class_fields weakmep实现的私有变量
       __privateAdd(this, _onIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h(icons_default.MikeOn, null)));
       __privateAdd(this, _offIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h(icons_default.MikeOff, null)));
       __privateAdd(this, _doingIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h(icons_default.MikeDoing, null)));
+      __privateAdd(this, _currentIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("span", null)));
       __privateAdd(this, _isBusy, false);
       //是否正在喊话
       __privateAdd(this, _talk, false);
@@ -15289,6 +15291,7 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
       __privateAdd(this, _intercom, void 0);
       // 协议类型
       __privateAdd(this, _type, void 0);
+      __privateMethod(this, _setIcon, setIcon_fn).call(this, "off");
       this.attachShadow({ mode: "open" });
       this.addEventListener("click", () => {
         if (!__privateGet(this, _isBusy)) {
@@ -15314,7 +15317,7 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
           if (toast) {
             toast.error(e);
           }
-          __privateGet(this, _doingIcon).replaceWith(__privateGet(this, _offIcon));
+          __privateMethod(this, _setIcon, setIcon_fn).call(this, "off");
         });
         pm.finally(() => {
           __privateSet(this, _isBusy, false);
@@ -15333,12 +15336,13 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
     render() {
       if (!this.shadowRoot)
         return;
-      this.shadowRoot.appendChild(__privateGet(this, _talk) ? __privateGet(this, _onIcon) : __privateGet(this, _offIcon));
+      this.shadowRoot.appendChild(__privateGet(this, _currentIcon));
     }
   };
   _onIcon = new WeakMap();
   _offIcon = new WeakMap();
   _doingIcon = new WeakMap();
+  _currentIcon = new WeakMap();
   _isBusy = new WeakMap();
   _talk = new WeakMap();
   _intercom = new WeakMap();
@@ -15349,12 +15353,12 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
       var _a;
       if (!__privateGet(this, _intercom))
         return;
-      __privateGet(this, _offIcon).replaceWith(__privateGet(this, _doingIcon));
+      __privateMethod(this, _setIcon, setIcon_fn).call(this, "doing");
       if (!navigator.mediaDevices) {
         throw t("mei-you-mai-ke-feng-huo-zhe-mei-you-quan-xian");
       }
       yield (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.open(void 0, __privateGet(this, _type));
-      __privateGet(this, _doingIcon).replaceWith(__privateGet(this, _onIcon));
+      __privateMethod(this, _setIcon, setIcon_fn).call(this, "on");
       this.events.dispatch("intercomStart");
     });
   };
@@ -15362,15 +15366,36 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
   onTalkEnd_fn = function() {
     return __async(this, null, function* () {
       var _a;
-      __privateGet(this, _onIcon).replaceWith(__privateGet(this, _doingIcon));
+      __privateMethod(this, _setIcon, setIcon_fn).call(this, "doing");
       yield (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.close();
       yield new Promise((r) => {
         setTimeout(r, 1e3);
       });
-      __privateGet(this, _doingIcon).replaceWith(__privateGet(this, _offIcon));
+      __privateMethod(this, _setIcon, setIcon_fn).call(this, "off");
       this.events.dispatch("intercomStop");
     });
   };
+  _setIcon = new WeakSet();
+  setIcon_fn = function(iconType) {
+    core_default.dom.empty(__privateGet(this, _currentIcon));
+    switch (iconType) {
+      case "doing":
+        {
+          __privateGet(this, _currentIcon).appendChild(__privateGet(this, _doingIcon));
+        }
+        break;
+      case "on":
+        {
+          __privateGet(this, _currentIcon).appendChild(__privateGet(this, _onIcon));
+        }
+        break;
+      case "off":
+        {
+          __privateGet(this, _currentIcon).appendChild(__privateGet(this, _offIcon));
+        }
+        break;
+    }
+  };
   customElements.define("mike-button", MikeButton);
 
   // src/plugins/controller/index.tsx
@@ -22481,7 +22506,7 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
         logger_default.debug("BvWebrtcInstance close", `_dialogId: ${this._dialogId}`);
         this.player.mask.visible = true;
         this.player.mask.text = t("video-closed");
-        this.player.close();
+        yield this.player.close();
         logger_default.debug(
           `BvWebrtcInstance close\uFF0C player closed\uFF0C\u68C0\u67E5 remoteSdpFetcher: `,
           this._remoteSdpFetcher
@@ -22569,10 +22594,10 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
       bvInstance.removeEventListener("close", handleClose);
       onClose && onClose();
     };
-    bvInstance.addEventListener("close", handleClose);
     const instance2 = {
       open: () => __async(void 0, null, function* () {
         logger_default.debug("BvWebrtc open");
+        bvInstance.addEventListener("close", handleClose);
         yield bvInstance.open();
       }),
       setOption: (option) => {
@@ -22641,6 +22666,66 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
     logger_default.debug("microphone audio tracks\uFF1A", audioTracks);
     return localStream;
   });
+  function CreatePlayerCloseInterruptManager(player) {
+    let isCloseEmit = false;
+    function onCloseEmitHandle() {
+      if (isCloseEmit == false) {
+        setCloseEmited();
+      }
+    }
+    let isBegin = false;
+    let isEnd = false;
+    const szInvoke = [];
+    function invokeWaitResult() {
+      szInvoke.forEach((item) => {
+        try {
+          item();
+        } catch (e) {
+        }
+      });
+      szInvoke.splice(0, szInvoke.length);
+    }
+    function setCloseEmited() {
+      isCloseEmit = true;
+    }
+    return {
+      WaitForClose() {
+        return __async(this, null, function* () {
+          setCloseEmited();
+          return new Promise((r) => {
+            if (!isBegin) {
+              r();
+            } else {
+              szInvoke.push(r);
+            }
+          });
+        });
+      },
+      Begin(notListenCloseEvent) {
+        isBegin = true;
+        isEnd = false;
+        isCloseEmit = false;
+        if (!notListenCloseEvent) {
+          player.addEventListener("close", onCloseEmitHandle);
+        }
+      },
+      Check() {
+        if (isCloseEmit) {
+          this.End();
+          invokeWaitResult();
+          throw "abort open";
+        }
+      },
+      End() {
+        isBegin = false;
+        isEnd = true;
+        try {
+          player.removeEventListener("close", onCloseEmitHandle);
+        } catch (e) {
+        }
+      }
+    };
+  }
   var AudioPlayer = (props) => {
     const {
       container,
@@ -22719,7 +22804,9 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
       onPcEventAdded: (pc) => __async(void 0, null, function* () {
         try {
           const localStream = yield getUserMedia();
-          localStream.getTracks().forEach((track) => pc.addTrack(track, localStream));
+          localStream.getTracks().forEach((track) => {
+            pc.addTrack(track, localStream);
+          });
           releaseLocalStream();
           localStreamRelease = () => {
             localStream.getTracks().forEach((t2) => t2.stop());
@@ -22731,21 +22818,38 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
       //对讲和会议不启用控制器
       enableController: false
     });
+    const player = bvWebrtcComponentInstance.__dangerGetPlayer();
+    const playerCloseInteruptMgr = CreatePlayerCloseInterruptManager(player);
     const instance2 = __spreadProps(__spreadValues({}, bvWebrtcComponentInstance), {
+      destroy() {
+        return __async(this, null, function* () {
+          yield instance2.close();
+          bvWebrtcComponentInstance.destroy();
+        });
+      },
+      close: () => __async(void 0, null, function* () {
+        console.log("wait for close intercom");
+        yield playerCloseInteruptMgr.WaitForClose();
+        console.log("wait for close intercom do");
+        bvWebrtcComponentInstance.close();
+      }),
       open: (..._0) => __async(void 0, [..._0], function* (protocol = type, mikeButtonType) {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         if (mikeButtonType)
           protocol = mikeButtonType;
-        const player = bvWebrtcComponentInstance.__dangerGetPlayer();
         let hplayer = null;
         try {
           if (protocol === "ws-bvrtc") {
             throw "protocol == ws-bvrtc";
           }
           player.enableCanvas(false);
+          playerCloseInteruptMgr.Begin(true);
           yield bvWebrtcComponentInstance.open();
+          playerCloseInteruptMgr.Check();
+          playerCloseInteruptMgr.End();
         } catch (e) {
           try {
+            playerCloseInteruptMgr.Begin();
             logger_default.debug("error type", e.name, e instanceof OpenDialogError);
             if (e instanceof OpenDialogError || protocol === "webrtc")
               throw e;
@@ -22758,6 +22862,7 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
               hplayer.setPrefix(apiPrefix);
             }
             yield hplayer.open(5e3, 3, "");
+            playerCloseInteruptMgr.Check();
             if (typeof (bvrtcConfig == null ? void 0 : bvrtcConfig.realTimeLevel) == "number") {
               if (bvrtcConfig.realTimeLevel >= 0 && bvrtcConfig.realTimeLevel <= 10) {
                 yield hplayer.setRealTimeIndex(bvrtcConfig.realTimeLevel);
@@ -22782,16 +22887,18 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
               hplayer.close();
               throw new Error("ws-bvrtc create offer failed.");
             }
-            logger_default.debug("ws-bvrtc localSDP: ", (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.sdp);
+            logger_default.debug("ws-bvrtc localSDP: ", (_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.sdp);
+            playerCloseInteruptMgr.Check();
             yield dialog_default.closeDialogs(
               [sdpFetcher.dialogId || ""],
               sdpFetcher.token
             );
             yield new Promise((resolve) => {
               setTimeout(() => {
-                resolve(1);
-              }, 1e3);
+                resolve();
+              }, 0);
             });
+            playerCloseInteruptMgr.Check();
             const dialog = isConference ? yield dialog_default.getConferenceBvrtc(
               {
                 id,
@@ -22809,39 +22916,38 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
             );
             logger_default.debug("ws-bvrtc remoteSDP: ", dialog.sdp);
             hplayer.setRemoteSDP(dialog.dialogId, dialog.sdp);
-            let invokePomiseWaitResult = () => {
-            };
-            let rejectPomiseWaitResult = () => {
-            };
-            const promiseWaitResult = new Promise((r, j) => {
-              invokePomiseWaitResult = r;
-              rejectPomiseWaitResult = j;
-            });
+            playerCloseInteruptMgr.Check();
+            const {
+              promise: promiseWaitResult,
+              resolve: invokePomiseWaitResult,
+              reject: rejectPomiseWaitResult
+            } = Promise.withResolvers();
             hplayer.onevent = function(bCloseEvent, iResult) {
-              if (bCloseEvent !== 0) {
-                logger_default.debug("ws-bvrtc", "av channel be closed");
-                onDisConnected && onDisConnected();
-              } else if (iResult == 0) {
-                logger_default.debug("ws-bvrtc", "open av channel success ");
-                onConnected && onConnected();
-                invokePomiseWaitResult();
-              } else {
-                logger_default.debug("ws-bvrtc", "open av channel fail " + iResult);
-                onConnectedFailed && onConnectedFailed();
-                rejectPomiseWaitResult();
-              }
+              return __async(this, null, function* () {
+                if (bCloseEvent !== 0) {
+                  logger_default.debug("ws-bvrtc", "av channel be closed");
+                  onDisConnected && onDisConnected();
+                } else if (iResult == 0) {
+                  logger_default.debug("ws-bvrtc", "open av channel success ");
+                  onConnected && onConnected();
+                  invokePomiseWaitResult();
+                } else {
+                  logger_default.debug("ws-bvrtc", "open av channel fail " + iResult);
+                  onConnectedFailed && onConnectedFailed();
+                  rejectPomiseWaitResult();
+                }
+              });
             };
             yield promiseWaitResult;
+            playerCloseInteruptMgr.End();
             player.spinner.spin = false;
             const closeHandle = () => __async(void 0, null, function* () {
               if (!hplayer)
                 return;
               player.removeEventListener("close", closeHandle);
+              const dialogId = hplayer.getDialogID();
               hplayer.close();
-              yield dialog_default.closeDialogs(
-                [hplayer.getDialogID()],
-                sdpFetcher.token
-              );
+              yield dialog_default.closeDialogs([dialogId], sdpFetcher.token);
             });
             player.addEventListener("close", closeHandle);
           } catch (e2) {
@@ -24067,6 +24173,11 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
       }
     }
     const dlgMgr = new DialogManager();
+    if (player.mikeBtn) {
+      player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
+    } else {
+      player.intercomUtils = CreateIntercomUtils(intercom == null ? void 0 : intercom.instance, (void 0).protocol);
+    }
     const instance2 = {
       getVideoElement: () => {
         const el = player.video.getVideoEl();
@@ -24110,6 +24221,9 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
             }
             player.enableCanvas(false);
             this.protocol = "webrtc";
+            if (player.mikeBtn) {
+              player.mikeBtn.type = this.protocol;
+            }
             yield player.prepareWebrtc();
             if (dlgMgr.enterOpeningCanClose()) {
               return;
@@ -24118,12 +24232,6 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
               audioWaveShow.setMediaStream(player.video.srcObject);
               audioWaveShow.setEle(playerEl);
             }
-            if (player.mikeBtn) {
-              player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
-              player.mikeBtn.type = this.protocol;
-            } else {
-              player.intercomUtils = CreateIntercomUtils(intercom == null ? void 0 : intercom.instance, this.protocol);
-            }
           } catch (e) {
             tokenFailDetect(e, () => {
               player.mask.visible = true;
@@ -24329,7 +24437,6 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
                 });
               }
               if (player.mikeBtn) {
-                player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
                 player.mikeBtn.type = this.protocol;
               }
             } catch (e2) {
@@ -24433,14 +24540,15 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
         yield player.close();
         useRecntMgr = void 0;
         reconnectMgr == null ? void 0 : reconnectMgr.cancelReconnect();
-        if (player.mikeBtn) {
-          player.mikeBtn.talking = false;
-          player.mikeBtn.intercom = void 0;
-        }
       }),
       render: player.init,
       destroy: () => __async(void 0, null, function* () {
         logger_default.debug("PuPlayer destroy");
+        if (player.mikeBtn) {
+          player.mikeBtn.talking = false;
+          player.mikeBtn.intercom = void 0;
+          intercom == null ? void 0 : intercom.instance.close();
+        }
         intercom == null ? void 0 : intercom.instance.destroy();
         player.destroy();
         reconnectMgr == null ? void 0 : reconnectMgr.cancelReconnect();
@@ -25463,6 +25571,9 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
       this.svgSound = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("span", { class: "svg-sound" }, /* @__PURE__ */ jsx_default.h("input", { type: "range", className: "range-input", value: this.volumeCurrent, oninput: (e) => {
         this.onVolumeChange(e.target.value);
       } })));
+      this.svgSnapshot = core_default.dom.createByJsx(
+        /* @__PURE__ */ jsx_default.h("svg", { onclick: () => this.dispatch("snapshot"), style: "margin-left: 20px; cursor: pointer", xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 256 256" }, /* @__PURE__ */ jsx_default.h("rect", { width: "256", height: "256", fill: "none" }), /* @__PURE__ */ jsx_default.h("path", { fill: "#fff", d: "M208 58h-28.79L165 36.67a6 6 0 0 0-5-2.67H96a6 6 0 0 0-5 2.67L76.78 58H48a22 22 0 0 0-22 22v112a22 22 0 0 0 22 22h160a22 22 0 0 0 22-22V80a22 22 0 0 0-22-22m10 134a10 10 0 0 1-10 10H48a10 10 0 0 1-10-10V80a10 10 0 0 1 10-10h32a6 6 0 0 0 5-2.67L99.21 46h57.57L171 67.33a6 6 0 0 0 5 2.67h32a10 10 0 0 1 10 10ZM128 90a42 42 0 1 0 42 42a42 42 0 0 0-42-42m0 72a30 30 0 1 1 30-30a30 30 0 0 1-30 30", "stroke-width": "6.5", stroke: "#fff" }))
+      );
       this.svgFullscreen = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("svg", { onclick: () => {
         this.dispatch("fullscreen");
       }, style: "margin-left: 30px; cursor: pointer", xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 24 24" }, /* @__PURE__ */ jsx_default.h("path", { fill: "white", d: "M4 4h6v2H6v4H4zm10 0h6v6h-2V6h-4zM6 14v4h4v2H4v-6zm14 0v6h-6v-2h4v-4z" })));
@@ -25739,7 +25850,7 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
       const rightPanel = this.controls.rightControls ? this.controls.rightControls : (() => {
         this.controls.rightControls = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("span", { class: "right-options" }));
         core_default.dom.append(this.svgSound, this.svgSound100);
-        core_default.dom.append(this.controls.rightControls, this.svgSound, this.playSpeed, this.svgFullscreen, this.svgOptions, this.optionsContent);
+        core_default.dom.append(this.controls.rightControls, this.svgSound, this.playSpeed, this.svgSnapshot, this.svgFullscreen, this.optionsContent);
         return this.controls.rightControls;
       })();
       const barContent = this.controls.barContent ? this.controls.barContent : this.controls.barContent = core_default.dom.createByJsx(
@@ -26399,6 +26510,10 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
           barHandle.addEventListener("fullscreen", () => {
             fullscreen_default.toggle(markerHandle.GetPlayArea());
           });
+          barHandle.addEventListener("snapshot", () => __async(this, null, function* () {
+            const snapshotHandle = yield player.video.screenshot();
+            snapshotHandle == null ? void 0 : snapshotHandle.download();
+          }));
           markerHandle.addEventListener("jump", (params) => {
             barHandle.jumpToTargetSeconds(params);
           });

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.10.5", PROJECT_NAMESPACE: "bvplayer" };
+    define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.10.7", PROJECT_NAMESPACE: "bvplayer" };
   }
 });
 
@@ -15254,16 +15254,18 @@ function CreateIntercomUtils(intercomIns, type) {
   };
   return handle2;
 }
-var _onIcon, _offIcon, _doingIcon, _isBusy, _talk, _intercom, _type, _onTalkStart, onTalkStart_fn, _onTalkEnd, onTalkEnd_fn;
+var _onIcon, _offIcon, _doingIcon, _currentIcon, _isBusy, _talk, _intercom, _type, _onTalkStart, onTalkStart_fn, _onTalkEnd, onTalkEnd_fn, _setIcon, setIcon_fn;
 var MikeButton = class extends HTMLElement {
   constructor() {
     super();
     __privateAdd(this, _onTalkStart);
     __privateAdd(this, _onTalkEnd);
+    __privateAdd(this, _setIcon);
     // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes/Private_class_fields weakmep实现的私有变量
     __privateAdd(this, _onIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h(icons_default.MikeOn, null)));
     __privateAdd(this, _offIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h(icons_default.MikeOff, null)));
     __privateAdd(this, _doingIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h(icons_default.MikeDoing, null)));
+    __privateAdd(this, _currentIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("span", null)));
     __privateAdd(this, _isBusy, false);
     //是否正在喊话
     __privateAdd(this, _talk, false);
@@ -15272,6 +15274,7 @@ var MikeButton = class extends HTMLElement {
     __privateAdd(this, _intercom, void 0);
     // 协议类型
     __privateAdd(this, _type, void 0);
+    __privateMethod(this, _setIcon, setIcon_fn).call(this, "off");
     this.attachShadow({ mode: "open" });
     this.addEventListener("click", () => {
       if (!__privateGet(this, _isBusy)) {
@@ -15297,7 +15300,7 @@ var MikeButton = class extends HTMLElement {
         if (toast) {
           toast.error(e);
         }
-        __privateGet(this, _doingIcon).replaceWith(__privateGet(this, _offIcon));
+        __privateMethod(this, _setIcon, setIcon_fn).call(this, "off");
       });
       pm.finally(() => {
         __privateSet(this, _isBusy, false);
@@ -15316,12 +15319,13 @@ var MikeButton = class extends HTMLElement {
   render() {
     if (!this.shadowRoot)
       return;
-    this.shadowRoot.appendChild(__privateGet(this, _talk) ? __privateGet(this, _onIcon) : __privateGet(this, _offIcon));
+    this.shadowRoot.appendChild(__privateGet(this, _currentIcon));
   }
 };
 _onIcon = new WeakMap();
 _offIcon = new WeakMap();
 _doingIcon = new WeakMap();
+_currentIcon = new WeakMap();
 _isBusy = new WeakMap();
 _talk = new WeakMap();
 _intercom = new WeakMap();
@@ -15332,12 +15336,12 @@ onTalkStart_fn = function() {
     var _a;
     if (!__privateGet(this, _intercom))
       return;
-    __privateGet(this, _offIcon).replaceWith(__privateGet(this, _doingIcon));
+    __privateMethod(this, _setIcon, setIcon_fn).call(this, "doing");
     if (!navigator.mediaDevices) {
       throw t("mei-you-mai-ke-feng-huo-zhe-mei-you-quan-xian");
     }
     yield (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.open(void 0, __privateGet(this, _type));
-    __privateGet(this, _doingIcon).replaceWith(__privateGet(this, _onIcon));
+    __privateMethod(this, _setIcon, setIcon_fn).call(this, "on");
     this.events.dispatch("intercomStart");
   });
 };
@@ -15345,15 +15349,36 @@ _onTalkEnd = new WeakSet();
 onTalkEnd_fn = function() {
   return __async(this, null, function* () {
     var _a;
-    __privateGet(this, _onIcon).replaceWith(__privateGet(this, _doingIcon));
+    __privateMethod(this, _setIcon, setIcon_fn).call(this, "doing");
     yield (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.close();
     yield new Promise((r) => {
       setTimeout(r, 1e3);
     });
-    __privateGet(this, _doingIcon).replaceWith(__privateGet(this, _offIcon));
+    __privateMethod(this, _setIcon, setIcon_fn).call(this, "off");
     this.events.dispatch("intercomStop");
   });
 };
+_setIcon = new WeakSet();
+setIcon_fn = function(iconType) {
+  core_default.dom.empty(__privateGet(this, _currentIcon));
+  switch (iconType) {
+    case "doing":
+      {
+        __privateGet(this, _currentIcon).appendChild(__privateGet(this, _doingIcon));
+      }
+      break;
+    case "on":
+      {
+        __privateGet(this, _currentIcon).appendChild(__privateGet(this, _onIcon));
+      }
+      break;
+    case "off":
+      {
+        __privateGet(this, _currentIcon).appendChild(__privateGet(this, _offIcon));
+      }
+      break;
+  }
+};
 customElements.define("mike-button", MikeButton);
 
 // src/plugins/controller/index.tsx
@@ -22464,7 +22489,7 @@ var BvWebrtcInstance = class extends CommonInstance {
       logger_default.debug("BvWebrtcInstance close", `_dialogId: ${this._dialogId}`);
       this.player.mask.visible = true;
       this.player.mask.text = t("video-closed");
-      this.player.close();
+      yield this.player.close();
       logger_default.debug(
         `BvWebrtcInstance close\uFF0C player closed\uFF0C\u68C0\u67E5 remoteSdpFetcher: `,
         this._remoteSdpFetcher
@@ -22552,10 +22577,10 @@ var BvWebrtc = (props) => {
     bvInstance.removeEventListener("close", handleClose);
     onClose && onClose();
   };
-  bvInstance.addEventListener("close", handleClose);
   const instance2 = {
     open: () => __async(void 0, null, function* () {
       logger_default.debug("BvWebrtc open");
+      bvInstance.addEventListener("close", handleClose);
       yield bvInstance.open();
     }),
     setOption: (option) => {
@@ -22624,6 +22649,66 @@ var getUserMedia = () => __async(void 0, null, function* () {
   logger_default.debug("microphone audio tracks\uFF1A", audioTracks);
   return localStream;
 });
+function CreatePlayerCloseInterruptManager(player) {
+  let isCloseEmit = false;
+  function onCloseEmitHandle() {
+    if (isCloseEmit == false) {
+      setCloseEmited();
+    }
+  }
+  let isBegin = false;
+  let isEnd = false;
+  const szInvoke = [];
+  function invokeWaitResult() {
+    szInvoke.forEach((item) => {
+      try {
+        item();
+      } catch (e) {
+      }
+    });
+    szInvoke.splice(0, szInvoke.length);
+  }
+  function setCloseEmited() {
+    isCloseEmit = true;
+  }
+  return {
+    WaitForClose() {
+      return __async(this, null, function* () {
+        setCloseEmited();
+        return new Promise((r) => {
+          if (!isBegin) {
+            r();
+          } else {
+            szInvoke.push(r);
+          }
+        });
+      });
+    },
+    Begin(notListenCloseEvent) {
+      isBegin = true;
+      isEnd = false;
+      isCloseEmit = false;
+      if (!notListenCloseEvent) {
+        player.addEventListener("close", onCloseEmitHandle);
+      }
+    },
+    Check() {
+      if (isCloseEmit) {
+        this.End();
+        invokeWaitResult();
+        throw "abort open";
+      }
+    },
+    End() {
+      isBegin = false;
+      isEnd = true;
+      try {
+        player.removeEventListener("close", onCloseEmitHandle);
+      } catch (e) {
+      }
+    }
+  };
+}
 var AudioPlayer = (props) => {
   const {
     container,
@@ -22702,7 +22787,9 @@ var AudioPlayer = (props) => {
     onPcEventAdded: (pc) => __async(void 0, null, function* () {
       try {
         const localStream = yield getUserMedia();
-        localStream.getTracks().forEach((track) => pc.addTrack(track, localStream));
+        localStream.getTracks().forEach((track) => {
+          pc.addTrack(track, localStream);
+        });
         releaseLocalStream();
         localStreamRelease = () => {
           localStream.getTracks().forEach((t2) => t2.stop());
@@ -22714,21 +22801,38 @@ var AudioPlayer = (props) => {
     //对讲和会议不启用控制器
     enableController: false
   });
+  const player = bvWebrtcComponentInstance.__dangerGetPlayer();
+  const playerCloseInteruptMgr = CreatePlayerCloseInterruptManager(player);
   const instance2 = __spreadProps(__spreadValues({}, bvWebrtcComponentInstance), {
+    destroy() {
+      return __async(this, null, function* () {
+        yield instance2.close();
+        bvWebrtcComponentInstance.destroy();
+      });
+    },
+    close: () => __async(void 0, null, function* () {
+      console.log("wait for close intercom");
+      yield playerCloseInteruptMgr.WaitForClose();
+      console.log("wait for close intercom do");
+      bvWebrtcComponentInstance.close();
+    }),
     open: (..._0) => __async(void 0, [..._0], function* (protocol = type, mikeButtonType) {
-      var _a, _b, _c;
+      var _a2, _b, _c;
       if (mikeButtonType)
         protocol = mikeButtonType;
-      const player = bvWebrtcComponentInstance.__dangerGetPlayer();
       let hplayer = null;
       try {
         if (protocol === "ws-bvrtc") {
           throw "protocol == ws-bvrtc";
         }
         player.enableCanvas(false);
+        playerCloseInteruptMgr.Begin(true);
         yield bvWebrtcComponentInstance.open();
+        playerCloseInteruptMgr.Check();
+        playerCloseInteruptMgr.End();
       } catch (e) {
         try {
+          playerCloseInteruptMgr.Begin();
           logger_default.debug("error type", e.name, e instanceof OpenDialogError);
           if (e instanceof OpenDialogError || protocol === "webrtc")
             throw e;
@@ -22741,6 +22845,7 @@ var AudioPlayer = (props) => {
             hplayer.setPrefix(apiPrefix);
           }
           yield hplayer.open(5e3, 3, "");
+          playerCloseInteruptMgr.Check();
           if (typeof (bvrtcConfig == null ? void 0 : bvrtcConfig.realTimeLevel) == "number") {
             if (bvrtcConfig.realTimeLevel >= 0 && bvrtcConfig.realTimeLevel <= 10) {
               yield hplayer.setRealTimeIndex(bvrtcConfig.realTimeLevel);
@@ -22765,16 +22870,18 @@ var AudioPlayer = (props) => {
             hplayer.close();
             throw new Error("ws-bvrtc create offer failed.");
           }
-          logger_default.debug("ws-bvrtc localSDP: ", (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.sdp);
+          logger_default.debug("ws-bvrtc localSDP: ", (_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.sdp);
+          playerCloseInteruptMgr.Check();
           yield dialog_default.closeDialogs(
             [sdpFetcher.dialogId || ""],
             sdpFetcher.token
           );
           yield new Promise((resolve) => {
             setTimeout(() => {
-              resolve(1);
-            }, 1e3);
+              resolve();
+            }, 0);
           });
+          playerCloseInteruptMgr.Check();
           const dialog = isConference ? yield dialog_default.getConferenceBvrtc(
             {
               id,
@@ -22792,39 +22899,38 @@ var AudioPlayer = (props) => {
           );
           logger_default.debug("ws-bvrtc remoteSDP: ", dialog.sdp);
           hplayer.setRemoteSDP(dialog.dialogId, dialog.sdp);
-          let invokePomiseWaitResult = () => {
-          };
-          let rejectPomiseWaitResult = () => {
-          };
-          const promiseWaitResult = new Promise((r, j) => {
-            invokePomiseWaitResult = r;
-            rejectPomiseWaitResult = j;
-          });
+          playerCloseInteruptMgr.Check();
+          const {
+            promise: promiseWaitResult,
+            resolve: invokePomiseWaitResult,
+            reject: rejectPomiseWaitResult
+          } = Promise.withResolvers();
           hplayer.onevent = function(bCloseEvent, iResult) {
-            if (bCloseEvent !== 0) {
-              logger_default.debug("ws-bvrtc", "av channel be closed");
-              onDisConnected && onDisConnected();
-            } else if (iResult == 0) {
-              logger_default.debug("ws-bvrtc", "open av channel success ");
-              onConnected && onConnected();
-              invokePomiseWaitResult();
-            } else {
-              logger_default.debug("ws-bvrtc", "open av channel fail " + iResult);
-              onConnectedFailed && onConnectedFailed();
-              rejectPomiseWaitResult();
-            }
+            return __async(this, null, function* () {
+              if (bCloseEvent !== 0) {
+                logger_default.debug("ws-bvrtc", "av channel be closed");
+                onDisConnected && onDisConnected();
+              } else if (iResult == 0) {
+                logger_default.debug("ws-bvrtc", "open av channel success ");
+                onConnected && onConnected();
+                invokePomiseWaitResult();
+              } else {
+                logger_default.debug("ws-bvrtc", "open av channel fail " + iResult);
+                onConnectedFailed && onConnectedFailed();
+                rejectPomiseWaitResult();
+              }
+            });
           };
           yield promiseWaitResult;
+          playerCloseInteruptMgr.End();
           player.spinner.spin = false;
           const closeHandle = () => __async(void 0, null, function* () {
             if (!hplayer)
               return;
             player.removeEventListener("close", closeHandle);
+            const dialogId = hplayer.getDialogID();
             hplayer.close();
-            yield dialog_default.closeDialogs(
-              [hplayer.getDialogID()],
-              sdpFetcher.token
-            );
+            yield dialog_default.closeDialogs([dialogId], sdpFetcher.token);
           });
           player.addEventListener("close", closeHandle);
         } catch (e2) {
@@ -24050,6 +24156,11 @@ var PuPlayer = (props) => {
     }
   }
   const dlgMgr = new DialogManager();
+  if (player.mikeBtn) {
+    player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
+  } else {
+    player.intercomUtils = CreateIntercomUtils(intercom == null ? void 0 : intercom.instance, (void 0).protocol);
+  }
   const instance2 = {
     getVideoElement: () => {
       const el = player.video.getVideoEl();
@@ -24093,6 +24204,9 @@ var PuPlayer = (props) => {
           }
           player.enableCanvas(false);
           this.protocol = "webrtc";
+          if (player.mikeBtn) {
+            player.mikeBtn.type = this.protocol;
+          }
           yield player.prepareWebrtc();
           if (dlgMgr.enterOpeningCanClose()) {
             return;
@@ -24101,12 +24215,6 @@ var PuPlayer = (props) => {
             audioWaveShow.setMediaStream(player.video.srcObject);
             audioWaveShow.setEle(playerEl);
           }
-          if (player.mikeBtn) {
-            player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
-            player.mikeBtn.type = this.protocol;
-          } else {
-            player.intercomUtils = CreateIntercomUtils(intercom == null ? void 0 : intercom.instance, this.protocol);
-          }
         } catch (e) {
           tokenFailDetect(e, () => {
             player.mask.visible = true;
@@ -24312,7 +24420,6 @@ var PuPlayer = (props) => {
               });
             }
             if (player.mikeBtn) {
-              player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
               player.mikeBtn.type = this.protocol;
             }
           } catch (e2) {
@@ -24416,14 +24523,15 @@ var PuPlayer = (props) => {
       yield player.close();
       useRecntMgr = void 0;
       reconnectMgr == null ? void 0 : reconnectMgr.cancelReconnect();
-      if (player.mikeBtn) {
-        player.mikeBtn.talking = false;
-        player.mikeBtn.intercom = void 0;
-      }
     }),
     render: player.init,
     destroy: () => __async(void 0, null, function* () {
       logger_default.debug("PuPlayer destroy");
+      if (player.mikeBtn) {
+        player.mikeBtn.talking = false;
+        player.mikeBtn.intercom = void 0;
+        intercom == null ? void 0 : intercom.instance.close();
+      }
       intercom == null ? void 0 : intercom.instance.destroy();
       player.destroy();
       reconnectMgr == null ? void 0 : reconnectMgr.cancelReconnect();
@@ -25446,6 +25554,9 @@ var PlaybackBar = class extends Plugin {
     this.svgSound = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("span", { class: "svg-sound" }, /* @__PURE__ */ jsx_default.h("input", { type: "range", className: "range-input", value: this.volumeCurrent, oninput: (e) => {
       this.onVolumeChange(e.target.value);
     } })));
+    this.svgSnapshot = core_default.dom.createByJsx(
+      /* @__PURE__ */ jsx_default.h("svg", { onclick: () => this.dispatch("snapshot"), style: "margin-left: 20px; cursor: pointer", xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 256 256" }, /* @__PURE__ */ jsx_default.h("rect", { width: "256", height: "256", fill: "none" }), /* @__PURE__ */ jsx_default.h("path", { fill: "#fff", d: "M208 58h-28.79L165 36.67a6 6 0 0 0-5-2.67H96a6 6 0 0 0-5 2.67L76.78 58H48a22 22 0 0 0-22 22v112a22 22 0 0 0 22 22h160a22 22 0 0 0 22-22V80a22 22 0 0 0-22-22m10 134a10 10 0 0 1-10 10H48a10 10 0 0 1-10-10V80a10 10 0 0 1 10-10h32a6 6 0 0 0 5-2.67L99.21 46h57.57L171 67.33a6 6 0 0 0 5 2.67h32a10 10 0 0 1 10 10ZM128 90a42 42 0 1 0 42 42a42 42 0 0 0-42-42m0 72a30 30 0 1 1 30-30a30 30 0 0 1-30 30", "stroke-width": "6.5", stroke: "#fff" }))
+    );
     this.svgFullscreen = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("svg", { onclick: () => {
       this.dispatch("fullscreen");
     }, style: "margin-left: 30px; cursor: pointer", xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 24 24" }, /* @__PURE__ */ jsx_default.h("path", { fill: "white", d: "M4 4h6v2H6v4H4zm10 0h6v6h-2V6h-4zM6 14v4h4v2H4v-6zm14 0v6h-6v-2h4v-4z" })));
@@ -25722,7 +25833,7 @@ var PlaybackBar = class extends Plugin {
     const rightPanel = this.controls.rightControls ? this.controls.rightControls : (() => {
       this.controls.rightControls = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("span", { class: "right-options" }));
       core_default.dom.append(this.svgSound, this.svgSound100);
-      core_default.dom.append(this.controls.rightControls, this.svgSound, this.playSpeed, this.svgFullscreen, this.svgOptions, this.optionsContent);
+      core_default.dom.append(this.controls.rightControls, this.svgSound, this.playSpeed, this.svgSnapshot, this.svgFullscreen, this.optionsContent);
       return this.controls.rightControls;
     })();
     const barContent = this.controls.barContent ? this.controls.barContent : this.controls.barContent = core_default.dom.createByJsx(
@@ -26382,6 +26493,10 @@ var PlayBack = (props) => {
         barHandle.addEventListener("fullscreen", () => {
           fullscreen_default.toggle(markerHandle.GetPlayArea());
         });
+        barHandle.addEventListener("snapshot", () => __async(this, null, function* () {
+          const snapshotHandle = yield player.video.screenshot();
+          snapshotHandle == null ? void 0 : snapshotHandle.download();
+        }));
         markerHandle.addEventListener("jump", (params) => {
           barHandle.jumpToTargetSeconds(params);
         });

package/dist/types/plugins/palybackBar.d.ts

@@ -14,6 +14,7 @@ interface IPlaybackBarEventMap extends IPluginEventMap {
     playSpeedChange: {
         speed: number;
     };
+    snapshot: {};
 }
 declare class PlaybackBar extends Plugin<HTMLDivElement, IPlaybackBarEventMap> {
     private content;
@@ -52,6 +53,7 @@ declare class PlaybackBar extends Plugin<HTMLDivElement, IPlaybackBarEventMap> {
     private svgSoundZero;
     private svgSound100;
     private svgSound;
+    private svgSnapshot;
     private svgFullscreen;
     private optionsValues;
     private currenSpeed;

package/package.json

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