update v9.0.4-beta.3

Author: RaconXXY

dist/adapter.esm.js

@@ -1,14 +1,12 @@
-import * as StreamIO from '@ezuikit/stream-io';
-import StreamIO__default from '@ezuikit/stream-io';
-import * as I18n from '@ezuikit/utils-i18n';
-import I18n__default from '@ezuikit/utils-i18n';
 import * as _ezuikit_utils_service_dist_types_fetch from '@ezuikit/utils-service/dist/types/fetch';
 import { LoggerCls } from '@ezuikit/utils-logger/dist/types/logger';
 import { LoggerOptions } from '@ezuikit/utils-logger';
+import * as I18n from '@ezuikit/utils-i18n';
+import I18n__default from '@ezuikit/utils-i18n';
 import Service, { DeviceCapacityRes, DeviceInfoRes } from '@ezuikit/utils-service';
 import { EzopenURL } from '@ezuikit/utils-tools';
-import { PlayerPluginRecord } from '@ezuikit/player-plugin-record';
 import EventEmitter from 'eventemitter3';
+import { PlayerPluginRecord } from '@ezuikit/player-plugin-record';
 
 /**
  * 环境
@@ -55,7 +53,7 @@ interface PlayerOptions {
      */
     streamInfoCBType: 0 | 1;
 }
