@byteplus/veplayer-plugin 2.4.1-rc.1 → 2.4.2-rc.1

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

@@ -339,6 +339,14 @@
       }
     }, exports3;
   }
+  function _typeof$2(obj) {
+    "@babel/helpers - typeof";
+    return _typeof$2 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(obj2) {
+      return typeof obj2;
+    } : function(obj2) {
+      return obj2 && "function" == typeof Symbol && obj2.constructor === Symbol && obj2 !== Symbol.prototype ? "symbol" : typeof obj2;
+    }, _typeof$2(obj);
+  }
   function asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, key, arg) {
     try {
       var info = gen[key](arg);
@@ -1534,7 +1542,7 @@
     }
     return offsetTime;
   };
-  var version = "3.0.20-rc.3";
+  var version = "3.0.19-rc.0";
   var ERROR_MAP = {
     1: 5101,
     2: 5102,
@@ -1598,6 +1606,8 @@
       }
     }
   );
+  var PLAY = "play";
+  var PAUSE = "pause";
   var ERROR = "error";
   var DESTROY = "destroy";
   var URL_CHANGE = "urlchange";
@@ -4812,7 +4822,8 @@
       loadTimeout: 5e3,
       stallInterval: 400,
       networkEvaluateInterval: 1e3,
-      delayHint: 0
+      delayHint: 0,
+      seamlesslyReload: false
     }, opts);
   }
   function _getStats(stats) {
@@ -5075,6 +5086,7 @@
       _defineProperty$2(_assertThisInitialized$1(_this), "_audioTransceicer", null);
       _defineProperty$2(_assertThisInitialized$1(_this), "_videoTransceicer", null);
       _defineProperty$2(_assertThisInitialized$1(_this), "_mediaStream", null);
+      _defineProperty$2(_assertThisInitialized$1(_this), "_lastMediaStream", null);
       _defineProperty$2(_assertThisInitialized$1(_this), "_media", null);
       _defineProperty$2(_assertThisInitialized$1(_this), "_opts", null);
       _defineProperty$2(_assertThisInitialized$1(_this), "_loader", null);
@@ -5082,19 +5094,10 @@
       _defineProperty$2(_assertThisInitialized$1(_this), "_retry", 0);
       _defineProperty$2(_assertThisInitialized$1(_this), "_waitingTimer", 0);
       _defineProperty$2(_assertThisInitialized$1(_this), "_rctConnectStartTs", 0);
+      _defineProperty$2(_assertThisInitialized$1(_this), "_isReplacing", false);
       _defineProperty$2(_assertThisInitialized$1(_this), "_onTrack", function(e) {
         logger.log("addTrack: ", e.track, e.streams);
         _this["_".concat(e.track.kind)] = e.track;
-        if (!_this._mediaStream) {
-          _this._mediaStream = new MediaStream();
-          _this._media.srcObject = _this._mediaStream;
-          var req = _this._media.play();
-          if (req && req.catch) {
-            req.catch(function(e2) {
-            });
-          }
-        }
-        _this._mediaStream.addTrack(e.track);
       });
       _defineProperty$2(_assertThisInitialized$1(_this), "_mockWaitingByTimeupdate", function() {
         var _this$_pc, _this$_pc2;
@@ -5142,6 +5145,9 @@
       }));
       _this._retry = _this._opts.retryCount;
       _this._bindMediaEvent();
