@volcengine/veplayer 2.4.0 → 2.5.0-rc.0

package/esm/veplayer.live.development.js

@@ -1312,7 +1312,7 @@ var VERSION_REG = {
   android: /(Android)\s([\d.]+)/,
   ios: /(Version)\/([\d.]+)/
 };
-var H264_MIMETYPES = ["avc1.42E01E, mp4a.40.2", "avc1.58A01E, mp4a.40.2", "avc1.4D401E, mp4a.40.2", "avc1.64001E, mp4a.40.2", "avc1.42E01E", "mp4v.20.8", "avc1.42E01E, mp4a.40.2", "avc1.58A01E, mp4a.40.2", "avc1.4D401E, mp4a.40.2", "avc1.64001E, mp4a.40.2", "mp4v.20.8, mp4a.40.2", "mp4v.20.240, mp4a.40.2"];
+var H264_MIMETYPES = ["avc1.42E01E, mp4a.40.2", "avc1.58A01E, mp4a.40.2", "avc1.4D401E, mp4a.40.2", "avc1.64001E, mp4a.40.2", "avc1.42E01E", "mp4v.20.8", "mp4v.20.8, mp4a.40.2", "mp4v.20.240, mp4a.40.2"];
 var sniffer$1 = {
   get device() {
     var r2 = sniffer$1.os;
@@ -1457,7 +1457,7 @@ var sniffer$1 = {
     }
   }
 };
