@volcengine/veplayer 2.5.1 → 2.5.2-rc.0

package/esm/index.d.ts

@@ -419,7 +419,14 @@ declare enum Level {
     /** {en}
      * @brief Error.
      */
-    Error = "Error"
+    Error = "Error",
+    /** {zh}
+     * @brief 提示。
+     */
+    /** {en}
+     * @brief Warn.
+     */
+    Warn = "Warn"
 }
 declare enum ErrorCode {
     /** {zh}
@@ -1501,15 +1508,16 @@ type PrepareResult = {
     options?: Partial<VePlayerBaseOptions>;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     plugins?: any[];
+    useSrc?: boolean;
 };
 type PreparePlugins = (url: string) => Promise<PrepareResult> | undefined;
 /** {zh}
  * @detail option
- * @brief 视频的实际编码格式。如果您在degradation 设置了 SoftFirst 属性（即硬解不支持降级软解），建议您传入该参数，省去探测实际编码格式的操作。
+ * @brief 视频的实际编码格式。如果您在 degradation 设置了 SoftFirst 属性（即硬解不支持降级软解），建议您传入该参数，省去探测实际编码格式的操作。
  */
 /** {en}
  * @detail option
- * @brief The actual codec of the video.
+ * @brief The actual codec of the video. If you set the SoftFirst property in degradation (that is, hard solutions do not support downgrading soft solutions), it is recommended that you pass this parameter to save the operation of probing the actual encoding format.
  */
 declare enum Codec {
     /** {zh}
@@ -2147,16 +2155,17 @@ declare class VePlayerBase {
      * @hidden
      */
     prepare(url: string): Promise<{
-        plugins: any[];
+        plugins: any[] | undefined;
         options: Partial<VePlayerBaseOptions> | undefined;
+        isSameProtocol: boolean | "";
+        useSrc: boolean | undefined;
     }>;
     private _handleFallback;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     private _transformEvent;
     private _switch;
+    private _switchDifferentProtocolUrl;
     private _switchUrl;
-    // 获取需要卸载和需要注册的播放插件
-    private _diffPlugins;
     private _callBeforePlayerInitForUrl;
 }
 declare const enum State {
@@ -2679,7 +2688,14 @@ declare namespace strategy {
         /** {en}
          * @brief Error.
          */
-        Error = "Error"
+        Error = "Error",
+        /** {zh}
+         * @brief 提示。
+         */
+        /** {en}
+         * @brief Warn.
+         */
+        Warn = "Warn"
     }
     enum ErrorCode {
         /** {zh}
@@ -3824,15 +3840,16 @@ declare namespace strategy {
         options?: Partial<VePlayerBaseOptions>;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         plugins?: any[];
+        useSrc?: boolean;
     };
     type PreparePlugins = (url: string) => Promise<PrepareResult> | undefined;
     /** {zh}
      * @detail option
-     * @brief 视频的实际编码格式。如果您在degradation 设置了 SoftFirst 属性（即硬解不支持降级软解），建议您传入该参数，省去探测实际编码格式的操作。
+     * @brief 视频的实际编码格式。如果您在 degradation 设置了 SoftFirst 属性（即硬解不支持降级软解），建议您传入该参数，省去探测实际编码格式的操作。
      */
     /** {en}
      * @detail option
-     * @brief The actual codec of the video.
+     * @brief The actual codec of the video. If you set the SoftFirst property in degradation (that is, hard solutions do not support downgrading soft solutions), it is recommended that you pass this parameter to save the operation of probing the actual encoding format.
      */
     enum Codec {
         /** {zh}
@@ -4172,7 +4189,14 @@ declare namespace error {
         /** {en}
          * @brief Error.
          */
-        Error = "Error"
+        Error = "Error",
+        /** {zh}
+         * @brief 提示。
+         */
+        /** {en}
+         * @brief Warn.
+         */
+        Warn = "Warn"
     }
     enum ErrorCode {
         /** {zh}

package/esm/veplayer.biz.live.development.js

@@ -8,6 +8,7 @@ const error = window["VePlayer"].error;
 const { VeError } = error;
 var LiveErrorCode = /* @__PURE__ */ ((LiveErrorCode2) => {
   LiveErrorCode2[LiveErrorCode2["INVALID_PARAMETER"] = 210] = "INVALID_PARAMETER";
+  LiveErrorCode2[LiveErrorCode2["EMPTY_RTM_FALLBACK_PARAMETER"] = 211] = "EMPTY_RTM_FALLBACK_PARAMETER";
   LiveErrorCode2[LiveErrorCode2["INVALID_LOGGER"] = 220] = "INVALID_LOGGER";
   return LiveErrorCode2;
 })(LiveErrorCode || {});
@@ -25,12 +26,19 @@ const ERRORS = {
     messageTextKey: "INVALID_PARAMETER",
     level: error.Level.Fatal
   },
+  [
+    211
+    /* EMPTY_RTM_FALLBACK_PARAMETER */
+  ]: {
+    messageTextKey: "EMPTY_RTM_FALLBACK_PARAMETER",
+    level: error.Level.Warn
+  },
   [
     220
     /* INVALID_LOGGER */
   ]: {
     messageTextKey: "INVALID_LOGGER",
-    level: error.Level.Error
+    level: error.Level.Warn
   }
 };
 function create(errorCode, i18n) {
@@ -54,38 +62,63 @@ async function isRTMSupportCodec(codec = RTMCodec.H264) {
     return RtmPlugin.isSupportedH264();
   return false;
 }
+const getUrlObject = (url) => {
+  if (!url) {
+    return;
+  }
+  const withoutProtocol = url.startsWith("//");
+  if (withoutProtocol) {
+    url = location.protocol + url;
+  }
+  try {
+    return new URL(url);
+  } catch (error2) {
+    return;
+  }
+};
 const strategy$2 = window["VePlayer"].strategy;
 const util$6 = window["VePlayer"].util;
 const DynamicModule$3 = window["VePlayer"].DynamicModule;
 const load$4 = window["VePlayer"].load;
 const Codec$3 = window["VePlayer"].Codec;
-const Sniffer$5 = window["VePlayer"].Sniffer;
+const Sniffer$4 = window["VePlayer"].Sniffer;
 const rtmStrategy = {
   options: {},
   module: DynamicModule$3.PluginRtm
 };
 const generateFallbackUrl = (url) => {
-  if (Sniffer$5.device === "pc") {
+  if (Sniffer$4.device === "pc") {
     return url.replace(".sdp", ".flv");
   } else {
     return url.replace(".sdp", ".m3u8");
   }
 };
-const getRtmStrategy = async (options, player) => {
-  var _a;
+const getRtmStrategy = async (options, player, i18n) => {
+  var _a, _b;
   let backupStrategy;
-  const { url } = options;
-  const {
-    fallbackUrl,
-    enableFallback = true,
-    enableRTMAutoTranscode,
-    ...ret
-  } = options.rtm || {};
-  const actualFallbackUrl = !enableFallback ? "" : !fallbackUrl && url ? generateFallbackUrl(url) : fallbackUrl;
+  let actualFallbackUrl = "";
+  const { url, playlist } = options;
+  const { fallbackUrl, enableRTMAutoTranscode, ...ret } = options.rtm || {};
+  let { enableFallback = true } = options.rtm || {};
+  if (playlist == null ? void 0 : playlist.length) {
+    enableFallback = false;
+  }
+  const isRTMAutoTranscode = enableRTMAutoTranscode || ((_a = getUrlObject(url)) == null ? void 0 : _a.searchParams.get("enableRTMAutoTranscode")) === "true";
+  if (enableFallback) {
+    if (fallbackUrl) {
+      actualFallbackUrl = fallbackUrl;
+    } else if (isRTMAutoTranscode && url) {
+      actualFallbackUrl = generateFallbackUrl(url);
+    } else {
+      console.warn(
+        create(ErrorCode.EMPTY_RTM_FALLBACK_PARAMETER, i18n).message
+      );
+    }
+  }
   const backupType = actualFallbackUrl && util$6.getStreamType(actualFallbackUrl);
   if (backupType === "flv" && util$6.isMseSupported(Codec$3.H264)) {
     backupStrategy = strategy$2.createFlvMseStrategy(options);
-  } else if (backupType === "hls" && (Sniffer$5.device !== "mobile" || ((_a = options == null ? void 0 : options.hls) == null ? void 0 : _a.enableMSE)) && util$6.isMseSupported(Codec$3.H264)) {
+  } else if (backupType === "hls" && (Sniffer$4.device !== "mobile" || ((_b = options == null ? void 0 : options.hls) == null ? void 0 : _b.enableMSE)) && util$6.isMseSupported(Codec$3.H264)) {
     backupStrategy = strategy$2.createHlsMseStrategy(options);
   }
   const [rtmCdn, backupCdn] = await Promise.all([
@@ -100,33 +133,35 @@ const getRtmStrategy = async (options, player) => {
       }
     }).catch(() => void 0)
   ]);
-  const [RTMSupported, RTMSupportCodec] = await Promise.all([
-    isRTMSupported(),
-    isRTMSupportCodec()
-  ]);
-  if (!RTMSupported || !RTMSupportCodec) {
-    if (player) {
-      player.emit("degrade", {
-        url: actualFallbackUrl,
-        originRtmUrl: url,
-        code: "NOT_SUPPORT",
-        message: "not support rtm or h264",
-        isRTMSupported: RTMSupported,
-        isRTMSupportCodec: RTMSupportCodec
-      });
+  if (actualFallbackUrl) {
+    const [RTMSupported, RTMSupportCodec] = await Promise.all([
+      isRTMSupported(),
+      isRTMSupportCodec()
+    ]);
+    if (!RTMSupported || !RTMSupportCodec) {
+      if (player) {
+        player.emit("degrade", {
+          url: actualFallbackUrl,
+          originRtmUrl: url,
+          code: "NOT_SUPPORT",
+          message: "not support rtm or h264",
+          isRTMSupported: RTMSupported,
+          isRTMSupportCodec: RTMSupportCodec
+        });
+      }
+      return {
+        options: {
+          ...(backupStrategy == null ? void 0 : backupStrategy.options) || {},
+          url: actualFallbackUrl,
+          _RTMdegrade: {
+            _originRtmUrl: url,
+            _isRTMSupported: RTMSupported,
+            _isRTMSupportCodec: RTMSupportCodec
+          }
+        },
+        plugins: backupCdn ? [backupCdn] : []
+      };
     }
-    return {
-      options: {
-        ...(backupStrategy == null ? void 0 : backupStrategy.options) || {},
-        url: actualFallbackUrl,
-        _RTMdegrade: {
-          _originRtmUrl: url,
-          _isRTMSupported: RTMSupported,
-          _isRTMSupportCodec: RTMSupportCodec
-        }
-      },
-      plugins: backupCdn ? [backupCdn] : []
-    };
   }
   return {
     options: {
@@ -143,13 +178,13 @@ const getRtmStrategy = async (options, player) => {
     plugins: rtmCdn ? [rtmCdn] : []
   };
 };
-const Sniffer$4 = window["VePlayer"].Sniffer;
+const Sniffer$3 = window["VePlayer"].Sniffer;
 var DrmType = /* @__PURE__ */ ((DrmType2) => {
   DrmType2["Fairplay"] = "fairplay";
   return DrmType2;
 })(DrmType || {});
 function getDrmType(drm) {
-  if ((drm == null ? void 0 : drm.fairplay) && (Sniffer$4.browser === "safari" || Sniffer$4.os.isIos)) {
+  if ((drm == null ? void 0 : drm.fairplay) && (Sniffer$3.browser === "safari" || Sniffer$3.os.isIos)) {
     return "fairplay";
   }
   return;
@@ -167,12 +202,12 @@ function isMseSupportedWithDrm({
   }
   return true;
 }
-const Sniffer$3 = window["VePlayer"].Sniffer;
+const Sniffer$2 = window["VePlayer"].Sniffer;
 const Codec$2 = window["VePlayer"].Codec;
 const util$5 = window["VePlayer"].util;
 const { isMMSSupported: isMMSSupported$1, isMseSupported: isMseSupported$1 } = util$5;
 function enableMMS() {
-  return Sniffer$3.os.isIos;
+  return Sniffer$2.os.isIos;
 }
 function isFLVSupported(codec = Codec$2.H264) {
   const isMediaSourceSupported = enableMMS() ? isMMSSupported$1 : isMseSupported$1;
@@ -180,7 +215,6 @@ function isFLVSupported(codec = Codec$2.H264) {
 }
 const strategy$1 = window["VePlayer"].strategy;
 const load$3 = window["VePlayer"].load;
-const Sniffer$2 = window["VePlayer"].Sniffer;
 const Codec$1 = window["VePlayer"].Codec;
 const util$4 = window["VePlayer"].util;
 const { appendSearchParams } = util$4;
@@ -188,7 +222,7 @@ const getFlvStrategy = async (options) => {
   var _a, _b, _c, _d, _e, _f;
   let mseStrategy;
   let softStrategy;
-  const enableLowLatency = ((_a = options == null ? void 0 : options.flv) == null ? void 0 : _a.enableLowLatency) && Sniffer$2.device === "pc";
+  const enableLowLatency = (_a = options == null ? void 0 : options.flv) == null ? void 0 : _a.enableLowLatency;
   const enableFrameChasing = ((_c = (_b = options == null ? void 0 : options.flv) == null ? void 0 : _b.lowLatency) == null ? void 0 : _c.enableFrameChasing) ?? true;
   const abrPts = ((_e = (_d = options == null ? void 0 : options.flv) == null ? void 0 : _d.lowLatency) == null ? void 0 : _e.abrPts) ?? "-800";
   const codec = await strategy$1.getCodec(options);
@@ -226,13 +260,13 @@ const getFlvStrategy = async (options) => {
 };
 const util$3 = window["VePlayer"].util;
 const strategy = window["VePlayer"].strategy;
-const getTypeStrategy = async (options, player) => {
+const getTypeStrategy = async (options, player, i18n) => {
   const type = options.url ? util$3.getStreamType(options.url) : "";
   if (!type || type === "unknown") {
     return { options: {}, plugins: [] };
   }
   if (type === "rtm") {
-    return await getRtmStrategy(options, player);
+    return await getRtmStrategy(options, player, i18n);
   }
   if (type === "flv") {
     return await getFlvStrategy(options);
@@ -3058,7 +3092,7 @@ class Logger extends Plugin$2 {
       device_id: this._deviceId,
       error_report_stop: true,
       ext: {
-        veplayer_version: "2.3.0",
+        veplayer_version: "2.3.1-rc.1",
         flv_version: "3.0.21-rc.5",
         hls_version: "3.0.21-rc.5",
         rts_version: "0.2.1-alpha.14"
@@ -3303,6 +3337,7 @@ const EN$1 = {
   ...BaseEN,
   INVALID_PARAMETER: "The imported parameter is empty, please pass in necessary parameters such as the stream address",
   INVALID_LOGGER: `Log options not configured correctly. Please refer to this document ${logDoc} to configure the logs.`,
+  EMPTY_RTM_FALLBACK_PARAMETER: "Fallback URL for RTM is not configured. Please set enableFallback: false to disable fallback, or configure fallbackUrl for FLV and HLS formats based on the browser environment.",
   // info-panel
   FORMAT: "format",
   FPS: "fps",
@@ -3322,6 +3357,7 @@ const ZH_CN$1 = {
   ...BaseZH_CN,
   INVALID_PARAMETER: "入参为空，请传入流地址等必要参数",
   INVALID_LOGGER: `未正确配置质量日志参数, 请参考 ${logDoc} 配置`,
+  EMPTY_RTM_FALLBACK_PARAMETER: "未配置 RTM 降级地址 fallbackUrl，请设置 enableFallback: false 取消降级或根据浏览器环境配置 FLV、HLS 格式降级地址",
   // info-panel
   FORMAT: "格式",
   FPS: "帧率",
@@ -3655,13 +3691,15 @@ async function createLivePlayer(options) {
         };
       },
       async preparePlugins(url) {
+        var _a2;
         const [typeStrategy, drmStrategy, abrStrategy] = await Promise.all([
           getTypeStrategy(
             {
               ...finalOptions,
               url
             },
-            player
+            player,
+            i18n
           ),
           getDrmStrategy(
             {
@@ -3684,7 +3722,8 @@ async function createLivePlayer(options) {
             ...plugins ?? [],
             ...drmPlugins ?? [],
             ...abrPlugins ?? []
-          ]
+          ],
+          useSrc: !((_a2 = typeStrategy.plugins) == null ? void 0 : _a2.length)
         };
       }
     },