@hysc/meeting 10.0.12 → 10.0.14

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';
@@ -155,6 +155,7 @@ declare class SingletonQueue {
 
 declare type UserSortType = {
     isCommon: boolean;
+    isAudience: boolean;
     shouldDelay: boolean;
 };
 
@@ -224,7 +225,7 @@ declare class BMUserVM {
      */
     initUserList(usersInRoom: Map<string, BCUser>): Promise<void>;
     addBcUsersMap(users: Map<string, BCUser>, forceGetStream?: boolean): void;
-    addBCUser: (bcUser: BCUser, forceGetStream?: boolean) => BMUser | null;
+    addBCUser: (bcUser: BCUser, forceGetStream?: boolean) => BMUser | null | undefined;
     /**
      * 改变userList中的主持人,返回改变后的主持人用户对象,该方法只在change-master中调用, 不对外暴露
      * @param userId
@@ -270,7 +271,7 @@ declare class BMUserVM {
     updateUserSort: lodash_es.DebouncedFunc<() => void>;
     updateCommonUserSort: lodash_es.DebouncedFunc<() => void>;
     updateDelayCommonUserSort: lodash_es.DebouncedFunc<() => void>;
-    updateAudienceUserSort: () => void;
+    updateAudienceUserSort: lodash_es.DebouncedFunc<() => void>;
     updateSignalUserSort: () => void;
     /**
      * 初始化所有的用户
@@ -308,6 +309,7 @@ declare class BMUserVM {
     searchUsers(searchTxt: string, pageSize: number): Promise<{
         userList: BMUser[];
         commonUserList: BMUser[];
+        audienceList: BMUser[];
     }>;
     /**
      * 查找等候室用户
@@ -315,6 +317,7 @@ declare class BMUserVM {
      * @param pageSize
      */
     searchWaitRoomUsers(searchTxt: string, pageSize: number): Promise<BMUser[]>;
+    createUser(bcUser: BCUser): BMUser;
 }
 
 declare class BMChatVM {
@@ -379,11 +382,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 +415,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 +588,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 +614,9 @@ interface NoPlayerContainer {
     container: 'small' | 'big';
     id: string;
 }
+interface StreamPlayMessage {
+    uid: string;
+}
 /**
  * 播放器状态
  */
@@ -677,7 +692,7 @@ declare class BMStreamModel {
     get uuid(): string;
     get isAudience(): boolean;
     /**
-     * 因为直播模式中，观众默认是不展示的，只有开麦以后才会展示
+     * 因为直播模式中，观众是不展示的
      * 所以这个地方要判断一下
      */
     get canShow(): boolean;
@@ -946,6 +961,9 @@ declare class BMUser {
     raiseVideoHands: boolean;
     raiseAudioHands: boolean;
     raiseHand: boolean;
+    /**
+     * 观众
+     */
     isAudience: boolean;
     /**
      * 是不是普通参会者
@@ -1582,7 +1600,7 @@ declare class BMLiveVM {
     private get localBMUser();
     private get localIsAudience();
     /**
-     * 拉流处理
+     * 拉流处理, 观众只拉混流
      * @param bmStreamModel
      */
     handlePull(bmStreamModel: BMStreamModel): Promise<void>;
@@ -1600,6 +1618,7 @@ declare class BMLiveVM {
      * 观众允许发言，允许发言之后，要把所有的流都拉，然后混流静音
      */
     handleAudienceEnable(): Promise<void>;
+    handleMixStream(mute: boolean): Promise<void>;
 }
 
 /**
@@ -1696,6 +1715,10 @@ declare class BMRoom {
     videoProfile: VideoProfile;
     audioProfile: AudioProfileInfo | null;
     voiceMode: AudioHint;
+    /**
+     * 视频自定义编码设置
+     */
+    videoEncodeConfig: StreamCodecOption | null;
     setVoiceMode(mode: AudioHint): void;
     /**
      * brtc断网重连要给端上事件响应，所有端上把流单独做处理的，需要在收到这个事件之后，重新处理所有的effect
@@ -1730,6 +1753,12 @@ declare class BMRoom {
     audioPlayer: AudioPlay;
     private pubFailedTimer;
     get isSingleColumns(): boolean;
+    get localIsAudience(): boolean;
+    get shouldIgnoreStream(): boolean;
+    /**
+     * 研讨会
+     */
+    get isWorkShop(): boolean;
     /**
      * 传递信息用的，主要是用于message信令往上层业务发送消息
      */
@@ -1769,6 +1798,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;
     /**
@@ -2316,6 +2354,7 @@ declare class BMRoom {
     queryBrtcStreams(uids: string[]): Promise<_hysc_brtc.RemoteStream[]>;
     handleAddStreams(streams: SingleRemoteStream[]): void;
     getForceUser(forceId: string): Promise<void>;
+    queryUsers(uids: string[]): Promise<void>;
     getVersion(): string;
 }
 

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';
@@ -155,6 +155,7 @@ declare class SingletonQueue {
 
 declare type UserSortType = {
     isCommon: boolean;
+    isAudience: boolean;
     shouldDelay: boolean;
 };
 
@@ -224,7 +225,7 @@ declare class BMUserVM {
      */
     initUserList(usersInRoom: Map<string, BCUser>): Promise<void>;
     addBcUsersMap(users: Map<string, BCUser>, forceGetStream?: boolean): void;
-    addBCUser: (bcUser: BCUser, forceGetStream?: boolean) => BMUser | null;
+    addBCUser: (bcUser: BCUser, forceGetStream?: boolean) => BMUser | null | undefined;
     /**
      * 改变userList中的主持人,返回改变后的主持人用户对象,该方法只在change-master中调用, 不对外暴露
      * @param userId
@@ -270,7 +271,7 @@ declare class BMUserVM {
     updateUserSort: lodash_es.DebouncedFunc<() => void>;
     updateCommonUserSort: lodash_es.DebouncedFunc<() => void>;
     updateDelayCommonUserSort: lodash_es.DebouncedFunc<() => void>;
-    updateAudienceUserSort: () => void;
+    updateAudienceUserSort: lodash_es.DebouncedFunc<() => void>;
     updateSignalUserSort: () => void;
     /**
      * 初始化所有的用户
@@ -308,6 +309,7 @@ declare class BMUserVM {
     searchUsers(searchTxt: string, pageSize: number): Promise<{
         userList: BMUser[];
         commonUserList: BMUser[];
+        audienceList: BMUser[];
     }>;
     /**
      * 查找等候室用户
@@ -315,6 +317,7 @@ declare class BMUserVM {
      * @param pageSize
      */
     searchWaitRoomUsers(searchTxt: string, pageSize: number): Promise<BMUser[]>;
+    createUser(bcUser: BCUser): BMUser;
 }
 
 declare class BMChatVM {
@@ -379,11 +382,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 +415,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 +588,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 +614,9 @@ interface NoPlayerContainer {
     container: 'small' | 'big';
     id: string;
 }
+interface StreamPlayMessage {
+    uid: string;
+}
 /**
  * 播放器状态
  */
@@ -677,7 +692,7 @@ declare class BMStreamModel {
     get uuid(): string;
     get isAudience(): boolean;
     /**
-     * 因为直播模式中，观众默认是不展示的，只有开麦以后才会展示
+     * 因为直播模式中，观众是不展示的
      * 所以这个地方要判断一下
      */
     get canShow(): boolean;
@@ -946,6 +961,9 @@ declare class BMUser {
     raiseVideoHands: boolean;
     raiseAudioHands: boolean;
     raiseHand: boolean;
+    /**
+     * 观众
+     */
     isAudience: boolean;
     /**
      * 是不是普通参会者
@@ -1582,7 +1600,7 @@ declare class BMLiveVM {
     private get localBMUser();
     private get localIsAudience();
     /**
-     * 拉流处理
+     * 拉流处理, 观众只拉混流
      * @param bmStreamModel
      */
     handlePull(bmStreamModel: BMStreamModel): Promise<void>;
@@ -1600,6 +1618,7 @@ declare class BMLiveVM {
      * 观众允许发言，允许发言之后，要把所有的流都拉，然后混流静音
      */
     handleAudienceEnable(): Promise<void>;
+    handleMixStream(mute: boolean): Promise<void>;
 }
 
 /**
@@ -1696,6 +1715,10 @@ declare class BMRoom {
     videoProfile: VideoProfile;
     audioProfile: AudioProfileInfo | null;
     voiceMode: AudioHint;
+    /**
+     * 视频自定义编码设置
+     */
+    videoEncodeConfig: StreamCodecOption | null;
     setVoiceMode(mode: AudioHint): void;
     /**
      * brtc断网重连要给端上事件响应，所有端上把流单独做处理的，需要在收到这个事件之后，重新处理所有的effect
@@ -1730,6 +1753,12 @@ declare class BMRoom {
     audioPlayer: AudioPlay;
     private pubFailedTimer;
     get isSingleColumns(): boolean;
+    get localIsAudience(): boolean;
+    get shouldIgnoreStream(): boolean;
+    /**
+     * 研讨会
+     */
+    get isWorkShop(): boolean;
     /**
      * 传递信息用的，主要是用于message信令往上层业务发送消息
      */
@@ -1769,6 +1798,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;
     /**
@@ -2316,6 +2354,7 @@ declare class BMRoom {
     queryBrtcStreams(uids: string[]): Promise<_hysc_brtc.RemoteStream[]>;
     handleAddStreams(streams: SingleRemoteStream[]): void;
     getForceUser(forceId: string): Promise<void>;
+    queryUsers(uids: string[]): Promise<void>;
     getVersion(): string;
 }