@hysc/meeting 10.0.34 → 10.0.35

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as lodash_es from 'lodash-es';
 import * as _hysc_brtc from '@hysc/brtc';
 import { LocalStream, RemoteStream, Device, SubscribeOptions, VideoProfile, AudioHint, StreamCodecOption } from '@hysc/brtc';
-import BCClient, { BCUser, ShareMediaOptions, Player, AudioPlayer } from '@hysc/core';
+import BCClient, { ShareMediaOptions, Player, BCUser, AudioPlayer } from '@hysc/core';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { BoomError } from '@hysc/utils';
 export { Logger } from '@hysc/utils';
@@ -119,209 +119,6 @@ declare function getMediaStreamInfo(mediaStream: MediaStream, videoInfo: {
     height: number;
 } | null;
 
-/**
- * @name: SingletonQueue
- * @author: yangliye
- * @date: 2023-05-18 09:47
- * @description：SingletonQueue
- * @update: 2023-05-18 09:47
- */
-declare type CallBack = (arg: Map<string, PullItem>, ...args: any) => void;
-declare type PullItem = {
-    id: string;
-    isScreen: boolean;
-    isWeb?: boolean;
-    force?: boolean;
-};
-declare class SingletonQueue {
-    private static instance;
-    private _callback;
-    private pullMap;
-    constructor();
-    addUsers(userIds: PullItem[]): void;
-    removeUsers(userId: PullItem[]): void;
-    restart(): void;
-    setQueueProcessor(callback: CallBack): void;
-    removeQueueProcessor(): void;
-}
-
-/**
- * @name: emitter
- * @author: yangliye
- * @date: 2022-05-24 15:15
- * @description：emitter
- * @update: 2022-05-24 15:15
- */
-
-declare type UserSortType = {
-    isCommon: boolean;
-    isAudience: boolean;
-    shouldDelay: boolean;
-};
-
-interface ChangeIsGuest {
-    user: BMUser;
-    preIsGuest: boolean;
-    isGuest: boolean;
-}
-declare class BMUserVM {
-    userList: Map<string, BMUser>;
-    audiencesList: Map<string, BMUser>;
-    signalList: Map<string, BMUser>;
-    commonUserList: Map<string, BMUser>;
-    boomCore: BCClient;
-    room: BMRoom;
-    userListWatcher: BehaviorSubject<BMUser[]>;
-    audiencesListWatcher: BehaviorSubject<BMUser[]>;
-    commonUserListWatcher: BehaviorSubject<BMUser[]>;
-    signalListWatcher: BehaviorSubject<BMUser[]>;
-    masterUserWatcher: BehaviorSubject<BMUser | null>;
-    getForceUserWatcher: BehaviorSubject<boolean>;
-    localUser: BMUser;
-    commTimer: number;
-    constructor(boomCore: BCClient, localUser: BMUser, room: BMRoom);
-    handleUserRoleChange(info: ChangeIsGuest): Promise<void>;
-    /**
-     * 添加用户, 并返回已添加的用户对象
-     * @param bcUser bcUser对象
-     */
-    addUser(bcUser: BCUser): BMUser;
-    /**
-     * 移除用户
-     * @param userId 用户id
-     */
-    removeUser(userId: string): boolean;
-    /**
-     * 获取用户视频开启状态
-     * @param userId 用户id
-     */
-    videoEnable(userId: string): boolean;
-    /**
-     * 获取用户音频开启状态
-     * @param userId
-     */
-    audioEnable(userId: string): boolean;
-    /**
-     * 检测用户是不是主持人
-     * @param {string} userId 用户id
-     */
-    checkIsMaster(userId: any): boolean;
-    /**
-     * 检测当前用户是否有主持人权限
-     */
-    checkLocalHasMaster(): boolean;
-    /**
-     * 检测目标用户是否有主持人权限
-     */
-    checkUserHasMaster(userId: string): boolean;
-    /**
-     * 根据用户id获取user对象
-     * @param {string} userId
-     */
-    getUser(userId: string): BMUser | undefined;
-    getAllUsers(pageIndex: number, allUsers: Map<string, BCUser>, permission?: string, useNew?: boolean): Promise<void>;
-    /**
-     * 刚加入房间时初始化人数
-     */
-    initUserList(usersInRoom: Map<string, BCUser>): Promise<void>;
-    addBcUsersMap(users: Map<string, BCUser>, forceGetStream?: boolean, updateSort?: boolean): void;
-    addBCUser: (bcUser: BCUser, forceGetStream?: boolean, updateSort?: boolean) => BMUser | undefined;
-    /**
-     * 改变userList中的主持人,返回改变后的主持人用户对象,该方法只在change-master中调用, 不对外暴露
-     * @param userId
-     * @param oldMasterId
-     * @param isKeep
-     */
-    updateMaster(userId: string, oldMasterId: string, isKeep: boolean): UpdateMasterType;
-    /**
-       * 联席主持人设置嘉宾的操作
-       * @param userId
-       */
-    managerChangeToGuest(userId: string): BMUser | undefined;
-    /**
-     * 改变联席主持人,返回设置为联席主持人的bmuser对象
-     * @param userId
-     * @param status true:设置成联席主持人 false:取消联席主持人身份
-     * @param hasS
-     * @returns
-     */
-    updateManager(userId: string, status: boolean, hasS?: boolean): BMUser;
-    /**
-     * 获取我自己
-     */
-    getLocalUser(): BMUser;
-    updateUser(bmUser: BMUser, bcUser: BCUser): void;
-    updateLocalUserPermission(permission: string): void;
-    /**
-     * bcUser变成BMUser
-     * @param bcUser
-     * @returns
-     */
-    toBMUser(bcUser: BCUser): BMUser;
-    private sortUsers;
-    private sortAudiences;
-    private sortCommonUsers;
-    private sortSignalUsers;
-    private static filterUsers;
-    /**
-     * 排序变化之后的处理逻辑
-     */
-    updateAllSort: () => void;
-    updateSortByType: (userType: UserSortType) => void;
-    updateUserSort: lodash_es.DebouncedFunc<() => void>;
-    updateCommonUserSort: lodash_es.DebouncedFunc<() => void>;
-    updateDelayCommonUserSort: lodash_es.DebouncedFunc<() => void>;
-    updateAudienceUserSort: lodash_es.DebouncedFunc<() => void>;
-    updateSignalUserSort: () => void;
-    /**
-     * 初始化所有的用户
-     */
-    initUsers(): Promise<void>;
-    /**
-     * 把bloud用户转化为当前的BMUser 和创建对应的BMStreamModel
-     * @param page
-     * @param permission
-     * @param useNew 是否使用getUsersList
-     */
-    transBloudUsers: (page: number, permission?: string, useNew?: boolean, failedNum?: number) => Promise<void>;
-    /**
-     * 本地嘉宾用户降级为普通参会者之后要取消拉流
-     */
-    handleUnSubCommonUser(): void;
-    handleCommonUserChange(): void;
-    getUsers(page: number, pageSize: number, permission?: string, mode?: 'map' | 'array'): Promise<{
-        userList: Map<string, BMUser>;
-        total: number;
-    } | {
-        userList: BMUser[];
-        total: number;
-    }>;
-    getUsersList(page: number, pageSize: number, permission?: string, waitRoom?: boolean): Promise<{
-        userList: BMUser[];
-        total: number;
-        pageIndex: number;
-    }>;
-    getTotalUserNumber(): Promise<number>;
-    clearUsers(): void;
-    /**
-     * 参会者列表搜索(嘉宾及以上才能搜索)
-     * @param searchTxt 搜索文本
-     * @param pageSize 一页几个
-     * @param waitRoom 是否是等候室用户
-     */
-    searchUsers(searchTxt: string, pageSize: number): Promise<{
-        userList: BMUser[];
-        commonUserList: BMUser[];
-        audienceList: BMUser[];
-    }>;
-    /**
-     * 查找等候室用户
-     * @param searchTxt
-     * @param pageSize
-     */
-    searchWaitRoomUsers(searchTxt: string, pageSize: number): Promise<BMUser[]>;
-}
-
 declare class BMChatVM {
     messageList: Array<BMMessageInfo>;
     boomCore: BCClient;
@@ -1049,6 +846,183 @@ declare class BMUser {
     setSortNum(sortNum: number, force: boolean, shouldDelay: boolean): void;
 }
 
+/**
+ * @name: emitter
+ * @author: yangliye
+ * @date: 2022-05-24 15:15
+ * @description：emitter
+ * @update: 2022-05-24 15:15
+ */
+
+declare type UserSortType = {
+    isCommon: boolean;
+    isAudience: boolean;
+    shouldDelay: boolean;
+};
+
+interface ChangeIsGuest {
+    user: BMUser;
+    preIsGuest: boolean;
+    isGuest: boolean;
+}
+declare class BMUserVM {
+    userList: Map<string, BMUser>;
+    audiencesList: Map<string, BMUser>;
+    signalList: Map<string, BMUser>;
+    commonUserList: Map<string, BMUser>;
+    boomCore: BCClient;
+    room: BMRoom;
+    userListWatcher: BehaviorSubject<BMUser[]>;
+    audiencesListWatcher: BehaviorSubject<BMUser[]>;
+    commonUserListWatcher: BehaviorSubject<BMUser[]>;
+    signalListWatcher: BehaviorSubject<BMUser[]>;
+    masterUserWatcher: BehaviorSubject<BMUser | null>;
+    getForceUserWatcher: BehaviorSubject<boolean>;
+    localUser: BMUser;
+    commTimer: number;
+    constructor(boomCore: BCClient, localUser: BMUser, room: BMRoom);
+    handleUserRoleChange(info: ChangeIsGuest): Promise<void>;
+    /**
+     * 添加用户, 并返回已添加的用户对象
+     * @param bcUser bcUser对象
+     */
+    addUser(bcUser: BCUser): BMUser;
+    /**
+     * 移除用户
+     * @param userId 用户id
+     */
+    removeUser(userId: string): boolean;
+    /**
+     * 获取用户视频开启状态
+     * @param userId 用户id
+     */
+    videoEnable(userId: string): boolean;
+    /**
+     * 获取用户音频开启状态
+     * @param userId
+     */
+    audioEnable(userId: string): boolean;
+    /**
+     * 检测用户是不是主持人
+     * @param {string} userId 用户id
+     */
+    checkIsMaster(userId: any): boolean;
+    /**
+     * 检测当前用户是否有主持人权限
+     */
+    checkLocalHasMaster(): boolean;
+    /**
+     * 检测目标用户是否有主持人权限
+     */
+    checkUserHasMaster(userId: string): boolean;
+    /**
+     * 根据用户id获取user对象
+     * @param {string} userId
+     */
+    getUser(userId: string): BMUser | undefined;
+    getAllUsers(pageIndex: number, allUsers: Map<string, BCUser>, permission?: string, useNew?: boolean): Promise<void>;
+    /**
+     * 刚加入房间时初始化人数
+     */
+    initUserList(usersInRoom: Map<string, BCUser>): Promise<void>;
+    addBcUsersMap(users: Map<string, BCUser>, forceGetStream?: boolean, updateSort?: boolean): void;
+    addBCUser: (bcUser: BCUser, forceGetStream?: boolean, updateSort?: boolean) => BMUser | undefined;
+    /**
+     * 改变userList中的主持人,返回改变后的主持人用户对象,该方法只在change-master中调用, 不对外暴露
+     * @param userId
+     * @param oldMasterId
+     * @param isKeep
+     */
+    updateMaster(userId: string, oldMasterId: string, isKeep: boolean): UpdateMasterType;
+    /**
+       * 联席主持人设置嘉宾的操作
+       * @param userId
+       */
+    managerChangeToGuest(userId: string): BMUser | undefined;
+    /**
+     * 改变联席主持人,返回设置为联席主持人的bmuser对象
+     * @param userId
+     * @param status true:设置成联席主持人 false:取消联席主持人身份
+     * @param hasS
+     * @returns
+     */
+    updateManager(userId: string, status: boolean, hasS?: boolean): BMUser;
+    /**
+     * 获取我自己
+     */
+    getLocalUser(): BMUser;
+    updateUser(bmUser: BMUser, bcUser: BCUser): void;
+    updateLocalUserPermission(permission: string): void;
+    /**
+     * bcUser变成BMUser
+     * @param bcUser
+     * @returns
+     */
+    toBMUser(bcUser: BCUser): BMUser;
+    private sortUsers;
+    private sortAudiences;
+    private sortCommonUsers;
+    private sortSignalUsers;
+    private static filterUsers;
+    /**
+     * 排序变化之后的处理逻辑
+     */
+    updateAllSort: () => void;
+    updateSortByType: (userType: UserSortType) => void;
+    updateUserSort: lodash_es.DebouncedFunc<() => void>;
+    updateCommonUserSort: lodash_es.DebouncedFunc<() => void>;
+    updateDelayCommonUserSort: lodash_es.DebouncedFunc<() => void>;
+    updateAudienceUserSort: lodash_es.DebouncedFunc<() => void>;
+    updateSignalUserSort: () => void;
+    /**
+     * 初始化所有的用户
+     */
+    initUsers(): Promise<void>;
+    /**
+     * 把bloud用户转化为当前的BMUser 和创建对应的BMStreamModel
+     * @param page
+     * @param permission
+     * @param useNew 是否使用getUsersList
+     */
+    transBloudUsers: (page: number, permission?: string, useNew?: boolean, failedNum?: number) => Promise<void>;
+    /**
+     * 本地嘉宾用户降级为普通参会者之后要取消拉流
+     */
+    handleUnSubCommonUser(): void;
+    handleCommonUserChange(): void;
+    getUsers(page: number, pageSize: number, permission?: string, mode?: 'map' | 'array'): Promise<{
+        userList: Map<string, BMUser>;
+        total: number;
+    } | {
+        userList: BMUser[];
+        total: number;
+    }>;
+    getUsersList(page: number, pageSize: number, permission?: string, waitRoom?: boolean): Promise<{
+        userList: BMUser[];
+        total: number;
+        pageIndex: number;
+    }>;
+    getTotalUserNumber(): Promise<number>;
+    clearUsers(): void;
+    /**
+     * 参会者列表搜索(嘉宾及以上才能搜索)
+     * @param searchTxt 搜索文本
+     * @param pageSize 一页几个
+     * @param waitRoom 是否是等候室用户
+     */
+    searchUsers(searchTxt: string, pageSize: number): Promise<{
+        userList: BMUser[];
+        commonUserList: BMUser[];
+        audienceList: BMUser[];
+    }>;
+    /**
+     * 查找等候室用户
+     * @param searchTxt
+     * @param pageSize
+     */
+    searchWaitRoomUsers(searchTxt: string, pageSize: number): Promise<BMUser[]>;
+}
+
 /**
  * @name: BMRoomInfo
  * @author: yangliye
@@ -1588,6 +1562,23 @@ declare class BMRoomVM {
     resp2ChangeRemoteAudioProfile(status: boolean, uid: string): Promise<any>;
 }
 
+/**
+ * @name: SingletonQueue
+ * @author: yangliye
+ * @date: 2023-05-18 09:47
+ * @description：SingletonQueue
+ * @update: 2023-05-18 09:47
+ */
+
+declare class SingletonQueue {
+    room: BMRoom;
+    pullMap: Map<string, PullItem>;
+    constructor(room: BMRoom);
+    addUser(pullInfo: PullItem): void;
+    removeUser(pullInfo: PullItem): void;
+    restart(): void;
+}
+
 /**
  * @name: BMLiveVM.ts
  * @author: yangliye
@@ -1652,6 +1643,12 @@ declare class AudioPlay {
     destroy(): void;
 }
 
+declare type PullItem = {
+    id: string;
+    isScreen: boolean;
+    isWeb?: boolean;
+    force?: boolean;
+};
 interface BMRoomProps {
     initDevices: boolean;
 }
@@ -2342,9 +2339,13 @@ declare class BMRoom {
      * 重拉远端流
      */
     handleResetOtherStreamStatus(): void;
+    /**
+     * 处理断网重连之后对流的处理
+     * @param pullItems
+     */
+    restartPullUsers(pullItems: Map<string, PullItem>): void;
     addUser2Queue(pullItem: PullItem): Promise<void>;
-    processUser: (uIds: Map<string, PullItem>) => Promise<void>;
-    queueProcessor: lodash_es.DebouncedFunc<(uIds: Map<string, PullItem>) => Promise<void>>;
+    processUser: (uId: PullItem, failed?: number) => Promise<void>;
     queryBrtcStreams(uids: string[]): Promise<_hysc_brtc.RemoteStream[]>;
     handleAddStreams(streams: SingleRemoteStream[]): void;
     getForceUser(forceId: string): Promise<void>;
@@ -2352,4 +2353,4 @@ declare class BMRoom {
     getVersion(): string;
 }
 
-export { BMRoom as default };
+export { BMStreamModel, BMUser, BMRoom as default };