xgplayer 3.0.10-alpha.0 → 3.0.10-alpha.2

package/es/defaultConfig.d.ts

@@ -1,6 +1,9 @@
+/**
+ * @typedef { string | MediaStream | Array<{src: string, type?:string, [propName: string]: any}> } IUrl
+ */
 /**
  * @typedef {{
- *   url: any,
+ *   url: IUrl,
  *   definition: any,
  *   bitrate?: number,
  *   bandwidth?: number,
@@ -13,7 +16,7 @@
  * @typedef { {
  *   id?: string,
  *   el?: HTMLElement,
- *   url?: any,
+ *   url?: IUrl,
  *   domEventType?: 'default' | 'touch' | 'mouse',
  *   nullUrlStart?: boolean,
  *   width?: number | string,
@@ -50,6 +53,7 @@
  *   miniprogress?: boolean,
  *   disableSwipeHandler?: () => any,
  *   enableSwipeHandler?: () => any,
+ *   preProcessUrl?: (url: IUrl, ext?: { [propName: string]: any }) => { url: IUrl, [propName: string]: any },
  *   ignores?: Array<'cssfullscreen' | 'screenshot' | 'pip' | 'miniscreen' | 'keyboard' | 'download' | 'playbackrate' | 'time' | 'definition' | 'error' | 'fullscreen' | 'loading' | 'mobile' | 'pc' | 'play' | 'poster' | 'progress' | 'replay' | 'start' | 'volume' | string>,
  *   inactive?: number,
  *   lang?: string,
@@ -98,9 +102,14 @@
  * @returns { IPlayerOptions }
  */
 export default function getDefaultConfig(): IPlayerOptions;
