@besovideo/webrtc-player 0.8.99 → 0.9.1

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.8.99", PROJECT_NAMESPACE: "bvplayer" };
+      define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.9.1", PROJECT_NAMESPACE: "bvplayer" };
     }
   });
 
@@ -5104,8 +5104,16 @@ padding: 2px 5px;
       signal
     );
     logger_default.api("\u8BBE\u5907\u97F3\u89C6\u9891\u6D41 bvrtc\u65B9\u5F0F\u6253\u5F00dialog: ", { params, resData });
-    if (!resData || resData.code !== 0 || !((_a = resData.data) == null ? void 0 : _a.dialogid))
-      throw new OpenDialogError(`\u6253\u5F00\u4F20\u8F93\u901A\u9053\u5931\u8D25: ${resData.msg}`);
+    if (!resData || resData.code !== 0 || !((_a = resData.data) == null ? void 0 : _a.dialogid)) {
+      if (resData.code == 7) {
+        throw new OpenDialogError(
+          `${t("hui-fang-wen-jian-bu-cun-zai")}`
+        );
+      }
+      throw new OpenDialogError(
+        `${t("da-kai-chuan-shu-tong-dao-shi-bai")}: ${resData.msg}`
+      );
+    }
     const { data: dialog } = resData;
     if (dialog.dialogid) {
       const ids = storage_default.get(DialogIdsKey) || [];
@@ -15098,7 +15106,10 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
     "yi-dong-su-du": "Speed",
     "she-bei-bu-zhi-chi": "Not support",
     "mei-you-yun-tai-quan-xian": "No PTZ Permission",
-    "wei-zhi-cuo-wu": "Unknown Error"
+    "wei-zhi-cuo-wu": "Unknown Error",
+    "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"
   };
 
   // src/locales/zh.json
@@ -15154,7 +15165,10 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
     "yi-dong-su-du": "\u79FB\u52A8\u901F\u5EA6",
     "she-bei-bu-zhi-chi": "\u8BBE\u5907\u4E0D\u652F\u6301",
     "mei-you-yun-tai-quan-xian": "\u6CA1\u6709\u4E91\u53F0\u6743\u9650",
-    "wei-zhi-cuo-wu": "\u672A\u77E5\u9519\u8BEF"
+    "wei-zhi-cuo-wu": "\u672A\u77E5\u9519\u8BEF",
+    "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"
   };
 
   // src/locales/i18n.ts
@@ -18000,14 +18014,15 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
       fileName,
       token,
       locale = "zh",
-      type: type1 = "web",
+      type: type1 = "auto",
       zIndexMenu,
       displayMode
     } = __spreadValues(__spreadValues({}, defaultProps3), props);
     i18n_default(locale);
     let hplayer = void 0;
     const handle2 = {};
-    let type = (puOption == null ? void 0 : puOption.puId) && type1 == "ws-bvrtc" ? type1 : type1;
+    const isWebErrorAutoToWsBvrtc = type1 == "auto";
+    let type = type1 == "ws-bvrtc" ? type1 : "web";
     const instance2 = {
       videoFit: "contain",
       open() {
@@ -18081,6 +18096,23 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
           });
           if (this.protocol == "web") {
             const videoEle = player.video.getVideoEl();
+            videoEle.onerror = () => {
+              var _a3;
+              if (videoEle.src != "") {
+                if (videoEle.error && videoEle.error.code == MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED) {
+                  player.mask.text = t("hui-fang-wen-jian-bu-cun-zai");
+                  player.mask.visible = true;
+                } else if (videoEle.error && videoEle.error.code == MediaError.MEDIA_ERR_DECODE) {
+                  player.mask.text = "\u89E3\u7801\u5931\u8D25";
+                  player.mask.visible = true;
+                }
+                if (isWebErrorAutoToWsBvrtc) {
+                  (_a3 = handle2.close) == null ? void 0 : _a3.call(handle2);
+                  instance2.setProtocol("ws-bvrtc");
+                  instance2.open();
+                }
+              }
+            };
             videoEle.src = dialog_default.getPlaybackFilePath({ fileId: fileID, puid: puOption == null ? void 0 : puOption.puId }, token);
             videoEle.controls = false;
             barHandle.addEventListener("changeVolume", (data) => {
@@ -18125,6 +18157,8 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
               }
             });
             handle2.close = () => {
+              videoEle.onerror = () => {
+              };
               videoEle.src = "";
               markerHandle.destroy();
               player.close();
@@ -18168,19 +18202,47 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
             throw new Error("ws-bvrtc create offer failed.");
           }
           logger_default.info("ws-bvrtc localSDP: ", (_c = res == null ? void 0 : res.data) == null ? void 0 : _c.sdp);
