@hysc/meeting 1.6.16 → 1.6.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hysc/meeting",
-  "version": "1.6.16",
+  "version": "1.6.18",
   "description": "boom meeting",
   "main": "umd/index.js",
   "module": "esm/index.js",
@@ -14,7 +14,7 @@
   "author": "yangliye",
   "license": "MIT",
   "dependencies": {
-    "@hysc/core": "1.6.8",
+    "@hysc/core": "1.6.10",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "@hysc/p-queue": "6.3.0",
@@ -23,7 +23,7 @@
     "@hysc/utils": "1.2.0"
   },
   "peerDependencies": {
-    "@hysc/core": "1.6.8"
+    "@hysc/core": "1.6.10"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.6"

package/umd/BMStream/BMStreamModel.d.ts

@@ -28,6 +28,8 @@ export default class BMStreamModel {
     _audio_enable: boolean;
     videoEnableWatcher: BehaviorSubject<boolean>;
     audioEnableWatcher: BehaviorSubject<boolean>;
+    streamUpdateWatcher: Subject<boolean>;
+    isSubScribedWatcher: Subject<boolean>;
     playStateChangeWatcher: Subject<BMStreamModel>;
     audioLevelWatcher: Subject<number>;
     isCurrentDisplay: boolean;

package/umd/BMUser/BMUser.d.ts

@@ -0,0 +1,151 @@
+import BMStreamModel from '../BMStream/BMStreamModel';
+import { BehaviorSubject } from 'rxjs';
+import BCUser from '@hysc/core/esm/BoomAdapter/User/User';
+import BMRoom from '../BMRoom/BMRoom';
+declare type Operation = 'none' | 'getMaster' | 'getManager' | 'removeMaster' | 'getGuest' | 'removeGuest' | 'removeManager' | 'changeNickName' | 'speakerEnable' | 'changeShare' | 'updateUser' | 'raiseHandsVideo' | 'raiseHandsAudio' | 'audienceEnableSpeaking' | 'inBackground';
+interface IUserActionWatcher {
+    operation: Operation;
+    user: BMUser;
+}
+interface UserInfo {
+    avatar: string;
+    jointime: number;
+    nickname: string;
+    pos: string;
+    userId: string;
+    status?: {
+        audioRaiseHands: boolean;
+        videoRaiseHands: boolean;
+    };
+}
+export interface RaiseHandInfo {
+    status: 'raiseHandsAudio' | 'raiseHandsVideo';
+    user: BMUser;
+}
+export default class BMUser {
+    /**
+     * 用户id
+     */
+    userId: string;
+    /**
+     * 用户信息
+     */
+    userInfo: UserInfo;
+    nickName: string;
+    isMaster: boolean;
+    isManager: boolean;
+    mirror: boolean;
+    isLocal: boolean;
+    isToupingma: boolean;
+    hasMultiple: boolean;
+    isCreate: boolean;
+    hasShare: boolean;
+    audienceEnableSpeaking: boolean;
+    /** 头像 */
+    avatar: string;
+    private streamModels;
+    permission: any;
+    /**
+     * 监听器, 监听返回对象属性
+     * @property {string} operation
+     * 'getManager':获得管理员权限/成为联席主持人
+     * 'getMaster':成为主持人
+     * 'removeManager':取消管理员权限/取消联席主持人
+     * 'removeMaster':取消主持人
+     * 'changeNickName':改变昵称
+     * 'speakerEnable':扬声器开关状态改变
+     * 'changeShare': 是否在屏幕共享
+     * 'raiseHandsVideo': 是否视频举手
+     * 'raiseHandsAudio': 是否音频举手
+     * @property {BMUser} user
+     */
+    watcher: BehaviorSubject<IUserActionWatcher>;
+    /**
+     * 排序
+     */
+    sortNum: number;
+    /**
+     * 举手相关
+     */
+    raiseVideoHands: boolean;
+    raiseAudioHands: boolean;
+    isAudience: boolean;
+    /**
+     * 是不是普通参会者
+     */
+    isCommonUser: boolean;
+    /**
+     * 如果改用户是移动端, 该值用于判断这个用户是否在后台
+     */
+    inBackground: boolean;
+    /**
+     * 是不是web端入会
+     */
+    get isWeb(): boolean;
+    constructor(user: any, isLocal?: boolean);
+    setup(userId: string, userinfo: UserInfo, nickname: string): void;
+    getMainStreamModel(): BMStreamModel | undefined;
+    getShareStreamModel(): BMStreamModel | undefined;
+    /**
+     * 获取用户麦克风开启状态
+     */
+    get audioEnable(): boolean;
+    get isMixer(): boolean;
+    /**
+     * 获取用户视频开启状态
+     */
+    get videoEnable(): boolean;
+    get isSharing(): boolean;
+    /**
+     * 是否是信号源
+     */
+    get isSignal(): boolean;
+    /**
+     * 检测当前用户是否有主持人权限
+     */
+    checkLocalHasMaster(): boolean;
+    /**
+     * 给用户添加流
+     * @param streamId
+     * @param stream 流
+     */
+    addStream(streamId: string, stream: BMStreamModel): void;
+    /**
+     * 删除流
+     * @param streamId
+     */
+    removeStream(streamId: string): void;
+    /**
+     * 获取用户id
+     */
+    getID(): string;
+    /**
+     * 获取用户昵称
+     */
+    getNickName(): string;
+    /**
+     * 获取用户信息
+     */
+    getUserInfo(): UserInfo;
+    /**
+     * 获取用户流信息
+     */
+    getStreams(): Map<string, BMStreamModel>;
+    /**
+     * updateUserInfo更新用户信息(除了isMaster,isMaster是通过change-master事件改变的)
+     * @param bcUser
+     * @param participant
+     * @param bmRoom
+     * @returns
+     */
+    updateUserInfo(bcUser: BCUser, participant: any, bmRoom: BMRoom): void;
+    /** 是否有管理权限, 是主持人或联席主持人之一 */
+    hasManager(): boolean;
+    /** 获取用户后面的身份标识 */
+    getNicknameSuffix(): string;
+    /**
+     * 更新当前用户的排序
+     */
+    updateSortNum(): void;
+}
+export {};

package/umd/BMUser/BMUserVM.d.ts

@@ -0,0 +1,138 @@
+import BoomCore from '@hysc/core/esm';
+import BMUser from './BMUser';
+import BCUser from '@hysc/core/esm/BoomAdapter/User/User';
+import BMRoom from '../BMRoom/BMRoom';
+import { BehaviorSubject } from 'rxjs';
+import { UpdateMasterType } from '../type';
+/**
+ * 往业务端返回的时候，需要把这些用户过滤掉
+ */
+export declare const ignoreUserId: string[];
+export interface ChangeIsGuest {
+    user: BMUser;
+    preIsGuest: boolean;
+    isGuest: boolean;
+}
+export default class BMUserVM {
+    userList: Map<string, BMUser>;
+    audiencesList: Map<string, BMUser>;
+    signalList: Map<string, BMUser>;
+    commonUserList: Map<string, BMUser>;
+    boomCore: BoomCore;
+    room: BMRoom | null;
+    userListWatcher: BehaviorSubject<BMUser[]>;
+    audiencesListWatcher: BehaviorSubject<BMUser[]>;
+    commonUserListWatcher: BehaviorSubject<BMUser[]>;
+    signalListWatcher: BehaviorSubject<BMUser[]>;
+    masterUserWatcher: BehaviorSubject<BMUser | null>;
+    localUser: BMUser;
+    constructor(boomCore: BoomCore, localUser: BMUser);
+    initWithRoom(room: BMRoom): void;
+    handleUserRoleChange(info: ChangeIsGuest): Promise<void>;
+    /**
+     * 添加用户, 并返回已添加的用户对象
+     * @param bcUser bcUser对象
+     */
+    addUser(bcUser: BCUser): BMUser | null;
+    /**
+     * 移除用户
+     * @param userId 用户id
+     */
+    removeUser(userId: string): void;
+    /**
+     * 是否在userList找到该用户,返回true or false
+     * @param bcUser bcUser对象
+     * @returns
+     */
+    findUser(bcUser: BCUser): boolean;
+    /**
+     * 获取用户视频开启状态
+     * @param userId 用户id
+     */
+    videoEnable(userId: string): boolean;
+    /**
+     * 获取用户音频开启状态
+     * @param userId
+     */
+    audioEnable(userId: string): boolean;
+    /**
+     * 检测用户是不是主持人
+     * @param {string} userId 用户id
+     */
+    checkIsMaster(userId: any): boolean;
+    /**
+     * 检测当前用户是否有主持人权限
+     */
+    checkLocalHasMaster(): any;
+    /**
+     * 检测目标用户是否有主持人权限
+     */
+    checkUserHasMaster(userId: string): boolean;
+    /**
+     * 根据用户id获取user对象
+     * @param {string} userId
+     */
+    getUser(userId: string): BMUser | undefined;
+    getAllUsers(pageIndex: number, allUsers: Map<string, BCUser>): Promise<void>;
+    /**
+     * 刚加入房间时初始化人数
+     */
+    initUserList(usersInRoom: Map<string, BCUser>): Promise<void>;
+    /**
+     * 改变userList中的主持人,返回改变后的主持人用户对象,该方法只在change-master中调用, 不对外暴露
+     * @param userId
+     * @param oldMasterId
+     * @param isKeep
+     */
+    updateMaster(userId: string, oldMasterId: string, isKeep: boolean): UpdateMasterType;
+    /**
+       * 联席主持人设置嘉宾的操作
+       * @param userId
+       */
+    managerChangeToGuest(userId: string): any;
+    /**
+     * 改变联席主持人,返回设置为联席主持人的bmuser对象
+     * @param userId
+     * @param status true:设置成联席主持人 false:取消联席主持人身份
+     * @param hasS
+     * @returns
+     */
+    updateManager(userId: string, status: boolean, hasS?: boolean): BMUser;
+    /**
+     * 获取我自己
+     */
+    getLocalUser(): BMUser;
+    updateSelf(bcUser: BCUser): void;
+    updateUser(bmUser: BMUser, bcUser: BCUser): void;
+    /**
+     * bcUser变成BMUser
+     * @param bcUser
+     * @returns
+     */
+    toBMUser(bcUser: BCUser): BMUser;
+    private sortUsers;
+    private sortAudiences;
+    private sortCommonUsers;
+    private sortSignalUsers;
+    private static filterUsers;
+    /**
+     * 排序变化之后的处理逻辑
+     */
+    updateSort: () => void;
+    /**
+     * 初始化所有的用户
+     * @param total
+     */
+    initUsers(total: number): Promise<void>;
+    /**
+     * 本地嘉宾用户降级为普通参会者之后要取消拉流
+     */
+    handleUnSubCommonUser(): void;
+    handleCommonUserChange(): void;
+    getUsers(page: number, pageSize: number, permission?: string): Promise<{
+        userList: BMUser[];
+        total: number;
+    }>;
+    getTotalUserNumber(): Promise<number>;
+    clearUsers(): void;
+}