@volcengine/veplayer 2.5.1-rc.2 → 2.5.2-rc.0

package/umd/veplayer.development.js

@@ -6506,6 +6506,7 @@ var __publicField = (obj, key, value) => {
   var Level = /* @__PURE__ */ ((Level2) => {
     Level2["Fatal"] = "Fatal";
     Level2["Error"] = "Error";
+    Level2["Warn"] = "Warn";
     return Level2;
   })(Level || {});
   var ErrorCode$1 = /* @__PURE__ */ ((ErrorCode2) => {
@@ -13872,7 +13873,7 @@ var __publicField = (obj, key, value) => {
      * @brief Retrieve the player SDK version number.
      */
     get playerVersion() {
-      return "2.5.1-rc.2";
+      return "2.5.2-rc.0";
     }
     /** {zh}
      * @brief 获取当前播放视频的清晰度唯一标识（definition）。
@@ -14356,25 +14357,27 @@ var __publicField = (obj, key, value) => {
      * @hidden
      */
     async prepare(url) {
-      var _a, _b;
+      var _a, _b, _c, _d, _e, _f, _g;
       const result = await ((_a = this._preparePlugins) == null ? void 0 : _a.call(this, url));
-      const { removedPlugins, addedPlugins } = this._diffPlugins(
-        ((_b = this._previousPrepareResult) == null ? void 0 : _b.plugins) ?? [],
-        (result == null ? void 0 : result.plugins) ?? []
-      );
-      removedPlugins == null ? void 0 : removedPlugins.forEach((pluginName) => {
-        /* istanbul ignore next -- @preserve */
-        this._player.unRegisterPlugin(pluginName);
-      });
+      const newUrl = ((_b = result == null ? void 0 : result.options) == null ? void 0 : _b.url) ?? url;
+      const oldUrl = (_d = (_c = this._player) == null ? void 0 : _c.config) == null ? void 0 : _d.url;
+      const isSameProtocol = oldUrl && getStreamType(newUrl) === getStreamType(oldUrl);
+      if (!isSameProtocol) {
+        (_f = (_e = this._previousPrepareResult) == null ? void 0 : _e.plugins) == null ? void 0 : _f.forEach((plugin) => {
+          this._player.unRegisterPlugin(plugin.pluginName);
+        });
+      }
       this._previousPrepareResult = result;
       if (result == null ? void 0 : result.options) {
         this._player.setConfig(result.options);
       }
       return {
-        plugins: addedPlugins.map((plugin) => {
+        plugins: isSameProtocol ? [] : (_g = result == null ? void 0 : result.plugins) == null ? void 0 : _g.map((plugin) => {
           return this._player.registerPlugin(plugin);
         }),
-        options: result == null ? void 0 : result.options
+        options: result == null ? void 0 : result.options,
+        isSameProtocol,
+        useSrc: result == null ? void 0 : result.useSrc
       };
     }
     async _handleFallback(err) {
@@ -14417,81 +14420,105 @@ var __publicField = (obj, key, value) => {
     async _switch(targetDefinition) {
       var _a, _b, _c, _d, _e, _f;
       const preDefinition = clonedeep(this._sourceManager.definition);
-      const { plugins: newPlugins, options } = await this.prepare(targetDefinition.url) || {};
+      const isPaused = this._player.paused && !this._player.isError;
+      const {
+        plugins: newPlugins,
+        options,
+        isSameProtocol,
+        useSrc
+      } = await this.prepare(targetDefinition.url) || {};
       if (options == null ? void 0 : options.url) {
         targetDefinition.url = options == null ? void 0 : options.url;
       }
       this._sourceManager.switch(targetDefinition);
       (_b = (_a = this._player) == null ? void 0 : _a.plugins) == null ? void 0 : _b.sources.renderItemList();
       (_d = (_c = this._player) == null ? void 0 : _c.plugins) == null ? void 0 : _d.definition.renderItemList();
-      if (((_e = targetDefinition == null ? void 0 : targetDefinition.source) == null ? void 0 : _e.name) !== ((_f = preDefinition == null ? void 0 : preDefinition.source) == null ? void 0 : _f.name)) {
-        this.emit(Events$1.SOURCE_CHANGE);
-      }
-      if (newPlugins == null ? void 0 : newPlugins.length) {
-        this.emit(Events$1.DEFINITION_CHANGE);
-        await this._callBeforePlayerInitForUrl(newPlugins, targetDefinition.url);
-        this.emit(Events$1.AFTER_DEFINITION_CHANGE);
+      const isSourceSwitching = ((_e = targetDefinition == null ? void 0 : targetDefinition.source) == null ? void 0 : _e.name) !== ((_f = preDefinition == null ? void 0 : preDefinition.source) == null ? void 0 : _f.name);
+      this._player.config.url = targetDefinition.url;
+      if (isSameProtocol) {
+        if (isSourceSwitching) {
+          this.emit(Events$1.SOURCE_CHANGE);
+          this._player.switchURL(targetDefinition.url);
+        } else {
+          this._player.changeDefinition(targetDefinition, preDefinition);
+        }
       } else {
-        this._player.changeDefinition(targetDefinition, preDefinition);
+        this.emit(
+          isSourceSwitching ? Events$1.SOURCE_CHANGE : Events$1.DEFINITION_CHANGE
+        );
+        await this._switchDifferentProtocolUrl(
+          newPlugins,
+          targetDefinition.url,
+          isPaused,
+          useSrc
+        );
+        !isSourceSwitching && this.emit(Events$1.AFTER_DEFINITION_CHANGE);
       }
     }
+    async _switchDifferentProtocolUrl(plugins, url, isPaused, useSrc) {
+      var _a, _b;
+      if (useSrc && this._player.media) {
+        if ((_a = this._player.config) == null ? void 0 : _a.preProcessUrl) {
+          url = (_b = this._player.config) == null ? void 0 : _b.preProcessUrl(url).url;
+        }
+        this._player.media.src = url;
+      }
+      if (plugins == null ? void 0 : plugins.length) {
+        await this._callBeforePlayerInitForUrl(plugins);
+      }
+      return new Promise((resolve) => {
+        const curTime = this._player.currentTime;
+        const _canplay = () => {
+          console.log("canplay canplay");
+          this._player.currentTime = curTime;
+          if (isPaused) {
+            this._player.once(CANPLAY, () => {
+              this._player.pause();
+            });
+          }
+          resolve();
+        };
+        if (sniffer$1.os.isAndroid) {
+          this.once(TIME_UPDATE, () => {
+            _canplay();
+          });
+        } else {
+          this.once(CANPLAY, () => {
+            _canplay();
+          });
+        }
+        this._player.play();
+      });
+    }
     async _switchUrl(url, config) {
-      const { plugins: newPlugins, options } = await this.prepare(url) || {};
+      const isPaused = this._player.paused && !this._player.isError;
+      const {
+        plugins: newPlugins,
+        options,
+        isSameProtocol,
+        useSrc
+      } = await this.prepare(url) || {};
       const newUrl = (options == null ? void 0 : options.url) ?? url;
       this._sourceManager.url = newUrl;
-      if (newPlugins == null ? void 0 : newPlugins.length) {
-        this._callBeforePlayerInitForUrl(newPlugins, newUrl);
-      } else {
+      this._player.config.url = newUrl;
+      if (isSameProtocol) {
         const res = this._player.switchURL(newUrl, {
           seamless: config == null ? void 0 : config.seamless
         });
-        const curTime = this._player.currentTime;
         if (res && res.then) {
           return res;
-        } else {
-          return new Promise((resolve) => {
-            const isPaused = this._player.paused && !this._player.isError;
-            const _canplay = () => {
-              this._player.currentTime = curTime;
-              if (isPaused) {
-                this._player.once(CANPLAY, () => {
-                  this._player.pause();
-                });
-              }
-              resolve();
-            };
-            if (sniffer$1.os.isAndroid) {
-              this.once(TIME_UPDATE, () => {
-                _canplay();
-              });
-            } else {
-              this.once(CANPLAY, () => {
-                _canplay();
-              });
-            }
-            this._player.play();
-          });
         }
+      } else {
+        return this._switchDifferentProtocolUrl(
+          newPlugins,
+          newUrl,
+          isPaused,
+          useSrc
+        );
       }
     }
-    // 获取需要卸载和需要注册的播放插件
-    _diffPlugins(previousPlugins, newPlugins) {
-      const previousPluginNames = previousPlugins.map((item) => item.pluginName);
-      const newPluginNames = newPlugins.map((item) => item.pluginName);
-      const removedPlugins = previousPluginNames.filter(
-        (name) => !newPluginNames.includes(name)
-      );
-      const addedPlugins = newPlugins.filter(
-        (name) => !previousPluginNames.includes(name.pluginName)
-      );
-      return {
-        removedPlugins,
-        addedPlugins
-      };
-    }
-    _callBeforePlayerInitForUrl(newPlugins, url) {
+    _callBeforePlayerInitForUrl(newPlugins) {
       return new Promise((resolve) => {
-        this._player.config.url = url;
         newPlugins == null ? void 0 : newPlugins.forEach((plugin) => {
           plugin.beforePlayerInit();
         });
@@ -19150,6 +19177,7 @@ var __publicField = (obj, key, value) => {
   const { VeError } = error$1;
   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 || {});
@@ -19166,12 +19194,19 @@ var __publicField = (obj, key, value) => {
       messageTextKey: "INVALID_PARAMETER",
       level: Level.Fatal
     },
+    [
+      211
+      /* EMPTY_RTM_FALLBACK_PARAMETER */
+    ]: {
+      messageTextKey: "EMPTY_RTM_FALLBACK_PARAMETER",
+      level: Level.Warn
+    },
     [
       220
       /* INVALID_LOGGER */
     ]: {
       messageTextKey: "INVALID_LOGGER",
-      level: Level.Error
+      level: Level.Warn
     }
   };
   function create(errorCode, i18n) {
@@ -19204,21 +19239,32 @@ var __publicField = (obj, key, value) => {
       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.getStreamType(actualFallbackUrl);
     if (backupType === "flv" && util.isMseSupported(Codec.H264)) {
       backupStrategy = createFlvMseStrategy(options);
-    } else if (backupType === "hls" && (sniffer$1.device !== "mobile" || ((_a = options == null ? void 0 : options.hls) == null ? void 0 : _a.enableMSE)) && util.isMseSupported(Codec.H264)) {
+    } else if (backupType === "hls" && (sniffer$1.device !== "mobile" || ((_b = options == null ? void 0 : options.hls) == null ? void 0 : _b.enableMSE)) && util.isMseSupported(Codec.H264)) {
       backupStrategy = createHlsMseStrategy(options);
     }
     const [rtmCdn, backupCdn] = await Promise.all([
@@ -19233,33 +19279,35 @@ var __publicField = (obj, key, value) => {
         }
       }).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: {
@@ -19312,7 +19360,7 @@ var __publicField = (obj, key, value) => {
     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$1.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 getCodec(options);
@@ -19348,13 +19396,13 @@ var __publicField = (obj, key, value) => {
       plugins
     };
   };
-  const getTypeStrategy = async (options, player) => {
+  const getTypeStrategy = async (options, player, i18n) => {
     const type = options.url ? util.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);
@@ -22170,7 +22218,7 @@ var __publicField = (obj, key, value) => {
         device_id: this._deviceId,
         error_report_stop: true,
         ext: {
-          veplayer_version: "2.5.1-rc.2",
+          veplayer_version: "2.5.2-rc.0",
           flv_version: "3.0.21-rc.5",
           hls_version: "3.0.21-rc.5",
           rts_version: "0.2.1-alpha.14"
@@ -22411,6 +22459,7 @@ var __publicField = (obj, key, value) => {
     ...EN$1,
     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",
@@ -22429,6 +22478,7 @@ var __publicField = (obj, key, value) => {
     ...ZH_CN$1,
     INVALID_PARAMETER: "入参为空，请传入流地址等必要参数",
     INVALID_LOGGER: `未正确配置质量日志参数, 请参考 ${logDoc} 配置`,
+    EMPTY_RTM_FALLBACK_PARAMETER: "未配置 RTM 降级地址 fallbackUrl，请设置 enableFallback: false 取消降级或根据浏览器环境配置 FLV、HLS 格式降级地址",
     // info-panel
     FORMAT: "格式",
     FPS: "帧率",
@@ -22727,13 +22777,15 @@ var __publicField = (obj, key, value) => {
           };
         },
         async preparePlugins(url) {
+          var _a2;
           const [typeStrategy, drmStrategy, abrStrategy] = await Promise.all([
             getTypeStrategy(
               {
                 ...finalOptions,
                 url
               },
-              player
+              player,
+              i18n
             ),
             getDrmStrategy(
               {
@@ -22756,7 +22808,8 @@ var __publicField = (obj, key, value) => {
               ...plugins ?? [],
               ...drmPlugins ?? [],
               ...abrPlugins ?? []
-            ]
+            ],
+            useSrc: !((_a2 = typeStrategy.plugins) == null ? void 0 : _a2.length)
           };
         }
       },