@besovideo/webrtc-player 0.9.85 → 0.9.87

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.85", PROJECT_NAMESPACE: "bvplayer" };
+      define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.9.87", PROJECT_NAMESPACE: "bvplayer" };
     }
   });
 
@@ -13416,6 +13416,7 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
   };
   var Events = class {
     constructor() {
+      this.isDisable = false;
       this._notifier = new Notifier();
     }
     addEventListener(name, callBack) {
@@ -13433,11 +13434,22 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
     }
     dispatch(name, event) {
       var _a;
-      (_a = this._notifier) == null ? void 0 : _a.publish(name, event);
+      if (!this.isDisable) {
+        (_a = this._notifier) == null ? void 0 : _a.publish(name, event);
+      }
     }
     dispatchSync(name, event) {
       return __async(this, null, function* () {
-        yield this._notifier.publishSync(name, event);
+        if (!this.isDisable) {
+          yield this._notifier.publishSync(name, event);
+        }
+      });
+    }
+    noDispathHandle(handle2) {
+      return __async(this, null, function* () {
+        this.isDisable = true;
+        yield handle2();
+        this.isDisable = false;
       });
     }
   };
@@ -22096,7 +22108,8 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
     "lian-jie-yi-wai-guan-bi": "Unexpected closure",
     "da-kai-chuan-shu-tong-dao-shi-bai": "Failed to open transmission channel",
     "hui-fang-wen-jian-bu-cun-zai": "File Not Found",
-    "shi-pin-jie-ma-shi-bai": "Video decode fail"
+    "shi-pin-jie-ma-shi-bai": "Video decode fail",
+    "hui-fang-chu-xian-wen-ti": "There is a problem with playback:"
   };
 
   // src/locales/zh.json
@@ -22156,7 +22169,8 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
     "lian-jie-yi-wai-guan-bi": "\u8FDE\u63A5\u610F\u5916\u5173\u95ED",
     "da-kai-chuan-shu-tong-dao-shi-bai": "\u6253\u5F00\u4F20\u8F93\u901A\u9053\u5931\u8D25",
     "hui-fang-wen-jian-bu-cun-zai": "\u56DE\u653E\u6587\u4EF6\u4E0D\u5B58\u5728",
-    "shi-pin-jie-ma-shi-bai": "\u89C6\u9891\u89E3\u7801\u5931\u8D25"
+    "shi-pin-jie-ma-shi-bai": "\u89C6\u9891\u89E3\u7801\u5931\u8D25",
+    "hui-fang-chu-xian-wen-ti": "\u56DE\u653E\u51FA\u73B0\u95EE\u9898\uFF1A"
   };
 
   // src/locales/i18n.ts