+      if (_this._opts.mediaStream && _this._opts.seamlesslyReload) {
+        _this._lastMediaStream = _this._opts.mediaStream;
+      }
       return _this;
     }
     _createClass$2(Rts2, [{
@@ -5185,9 +5191,9 @@
     }, {
       key: "load",
       value: function() {
-        var _load = _asyncToGenerator$1(/* @__PURE__ */ _regeneratorRuntime$1().mark(function _callee(url) {
+        var _load = _asyncToGenerator$1(/* @__PURE__ */ _regeneratorRuntime$1().mark(function _callee(url, seamless) {
           var _this2 = this;
-          var lastPc;
+          var _this$_pc3;
           return _regeneratorRuntime$1().wrap(function _callee$(_context) {
             while (1)
               switch (_context.prev = _context.next) {
@@ -5195,39 +5201,43 @@
                   this._disconnect();
                   this._url = url;
                   this._retry = this._opts.retryCount;
-                  lastPc = this._pc;
-                  if (lastPc) {
-                    lastPc.close();
+                  if (seamless) {
+                    this._lastPc = this._pc;
+                  } else {
+                    (_this$_pc3 = this._pc) === null || _this$_pc3 === void 0 ? void 0 : _this$_pc3.close();
                   }
-                  _context.prev = 5;
+                  _context.prev = 4;
                   this._pc = new RTCPeerConnection();
                   this._bindRTCEvents();
-                  _context.next = 10;
+                  _context.next = 9;
                   return this._connect(url);
-                case 10:
-                  _context.next = 15;
+                case 9:
+                  _context.next = 14;
                   break;
-                case 12:
-                  _context.prev = 12;
-                  _context.t0 = _context["catch"](5);
+                case 11:
+                  _context.prev = 11;
+                  _context.t0 = _context["catch"](4);
                   setTimeout(function() {
                     return _this2._emitError(StreamingError.create(ERR.OTHER, null, _context.t0));
                   });
-                case 15:
+                case 14:
                 case "end":
                   return _context.stop();
               }
-          }, _callee, this, [[5, 12]]);
+          }, _callee, this, [[4, 11]]);
         }));
-        function load(_x) {
+        function load(_x, _x2) {
           return _load.apply(this, arguments);
         }
         return load;
       }()
     }, {
       key: "switchURL",
-      value: function switchURL(url) {
-        this.load(url || this._url);
+      value: function switchURL(url, seamless) {
+        if (seamless) {
+          this._lastMediaStream = this._mediaStream;
+        }
+        this.load(url || this._url, seamless);
       }
     }, {
       key: "_bindRTCEvents",
@@ -5253,6 +5263,8 @@
             _this3.load(_this3._url);
           }
           if (pc.connectionState === "connected") {
+            _this3._closeLastPc();
+            _this3._handleMediaStream();
             _this3.emit(EVENT.TTFB, {
               url: _this3._url,
               responseUrl: _this3._url,
@@ -5261,6 +5273,40 @@
           }
         });
       }
+    }, {
+      key: "_handleMediaStream",
+      value: function _handleMediaStream() {
+        var _this4 = this;
+        if (this._lastMediaStream) {
+          var _this$_media$play;
+          var videoTrack = this._lastMediaStream.getVideoTracks()[0];
+          var audioTrack = this._lastMediaStream.getAudioTracks()[0];
+          if (videoTrack) {
+            this._lastMediaStream.removeTrack(videoTrack);
+          }
+          if (audioTrack) {
+            this._lastMediaStream.removeTrack(audioTrack);
+          }
+          this._mediaStream = this._lastMediaStream;
+          this._mediaStream.addTrack(this._audio);
+          this._mediaStream.addTrack(this._video);
+          this._isReplacing = true;
+          this._media.pause();
+          (_this$_media$play = this._media.play()) === null || _this$_media$play === void 0 ? void 0 : _this$_media$play.finally(function() {
+            _this4._isReplacing = false;
+          });
+        } else {
+          this._mediaStream = new MediaStream();
+          this._mediaStream.addTrack(this._audio);
+          this._mediaStream.addTrack(this._video);
+          this._media.srcObject = this._mediaStream;
+          var req = this._media.play();
+          if (req && req.catch) {
+            req.catch(function(e) {
+            });
+          }
+        }
+      }
     }, {
       key: "_bindMediaEvent",
       value: function _bindMediaEvent() {
@@ -5415,6 +5461,14 @@
         }
         return _connect;
       }()
+    }, {
+      key: "_closeLastPc",
+      value: function _closeLastPc() {
+        if (this._lastPc) {
+          this._lastPc.close();
+          this._lastPc = null;
+        }
+      }
     }, {
       key: "_disconnect",
       value: function _disconnect() {
@@ -5429,17 +5483,19 @@
     }, {
       key: "_emitError",
       value: function _emitError(error) {
+        this._closeLastPc();
         this.emit(EVENT.ERROR, error);
       }
     }, {
       key: "destroy",
       value: function destroy() {
-        var _this$_media2;
+        var _this$_media2, _this$_opts;
         this._disconnect();
         (_this$_media2 = this._media) === null || _this$_media2 === void 0 ? void 0 : _this$_media2.removeEventListener("timeupdate", this._mockWaitingByTimeupdate);
-        if (this._media) {
+        if (this._media && !((_this$_opts = this._opts) !== null && _this$_opts !== void 0 && _this$_opts.seamlesslyReload)) {
           this._media.srcObject = null;
         }
+        this._closeLastPc();
         if (this._pc) {
           this._pc.close();
         }
@@ -5537,15 +5593,35 @@
       }
       _this = _super.call.apply(_super, [this].concat(args));
       _defineProperty$2(_assertThisInitialized$1(_this), "_rts", null);
+      _defineProperty$2(_assertThisInitialized$1(_this), "_mediaStream", null);
       _defineProperty$2(_assertThisInitialized$1(_this), "_rtsOpts", null);
+      _defineProperty$2(_assertThisInitialized$1(_this), "_onPause", function() {
+        var _this$_rts, _this$_rts2, _this$config, _this$_rts4;
+        if (!((_this$_rts = _this._rts) !== null && _this$_rts !== void 0 && _this$_rts._pc) || (_this$_rts2 = _this._rts) !== null && _this$_rts2 !== void 0 && _this$_rts2._isReplacing) {
+          return;
+        }
+        if ((_this$config = _this.config) !== null && _this$config !== void 0 && _this$config.seamlesslyReload) {
+          var _this$_rts3;
+          _this._mediaStream = (_this$_rts3 = _this._rts) === null || _this$_rts3 === void 0 ? void 0 : _this$_rts3._mediaStream;
+        }
+        (_this$_rts4 = _this._rts) === null || _this$_rts4 === void 0 ? void 0 : _this$_rts4.destroy();
+      });
+      _defineProperty$2(_assertThisInitialized$1(_this), "_onPlay", function() {
+        var _this$_rts5, _this$_rts6;
+        if ((_this$_rts5 = _this._rts) !== null && _this$_rts5 !== void 0 && _this$_rts5._pc || (_this$_rts6 = _this._rts) !== null && _this$_rts6 !== void 0 && _this$_rts6._isReplacing) {
+          return;
+        }
+        _this._init();
+      });
       _defineProperty$2(_assertThisInitialized$1(_this), "_init", function() {
-        var _this$_rts;
-        (_this$_rts = _this._rts) === null || _this$_rts === void 0 ? void 0 : _this$_rts.destroy();
+        var _this$_rts7;
+        (_this$_rts7 = _this._rts) === null || _this$_rts7 === void 0 ? void 0 : _this$_rts7.destroy();
         var config = _this.player.config;
         var rtsOpts = config.rts || {};
         _this._rtsOpts = rtsOpts;
         _this._rts = new Rts(_objectSpread2$2({
           media: _this.player.video,
+          mediaStream: _this._mediaStream,
           preProcessUrl: function preProcessUrl(url, ext) {
             var _this$player$preProce, _this$player;
             return ((_this$player$preProce = (_this$player = _this.player).preProcessUrl) === null || _this$player$preProce === void 0 ? void 0 : _this$player$preProce.call(_this$player, url, ext)) || {
@@ -5556,36 +5632,39 @@
         }, rtsOpts));
         _this._rts.load(config.url);
       });
-      _defineProperty$2(_assertThisInitialized$1(_this), "_onSwitchURL", function(url) {
+      _defineProperty$2(_assertThisInitialized$1(_this), "_onSwitchURL", function(url, seamless) {
         if (_this._rts) {
+          if (_typeof$2(seamless) === "object") {
+            seamless = seamless.seamless;
+          }
           _this.player.config.url = url;
-          _this._rts.switchURL(url);
+          _this._rts.switchURL(url, seamless);
         }
       });
       _defineProperty$2(_assertThisInitialized$1(_this), "destroy", function() {
-        var _this$_rts2;
+        var _this$_rts8;
         _this.player.switchURL = _this._originSwitchFn;
-        (_this$_rts2 = _this._rts) === null || _this$_rts2 === void 0 ? void 0 : _this$_rts2.destroy();
+        (_this$_rts8 = _this._rts) === null || _this$_rts8 === void 0 ? void 0 : _this$_rts8.destroy();
       });
       return _this;
     }
     _createClass$2(RtsPlugin2, [{
       key: "pc",
       get: function get() {
-        var _this$_rts3;
-        return (_this$_rts3 = this._rts) === null || _this$_rts3 === void 0 ? void 0 : _this$_rts3.pc;
+        var _this$_rts9;
+        return (_this$_rts9 = this._rts) === null || _this$_rts9 === void 0 ? void 0 : _this$_rts9.pc;
       }
     }, {
       key: "videoTrack",
       get: function get() {
-        var _this$_rts4;
-        return (_this$_rts4 = this._rts) === null || _this$_rts4 === void 0 ? void 0 : _this$_rts4.videoTack;
+        var _this$_rts10;
+        return (_this$_rts10 = this._rts) === null || _this$_rts10 === void 0 ? void 0 : _this$_rts10.videoTack;
       }
     }, {
       key: "audioTrack",
       get: function get() {
-        var _this$_rts5;
-        return (_this$_rts5 = this._rts) === null || _this$_rts5 === void 0 ? void 0 : _this$_rts5.audioTrack;
+        var _this$_rts11;
+        return (_this$_rts11 = this._rts) === null || _this$_rts11 === void 0 ? void 0 : _this$_rts11.audioTrack;
       }
     }, {
       key: "core",
@@ -5595,18 +5674,18 @@
     }, {
       key: "loader",
       get: function get() {
-        var _this$_rts6;
-        return (_this$_rts6 = this._rts) === null || _this$_rts6 === void 0 ? void 0 : _this$_rts6.loader;
+        var _this$_rts12;
+        return (_this$_rts12 = this._rts) === null || _this$_rts12 === void 0 ? void 0 : _this$_rts12.loader;
       }
     }, {
       key: "version",
       get: function get() {
-        return "0.2.1-alpha.1";
+        return "0.2.1-alpha.4";
       }
     }, {
       key: "beforePlayerInit",
       value: function beforePlayerInit() {
-        var _this$player2, _this2 = this;
+        var _this$player2, _this2 = this, _this$player$config, _this$player$config$r;
         this._init();
         if (!this._originSwitchFn) {
           this._originSwitchFn = this.player.switchURL.bind(this.player);
@@ -5618,6 +5697,10 @@
         });
         this.on(URL_CHANGE, this._onSwitchURL);
         this.on(DESTROY, this.destroy);
+        if ((_this$player$config = this.player.config) !== null && _this$player$config !== void 0 && (_this$player$config$r = _this$player$config.rts) !== null && _this$player$config$r !== void 0 && _this$player$config$r.seamlesslyReload) {
+          this.on(PAUSE, this._onPause);
+          this.on(PLAY, this._onPlay);
+        }
         this._transErrorEvent();
         this._transCoreEvent(EVENT.LOAD_START);
         this._transCoreEvent(EVENT.LOAD_COMPLETE);
@@ -5647,20 +5730,20 @@
     }, {
       key: "getStats",
       value: function getStats2() {
-        var _this$_rts7;
-        return (_this$_rts7 = this._rts) === null || _this$_rts7 === void 0 ? void 0 : _this$_rts7.getStats();
+        var _this$_rts13;
+        return (_this$_rts13 = this._rts) === null || _this$_rts13 === void 0 ? void 0 : _this$_rts13.getStats();
       }
     }, {
       key: "getStatsSnapshoot",
       value: function getStatsSnapshoot2() {
-        var _this$_rts8;
-        return (_this$_rts8 = this._rts) === null || _this$_rts8 === void 0 ? void 0 : _this$_rts8.getStatsSnapshoot();
+        var _this$_rts14;
+        return (_this$_rts14 = this._rts) === null || _this$_rts14 === void 0 ? void 0 : _this$_rts14.getStatsSnapshoot();
       }
     }, {
       key: "getNetWorkInfo",
       value: function getNetWorkInfo() {
-        var _this$_rts9;
-        return (_this$_rts9 = this._rts) === null || _this$_rts9 === void 0 ? void 0 : _this$_rts9.networkStats;
+        var _this$_rts15;
+        return (_this$_rts15 = this._rts) === null || _this$_rts15 === void 0 ? void 0 : _this$_rts15.networkStats;
       }
     }, {
       key: "_transErrorEvent",
@@ -5697,14 +5780,8 @@
             }
             player.config.url = backupURL;
             if (backupConstruct) {
-              if (!Array.isArray(backupConstruct)) {
-                backupConstruct = [backupConstruct];
-              }
-              backupConstruct.forEach(function(construct) {
-                var _newPlugin$beforePlay;
-                var newPlugin = player.registerPlugin(construct);
-                (_newPlugin$beforePlay = newPlugin.beforePlayerInit) === null || _newPlugin$beforePlay === void 0 ? void 0 : _newPlugin$beforePlay.call(newPlugin);
-              });
+              var newPlugin = player.registerPlugin(backupConstruct);
+              newPlugin.beforePlayerInit();
             } else {
               player.video.src = backupURL;
             }