@byteplus/veplayer-plugin 2.4.0-rc.2 → 2.4.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byteplus/veplayer-plugin",
-  "version": "2.4.0-rc.2",
+  "version": "2.4.0-rc.4",
   "main": "./umd/index.production.js",
   "module": "./esm/index.production.js",
   "browser": "./umd/index.production.js",

package/umd/veplayer.plugin.flv.development.js

@@ -1542,7 +1542,7 @@
     }
     return offsetTime;
   };
-  var version = "3.0.17";
+  var version = "3.0.19-rc.0";
   var ERROR_MAP = {
     1: 5101,
     2: 5102,
@@ -2790,6 +2790,7 @@
       MSE_APPEND_BUFFER: "MSE_APPEND_BUFFER",
       MSE_OTHER: "MSE_OTHER",
       MSE_FULL: "MSE_FULL",
+      MSE_CHANGE_TYPE: "MSE_CHANGE_TYPE",
       OPTION: "OPTION",
       DASH: "DASH",
       LICENSE: "LICENSE",
@@ -2832,6 +2833,7 @@
     MSE_OTHER: 5202,
     MSE_FULL: 5203,
     MSE_HIJACK: 5204,
+    MSE_CHANGE_TYPE: 5205,
     EME_HIJACK: 5301
   }), _defineProperty$1(_ERR_CODE, ERR.DRM, {
     LICENSE: 7100,
@@ -3167,7 +3169,7 @@
             queue.shift();
           }
           if (op) {
-            var _this2$_sourceBuffer$;
+            var _this2$_sourceBuffer$, _op$context;
             var costtime = nowTime() - _this2._opst;
             _this2._logger.debug("UpdateEnd(".concat(type, "/").concat(op.opName, ")"), SafeJSON.stringify(getTimeRanges((_this2$_sourceBuffer$ = _this2._sourceBuffer[type]) === null || _this2$_sourceBuffer$ === void 0 ? void 0 : _this2$_sourceBuffer$.buffered)), costtime, op.context);
             op.promise.resolve({
@@ -3175,6 +3177,10 @@
               context: op.context,
               costtime
             });
+            var callback = (_op$context = op.context) === null || _op$context === void 0 ? void 0 : _op$context.callback;
+            if (callback && typeof callback === "function") {
+              callback(op.context);
+            }
             _this2._startQueue(type);
           }
         }
@@ -3436,10 +3442,15 @@
         var sb = this._sourceBuffer[type];
         if (!this.mediaSource || !sb || sb.mimeType === mimeType)
           return Promise.resolve();
