ezuikit-flv 1.0.3-alpha.9 → 1.0.3-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezuikit-flv",
-  "version": "1.0.3-alpha.9",
+  "version": "1.0.3-beta.2",
   "main": "./index.js",
   "types": "./types",
   "author": "Ezviz-OpenBiz",

package/types/constant/index.d.ts

@@ -17,13 +17,10 @@ export namespace DEFAULT_PLAYER_OPTIONS {
     export let videoBufferDelay: number;
     export let scaleMode: number;
     export let debug: boolean;
-    export let loadingTimeout: number;
-    export let heartTimeout: number;
     export let timeout: number;
-    export let loadingTimeoutReplay: boolean;
-    export let heartTimeoutReplay: boolean;
+    export let loadingTimeout: number;
+    export let loadingTimeoutDelay: number;
     export let loadingTimeoutReplayTimes: number;
-    export let heartTimeoutReplayTimes: number;
     export let keepScreenOn: boolean;
     export let isMute: boolean;
     export let hasAudio: boolean;
@@ -33,6 +30,7 @@ export namespace DEFAULT_PLAYER_OPTIONS {
     export let staticPath: string;
     export let url: string;
     export let rotate: number;
+    export let isLive: boolean;
     export let forceNoOffscreen: boolean;
     import protocol = PLAYER_PLAY_PROTOCOL.fetch;
     export { protocol };
@@ -44,6 +42,7 @@ export namespace DEFAULT_PLAYER_OPTIONS {
     export let openWebglAlignment: boolean;
     export let wasmDecodeAudioSyncVideo: boolean;
     export let useWebFullScreen: boolean;
+    export let autoPlay: boolean;
     export namespace loggerOptions {
         let level: string;
     }
@@ -107,6 +106,7 @@ export namespace EVENTS {
     export let delayTimeout: string;
     let loadingTimeout_1: string;
     export { loadingTimeout_1 as loadingTimeout };
+    export let loadingRetryTimes: string;
     export let stats: string;
     export let performance: string;
     export let buffer: string;
@@ -155,10 +155,6 @@ export namespace FLV_EVENTS {
     export { log_1 as log };
     import start_1 = EVENTS.start;
     export { start_1 as start };
-    import timeout_2 = EVENTS.timeout;
-    export { timeout_2 as timeout };
-    import loadingTimeout_2 = EVENTS.loadingTimeout;
-    export { loadingTimeout_2 as loadingTimeout };
     import delayTimeout_1 = EVENTS.delayTimeout;
     export { delayTimeout_1 as delayTimeout };
     let fullscreen_1: string;

package/types/index.d.ts

@@ -44,7 +44,6 @@ declare class EzuikitFlv extends EventEmitter<string | symbol, any> {
     static ROTATE: number[];
     /** */
     static TIMEOUT: {
-        loadingTimeout: string;
         delayTimeout: string;
     };
     /**
@@ -79,10 +78,11 @@ declare class EzuikitFlv extends EventEmitter<string | symbol, any> {
     urlInfo: {};
     /** @type {Services} */
     services: Services;
-    _opt: FlvOptions;
+    /** @private */
+    private _loadingTimeoutDelayTimer;
+    _opt: any;
     $container: any;
     _loadingTimeoutReplayTimes: number;
-    _heartTimeoutReplayTimes: number;
     events: Events;
     _videoInfo: {};
     _currentPlayDate: string;
@@ -111,31 +111,39 @@ declare class EzuikitFlv extends EventEmitter<string | symbol, any> {
      * @description 切换清晰度，仅对萤石设备预览生效
      * @param {VideoLevel} definition 清晰
      * @since 1.0.3
-     * @returns {void}
+     * @returns {Promise<number>}  0 成功（不代表取流成功）， 1 失败
      */
-    switchDefinition(definition: VideoLevel): void;
+    switchDefinition(definition: VideoLevel): Promise<number>;
     /**
      * @description 自定义设置倍速列表, 仅对萤石设备回放生效
-     * @param {Array<number>} list
+     * @param {Array<number>} list 倍速列表
      * @since 1.0.3
      * @returns {void}
      */
     setPlaybackRateList(list: Array<number>): void;
+    /**
+     * @description 设置倍速，仅对萤石设备回放生效
+     * @since 1.0.3
+     */
     set playbackRate(rate: number);
+    /**
+     * @description 获取倍速
+     * @since 1.0.3
+     */
     get playbackRate(): number;
     /**
      * @description 切换倍速，仅对萤石设备回放生效
      * @param {number} rate
      * @since 1.0.3
-     * @returns {void}
+     * @returns {Promise<number>} 0 成功（不代表取流成功）， 1 失败
      */
-    switchPlaybackRate(rate: number): void;
+    switchPlaybackRate(rate: number): Promise<number>;
     /**
      * @description 获取回放地址
      * @private
      * @returns {Promise<string>} // 空字符表示失败
      */
-    private _getNewPlaybackPlayUrl;
+    private _getNewRecordPlayUrl;
     /**
      * @description 是否是萤石开放平台回放
      * @param {string} url
@@ -155,6 +163,11 @@ declare class EzuikitFlv extends EventEmitter<string | symbol, any> {
      */
     destroy(): void;
     player: Player;
+    /**
+     * @private
+     * @param {obejct} videoInfo
+     */
+    private _handlevideoInfo;
     /**
      * @description 初始化播放
      * @private
@@ -234,7 +247,6 @@ declare class EzuikitFlv extends EventEmitter<string | symbol, any> {
      * @example
      * flv.setTimeout(3)
      */
-    private setTimeout;
     /**
      * @description 设置渲染的模式 (video 不支持)
      * @private
@@ -251,6 +263,7 @@ declare class EzuikitFlv extends EventEmitter<string | symbol, any> {
      * flv.pause()
      */
     pause(): Promise<unknown>;
+    _delayTimeoutTimer: any;
     /**
      * @description 清理画布为黑色背景
      * @private
@@ -267,6 +280,10 @@ declare class EzuikitFlv extends EventEmitter<string | symbol, any> {
      * flv.play()
      */
     play(options?: (string | FlvOptions) | undefined): Promise<any>;
+    /**
+     * @private
+     */
+    private __play;
     /**
      * @description 播放
      * @private
@@ -275,6 +292,22 @@ declare class EzuikitFlv extends EventEmitter<string | symbol, any> {
      * @returns {Promise<unknown>}
      */
     private _play;
+    /**
+     * @private
+     */
+    private _onDelayTimeout;
+    /**
+     * @private
+     */
+    private _onLoadingTimeout;
+    /**
+     * @private
+     */
+    private _onStreamSuccess;
+    /**
+     * @private
+     */
+    private _onStreamError;
     /**
      * @description 重新调整视图大小
      * @param {number=} width  宽
@@ -371,7 +404,7 @@ declare class EzuikitFlv extends EventEmitter<string | symbol, any> {
      * @param {number=} quality 当格式是jpeg或者webp时，压缩质量，取值0 ~ 1 ,默认 0.92
      * @param {("download" | "base64" | "blob")} type  download,base64,blob, 默认download
      *
-     * @returns {string | Blob | undefined}
+     * @returns {string | Blob | undefined}   undefined 代表截图失败
      * @since 1.0.3
      * @example
      * flv.screenshot()

package/types/player/base-player.d.ts

@@ -7,7 +7,6 @@ export default class BasePlayer extends Emitter {
     _playing: boolean;
     _hasLoaded: boolean;
     _checkHeartTimeout: any;
-    _checkLoadingTimeout: any;
     _checkStatsInterval: any;
     _startBpsTime: any;
     _isPlayingBeforePageHidden: boolean;

package/types/player/commonLoader.d.ts

@@ -1,12 +1,7 @@
 export default class CommonLoader extends Emitter {
     init: boolean;
     resetInit(): void;
-    videoInfo: {
-        width: string;
-        height: string;
-        encType: string;
-        encTypeCode: string;
-    };
+    videoInfo: any;
     destroy(): void;
     updateVideoInfo(data: any): void;
     play(): void;

package/types/player/hard-player/index.d.ts

@@ -20,15 +20,14 @@ export default class HardPlayer extends BasePlayer {
     _times: any;
     $container: HTMLElement;
     _opt: RequiredFlvOptions;
-    _hasLoaded: boolean;
     _checkHeartTimeout: number;
     _stats: any;
-    _checkLoadingTimeout: number;
     control: Control;
     width: number;
     height: number;
     _pause: boolean;
     _decodedFrames: number;
+    _checkLoadingTimeout: number;
     constructor(container: HTMLElement, options: RequiredFlvOptions);
     close(): void;
     _createPlayer(options: RequiredFlvOptions): void;
@@ -40,14 +39,16 @@ export default class HardPlayer extends BasePlayer {
      * @private
      */
     _flvEvents(): void;
+    _onVideoLoadstart(): void;
+    _onVideoStreamSuccess(): void;
     getOption(): RequiredFlvOptions;
     emitError(errorType: string, message?: string): void;
     /**
      * @description 销毁实例
      */
     destroy(): void;
+    _destroy(): void;
     resetStats(): void;
-    set loaded(value: boolean);
     get loaded(): boolean;
     set playing(value: boolean);
     get playing(): boolean;
@@ -61,6 +62,14 @@ export default class HardPlayer extends BasePlayer {
     set videoTimestamp(value: number);
     get videoTimestamp(): number;
     get isDebug(): boolean;
+    /**
+     * @description 检查等待时间 （loading 等待时间）
+     */
+    checkLoadingTimeout(): void;
+    /**
+     * @description 清除加载超时
+     */
+    clearCheckLoadingTimeout(): void;
     /**
      * 心跳检查
      */
@@ -70,12 +79,7 @@ export default class HardPlayer extends BasePlayer {
      * @description 心跳检查，如果渲染间隔暂停了多少时间之后，就会抛出异常
      */
     checkHeartTimeout(): void;
-    /**
-     * @description 检查等待时间 （loading 等待时间）
-     */
-    checkLoadingTimeout(): void;
     handleRender(): void;
-    clearCheckLoadingTimeout(): void;
     /**
      *
      * @param options

package/types/player/interface.d.ts

@@ -8,10 +8,9 @@ export type TFlvOptions = {
     scaleMode: 0 | 1 | 2;
     debug: boolean;
     timeout: number;
-    heartTimeout: number;
-    heartTimeoutReplayTimes: number;
     loadingTimeout: number;
-    loadingTimeoutReplay: boolean;
+    loadingTimeoutDelay: number;
+    loadingTimeoutReplayTimes: number;
     keepScreenOn: boolean;
     isMute: boolean;
     useMSE: boolean;

package/types/player/soft-player/index.d.ts

@@ -3,6 +3,7 @@
  */
 export default class SoftPlayer extends BasePlayer {
     constructor(container: any, options: any);
+    _loadingTimeoutDelayTimer: any;
     audio: Audio;
     decoderWorker: DecoderWorker;
     stream: Stream;
@@ -67,6 +68,10 @@ export default class SoftPlayer extends BasePlayer {
      * @description 检查等待时间 （loading 等待时间）
      */
     checkLoadingTimeout(): void;
+    _checkLoadingTimeout: NodeJS.Timeout;
+    /**
+     * @description 清除加载超时
+     */
     clearCheckLoadingTimeout(): void;
     clearStatsInterval(): void;
     handleRender(): void;

package/types/stream/fetchLoader.d.ts

@@ -4,6 +4,7 @@ export default class FetchLoader extends Emitter {
     playing: boolean;
     abortController: AbortController;
     streamRate: (size: any) => void;
+    _streamSuccess: boolean;
     destroy(): void;
     /**
      *

package/types/typedefs.d.ts

@@ -14,10 +14,8 @@
  * @property {(0 | 1 | 2)=} scaleMode 设置渲染模式， 默认 1 等比缩放,最大边填充, 取值 0 | 1 | 2。
  * @property {boolean=} debug 是否开启控制台调试打印。默认 false
  * @property {number=} timeout 设置超时时长, 单位秒, 在连接成功之前(loading)和播放中途(heart),如果超过设定时长无数据返回,则回调timeout事件。默认 10
- * @property {number=} heartTimeout 设置超时时长, 单位秒， 播放中途,如果超过设定时长无数据返回,则回调timeout事件。默认 5
- * @property {number=} heartTimeoutReplayTimes `heartTimeoutReplay` 重试次数。默认 3
- * @property {number=} loadingTimeout 设置超时时长, 单位秒。默认 10
- * @property {boolean=} loadingTimeoutReplay 是否开启loading超时之后自动再播放, 默认 true
+ * @property {number=} loadingTimeoutDelay 请求失败， 延时重试时长，单位秒。默认 3
+ * @property {number=} loadingTimeoutReplayTimes  重试次数。默认 5,  -1 不限次数
  * @property {boolean=} keepScreenOn 开启屏幕常亮，在手机浏览器上, canvas标签渲染视频并不会像video标签那样保持屏幕常。默认 false
  * @property {boolean=} isMute 是否静音，默认是关闭声音播放的。默认 true
  * @property {boolean=} useMSE 是否开启MediaSource硬解码。视频编码只支持H.264视频（Safari on iOS不支持）。默认 false
@@ -100,21 +98,13 @@ export type FlvOptions = {
      */
     timeout?: number | undefined;
     /**
-     * 设置超时时长, 单位秒， 播放中途,如果超过设定时长无数据返回,则回调timeout事件。默认 5
+     * 请求失败， 延时重试时长，单位秒。默认 3
      */
-    heartTimeout?: number | undefined;
+    loadingTimeoutDelay?: number | undefined;
     /**
-     * `heartTimeoutReplay` 重试次数。默认 3
+     * 重试次数。默认 5,  -1 不限次数
      */
-    heartTimeoutReplayTimes?: number | undefined;
-    /**
-     * 设置超时时长, 单位秒。默认 10
-     */
-    loadingTimeout?: number | undefined;
-    /**
-     * 是否开启loading超时之后自动再播放, 默认 true
-     */
-    loadingTimeoutReplay?: boolean | undefined;
+    loadingTimeoutReplayTimes?: number | undefined;
     /**
      * 开启屏幕常亮，在手机浏览器上, canvas标签渲染视频并不会像video标签那样保持屏幕常。默认 false
      */