@volcengine/veplayer 2.4.0-rc.3 → 2.4.0-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volcengine/veplayer",
-  "version": "2.4.0-rc.3",
+  "version": "2.4.0-rc.5",
   "main": "./umd/veplayer.production.js",
   "module": "./esm/veplayer.production.js",
   "browser": "./umd/veplayer.production.js",

package/umd/index.d.ts

@@ -1729,6 +1729,11 @@ declare class VePlayerBase {
      * @brief Gets the current playback source ID.
      */
     get source(): string | undefined;
+    /** {zh}
+     * 获取播放器版本号
+     * @returns
+     */
+    get playerVersion(): string;
     /** {zh}
      * @brief 获取当前播放视频的清晰度唯一标识（definition）。
      */
@@ -1851,6 +1856,12 @@ declare class VePlayerBase {
          *
          */
         fallbackToFirstDefinition?: boolean;
+        /** {zh}
+         * @brief 是否无缝切换
+         * - true: 无缝切换
+         * - false: 非无缝切换
+         * @default false
+         */
         seamless?: boolean;
     }): Promise<ExposedDefinition>;
     /** {zh}
@@ -2020,6 +2031,11 @@ declare class VePlayerBase {
          */
         ignorePaused?: boolean;
     }): void;
+    /** {zh}
+     * @brief 判断浏览器是否支持播放格式
+     * @param type 播放格式
+     * @returns
+     */
     canPlayType(type: string): boolean;
     /** {zh}
      * @brief 调用此方法进入系统全屏状态。如果该方法调用的时候处于网页全屏状态会自动退出网页全屏，下发事件 `Events.FULLSCREEN_CHANGE`。
@@ -4609,9 +4625,9 @@ declare namespace event {
         AUTOPLAY_SUCCESS: string;
         ERROR_REFRESH_CLICK: string;
         SOURCE_CHANGE: string;
-        SWITCH_DEFINITION_START: string;
-        SWITCH_DEFINITION_SUCCESS: string;
-        DOWN_DEFINITION: string;
+        ABR_SWITCH_START: string;
+        ABR_SWITCH_SUCCESS: string;
+        ABR_SWITCH_FAILED: string;
     };
     const Events: {
         SEI: string;
@@ -4637,9 +4653,9 @@ declare namespace event {
         AUTOPLAY_SUCCESS: string;
         ERROR_REFRESH_CLICK: string;
         SOURCE_CHANGE: string;
-        SWITCH_DEFINITION_START: string;
-        SWITCH_DEFINITION_SUCCESS: string;
-        DOWN_DEFINITION: string;
+        ABR_SWITCH_START: string;
+        ABR_SWITCH_SUCCESS: string;
+        ABR_SWITCH_FAILED: string;
         REPLAY: string;
         ERROR: string;
         PLAY: string;

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

@@ -887,7 +887,7 @@ var __publicField = (obj, key, value) => {
       live_sdk_version: getPlayerCore(player) || player.hlsOps ? "2" : "-1",
       player_sdk_version: player.version,
       // eslint-disable-next-line no-undef
-      logger_version: "1.1.0-alpha.7",
+      logger_version: "1.1.0-alpha.10",
       // 由rollup 在编译时注入
       report_version: "5",
       product_line: options.product_line,
@@ -1691,9 +1691,29 @@ var __publicField = (obj, key, value) => {
           play_current_time: _this7.player.currentTime
         }, _this7.videoSize));
         return Promise.resolve(_this7.getRtcStats(playedTime, first)).then(function(stats) {
-          _this7.logmanager.push(Object.assign({}, _this7.log.playing, _objectSpread2({
+          var flvStats = {};
+          if (_this7.core) {
+            if (_this7.core.getStats) {
+              var _ref2 = _this7.core.getStats() || {}, bitrate = _ref2.bitrate, avgSpeed = _ref2.avgSpeed;
+              Object.assign(flvStats, {
+                bitrate,
+                avg_speed: avgSpeed,
+                rate: avgSpeed / bitrate
+              });
+            }
+            if (_this7.core.getNetWorkInfo) {
+              var _this7$core$core;
+              var _ref3 = _this7.core.getNetWorkInfo() || {}, lostRate = _ref3.lostRate;
+              var _ref4 = ((_this7$core$core = _this7.core.core) === null || _this7$core$core === void 0 ? void 0 : _this7$core$core._opts) || {}, networkEvaluateInterval = _ref4.networkEvaluateInterval;
+              Object.assign(flvStats, {
+                lostRate,
+                networkEvaluateInterval
+              });
+            }
+          }
+          _this7.logmanager.push(Object.assign({}, _this7.log.playing, _objectSpread2(_objectSpread2({
             play_time: first ? 0 : playedTime
-          }, stats)), true);
+          }, stats), flvStats)), true);
           _this7.log.playing.download_speed_array = [];
           _this7.log.playing.stall_time = 0;
           _this7.log.playing.stall_count = 0;
@@ -1714,7 +1734,7 @@ var __publicField = (obj, key, value) => {
         _this9.player.off("playing", _this9.handlePlayerPlaying);
         _this9.player.off("timeupdate", _this9.handlePlayerPlaying);
         if (_this9.core) {
-          var _ref2 = _this9.core.getStats() || {}, fps = _ref2.fps;
+          var _ref5 = _this9.core.getStats() || {}, fps = _ref5.fps;
           _this9.commonParams.fps = fps;
         }
         return Promise.resolve(_this9.reportPlaying(true)).then(function() {
@@ -1725,7 +1745,7 @@ var __publicField = (obj, key, value) => {
               var _temp4 = function() {
                 if (Math.abs(Date.now() - _this9.log.playing.timestamp - timer) < 100 || Date.now() - _this9.log.playing.timestamp >= timer) {
                   var _temp5 = function() {
-                    if (!_this9.player.video) {
+                    if (!_this9.player || !_this9.player.video) {
                       _this9.destroyFunc();
                     } else {
                       var _temp6 = function() {
@@ -1958,24 +1978,30 @@ var __publicField = (obj, key, value) => {
         this.player.off("bufferappend", this.handleBufferAppend);
         this.player.off("core_event", this.handleCoreEvent);
         this.player.off("degrade", this.handleDegrade);
-        this.clearPlayingInterval();
-        this.clearStallTimer();
-        this.clearPlayResultTimer();
-        clearTimeout(this.collectDownloadSpeedTimer);
         this._player = null;
       }
-    };
-    _proto2.handleUserLeave = function handleUserLeave() {
-      if (this.destroyed || !this.started) {
-        return;
-      }
-      this.destroyed = true;
-      this.updatePlayStopParams();
-      this.reportPlayStop();
       this.clearPlayingInterval();
       this.clearStallTimer();
+      this.clearPlayResultTimer();
       clearTimeout(this.collectDownloadSpeedTimer);
-      this.removeWindowListener();
+    };
+    _proto2.handleUserLeave = function handleUserLeave() {
+      try {
+        var _this15 = this;
+        if (_this15.destroyed || !_this15.started) {
+          return Promise.resolve();
+        }
+        _this15.destroyed = true;
+        return Promise.resolve(_this15.updatePlayStopParams()).then(function() {
+          _this15.reportPlayStop();
+          _this15.clearPlayingInterval();
+          _this15.clearStallTimer();
+          clearTimeout(_this15.collectDownloadSpeedTimer);
+          _this15.removeWindowListener();
+        });
+      } catch (e2) {
+        return Promise.reject(e2);
+      }
     };
     _proto2.saveBuffered = function saveBuffered() {
       try {
@@ -1998,8 +2024,10 @@ var __publicField = (obj, key, value) => {
       }
     };
     _proto2.reportPlayStop = function reportPlayStop() {
-      this.log.play_stop.play_current_time = this.player.currentTime || this.log.playing.play_current_time;
-      this.saveBuffered();
+      if (this.player) {
+        this.log.play_stop.play_current_time = this.player.currentTime || this.log.playing.play_current_time;
+        this.saveBuffered();
+      }
       this.logmanager.push(this.log.play_stop, true);
     };
     _proto2.reportFirstframe = function reportFirstframe() {
@@ -2007,7 +2035,7 @@ var __publicField = (obj, key, value) => {
         return;
       }
       if (this.core) {
-        var _ref3 = this.core.getStats() || {}, fps = _ref3.fps;
+        var _ref6 = this.core.getStats() || {}, fps = _ref6.fps;
         this.commonParams.fps = fps;
       }
       this.firstFrameViewed = true;
@@ -2026,47 +2054,79 @@ var __publicField = (obj, key, value) => {
       this.log.play_stop.is_stream_received = 1;
     };
     _proto2.updatePlayStopParams = function updatePlayStopParams() {
-      var timing = getResourceTiming(this._url);
-      var endTime = getCurrentTime();
-      this.playedTime = endTime - this.log.start_play.start_play_time;
-      var play_stop = this.log.play_stop;
-      Object.assign(play_stop, _objectSpread2({}, play_stop.stall_count === 0 && {
-        stall_time: 0
-      }));
-      if (this.inWaitingStart && endTime - this.inWaitingStart > 200) {
-        play_stop.stall_time += endTime - this.inWaitingStart;
-      }
-      this.inWaitingStart = 0;
-      Object.assign(play_stop, _objectSpread2({
-        stall_time_per_100sec: play_stop.stall_time / this.playedTime * 100,
-        // 计算百秒卡顿时长
-        stall_count_per_100sec: play_stop.stall_count * 1e3 / this.playedTime * 100
-      }, timing));
-      if (this.log.play_stop.stall_count_per_100sec === 0) {
-        this.log.play_stop.stall_time_per_100sec = 0;
-      }
-      if (this.log.play_stop.stall_time_per_100sec > 100 || this.log.play_stop.stall_time_per_100sec < 0) {
-        return;
-      }
-      if (this.log.playing.index) {
-        Object.assign(this.log.playing, _objectSpread2({
-          timestamp: getCurrentTime(),
-          is_last: 1
-        }, this.videoSize));
-        this.logmanager.push(this.log.playing, true);
-      } else {
-        this.log.play_stop.error_code = this.log.play_error.code;
-        this.log.play_stop.error_info = this.log.play_error.info;
-      }
-      endTime = getCurrentTime();
-      Object.assign(play_stop, _objectSpread2({
-        timestamp: endTime,
-        stop_time: endTime,
-        duration: this.playedTime / 1e3,
-        play_time: this.playedTime / 1e3
-      }, this.videoSize));
-      if (this.errorNumber === 0) {
-        play_stop.play_time_on_no_frame = play_stop.stop_time - this.log.start_play.start_play_time;
+      try {
+        var _this17$core;
+        var _temp9 = function _temp92() {
+          Object.assign(play_stop, _objectSpread2({
+            timestamp: endTime,
+            stop_time: endTime,
+            duration: _this17.playedTime / 1e3,
+            play_time: _this17.playedTime / 1e3
+          }, _this17.videoSize));
+          if (_this17.errorNumber === 0) {
+            play_stop.play_time_on_no_frame = play_stop.stop_time - _this17.log.start_play.start_play_time;
+          }
+        };
+        var _this17 = this;
+        var timing = getResourceTiming(_this17._url);
+        var endTime = getCurrentTime();
+        _this17.playedTime = endTime - _this17.log.start_play.start_play_time;
+        var play_stop = _this17.log.play_stop;
+        Object.assign(play_stop, _objectSpread2({}, play_stop.stall_count === 0 && {
+          stall_time: 0
+        }));
+        if (_this17.inWaitingStart && endTime - _this17.inWaitingStart > 200) {
+          play_stop.stall_time += endTime - _this17.inWaitingStart;
+        }
+        _this17.inWaitingStart = 0;
+        Object.assign(play_stop, _objectSpread2({
+          stall_time_per_100sec: play_stop.stall_time / _this17.playedTime * 100,
+          // 计算百秒卡顿时长
+          stall_count_per_100sec: play_stop.stall_count * 1e3 / _this17.playedTime * 100
+        }, timing));
+        if (_this17.log.play_stop.stall_count_per_100sec === 0) {
+          _this17.log.play_stop.stall_time_per_100sec = 0;
+        }
+        if (_this17.log.play_stop.stall_time_per_100sec > 100 || _this17.log.play_stop.stall_time_per_100sec < 0) {
+          return Promise.resolve();
+        }
+        if (_this17.log.playing.index) {
+          Object.assign(_this17.log.playing, _objectSpread2({
+            timestamp: getCurrentTime(),
+            is_last: 1
+          }, _this17.videoSize));
+          _this17.logmanager.push(_this17.log.playing, true);
+        } else {
+          _this17.log.play_stop.error_code = _this17.log.play_error.code;
+          _this17.log.play_stop.error_info = _this17.log.play_error.info;
+        }
+        endTime = getCurrentTime();
+        if ((_this17$core = _this17.core) === null || _this17$core === void 0 ? void 0 : _this17$core.getStats) {
+          var _ref7 = _this17.core.getStats() || {}, totalReceivedByte = _ref7.totalReceivedByte, totalReceivedCost = _ref7.totalReceivedCost;
+          Object.assign(_this17.log.play_stop, {
+            totalReceivedByte,
+            totalReceivedCost,
+            totalAverageSpeed: totalReceivedByte * 8 / (totalReceivedCost / 1e3)
+            // bps
+          });
+        }
+        var _temp10 = function() {
+          var _this17$core2;
+          if ((_this17$core2 = _this17.core) === null || _this17$core2 === void 0 ? void 0 : _this17$core2.getStatsSnapshoot) {
+            return Promise.resolve(_this17.core.getStatsSnapshoot()).then(function(_ref8) {
+              var video = _ref8.video;
+              var _ref9 = video || {}, packetsLost = _ref9.packetsLost, packetsReceived = _ref9.packetsReceived;
+              Object.assign(play_stop, {
+                packetsLost,
+                packetsReceived,
+                totalLostRate: packetsLost / (packetsLost + packetsReceived)
+              });
+            });
+          }
+        }();
+        return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(_temp9) : _temp9(_temp10));
+      } catch (e2) {
+        return Promise.reject(e2);
       }
     };
     _proto2.clearPlayingInterval = function clearPlayingInterval() {
@@ -2935,8 +2995,8 @@ var __publicField = (obj, key, value) => {
         device_id: this._deviceId,
         ext: {
           veplayer_version: "2.3.1-rc.0",
-          flv_version: "3.0.18-alpha.5",
-          hls_version: "3.0.17",
+          flv_version: "3.0.19-rc.0",
+          hls_version: "3.0.19-rc.0",
           rts_version: "0.2.1-alpha.0"
         }
       });
@@ -3271,8 +3331,9 @@ var __publicField = (obj, key, value) => {
   const getAbrStrategy = async (options) => {
     var _a, _b;
     const streamType = options.url && getStreamType(options.url);
-    if (streamType === "rtm")
+    if (streamType === "rtm") {
       return {};
+    }
     const abrOptions = streamType === "flv" ? (_a = options == null ? void 0 : options.flv) == null ? void 0 : _a.abr : (_b = options == null ? void 0 : options.hls) == null ? void 0 : _b.abr;
     if (!abrOptions) {
       return {};
@@ -3323,6 +3384,23 @@ var __publicField = (obj, key, value) => {
     constructor(options) {
       super(options);
     }
+    /** {zh}
+     * @brief 获取已经播放的时间
+     */
+    get playTime() {
+      var _a, _b, _c, _d;
+      if (!((_b = (_a = this._player) == null ? void 0 : _a.played) == null ? void 0 : _b.length)) {
+        return 0;
+      }
+      const length = this._player.played.length;
+      let time = 0;
+      for (let index = 0; index < length; index++) {
+        const start = (_c = this._player) == null ? void 0 : _c.played.start(index);
+        const end = (_d = this._player) == null ? void 0 : _d.played.end(index);
+        time += end - start;
+      }
+      return time;
+    }
     /** {zh}
      * @brief 调用此方法开启直播日志上报。
      */
