@hysc/meeting 10.0.11 → 10.0.13

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import * as lodash_es from 'lodash-es';
 import * as _hysc_brtc from '@hysc/brtc';
-import { LocalStream, RemoteStream, Device, SubscribeOptions, VideoProfile, AudioHint } from '@hysc/brtc';
+import { LocalStream, RemoteStream, Device, SubscribeOptions, VideoProfile, AudioHint, StreamCodecOption } from '@hysc/brtc';
 import BCClient, { BCUser, ShareMediaOptions, Player, AudioPlayer } from '@hysc/core';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { BoomError } from '@hysc/utils';
@@ -379,11 +379,14 @@ declare class BMStreamModelVM {
      */
     localIsShare: boolean;
     isShareWatcher: Subject<boolean>;
+    localShareCustomStats: any;
     _speaker_enable: boolean;
     speakerEnableWatcher: BehaviorSubject<boolean>;
     /**
      * 混流
      */
+    mixStreamUid: string | null;
+    get mixStreamModel(): BMStreamModel | null | undefined;
     mixStreamModelWatcher: BehaviorSubject<BMStreamModel | null>;
     canvasTimer: NodeJS.Timeout | null;
     private _recorder;
@@ -409,12 +412,18 @@ declare class BMStreamModelVM {
      * 共享屏幕流错误
      */
     localShareError: Subject<BoomError>;
+    localShareEndedError: Subject<boolean>;
     /**
      * 共享屏幕流是单独处理的逻辑，不是先创建streamModel然后在去查流，而是先去查流，在创建streamModel
      */
     shareBloudStateMap: Map<string, BloudStreamEventState>;
+    /**
+     * 窗口播放事件，给到端上去做埋点
+     */
+    streamPlayWatcher: Subject<StreamPlayMessage>;
     constructor();
     private static filterStreamModels;
+    handleStreamPlay: (info: StreamPlayMessage) => void;
     initWithRoom(room: BMRoom): this;
     /**
      * 设置扬声器是否打开
@@ -576,7 +585,7 @@ declare class BMStreamModelVM {
     /**
      * 更新流信息 会给服务端发送updateStream信令，会收到updateStream的广播
      */
-    updateBloudStreamCustomStats(uid: string, streamId: string, streamInfo: StreamCustomInfo): Promise<any> | undefined;
+    updateBloudStreamCustomStats(uid: string, streamId: string, streamInfo: StreamCustomInfo): Promise<void>;
     /**
      * 布局发生变化之后去调用一下这个方法去检测所有流的播放状态
      * @param {string} status tag 用于区分是什么状态下调用的
@@ -602,6 +611,9 @@ interface NoPlayerContainer {
     container: 'small' | 'big';
     id: string;
 }
+interface StreamPlayMessage {
+    uid: string;
+}
 /**
  * 播放器状态
  */
@@ -677,7 +689,7 @@ declare class BMStreamModel {
     get uuid(): string;
     get isAudience(): boolean;
     /**
-     * 因为直播模式中，观众默认是不展示的，只有开麦以后才会展示
+     * 因为直播模式中，观众是不展示的
      * 所以这个地方要判断一下
      */
     get canShow(): boolean;
@@ -809,11 +821,11 @@ declare class BMStreamModel {
     /**
      * 播放当前流
      */
-    play: () => Promise<void>;
+    play: (force?: boolean) => Promise<void>;
     /**
      * 在大窗口播放该流的时候调用这个方法
      */
-    playInBig: () => Promise<void>;
+    playInBig: (force?: boolean) => Promise<void>;
     private initBigPlayer;
     /**
      * 停止播放当前流
@@ -946,6 +958,9 @@ declare class BMUser {
     raiseVideoHands: boolean;
     raiseAudioHands: boolean;
     raiseHand: boolean;
+    /**
+     * 观众
+     */
     isAudience: boolean;
     /**
      * 是不是普通参会者
@@ -1177,14 +1192,17 @@ declare class BMRoomInfo {
     totalUserWatcher: BehaviorSubject<number>;
     totalWaitRoomUserWatcher: BehaviorSubject<number>;
     isOpenWaitRoom: Subject<boolean>;
-    constructor();
+    constructor(room: BMRoom);
     get roomName(): string;
     /**
      * 判断是不是大房间使用
      */
     get isBigRoom(): boolean;
+    /**
+     * 会议开始时间
+     */
+    get startup(): number;
     setup(info: any): void;
-    bindRoom(room: BMRoom): void;
     initCustomStats(customStats: any): void;
     updateOperationPermission(stats: any): void;
     private handleInitParams;
@@ -1579,7 +1597,7 @@ declare class BMLiveVM {
     private get localBMUser();
     private get localIsAudience();
     /**
-     * 拉流处理
+     * 拉流处理, 观众只拉混流
      * @param bmStreamModel
      */
     handlePull(bmStreamModel: BMStreamModel): Promise<void>;
@@ -1597,6 +1615,7 @@ declare class BMLiveVM {
      * 观众允许发言，允许发言之后，要把所有的流都拉，然后混流静音
      */
     handleAudienceEnable(): Promise<void>;
+    handleMixStream(mute: boolean): Promise<void>;
 }
 
 /**
@@ -1693,6 +1712,10 @@ declare class BMRoom {
     videoProfile: VideoProfile;
     audioProfile: AudioProfileInfo | null;
     voiceMode: AudioHint;
+    /**
+     * 视频自定义编码设置
+     */
+    videoEncodeConfig: StreamCodecOption | null;
     setVoiceMode(mode: AudioHint): void;
     /**
      * brtc断网重连要给端上事件响应，所有端上把流单独做处理的，需要在收到这个事件之后，重新处理所有的effect
@@ -1727,6 +1750,8 @@ declare class BMRoom {
     audioPlayer: AudioPlay;
     private pubFailedTimer;
     get isSingleColumns(): boolean;
+    get localIsAudience(): boolean;
+    get shouldIgnoreStream(): boolean;
     /**
      * 传递信息用的，主要是用于message信令往上层业务发送消息
      */
@@ -1766,6 +1791,15 @@ declare class BMRoom {
      * @param profile 设置视频分辨率
      */
     setVideoProfile(profile: VideoProfile): void;
+    /**
+     * 设置视频分辨率， 需要在入会之前调用
+     * @param encodeConfig
+     * @param encodeConfig.width 宽
+     * @param encodeConfig.height 高
+     * @param encodeConfig.biterate 码率
+     * @param encodeConfig.frameRate 帧率
+     */
+    setCustomVideoEncodeConfig(encodeConfig: StreamCodecOption): void;
     setUserListColumns(column: number): void;
     setSortType(type: number): void;
     /**
@@ -2246,11 +2280,11 @@ declare class BMRoom {
     /**
      * 处理播放相关的逻辑
      * @param streamModel
-     * @param noPlayChanged
-     * @param shouldPlayBig
+     * @param force
      */
-    handlePlay(streamModel: BMStreamModel, noPlayChanged: boolean, shouldPlayBig?: boolean): Promise<void>;
-    handlePlayInBIg(streamModel: BMStreamModel): Promise<void>;
+    handlePlay(streamModel: BMStreamModel, force?: boolean): Promise<void>;
+    handlePlaySmall(streamModel: BMStreamModel): void;
+    handlePlayInBIg(streamModel: BMStreamModel): void;
     /**
      * 处理brtc订阅这股流失败的处理
      * @param streamModel

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as lodash_es from 'lodash-es';
 import * as _hysc_brtc from '@hysc/brtc';
-import { LocalStream, RemoteStream, Device, SubscribeOptions, VideoProfile, AudioHint } from '@hysc/brtc';
+import { LocalStream, RemoteStream, Device, SubscribeOptions, VideoProfile, AudioHint, StreamCodecOption } from '@hysc/brtc';
 import BCClient, { BCUser, ShareMediaOptions, Player, AudioPlayer } from '@hysc/core';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { BoomError } from '@hysc/utils';
@@ -379,11 +379,14 @@ declare class BMStreamModelVM {
      */
     localIsShare: boolean;
     isShareWatcher: Subject<boolean>;
+    localShareCustomStats: any;
     _speaker_enable: boolean;
     speakerEnableWatcher: BehaviorSubject<boolean>;
     /**
      * 混流
      */
+    mixStreamUid: string | null;
+    get mixStreamModel(): BMStreamModel | null | undefined;
     mixStreamModelWatcher: BehaviorSubject<BMStreamModel | null>;
     canvasTimer: NodeJS.Timeout | null;
     private _recorder;
@@ -409,12 +412,18 @@ declare class BMStreamModelVM {
      * 共享屏幕流错误
      */
     localShareError: Subject<BoomError>;
+    localShareEndedError: Subject<boolean>;
     /**
      * 共享屏幕流是单独处理的逻辑，不是先创建streamModel然后在去查流，而是先去查流，在创建streamModel
      */
     shareBloudStateMap: Map<string, BloudStreamEventState>;
+    /**
+     * 窗口播放事件，给到端上去做埋点
+     */
+    streamPlayWatcher: Subject<StreamPlayMessage>;
     constructor();
     private static filterStreamModels;
+    handleStreamPlay: (info: StreamPlayMessage) => void;
     initWithRoom(room: BMRoom): this;
     /**
      * 设置扬声器是否打开
@@ -576,7 +585,7 @@ declare class BMStreamModelVM {
     /**
      * 更新流信息 会给服务端发送updateStream信令，会收到updateStream的广播
      */
-    updateBloudStreamCustomStats(uid: string, streamId: string, streamInfo: StreamCustomInfo): Promise<any> | undefined;
+    updateBloudStreamCustomStats(uid: string, streamId: string, streamInfo: StreamCustomInfo): Promise<void>;
     /**
      * 布局发生变化之后去调用一下这个方法去检测所有流的播放状态
      * @param {string} status tag 用于区分是什么状态下调用的
@@ -602,6 +611,9 @@ interface NoPlayerContainer {
     container: 'small' | 'big';
     id: string;
 }
+interface StreamPlayMessage {
+    uid: string;
+}
 /**
  * 播放器状态
  */
@@ -677,7 +689,7 @@ declare class BMStreamModel {
     get uuid(): string;
     get isAudience(): boolean;
     /**
-     * 因为直播模式中，观众默认是不展示的，只有开麦以后才会展示
+     * 因为直播模式中，观众是不展示的
      * 所以这个地方要判断一下
      */
     get canShow(): boolean;
@@ -809,11 +821,11 @@ declare class BMStreamModel {
     /**
      * 播放当前流
      */
-    play: () => Promise<void>;
+    play: (force?: boolean) => Promise<void>;
     /**
      * 在大窗口播放该流的时候调用这个方法
      */
-    playInBig: () => Promise<void>;
+    playInBig: (force?: boolean) => Promise<void>;
     private initBigPlayer;
     /**
      * 停止播放当前流
@@ -946,6 +958,9 @@ declare class BMUser {
     raiseVideoHands: boolean;
     raiseAudioHands: boolean;
     raiseHand: boolean;
+    /**
+     * 观众
+     */
     isAudience: boolean;
     /**
      * 是不是普通参会者
@@ -1177,14 +1192,17 @@ declare class BMRoomInfo {
     totalUserWatcher: BehaviorSubject<number>;
     totalWaitRoomUserWatcher: BehaviorSubject<number>;
     isOpenWaitRoom: Subject<boolean>;
-    constructor();
+    constructor(room: BMRoom);
     get roomName(): string;
     /**
      * 判断是不是大房间使用
      */
     get isBigRoom(): boolean;
+    /**
+     * 会议开始时间
+     */
+    get startup(): number;
     setup(info: any): void;
-    bindRoom(room: BMRoom): void;
     initCustomStats(customStats: any): void;
     updateOperationPermission(stats: any): void;
     private handleInitParams;
@@ -1579,7 +1597,7 @@ declare class BMLiveVM {
     private get localBMUser();
     private get localIsAudience();
     /**
-     * 拉流处理
+     * 拉流处理, 观众只拉混流
      * @param bmStreamModel
      */
     handlePull(bmStreamModel: BMStreamModel): Promise<void>;
@@ -1597,6 +1615,7 @@ declare class BMLiveVM {
      * 观众允许发言，允许发言之后，要把所有的流都拉，然后混流静音
      */
     handleAudienceEnable(): Promise<void>;
+    handleMixStream(mute: boolean): Promise<void>;
 }
 
 /**
@@ -1693,6 +1712,10 @@ declare class BMRoom {
     videoProfile: VideoProfile;
     audioProfile: AudioProfileInfo | null;
     voiceMode: AudioHint;
+    /**
+     * 视频自定义编码设置
+     */
+    videoEncodeConfig: StreamCodecOption | null;
     setVoiceMode(mode: AudioHint): void;
     /**
      * brtc断网重连要给端上事件响应，所有端上把流单独做处理的，需要在收到这个事件之后，重新处理所有的effect
@@ -1727,6 +1750,8 @@ declare class BMRoom {
     audioPlayer: AudioPlay;
     private pubFailedTimer;
     get isSingleColumns(): boolean;
+    get localIsAudience(): boolean;
+    get shouldIgnoreStream(): boolean;
     /**
      * 传递信息用的，主要是用于message信令往上层业务发送消息
      */
@@ -1766,6 +1791,15 @@ declare class BMRoom {
      * @param profile 设置视频分辨率
      */
     setVideoProfile(profile: VideoProfile): void;
+    /**
+     * 设置视频分辨率， 需要在入会之前调用
+     * @param encodeConfig
+     * @param encodeConfig.width 宽
+     * @param encodeConfig.height 高
+     * @param encodeConfig.biterate 码率
+     * @param encodeConfig.frameRate 帧率
+     */
+    setCustomVideoEncodeConfig(encodeConfig: StreamCodecOption): void;
     setUserListColumns(column: number): void;
     setSortType(type: number): void;
     /**
@@ -2246,11 +2280,11 @@ declare class BMRoom {
     /**
      * 处理播放相关的逻辑
      * @param streamModel
-     * @param noPlayChanged
-     * @param shouldPlayBig
+     * @param force
      */
-    handlePlay(streamModel: BMStreamModel, noPlayChanged: boolean, shouldPlayBig?: boolean): Promise<void>;
-    handlePlayInBIg(streamModel: BMStreamModel): Promise<void>;
+    handlePlay(streamModel: BMStreamModel, force?: boolean): Promise<void>;
+    handlePlaySmall(streamModel: BMStreamModel): void;
+    handlePlayInBIg(streamModel: BMStreamModel): void;
     /**
      * 处理brtc订阅这股流失败的处理
      * @param streamModel