-          const [dialog, playbackController] = yield dialog_default.getPlaybackBvrtc({
-            sdp: (_d = res == null ? void 0 : res.data) == null ? void 0 : _d.sdp,
-            id: (puOption == null ? void 0 : puOption.puId) || (puOption == null ? void 0 : puOption.nruId)
-          }, token);
+          let dialogId = "";
+          let sdp = "";
+          let playbackController = {};
+          try {
+            const [dialog, playbackControllerTemp] = yield dialog_default.getPlaybackBvrtc({
+              sdp: (_d = res == null ? void 0 : res.data) == null ? void 0 : _d.sdp,
+              id: (puOption == null ? void 0 : puOption.puId) || (puOption == null ? void 0 : puOption.nruId)
+            }, token);
+            playbackController = playbackControllerTemp;
+            dialogId = dialog.dialogId;
+            sdp = dialog.sdp;
+          } catch (e) {
+            const openError = e;
+            player.mask.text = openError.message;
+            player.mask.visible = true;
+            handle2.close = () => {
+              var _a3;
+              markerHandle.destroy();
+              player.close();
+              (_a3 = playbackController.close) == null ? void 0 : _a3.call(playbackController);
+              hplayer == null ? void 0 : hplayer.playbackStop();
+              hplayer.close();
+              barHandle.destroy();
+              contextIns == null ? void 0 : contextIns();
+              jumpEventHandler.destory();
+              handle2.close = void 0;
+              handle2.pause = void 0;
+              handle2.resume = void 0;
+              hplayer = void 0;
+            };
+            return;
+          }
           hplayer.onevent = (bCloseEvent, iResult) => {
             if (bCloseEvent && handle2.close) {
-              player.mask.text = "\u8FDE\u63A5\u610F\u5916\u5173\u95ED" + iResult;
+              player.mask.text = t("lian-jie-yi-wai-guan-bi") + iResult;
               player.mask.visible = true;
               barHandle.disable();
               stopInterval();
             }
           };
-          hplayer.setRemoteSDP(dialog.dialogId, dialog.sdp);
+          hplayer.setRemoteSDP(dialogId, sdp);
           const playbackInfo = yield playbackController.play();
           hplayer == null ? void 0 : hplayer.playbackStart(1);
           player.addEventListener("refreshInfoModal", (e) => __async(this, null, function* () {
@@ -18231,6 +18293,7 @@ registerProcessor('bv-audio-processor', BVAudioProcessor);
               (_b2 = handle2.resume) == null ? void 0 : _b2.call(handle2);
             }
           });
+          barHandle.pausePlayStateChange("pause");
           const stopInterval = () => {
             if (intervalToken) {
               clearInterval(intervalToken);

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.8.99", PROJECT_NAMESPACE: "bvplayer" };
+    define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.9.1", PROJECT_NAMESPACE: "bvplayer" };
   }
 });
 
@@ -5088,8 +5088,16 @@ var getPlaybackBvrtc = (param, token, signal) => __async(void 0, null, function*
     signal
   );
   logger_default.api("\u8BBE\u5907\u97F3\u89C6\u9891\u6D41 bvrtc\u65B9\u5F0F\u6253\u5F00dialog: ", { params, resData });
