@byteplus/veplayer-plugin 2.5.0-rc.1 → 2.6.0-rc.0

package/esm/veplayer.plugin.ad.development.css

@@ -1,4 +1,4 @@
-.xgplayer-ads{position:absolute;left:0;top:0;width:100%;height:100%;z-index:1;display:none}.xgplayer-ad-start .xgplayer-ads{display:block}
+.xgplayer-ads{position:absolute;left:0;top:0;width:100%;height:100%;z-index:1;display:none}.xgplayer-ad-start .xgplayer-ads{display:block}.xgplayer-ad-show-ui .xgplayer-replay{display:none!important}
 .xgplayer.xgplayer-ads-playing .xgplayer-start,
 .xgplayer.xgplayer-ads-playing .xgplayer-replay {
   display: none;

package/esm/veplayer.plugin.ad.development.js

@@ -2460,8 +2460,11 @@ var AD_START = "ad_start";
 var AD_PLAY = "ad_play";
 var AD_PAUSE = "ad_pause";
 var AD_TIME_UPDATE = "ad_time_update";
+var AD_SKIPPED = "ad_skipped";
+var AD_ERROR = "ad_error";
 var AD_COMPLETE = "ad_complete";
 var AD_ALL_COMPLETED = "ad_all_completed";
+var IMA_SDK_LOAD_START = "ima_sdk_load_start";
 var IMA_SDK_LOAD_SUCCESS = "ima_sdk_load_success";
 var IMA_SDK_LOAD_ERROR = "ima_sdk_load_error";
 var IMA_AD_LOADER_READY = "ima_ad_loader_ready";
@@ -4752,6 +4755,18 @@ var BasePlugin = /* @__PURE__ */ function() {
         }
       }
     }