-interface IResult<T> {
+interface IResult$1<T> {
     data?: T;
     code?: number;
     msg?: string;
@@ -111,6 +109,127 @@ interface IBufferItem {
     duration: number;
 }
 
+interface IResult<T> {
+    data?: T;
+    code?: number;
+    msg?: string;
+}
+/**
+ * 播放器标准接口
+ */
+interface PlayerInterface extends EventEmitter {
+    playing: boolean;
+    volume: number;
+    playbackRate: number;
+    deviceCapacity: Record<string, any>;
+    i18n: any;
+    logger: any;
+    event: EventEmitter;
+    wasmplayer: any;
+    _wss_info: any;
+    _options: any;
+    /**
+     * 播放
+     * @param options
+     * @returns {Promise}
+     */
+    play: (options?: any) => Promise<unknown>;
+    /**
+     * 暂停播放
+     * @returns
+     */
+    pause: (bool?: boolean) => Promise<unknown>;
+    /**
+     * 销毁并断流
+     * @returns
+     */
+    destroy: () => Promise<unknown>;
+    /**
+     * 截图
+     * @param {string} name 文件名 默认时间戳（new Date().getTime()）
+     * @param {"png" | "jpeg"} fmt 图片格式
+     * @param {"base64"} type 文件格式 默认base64
+     * @param {boolean} download 是否直接下载 默认不直接下载
+     * @returns 返回base64字符
+     */
+    snapshot: (name?: string, fmt?: 'jpeg', type?: 'base64', download?: boolean) => Promise<IResult<{
+        fileName?: string;
+        base64?: string;
+    } | null>>;
+    /**
+     * 开始录制视频
+     * @param {string} name 文件名 默认时间戳（new Date().getTime()）
+     * @param {"mp4"} fmt 图片格式 默认mp4
+     * @returns
+     */
+    startRecord?: (name?: string, fmt?: 'mp4') => Promise<any>;
+    /**
+     * 停止录制
+     * @returns
+     */
+    stopRecord?: () => Promise<any>;
+    /**
+     * 全屏
+     * @returns
+     */
+    fullScreen: () => Promise<void>;
+    /**
+     * 退出全屏
+     * @returns
+     */
+    exitScreen: () => Promise<void>;
+    /**
+     * 设置画布/视频的尺寸  不设置 默认使用容器的高宽（充满容器）
+     * @param {number=} width 画布的宽度
+     * @param {number=} height 画布的高度
+     * @returns
+     */
+    resize: (width?: number, height?: number) => Promise<{
+        width: number;
+        height: number;
+    }>;
+    /**
+     * 设置音量
+     * @param volume 音量 [0-1]， 0：表示静音
+     * @returns {void}
+     */
+    setVolume: (volume: number) => void;
+    /**
+     * 设置封面
+     * @param url
+     * @returns
+     */
+    setPoster?: (postUrl: string) => void;
+    /**
+     * 设置播放速度
+     * @param rate
+     * @returns
+     */
+    setPlaybackRate?: (rate: number) => void;
+    /**
+     * 当前版本号
+     * @returns
+     */
+    getVersion: () => object;
+    /**
+     * 设置日志打印的级别 INFO | LOG | WARN | ERROR
+     *
+     *
+     * @param {string} level 日志级别 一次从大到小 3 -> 0 (为了更好的扩展)
+     * @returns
+     */
+    setDebug?: (level: 'INFO' | 'LOG' | 'WARN' | 'ERROR') => void;
+}
+
+interface PlayerPlugin {
+    name: string;
+    init?: (player?: PlayerInterface) => void;
+    beforeExec?: (player?: PlayerInterface) => boolean | Promise<boolean>;
+    exec: (player?: PlayerInterface) => void;
+    afterExec?: (player?: PlayerInterface) => void;
+    destroy?: (player?: PlayerInterface) => void;
+}
+
 declare class ESCanvas {
   constructor(szCanvasId: any);
   m_iCanvasWidth: any;
@@ -464,32 +583,32 @@ interface WasmDecoderStatue {
     bSupHardOrSoft: boolean;
     bSupHardDecAVC: boolean;
     bSupHardDecHEVC: boolean;
-    cmd: "loaded" | "onebyone";
+    cmd: 'loaded' | 'onebyone';
     errorCode: number;
     status: any;
 }
 
 type Zoom3DCallback = (oRECT?: any) => void;
 
-type SnapshotFmt = "jpeg";
+type SnapshotFmt = 'jpeg';
 
 /**
  * @description 插件管理系统
  */
 declare class PluginManager {
     context: EZopenPlayer;
-    plugins: Map<string, PlayerPluginRecord>;
+    plugins: Map<string, PlayerPlugin>;
     constructor(player: EZopenPlayer);
     /**
      * @description 注册插件做个插件
      * @param plugins
      */
-    usePlugins(plugins: PlayerPluginRecord[]): Promise<void>;
+    usePlugins(plugins: PlayerPlugin[]): Promise<void>;
     /**
      * @description 注册插件
      * @param plugins
      */
-    use(plugin: PlayerPluginRecord): Promise<void>;
+    use(plugin: PlayerPlugin): Promise<void>;
     /**
      * @description 通过name销毁指定插件
      * @param {string} name 插件名
@@ -646,7 +765,7 @@ interface EZopenPlayerOptions extends PlayerOptions {
     /** 全屏节点 */
     fullScreenEle?: HTMLElement;
     /** 指定解码类型， v1 软解  v3 包括硬解和多线程 */
-    decoderType?: "auto" | "v1" | "v3";
+    decoderType?: 'auto' | 'v1' | 'v3';
     /** 下载当前原始视频流，用于调试，不能动态设置，结束或销毁播放时自动保存成文件并下载 */
     debugDownloadData?: boolean;
     extraParams?: {
@@ -663,7 +782,7 @@ interface EZopenPlayerOptions extends PlayerOptions {
     isLive?: boolean;
 }
 declare class EZopenPlayer extends EventEmitter {
-    _options: EZopenPlayerOptions | undefined;
+    _options: EZopenPlayerOptions;
     static EVENT_TYPE: {
         initializing: string;
         loadstart: string;
@@ -743,6 +862,7 @@ declare class EZopenPlayer extends EventEmitter {
      */
     event: any;
     isHls: boolean;
+    isLive: boolean;
     initializing: boolean;
     loading: boolean;
     /** 播放速度 */
@@ -765,11 +885,7 @@ declare class EZopenPlayer extends EventEmitter {
     $container: HTMLElement;
     esCanvas: ESCanvas;
     fECCorrect: FECCorrect;
-    /**  当前播放时间，单位秒 */
-    currentTime: number;
-    /** 视频总时长，单位秒 */
-    duration: number;
-    _oStreamClient: StreamIO__default;
+    _oStreamClient: StreamClient;
     _aHead: Uint8Array;
     /** @private */
     _detectTimer: any;
@@ -811,7 +927,7 @@ declare class EZopenPlayer extends EventEmitter {
      * @param options
      * @returns
      */
-    play(options?: Partial<Pick<EZopenPlayerOptions, "url" | "accessToken">>): Promise<unknown>;
+    play(options?: Partial<Pick<EZopenPlayerOptions, 'url' | 'accessToken'>>): Promise<unknown>;
     _wss_play(szUrl: string, oParams?: {
         playURL: string;
     }): Promise<unknown>;
@@ -846,7 +962,7 @@ declare class EZopenPlayer extends EventEmitter {
      * @param {boolean} canvas 是否使用 canvas
      * @returns 返回base64字符
      */
-    snapshot(name?: string, fmt?: SnapshotFmt, type?: "base64", download?: boolean, canvas?: boolean): Promise<IResult<{
+    snapshot(name?: string, fmt?: SnapshotFmt, type?: 'base64', download?: boolean, canvas?: boolean): Promise<IResult$1<{
         fileName?: string | undefined;
         base64?: string | undefined;
     } | null>>;
@@ -857,7 +973,7 @@ declare class EZopenPlayer extends EventEmitter {
      * @param {boolean} download 是否直接下载 默认不直接下载 false
      * @returns 返回base64字符
      */
-    snapshotByCanvas(name?: string, fmt?: SnapshotFmt, download?: boolean): Promise<IResult<{
+    snapshotByCanvas(name?: string, fmt?: SnapshotFmt, download?: boolean): Promise<IResult$1<{
         fileName?: string | undefined;
         base64?: string | undefined;
     } | null>>;
@@ -893,7 +1009,7 @@ declare class EZopenPlayer extends EventEmitter {
      * @description 插件管理
      * @param plugin 插件
      */
-    use(plugin: typeof PlayerPluginRecord): void;
+    use(plugin: PlayerPlugin): void;
     /**
      *
      * @param {Object} type 矫正类型  参考 src/ezopen/constants.js
@@ -952,7 +1068,7 @@ declare class EZopenPlayer extends EventEmitter {
      */
     disable3DZoom(): number;
     /**
-     * @description 获取当前osd (时间戳), 当获取失败返回 0
+     * @description 获取当前osd, 当获取失败返回 0
      * @returns {number}
      */
     getOSDTime(): number;
@@ -963,7 +1079,6 @@ declare class EZopenPlayer extends EventEmitter {
     getFrameInfo(): IFrameInfo;
     /**
      * @description 设置播放视频区域 （仅视频不是画布）
-     * @deprecated
      * @param {number} left 视频展示区域 x轴开始位置
      * @param {number} right 视频展示区域 x轴结束位置
      * @param {number} top 视频展示区域 y轴开始位置
@@ -983,7 +1098,7 @@ declare class EZopenPlayer extends EventEmitter {
      *
      * @returns
      */
-    getOptions(): EZopenPlayerOptions | undefined;
+    getOptions(): EZopenPlayerOptions;
     /**
      * @description 切换调试日志等级
      * @param {LoggerOptions} loggerOptions 日志等级
@@ -1034,15 +1149,61 @@ declare class EZopenPlayer extends EventEmitter {
      */
     setStreamInfoCallBackType(type: 0 | 1, cb?: StreamInfoCallBackFn): void;
     _addEventListener(): void;
+}
+
+declare class StreamClient {
+    private readonly _player;
+    private _streamClient;
+    _streamUUID: string;
+    constructor(player: EZopenPlayer);
+    private _getStreamClientFactory;
     /**
-     * 是否是 hls 直播， 优先使用用户传的值， 如果你没有传值（boolean），则根据 m3u8 的解析结果进行判断
-     * @returns {boolean}
+     * @description 开流, 此时设备的流还没有发出来
+     * @param {string} szUrl 取流路径，如ws://hostname:port/channel
+     * @param {object} oParams 取流需要涉及的相关参数
+     * @param {function} cbMessage 消息回调函数
+     * @param {function} cbClose 关闭回调
+     * @param {function} cbError 错误回调
+     * @returns {Promise<string>} 返回Promise对象 // 取流uuid，用于区分每条取流连接
      */
-    get isLive(): boolean;
+    openStream(szUrl: string, oParams: object, cbMessage: (msg: object) => void, cbClose: (id?: string) => void, cbError: (id?: string, msg?: any) => void): Promise<string>;
     /**
-     * 片段列表
+     * @description 开始取流
+     *
+     * @param {string} id websocket id，在openStream的时候生成
+     * @param {string} szStartTime 开始时间
+     * @param {string} szStopTime 结束时间
+     * @param {function} cbMessage 码流回调函数
+     *
+     * @returns {Promise<unknown>} 返回Promise对象
      */
-    get segments(): any;
+    startPlay(id?: string): Promise<void>;
+    /**
+     * @description 设置播放速度
+     * @param rate 播放速度
+     * @param uuid websocket id，在openStream的时候生成
+     * @returns
+     */
+    setPlayRate(rate: number, id?: string): Promise<void>;
+    /**
+     * @description 定位回放
+     *
+     * @param {string} id websocket id在openStream的时候生成
+     * @param {string} startTime 开始时间
+     * @param {string} stopTime 结束时间
+     *
+     * @returns {Promise<unknown>} Promise
+     */
+    seek(startTime: string, stopTime: string, id?: string): Promise<void>;
+    /**
+     * @description 停止所有流
+     * @returns
+     */
+    stopAll(): Promise<void>;
+    /**
+     * @description 客户端销毁
+     */
+    destroy(): void;
 }
 
 declare class JSPlugin {
@@ -1052,20 +1213,18 @@ declare class JSPlugin {
     player: EZopenPlayer;
     i18n: I18n.default;
     downloadRecord: any;
-    _recordPlugin: any;
+    _recordPlugin: PlayerPluginRecord;
     nWidth: number;
     nHeight: number;
-    oStreamClient: StreamIO.default;
+    oStreamClient: StreamClient;
     g_port: number;
-    get isHls(): boolean;
-    get isLive(): boolean;
     get bPlay(): boolean;
     get iRate(): number;
-    set playURL(url: string);
+    set playURL(arg: string);
     get playURL(): string;
-    set FECSplitIds(ids: string | undefined);
+    set FECSplitIds(arg: string | undefined);
     get FECSplitIds(): string | undefined;
-    set correctType(type: any);
+    set correctType(arg: any);
     get correctType(): any;
     _initEventCallback(): void;
     JSPlayM4_SetDecodeEngine(useHard: any): void;
@@ -1102,8 +1261,8 @@ declare class JSPlugin {
      * @returns {none} 无
      */
     JS_Disable3DZoom(): none;
-    JS_StartSave(fileName: string | undefined, stopCallback: any, secretKey: any): any;
-    JS_StopSave(download?: boolean): any;
+    JS_StartSave(fileName: string | undefined, stopCallback: any, secretKey: any): Promise<void>;
+    JS_StopSave(download?: boolean): Promise<unknown>;
     _JSPlayM4_GetFrameInfo(): IFrameInfo;
     _JSPlayM4_SetDisplayRegion(left: any, right: any, top: any, bottom: any, flag: boolean | undefined, isFullScreen: any): boolean;
     JS_CapturePicture(port: any, fileName: any, format: any, callback: any, download: any, canvas: any): Promise<any>;