+export type IUrl = string | MediaStream | {
+    [propName: string]: any;
+    src: string;
+    type?: string;
+}[];
 export type IDefinition = {
     [propName: string]: any;
-    url: any;
+    url: IUrl;
     definition: any;
     bitrate?: number;
     bandwidth?: number;
@@ -115,7 +124,7 @@ export type IPlayerOptions = {
     [propName: string]: any;
     id?: string;
     el?: HTMLElement;
-    url?: any;
+    url?: IUrl;
     domEventType?: 'default' | 'touch' | 'mouse';
     nullUrlStart?: boolean;
     width?: number | string;
@@ -158,6 +167,12 @@ export type IPlayerOptions = {
     miniprogress?: boolean;
     disableSwipeHandler?: () => any;
     enableSwipeHandler?: () => any;
+    preProcessUrl?: (url: IUrl, ext?: {
+        [propName: string]: any;
+    }) => {
+        [propName: string]: any;
+        url: IUrl;
+    };
     ignores?: Array<'cssfullscreen' | 'screenshot' | 'pip' | 'miniscreen' | 'keyboard' | 'download' | 'playbackrate' | 'time' | 'definition' | 'error' | 'fullscreen' | 'loading' | 'mobile' | 'pc' | 'play' | 'poster' | 'progress' | 'replay' | 'start' | 'volume' | string>;
     inactive?: number;
     lang?: string;

package/es/defaultConfig.js

@@ -42,6 +42,7 @@ function getDefaultConfig() {
     },
     enableSwipeHandler: function enableSwipeHandler() {
     },
+    preProcessUrl: null,
     ignores: [],
     whitelist: [],
     inactive: 3e3,

package/es/mediaProxy.js

@@ -541,7 +541,7 @@ var MediaProxy = /* @__PURE__ */ function(_EventEmitter) {
       this.emit(WAITING);
       this._currentTime = 0;
       this._duration = 0;
-      if (/^blob/.test(this.media.currentSrc) || /^blob/.test(this.media.src)) {
+      if (util.isMSE(this.media)) {
         this.onWaiting();
         return;
       }

package/es/player.d.ts

@@ -1,5 +1,6 @@
 export type IPlayerOptions = import('./defaultConfig').IPlayerOptions;
 export type IDefinition = import('./defaultConfig').IDefinition;
+export type IUrl = import('./defaultConfig').IUrl;
 declare class Player extends MediaProxy {
     /**
      * @type {number}
@@ -642,6 +643,15 @@ declare class Player extends MediaProxy {
      * @param { number } newState
      */
     protected setState(newState: number): void;
+    /**
+     * @description url preprocessing
+     * @param { IUrl } url
+     * @param { {[propName: string]: any} } [ext]
+     * @returns { url: IUrl, [propName: string]: any }
+     */
+    preProcessUrl(url: IUrl, ext?: {
+        [propName: string]: any;
+    }): import("./defaultConfig").IUrl;
     /**
      * @type { number }
      */

package/es/player.js

@@ -389,8 +389,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       var readyState = this.media.readyState;
       XG_DEBUG.logInfo("_startInit readyState", readyState);
       if (this.config.autoplay) {
-        !(/^blob/.test(this.media.currentSrc) || /^blob/.test(this.media.src)) && this.load();
-        (sniffer.os.isIpad || sniffer.os.isPhone) && this.mediaPlay();
+        !util.isMSE(this.media) && this.load()(sniffer.os.isIpad || sniffer.os.isPhone) && this.mediaPlay();
       }
       if (readyState >= 2) {
         this.canPlayFunc();
@@ -617,7 +616,8 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
         if (!url) {
           url = _this8.url || _this8.config.url;
         }
-        var ret = _this8._startInit(url);
+        var _furl = _this8.preProcessUrl(url);
+        var ret = _this8._startInit(_furl.url);
         return ret;
       }).catch(function(e) {
         e.fileName = "player";
@@ -634,6 +634,7 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       if (util.typeOf(url) === "Object") {
         _src = url.url;
       }
+      _src = this.preProcessUrl(_src).url;
       var curTime = this.currentTime;
       var isPaused = this.paused && !this.isError;
       this.src = _src;
@@ -1608,6 +1609,14 @@ var Player = /* @__PURE__ */ function(_MediaProxy) {
       XG_DEBUG.logInfo("setState", "state from:".concat(STATE_ARRAY[this.state], " to:").concat(STATE_ARRAY[newState]));
       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) : {
+        url
+      };
+    }
   }, {
     key: "state",
     get: function get() {

package/es/plugins/dynamicBg/index.js

@@ -175,7 +175,7 @@ var DynamicBg = /* @__PURE__ */ function(_Plugin) {
         return null;
       }
       var _tVideo = video && video instanceof window.HTMLVideoElement ? video : video.canvas ? video.canvas : video.flyVideo ? video.flyVideo : null;
-      if (_tVideo && !(sniffer.browser === "safari" && (/^blob/.test(_tVideo.currentSrc) || /^blob/.test(_tVideo.src)))) {
+      if (_tVideo && !(sniffer.browser === "safari" && util.isMSE(_tVideo))) {
         return _tVideo;
       }
       var _tagName = _tVideo ? _tVideo.tagName.toLowerCase() : "";

package/es/utils/util.d.ts

@@ -244,6 +244,7 @@ declare namespace util {
      * @returns { Boolean }
      */
     function isMSE(video: HTMLElement | HTMLVideoElement | HTMLAudioElement): boolean;
+    function isBlob(url: any): boolean;
     /**
      * @param { number } did
      * @returns { string }

package/es/utils/util.js

@@ -534,6 +534,9 @@ util.isMSE = function(video) {
   }
   return /^blob/.test(video.currentSrc) || /^blob/.test(video.src);
 };
+util.isBlob = function(url) {
+  return /^blob/.test(url);
+};
 util.generateSessionId = function() {
   var did = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
   var d = new Date().getTime();

package/es/version.js

@@ -1,2 +1,2 @@
-var version = "3.0.10-alpha.0";
+var version = "3.0.10-alpha.2";
 export { version as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xgplayer",
-  "version": "3.0.10-alpha.0",
+  "version": "3.0.10-alpha.2",
   "description": "video player",
   "main": "dist/index.min.js",
   "module": "es/index.js",
@@ -43,7 +43,7 @@
     "delegate": "^3.2.0",
     "downloadjs": "1.4.7",
     "eventemitter3": "^4.0.7",
-    "xgplayer-subtitles": "3.0.10-alpha.0"
+    "xgplayer-subtitles": "3.0.10-alpha.2"
   },
   "peerDependencies": {
     "core-js": ">=3.12.1"