-  if (!resData || resData.code !== 0 || !((_a = resData.data) == null ? void 0 : _a.dialogid))
-    throw new OpenDialogError(`\u6253\u5F00\u4F20\u8F93\u901A\u9053\u5931\u8D25: ${resData.msg}`);
+  if (!resData || resData.code !== 0 || !((_a = resData.data) == null ? void 0 : _a.dialogid)) {
+    if (resData.code == 7) {
+      throw new OpenDialogError(
+        `${t("hui-fang-wen-jian-bu-cun-zai")}`
+      );
+    }
+    throw new OpenDialogError(
+      `${t("da-kai-chuan-shu-tong-dao-shi-bai")}: ${resData.msg}`
+    );
+  }
   const { data: dialog } = resData;
   if (dialog.dialogid) {
     const ids = storage_default.get(DialogIdsKey) || [];
@@ -15082,7 +15090,10 @@ var en_default = {
   "yi-dong-su-du": "Speed",
   "she-bei-bu-zhi-chi": "Not support",
   "mei-you-yun-tai-quan-xian": "No PTZ Permission",
-  "wei-zhi-cuo-wu": "Unknown Error"
+  "wei-zhi-cuo-wu": "Unknown Error",
+  "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"
 };
 
 // src/locales/zh.json
@@ -15138,7 +15149,10 @@ var zh_default = {
   "yi-dong-su-du": "\u79FB\u52A8\u901F\u5EA6",
   "she-bei-bu-zhi-chi": "\u8BBE\u5907\u4E0D\u652F\u6301",
   "mei-you-yun-tai-quan-xian": "\u6CA1\u6709\u4E91\u53F0\u6743\u9650",
-  "wei-zhi-cuo-wu": "\u672A\u77E5\u9519\u8BEF"
+  "wei-zhi-cuo-wu": "\u672A\u77E5\u9519\u8BEF",
+  "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"
 };
 
 // src/locales/i18n.ts
@@ -17984,14 +17998,15 @@ var PlayBack = (props) => {
     fileName,
     token,
     locale = "zh",
-    type: type1 = "web",
+    type: type1 = "auto",
     zIndexMenu,
     displayMode
   } = __spreadValues(__spreadValues({}, defaultProps3), props);
   i18n_default(locale);
   let hplayer = void 0;
   const handle2 = {};
-  let type = (puOption == null ? void 0 : puOption.puId) && type1 == "ws-bvrtc" ? type1 : type1;
+  const isWebErrorAutoToWsBvrtc = type1 == "auto";
+  let type = type1 == "ws-bvrtc" ? type1 : "web";
   const instance2 = {
     videoFit: "contain",
     open() {
@@ -18065,6 +18080,23 @@ var PlayBack = (props) => {
         });
         if (this.protocol == "web") {
           const videoEle = player.video.getVideoEl();
+          videoEle.onerror = () => {
+            var _a3;
+            if (videoEle.src != "") {
+              if (videoEle.error && videoEle.error.code == MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED) {
+                player.mask.text = t("hui-fang-wen-jian-bu-cun-zai");
+                player.mask.visible = true;
+              } else if (videoEle.error && videoEle.error.code == MediaError.MEDIA_ERR_DECODE) {
+                player.mask.text = "\u89E3\u7801\u5931\u8D25";
+                player.mask.visible = true;
+              }
+              if (isWebErrorAutoToWsBvrtc) {
+                (_a3 = handle2.close) == null ? void 0 : _a3.call(handle2);
+                instance2.setProtocol("ws-bvrtc");
+                instance2.open();
+              }
+            }
+          };
           videoEle.src = dialog_default.getPlaybackFilePath({ fileId: fileID, puid: puOption == null ? void 0 : puOption.puId }, token);
           videoEle.controls = false;
           barHandle.addEventListener("changeVolume", (data) => {
@@ -18109,6 +18141,8 @@ var PlayBack = (props) => {
             }
           });
           handle2.close = () => {
+            videoEle.onerror = () => {
+            };
             videoEle.src = "";
             markerHandle.destroy();
             player.close();
@@ -18152,19 +18186,47 @@ var PlayBack = (props) => {
           throw new Error("ws-bvrtc create offer failed.");
         }
         logger_default.info("ws-bvrtc localSDP: ", (_c = res == null ? void 0 : res.data) == null ? void 0 : _c.sdp);
-        const [dialog, playbackController] = yield dialog_default.getPlaybackBvrtc({
-          sdp: (_d = res == null ? void 0 : res.data) == null ? void 0 : _d.sdp,
-          id: (puOption == null ? void 0 : puOption.puId) || (puOption == null ? void 0 : puOption.nruId)
-        }, token);
+        let dialogId = "";
+        let sdp = "";
+        let playbackController = {};
+        try {
+          const [dialog, playbackControllerTemp] = yield dialog_default.getPlaybackBvrtc({
+            sdp: (_d = res == null ? void 0 : res.data) == null ? void 0 : _d.sdp,
+            id: (puOption == null ? void 0 : puOption.puId) || (puOption == null ? void 0 : puOption.nruId)
+          }, token);
+          playbackController = playbackControllerTemp;
+          dialogId = dialog.dialogId;
+          sdp = dialog.sdp;
+        } catch (e) {
+          const openError = e;
+          player.mask.text = openError.message;
+          player.mask.visible = true;
+          handle2.close = () => {
+            var _a3;
+            markerHandle.destroy();
+            player.close();
+            (_a3 = playbackController.close) == null ? void 0 : _a3.call(playbackController);
+            hplayer == null ? void 0 : hplayer.playbackStop();
+            hplayer.close();
+            barHandle.destroy();
+            contextIns == null ? void 0 : contextIns();
+            jumpEventHandler.destory();
+            handle2.close = void 0;
+            handle2.pause = void 0;
+            handle2.resume = void 0;
+            hplayer = void 0;
+          };
+          return;
+        }
         hplayer.onevent = (bCloseEvent, iResult) => {
           if (bCloseEvent && handle2.close) {
-            player.mask.text = "\u8FDE\u63A5\u610F\u5916\u5173\u95ED" + iResult;
+            player.mask.text = t("lian-jie-yi-wai-guan-bi") + iResult;
             player.mask.visible = true;
             barHandle.disable();
             stopInterval();
           }
         };
-        hplayer.setRemoteSDP(dialog.dialogId, dialog.sdp);
+        hplayer.setRemoteSDP(dialogId, sdp);
         const playbackInfo = yield playbackController.play();
         hplayer == null ? void 0 : hplayer.playbackStart(1);
         player.addEventListener("refreshInfoModal", (e) => __async(this, null, function* () {
@@ -18215,6 +18277,7 @@ var PlayBack = (props) => {
             (_b2 = handle2.resume) == null ? void 0 : _b2.call(handle2);
           }
         });
+        barHandle.pausePlayStateChange("pause");
         const stopInterval = () => {
           if (intervalToken) {
             clearInterval(intervalToken);

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

@@ -25,7 +25,7 @@ interface IPlaybackProps extends Props {
     zIndexMenu?: number;
     displayMode?: 'playback';
 }
-type IPlaybackPlayType = "ws-bvrtc" | "web";
+type IPlaybackPlayType = "ws-bvrtc" | "web" | "auto";
 interface IPlaybackInstance extends IComponentInstance {
     open(): Promise<void>;
     close(): Promise<void>;

package/package.json

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