@besovideo/webrtc-player 0.8.78 → 0.8.80

package/README.md

@@ -71,6 +71,8 @@ const { instance } = PuPlayer({
   onConnectedFailed: () => {},
   // (可选) 连接断开后回调
   onDisConnected: () => {},
+  // (可选) token 失效回调
+  onTokenFail: () => void,
   // (可选) 双击是否全屏
   fullScreenOnDblclick: true,
   // (可选) 启用控制器

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.78", PROJECT_NAMESPACE: "bvplayer" };
+    define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.80", PROJECT_NAMESPACE: "bvplayer" };
   }
 });
 
@@ -4944,6 +4944,8 @@ var CustomError = class extends Error {
 };
 // 错误码
 CustomError.ErrorStatus = {
+  //token 失效
+  TOKEN_FAIL: 9,
   // 打开dialog失败
   OPEN_DIALOG_FAILED: 1001,
   // WEBRTC打开的流为h265
@@ -4973,6 +4975,18 @@ var globalConfigHandler = {
 };
 
 // src/api/dialog.ts
+var TokenFailError = class extends CustomError {
+  constructor(message) {
+    super(CustomError.ErrorStatus.TOKEN_FAIL, message);
+  }
+  static isTokenFailError(e) {
+    return e instanceof TokenFailError;
+  }
+  toString() {
+    console.error(super.toString());
+    return "token fail";
+  }
+};
 var OpenDialogError = class extends CustomError {
   constructor(message) {
     super(CustomError.ErrorStatus.OPEN_DIALOG_FAILED, message);
@@ -5006,6 +5020,9 @@ var getDeviceWebrtc = (param, token, signal) => __async(void 0, null, function*
     signal
   );
   logger_default.api("\u8BBE\u5907\u97F3\u89C6\u9891\u6D41 webrtc\u65B9\u5F0F\u6253\u5F00dialog: ", { params, resData });
+  if ((resData == null ? void 0 : resData.code) == 9) {
+    throw new TokenFailError("token fail");
+  }
   if (!resData || resData.code !== 0 || !((_a = resData.data) == null ? void 0 : _a.dialogid))
     throw new OpenDialogError(`open dialog error: ${resData.msg}`);
   const { data: dialog } = resData;
@@ -5036,6 +5053,9 @@ var getDeviceBvrtc = (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 == null ? void 0 : resData.code) {
+    throw new TokenFailError("token fail");
+  }
   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}`);
   const { data: dialog } = resData;
@@ -9065,6 +9085,12 @@ var connect = (param, onGotStream) => __async(void 0, null, function* () {
     try {
       remoteSdp = yield productRemoteSdp(new RTCSessionDescription(offer));
     } catch (e) {
+      if (e instanceof CustomError) {
+        const err = e;
+        if (err.status == CustomError.ErrorStatus.TOKEN_FAIL) {
+          throw e;
+        }
+      }
       throw t("da-kai-shi-bai");
     }
     logger_default.info("webrtc remoteSDP: ", remoteSdp);
@@ -14874,7 +14900,8 @@ var en_default = {
   "shan-chu": "Delete",
   "tiao-zhuan": "Jump",
   "fa-song": "Send",
-  "xian-shi": "Show"
+  "xian-shi": "Show",
+  "token-fail": "Token Fail"
 };
 
 // src/locales/zh.json
@@ -14923,7 +14950,8 @@ var zh_default = {
   "shan-chu": "\u5220\u9664",
   "tiao-zhuan": "\u8DF3\u8F6C",
   "xian-shi": "\u663E\u793A",
-  "fa-song": "\u53D1\u9001"
+  "fa-song": "\u53D1\u9001",
+  "token-fail": "\u8BA4\u8BC1\u5931\u6548"
 };
 
 // src/locales/i18n.ts
@@ -16456,6 +16484,7 @@ var PuPlayer = (props) => {
     onConnectedFailed,
     onClose,
     onDisConnected,
+    onTokenFail,
     fullScreenOnDblclick = true,
     enableController = false,
     disabledControls = [],
@@ -16544,7 +16573,6 @@ var PuPlayer = (props) => {
           player.mask.text = t("lost-connection");
           player.close();
           onDisConnected && onDisConnected();
-          useRecntMgr == null ? void 0 : useRecntMgr.reconnect();
         },
         onConnected: (_pc) => {
           onConnected && onConnected();
@@ -16602,6 +16630,12 @@ var PuPlayer = (props) => {
       }
     }
   });
+  function tokenFailDetect(err, callBack) {
+    if (TokenFailError.isTokenFailError(err)) {
+      callBack == null ? void 0 : callBack();
+      throw err;
+    }
+  }
   const instance2 = {
     getVideoElement: () => {
       const el = player.video.getVideoEl();
@@ -16653,6 +16687,11 @@ var PuPlayer = (props) => {
             player.intercomUtils = CreateIntercomUtils(intercom == null ? void 0 : intercom.instance, this.protocol);
           }
         } catch (e) {
+          tokenFailDetect(e, () => {
+            player.mask.visible = true;
+            player.mask.text = t("token-fail");
+            onTokenFail == null ? void 0 : onTokenFail();
+          });
           if (protocol == "webrtc") {
             player.mask.visible = true;
             player.mask.text = e.toString();
@@ -16676,6 +16715,8 @@ var PuPlayer = (props) => {
             logger_default.debug("error\u7684\u7C7B\u578B", e.name, e instanceof OpenDialogError);
             if (e instanceof OpenDialogError)
               throw e;
+            player.mask.visible = true;
+            player.mask.text = t("connecting") + "...";
             const captureStream = () => hplayer == null ? void 0 : hplayer.captureStream();
             player.enableCanvas(true, captureStream);
             this.protocol = "ws-bvrtc";
@@ -16735,6 +16776,9 @@ var PuPlayer = (props) => {
               logger_default.info("ws-bvrtc remoteSDP: ", dialog.sdp);
               hplayer.setRemoteSDP(dialog.dialogId, dialog.sdp);
             } catch (e2) {
+              if (TokenFailError.isTokenFailError(e2)) {
+                throw e2;
+              }
               throw t("da-kai-shi-bai");
             }
             player.statsInfosV1 = () => {
@@ -16794,6 +16838,7 @@ var PuPlayer = (props) => {
               });
             });
             player.addEventListener("close", closeHandle);
+            player.mask.visible = false;
             onConnected && onConnected();
             reconnectMgr == null ? void 0 : reconnectMgr.cancelReconnect();
             dialog_default.closeDialogs([dialogId || ""], tempToken || "");
@@ -16846,6 +16891,11 @@ var PuPlayer = (props) => {
               player.mikeBtn.type = this.protocol;
             }
           } catch (e2) {
+            tokenFailDetect(e2, () => {
+              player.mask.visible = true;
+              player.mask.text = t("token-fail");
+              onTokenFail == null ? void 0 : onTokenFail();
+            });
             player.mask.visible = true;
             player.mask.text = e2.toString();
             hplayer == null ? void 0 : hplayer.close();

package/dist/types/api/dialog.d.ts

@@ -1,4 +1,9 @@
 import { CustomError } from "src/core/error";
+export declare class TokenFailError extends CustomError {
+    constructor(message?: string);
+    static isTokenFailError(e: any): boolean;
+    toString(): string;
+}
 export declare class OpenDialogError extends CustomError {
     constructor(message?: string);
     toString(): string;

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

@@ -35,6 +35,7 @@ export interface IPuPlayerProps extends Props {
     onConnectedFailed?(): void;
     onClose?(): void;
     onDisConnected?(): void;
+    onTokenFail?(): void;
     maxReconnectInterval?: number;
     locale?: "zh" | "en";
     noVideoRendeAudioWaveform?: boolean;

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

@@ -2,6 +2,7 @@ declare class CustomError extends Error {
     name: string;
     status: number;
     static ErrorStatus: {
+        TOKEN_FAIL: number;
         OPEN_DIALOG_FAILED: number;
         WEBRTC_H265: number;
         PTZ_CAMERA_OPERATION_FAILURE: number;

package/package.json

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