+  }, {
+    key: "defineMethod",
+    value: function defineMethod(Obj, map3) {
+      for (var key in map3) {
+        if (Object.prototype.hasOwnProperty.call(map3, key) && typeof map3[key] === "function") {
+          Object.defineProperty(Obj, key, {
+            configurable: true,
+            value: map3[key]
+          });
+        }
+      }
+    }
   }, {
     key: "defaultConfig",
     get: function get2() {
@@ -6711,7 +6726,7 @@ var Fullscreen = /* @__PURE__ */ function(_IconPlugin) {
   }, {
     key: "toggleFullScreen",
     value: function toggleFullScreen(e) {
-      if (e) {
+      if (e instanceof Event) {
         e.preventDefault();
         e.stopPropagation();
       }
@@ -7980,16 +7995,18 @@ var ImaAdManager = /* @__PURE__ */ function(_BaseAdManager) {
       _this._handleAdError(ev.getError());
     });
     _defineProperty$2(_assertThisInitialized$1(_this), "_handleAdError", function(error) {
-      var _this$adsManager3;
+      var _this$adsManager3, _this$plugin, _this$plugin2;
       logger$1.log("AdError", error);
       _this.shouldBlockVideoContent = false;
       _this.isLinearAdRunning = false;
       (_this$adsManager3 = _this.adsManager) === null || _this$adsManager3 === void 0 ? void 0 : _this$adsManager3.destroy();
-      _this.player.emit(IMA_AD_ERROR, error);
+      (_this$plugin = _this.plugin) === null || _this$plugin === void 0 ? void 0 : _this$plugin.emit(IMA_AD_ERROR, error);
+      (_this$plugin2 = _this.plugin) === null || _this$plugin2 === void 0 ? void 0 : _this$plugin2.emit(AD_ERROR, error);
     });
     _defineProperty$2(_assertThisInitialized$1(_this), "onAdEvent", function(ev) {
       var _assertThisInitialize2 = _assertThisInitialized$1(_this), player = _assertThisInitialize2.player;
       var ad = ev === null || ev === void 0 ? void 0 : ev.getAd();
+      var adData = (ev === null || ev === void 0 ? void 0 : ev.getAdData()) || (ad === null || ad === void 0 ? void 0 : ad.data);
       var intervalTimer;
       var printJsonLog = false;
       switch (ev === null || ev === void 0 ? void 0 : ev.type) {
@@ -8000,7 +8017,7 @@ var ImaAdManager = /* @__PURE__ */ function(_BaseAdManager) {
           break;
         }
         case google.ima.AdEvent.Type.LOADED: {
-          var _ev$getAdData = ev.getAdData(), adPodInfo = _ev$getAdData.adPodInfo;
+          var _ref = adData || {}, adPodInfo = _ref.adPodInfo;
           var isPreroll = (adPodInfo === null || adPodInfo === void 0 ? void 0 : adPodInfo.podIndex) === 0;
           printJsonLog = true;
           if (isPreroll) {
@@ -8011,8 +8028,13 @@ var ImaAdManager = /* @__PURE__ */ function(_BaseAdManager) {
               _this.tryContentPlay();
             }
           }
+          _this.emit(IMA_AD_LOADED, {
+            ad,
+            isPreroll
+          });
           _this.plugin.emit(IMA_AD_LOADED, {
-            ad
+            ad,
+            isPreroll
           });
           break;
         }
@@ -8061,8 +8083,14 @@ var ImaAdManager = /* @__PURE__ */ function(_BaseAdManager) {
           });
           break;
         }
+        case google.ima.AdEvent.Type.SKIPPED: {
+          _this.plugin.emit(AD_SKIPPED, {
+            ad
+          });
+          break;
+        }
         case google.ima.AdEvent.Type.AD_PROGRESS: {
-          var _ev$getAdData2 = ev.getAdData(), currentTime = _ev$getAdData2.currentTime, duration = _ev$getAdData2.duration;
+          var _ev$getAdData = ev.getAdData(), currentTime = _ev$getAdData.currentTime, duration = _ev$getAdData.duration;
           Object.assign(_this.context, {
             currentTime,
             duration
@@ -8073,14 +8101,21 @@ var ImaAdManager = /* @__PURE__ */ function(_BaseAdManager) {
           break;
         }
         case google.ima.AdEvent.Type.COMPLETE: {
+          var _ref2 = adData || {}, _adPodInfo = _ref2.adPodInfo;
+          var hasNextInPod = false;
           if (ad !== null && ad !== void 0 && ad.isLinear()) {
+            if (_adPodInfo) {
+              hasNextInPod = _adPodInfo.adPosition < _adPodInfo.totalAds;
+            }
             clearInterval(intervalTimer);
           }
           _this.plugin.emit(IMA_AD_COMPLETE, {
-            ad
+            ad,
+            hasNextInPod
           });
           _this.plugin.emit(AD_COMPLETE, {
-            ad
+            ad,
+            hasNextInPod
           });
           break;
         }
@@ -8119,30 +8154,31 @@ var ImaAdManager = /* @__PURE__ */ function(_BaseAdManager) {
               case 0:
                 this.shouldBlockVideoContent = !!(this.config.adTagUrl || this.config.adsResponse || this.config.adsRequest);
                 _context.prev = 1;
-                _context.next = 4;
+                this.emit(IMA_SDK_LOAD_START);
+                _context.next = 5;
                 return this._loadIMASdk();
-              case 4:
+              case 5:
                 this.emit(IMA_SDK_LOAD_SUCCESS);
-                _context.next = 13;
+                _context.next = 14;
                 break;
-              case 7:
-                _context.prev = 7;
+              case 8:
+                _context.prev = 8;
                 _context.t0 = _context["catch"](1);
                 logger$1.error("google.ima sdk is not loaded, due to error", (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || _context.t0);
                 this.emit(IMA_SDK_LOAD_ERROR);
                 this.shouldBlockVideoContent = false;
                 return _context.abrupt("return");
-              case 13:
+              case 14:
                 this._initConfig();
                 this._initMediaEvents();
                 this._initContainer();
                 this._initLoader();
                 this._initAdsRequest();
-              case 18:
+              case 19:
               case "end":
                 return _context.stop();
             }
-        }, _callee, this, [[1, 7]]);
+        }, _callee, this, [[1, 8]]);
       }));
       function init() {
         return _init.apply(this, arguments);
@@ -8399,14 +8435,14 @@ var ImaAdManager = /* @__PURE__ */ function(_BaseAdManager) {
                 _context3.next = 4;
                 return Promise.all([autoplay ? index.video({
                   timeout
-                }).then(function(_ref) {
-                  var result = _ref.result;
+                }).then(function(_ref3) {
+                  var result = _ref3.result;
                   return result;
                 }) : Promise.resolve(false), autoplay && this.player.config.autoplayMuted ? index.video({
                   timeout,
                   muted: true
-                }).then(function(_ref2) {
-                  var result = _ref2.result;
+                }).then(function(_ref4) {
+                  var result = _ref4.result;
                   return result;
                 }) : Promise.resolve(false)]);
               case 4:
@@ -8432,7 +8468,8 @@ var ImaAdManager = /* @__PURE__ */ function(_BaseAdManager) {
   return ImaAdManager2;
 }(BaseAdManager);
 var AD_STATE_CLASS = {
-  START: "xgplayer-ad-start"
+  START: "xgplayer-ad-start",
+  UI_SHOW: "xgplayer-ad-show-ui"
 };
 var AdPlayIcon = /* @__PURE__ */ function(_PlayIcon) {
   _inherits$1(AdPlayIcon2, _PlayIcon);
@@ -8584,9 +8621,9 @@ var AdTimeIcon = /* @__PURE__ */ function(_TimeIcon) {
   return AdTimeIcon2;
 }(Time);
 var AdUIManager = /* @__PURE__ */ function() {
-  function AdUIManager2(config, _ref) {
-    var player = _ref.player, plugin2 = _ref.plugin;
+  function AdUIManager2(config, options) {
     _classCallCheck$2(this, AdUIManager2);
+    var player = options.player, plugin2 = options.plugin;
     this.player = player;
     this.config = config;
     this.adPlugin = plugin2;
@@ -8601,8 +8638,8 @@ var AdUIManager = /* @__PURE__ */ function() {
     key: "init",
     value: function init() {
       var player = this.player, adUIPlugins = this.adUIPlugins, fragment = this.fragment, decoratedAdPluginList = this.decoratedAdPluginList;
-      decoratedAdPluginList.forEach(function(_ref2) {
-        var _ref3 = _slicedToArray(_ref2, 2), targetClass = _ref3[0], decoratorClass = _ref3[1];
+      decoratedAdPluginList.forEach(function(_ref) {
+        var _ref2 = _slicedToArray(_ref, 2), targetClass = _ref2[0], decoratorClass = _ref2[1];
         var targetPlugin = player.getPlugin(targetClass.pluginName);
         if (targetPlugin) {
           var newDecoratorPlugin = null;
@@ -8615,6 +8652,15 @@ var AdUIManager = /* @__PURE__ */ function() {
         }
       });
     }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      this.fragment = null;
+      this.adUIPlugins = [];
+      this.decoratedAdPluginList = [];
+      this.adPlugin = null;
+      this.player = null;
+    }
   }, {
     key: "initEvents",
     value: function initEvents() {
@@ -8630,7 +8676,16 @@ var AdUIManager = /* @__PURE__ */ function() {
       adPlugin.on(AD_START, function() {
         _this.showAdContainer();
       });
-      adPlugin.on(AD_COMPLETE, function() {
+      adPlugin.on(AD_COMPLETE, function(_ref3) {
+        var hasNextInPod = _ref3.hasNextInPod;
+        if (!hasNextInPod) {
+          _this.hideAdContainer();
+        }
+      });
+      adPlugin.on(AD_SKIPPED, function() {
+        _this.hideAdContainer();
+      });
+      adPlugin.on(AD_ERROR, function() {
         _this.hideAdContainer();
       });
     }
@@ -8686,6 +8741,7 @@ var AdUIManager = /* @__PURE__ */ function() {
         this.hideControls();
       }
       this.showAdContainer();
+      player.addClass(AD_STATE_CLASS.UI_SHOW);
     }
   }, {
     key: "hideAdUI",
@@ -8736,6 +8792,7 @@ var AdUIManager = /* @__PURE__ */ function() {
           }, 10);
         });
       }
+      player.removeClass(AD_STATE_CLASS.UI_SHOW);
     }
   }, {
     key: "hideControls",
@@ -8812,7 +8869,7 @@ var AdsPlugin$1 = /* @__PURE__ */ function(_Plugin) {
   _createClass$2(AdsPlugin2, [{
     key: "version",
     get: function get2() {
-      return "3.0.20-alpha.7";
+      return "3.0.20-alpha.8";
     }
   }, {
     key: "paused",
@@ -8881,6 +8938,18 @@ var AdsPlugin$1 = /* @__PURE__ */ function(_Plugin) {
         config: this.config.ima,
         displayContainer: this.root
       });
+      this.csManager.once(IMA_SDK_LOAD_START, function() {
+        _this.uiManager.showAdContainer();
+      });
+      this.csManager.on(IMA_SDK_LOAD_ERROR, function() {
+        _this.uiManager.hideAdContainer();
+      });
+      this.csManager.once(IMA_AD_LOADED, function(_ref) {
+        var isPreroll = _ref.isPreroll;
+        if (!isPreroll) {
+          _this.uiManager.hideAdContainer();
+        }
+      });
       this.csManager.once(IMA_READY_TO_PLAY, function() {
         var _this$initPromise;
         (_this$initPromise = _this.initPromise) === null || _this$initPromise === void 0 ? void 0 : _this$initPromise.resolve();
@@ -8920,8 +8989,10 @@ var AdsPlugin$1 = /* @__PURE__ */ function(_Plugin) {
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$csManager9;
+      var _this$csManager9, _this$uiManager;
+      this.offAll();
       (_this$csManager9 = this.csManager) === null || _this$csManager9 === void 0 ? void 0 : _this$csManager9.destroy();
+      (_this$uiManager = this.uiManager) === null || _this$uiManager === void 0 ? void 0 : _this$uiManager.destroy();
     }
   }, {
     key: "reset",
@@ -12976,7 +13047,7 @@ var sort$1 = sort$2;
 var sort2 = sort$1;
 var _sortInstanceProperty = /* @__PURE__ */ getDefaultExportFromCjs(sort2);
 function scheduleToVmap(schedule) {
-  var _context;
+  var _context, _context2;
   if (!schedule || !schedule.length) {
     return;
   }
@@ -12986,7 +13057,10 @@ function scheduleToVmap(schedule) {
   var midRollCount = 0;
   var curMidRoll;
   var curMidRollAdsCount = 0;
-  _forEachInstanceProperty(_context = _sortInstanceProperty(schedule).call(schedule, function(a, b) {
+  _forEachInstanceProperty(_context = _sortInstanceProperty(_context2 = _filterInstanceProperty(schedule).call(schedule, function(_ref) {
+    var offset = _ref.offset;
+    return offset === "pre" || offset === "post" || /^(\d\d):([0-5]\d):([0-5]\d)(.\d\d\d)?$/.test(offset);
+  })).call(_context2, function(a, b) {
     if (a.offset === "pre" || b.offset === "post") {
       return -1;
     }
@@ -12994,9 +13068,9 @@ function scheduleToVmap(schedule) {
       return 1;
     }
     return Date.parse("2024-01-01T".concat(a.offset)) < Date.parse("2024-01-01T".concat(b.offset)) ? -1 : 1;
-  })).call(_context, function(_ref) {
-    var _context2;
-    var offset = _ref.offset, type = _ref.type, tag = _ref.tag;
+  })).call(_context, function(_ref2) {
+    var _context3;
+    var offset = _ref2.offset, type = _ref2.type, tag = _ref2.tag;
     var timeOffset;
     var breakId;
     switch (offset) {
@@ -13026,7 +13100,7 @@ function scheduleToVmap(schedule) {
     adBreakElement.setAttribute("breakType", type || "linear");
     root[0].appendChild(adBreakElement);
     var adSourceElement = vmapXml.createElement("vmap:AdSource");
-    adSourceElement.setAttribute("id", _concatInstanceProperty(_context2 = "".concat(breakId, "-ad-")).call(_context2, curMidRollAdsCount));
+    adSourceElement.setAttribute("id", _concatInstanceProperty(_context3 = "".concat(breakId, "-ad-")).call(_context3, curMidRollAdsCount));
     adSourceElement.setAttribute("allowMultipleAds", "true");
     adSourceElement.setAttribute("followRedirects", "true");
     adBreakElement.appendChild(adSourceElement);
@@ -13060,10 +13134,10 @@ var AdsPlugin = /* @__PURE__ */ function(_XGAdsPlugin) {
       var ad = _ref.ad;
       if (isPrerollAd(ad)) {
         var _this$player$plugins$, _this$player$plugins$2;
-        (_this$player$plugins$ = (_this$player$plugins$2 = _this.player.plugins.autoplayplugin).handleAutoplayStart) === null || _this$player$plugins$ === void 0 ? void 0 : _this$player$plugins$.call(_this$player$plugins$2);
+        (_this$player$plugins$ = _this.player.plugins.autoplayplugin) === null || _this$player$plugins$ === void 0 || (_this$player$plugins$2 = _this$player$plugins$.handleAutoplayStart) === null || _this$player$plugins$2 === void 0 ? void 0 : _this$player$plugins$2.call(_this$player$plugins$);
         _this.player.once(VOLUME_CHANGE, function() {
           var _this$player$plugins$3, _this$player$plugins$4;
-          (_this$player$plugins$3 = (_this$player$plugins$4 = _this.player.plugins.autoplayplugin).initState) === null || _this$player$plugins$3 === void 0 ? void 0 : _this$player$plugins$3.call(_this$player$plugins$4);
+          (_this$player$plugins$3 = _this.player.plugins.autoplayplugin) === null || _this$player$plugins$3 === void 0 || (_this$player$plugins$4 = _this$player$plugins$3.initState) === null || _this$player$plugins$4 === void 0 ? void 0 : _this$player$plugins$4.call(_this$player$plugins$3);
         });
       }
     });
@@ -13104,9 +13178,7 @@ var AdsPlugin = /* @__PURE__ */ function(_XGAdsPlugin) {
       if (!((_this$config$ima2 = this.config.ima) !== null && _this$config$ima2 !== void 0 && _this$config$ima2.adTagUrl) && (_this$config$ima3 = this.config.ima) !== null && _this$config$ima3 !== void 0 && (_this$config$ima3 = _this$config$ima3.schedule) !== null && _this$config$ima3 !== void 0 && _this$config$ima3.length) {
         this.config.ima.adsResponse = scheduleToVmap(this.config.ima.schedule);
       }
-      if (this.player.plugins.autoplayplugin) {
-        this.player.once(AD_PLAY, this._handlePrerollMuted);
-      }
+      this.player.once(AD_PLAY, this._handlePrerollMuted);
     }
   }], [{
     key: "pluginName",

package/esm/veplayer.plugin.ad.production.css

@@ -1 +1 @@
-.xgplayer-ads{position:absolute;left:0;top:0;width:100%;height:100%;z-index:1;display:none}.xgplayer-ad-start .xgplayer-ads{display:block}.xgplayer.xgplayer-ads-playing .xgplayer-start,.xgplayer.xgplayer-ads-playing .xgplayer-replay{display:none}.xgplayer.xgplayer-ads-playing .xgplayer-ads{z-index:6}.xgplayer.xgplayer-ads-playing.xgplayer-is-enter .xgplayer-enter{display:none}
+.xgplayer-ads{position:absolute;left:0;top:0;width:100%;height:100%;z-index:1;display:none}.xgplayer-ad-start .xgplayer-ads{display:block}.xgplayer-ad-show-ui .xgplayer-replay{display:none!important}.xgplayer.xgplayer-ads-playing .xgplayer-start,.xgplayer.xgplayer-ads-playing .xgplayer-replay{display:none}.xgplayer.xgplayer-ads-playing .xgplayer-ads{z-index:6}.xgplayer.xgplayer-ads-playing.xgplayer-is-enter .xgplayer-enter{display:none}