@@ -3365,13 +3443,33 @@ var __publicField = (obj, key, value) => {
       var _a;
       (_a = this._player.plugins) == null ? void 0 : _a.infopanel.close();
     }
+    /** {zh}
+     * @brief 打开 Abr
+     */
     openAbr() {
-      var _a, _b;
-      (_b = (_a = this._player.plugins) == null ? void 0 : _a.abr) == null ? void 0 : _b.switchAbr(true);
+      var _a, _b, _c, _d;
+      const streamType = this.url && getStreamType(this.url);
+      if (streamType === "flv") {
+        (_b = (_a = this._player.plugins) == null ? void 0 : _a.abr) == null ? void 0 : _b.switchAbr(true);
+        return;
+      }
+      if (streamType === "hls") {
+        (_d = (_c = this._player.plugins) == null ? void 0 : _c.hlsabr) == null ? void 0 : _d.switchAbr(true);
+      }
     }
+    /** {zh}
+     * @brief 关闭 Abr
+     */
     closeAbr() {
-      var _a, _b;
-      (_b = (_a = this._player.plugins) == null ? void 0 : _a.abr) == null ? void 0 : _b.switchAbr(false);
+      var _a, _b, _c, _d;
+      const streamType = this.url && getStreamType(this.url);
+      if (streamType === "flv") {
+        (_b = (_a = this._player.plugins) == null ? void 0 : _a.abr) == null ? void 0 : _b.switchAbr(false);
+        return;
+      }
+      if (streamType === "hls") {
+        (_d = (_c = this._player.plugins) == null ? void 0 : _c.hlsabr) == null ? void 0 : _d.switchAbr(false);
+      }
     }
     /** {zh}
      * @brief 调用此方法更新 DRM 鉴权配置。
@@ -3381,56 +3479,48 @@ var __publicField = (obj, key, value) => {
       var _a, _b, _c;
       (_c = (_b = (_a = this._player) == null ? void 0 : _a.plugins) == null ? void 0 : _b.drm) == null ? void 0 : _c.updateDrmConfig(config);
     }
-    switchAbr({ enable, bitrate }) {
+    /** {zh}
+     * @brief 切换 flv Abr
+     * @param options 切换 Abr 的配置。
+     * @returns
+     */
+    switchAbr(options) {
       var _a, _b;
       if (!((_a = this._player.plugins) == null ? void 0 : _a.abr)) {
         return;
       }
-      if (typeof bitrate !== "undefined") {
-        const url = this._player.plugins.abr.config.urls[bitrate];
+      if (typeof (options == null ? void 0 : options.bitrate) !== "undefined") {
+        const url = this._player.plugins.abr.config.urls[options.bitrate];
         if (!url) {
           return;
         }
         this.switch(url, { seamless: true });
-        this._player.plugins.abr.bitrate = bitrate;
+        this._player.plugins.abr.bitrate = options.bitrate;
       }
-      if (typeof enable !== "undefined") {
-        (_b = this._player.plugins) == null ? void 0 : _b.abr.switchAbr(enable);
+      if (typeof (options == null ? void 0 : options.enable) !== "undefined") {
+        (_b = this._player.plugins) == null ? void 0 : _b.abr.switchAbr(options.enable);
       }
     }
-    async switch(target, options) {
-      var _a, _b, _c;
-      const { abr, ...rest } = options ?? {};
-      if (abr) {
-        (_c = (_b = (_a = this._player) == null ? void 0 : _a.plugins) == null ? void 0 : _b.abr) == null ? void 0 : _c.updateConfig(abr);
-      }
-      return super.switch(target, rest);
-    }
-    getPlayTime() {
-      var _a, _b, _c, _d;
-      if (!((_b = (_a = this._player) == null ? void 0 : _a.played) == null ? void 0 : _b.length)) {
-        return 0;
-      }
-      const length = this._player.played.length;
-      let time = 0;
-      for (let index = 0; index < length; index++) {
-        const start = (_c = this._player) == null ? void 0 : _c.played.start(index);
-        const end = (_d = this._player) == null ? void 0 : _d.played.end(index);
-        time += end - start;
-      }
-      return time;
-    }
-    getPlayerVersion() {
-      return "2.3.1-rc.0";
-    }
+    /** {zh}
+     * @brief 获取 RTM 的网络相关信息
+     * @returns
+     */
     getRTMNetWorkInfo() {
       var _a, _b, _c;
       return (_c = (_b = (_a = this._player) == null ? void 0 : _a.plugins) == null ? void 0 : _b.rts) == null ? void 0 : _c.getNetWorkInfo();
     }
+    /** {zh}
+     * @brief 获取 RTM 播放信息
+     * @returns
+     */
     async getRTMStats() {
-      var _a;
-      return (_a = this._player) == null ? void 0 : _a.plugins.rts.getStatsSnapshoot();
+      var _a, _b, _c;
+      return (_c = (_b = (_a = this._player) == null ? void 0 : _a.plugins) == null ? void 0 : _b.rts) == null ? void 0 : _c.getStatsSnapshoot();
     }
+    /** {zh}
+     * @brief 获取 FLV 播放信息
+     * @returns
+     */
     getFLVStats() {
       var _a, _b, _c;
       return (_c = (_b = (_a = this._player) == null ? void 0 : _a.plugins) == null ? void 0 : _b.flv) == null ? void 0 : _c.getStats();