@@ -22307,7 +22321,9 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
     open(muted = false) {
       return __async(this, null, function* () {
         logger_default.debug("BvWebrtc open");
-        yield this.close();
+        yield this.noDispathHandle(() => __async(this, null, function* () {
+          yield this.close();
+        }));
         this.player.mask.visible = false;
         this.player.mask.text = t("connecting");
         this.player.mute(!!muted);
@@ -24427,6 +24443,14 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
     svgLoading.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 24 24"><g fill="none" stroke="black" stroke-linecap="round" stroke-width="2"><path stroke-dasharray="60" stroke-dashoffset="60" stroke-opacity="0.3" d="M12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3Z"><animate fill="freeze" attributeName="stroke-dashoffset" dur="1.3s" values="60;0"/></path><path stroke-dasharray="15" stroke-dashoffset="15" d="M12 3C16.9706 3 21 7.02944 21 12"><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.3s" values="15;0"/><animateTransform attributeName="transform" dur="1.5s" repeatCount="indefinite" type="rotate" values="0 12 12;360 12 12"/></path></g></svg>`;
     return svgLoading;
   }
+  function CreateLoadingSvgWhite() {
+    const svgLoading = document.createElement("div");
+    svgLoading.style.position = "absolute";
+    svgLoading.style.top = "calc(50% - 48px)";
+    svgLoading.style.left = "calc(50% - 48px)";
+    svgLoading.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 24 24"><rect width="24" height="24" fill="none"/><g fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"><path stroke-dasharray="16" stroke-dashoffset="16" d="M12 3c4.97 0 9 4.03 9 9"><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.3s" values="16;0"/><animateTransform attributeName="transform" dur="1.5s" repeatCount="indefinite" type="rotate" values="0 12 12;360 12 12"/></path><path stroke-dasharray="64" stroke-dashoffset="64" stroke-opacity="0.45" d="M12 3c4.97 0 9 4.03 9 9c0 4.97 -4.03 9 -9 9c-4.97 0 -9 -4.03 -9 -9c0 -4.97 4.03 -9 9 -9Z"><animate fill="freeze" attributeName="stroke-dashoffset" dur="1.2s" values="64;0"/></path></g></svg>`;
+    return svgLoading;
+  }
   var PlaybackBar = class extends Plugin {
     constructor() {
       super(PLUGIN_NAME_PLAYBAR, "div", core_default.style.cls("blaybackbar"));
@@ -24437,6 +24461,7 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
       this.isShowControls = true;
       this.svgPause = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("svg", { xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 24 24" }, /* @__PURE__ */ jsx_default.h("path", { fill: "currentColor", d: "M6 5h2v14H6zm10 0h2v14h-2z" })));
       this.svgPlay = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("svg", { xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 32 32" }, /* @__PURE__ */ jsx_default.h("path", { fill: "white", d: "M6.684 25.682L24.316 15.5L6.684 5.318z" })));
+      this.svgLoadingWhite = CreateLoadingSvgWhite();
       this.svgLoading = CreateLoadingSvg();
       this.volumeCurrent = 100;
       this.svgSoundZero = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("svg", { xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 24 24", onclick: () => {
@@ -24587,6 +24612,16 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
         });
       }
     }
+    showInitLoading(isShow) {
+      var _a;
+      if (isShow) {
+        core_default.dom.append(this._container, this.svgLoadingWhite);
+      } else {
+        if ((_a = this.svgLoadingWhite) == null ? void 0 : _a.parentNode) {
+          core_default.dom.removeSelf(this.svgLoadingWhite);
+        }
+      }
+    }
     showLoading(isShow) {
       var _a;
       if (isShow) {
@@ -25319,14 +25354,17 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
     let hplayer = void 0;
     const handle2 = {};
     let type = type1;
+    let onOpenHandleOver = null;
     const instance2 = {
+      inBusy: false,
       videoFit: "contain",
       open() {
         return __async(this, null, function* () {
           var _a2, _b;
-          if (hplayer) {
+          if (instance2.inBusy) {
             return;
           }
+          instance2.inBusy = true;
           const audioWaveShow = new MediaStreamAudioWavePlaybackShow();
           const markerHandle = new MarkerHandle({
             token,
@@ -25422,6 +25460,21 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
                 player.mask.visible = true;
                 return r(false);
               }
+              videoEle.onerror = () => __async(this, null, function* () {
+                var _a3;
+                player.mask.text = t("hui-fang-chu-xian-wen-ti") + ((_a3 = videoEle.error) == null ? void 0 : _a3.code);
+                player.mask.visible = true;
+                if (instance2.protocol == "auto") {
+                  instance2.inBusy = true;
+                  barHandle.showInitLoading(true);
+                  yield RunHandle("ws-bvrtc");
+                  barHandle.showInitLoading(false);
+                  instance2.inBusy = false;
+                }
+              });
+              removeHooks.push(() => {
+                videoEle.onerror = null;
+              });
               videoEle.src = srcFile;
               videoEle.controls = false;
               removeHooks.push(
@@ -25676,6 +25729,7 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
             }
             return false;
           }
+          barHandle.showInitLoading(true);
           if (this.protocol == "auto") {
             if (!(yield RunHandle("web"))) {
               yield RunHandle("ws-bvrtc");
@@ -25683,12 +25737,30 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
           } else {
             yield RunHandle(this.protocol);
           }
+          barHandle.showInitLoading(false);
+          instance2.inBusy = false;
         });
       },
       close() {
         return __async(this, null, function* () {
           var _a2;
-          (_a2 = handle2.close) == null ? void 0 : _a2.call(handle2);
+          if (!instance2.inBusy) {
+            (_a2 = handle2.close) == null ? void 0 : _a2.call(handle2);
+          } else if (instance2.inBusy) {
+            yield new Promise((r) => {
+              const oriOnOpenHandleOver = onOpenHandleOver;
+              onOpenHandleOver = () => {
+                var _a3;
+                onOpenHandleOver = null;
+                try {
+                  oriOnOpenHandleOver == null ? void 0 : oriOnOpenHandleOver();
+                  (_a3 = handle2.close) == null ? void 0 : _a3.call(handle2);
+                } catch (e) {
+                }
+                r();
+              };
+            });
+          }
         });
       },
       pause() {
@@ -25717,6 +25789,9 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
         this.videoFit = fit;
       },
       setProtocol: function(protocol) {
+        if (this.protocol == protocol || this.inBusy) {
+          return;
+        }
         this.close();
         this.protocol = (puOption == null ? void 0 : puOption.puId) ? protocol : protocol;
         this.open();

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.85", PROJECT_NAMESPACE: "bvplayer" };
+    define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.9.87", PROJECT_NAMESPACE: "bvplayer" };
   }
 });
 
@@ -13400,6 +13400,7 @@ var IDataHandle = class {
 };
 var Events = class {
   constructor() {
+    this.isDisable = false;
     this._notifier = new Notifier();
   }
   addEventListener(name, callBack) {
@@ -13417,11 +13418,22 @@ var Events = class {
   }
   dispatch(name, event) {
     var _a;
-    (_a = this._notifier) == null ? void 0 : _a.publish(name, event);
+    if (!this.isDisable) {
+      (_a = this._notifier) == null ? void 0 : _a.publish(name, event);
+    }
   }
   dispatchSync(name, event) {
     return __async(this, null, function* () {
-      yield this._notifier.publishSync(name, event);
+      if (!this.isDisable) {
+        yield this._notifier.publishSync(name, event);
+      }
+    });
+  }
+  noDispathHandle(handle2) {
+    return __async(this, null, function* () {
+      this.isDisable = true;
+      yield handle2();
+      this.isDisable = false;
     });
   }
 };
@@ -22080,7 +22092,8 @@ var en_default = {
   "lian-jie-yi-wai-guan-bi": "Unexpected closure",
   "da-kai-chuan-shu-tong-dao-shi-bai": "Failed to open transmission channel",
   "hui-fang-wen-jian-bu-cun-zai": "File Not Found",
-  "shi-pin-jie-ma-shi-bai": "Video decode fail"
+  "shi-pin-jie-ma-shi-bai": "Video decode fail",
+  "hui-fang-chu-xian-wen-ti": "There is a problem with playback:"
 };
 
 // src/locales/zh.json
@@ -22140,7 +22153,8 @@ var zh_default = {
   "lian-jie-yi-wai-guan-bi": "\u8FDE\u63A5\u610F\u5916\u5173\u95ED",
   "da-kai-chuan-shu-tong-dao-shi-bai": "\u6253\u5F00\u4F20\u8F93\u901A\u9053\u5931\u8D25",
   "hui-fang-wen-jian-bu-cun-zai": "\u56DE\u653E\u6587\u4EF6\u4E0D\u5B58\u5728",
-  "shi-pin-jie-ma-shi-bai": "\u89C6\u9891\u89E3\u7801\u5931\u8D25"
+  "shi-pin-jie-ma-shi-bai": "\u89C6\u9891\u89E3\u7801\u5931\u8D25",
+  "hui-fang-chu-xian-wen-ti": "\u56DE\u653E\u51FA\u73B0\u95EE\u9898\uFF1A"
 };
 
 // src/locales/i18n.ts
@@ -22291,7 +22305,9 @@ var BvWebrtcInstance = class extends CommonInstance {
   open(muted = false) {
     return __async(this, null, function* () {
       logger_default.debug("BvWebrtc open");
-      yield this.close();
+      yield this.noDispathHandle(() => __async(this, null, function* () {
+        yield this.close();
+      }));
       this.player.mask.visible = false;
       this.player.mask.text = t("connecting");
       this.player.mute(!!muted);
@@ -24411,6 +24427,14 @@ function CreateLoadingSvg() {
   svgLoading.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 24 24"><g fill="none" stroke="black" stroke-linecap="round" stroke-width="2"><path stroke-dasharray="60" stroke-dashoffset="60" stroke-opacity="0.3" d="M12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3Z"><animate fill="freeze" attributeName="stroke-dashoffset" dur="1.3s" values="60;0"/></path><path stroke-dasharray="15" stroke-dashoffset="15" d="M12 3C16.9706 3 21 7.02944 21 12"><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.3s" values="15;0"/><animateTransform attributeName="transform" dur="1.5s" repeatCount="indefinite" type="rotate" values="0 12 12;360 12 12"/></path></g></svg>`;
   return svgLoading;
 }
+function CreateLoadingSvgWhite() {
+  const svgLoading = document.createElement("div");
+  svgLoading.style.position = "absolute";
+  svgLoading.style.top = "calc(50% - 48px)";
+  svgLoading.style.left = "calc(50% - 48px)";
+  svgLoading.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 24 24"><rect width="24" height="24" fill="none"/><g fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"><path stroke-dasharray="16" stroke-dashoffset="16" d="M12 3c4.97 0 9 4.03 9 9"><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.3s" values="16;0"/><animateTransform attributeName="transform" dur="1.5s" repeatCount="indefinite" type="rotate" values="0 12 12;360 12 12"/></path><path stroke-dasharray="64" stroke-dashoffset="64" stroke-opacity="0.45" d="M12 3c4.97 0 9 4.03 9 9c0 4.97 -4.03 9 -9 9c-4.97 0 -9 -4.03 -9 -9c0 -4.97 4.03 -9 9 -9Z"><animate fill="freeze" attributeName="stroke-dashoffset" dur="1.2s" values="64;0"/></path></g></svg>`;
+  return svgLoading;
+}
 var PlaybackBar = class extends Plugin {
   constructor() {
     super(PLUGIN_NAME_PLAYBAR, "div", core_default.style.cls("blaybackbar"));
@@ -24421,6 +24445,7 @@ var PlaybackBar = class extends Plugin {
     this.isShowControls = true;
     this.svgPause = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("svg", { xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 24 24" }, /* @__PURE__ */ jsx_default.h("path", { fill: "currentColor", d: "M6 5h2v14H6zm10 0h2v14h-2z" })));
     this.svgPlay = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("svg", { xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 32 32" }, /* @__PURE__ */ jsx_default.h("path", { fill: "white", d: "M6.684 25.682L24.316 15.5L6.684 5.318z" })));
+    this.svgLoadingWhite = CreateLoadingSvgWhite();
     this.svgLoading = CreateLoadingSvg();
     this.volumeCurrent = 100;
     this.svgSoundZero = core_default.dom.createByJsx(/* @__PURE__ */ jsx_default.h("svg", { xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 24 24", onclick: () => {
@@ -24571,6 +24596,16 @@ var PlaybackBar = class extends Plugin {
       });
     }
   }
+  showInitLoading(isShow) {
+    var _a;
+    if (isShow) {
+      core_default.dom.append(this._container, this.svgLoadingWhite);
+    } else {
+      if ((_a = this.svgLoadingWhite) == null ? void 0 : _a.parentNode) {
+        core_default.dom.removeSelf(this.svgLoadingWhite);
+      }
+    }
+  }
   showLoading(isShow) {
     var _a;
     if (isShow) {
@@ -25303,14 +25338,17 @@ var PlayBack = (props) => {
   let hplayer = void 0;
   const handle2 = {};
   let type = type1;
+  let onOpenHandleOver = null;
   const instance2 = {
+    inBusy: false,
     videoFit: "contain",
     open() {
       return __async(this, null, function* () {
         var _a2, _b;
-        if (hplayer) {
+        if (instance2.inBusy) {
           return;
         }
+        instance2.inBusy = true;
         const audioWaveShow = new MediaStreamAudioWavePlaybackShow();
         const markerHandle = new MarkerHandle({
           token,
@@ -25406,6 +25444,21 @@ var PlayBack = (props) => {
               player.mask.visible = true;
               return r(false);
             }
+            videoEle.onerror = () => __async(this, null, function* () {
+              var _a3;
+              player.mask.text = t("hui-fang-chu-xian-wen-ti") + ((_a3 = videoEle.error) == null ? void 0 : _a3.code);
+              player.mask.visible = true;
+              if (instance2.protocol == "auto") {
+                instance2.inBusy = true;
+                barHandle.showInitLoading(true);
+                yield RunHandle("ws-bvrtc");
+                barHandle.showInitLoading(false);
+                instance2.inBusy = false;
+              }
+            });
+            removeHooks.push(() => {
+              videoEle.onerror = null;
+            });
             videoEle.src = srcFile;
             videoEle.controls = false;
             removeHooks.push(
@@ -25660,6 +25713,7 @@ var PlayBack = (props) => {
           }
           return false;
         }
+        barHandle.showInitLoading(true);
         if (this.protocol == "auto") {
           if (!(yield RunHandle("web"))) {
             yield RunHandle("ws-bvrtc");
@@ -25667,12 +25721,30 @@ var PlayBack = (props) => {
         } else {
           yield RunHandle(this.protocol);
         }
+        barHandle.showInitLoading(false);
+        instance2.inBusy = false;
       });
     },
     close() {
       return __async(this, null, function* () {
         var _a2;
-        (_a2 = handle2.close) == null ? void 0 : _a2.call(handle2);
+        if (!instance2.inBusy) {
+          (_a2 = handle2.close) == null ? void 0 : _a2.call(handle2);
+        } else if (instance2.inBusy) {
+          yield new Promise((r) => {
+            const oriOnOpenHandleOver = onOpenHandleOver;
+            onOpenHandleOver = () => {
+              var _a3;
+              onOpenHandleOver = null;
+              try {
+                oriOnOpenHandleOver == null ? void 0 : oriOnOpenHandleOver();
+                (_a3 = handle2.close) == null ? void 0 : _a3.call(handle2);
+              } catch (e) {
+              }
+              r();
+            };
+          });
+        }
       });
     },
     pause() {
@@ -25701,6 +25773,9 @@ var PlayBack = (props) => {
       this.videoFit = fit;
     },
     setProtocol: function(protocol) {
+      if (this.protocol == protocol || this.inBusy) {
+        return;
+      }
       this.close();
       this.protocol = (puOption == null ? void 0 : puOption.puId) ? protocol : protocol;
       this.open();

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

@@ -36,6 +36,7 @@ interface IPlaybackInstance extends IComponentInstance {
     setProtocol: (protocol: IPlaybackPlayType) => void;
     videoFit: keyof IVideoFits;
     protocol: IPlaybackPlayType;
+    inBusy: boolean;
 }
 declare type helperFunc = {
     getDefaultProps: () => Partial<IPlaybackProps>;

package/dist/types/core/events.d.ts

@@ -53,6 +53,8 @@ export declare class Events<M extends IEventMap> {
     clearEventListener<K extends keyof M>(name?: K): void;
     dispatch<K extends keyof M>(name: K, event?: M[K]): void;
     dispatchSync<K extends keyof M>(name: K, event?: M[K]): Promise<void>;
+    private isDisable;
+    noDispathHandle(handle: () => (Promise<void> | void)): Promise<void>;
 }
 export declare class DomEventStore {
     private _store;

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

@@ -40,8 +40,10 @@ declare class PlaybackBar extends Plugin<HTMLDivElement, IPlaybackBarEventMap> {
     private onClickJump;
     private svgPause;
     private svgPlay;
+    private svgLoadingWhite;
+    showInitLoading(isShow: boolean): void;
     private svgLoading;
-    private showLoading;
+    showLoading(isShow: boolean): void;
     jumpToTargetSeconds(params: IJumpEventParams): void;
     private onSooundClick;
     private onVolumeChange;

package/package.json

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