@volcengine/veplayer 2.7.0 → 2.7.1-rc.1

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

@@ -323,6 +323,19 @@ function _objectSpread2(target) {
   }
   return target;
 }
+typeof Symbol !== "undefined" ? Symbol.iterator || (Symbol.iterator = /* @__PURE__ */ Symbol("Symbol.iterator")) : "@@iterator";
+typeof Symbol !== "undefined" ? Symbol.asyncIterator || (Symbol.asyncIterator = /* @__PURE__ */ Symbol("Symbol.asyncIterator")) : "@@asyncIterator";
+function _catch(body, recover) {
+  try {
+    var result = body();
+  } catch (e3) {
+    return recover(e3);
+  }
+  if (result && result.then) {
+    return result.then(void 0, recover);
+  }
+  return result;
+}
 var device_id_key = "xgplayer_device_id";
 var user_id_key = "xgplayer_user_id";
 var getCookie = function getCookie2(key) {
@@ -526,17 +539,25 @@ function getPlayerCore(player) {
       return player.plugins.hls;
     } else if (player.plugins.rts) {
       return player.plugins.rts;
-    } else if (player.plugins.rtm) {
-      return player.plugins.rtm;
-    }
-  }
-  return null;
+    } else if (player.plugins.flvlive) {
+      return player.plugins.flvlive;
+    } else if (player.plugins.hlslive) {
+      return player.plugins.hlslive;
+    } else if (player.plugins.hlsvod) {
+      return player.plugins.hlsvod;
+    } else if (player.plugins.hlslivemobile) {
+      return player.plugins.hlslivemobile;
+    } else if (player.plugins.flvlivemobile) {
+      return player.plugins.flvlivemobile;
+    }
+  }
+  return player.newHls || player.newFlv || player.__core__ || player.flv;
 }
 function getDefaultOptions(options) {
   return {
     device_id: options.device_id || getDeviceID$1(),
     user_id: options.user_id || getUserId$1(),
-    error_report_stop: !!options.error_report_stop,
+    error_report_stop: typeof options.error_report_stop === "boolean" ? options.error_report_stop : true,
     project_key: options.project_key || "live",
     product_line: options.product_line || "live",
     onReport: options.onReport || function() {
@@ -759,9 +780,8 @@ function getCommonLog(options) {
     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.12",
+    logger_version: "1.1.0-alpha.17",
     // 由rollup 在编译时注入
-    report_version: "5",
     product_line: options.product_line,
     user_id: options.user_id,
     device_id: options.device_id,
@@ -770,6 +790,7 @@ function getCommonLog(options) {
     cdn_ip: options.cdn_ip,
     is_wasm: +(!!mediaType && mediaType !== "video"),
     review_is_live: player.config.isLive ? 2 : 1,
+    isSupportedH265: isCodecSupport("hev1.1.6.L93.B0,mp4a.40.2"),
     aid: options.aid,
     live_id: options.live_id || options.aid + "-" + options.user_id + "-" + Date.now(),
     is_preview: options.is_preview ? 1 : 0,
@@ -895,6 +916,7 @@ var Manage = /* @__PURE__ */ function() {
     log.cpu_core_number = cpu_core_number;
     log.memory_usage = memory_usage;
     log.network_downlink = network_downlink;
+    log.muted = +this._player.muted;
     Object.assign(log, _objectSpread2({}, this.videoSize));
     this.send(log);
   };
@@ -925,14 +947,29 @@ var getNetStat = function getNetStat2() {
   }
   return "unknown";
 };
-var videoEvts = ["play", "playing", "pause", "ended", "error", "seeking", "seeked", "timeupdate", "waiting", "canplay", "canplaythrough", "durationchange", "ratechange", "volumechange", "loadeddata"];
+var videoEvts = [
+  "play",
+  "playing",
+  "pause",
+  "ended",
+  // 'error',
+  "seeking",
+  "seeked",
+  "timeupdate",
+  "waiting",
+  "canplay",
+  "canplaythrough",
+  "durationchange",
+  "ratechange",
+  "volumechange",
+  "loadeddata"
+];
 var LoggerControl = /* @__PURE__ */ function() {
   function LoggerControl2(options) {
     this.options = options;
     this.logger = new XgLiveLogger(options);
     this.restart = this.restart.bind(this);
     this.bindUrlChange();
-    sniffer.browser.includes("Chrome");
   }
   var _proto = LoggerControl2.prototype;
   _proto.restart = function restart(report_stop) {
@@ -956,6 +993,9 @@ var LoggerControl = /* @__PURE__ */ function() {
       this.logger.updateExt(ext);
     }
   };
+  _proto.sendLog = function sendLog(log) {
+    this.logger.sendLog(log);
+  };
   _proto.destroy = function destroy(report_stop) {
     this.logger.destroy(report_stop);
     this.logger = null;
@@ -1017,6 +1057,7 @@ var XgLiveLogger = /* @__PURE__ */ function() {
     this.completed = false;
     this.firstFrameViewed = false;
     this.cacheRtcStats = {};
+    this.cachePlaying = {};
   }
   var _proto2 = XgLiveLogger2.prototype;
   _proto2.setNTP = function setNTP(ntp) {
@@ -1106,6 +1147,14 @@ var XgLiveLogger = /* @__PURE__ */ function() {
       });
     }
   };
+  _proto2.sendLog = function sendLog(log) {
+    for (var commonKey in this.commonParams) {
+      if (log[commonKey] === void 0) {
+        log[commonKey] = this["_" + commonKey] || this.commonParams[commonKey];
+      }
+    }
+    this.logmanager.push(log);
+  };
   _proto2.updateExt = function updateExt(ext) {
     for (var logKey in this.log) {
       for (var extKey in ext) {
@@ -1244,9 +1293,11 @@ var XgLiveLogger = /* @__PURE__ */ function() {
     };
   };
   _proto2.handleTTFB = function handleTTFB(params) {
-    var _ref = params || {}, end = _ref.end, elapsed = _ref.elapsed;
+    var _ref = params || {}, end = _ref.end, elapsed = _ref.elapsed, responseUrl = _ref.responseUrl, url = _ref.url;
     this.log.first_frame.ttfb = elapsed || -1;
     this.log.first_frame.ttfb_end = end || 0;
+    this.log.first_frame.is_redirect = +(url !== responseUrl);
+    this.log.play_result.is_redirect = this.log.first_frame.is_redirect;
   };
   _proto2.handleUrlChange = function handleUrlChange(url) {
     this.logmanager.push(Object.assign(this.log.play_url_change, {
@@ -1298,11 +1349,11 @@ var XgLiveLogger = /* @__PURE__ */ function() {
         this.clearPlayResultTimer();
         this.log.play_result.reason = err.message || "first frame failed";
         this.log.play_result.code = this.log.play_error.code;
-        this.logmanager.push(this.log.play_result, true);
+        this.logmanager.push(this.log.play_result);
       }
     }
     if (this.options.error_report_stop) {
-      this.handleUserLeave();
+      this.destroy(true);
     } else {
       this.updatePlayStopParams();
     }
@@ -1326,22 +1377,36 @@ var XgLiveLogger = /* @__PURE__ */ function() {
     this.logmanager.push(play_stream_loaded);
   };
   _proto2.handleSEIParsed = function handleSEIParsed(sei) {
-    var _this$log = this.log, playing = _this$log.playing, first_frame = _this$log.first_frame;
-    if (sei.code === 100) {
-      var seiString = Utf8ArrayToStr(sei.content);
-      seiString = seiString.slice(seiString.indexOf("{"), seiString.lastIndexOf("}") + 1);
-      try {
-        var seiContent = JSON.parse(seiString);
-        var seiDelay = this.getPlayerBuffer() + this.ntpTime - seiContent.ts;
-        playing.sei_delay = seiDelay;
-        playing.sei_source = seiContent.source;
-        playing.ntp_sync = this.options.ntp ? 1 : 0;
-        playing.ntp_delta = this.ntp_delta;
-        first_frame.first_sei_delay = seiDelay;
-        first_frame.ntp_sync = this.options.ntp ? 1 : 0;
-        first_frame.ntp_delta = this.ntp_delta;
-      } catch (e3) {
-      }
+    try {
+      var _this5 = this;
+      var _this5$log = _this5.log, playing = _this5$log.playing, first_frame = _this5$log.first_frame;
+      var _temp3 = function() {
+        if (sei.code === 100) {
+          var seiString = Utf8ArrayToStr(sei.content);
+          seiString = seiString.slice(seiString.indexOf("{"), seiString.lastIndexOf("}") + 1);
+          var _temp4 = _catch(function() {
+            var seiContent = JSON.parse(seiString);
+            return Promise.resolve(_this5.getPlayerBuffer()).then(function(bufferTime) {
+              var seiDelay = bufferTime + _this5.ntpTime - seiContent.ts;
+              playing.sei_delay = seiDelay;
+              playing.sei_source = seiContent.source;
+              playing.ntp_sync = _this5.options.ntp ? 1 : 0;
+              playing.ntp_delta = _this5.ntp_delta;
+              first_frame.first_sei_delay = seiDelay;
+              first_frame.ntp_sync = _this5.options.ntp ? 1 : 0;
+              first_frame.ntp_delta = _this5.ntp_delta;
+            });
+          }, function() {
+          });
+          if (_temp4 && _temp4.then)
+            return _temp4.then(function() {
+            });
+        }
+      }();
+      return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function() {
+      }) : void 0);
+    } catch (e3) {
+      return Promise.reject(e3);
     }
   };
   _proto2.handleMetaDataLoaded = function handleMetaDataLoaded(type, meta) {
@@ -1371,7 +1436,7 @@ var XgLiveLogger = /* @__PURE__ */ function() {
   _proto2.handleAVUnsync = function handleAVUnsync(unsyncInfo) {
     Object.assign(this.log.play_av_unsync, unsyncInfo || {});
     this.log.play_av_unsync.timestamp = getCurrentTime();
-    this.logmanager.push(this.log.play_av_unsync, false);
+    this.logmanager.push(this.log.play_av_unsync);
   };
   _proto2.handleStreamException = function handleStreamException(info) {
     this.logmanager.push(Object.assign({}, this.log.stream_exception, info));
@@ -1391,27 +1456,58 @@ var XgLiveLogger = /* @__PURE__ */ function() {
     }
   };
   _proto2.getPlayerBuffer = function getPlayerBuffer() {
-    var buffered = this.player.video.buffered;
-    if (buffered) {
-      var bufferIdx = Math.max(0, buffered.length - 1);
-      try {
-        var bufferedTime = Number.parseInt((buffered.end(bufferIdx) - this.player.video.currentTime) * 1e3);
-        this.log.playing.audio_buffer_time = this.log.playing.video_buffer_time = bufferedTime;
-        return bufferedTime;
-      } catch (e3) {
-        return 0;
-      }
+    try {
+      var _this7 = this;
+      return Promise.resolve(_this7.getRtcStats({
+        onlyJb: true
+      })).then(function(rtc_stats) {
+        if (rtc_stats.video_jb_delay !== void 0) {
+          return rtc_stats.video_jb_delay;
+        }
+        var buffered = _this7.player.video.buffered;
+        if (buffered) {
+          var bufferIdx = Math.max(0, buffered.length - 1);
+          try {
+            var bufferedTime = Number.parseInt((buffered.end(bufferIdx) - _this7.player.video.currentTime) * 1e3);
+            _this7.log.playing.audio_buffer_time = _this7.log.playing.video_buffer_time = bufferedTime;
+            return bufferedTime;
+          } catch (e3) {
+            return 0;
+          }
+        }
+      });
+    } catch (e3) {
+      return Promise.reject(e3);
     }
   };
+  _proto2.getTransferCost = function getTransferCost(isFirstFrame) {
+    var _this$core;
+    if (!((_this$core = this.core) === null || _this$core === void 0 ? void 0 : _this$core.transferCost)) {
+      return {};
+    }
+    if (isFirstFrame)
+      return this.core.transferCost;
+    var _this$core$transferCo = this.core.transferCost, demuxCost = _this$core$transferCo.demuxCost, remuxCost = _this$core$transferCo.remuxCost, appendCost = _this$core$transferCo.appendCost;
+    var transferCost = {
+      demuxCost: demuxCost - this.cachePlaying.demuxCost,
+      remuxCost: remuxCost - this.cachePlaying.remuxCost,
+      appendCost: appendCost - this.cachePlaying.appendCost
+    };
+    Object.assign(this.cachePlaying, this.core.transferCost);
+    return transferCost;
+  };
   _proto2.getPlayerDownloadSpeed = function getPlayerDownloadSpeed() {
     if (this.core && this.core.core) {
       if (typeof this.core.core.speedInfo === "function") {
-        return this.core.core.speedInfo().speed;
+        return this.core.core.speedInfo().speed || {};
       }
     }
+    return {};
   };
   _proto2.getPlayerQuality = function getPlayerQuality() {
     var video = this.player.video;
+    if (!video)
+      return;
     if (video.getVideoPlaybackQuality) {
       var quality = video.getVideoPlaybackQuality();
       this.log.playing.drop_count = quality.droppedVideoFrames - this.tempDroppedFrameCount;
@@ -1425,10 +1521,11 @@ var XgLiveLogger = /* @__PURE__ */ function() {
       this.tempDroppedFrameCount = droppedVideoFrames;
     }
   };
-  _proto2.getRtcStats = function getRtcStats(duration, first) {
+  _proto2.getRtcStats = function getRtcStats(_ref2) {
+    var _ref2$duration = _ref2.duration, duration = _ref2$duration === void 0 ? 1e3 : _ref2$duration, _ref2$onlyJb = _ref2.onlyJb, onlyJb = _ref2$onlyJb === void 0 ? false : _ref2$onlyJb;
     try {
-      var _this5 = this;
-      var rtm = _this5.player.plugins.rts || _this5.player.plugins.rtm;
+      var _this9 = this;
+      var rtm = _this9.player.plugins.rts || _this9.player.plugins.rtm;
       var pc = rtm && rtm.pc;
       var rtc_stats = {};
       if (!pc)
@@ -1439,53 +1536,56 @@ var XgLiveLogger = /* @__PURE__ */ function() {
           switch (type) {
             case "inbound-rtp":
               if (mediaType === "audio") {
-                rtc_stats.audio_bytes_received = bytesReceived - (_this5.cacheRtcStats.audioBytesReceived || 0);
-                _this5.cacheRtcStats.audioBytesReceived = bytesReceived;
-                rtc_stats.audio_packets_lost = packetsLost - (_this5.cacheRtcStats.audioPacketsLost || 0);
-                rtc_stats.audio_packets_received = packetsReceived - (_this5.cacheRtcStats.audioPacketsReceived || 0);
-                _this5.cacheRtcStats.audioPacketsLost = packetsLost;
-                _this5.cacheRtcStats.audioPacketsReceived = packetsReceived;
+                rtc_stats.audio_bytes_received = bytesReceived - (_this9.cacheRtcStats.audioBytesReceived || 0);
+                _this9.cacheRtcStats.audioBytesReceived = bytesReceived;
+                rtc_stats.audio_packets_lost = packetsLost - (_this9.cacheRtcStats.audioPacketsLost || 0);
+                rtc_stats.audio_packets_received = packetsReceived - (_this9.cacheRtcStats.audioPacketsReceived || 0);
+                _this9.cacheRtcStats.audioPacketsLost = packetsLost;
+                _this9.cacheRtcStats.audioPacketsReceived = packetsReceived;
                 rtc_stats.audio_level = audioLevel;
                 rtc_stats.concealment_event = concealmentEvents;
                 rtc_stats.audio_fraction_lost = rtc_stats.audio_packets_lost / rtc_stats.audio_packets_received;
-                if (_this5.cacheRtcStats.totalSamplesReceived !== void 0) {
-                  rtc_stats.audio_rec_sample_rate = (totalSamplesReceived - _this5.cacheRtcStats.totalSamplesReceived) / duration;
+                if (_this9.cacheRtcStats.totalSamplesReceived !== void 0) {
+                  rtc_stats.audio_rec_sample_rate = (totalSamplesReceived - _this9.cacheRtcStats.totalSamplesReceived) / duration;
                 }
-                _this5.cacheRtcStats.totalSamplesReceived = totalSamplesReceived;
+                _this9.cacheRtcStats.totalSamplesReceived = totalSamplesReceived;
                 rtc_stats.concealed_samples = concealedSamples;
                 rtc_stats.total_samples_received = totalSamplesReceived;
               } else {
+                rtc_stats.video_jb_delay = jitterBufferDelay / jitterBufferEmittedCount * 1e3;
+                if (onlyJb) {
+                  return rtc_stats;
+                }
                 rtc_stats.frames_dropped = framesDropped;
                 rtc_stats.iframes_decoded = keyFramesDecoded;
-                rtc_stats.video_bytes_received = bytesReceived - (_this5.cacheRtcStats.videoBytesReceived || 0);
-                _this5.cacheRtcStats.videoBytesReceived = bytesReceived;
+                rtc_stats.video_bytes_received = bytesReceived - (_this9.cacheRtcStats.videoBytesReceived || 0);
+                _this9.cacheRtcStats.videoBytesReceived = bytesReceived;
                 rtc_stats.video_dec_time = totalDecodeTime;
                 rtc_stats.video_decoded_delay_ms = rtc_stats.video_dec_elapse / framesDecoded;
                 rtc_stats.video_frame_height = frameHeight;
                 rtc_stats.video_frame_width = frameWidth;
-                if (_this5.cacheRtcStats.framesDecoded !== void 0) {
-                  rtc_stats.video_decode_framerate = (framesDecoded - _this5.cacheRtcStats.framesDecoded) / duration;
+                if (_this9.cacheRtcStats.framesDecoded !== void 0) {
+                  rtc_stats.video_decode_framerate = (framesDecoded - _this9.cacheRtcStats.framesDecoded) / duration;
                 }
-                _this5.cacheRtcStats.framesDecoded = framesDecoded;
-                if (_this5.cacheRtcStats.framesReceived !== void 0) {
-                  rtc_stats.video_recv_framerate = (framesReceived - _this5.cacheRtcStats.framesReceived) / duration;
+                _this9.cacheRtcStats.framesDecoded = framesDecoded;
+                if (_this9.cacheRtcStats.framesReceived !== void 0) {
+                  rtc_stats.video_recv_framerate = (framesReceived - _this9.cacheRtcStats.framesReceived) / duration;
                 }
-                if (_this5.cacheRtcStats.freezeCount !== void 0) {
-                  rtc_stats.freeze_count = freezeCount - _this5.cacheRtcStats.freezeCount;
-                  rtc_stats.freeze_duration = totalFreezesDuration - _this5.cacheRtcStats.totalFreezesDuration;
+                if (_this9.cacheRtcStats.freezeCount !== void 0) {
+                  rtc_stats.freeze_count = freezeCount - _this9.cacheRtcStats.freezeCount;
+                  rtc_stats.freeze_duration = totalFreezesDuration - _this9.cacheRtcStats.totalFreezesDuration;
                 }
-                _this5.cacheRtcStats.freezeCount = freezeCount;
-                _this5.cacheRtcStats.totalFreezesDuration = totalFreezesDuration;
-                _this5.cacheRtcStats.framesReceived = framesReceived;
+                _this9.cacheRtcStats.freezeCount = freezeCount;
+                _this9.cacheRtcStats.totalFreezesDuration = totalFreezesDuration;
+                _this9.cacheRtcStats.framesReceived = framesReceived;
                 rtc_stats.total_pauses_duration = totalPausesDuration;
-                rtc_stats.video_jb_delay = jitterBufferDelay / jitterBufferEmittedCount * 1e3;
                 rtc_stats.video_jitter = jitter * 1e3;
                 rtc_stats.video_nack_count = nackCount;
-                rtc_stats.video_packets_lost = packetsLost - (_this5.cacheRtcStats.videoPacketsLost || 0);
-                rtc_stats.video_packets_received = packetsReceived - (_this5.cacheRtcStats.videoPacketsReceived || 0);
+                rtc_stats.video_packets_lost = packetsLost - (_this9.cacheRtcStats.videoPacketsLost || 0);
+                rtc_stats.video_packets_received = packetsReceived - (_this9.cacheRtcStats.videoPacketsReceived || 0);
                 rtc_stats.video_fraction_lost = rtc_stats.video_packets_lost / rtc_stats.video_packets_received;
-                _this5.cacheRtcStats.videoPacketsLost = packetsLost;
-                _this5.cacheRtcStats.videoPacketsReceived = packetsReceived;
+                _this9.cacheRtcStats.videoPacketsLost = packetsLost;
+                _this9.cacheRtcStats.videoPacketsReceived = packetsReceived;
                 rtc_stats.video_pli_count = pliCount;
                 rtc_stats.decoder_name = decoderImplementation;
               }
@@ -1509,13 +1609,12 @@ var XgLiveLogger = /* @__PURE__ */ function() {
                 rtc_stats.audio_codec = mediaType;
               }
           }
-          rtc_stats.total_delay = rtc_stats.e2e_delay_ms + (rtc_stats.video_decoded_delay_ms || 0) + (rtc_stats.video_jb_delay || 0);
         });
-        Object.assign(_this5.log.playing, {
+        Object.assign(_this9.log.playing, {
           video_download_size: rtc_stats.video_bytes_received,
           decode_fps: rtc_stats.video_decode_framerate,
-          sei_delay: rtc_stats.total_delay,
-          sei_network_delay: rtc_stats.e2e_delay_ms,
+          // sei_delay: rtc_stats.total_delay,
+          // sei_network_delay: rtc_stats.e2e_delay_ms,
           width: rtc_stats.video_frame_width,
           height: rtc_stats.video_frame_height,
           current_speed: (rtc_stats.audio_bytes_received + rtc_stats.video_bytes_received) / duration
@@ -1528,31 +1627,34 @@ var XgLiveLogger = /* @__PURE__ */ function() {
   };
   _proto2.reportPlaying = function reportPlaying(first) {
     try {
-      var _this7 = this;
-      if (_this7.commonParams.is_wasm) {
-        _this7.commonParams.fps = _this7.player.video.fps;
-        _this7.log.playing.render_fps = _this7.player.video.fps;
-        _this7.log.playing.decode_fps = _this7.player.video.decodeFps;
+      var _this11 = this;
+      if (_this11.commonParams.is_wasm) {
+        _this11.commonParams.fps = _this11.player.video.fps;
+        _this11.log.playing.render_fps = _this11.player.video.fps;
+        _this11.log.playing.decode_fps = _this11.player.video.decodeFps;
       }
-      _this7.log.playing.index++;
-      var lastPlayingTime = _this7.log.playing.timestamp;
+      _this11.log.playing.index++;
+      var lastPlayingTime = _this11.log.playing.timestamp;
       var stallTime;
-      if (_this7.inWaitingStart && _this7.inWaitingStart < getCurrentTime()) {
-        stallTime = Math.min(_this7.options.playingInterval || _this7.log.playing.play_time, getCurrentTime() - Math.max(_this7.inWaitingStart, lastPlayingTime));
+      if (_this11.inWaitingStart && _this11.inWaitingStart < getCurrentTime()) {
+        stallTime = Math.min(_this11.options.playingInterval || _this11.log.playing.play_time, getCurrentTime() - Math.max(_this11.inWaitingStart, lastPlayingTime));
       }
-      _this7.getPlayerQuality();
-      _this7.getPlayerBuffer();
-      if (!_this7.options.downloadSpeedInterval) {
-        _this7.log.playing.current_speed = _this7.getPlayerDownloadSpeed();
+      _this11.getPlayerQuality();
+      _this11.getPlayerBuffer();
+      var transferCost = _this11.getTransferCost(false);
+      if (!_this11.options.downloadSpeedInterval) {
+        var _this11$getPlayerDown = _this11.getPlayerDownloadSpeed(), speed = _this11$getPlayerDown.speed, avgSpeed = _this11$getPlayerDown.avgSpeed;
+        _this11.log.playing.current_speed = speed;
+        _this11.log.playing.avg_speed = avgSpeed;
       }
       var now2 = getCurrentTime();
       var playedTime = now2 - lastPlayingTime;
-      var stall_time = (stallTime > 200 ? stallTime : 0) + _this7.log.playing.stall_time;
-      var stall_count = (stallTime > 200 ? 1 : 0) + _this7.log.playing.stall_count;
-      if (_this7.options.aggregationDowngradeStallTime) {
-        _this7.log.playing.aggregation_downgrade_stall = (stallTime > _this7.options.aggregationDowngradeStallTime ? stallTime : 0) + (_this7.log.playing.aggregation_downgrade_stall || 0);
+      var stall_time = (stallTime > 200 ? stallTime : 0) + _this11.log.playing.stall_time;
+      var stall_count = (stallTime > 200 ? 1 : 0) + _this11.log.playing.stall_count;
+      if (_this11.options.aggregationDowngradeStallTime) {
+        _this11.log.playing.aggregation_downgrade_stall = (stallTime > _this11.options.aggregationDowngradeStallTime ? stallTime : 0) + (_this11.log.playing.aggregation_downgrade_stall || 0);
       }
-      Object.assign(_this7.log.playing, _objectSpread2({
+      Object.assign(_this11.log.playing, _objectSpread2(_objectSpread2({
         timestamp: now2,
         // 60s内存在多次触发playing
         stop_time: now2,
@@ -1564,37 +1666,41 @@ var XgLiveLogger = /* @__PURE__ */ function() {
         stall_count,
         // playing前会有一次卡顿现处于waiting状态
         stall_time,
-        play_current_time: _this7.player.currentTime
-      }, _this7.videoSize));
-      return Promise.resolve(_this7.getRtcStats(playedTime, first)).then(function(stats) {
+        play_current_time: _this11.player.currentTime
+      }, transferCost), _this11.videoSize));
+      return Promise.resolve(_this11.getRtcStats({
+        duration: playedTime,
+        first,
+        onlyJb: false
+      })).then(function(stats) {
         var flvStats = {};
-        if (_this7.core) {
-          if (_this7.core.getStats) {
-            var _ref2 = _this7.core.getStats() || {}, bitrate = _ref2.bitrate, avgSpeed = _ref2.avgSpeed;
+        if (_this11.core) {
+          if (_this11.core.getStats) {
+            var _ref3 = _this11.core.getStats() || {}, bitrate = _ref3.bitrate, _avgSpeed = _ref3.avgSpeed;
             Object.assign(flvStats, {
               bitrate,
-              avg_speed: avgSpeed,
-              rate: avgSpeed / 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;
+          if (_this11.core.getNetWorkInfo) {
+            var _this11$core$core;
+            var _ref4 = _this11.core.getNetWorkInfo() || {}, lostRate = _ref4.lostRate;
+            var _ref5 = ((_this11$core$core = _this11.core.core) === null || _this11$core$core === void 0 ? void 0 : _this11$core$core._opts) || {}, networkEvaluateInterval = _ref5.networkEvaluateInterval;
             Object.assign(flvStats, {
               lostRate,
               networkEvaluateInterval
             });
           }
         }
-        _this7.logmanager.push(Object.assign({}, _this7.log.playing, _objectSpread2(_objectSpread2({
+        _this11.logmanager.push(Object.assign({}, _this11.log.playing, _objectSpread2(_objectSpread2({
           play_time: first ? 0 : playedTime
         }, stats), flvStats)), true);
-        _this7.log.playing.download_speed_array = [];
-        _this7.log.playing.stall_time = 0;
-        _this7.log.playing.stall_count = 0;
-        if (_this7.options.aggregationDowngradeStallTime) {
-          _this7.log.playing.aggregation_downgrade_stall = 0;
+        _this11.log.playing.download_speed_array = [];
+        _this11.log.playing.stall_time = 0;
+        _this11.log.playing.stall_count = 0;
+        if (_this11.options.aggregationDowngradeStallTime) {
+          _this11.log.playing.aggregation_downgrade_stall = 0;
         }
       });
     } catch (e3) {
@@ -1603,64 +1709,71 @@ var XgLiveLogger = /* @__PURE__ */ function() {
   };
   _proto2.handlePlayerPlaying = function handlePlayerPlaying() {
     try {
-      var _this9 = this;
-      if (_this9.player && _this9.player.video.readyState < 3) {
+      var _this13 = this;
+      if (_this13.player && _this13.player.video.readyState < 3) {
         return Promise.resolve();
       }
-      _this9.player.off("playing", _this9.handlePlayerPlaying);
-      _this9.player.off("timeupdate", _this9.handlePlayerPlaying);
-      if (_this9.core && _this9.core.getStats) {
-        var _ref5 = _this9.core.getStats() || {}, fps = _ref5.fps;
-        _this9.commonParams.fps = fps;
+      _this13.player.off("playing", _this13.handlePlayerPlaying);
+      _this13.player.off("timeupdate", _this13.handlePlayerPlaying);
+      if (!_this13.player.video) {
+        _this13.destroyFunc();
+        return Promise.resolve();
+      } else if (_this13.player.paused) {
+        _this13.handleVideopause();
+        return Promise.resolve();
       }
-      return Promise.resolve(_this9.reportPlaying(true)).then(function() {
-        _this9.clearPlayingInterval();
-        var timer = _this9.options.playingInterval || _this9.log.playing.play_time;
-        _this9.intervalId = setInterval(function() {
+      if (_this13.core && _this13.core.getStats) {
+        var _ref6 = _this13.core.getStats() || {}, fps = _ref6.fps;
+        _this13.commonParams.fps = fps;
+      }
+      return Promise.resolve(_this13.reportPlaying(true)).then(function() {
+        _this13.clearPlayingInterval();
+        var timer = _this13.options.playingInterval || _this13.log.playing.play_time;
+        _this13.intervalId = setInterval(function() {
           try {
-            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 || !_this9.player.video) {
-                    _this9.destroyFunc();
+            var _temp8 = function() {
+              if (Math.abs(Date.now() - _this13.log.playing.timestamp - timer) < 100 || Date.now() - _this13.log.playing.timestamp >= timer) {
+                var _temp9 = function() {
+                  if (!_this13.player || !_this13.player.video) {
+                    _this13.destroyFunc();
                   } else {
-                    var _temp6 = function() {
-                      if (_this9.player.paused) {
-                        _this9.handleVideopause();
+                    var _temp10 = function() {
+                      if (_this13.player.paused) {
+                        _this13.handleVideopause();
                       } else {
-                        return Promise.resolve(_this9.reportPlaying()).then(function() {
+                        return Promise.resolve(_this13.reportPlaying()).then(function() {
                         });
                       }
                     }();
-                    if (_temp6 && _temp6.then)
-                      return _temp6.then(function() {
+                    if (_temp10 && _temp10.then)
+                      return _temp10.then(function() {
                       });
                   }
                 }();
-                if (_temp5 && _temp5.then)
-                  return _temp5.then(function() {
+                if (_temp9 && _temp9.then)
+                  return _temp9.then(function() {
                   });
               }
             }();
-            return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function() {
+            return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function() {
             }) : void 0);
           } catch (e3) {
             return Promise.reject(e3);
           }
         }, 1e3);
-        _this9.clearStallTimer();
-        _this9.handleVideoplaying();
-        if (!_this9.started) {
-          _this9.reportStartPlay();
+        _this13.clearStallTimer();
+        _this13.handleVideoplaying();
+        if (!_this13.started) {
+          _this13.reportStartPlay();
         }
-        _this9.saveBuffered();
+        _this13.saveBuffered();
       });
     } catch (e3) {
       return Promise.reject(e3);
     }
   };
   _proto2.handlePlayerReady = function handlePlayerReady() {
-    var _this10 = this;
+    var _this14 = this;
     this.log.start_play.start_play_time = getCurrentTime();
     if (this.player.config.autoplay) {
       this.reportStartPlay();
@@ -1671,14 +1784,16 @@ var XgLiveLogger = /* @__PURE__ */ function() {
     this.clearPlayResultTimer();
     this.log.play_result.start = getCurrentTime();
     this.playResultTimer = setTimeout(function() {
-      if (_this10.log.play_result.timestamp >= _this10.log.play_result.start)
+      if (_this14.log.play_result.timestamp >= _this14.log.play_result.start)
+        return;
+      if (!_this14.player || _this14.player.paused || !_this14.player.video)
         return;
-      _this10.log.play_result.is_threshold = 1;
-      _this10.logmanager.push(_this10.log.play_result, true);
+      _this14.log.play_result.is_threshold = 1;
+      _this14.logmanager.push(_this14.log.play_result, true);
     }, this.log.play_result.threshold);
   };
   _proto2.handlePlayerWaiting = function handlePlayerWaiting() {
-    var _this11 = this;
+    var _this15 = this;
     if (!!this.inWaitingStart || !this.log.first_frame.timestamp)
       return;
     this.log.stall.timestamp = this.inWaitingStart = this.log.stall.stall_start = getCurrentTime();
@@ -1690,11 +1805,13 @@ var XgLiveLogger = /* @__PURE__ */ function() {
     this.log.stall.play_current_time = this.player.currentTime;
     this.log.stall_start.buffered = this.getBuffered();
     this.log.stall.buffered = this.log.stall_start.buffered;
-    this.log.stall.current_speed = this.getPlayerDownloadSpeed();
+    var _this$getPlayerDownlo = this.getPlayerDownloadSpeed(), speed = _this$getPlayerDownlo.speed, avgSpeed = _this$getPlayerDownlo.avgSpeed;
+    this.log.stall.current_speed = speed;
+    this.log.stall.avg_speed = avgSpeed;
     Object.assign(this.log.stall_start, this.videoSize);
     this.clearStallTimer();
     this.stallStartTimer = setTimeout(function() {
-      _this11.logmanager.push(_this11.log.stall_start, true);
+      _this15.logmanager.push(_this15.log.stall_start, true);
     }, 205);
   };
   _proto2.handleVideoseeking = function handleVideoseeking() {
@@ -1765,37 +1882,36 @@ var XgLiveLogger = /* @__PURE__ */ function() {
   _proto2.handleVideoended = function handleVideoended() {
     this.clearPlayingInterval();
     this.clearStallTimer();
-    Object.assign(this.log.playing, _objectSpread2({
-      timestamp: getCurrentTime(),
+    Object.assign(this.log.playing, {
       is_last: 1
-    }, this.videoSize));
-    this.logmanager.push(this.log.playing);
+    });
+    this.reportPlaying();
   };
   _proto2.handleVideoerror = function handleVideoerror() {
-    var _this12 = this;
+    var _this16 = this;
     this.errorNumber = 1;
     var error2 = this.player.video.error;
     var firstframeFailed = function firstframeFailed2() {
-      if (_this12.log.first_frame.first_frame_view === 0 && !_this12.log.first_frame_failed.code) {
+      if (_this16.log.first_frame.first_frame_view === 0 && !_this16.log.first_frame_failed.code) {
         if (error2) {
-          _this12.log.first_frame_failed.code = error2.code;
-          _this12.log.first_frame_failed.msg = video_error[error2.code];
-          if (_this12.log.first_frame_failed.timestamp !== void 0) {
-            _this12.log.first_frame_failed.timestamp = getCurrentTime();
+          _this16.log.first_frame_failed.code = error2.code;
+          _this16.log.first_frame_failed.msg = video_error[error2.code];
+          if (_this16.log.first_frame_failed.timestamp !== void 0) {
+            _this16.log.first_frame_failed.timestamp = getCurrentTime();
           }
-          _this12.logmanager.push(_this12.log.first_frame_failed, true);
-          if (!_this12.log.play_result.is_threshold) {
-            _this12.log.play_result.reason = video_error[error2.code] || "first frame failed";
-            _this12.log.play_result.code = error2.code;
-            _this12.clearPlayResultTimer();
-            _this12.logmanager.push(_this12.log.play_result, true);
+          _this16.logmanager.push(_this16.log.first_frame_failed, true);
+          if (!_this16.log.play_result.is_threshold) {
+            _this16.log.play_result.reason = video_error[error2.code] || "first frame failed";
+            _this16.log.play_result.code = error2.code;
+            _this16.clearPlayResultTimer();
+            _this16.logmanager.push(_this16.log.play_result, true);
           }
         }
       }
-      if (_this12.options.error_report_stop) {
-        _this12.handleUserLeave();
+      if (_this16.options.error_report_stop) {
+        _this16.handleUserLeave();
       } else {
-        _this12.updatePlayStopParams();
+        _this16.updatePlayStopParams();
       }
     };
     Object.assign(this.log.play_error, _objectSpread2(_objectSpread2({
@@ -1816,7 +1932,7 @@ var XgLiveLogger = /* @__PURE__ */ function() {
     this.player.once("timeupdate", this.handlePlayerPlaying);
   };
   _proto2.destroyFunc = function destroyFunc(no_report_stop) {
-    var _this13 = this;
+    var _this17 = this;
     if (this.destroyed) {
       return;
     }
@@ -1830,7 +1946,7 @@ var XgLiveLogger = /* @__PURE__ */ function() {
       window.removeEventListener("pagehide", this.handleUserLeave);
     }
     videoEvts.forEach(function(name) {
-      _this13.removeVideoEvt(name, _this13["handleVideo" + name + "Evt"]);
+      _this17.removeVideoEvt(name, _this17["handleVideo" + name + "Evt"]);
     });
     if (this.player) {
       if (this.player._start) {
@@ -1854,26 +1970,26 @@ var XgLiveLogger = /* @__PURE__ */ function() {
       this.player.off("bufferappend", this.handleBufferAppend);
       this.player.off("core_event", this.handleCoreEvent);
       this.player.off("degrade", this.handleDegrade);
-      this._player = null;
     }
     this.clearPlayingInterval();
     this.clearStallTimer();
     this.clearPlayResultTimer();
     clearTimeout(this.collectDownloadSpeedTimer);
+    this._player = null;
   };
   _proto2.handleUserLeave = function handleUserLeave() {
     try {
-      var _this15 = this;
-      if (_this15.destroyed || !_this15.started) {
+      var _this19 = this;
+      if (_this19.destroyed || !_this19.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();
+      _this19.destroyed = true;
+      return Promise.resolve(_this19.updatePlayStopParams()).then(function() {
+        _this19.reportPlayStop();
+        _this19.clearPlayingInterval();
+        _this19.clearStallTimer();
+        clearTimeout(_this19.collectDownloadSpeedTimer);
+        _this19.removeWindowListener();
       });
     } catch (e3) {
       return Promise.reject(e3);
@@ -1904,94 +2020,94 @@ var XgLiveLogger = /* @__PURE__ */ function() {
       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);
+    this.logmanager.push(this.log.play_stop);
   };
   _proto2.reportFirstframe = function reportFirstframe() {
     if (this.firstFrameViewed) {
       return;
     }
     if (this.core && this.core.getStats) {
-      var _ref6 = this.core.getStats() || {}, fps = _ref6.fps;
+      var _ref7 = this.core.getStats() || {}, fps = _ref7.fps;
       this.commonParams.fps = fps;
     }
+    var transferCost = this.getTransferCost(true);
     this.firstFrameViewed = true;
     var currentTime = getCurrentTime();
-    Object.assign(this.log.first_frame, _objectSpread2({
+    Object.assign(this.log.first_frame, _objectSpread2(_objectSpread2({
       first_frame_view: currentTime - this.log.start_play.start_play_time || currentTime,
       timestamp: currentTime
-    }, this.videoSize));
+    }, transferCost), this.videoSize));
     if (this.log.first_frame.ttfb_end) {
       this.log.first_frame.ttdb = currentTime - this.log.first_frame.ttfb_end;
     }
-    this.logmanager.push(this.log.first_frame, true);
+    this.logmanager.push(this.log.first_frame);
     this.clearPlayResultTimer();
     this.log.play_result.result = 1;
-    this.logmanager.push(this.log.play_result, true);
+    this.logmanager.push(this.log.play_result);
     this.log.play_stop.is_stream_received = 1;
   };
   _proto2.updatePlayStopParams = function updatePlayStopParams() {
     try {
-      var _this17$core;
-      var _temp9 = function _temp92() {
+      var _this21$core;
+      var _temp13 = function _temp132() {
         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;
+          duration: _this21.playedTime / 1e3,
+          play_time: _this21.playedTime / 1e3
+        }, _this21.videoSize));
+        if (_this21.errorNumber === 0) {
+          play_stop.play_time_on_no_frame = play_stop.stop_time - _this21.log.start_play.start_play_time;
         }
       };
-      var _this17 = this;
-      var timing = getResourceTiming(_this17._url);
+      var _this21 = this;
+      var timing = getResourceTiming(_this21._url);
       var endTime = getCurrentTime();
-      _this17.playedTime = endTime - _this17.log.start_play.start_play_time;
-      var play_stop = _this17.log.play_stop;
+      _this21.playedTime = endTime - _this21.log.start_play.start_play_time;
+      var play_stop = _this21.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;
+      if (_this21.inWaitingStart && endTime - _this21.inWaitingStart > 200) {
+        play_stop.stall_time += endTime - _this21.inWaitingStart;
       }
-      _this17.inWaitingStart = 0;
+      _this21.inWaitingStart = 0;
       Object.assign(play_stop, _objectSpread2({
-        stall_time_per_100sec: play_stop.stall_time / _this17.playedTime * 100,
+        stall_time_per_100sec: play_stop.stall_time / _this21.playedTime * 100,
         // 计算百秒卡顿时长
-        stall_count_per_100sec: play_stop.stall_count * 1e3 / _this17.playedTime * 100
+        stall_count_per_100sec: play_stop.stall_count * 1e3 / _this21.playedTime * 100
       }, timing));
-      if (_this17.log.play_stop.stall_count_per_100sec === 0) {
-        _this17.log.play_stop.stall_time_per_100sec = 0;
+      if (_this21.log.play_stop.stall_count_per_100sec === 0) {
+        _this21.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) {
+      if (_this21.log.play_stop.stall_time_per_100sec > 100 || _this21.log.play_stop.stall_time_per_100sec < 0) {
         return Promise.resolve();
       }
-      if (_this17.log.playing.index) {
-        Object.assign(_this17.log.playing, _objectSpread2({
-          timestamp: getCurrentTime(),
+      if (_this21.log.playing.index) {
+        Object.assign(_this21.log.playing, {
           is_last: 1
-        }, _this17.videoSize));
-        _this17.logmanager.push(_this17.log.playing, true);
+        });
+        _this21.reportPlaying();
       } else {
-        _this17.log.play_stop.error_code = _this17.log.play_error.code;
-        _this17.log.play_stop.error_info = _this17.log.play_error.info;
+        _this21.log.play_stop.error_code = _this21.log.play_error.code;
+        _this21.log.play_stop.error_info = _this21.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, {
+      if ((_this21$core = _this21.core) === null || _this21$core === void 0 ? void 0 : _this21$core.getStats) {
+        var _ref8 = _this21.core.getStats() || {}, totalReceivedByte = _ref8.totalReceivedByte, totalReceivedCost = _ref8.totalReceivedCost;
+        Object.assign(_this21.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;
+      var _temp14 = function() {
+        var _this21$core2;
+        if ((_this21$core2 = _this21.core) === null || _this21$core2 === void 0 ? void 0 : _this21$core2.getStatsSnapshoot) {
+          return Promise.resolve(_this21.core.getStatsSnapshoot()).then(function(_ref9) {
+            var video = _ref9.video;
+            var _ref10 = video || {}, packetsLost = _ref10.packetsLost, packetsReceived = _ref10.packetsReceived;
             Object.assign(play_stop, {
               packetsLost,
               packetsReceived,
@@ -2000,7 +2116,7 @@ var XgLiveLogger = /* @__PURE__ */ function() {
           });
         }
       }();
-      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(_temp9) : _temp9(_temp10));
+      return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(_temp13) : _temp13(_temp14));
     } catch (e3) {
       return Promise.reject(e3);
     }
@@ -2799,8 +2915,6 @@ const Plugin$2 = window["VePlayer"].Plugin;
 class Logger extends Plugin$2 {
   constructor() {
     super(...arguments);
-    __publicField(this, "_userId");
-    __publicField(this, "_deviceId");
     __publicField(this, "_liveLogger");
   }
   static get pluginName() {
@@ -2856,8 +2970,8 @@ class Logger extends Plugin$2 {
     });
     q.start();
     q.config({
-      user_unique_id: this._userId,
-      device_id: this._deviceId
+      user_unique_id: this.config.userId,
+      device_id: this.config.deviceId
     });
   }
   _start() {
@@ -2868,11 +2982,11 @@ class Logger extends Plugin$2 {
       aid: this.config.appId || 654925,
       project_key: this.config.appId,
       app_name: this.config.appName || this.config.appId,
-      user_id: this._userId,
-      device_id: this._deviceId,
+      user_id: this.config.userId,
+      device_id: this.config.deviceId,
       error_report_stop: true,
       ext: {
-        veplayer_version: "2.3.0",
+        veplayer_version: "2.3.1-rc.1",
         flv_version: "3.0.21-rc.21",
         hls_version: "3.0.21-rc.21",
         rts_version: "0.2.1-alpha.14"