-var version = "3.0.19-rc.0";
+var version = "3.0.20-alpha.4";
 var ERROR_TYPE_MAP = {
   1: "media",
   2: "media",
@@ -2427,8 +2427,7 @@ function hook(hookName, handler) {
     }
     if (this.__hooks && this.__hooks[hookName]) {
       try {
-        var _this$__hooks$hookNam;
-        var preRet = (_this$__hooks$hookNam = this.__hooks[hookName]).call.apply(_this$__hooks$hookNam, [this, this].concat(Array.prototype.slice.call(arguments)));
+        var preRet = runHooks(this, hookName, handler);
         if (preRet) {
           if (preRet.then) {
             preRet.then(function(isContinue) {
@@ -2453,6 +2452,19 @@ function hook(hookName, handler) {
     }
   }.bind(this);
 }
+function findHookIndex(hookName, handler) {
+  var __hooks = this.__hooks;
+  if (!__hooks || !Array.isArray(__hooks[hookName])) {
+    return -1;
+  }
+  var hookHandlers = __hooks[hookName];
+  for (var i2 = 0; i2 < hookHandlers.length; i2++) {
+    if (hookHandlers[i2] === handler) {
+      return i2;
+    }
+  }
+  return -1;
+}
 function useHooks(hookName, handler) {
   var __hooks = this.__hooks;
   if (!__hooks) {
@@ -2462,7 +2474,12 @@ function useHooks(hookName, handler) {
     console.warn("has no supported hook which name [".concat(hookName, "]"));
     return false;
   }
-  __hooks && (__hooks[hookName] = handler);
+  if (!Array.isArray(__hooks[hookName])) {
+    __hooks[hookName] = [];
+  }
+  if (findHookIndex.call(this, hookName, handler) === -1) {
+    __hooks[hookName].push(handler);
+  }
   return true;
 }
 function removeHooks(hookName, handler) {
@@ -2470,6 +2487,13 @@ function removeHooks(hookName, handler) {
   if (!__hooks) {
     return;
   }
+  if (Array.isArray(__hooks[hookName])) {
+    var hooks = __hooks[hookName];
+    var index = findHookIndex.call(this, hookName, handler);
+    if (index !== -1) {
+      hooks.splice(index, 1);
+    }
+  }
   delete __hooks[hookName];
 }
 function usePluginHooks(pluginName) {
@@ -2517,18 +2541,30 @@ function runHooks(obj, hookName, handler) {
   for (var _len5 = arguments.length, args = new Array(_len5 > 3 ? _len5 - 3 : 0), _key5 = 3; _key5 < _len5; _key5++) {
     args[_key5 - 3] = arguments[_key5];
   }
-  if (obj.__hooks && obj.__hooks[hookName]) {
-    var _obj$__hooks$hookName;
-    var ret = (_obj$__hooks$hookName = obj.__hooks[hookName]).call.apply(_obj$__hooks$hookName, [obj, obj].concat(args));
-    if (ret && ret.then) {
-      ret.then(function(data) {
-        return data === false ? null : handler.call.apply(handler, [obj, obj].concat(args));
-      }).catch(function(e3) {
-        console.warn("[runHooks]".concat(hookName, " reject"), e3.message);
-      });
-    } else if (ret !== false) {
-      return handler.call.apply(handler, [obj, obj].concat(args));
-    }
+  if (obj.__hooks && Array.isArray(obj.__hooks[hookName])) {
+    var hooks = obj.__hooks[hookName];
+    var index = -1;
+    var runHooksRecursive = function runHooksRecursive2(obj2, hookName2, handler2) {
+      for (var _len6 = arguments.length, args2 = new Array(_len6 > 3 ? _len6 - 3 : 0), _key6 = 3; _key6 < _len6; _key6++) {
+        args2[_key6 - 3] = arguments[_key6];
+      }
+      index++;
+      if (hooks.length === 0 || index === hooks.length) {
+        return handler2.call.apply(handler2, [obj2, obj2].concat(args2));
+      }
+      var hook2 = hooks[index];
+      var ret = hook2.call.apply(hook2, [obj2, obj2].concat(args2));
+      if (ret && ret.then) {
+        return ret.then(function(data) {
+          return data === false ? null : runHooksRecursive2.apply(void 0, [obj2, hookName2, handler2].concat(args2));
+        }).catch(function(e3) {
+          console.warn("[runHooks]".concat(hookName2, " reject"), e3.message);
+        });
+      } else if (ret !== false) {
+        return runHooksRecursive2.apply(void 0, [obj2, hookName2, handler2].concat(args2));
+      }
+    };
+    return runHooksRecursive.apply(void 0, [obj, hookName, handler].concat(args));
   } else {
     return handler.call.apply(handler, [obj, obj].concat(args));
   }
@@ -4485,10 +4521,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       }
       var _this$config = _this.config, autoplay2 = _this$config.autoplay, defaultPlaybackRate = _this$config.defaultPlaybackRate;
       XG_DEBUG.logInfo("player", "canPlayFunc, startTime", _this.__startTime);
-      if (_this.__startTime > 0 && _this.duration > 0) {
-        _this.currentTime = _this.__startTime > _this.duration ? _this.duration : _this.__startTime;
-        _this.__startTime = -1;
-      }
+      _this._seekToStartTime();
       _this.playbackRate = defaultPlaybackRate;
       (autoplay2 || _this._useAutoplay) && _this.mediaPlay();
       _this.off(CANPLAY, _this.canPlayFunc);
@@ -4578,6 +4611,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
     _this.waitTimer = null;
     _this.handleSource = true;
     _this._state = STATES.INITIAL;
+    _this.isAd = false;
     _this.isError = false;
     _this._hasStart = false;
     _this.isSeeking = false;
@@ -4962,7 +4996,8 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       _pConfig.position && (options.position = _pConfig.position);
       var position = options.position ? options.position : options.config && options.config.position || PLUFGIN.defaultConfig && PLUFGIN.defaultConfig.position;
       if (!options.root && typeof position === "string" && position.indexOf("controls") > -1) {
-        return this.controls && this.controls.registerPlugin(PLUFGIN, options, PLUFGIN.pluginName);
+        var _this$controls;
+        return (_this$controls = this.controls) === null || _this$controls === void 0 ? void 0 : _this$controls.registerPlugin(PLUFGIN, options, PLUFGIN.pluginName);
       }
       if (!options.root) {
         options.root = this._getRootByPosition(position);
@@ -5110,10 +5145,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
           reject(e3);
         };
         var _canplay = function _canplay2() {
-          if (_this9.duration > 0 && _this9.__startTime > 0) {
-            _this9.currentTime = _this9.__startTime;
-            _this9.__startTime = -1;
-          }
+          _this9._seekToStartTime();
           if (isPaused) {
             _this9.pause();
           }
@@ -5734,11 +5766,17 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
   }, {
     key: "onLoadeddata",
     value: function onLoadeddata() {
+      var _this22 = this;
       this.isError = false;
       this.isSeeking = false;
-      if (this.__startTime > 0 && this.duration > 0) {
-        this.currentTime = this.__startTime;
-        this.__startTime = -1;
+      if (this.__startTime > 0) {
+        if (this.duration > 0) {
+          this._seekToStartTime();
+        } else {
+          this.once(DURATION_CHANGE, function() {
+            _this22._seekToStartTime();
+          });
+        }
       }
     }
   }, {
@@ -5807,27 +5845,27 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
   }, {
     key: "onWaiting",
     value: function onWaiting() {
-      var _this22 = this;
+      var _this23 = this;
       if (this.waitTimer) {
         util$1.clearTimeout(this, this.waitTimer);
       }
       this.updateAcc("waiting");
       this.waitTimer = util$1.setTimeout(this, function() {
-        _this22.addClass(STATE_CLASS.LOADING);
-        _this22.emit(LOADING);
-        util$1.clearTimeout(_this22, _this22.waitTimer);
-        _this22.waitTimer = null;
+        _this23.addClass(STATE_CLASS.LOADING);
+        _this23.emit(LOADING);
+        util$1.clearTimeout(_this23, _this23.waitTimer);
+        _this23.waitTimer = null;
       }, this.config.minWaitDelay);
     }
   }, {
     key: "onPlaying",
     value: function onPlaying() {
-      var _this23 = this;
+      var _this24 = this;
       this.isError = false;
       var NO_START = STATE_CLASS.NO_START, PAUSED = STATE_CLASS.PAUSED, ENDED2 = STATE_CLASS.ENDED, ERROR2 = STATE_CLASS.ERROR, REPLAY2 = STATE_CLASS.REPLAY, LOADING2 = STATE_CLASS.LOADING;
       var clsList = [NO_START, PAUSED, ENDED2, ERROR2, REPLAY2, LOADING2];
       clsList.forEach(function(cls) {
-        _this23.removeClass(cls);
+        _this24.removeClass(cls);
       });
       if (!this._accPlayed.t && !this.paused && !this.ended) {
         this._accPlayed.t = (/* @__PURE__ */ new Date()).getTime();
@@ -5988,14 +6026,14 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
   }, {
     key: "setConfig",
     value: function setConfig(config) {
-      var _this24 = this;
+      var _this25 = this;
       if (!config) {
         return;
       }
       Object.keys(config).map(function(key) {
         if (key !== "plugins") {
-          _this24.config[key] = config[key];
-          var plugin = _this24.plugins[key.toLowerCase()];
+          _this25.config[key] = config[key];
+          var plugin = _this25.plugins[key.toLowerCase()];
           if (plugin && util$1.typeOf(plugin.setConfig) === "Function") {
             plugin.setConfig(config[key]);
           }
@@ -6005,20 +6043,20 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
   }, {
     key: "playNext",
     value: function playNext(config) {
-      var _this25 = this;
+      var _this26 = this;
       this.resetState();
       this.setConfig(config);
       this._currentTime = 0;
       this._duration = 0;
       runHooks(this, "playnext", function() {
-        _this25.start();
-        _this25.emit(PLAYNEXT, config);
+        _this26.start();
+        _this26.emit(PLAYNEXT, config);
       });
     }
   }, {
     key: "resize",
     value: function resize() {
-      var _this26 = this;
+      var _this27 = this;
       if (!this.media) {
         return;
       }
@@ -6058,7 +6096,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       }
       if (!this.fullscreen && !this.cssfullscreen) {
         Object.keys(_style).forEach(function(key) {
-          _this26.root.style[key] = _style[key];
+          _this27.root.style[key] = _style[key];
         });
       }
       if (videoFillMode === "fillHeight" && fit < videoFit || videoFillMode === "fillWidth" && fit > videoFit) {
@@ -6100,6 +6138,14 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
         url
       };
     }
+  }, {
+    key: "_seekToStartTime",
+    value: function _seekToStartTime() {
+      if (this.__startTime > 0 && this.duration > 0) {
+        this.currentTime = this.__startTime > this.duration ? this.duration : this.__startTime;
+        this.__startTime = -1;
+      }
+    }
   }, {
     key: "state",
     get: function get() {
@@ -6150,15 +6196,15 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       return this.config.definition.list || [];
     },
     set: function set(list) {
-      var _this27 = this;
+      var _this28 = this;
       var definition = this.config.definition;
       var curDef = null;
       var targetDef = null;
       definition.list = list;
       this.emit("resourceReady", list);
       list.forEach(function(item) {
-        var _this27$curDefinition;
-        if (((_this27$curDefinition = _this27.curDefinition) === null || _this27$curDefinition === void 0 ? void 0 : _this27$curDefinition.definition) === item.definition) {
+        var _this28$curDefinition;
+        if (((_this28$curDefinition = _this28.curDefinition) === null || _this28$curDefinition === void 0 ? void 0 : _this28$curDefinition.definition) === item.definition) {
           curDef = item;
         }
         if (definition.defaultDefinition === item.definition) {
@@ -6922,7 +6968,7 @@ var Start = /* @__PURE__ */ function(_Plugin) {
       var className = _this.config.mode === "auto" ? "auto-hide" : "hide";
       util$1.addClass(_this.root, className);
       _this.autoPlayStart = true;
-      _this.onPlayPause("play");
+      _this.toggleTo("play");
     });
     _this.autoPlayStart = false;
     return _this;
@@ -6930,9 +6976,19 @@ var Start = /* @__PURE__ */ function(_Plugin) {
   _createClass$1(Start2, [{
     key: "afterCreate",
     value: function afterCreate() {
+      var playerConfig = this.playerConfig;
+      this.initIcons();
+      this.listenEvents();
+      this.bindClickEvents();
+      if (!playerConfig.autoplay) {
+        this.show();
+      }
+    }
+  }, {
+    key: "listenEvents",
+    value: function listenEvents() {
       var _this2 = this;
       var player = this.player, playerConfig = this.playerConfig;
-      this.initIcons();
       this.once(READY, function() {
         if (playerConfig) {
           if (playerConfig.lang && playerConfig.lang === "en") {
@@ -6943,9 +6999,6 @@ var Start = /* @__PURE__ */ function(_Plugin) {
         }
       });
       this.on(AUTOPLAY_STARTED, this.onAutoplayStart);
-      if (!playerConfig.autoplay) {
-        this.show();
-      }
       this.on(AUTOPLAY_PREVENTED, function() {
         var className = _this2.config.mode === "auto" ? "auto-hide" : "hide";
         _this2.setAttr("data-state", "play");
@@ -6953,20 +7006,25 @@ var Start = /* @__PURE__ */ function(_Plugin) {
         _this2.show();
       });
       this.on(PLAY, function() {
-        _this2.onPlayPause("play");
+        _this2.toggleTo("play");
       });
       this.on(PAUSE, function() {
-        _this2.onPlayPause("pause");
+        _this2.toggleTo("pause");
       });
       this.on(RESET, function() {
         _this2.onPlayerReset();
       });
+    }
+  }, {
+    key: "bindClickEvents",
+    value: function bindClickEvents() {
+      var _this3 = this;
       this.clickHandler = this.hook("startClick", this.switchPausePlay, {
         pre: function pre(e3) {
           e3.cancelable && e3.preventDefault();
           e3.stopPropagation();
-          var paused = _this2.player.paused;
-          _this2.emitUserAction(e3, "switch_play_pause", {
+          var paused = _this3.player.paused;
+          _this3.emitUserAction(e3, "switch_play_pause", {
             props: "paused",
             from: paused,
             to: !paused
@@ -7028,17 +7086,17 @@ var Start = /* @__PURE__ */ function(_Plugin) {
   }, {
     key: "animate",
     value: function animate(endShow) {
-      var _this3 = this;
+      var _this4 = this;
       this._animateId = addAnimate("pauseplay", 400, {
         start: function start() {
-          util$1.addClass(_this3.root, "interact");
-          _this3.show();
-          _this3.switchStatus(true);
+          util$1.addClass(_this4.root, "interact");
+          _this4.show();
+          _this4.switchStatus(true);
         },
         end: function end() {
-          util$1.removeClass(_this3.root, "interact");
-          !endShow && _this3.hide();
-          _this3._animateId = null;
+          util$1.removeClass(_this4.root, "interact");
+          !endShow && _this4.hide();
+          _this4._animateId = null;
         }
       });
     }
@@ -7068,6 +7126,11 @@ var Start = /* @__PURE__ */ function(_Plugin) {
   }, {
     key: "onPlayPause",
     value: function onPlayPause(status) {
+      this.toggleTo(status);
+    }
+  }, {
+    key: "toggleTo",
+    value: function toggleTo(status) {
       var config = this.config, player = this.player;
       if (!player || player.state < STATES.RUNNING || !this.autoPlayStart) {
         return;
@@ -9398,29 +9461,56 @@ var Play$1 = /* @__PURE__ */ function(_IconPlugin) {
   _inherits(Play2, _IconPlugin);
   var _super = _createSuper(Play2);
   function Play2() {
+    var _this;
     _classCallCheck(this, Play2);
-    return _super.apply(this, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _super.call.apply(_super, [this].concat(args));
+    _defineProperty$1(_assertThisInitialized(_this), "btnClick", function(e3) {
+      e3.preventDefault();
+      e3.stopPropagation();
+      var _assertThisInitialize = _assertThisInitialized(_this), player = _assertThisInitialize.player;
+      _this.emitUserAction(e3, "switch_play_pause", {
+        prop: "paused",
+        from: player.paused,
+        to: !player.paused
+      });
+      if (player.ended) {
+        player.replay();
+      } else if (player.paused) {
+        player.play();
+        _this.animate(false);
+      } else {
+        player.pause();
+        _this.animate(true);
+      }
+      return false;
+    });
+    return _this;
   }
   _createClass$1(Play2, [{
     key: "afterCreate",
     value: function afterCreate() {
-      var _this = this;
       _get(_getPrototypeOf(Play2.prototype), "afterCreate", this).call(this);
-      var player = this.player, config = this.config;
+      var config = this.config;
       if (config.disable) {
         return;
       }
       this.initIcons();
-      this.btnClick = this.btnClick.bind(this);
       this.bind(["touchend", "click"], this.btnClick);
-      this.on([PAUSE, ERROR, EMPTIED], function() {
-        _this.animate(player.paused);
-      });
-      this.on(PLAY, function() {
-        _this.animate(player.paused);
-      });
+      this.listenEvents();
       this.animate(true);
     }
+  }, {
+    key: "listenEvents",
+    value: function listenEvents() {
+      var _this2 = this;
+      var player = this.player;
+      this.on([PLAY, PAUSE, ERROR, EMPTIED], function() {
+        _this2.animate(player.paused);
+      });
+    }
   }, {
     key: "registerIcons",
     value: function registerIcons() {
@@ -9435,28 +9525,6 @@ var Play$1 = /* @__PURE__ */ function(_IconPlugin) {
         }
       };
     }
-  }, {
-    key: "btnClick",
-    value: function btnClick(e3) {
-      e3.preventDefault();
-      e3.stopPropagation();
-      var player = this.player;
-      this.emitUserAction(e3, "switch_play_pause", {
-        prop: "paused",
-        from: player.paused,
-        to: !player.paused
-      });
-      if (player.ended) {
-        player.replay();
-      } else if (player.paused) {
-        player.play();
-        this.animate(false);
-      } else {
-        player.pause();
-        this.animate(true);
-      }
-      return false;
-    }
   }, {
     key: "initIcons",
     value: function initIcons() {
@@ -11575,10 +11643,10 @@ class OptionsIcon extends Plugin {
     const { controls } = this.player;
     const { listType } = this.config;
     if (isActive) {
-      listType && MODAL_TYPES.includes(listType) ? controls.blur() : controls.focus();
+      listType && MODAL_TYPES.includes(listType) ? controls == null ? void 0 : controls.blur() : controls == null ? void 0 : controls.focus();
       this.optionsList && this.optionsList.show();
     } else {
-      listType && MODAL_TYPES.includes(listType) ? controls.focus() : controls.focusAwhile();
+      listType && MODAL_TYPES.includes(listType) ? controls == null ? void 0 : controls.focus() : controls == null ? void 0 : controls.focusAwhile();
       this.optionsList && this.optionsList.hide();
     }
     this._isActive = isActive;
@@ -13045,6 +13113,7 @@ class Autoplay extends Plugin {
   }
   // 有音量修改，取消静音
   handleVolumechange() {
+    this._state.mode = this.player.muted ? 1 : 0;
     if (!this._state.showUnmuteBt)
       return;
     this._state.showUnmuteBt = false;
@@ -13742,7 +13811,7 @@ class VePlayerBase {
    * @returns
    */
   get playerVersion() {
-    return "2.4.0";
+    return "2.5.0-rc.0";
   }
   /** {zh}
    * @brief 获取当前播放视频的清晰度唯一标识（definition）。
@@ -21994,9 +22063,9 @@ class Logger extends Plugin {
       user_id: this._userId,
       device_id: this._deviceId,
       ext: {
-        veplayer_version: "2.4.0",
+        veplayer_version: "2.5.0-rc.0",
         flv_version: "3.0.19-rc.0",
-        hls_version: "3.0.19-rc.0",
+        hls_version: "3.0.20-alpha.2",
         rts_version: "0.2.1-alpha.0"
       }
     });