@besovideo/webrtc-player 0.8.40 → 0.8.41

package/dist/main.browser.js

@@ -77,7 +77,7 @@ var bvPlayerCore = (() => {
   };
 
   // <define:process.env>
-  var define_process_env_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.39", PROJECT_NAMESPACE: "bvplayer" };
+  var define_process_env_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.40", PROJECT_NAMESPACE: "bvplayer" };
 
   // node_modules/@shirtiny/logger/dist/main.es.js
   var _ = Object.defineProperty;
@@ -4431,10 +4431,12 @@ var bvPlayerCore = (() => {
       this._notifier.unSubscribe(name, callBack);
     }
     clearEventListener(name) {
-      this._notifier.clear(name);
+      var _a;
+      (_a = this._notifier) == null ? void 0 : _a.clear(name);
     }
     dispatch(name, event) {
-      this._notifier.publish(name, event);
+      var _a;
+      (_a = this._notifier) == null ? void 0 : _a.publish(name, event);
     }
     dispatchSync(name, event) {
       return __async(this, null, function* () {
@@ -9563,6 +9565,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
     constructor(options) {
       super(PLUGIN_NAME_PLAYER, "div");
       this._lastTotalReceivedBytes = 0;
+      this._isInClose = false;
       this._video = new video_default({
         puOptions: options == null ? void 0 : options.puOptions
       });
@@ -9685,6 +9688,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
     prepareWebrtc() {
       return __async(this, null, function* () {
         var _a;
+        this._isInClose = false;
         if (this._mode !== "plugin" /* PLUGIN */)
           return;
         logger_default.debug("PuPlayer Plugin prepareWebrtc");
@@ -9714,12 +9718,17 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
     }
     close() {
       return __async(this, null, function* () {
-        yield this.dispatchSync("close");
-        this.closeWebrtc();
+        if (!this._isInClose) {
+          this._isInClose = true;
+          yield this.dispatchSync("close");
+          this.closeWebrtc();
+        }
       });
     }
     beforeDestroy() {
-      this.close();
+      if (!this._isInClose) {
+        this.close();
+      }
     }
     // 应用和加载播放器设置
     loadPlayerConfig() {
@@ -9833,6 +9842,16 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
         }
       };
       updateVolumeButton(true);
+      function DisplayVolumn(volume) {
+        const button = panel == null ? void 0 : panel.controller.VolumeButton;
+        if (panel && button) {
+          const volumeSlider2 = panel.controller.VolumeSlider;
+          if (volumeSlider2) {
+            volumeSlider2.percent = volume;
+          }
+          volume == 0 ? button.Children = /* @__PURE__ */ jsx_default.h(icons_default.Volume, { off: true }) : button.Children = /* @__PURE__ */ jsx_default.h(icons_default.Volume, null);
+        }
+      }
       panel.controller.addEventListener("volume", () => updateVolumeButton());
       const volumeSlider = panel.controller.VolumeSlider;
       if (volumeSlider) {
@@ -9841,6 +9860,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
           panel.controller.activeVolume();
           this.video.volume = Number(e == null ? void 0 : e.percent);
           volumeSlider.percent = this.video.volume;
+          DisplayVolumn(Number(e == null ? void 0 : e.percent));
         });
       }
     }
@@ -9886,7 +9906,9 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
         peerConnection: (_a = this._webrtcConnect) == null ? void 0 : _a.pc
       });
       this._webrtcConnect = null;
-      this._video.srcObject = null;
+      if (this._video) {
+        this._video.srcObject = null;
+      }
     }
     refreshInfoModal() {
       return __async(this, null, function* () {
@@ -12316,6 +12338,18 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
               player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
           } catch (e) {
             try {
+              let DisplayVolumn2 = function(volume) {
+                var _a3;
+                const button = (_a3 = player.panel) == null ? void 0 : _a3.controller.VolumeButton;
+                if (player.panel && button && hplayer) {
+                  const volumeSlider2 = player.panel.controller.VolumeSlider;
+                  if (volumeSlider2) {
+                    volumeSlider2.percent = hplayer.getVolume();
+                  }
+                  volume == 0 ? button.Children = /* @__PURE__ */ jsx_default.h(icons_default.Volume, { off: true }) : button.Children = /* @__PURE__ */ jsx_default.h(icons_default.Volume, null);
+                }
+              };
+              var DisplayVolumn = DisplayVolumn2;
               logger_default.debug("error\u7684\u7C7B\u578B", e.name, e instanceof OpenDialogError);
               if (e instanceof OpenDialogError || protocol === "webrtc")
                 throw e;
@@ -12495,6 +12529,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
                   (_a3 = player.panel) == null ? void 0 : _a3.controller.activeVolume();
                   hplayer.setVolume(Number(e2 == null ? void 0 : e2.percent));
                   volumeSlider.percent = hplayer.getVolume();
+                  DisplayVolumn2(Number(e2 == null ? void 0 : e2.percent));
                 });
               }
               if (player.mikeBtn)

package/dist/main.es.js

@@ -71,7 +71,7 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // <define:process.env>
-var define_process_env_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.39", PROJECT_NAMESPACE: "bvplayer" };
+var define_process_env_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.40", PROJECT_NAMESPACE: "bvplayer" };
 
 // node_modules/@shirtiny/logger/dist/main.es.js
 var _ = Object.defineProperty;
@@ -4415,10 +4415,12 @@ var Events = class {
     this._notifier.unSubscribe(name, callBack);
   }
   clearEventListener(name) {
-    this._notifier.clear(name);
+    var _a;
+    (_a = this._notifier) == null ? void 0 : _a.clear(name);
   }
   dispatch(name, event) {
-    this._notifier.publish(name, event);
+    var _a;
+    (_a = this._notifier) == null ? void 0 : _a.publish(name, event);
   }
   dispatchSync(name, event) {
     return __async(this, null, function* () {
@@ -9547,6 +9549,7 @@ var PlayerPlugin = class extends Plugin {
   constructor(options) {
     super(PLUGIN_NAME_PLAYER, "div");
     this._lastTotalReceivedBytes = 0;
+    this._isInClose = false;
     this._video = new video_default({
       puOptions: options == null ? void 0 : options.puOptions
     });
@@ -9669,6 +9672,7 @@ var PlayerPlugin = class extends Plugin {
   prepareWebrtc() {
     return __async(this, null, function* () {
       var _a;
+      this._isInClose = false;
       if (this._mode !== "plugin" /* PLUGIN */)
         return;
       logger_default.debug("PuPlayer Plugin prepareWebrtc");
@@ -9698,12 +9702,17 @@ var PlayerPlugin = class extends Plugin {
   }
   close() {
     return __async(this, null, function* () {
-      yield this.dispatchSync("close");
-      this.closeWebrtc();
+      if (!this._isInClose) {
+        this._isInClose = true;
+        yield this.dispatchSync("close");
+        this.closeWebrtc();
+      }
     });
   }
   beforeDestroy() {
-    this.close();
+    if (!this._isInClose) {
+      this.close();
+    }
   }
   // 应用和加载播放器设置
   loadPlayerConfig() {
@@ -9817,6 +9826,16 @@ var PlayerPlugin = class extends Plugin {
       }
     };
     updateVolumeButton(true);
+    function DisplayVolumn(volume) {
+      const button = panel == null ? void 0 : panel.controller.VolumeButton;
+      if (panel && button) {
+        const volumeSlider2 = panel.controller.VolumeSlider;
+        if (volumeSlider2) {
+          volumeSlider2.percent = volume;
+        }
+        volume == 0 ? button.Children = /* @__PURE__ */ jsx_default.h(icons_default.Volume, { off: true }) : button.Children = /* @__PURE__ */ jsx_default.h(icons_default.Volume, null);
+      }
+    }
     panel.controller.addEventListener("volume", () => updateVolumeButton());
     const volumeSlider = panel.controller.VolumeSlider;
     if (volumeSlider) {
@@ -9825,6 +9844,7 @@ var PlayerPlugin = class extends Plugin {
         panel.controller.activeVolume();
         this.video.volume = Number(e == null ? void 0 : e.percent);
         volumeSlider.percent = this.video.volume;
+        DisplayVolumn(Number(e == null ? void 0 : e.percent));
       });
     }
   }
@@ -9870,7 +9890,9 @@ var PlayerPlugin = class extends Plugin {
       peerConnection: (_a = this._webrtcConnect) == null ? void 0 : _a.pc
     });
     this._webrtcConnect = null;
-    this._video.srcObject = null;
+    if (this._video) {
+      this._video.srcObject = null;
+    }
   }
   refreshInfoModal() {
     return __async(this, null, function* () {
@@ -12300,6 +12322,18 @@ var PuPlayer = (props) => {
             player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
         } catch (e) {
           try {
+            let DisplayVolumn2 = function(volume) {
+              var _a3;
+              const button = (_a3 = player.panel) == null ? void 0 : _a3.controller.VolumeButton;
+              if (player.panel && button && hplayer) {
+                const volumeSlider2 = player.panel.controller.VolumeSlider;
+                if (volumeSlider2) {
+                  volumeSlider2.percent = hplayer.getVolume();
+                }
+                volume == 0 ? button.Children = /* @__PURE__ */ jsx_default.h(icons_default.Volume, { off: true }) : button.Children = /* @__PURE__ */ jsx_default.h(icons_default.Volume, null);
+              }
+            };
+            var DisplayVolumn = DisplayVolumn2;
             logger_default.debug("error\u7684\u7C7B\u578B", e.name, e instanceof OpenDialogError);
             if (e instanceof OpenDialogError || protocol === "webrtc")
               throw e;
@@ -12479,6 +12513,7 @@ var PuPlayer = (props) => {
                 (_a3 = player.panel) == null ? void 0 : _a3.controller.activeVolume();
                 hplayer.setVolume(Number(e2 == null ? void 0 : e2.percent));
                 volumeSlider.percent = hplayer.getVolume();
+                DisplayVolumn2(Number(e2 == null ? void 0 : e2.percent));
               });
             }
             if (player.mikeBtn)

package/dist/types/plugins/player/index.d.ts

@@ -83,6 +83,7 @@ declare class PlayerPlugin extends Plugin<HTMLDivElement, IPlayerPluginEventMap>
     setProductRemoteSdp(productRemoteSdp: (localDescription: RTCSessionDescription) => Promise<string | undefined>): void;
     prepareWebrtc(): Promise<void>;
     close(): Promise<void>;
+    private _isInClose;
     protected beforeDestroy(): void;
     private loadPlayerConfig;
     private initEvents;

package/package.json

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