ezuikit-flv 1.0.3-beta.2 → 2.0.0

package/types/player/commonLoader.d.ts

@@ -1,11 +1,25 @@
-export default class CommonLoader extends Emitter {
+import Emitter from '../utils/emitter';
+import type BasePlayer from './base-player';
+interface VideoInfo {
+    width?: number;
+    height?: number;
+    encType?: string;
+    encTypeCode?: number;
+}
+export default class CommonLoader<T extends HTMLCanvasElement | HTMLVideoElement> extends Emitter {
     init: boolean;
+    protected _isFullScreen: boolean;
+    _orientation: any;
+    videoInfo: VideoInfo;
+    player: any;
+    $videoElement: T;
+    constructor(player: BasePlayer);
     resetInit(): void;
-    videoInfo: any;
     destroy(): void;
-    updateVideoInfo(data: any): void;
+    updateVideoInfo(data: VideoInfo): void;
+    _flvToMp4Codec(audioCodec: string | number): string;
     play(): void;
     pause(): void;
     clearView(): void;
 }
-import Emitter from '../utils/emitter';
+export {};

package/types/player/events.d.ts

@@ -1,2 +1,5 @@
-declare function _default(player: any): void;
+/**
+ * @param {BasePlayer} player
+ */
+declare const _default: (player: any) => void;
 export default _default;

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

@@ -13,14 +13,13 @@ export default class HardPlayer extends BasePlayer {
     video: Video;
     events: Events;
     _playing: boolean;
-    _lastVolume: number;
     _loading: any;
     _audioTimestamp: number;
     _videoTimestamp: number;
     _times: any;
     $container: HTMLElement;
     _opt: RequiredFlvOptions;
-    _checkHeartTimeout: number;
+    _checkHeartTimeout: number | null;
     _stats: any;
     control: Control;
     width: number;
@@ -52,9 +51,10 @@ export default class HardPlayer extends BasePlayer {
     get loaded(): boolean;
     set playing(value: boolean);
     get playing(): boolean;
+    get muted(): boolean;
+    set muted(muted: boolean);
     get volume(): number;
     set volume(value: number);
-    get lastVolume(): number;
     set loading(value: any);
     get loading(): any;
     set audioTimestamp(value: number);
@@ -101,5 +101,4 @@ export default class HardPlayer extends BasePlayer {
     _close(): Promise<unknown>;
     pause(): Promise<unknown>;
     resumeAudioAfterPause(): void;
-    mute(flag: boolean): void;
 }

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

@@ -1,7 +1,7 @@
 import CommonLoader from '../commonLoader';
 import { type ScreenshotFormat } from '../interface';
 import type HardPlayer from '.';
-export default class VideoLoader extends CommonLoader {
+export default class VideoLoader extends CommonLoader<HTMLVideoElement> {
     _delayPlay: boolean;
     $canvasElement: HTMLCanvasElement;
     canvasContext: CanvasRenderingContext2D | null;
@@ -10,6 +10,7 @@ export default class VideoLoader extends CommonLoader {
     $videoElement: HTMLVideoElement;
     player: HardPlayer;
     $posterElement: HTMLImageElement;
+    _videoMuted: boolean;
     constructor(player: HardPlayer);
     destroy(): void;
     fixChromeVideoFlashBug(): void;
@@ -26,4 +27,5 @@ export default class VideoLoader extends CommonLoader {
     _resizeElement($Element: HTMLVideoElement | HTMLImageElement): void;
     isPlaying(): boolean;
     get currentTime(): number;
+    _enableSoundOnUserInteraction(): void;
 }

package/types/player/index.d.ts

@@ -1,7 +1,7 @@
 export default class PlayerLoader {
-    static getLoaderFactory(useMSE: any): typeof SoftPlayer | typeof HardPlayer;
+    static getLoaderFactory(useMSE: any): typeof HardPlayer | typeof SoftPlayer;
     constructor(container: any, options: any);
     _opt: any;
 }
-import SoftPlayer from './soft-player';
 import HardPlayer from './hard-player';
+import SoftPlayer from './soft-player';

package/types/player/interface.d.ts

@@ -1,4 +1,5 @@
 import Debug from '../utils/debug';
+import { type IThemeData } from '@ezviz/player-theme';
 export type TFlvOptions = {
     container: string | HTMLElement;
     videoBuffer: number;
@@ -12,14 +13,22 @@ export type TFlvOptions = {
     loadingTimeoutDelay: number;
     loadingTimeoutReplayTimes: number;
     keepScreenOn: boolean;
-    isMute: boolean;
+    muted: boolean;
     useMSE: boolean;
-    autoWasm: boolean;
     wasmDecodeErrorReplay: boolean;
-    useWebFullScreen: boolean;
     width: number;
     height: number;
     isLive: boolean;
+    autoPlay: boolean;
+    heartTimeout?: number;
+    /**
+     * 控件配置项， 仅支持 play sound webExpend expend
+     *
+     * 当设置为 null  不展示控件
+     * {@link https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/blob/master/themeData.md}
+     *
+     */
+    themeData?: IThemeData;
 };
 export type RequiredFlvOptions = Required<TFlvOptions> & {
     url: string;
@@ -73,11 +82,6 @@ export interface PlayerInterface {
      * @description 暂停
      */
     pause(flag?: boolean): Promise<unknown>;
-    /**
-     * @description 静音
-     * @param flag
-     */
-    mute(flag?: boolean): void;
     /**
      * @description resize
      */

package/types/player/observer.d.ts

@@ -1,2 +1,2 @@
-declare function _default(player: any): void;
+declare const _default: (player: any) => void;
 export default _default;

package/types/player/property.d.ts

@@ -1,2 +1,2 @@
-declare function _default(player: any): void;
+declare const _default: (player: any) => void;
 export default _default;

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

@@ -1,20 +1,16 @@
-export default class CanvasVideoLoader extends CommonLoader {
-    constructor(player: any);
-    player: any;
-    $videoElement: HTMLCanvasElement;
-    context2D: CanvasRenderingContext2D;
+import type SoftPlayer from '.';
+import CommonLoader from '../commonLoader';
+export default class CanvasVideoLoader extends CommonLoader<HTMLCanvasElement> {
+    context2D: CanvasRenderingContext2D | null;
     contextGl: any;
     contextGlRender: (w: any, h: any, y: any, u: any, v: any) => void;
     contextGlDestroy: () => void;
-    bitmaprenderer: ImageBitmapRenderingContext;
+    bitmaprenderer: ImageBitmapRenderingContext | null;
     renderType: string;
-    videoInfo: {
-        width: string;
-        height: string;
-        encType: string;
-    };
     _currentTime: number;
     _contextmenuEvent: (e: any) => void;
+    constructor(player: SoftPlayer);
+    destroy(): void;
     _initContextGl(): void;
     _initContext2D(): void;
     _initCanvasRender(): void;
@@ -22,11 +18,11 @@ export default class CanvasVideoLoader extends CommonLoader {
     _bindOffscreen(): void;
     initCanvasViewSize(): void;
     render(msg: any): void;
-    screenshot(filename: any, format: any, quality: any, type: any): string | File;
+    screenshot(filename: string, format: string, quality: number, type: string): string | File;
+    clearView(): void;
     resize(): void;
     /**
      * 当前播放pts （单位秒）
      */
     get currentTime(): number;
 }
-import CommonLoader from '../commonLoader';

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

@@ -1,25 +1,36 @@
+import Audio from '../../audio';
+import type FetchLoader from '../../stream/fetchLoader';
+import DecoderWorker from '../../worker/index';
+import Demux from '../../demux';
+import NoSleep from '../../utils/noSleep';
+import BasePlayer from '../base-player';
 /**
  * @description 软解
  */
 export default class SoftPlayer extends BasePlayer {
-    constructor(container: any, options: any);
-    _loadingTimeoutDelayTimer: any;
+    _loadingTimeoutDelayTimer: null;
     audio: Audio;
     decoderWorker: DecoderWorker;
-    stream: Stream;
+    stream: FetchLoader;
     demux: Demux;
-    _lastVolume: number;
     keepScreenOn: NoSleep;
-    set volume(value: number);
-    get volume(): number;
+    _checkLoadingTimeout: number | null;
+    _checkHeartTimeout: number | null;
+    constructor(container: Element, options: any);
     destroy(): void;
     set loaded(value: boolean);
     get loaded(): boolean;
     set playing(value: boolean);
     get playing(): boolean;
+    get muted(): any;
+    /**
+     * 静音
+     */
+    set muted(muted: any);
+    get volume(): any;
+    set volume(value: any);
     set loading(value: boolean);
     get loading(): boolean;
-    get lastVolume(): number;
     set audioTimestamp(value: number);
     get audioTimestamp(): number;
     set videoTimestamp(value: number);
@@ -29,31 +40,25 @@ export default class SoftPlayer extends BasePlayer {
      *
      * @returns {Promise<unknown>}
      */
-    _init(): Promise<unknown>;
+    _init(): Promise<void>;
     /**
      *
      * @param url
      * @returns {Promise<unknown>}
      */
-    play(options: any): Promise<unknown>;
+    play(options: any): Promise<void>;
     /**
      *
      */
-    close(): Promise<any>;
+    close(): Promise<void>;
     _resumeAudioAfterPause(): void;
-    _close(): Promise<any>;
+    _close(): Promise<void>;
     /**
      *
      * @param flag {boolean} 是否清除画面
      * @returns {Promise<unknown>}
      */
-    pause(flag?: boolean): Promise<unknown>;
-    /**
-     * @description 静音
-     * @param {boolean} flag
-     */
-    mute(flag: boolean): void;
-    _onlyMseOrWcsVideo(): any;
+    pause(flag?: boolean): Promise<void>;
     /**
      * 心跳检查
      */
@@ -68,24 +73,18 @@ export default class SoftPlayer extends BasePlayer {
      * @description 检查等待时间 （loading 等待时间）
      */
     checkLoadingTimeout(): void;
-    _checkLoadingTimeout: NodeJS.Timeout;
     /**
      * @description 清除加载超时
      */
     clearCheckLoadingTimeout(): void;
     clearStatsInterval(): void;
     handleRender(): void;
-    updateStats(options: any): void;
+    updateStats(options?: any): void;
     resetStats(): void;
     enableWakeLock(): void;
     releaseWakeLock(): void;
     handlePlayToRenderTimes(): void;
     getOption(): any;
-    emitError(errorType: any, message?: string): void;
+    emitError(errorType: string, message?: string): void;
+    _enableSoundOnUserInteraction(): void;
 }
-import BasePlayer from '../base-player';
-import Audio from '../../audio';
-import DecoderWorker from '../../worker/index';
-import Stream from '../../stream';
-import Demux from '../../demux';
-import NoSleep from '../../utils/noSleep';

package/types/services/api.d.ts

@@ -6,4 +6,5 @@ declare namespace API {
     let getAddress: string;
     let getCDNLiveAddress: string;
     let getCDNRecordAddress: string;
+    let getStreamInterreputInfo: string;
 }

package/types/services/constant.d.ts

@@ -0,0 +1 @@
+export declare const HTTP_BASE_URL = "https://open.ys7.com";

package/types/services/index.d.ts

@@ -169,4 +169,10 @@ declare class Services {
         startTime: string;
         stopTime: string;
     }): Promise<string>;
+    /**
+     * 查询中断信息 (仅支持萤石直播间地址)
+     * @param {string} streamId - 直播间流ID
+     * @returns
+     */
+    getStreamInterreputInfo(streamId: string): Promise<any>;
 }

package/types/stream/fetchLoader.d.ts

@@ -1,17 +1,17 @@
+import Emitter from '../utils/emitter';
 export default class FetchLoader extends Emitter {
-    constructor(player: any);
     player: any;
     playing: boolean;
     abortController: AbortController;
     streamRate: (size: any) => void;
     _streamSuccess: boolean;
+    constructor(player: any);
     destroy(): void;
     /**
      *
      * @param url
      * @param options
      */
-    fetchStream(url: any, options?: {}): void;
+    fetchStream(url: string, options?: any): void;
     abort(): void;
 }
-import Emitter from '../utils/emitter';

package/types/typedefs.d.ts

@@ -10,14 +10,16 @@
  * @property {string=} staticPath 静态资源的了路径
  * @property {boolean=} autoPlay 自动播放 默认false
  * @property {boolean=} hasAudio 是否有音频，如果设置false，则不对音频数据解码，提升性能。
- * @property {number=} volume 音量大小, 默认 0.5。
+ * @property {number=} volume 音量大小, 默认 0.8。
  * @property {(0 | 1 | 2)=} scaleMode 设置渲染模式， 默认 1 等比缩放,最大边填充, 取值 0 | 1 | 2。
  * @property {boolean=} debug 是否开启控制台调试打印。默认 false
+ * @property {number=} heartTimeout 设置心态超时时长, 单位秒。默认 5 ， @2.0.0
+ * @property {number=} heartTimeoutReplayTimes 重试次数。默认 5,  -1 不限次数  @2.0.0
  * @property {number=} timeout 设置超时时长, 单位秒, 在连接成功之前(loading)和播放中途(heart),如果超过设定时长无数据返回,则回调timeout事件。默认 10
  * @property {number=} loadingTimeoutDelay 请求失败， 延时重试时长，单位秒。默认 3
  * @property {number=} loadingTimeoutReplayTimes  重试次数。默认 5,  -1 不限次数
  * @property {boolean=} keepScreenOn 开启屏幕常亮，在手机浏览器上, canvas标签渲染视频并不会像video标签那样保持屏幕常。默认 false
- * @property {boolean=} isMute 是否静音，默认是关闭声音播放的。默认 true
+ * @property {boolean=} muted 是否静音，默认是关闭声音播放的。默认 true
  * @property {boolean=} useMSE 是否开启MediaSource硬解码。视频编码只支持H.264视频（Safari on iOS不支持）。默认 false
  * @property {boolean=} autoWasm 在使用MSE或者Webcodecs 播放H265的时候，是否自动降级到wasm模式。默认 true
  * @property {boolean=} isLive 是否是直播。默认 true  @1.0.3
@@ -26,6 +28,7 @@
  * @property {Object=} env  环境变量， @1.0.3
  * @property {string=} env.domain 开放平台 api domain, @1.0.3
  * @property {string=} timeZone  时区 默认 0， @1.0.3
+ * @property {object=} themeData  控件配置项 @2.0.0， 仅支持 play sound webExpend expend， 当设置为 null  不展示控件 {@link https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/blob/master/themeData.md}
  */
 /**
  *
@@ -35,7 +38,6 @@
  * @property {boolean} playing 是否正在播放
  * @property {boolean} mute 是否静音
  * @property {boolean} fullscreen 是否全屏
- * @property {boolean} webFullscreen 是否web全屏
  * @property {boolean} loaded 是否加载完成
  * @property {string} volume 音量
  * @property {boolean} isDebug 是否打印日志
@@ -49,7 +51,7 @@
  * @property {number} streamTypeIn 1: 主码流，2：子码流
  * @property {string} name 清晰度名称
  * @property {string} url 播放地址
- * @property {stirng=} type 用来判断是否是默认主子码流清晰度 (compatible)
+ * @property {string=} type 用来判断是否是默认主子码流清晰度 (compatible)
  */
 export const Types: {};
 export type FlvOptions = {
@@ -82,7 +84,7 @@ export type FlvOptions = {
      */
     hasAudio?: boolean | undefined;
     /**
-     * 音量大小, 默认 0.5。
+     * 音量大小, 默认 0.8。
      */
     volume?: number | undefined;
     /**
@@ -94,37 +96,9 @@ export type FlvOptions = {
      */
     debug?: boolean | undefined;
     /**
-     * 设置超时时长, 单位秒, 在连接成功之前(loading)和播放中途(heart),如果超过设定时长无数据返回,则回调timeout事件。默认 10
+     * 设置心态超时时长, 单位秒。默认 5 ，
      */
-    timeout?: number | undefined;
-    /**
-     * 请求失败， 延时重试时长，单位秒。默认 3
-     */
-    loadingTimeoutDelay?: number | undefined;
-    /**
-     * 重试次数。默认 5,  -1 不限次数
-     */
-    loadingTimeoutReplayTimes?: number | undefined;
-    /**
-     * 开启屏幕常亮，在手机浏览器上, canvas标签渲染视频并不会像video标签那样保持屏幕常。默认 false
-     */
-    keepScreenOn?: boolean | undefined;
-    /**
-     * 是否静音，默认是关闭声音播放的。默认 true
-     */
-    isMute?: boolean | undefined;
-    /**
-     * 是否开启MediaSource硬解码。视频编码只支持H.264视频（Safari on iOS不支持）。默认 false
-     */
-    useMSE?: boolean | undefined;
-    /**
-     * 在使用MSE或者Webcodecs 播放H265的时候，是否自动降级到wasm模式。默认 true
-     */
-    autoWasm?: boolean | undefined;
-    /**
-     * 是否是直播。默认 true
-     */
-    isLive?: boolean | undefined;
+    heartTimeout?: number | undefined;
 };
 export type PlayerState = {
     /**
@@ -139,10 +113,6 @@ export type PlayerState = {
      * 是否全屏
      */
     fullscreen: boolean;
-    /**
-     * 是否web全屏
-     */
-    webFullscreen: boolean;
     /**
      * 是否加载完成
      */
@@ -176,5 +146,5 @@ export type VideoLevel = {
     /**
      * 用来判断是否是默认主子码流清晰度 (compatible)
      */
-    type?: stirng;
+    type?: string | undefined;
 };

package/types/utils/container.d.ts

@@ -0,0 +1 @@
+export function getContainer(container: any): any;

package/types/utils/debug.d.ts

@@ -1,10 +1,10 @@
 export default class Debug {
-    constructor(master: any);
     master: any;
     logger: any;
-    info(name: any, ...args: any[]): void;
-    log(name: any, ...args: any[]): void;
-    warn(name: any, ...args: any[]): void;
-    error(name: any, ...args: any[]): void;
-    _setLogger(level: any): 1 | 2 | 3 | 5 | 4;
+    constructor(master: any);
+    info(name: string, ...args: any[]): void;
+    log(name: string, ...args: any[]): void;
+    warn(name: string, ...args: any[]): void;
+    error(name: string, ...args: any[]): void;
+    _setLogger(): number;
 }