@besovideo/webrtc-player 0.8.71 → 0.8.73

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.70", PROJECT_NAMESPACE: "bvplayer" };
+    define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.73", PROJECT_NAMESPACE: "bvplayer" };
   }
 });
 
@@ -5038,12 +5038,10 @@ var getPlaybackBvrtc = (param, token, signal) => __async(void 0, null, function*
   const headers = {
     Authorization: token || ""
   };
-  const params = AppendHost(
-    __spreadValues({
-      index: param.index,
-      sdp: param.sdp
-    }, param.id ? { id: param.id } : {})
-  );
+  const params = AppendHost(__spreadValues({
+    index: param.index,
+    sdp: param.sdp
+  }, param.id ? { id: param.id } : {}));
   const resData = yield http_default.post(
     `${apiUrls.bvscpV1()}/dialog/playback`,
     params,
@@ -5068,6 +5066,9 @@ var getPlaybackBvrtc = (param, token, signal) => __async(void 0, null, function*
   ];
 });
 var getPlaybackFilePath = (param, token, signal) => {
+  if (param.puid) {
+    return `${apiUrls.bvscpV1()}/pu/download/${param.puid}/${param.fileId}?token=${token}`;
+  }
   return `${apiUrls.bvnruV1()}/download/${param.fileId}?token=${token}`;
 };
 var genPlaybackController = (dialogId, token) => {
@@ -14380,6 +14381,11 @@ function ContextMenu(menu, options) {
     container.innerHTML = "";
     container.appendChild(renderLevel(menu));
   };
+  this.destory = function() {
+    window.removeEventListener("click", documentClick);
+    var container = document.getElementById("cm_" + num);
+    document.body.removeChild(container);
+  };
   function renderLevel(level) {
     var ul_outer = document.createElement("ul");
     level.forEach(function(item) {
@@ -14446,7 +14452,7 @@ function ContextMenu(menu, options) {
     });
     return ul_outer;
   }
-  this.display = function(e, target) {
+  this.display = function(e, target, zIndexMenu) {
     if (typeof target !== "undefined") {
       self2.contextTarget = target;
     } else {
@@ -14500,6 +14506,9 @@ function ContextMenu(menu, options) {
     if (ContextUtil.getProperty(options, "close_on_click", true)) {
       window.addEventListener("click", documentClick);
     }
+    if (typeof zIndexMenu == "number") {
+      menu2.style.zIndex = zIndexMenu;
+    }
     e.preventDefault();
   };
   this.hide = function() {
@@ -16799,6 +16808,9 @@ var MarkerHandle = class extends Plugin {
     return this.playArea;
   }
   init(_container, layoutInfo) {
+    if (this.createParams.puid) {
+      return _container;
+    }
     if (layoutInfo) {
       this.layoutInfo = layoutInfo;
     }
@@ -16938,33 +16950,6 @@ var MarkerHandle = class extends Plugin {
   //core.dom.append(this.markerDisplayPanel, ...timelines)
 };
 
-// src/api/record.ts
-init_define_processenv();
-init_jsx_shim();
-init_logger();
-var RecordlineError = class extends CustomError {
-  constructor(message) {
-    super(CustomError.ErrorStatus.RECORD_INFO_FAILURE, message);
-  }
-};
-var GetRecordInfo = (fileId, token) => __async(void 0, null, function* () {
-  const headers = {
-    Authorization: token || ""
-  };
-  const resData = yield http_default.get(
-    `${apiUrls.bvscpV1()}/recordfile/${fileId}`,
-    void 0,
-    { headers }
-  );
-  logger_default.api("\u83B7\u53D6\u5F55\u50CF\u6587\u4EF6\u4FE1\u606F: ", { resData });
-  if (!resData || resData.code !== 0)
-    throw new RecordlineError(`Timeline Get: ${resData == null ? void 0 : resData.msg}`);
-  return resData.data;
-});
-var recordApi = {
-  GetRecordInfo
-};
-
 // src/components/playBack.tsx
 var ContextMenuItems2 = /* @__PURE__ */ ((ContextMenuItems3) => {
   ContextMenuItems3[ContextMenuItems3["videoFit"] = 0] = "videoFit";
@@ -17037,10 +17022,13 @@ var useContextMenu2 = (player) => {
       });
     });
     contextMenu.reload();
-    contextMenu.display(event);
+    contextMenu.display(event, void 0, player.zIndexMenu);
   };
   el.addEventListener("contextmenu", onContextMenu);
-  return () => el.removeEventListener("contextmenu", onContextMenu);
+  return () => {
+    el.removeEventListener("contextmenu", onContextMenu);
+    contextMenu.destory();
+  };
 };
 var PlayBack = (props) => {
   const {
@@ -17053,11 +17041,13 @@ var PlayBack = (props) => {
     fileName,
     token,
     locale = "zh",
-    type = "web"
+    type: type1 = "web",
+    zIndexMenu
   } = __spreadValues(__spreadValues({}, defaultProps3), props);
   i18n_default(locale);
   let hplayer = void 0;
   const handle2 = {};
+  let type = (puOption == null ? void 0 : puOption.puId) && type1 == "ws-bvrtc" ? "web" : type1;
   const instance2 = {
     videoFit: "contain",
     open() {
@@ -17069,18 +17059,18 @@ var PlayBack = (props) => {
         const markerHandle = new MarkerHandle({
           token,
           fileId: fileID,
+          puid: puOption == null ? void 0 : puOption.puId,
           currentTimeGatter() {
             return barHandle.playbackInfo.current;
           }
         });
         const playbackRender = markerHandle.init(container);
-        const recordfileInfo = yield recordApi.GetRecordInfo(fileID, token);
         const player = new player_default({
           video: {
             type: "WS-BVRTC"
           },
           puOptions: {
-            id: `${(puOption == null ? void 0 : puOption.id) ? puOption == null ? void 0 : puOption.id : ""} ${fileID}`,
+            id: `${fileID}`,
             index: 0
           },
           playerConfig: {
@@ -17098,22 +17088,22 @@ var PlayBack = (props) => {
         barHandle.addEventListener("fullscreen", () => {
           fullscreen_default.toggle(markerHandle.GetPlayArea());
         });
-        useContextMenu2({ instance: instance2, element: playbackRender });
+        const contextIns = useContextMenu2({ instance: instance2, element: playbackRender, zIndexMenu });
         core_default.dom.append(playbackRender, barRendertarget);
         core_default.dom.append(barHandle.getContainer(), playerRendertarget);
         handle2.setVideoFit = (fit) => {
           player.setVideoFit(fit);
         };
         barHandle.addEventListener("download", () => {
-          const filePath = dialog_default.getPlaybackFilePath({ fileId: fileID }, token);
+          const filePath = dialog_default.getPlaybackFilePath({ fileId: fileID, puid: puOption == null ? void 0 : puOption.puId }, token);
           const aEle = document.createElement("a");
           aEle.href = filePath;
-          aEle.download = fileName ? fileName : recordfileInfo.fileName;
+          aEle.download = fileName ? fileName : "\u8BF7\u586B\u5199Filename";
           aEle.click();
         });
         if (this.protocol == "web") {
           const videoEle = player.video.getVideoEl();
-          videoEle.src = dialog_default.getPlaybackFilePath({ fileId: fileID }, token);
+          videoEle.src = dialog_default.getPlaybackFilePath({ fileId: fileID, puid: puOption == null ? void 0 : puOption.puId }, token);
           videoEle.controls = false;
           barHandle.addEventListener("changeVolume", (data) => {
             if (data) {
@@ -17161,6 +17151,7 @@ var PlayBack = (props) => {
             markerHandle.destroy();
             player.close();
             barHandle.destroy();
+            contextIns == null ? void 0 : contextIns();
             handle2.close = void 0;
             handle2.pause = void 0;
             handle2.resume = void 0;
@@ -17199,7 +17190,8 @@ var PlayBack = (props) => {
         }
         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
+          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);
         hplayer.onevent = (bCloseEvent, iResult) => {
           if (bCloseEvent && handle2.close) {
@@ -17283,6 +17275,7 @@ var PlayBack = (props) => {
           playbackController.close();
           hplayer == null ? void 0 : hplayer.playbackStop();
           barHandle.destroy();
+          contextIns == null ? void 0 : contextIns();
           handle2.close = void 0;
           handle2.pause = void 0;
           handle2.resume = void 0;
@@ -17334,7 +17327,7 @@ var PlayBack = (props) => {
     },
     setProtocol: function(protocol) {
       this.close();
-      this.protocol = protocol;
+      this.protocol = (puOption == null ? void 0 : puOption.puId) ? "web" : protocol;
       this.open();
     },
     protocol: "web"

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

@@ -51,6 +51,7 @@ declare const dialogApi: {
     closeAllStorageDialog: (token: string) => Promise<void>;
     getPlaybackBvrtc: (param: Partial<IGetDeviceWebRtcParam>, token?: string, signal?: AbortSignal) => Promise<[IDialog, TPlaybackController]>;
     getPlaybackFilePath: (param: {
+        puid?: string;
         fileId: string;
     }, token?: string, signal?: AbortSignal) => string;
 };

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

@@ -1,4 +1,4 @@
-import { SFC, Props, IComponentInstance } from "src/core/types";
+import { SFC, Props, IComponentInstance } from "../core/types";
 import { IVideoFits } from "../plugins/player";
 import initI18n from "src/locales/i18n";
 type Container = HTMLElement | Element | Node | null;
@@ -6,8 +6,9 @@ interface IPlaybackProps extends Props {
     fileID: string;
     fileName?: string;
     token: string;
-    puOption: {
-        id: string;
+    puOption?: {
+        puId?: string;
+        nruId?: string;
     };
     apiPrefix?: string;
     bvrtcConfig?: {
@@ -20,7 +21,8 @@ interface IPlaybackProps extends Props {
     };
     container?: Container;
     locale?: Parameters<typeof initI18n>["0"];
-    type: IPlaybackPlayType;
+    type?: IPlaybackPlayType;
+    zIndexMenu?: number;
 }
 type IPlaybackPlayType = "ws-bvrtc" | "web";
 interface IPlaybackInstance extends IComponentInstance {

package/dist/types/components/subComponent/contextMenu.d.ts

@@ -7,7 +7,8 @@ export class ContextMenu {
     changeOption: (option: any, value: any) => void;
     getOptions: () => any;
     reload: () => void;
-    display: (e: any, target: any) => void;
+    destory: () => void;
+    display: (e: any, target: any, zIndexMenu: any) => void;
     hide: () => void;
 }
 export namespace ContextMenu {

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

@@ -13,6 +13,7 @@ interface ICreateParams {
     fileId: string;
     token: string;
     currentTimeGatter(): number;
+    puid?: string;
 }
 declare class MarkerHandle extends Plugin<HTMLDivElement, MarkerHandleEventMap> {
     protected beforeDestroy(): void;

package/package.json

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