@volcengine/veplayer 2.6.2 → 2.7.0-rc.0

package/esm/veplayer.vod.d.ts

@@ -1,7 +1,6 @@
 import Player from "xgplayer";
 import { IXGI18nText, Plugin, IPluginOptions } from "xgplayer";
 import { IPlayerOptions as PlayerOptions } from "xgplayer";
-import { IDefinition as XGDefinition } from "xgplayer";
 import { default as Player$0 } from "xgplayer";
 import { IError as XGError } from "xgplayer";
 import { IBasePluginOptions as XGPluginOptions } from "xgplayer";
@@ -92,8 +91,8 @@ interface DefinitionUrl {
     url: string;
     next: DefinitionUrl | null;
 }
-declare class Definition implements XGDefinition {
-    readonly definition: string;
+declare class Definition {
+    readonly definition?: string;
     readonly source: Source;
     readonly text?: Record<Lang, string> | string;
     readonly fallbackUrl: DefinitionUrl;
@@ -101,7 +100,7 @@ declare class Definition implements XGDefinition {
     private _currentUrlRef;
     constructor(definitionSetting: {
         url: string;
-        definition: string;
+        definition?: string;
         source: Source;
         text?: Record<Lang, string> | string;
         fallbackUrls?: string[];
@@ -139,7 +138,7 @@ interface ExposedDefinition {
      * @brief The resolution ID. This value must be unique.
      *
      */
-    definition: string;
+    definition?: string;
     /** {zh}
      * @brief 清晰度展示名称。可设置多语言 `{text: {'zh-cn': '高清', 'en': 'HD'}}`。
      */
@@ -155,6 +154,7 @@ interface ExposedDefinition {
      *
      */
     fallbackUrls?: string[];
+    type?: string;
 }
 /** {zh}
  * @list option
@@ -1482,9 +1482,10 @@ type PrepareResult = {
     options?: Partial<VePlayerBaseOptions>;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     plugins?: any[];
+    protocol?: string;
     useSrc?: boolean;
 };
-type PreparePlugins = (url: string) => Promise<PrepareResult> | undefined;
+type PreparePlugins = (url?: string) => Promise<PrepareResult | undefined> | undefined;
 /** {zh}
  * @detail option
  * @brief 视频的实际编码格式。如果您在 degradation 设置了 SoftFirst 属性（即硬解不支持降级软解），建议您传入该参数，省去探测实际编码格式的操作。
@@ -1571,6 +1572,7 @@ declare class VePlayerBase {
     private _events;
     private _customMedia?;
     private _errorCallback;
+    private _beforeFallbackError;
     /** {zh}
      * @hidden
      */
@@ -1721,7 +1723,7 @@ declare class VePlayerBase {
     /** {en}
      * @brief Gets the current resolution ID.
      */
-    get definition(): string;
+    get definition(): string | undefined;
     /** {zh}
      * @brief 获取和设置播放器的跨域配置信息，更多信息参考 [crossorigin](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/crossorigin) 属性介绍。
      */
@@ -2333,8 +2335,8 @@ declare namespace strategy {
         next: DefinitionUrl | null;
     }
     function arrayToList(urls?: string[]): DefinitionUrl;
-    class Definition implements XGDefinition {
-        readonly definition: string;
+    class Definition {
+        readonly definition?: string;
         readonly source: Source;
         readonly text?: Record<Lang, string> | string;
         readonly fallbackUrl: DefinitionUrl;
@@ -2342,7 +2344,7 @@ declare namespace strategy {
         private _currentUrlRef;
         constructor(definitionSetting: {
             url: string;
-            definition: string;
+            definition?: string;
             source: Source;
             text?: Record<Lang, string> | string;
             fallbackUrls?: string[];
@@ -2380,7 +2382,7 @@ declare namespace strategy {
          * @brief The resolution ID. This value must be unique.
          *
          */
-        definition: string;
+        definition?: string;
         /** {zh}
          * @brief 清晰度展示名称。可设置多语言 `{text: {'zh-cn': '高清', 'en': 'HD'}}`。
          */
@@ -2396,6 +2398,7 @@ declare namespace strategy {
          *
          */
         fallbackUrls?: string[];
+        type?: string;
     }
     /** {zh}
      * @list option
@@ -3783,9 +3786,10 @@ declare namespace strategy {
         options?: Partial<VePlayerBaseOptions>;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         plugins?: any[];
+        protocol?: string;
         useSrc?: boolean;
     };
-    type PreparePlugins = (url: string) => Promise<PrepareResult> | undefined;
+    type PreparePlugins = (url?: string) => Promise<PrepareResult | undefined> | undefined;
     /** {zh}
      * @detail option
      * @brief 视频的实际编码格式。如果您在 degradation 设置了 SoftFirst 属性（即硬解不支持降级软解），建议您传入该参数，省去探测实际编码格式的操作。
@@ -3965,13 +3969,6 @@ declare namespace strategy {
     function detectCodec(url: string): Promise<"unknown" | Codec>;
     function isSoftDecode(options: VePlayerBaseOptions, currentCodec?: Codec | "unknown"): Promise<boolean>;
     function combineOptions<T = VePlayerBaseOptions>(strategyList: (Strategy<T> | undefined)[]): Partial<T>;
-    const getHlsStrategy: (options: VePlayerBaseOptions) => Promise<{
-        options?: undefined;
-        plugins?: undefined;
-    } | {
-        options: Partial<VePlayerBaseOptions>;
-        plugins: any[];
-    }>;
 }
 declare namespace error {
     const EN: {

package/esm/veplayer.vod.development.js

@@ -11733,14 +11733,6 @@ class Sources extends OptionsIcon {
     const sourceManager = args.player.config.sources.sourceManager;
     args.config.list = sourceManager.sources;
   }
-  afterCreate() {
-    super.afterCreate();
-    if (this.config.sourceManager.sources.length < 2) {
-      this.hide();
-    } else {
-      this.renderItemList();
-    }
-  }
   registerIcons() {
     return {
       source: { icon: SourceIcon }
@@ -11749,6 +11741,10 @@ class Sources extends OptionsIcon {
   renderItemList() {
     const { sources, source } = this.config.sourceManager;
     const i18nManager = this.player.config.i18nManager;
+    if (sources.length < 2) {
+      this.hide();
+      return;
+    }
     const renderItems = sources.map((source2) => {
       return {
         ...source2,
@@ -12430,6 +12426,10 @@ class DefinitionPlugin extends OptionsIcon {
     var _a, _b;
     const sourceManager = this.player.config.sourceManager;
     const definitions = ((_a = sourceManager.source) == null ? void 0 : _a.definitions) ?? [];
+    if (definitions.length < 2) {
+      this.hide();
+      return;
+    }
     const renderItems = definitions.map((definition) => {
       const showItem = {
         url: definition.url,
@@ -14064,10 +14064,12 @@ class VePlayerBase {
     __publicField(this, "_events", {});
     __publicField(this, "_customMedia");
     __publicField(this, "_errorCallback");
+    __publicField(this, "_beforeFallbackError");
     var _a, _b, _c, _d, _e, _f;
     this._sourceManager = options.sourceManager;
     this._preparePlugins = options.preparePlugins;
     this._previousPrepareResult = options.prepareResult;
+    this._beforeFallbackError = options.beforeFallbackError;
     this._i18nManager = options.i18nManager ?? new VeI18n({
       i18n: options.i18n
     });
@@ -14092,6 +14094,9 @@ class VePlayerBase {
       ...DEFAULT_OPTIONS,
       ...xgOptions,
       definition: {
+        // TODO: ts
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
         list: ((_d = this._sourceManager.source) == null ? void 0 : _d.definitions) ?? [],
         defaultDefinition: (_e = this._sourceManager.definition) == null ? void 0 : _e.definition,
         ...options.definition ?? {}
@@ -14276,7 +14281,7 @@ class VePlayerBase {
    * @brief Retrieve the player SDK version number.
    */
   get playerVersion() {
-    return "2.6.2";
+    return "2.7.0-rc.0";
   }
   /** {zh}
    * @brief 获取当前播放视频的清晰度唯一标识（definition）。
@@ -14762,13 +14767,18 @@ class VePlayerBase {
    * @hidden
    */
   async prepare(url) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const result = await ((_a = this._preparePlugins) == null ? void 0 : _a.call(this, url));
-    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);
+    let isSameProtocol;
+    if ((result == null ? void 0 : result.protocol) && ((_b = this._previousPrepareResult) == null ? void 0 : _b.protocol)) {
+      isSameProtocol = result.protocol === ((_c = this._previousPrepareResult) == null ? void 0 : _c.protocol);
+    } else {
+      const newUrl = ((_d = result == null ? void 0 : result.options) == null ? void 0 : _d.url) ?? url;
+      const oldUrl = (_f = (_e = this._player) == null ? void 0 : _e.config) == null ? void 0 : _f.url;
+      isSameProtocol = oldUrl && getStreamType(newUrl) === getStreamType(oldUrl);
+    }
     if (!isSameProtocol) {
-      (_f = (_e = this._previousPrepareResult) == null ? void 0 : _e.plugins) == null ? void 0 : _f.forEach((plugin) => {
+      (_h = (_g = this._previousPrepareResult) == null ? void 0 : _g.plugins) == null ? void 0 : _h.forEach((plugin) => {
         this._player.unRegisterPlugin(plugin.pluginName);
       });
     }
@@ -14777,7 +14787,7 @@ class VePlayerBase {
       this._player.setConfig(result.options);
     }
     return {
-      plugins: isSameProtocol ? [] : (_g = result == null ? void 0 : result.plugins) == null ? void 0 : _g.map((plugin) => {
+      plugins: isSameProtocol ? [] : (_i = result == null ? void 0 : result.plugins) == null ? void 0 : _i.map((plugin) => {
         return this._player.registerPlugin(plugin);
       }),
       options: result == null ? void 0 : result.options,
@@ -14790,11 +14800,18 @@ class VePlayerBase {
     const preUrl = this._sourceManager.url;
     const url = this._sourceManager.fallback();
     if (!url) {
+      const transformedError = transform$1(err, this._i18nManager);
+      try {
+        const { canEmitError } = await this._beforeFallbackError(
+          transformedError
+        );
+        if (!canEmitError) {
+          return;
+        }
+      } catch (error2) {
+      }
       this._player.removeClass(STATE_CLASS.ENTER);
-      this.emit(
-        Events.FALLBACK_ERROR,
-        transform$1(err, this._i18nManager)
-      );
+      this.emit(Events.FALLBACK_ERROR, transformedError);
       return;
     }
     this._player.once("canplay", () => {
@@ -14874,7 +14891,6 @@ class VePlayerBase {
     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, () => {