xgplayer 3.0.12-rc.0 → 3.0.13

package/es/player.d.ts

@@ -11,15 +11,25 @@ declare class Player extends MediaProxy {
      */
     static set debugger(arg: number);
     static get debugger(): number;
+    /**
+     * @param {import('./instManager').InstManager} value
+     */
+    static set instManager(arg: InstManager);
+    /**
+     * @param {import('./instManager').InstManager} value
+     */
+    static get instManager(): InstManager;
     /**
      * 获取当前处理激活态的实例id
      * @returns { number | string | null }
+     * @deprecated 该方法转移到 InstManager 上去使用: player.instManager.getActiveId()
      */
     static getCurrentUserActivePlayerId(): number | string | null;
     /**
      * 设置实例的用户行为激活状态
      * @param { number | string } playerId
      * @param { boolean } isActive
+     * @deprecated 该方法转移到 InstManager 上去使用: player.instManager.setActive()
      */
     static setCurrentUserActive(playerId: number | string, isActive: boolean): void;
     /**
@@ -68,6 +78,12 @@ declare class Player extends MediaProxy {
      * @private
      */
     private waitTimer;
+    /**
+     * @public
+     * @description This switch provides the playback plugin with the ability
+     *  to handle media source by itself.
+     */
+    public handleSource: boolean;
     /**
      * @private
      */
@@ -96,6 +112,7 @@ declare class Player extends MediaProxy {
     private readonly _useAutoplay;
     /**
      * @description 记录起播需要seek的时间点
+     * @type { number }
      * @private
      * @readonly
      */
@@ -249,6 +266,10 @@ declare class Player extends MediaProxy {
     readonly innerStates: {
         isActiveLocked: boolean;
     };
+    /**
+     * @type {InstManager}
+     */
+    instManager: InstManager;
     /**
      * init control domElement
      * @private
@@ -279,10 +300,10 @@ declare class Player extends MediaProxy {
     private _unbindEvents;
     /**
      *
-     * @param { any } url
+     * @param { any } [url]
      * @returns
      */
-    _startInit(url: any): void;
+    _startInit(url?: any): void;
     set hasStart(arg: boolean);
     /**
      * @type { boolean }
@@ -378,11 +399,11 @@ declare class Player extends MediaProxy {
     removeAttribute(key: string, value: any): void;
     /**
      *
-     * @param { any } url
+     * @param { any } [url]
      * @returns { Promise<void> | void }
      * @description 启动播放器，start一般都是播放器内部隐式调用，主要功能是将video添加到DOM
      */
-    start(url: any): Promise<void> | void;
+    start(url?: any): Promise<void> | void;
     /**
      * @param { string | object } url
      * @param { boolean | {
@@ -397,7 +418,6 @@ declare class Player extends MediaProxy {
         currentTime?: number;
         bitrate?: number;
     }): Promise<any> | null;
-    currentTime: any;
     /**
      * @description call play without play hook
      * @deprecated this api renamed to mediaPlay, you can call it as player.mediaPlay()
@@ -656,7 +676,7 @@ declare class Player extends MediaProxy {
      * @param { {[propName: string]: any} } [ext]
      * @returns { url: IUrl, [propName: string]: any }
      */
-    preProcessUrl(url: IUrl, ext?: {
+    _preProcessUrl(url: IUrl, ext?: {
         [propName: string]: any;
     }): import("./defaultConfig").IUrl;
     /**
@@ -737,7 +757,7 @@ declare class Player extends MediaProxy {
     get fullscreenChanging(): boolean;
     /**
      * 累计观看时长
-     * @type number
+     * @type { number }
      */
     get cumulateTime(): number;
     /**
@@ -818,7 +838,6 @@ declare class Player extends MediaProxy {
      * @param { boolean } [isMuted]
      */
     setUserActive(isActive: boolean, isMuted?: boolean): void;
-    muted: any;
 }
 import Plugin from "./plugin/plugin";
 import BasePlugin from "./plugin/basePlugin";
@@ -829,4 +848,5 @@ import Util from "./utils/util";
 import STATE_CLASS from "./stateClassMap";
 import I18N from "./lang/i18n";
 import MediaProxy from "./mediaProxy";
+import { InstManager } from "./instManager";
 export { Player as default, Plugin, BasePlugin, Events, Errors, Sniffer, Util, STATE_CLASS, I18N };

package/es/player.js

@@ -27,9 +27,11 @@ import I18N from "./lang/i18n.js";
 export { default as I18N } from "./lang/i18n.js";
 import version from "./version.js";
 import { STATES, STATE_ARRAY } from "./state.js";
+import { InstManager, checkPlayerRoot } from "./instManager.js";
 var PlAYER_HOOKS = ["play", "pause", "replay", "retry"];
 var REAL_TIME_SPEED = 0;
 var AVG_SPEED = 0;
+var instManager = null;
 var Player = /* @__PURE__ */ function(_MediaProxy) {
   _inherits(Player2, _MediaProxy);
   var _super = _createSuper(Player2);
@@ -131,6 +133,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
     }
     _this.userTimer = null;
     _this.waitTimer = null;
+    _this.handleSource = true;
     _this._state = STATES.INITIAL;
     _this.isError = false;
     _this._hasStart = false;
@@ -192,6 +195,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
     _this.innerStates = {
       isActiveLocked: false
     };
+    _this.instManager = instManager;
     var rootInit = _this._initDOM();
     if (!rootInit) {
       console.error(new Error("can't find the dom which id is ".concat(_this.config.id, " or this.config.el does not exist")));
@@ -229,7 +233,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
   _createClass(Player2, [{
     key: "_initDOM",
     value: function _initDOM() {
-      var _this2 = this;
+      var _instManager, _this2 = this;
       this.root = this.config.id ? document.getElementById(this.config.id) : null;
       if (!this.root) {
         var el = this.config.el;
@@ -245,12 +249,13 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
           return false;
         }
       }
-      var ret = pluginsManager.checkPlayerRoot(this.root);
+      var ret = checkPlayerRoot(this.root);
       if (ret) {
         XG_DEBUG.logWarn("The is an Player instance already exists in this.root, destroy it and reinitialize");
         ret.destroy();
       }
       this.root.setAttribute(PLATER_ID, this.playerId);
+      (_instManager = instManager) === null || _instManager === void 0 ? void 0 : _instManager.add(this);
       pluginsManager.init(this);
       this._initBaseDoms();
       var XgVideoProxy = this.constructor.XgVideoProxy;
@@ -372,13 +377,15 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
           return;
         }
       }
-      this._detachSourceEvents(this.media);
-      if (util.typeOf(url) === "Array" && url.length > 0) {
-        this._attachSourceEvents(this.media, url);
-      } else if (!this.media.src || this.media.src !== url) {
-        this.media.src = url;
-      } else if (!url) {
-        this.media.removeAttribute("src");
+      if (this.handleSource) {
+        this._detachSourceEvents(this.media);
+        if (util.typeOf(url) === "Array" && url.length > 0) {
+          this._attachSourceEvents(this.media, url);
+        } else if (!this.media.src || this.media.src !== url) {
+          this.media.src = url;
+        } else if (!url) {
+          this.media.removeAttribute("src");
+        }
       }
       if (util.typeOf(this.config.volume) === "Number") {
         this.volume = this.config.volume;
@@ -621,7 +628,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
         if (!url) {
           url = _this8.url || _this8.config.url;
         }
-        var _furl = _this8.preProcessUrl(url);
+        var _furl = _this8._preProcessUrl(url);
         var ret = _this8._startInit(_furl.url);
         return ret;
       }).catch(function(e) {
@@ -639,7 +646,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       if (util.typeOf(url) === "Object") {
         _src = url.url;
       }
-      _src = this.preProcessUrl(_src).url;
+      _src = this._preProcessUrl(_src).url;
       var curTime = this.currentTime;
       this.__startTime = curTime;
       var isPaused = this.paused && !this.isError;
@@ -910,7 +917,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this18 = this;
+      var _instManager2, _this18 = this;
       var innerContainer = this.innerContainer, root = this.root, media = this.media;
       if (!root || !media) {
         return;
@@ -923,6 +930,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       this._detachSourceEvents(this.media);
       util.clearAllTimers(this);
       this.emit(DESTROY);
+      (_instManager2 = instManager) === null || _instManager2 === void 0 ? void 0 : _instManager2.remove(this);
       pluginsManager.destroy(this);
       delHooksDescriptor(this);
       _get(_getPrototypeOf(Player2.prototype), "destroy", this).call(this);
@@ -983,7 +991,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       runHooks(this, "retry", function() {
         var cur = _this20.currentTime;
         var url = _this20.config.url;
-        var _srcRet = !util.isMSE(_this20.media) ? _this20.preProcessUrl(url) : {
+        var _srcRet = !util.isMSE(_this20.media) ? _this20._preProcessUrl(url) : {
           url
         };
         _this20.src = _srcRet.url;
@@ -1459,8 +1467,9 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
   }, {
     key: "resizePosition",
     value: function resizePosition() {
-      var _this$videoPos = this.videoPos, rotate = _this$videoPos.rotate, vy = _this$videoPos.vy, vx = _this$videoPos.vx, h = _this$videoPos.h, w = _this$videoPos.w;
-      if (rotate < 0 && !vy && !vx) {
+      var _this$videoPos = this.videoPos, vy = _this$videoPos.vy, vx = _this$videoPos.vx, h = _this$videoPos.h, w = _this$videoPos.w;
+      var rotate = this.videoPos.rotate;
+      if (rotate < 0 && h < 0 && w < 0) {
         return;
       }
       var _pi = this.videoPos._pi;
@@ -1471,13 +1480,14 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
         return;
       }
       this.videoPos.pi = _pi;
+      rotate = rotate < 0 ? 0 : rotate;
       var _pos = {
         rotate
       };
       var offsetY = 0;
       var offsetX = 0;
       var scale = 1;
-      var _t = rotate < 0 ? 0 : Math.abs(rotate / 90);
+      var _t = Math.abs(rotate / 90);
       var root = this.root, innerContainer = this.innerContainer;
       var width = root.offsetWidth;
       var height = innerContainer ? innerContainer.offsetHeight : root.offsetHeight;
@@ -1634,10 +1644,10 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       this._state = newState;
     }
   }, {
-    key: "preProcessUrl",
-    value: function preProcessUrl(url, ext) {
-      var preProcessUrl2 = this.config.preProcessUrl;
-      return !util.isBlob(url) && preProcessUrl2 && typeof preProcessUrl2 === "function" ? preProcessUrl2(url, ext) : {
+    key: "_preProcessUrl",
+    value: function _preProcessUrl(url, ext) {
+      var preProcessUrl = this.config.preProcessUrl;
+      return !util.isBlob(url) && typeof preProcessUrl === "function" ? preProcessUrl(url, ext) : {
         url
       };
     }
@@ -1903,7 +1913,8 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
     }
   }, {
     key: "setUserActive",
-    value: function setUserActive(isActive, isMuted) {
+    value: function setUserActive(isActive) {
+      var isMuted = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
       if (typeof isMuted === "boolean" && isMuted !== this.muted) {
         this.addInnerOP("volumechange");
         this.muted = isMuted;
@@ -1918,15 +1929,25 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
     set: function set(value) {
       XG_DEBUG.config.debug = value;
     }
+  }, {
+    key: "instManager",
+    get: function get() {
+      return instManager;
+    },
+    set: function set(value) {
+      instManager = value;
+    }
   }, {
     key: "getCurrentUserActivePlayerId",
     value: function getCurrentUserActivePlayerId() {
-      return pluginsManager.getCurrentUseActiveId();
+      var _instManager3;
+      return (_instManager3 = instManager) === null || _instManager3 === void 0 ? void 0 : _instManager3.getActiveId();
     }
   }, {
     key: "setCurrentUserActive",
     value: function setCurrentUserActive(playerId, isActive) {
-      pluginsManager.setCurrentUserActive(playerId, isActive);
+      var _instManager4;
+      (_instManager4 = instManager) === null || _instManager4 === void 0 ? void 0 : _instManager4.setActive(playerId, isActive);
     }
   }, {
     key: "isHevcSupported",
@@ -1961,4 +1982,5 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
 }(MediaProxy);
 _defineProperty(Player, "defaultPreset", null);
 _defineProperty(Player, "XgVideoProxy", null);
+Player.instManager = InstManager.getInstance();
 export { Player as default };

package/es/plugin/basePlugin.d.ts

@@ -79,10 +79,10 @@ declare class BasePlugin {
     afterPlayerInit(): void;
     destroy(): void;
     /**
-     * @private
+     * @protected
      * @param { any } args
      */
-    private __init;
+    protected __init(args: any): void;
     logger: any;
     /**
      * 更新语言

package/es/plugin/plugin.d.ts

@@ -29,7 +29,7 @@ export type IPluginOptions = {
 declare class Plugin extends BasePlugin {
     /**
       * 插入dom结构
-      * @param { String | HTMLElement } html html字符串或者dom
+      * @param { string | HTMLElement } html html字符串或者dom
       * @param { HTMLElement } parent
       * @param { number } index
       * @returns { HTMLElement }
@@ -39,8 +39,8 @@ declare class Plugin extends BasePlugin {
     /**
      *
      * @param { HTMLElement } root
-     * @param { String } querySelector
-     * @param { String | Array<String> } eventType
+     * @param { string } querySelector
+     * @param { string | Array<string> } eventType
      * @param { Function } callback
      * @param { boolean } [capture=false]
      * @returns
@@ -70,9 +70,9 @@ declare class Plugin extends BasePlugin {
      */
     private __delegates;
     /**
-     * @private
+     * @protected
      */
-    private __init;
+    protected __init(args: any): void;
     /**
      * @readonly
      */
@@ -167,11 +167,10 @@ declare class Plugin extends BasePlugin {
      */
     unbindEL(event: string, eventHandle: Function, isBubble?: boolean): void;
     /**
-     *
      * @param { string } [value]
      * @returns
      */
-    show(value?: string): string;
+    show(value?: string): void;
     hide(): void;
     /**
      *

package/es/plugin/plugin.js

@@ -397,7 +397,7 @@ var Plugin = /* @__PURE__ */ function(_BasePlugin) {
       var cs = window.getComputedStyle(this.root, null);
       var cssDisplayValue = cs.getPropertyValue("display");
       if (cssDisplayValue === "none") {
-        return this.root.style.display = "block";
+        this.root.style.display = "block";
       }
     }
   }, {

package/es/plugin/pluginsManager.d.ts

@@ -3,16 +3,6 @@ declare namespace pluginsManager {
     const pluginGroup: {};
     function init(player: any): void;
     function init(player: any): void;
-    /**
-     * Check whether there is a player instance in the current dom
-     * @param {Element} root
-     */
-    function checkPlayerRoot(root: Element): any;
-    /**
-     * Check whether there is a player instance in the current dom
-     * @param {Element} root
-     */
-    function checkPlayerRoot(root: Element): any;
     function formatPluginInfo(plugin: any, config: any): {
         PLUFGIN: any;
         options: any;
@@ -133,30 +123,6 @@ declare namespace pluginsManager {
     function reRender(player: any): void;
     function onPluginsReady(player: any): void;
     function onPluginsReady(player: any): void;
-    /**
-     * 设置实例的用户行为激活状态
-     * @param { number | string } playerId
-     * @param { boolean } isActive
-     * @returns { number | null }
-     */
-    function setCurrentUserActive(playerId: string | number, isActive: boolean): number;
-    /**
-     * 设置实例的用户行为激活状态
-     * @param { number | string } playerId
-     * @param { boolean } isActive
-     * @returns { number | null }
-     */
-    function setCurrentUserActive(playerId: string | number, isActive: boolean): number;
-    /**
-     * 获取当前处理激活态的实例id
-     * @returns { number | null }
-     */
-    function getCurrentUseActiveId(): number;
-    /**
-     * 获取当前处理激活态的实例id
-     * @returns { number | null }
-     */
-    function getCurrentUseActiveId(): number;
     function destroy(player: any): void;
     function destroy(player: any): void;
 }

package/es/plugin/pluginsManager.js

@@ -11,28 +11,11 @@ var pluginsManager = {
     !player.config.closeResizeObserver && addObserver(player.root, function() {
       player.resize();
     });
-    if (Object.keys(this.pluginGroup).length === 0) {
-      player.isUserActive = true;
-    }
     this.pluginGroup[cgid] = {
-      _player: player,
       _originalOptions: player.config || {},
       _plugins: {}
     };
   },
-  checkPlayerRoot: function checkPlayerRoot(root) {
-    if (this.pluginGroup) {
-      var _keys = Object.keys(this.pluginGroup);
-      for (var i = 0; i < _keys.length; i++) {
-        var _p = this.pluginGroup[_keys[i]]._player;
-        if (_p.root === root) {
-          return _p;
-        }
-      }
-      return null;
-    }
-    return null;
-  },
   formatPluginInfo: function formatPluginInfo(plugin, config) {
     var PLUFGIN = null;
     var options = null;
@@ -107,7 +90,7 @@ var pluginsManager = {
     }
     var plugins = this.pluginGroup[cgid]._plugins;
     var originalOptions = this.pluginGroup[cgid]._originalOptions;
-    options.player = this.pluginGroup[cgid]._player;
+    options.player = player;
     var pluginName = options.pluginName || plugin.pluginName;
     if (!pluginName) {
       throw new Error("The property pluginName is necessary");
@@ -306,37 +289,6 @@ var pluginsManager = {
       }
     });
   },
-  setCurrentUserActive: function setCurrentUserActive(playerId, isActive) {
-    if (!this.pluginGroup[playerId]) {
-      return;
-    }
-    if (!isActive) {
-      this.pluginGroup[playerId]._player.isUserActive = isActive;
-      return playerId;
-    }
-    var keys = Object.keys(this.pluginGroup);
-    for (var i = 0; i < keys.length; i++) {
-      var c = this.pluginGroup[keys[i]];
-      if (c && c._player) {
-        this.pluginGroup[keys[i]]._player.isUserActive = false;
-      }
-    }
-    this.pluginGroup[playerId]._player.isUserActive = isActive;
-    return playerId;
-  },
-  getCurrentUseActiveId: function getCurrentUseActiveId() {
-    if (!this.pluginGroup) {
-      return;
-    }
-    var keys = Object.keys(this.pluginGroup);
-    for (var i = 0; i < keys.length; i++) {
-      var c = this.pluginGroup[keys[i]];
-      if (c && c._player && c._player.isUserActive) {
-        return keys[i];
-      }
-    }
-    return null;
-  },
   destroy: function destroy(player) {
     var cgid = player._pluginInfoId;
     if (!this.pluginGroup[cgid]) {

package/es/plugins/common/optionsIcon.d.ts

@@ -10,7 +10,6 @@ export default class OptionsIcon extends Plugin {
     curIndex: number;
     activeEvent: string;
     initIcons(): void;
-    show(): void;
     getTextByLang(item: any, key: any, lang: any): any;
     onEnter: (e: any) => void;
     switchActiveState: (e: any) => void;

package/es/plugins/common/optionsIcon.js

@@ -133,7 +133,7 @@ var OptionsIcon = /* @__PURE__ */ function(_Plugin) {
     }
   }, {
     key: "show",
-    value: function show() {
+    value: function show(value) {
       if (!this.config.list || this.config.list.length < 2) {
         return;
       }

package/es/plugins/controls/index.d.ts

@@ -48,7 +48,6 @@ declare class Controls extends Plugin {
     blur(): void;
     recoverAutoHide(): void;
     pauseAutoHide(): void;
-    show(): void;
     /**
      * @type {string}
      */

package/es/plugins/controls/index.js

@@ -98,7 +98,7 @@ var Controls = /* @__PURE__ */ function(_Plugin) {
     }
   }, {
     key: "show",
-    value: function show() {
+    value: function show(value) {
       this.root.style.display = "";
       this.player.focus();
     }

package/es/plugins/danmu/index.d.ts

@@ -60,6 +60,7 @@ declare class Danmu extends Plugin {
     seekCost: number;
     /**
      * @readonly
+     * @type {number}
      */
     readonly intervalId: number;
     /**

package/es/plugins/definition/index.js

@@ -48,7 +48,7 @@ var DefinitionIcon = /* @__PURE__ */ function(_OptionsIcon) {
     }
   }, {
     key: "show",
-    value: function show() {
+    value: function show(value) {
       if (!this.config.list || this.config.list.length < 2) {
         return;
       }

package/es/plugins/fpsDetect/index.d.ts

@@ -13,7 +13,10 @@ export default class FpsDetect extends BasePlugin {
         stuckCount: number;
         reportFrame: number;
     };
-    timer: any;
+    /**
+     * @type {null | number}
+     */
+    timer: null | number;
     _lastDecodedFrames: any;
     _currentStuckCount: number;
     _lastCheckPoint: number;

package/es/plugins/fullscreen/index.d.ts

@@ -22,10 +22,16 @@ export default class Fullscreen extends IconPlugin {
      * @private
      */
     private _onOrientationChange;
-    /**
-     * @private
-     */
-    private registerIcons;
+    registerIcons(): {
+        fullscreen: {
+            icon: any;
+            class: string;
+        };
+        exitFullscreen: {
+            icon: any;
+            class: string;
+        };
+    };
     initIcons(): void;
     /**
      * 切换全屏
@@ -37,12 +43,10 @@ export default class Fullscreen extends IconPlugin {
      * @param { boolean } isFullScreen
      */
     animate(isFullScreen: boolean): void;
-    show(): void;
     /**
-     * @private
      * @returns
      */
-    private render;
+    render(): string;
 }
 export type IFullscreenConfig = {
     [propName: string]: any;

package/es/plugins/fullscreen/index.js

@@ -158,16 +158,6 @@ var Fullscreen = /* @__PURE__ */ function(_IconPlugin) {
         }
       }
     }
-  }, {
-    key: "show",
-    value: function show() {
-      _get(_getPrototypeOf(Fullscreen2.prototype), "show", this).call(this);
-    }
-  }, {
-    key: "hide",
-    value: function hide() {
-      _get(_getPrototypeOf(Fullscreen2.prototype), "hide", this).call(this);
-    }
   }, {
     key: "render",
     value: function render() {

package/es/plugins/heatmap/index.d.ts

@@ -30,16 +30,18 @@ export default class HeatMap extends Plugin {
     xData: any[];
     yData: any[];
     yMax: number;
+    _duration: number;
     curData: any[];
     setConfig(config: any): void;
+    reset(): void;
     createRoot(): void;
     root: HTMLElement;
     canvas: HTMLElement;
     resize(): void;
-    formatData(data: any): any;
+    formatData(data: any, duration: any, minValue: any): any[];
     _getX(index: any, stepX: any, item: any, width: any): number;
+    _getY(item: any, stepY: any, maxY: any): any;
     setData(data: any): void;
-    xData2: any[];
     _getFillStyle(ctx: any): any;
     drawLinePath(): void;
     clearCanvas(): void;