-        if (typeof sb.changeType !== "function")
-          return Promise.reject();
+        if (typeof sb.changeType !== "function") {
+          return Promise.reject(new StreamingError(ERR.MEDIA, ERR.SUB_TYPES.MSE_CHANGE_TYPE, new Error("changeType is not a function")));
+        }
         return this._enqueueOp(type, function() {
-          sb.changeType(mimeType);
+          try {
+            sb.changeType(mimeType);
+          } catch (e) {
+            throw new StreamingError(ERR.MEDIA, ERR.SUB_TYPES.MSE_CHANGE_TYPE, e);
+          }
           sb.mimeType = mimeType;
           _this8._onSBUpdateEnd(type);
         }, "changeType", {
@@ -3689,11 +3700,14 @@
             } catch (error) {
               if (error && error.message && error.message.indexOf("SourceBuffer is full") >= 0) {
                 this._mseFullFlag[type] = true;
+                if (op.context && _typeof(op.context) === "object") {
+                  op.context.isFull = true;
+                }
                 this._logger.error("[MSE error],  context,", op.context, " ,name,", op.opName, ",err,SourceBuffer is full");
                 op.promise.reject(new StreamingError(ERR.MEDIA, ERR.SUB_TYPES.MSE_FULL, error));
               } else {
                 this._logger.error(error);
-                op.promise.reject(new StreamingError(ERR.MEDIA, ERR.SUB_TYPES.MSE_OTHER, error));
+                op.promise.reject(error.constructor === StreamingError ? error : new StreamingError(ERR.MEDIA, ERR.SUB_TYPES.MSE_OTHER, error));
                 queue.shift();
                 this._startQueue(type);
               }
@@ -5053,6 +5067,8 @@
       _defineProperty$1(this, "_chunkSpeed", 0);
       _defineProperty$1(this, "_chunkCache", []);
       _defineProperty$1(this, "_speeds", []);
+      _defineProperty$1(this, "_totalSize", 0);
+      _defineProperty$1(this, "_totalCost", 0);
       this._opts = opts || {};
     }
     _createClass$2(BandwidthService2, [{
@@ -5069,6 +5085,8 @@
         var _this$_opts, _this$_opts2;
         if (!totalByte || !ms || totalByte < (((_this$_opts = this._opts) === null || _this$_opts === void 0 ? void 0 : _this$_opts.skipChunkSize) || SKIP_SMALL_CHUNK))
           return;
+        this._totalSize += totalByte;
+        this._totalCost += ms;
         this._chunkSpeed = 8e3 * totalByte / ms;
         this._chunkCache.push({
           size: totalByte,
@@ -5118,11 +5136,23 @@
         }
         return this._chunkSpeed;
       }
+    }, {
+      key: "getTotalSize",
+      value: function getTotalSize() {
+        return this._totalSize;
+      }
+    }, {
+      key: "getTotalCost",
+      value: function getTotalCost() {
+        return this._totalCost;
+      }
     }, {
       key: "reset",
       value: function reset() {
         this._chunkCache = [];
         this._speeds = [];
+        this._totalSize = 0;
+        this._totalCost = 0;
       }
     }]);
     return BandwidthService2;
@@ -5251,13 +5281,15 @@
     _createClass$2(MediaStatsService2, [{
       key: "getStats",
       value: function getStats() {
-        var _this$_core, _this$_core2, _this$_core2$speedInf, _this$_core3, _this$_core3$speedInf, _this$_core4, _this$_core4$bufferIn;
+        var _this$_core, _this$_core2, _this$_core2$speedInf, _this$_core3, _this$_core3$speedInf, _this$_core4, _this$_core4$speedInf, _this$_core5, _this$_core5$speedInf, _this$_core6, _this$_core6$bufferIn;
         var _ref2 = ((_this$_core = this._core) === null || _this$_core === void 0 ? void 0 : _this$_core.media) || {}, _ref2$currentTime = _ref2.currentTime, currentTime = _ref2$currentTime === void 0 ? 0 : _ref2$currentTime, _ref2$decodeFps = _ref2.decodeFps, decodeFps = _ref2$decodeFps === void 0 ? 0 : _ref2$decodeFps;
         return _objectSpread2(_objectSpread2({}, this._stats.getStats()), {}, {
           downloadSpeed: ((_this$_core2 = this._core) === null || _this$_core2 === void 0 ? void 0 : (_this$_core2$speedInf = _this$_core2.speedInfo) === null || _this$_core2$speedInf === void 0 ? void 0 : _this$_core2$speedInf.call(_this$_core2).speed) || 0,
           avgSpeed: ((_this$_core3 = this._core) === null || _this$_core3 === void 0 ? void 0 : (_this$_core3$speedInf = _this$_core3.speedInfo) === null || _this$_core3$speedInf === void 0 ? void 0 : _this$_core3$speedInf.call(_this$_core3).avgSpeed) || 0,
+          totalReceivedByte: ((_this$_core4 = this._core) === null || _this$_core4 === void 0 ? void 0 : (_this$_core4$speedInf = _this$_core4.speedInfo) === null || _this$_core4$speedInf === void 0 ? void 0 : _this$_core4$speedInf.call(_this$_core4).totalSize) || 0,
+          totalReceivedCost: ((_this$_core5 = this._core) === null || _this$_core5 === void 0 ? void 0 : (_this$_core5$speedInf = _this$_core5.speedInfo) === null || _this$_core5$speedInf === void 0 ? void 0 : _this$_core5$speedInf.call(_this$_core5).totalCost) || 0,
           currentTime,
-          bufferEnd: ((_this$_core4 = this._core) === null || _this$_core4 === void 0 ? void 0 : (_this$_core4$bufferIn = _this$_core4.bufferInfo()) === null || _this$_core4$bufferIn === void 0 ? void 0 : _this$_core4$bufferIn.remaining) || 0,
+          bufferEnd: ((_this$_core6 = this._core) === null || _this$_core6 === void 0 ? void 0 : (_this$_core6$bufferIn = _this$_core6.bufferInfo()) === null || _this$_core6$bufferIn === void 0 ? void 0 : _this$_core6$bufferIn.remaining) || 0,
           decodeFps
         });
       }
@@ -10451,7 +10483,7 @@
     _createClass$4(Flv2, [{
       key: "version",
       get: function get() {
-        return "3.0.18-alpha.3";
+        return "3.0.19-rc.0";
       }
     }, {
       key: "isLive",
@@ -10485,7 +10517,9 @@
       value: function speedInfo() {
         return {
           speed: this._bandwidthService.getLatestSpeed(),
-          avgSpeed: this._bandwidthService.getAvgSpeed()
+          avgSpeed: this._bandwidthService.getAvgSpeed(),
+          totalSize: this._bandwidthService.getTotalSize(),
+          totalCost: this._bandwidthService.getTotalCost()
         };
       }
     }, {
@@ -10775,7 +10809,7 @@
                   _context9.prev = 17;
                   _context9.t0 = _context9["catch"](12);
                   this._loading = false;
-                  return _context9.abrupt("return", this._emitError(StreamingError.network(_context9.t0)));
+                  return _context9.abrupt("return", this._emitError(StreamingError.network(_context9.t0), false));
                 case 21:
                 case "end":
                   return _context9.stop();