@hysc/meeting 1.6.17 → 1.6.18

package/esm/BMChat/BMChatVM.d.ts

@@ -1,24 +1,24 @@
-import BoomCore from '@hysc/core/esm';
-import BMMessageInfo from './BMMessageInfo';
-import { BehaviorSubject, Subject } from "rxjs";
-import BMUserVM from '../BMUser/BMUserVM';
-import BMRoom from '../BMRoom/BMRoom';
-export default class BMChatVM {
-    messageList: Array<BMMessageInfo>;
-    boomCore: BoomCore;
-    userVM: BMUserVM;
-    bmRoom: BMRoom;
-    messageListWatcher: BehaviorSubject<Array<BMMessageInfo>>;
-    hasDangerMessageWatcher: Subject<boolean>;
-    constructor(boomCore: BoomCore, userVM: BMUserVM, bmRoom: BMRoom);
-    /**
-     * 发送聊天消息
-     * @param talkMsg 聊天信息
-     */
-    sendMessage(talkMsg: string, userId: string | undefined): Promise<void>;
-    addMessage(info: BMMessageInfo, isParticipantNotice: boolean): void;
-    /**
-     * 获取历史消息
-     */
-    getHistoryMessage(): Promise<BMMessageInfo[]>;
-}
+import BoomCore from '@hysc/core/esm';
+import BMMessageInfo from './BMMessageInfo';
+import { BehaviorSubject, Subject } from "rxjs";
+import BMUserVM from '../BMUser/BMUserVM';
+import BMRoom from '../BMRoom/BMRoom';
+export default class BMChatVM {
+    messageList: Array<BMMessageInfo>;
+    boomCore: BoomCore;
+    userVM: BMUserVM;
+    bmRoom: BMRoom;
+    messageListWatcher: BehaviorSubject<Array<BMMessageInfo>>;
+    hasDangerMessageWatcher: Subject<boolean>;
+    constructor(boomCore: BoomCore, userVM: BMUserVM, bmRoom: BMRoom);
+    /**
+     * 发送聊天消息
+     * @param talkMsg 聊天信息
+     */
+    sendMessage(talkMsg: string, userId: string | undefined): Promise<void>;
+    addMessage(info: BMMessageInfo, isParticipantNotice: boolean): void;
+    /**
+     * 获取历史消息
+     */
+    getHistoryMessage(): Promise<BMMessageInfo[]>;
+}

package/esm/BMChat/BMMessageInfo.d.ts

@@ -1,27 +1,27 @@
-interface IMessageInfo {
-    userId?: string;
-    message: string;
-    role?: string;
-    isLocal?: boolean;
-    avatar?: string;
-    nickName?: string;
-    sendTime?: number;
-    isMeetingNotice?: boolean;
-    to?: string | undefined;
-    isDanger?: boolean;
-}
-export default class BMMessageInfo {
-    userId?: any;
-    message: string;
-    time: string;
-    timeStamp: number;
-    role?: string;
-    isLocal?: boolean;
-    avatar?: any;
-    nickName?: any;
-    isMeetingNotice: boolean;
-    to: string | undefined;
-    isDanger: boolean | undefined;
-    constructor(props: IMessageInfo);
-}
-export {};
+interface IMessageInfo {
+    userId?: string;
+    message: string;
+    role?: string;
+    isLocal?: boolean;
+    avatar?: string;
+    nickName?: string;
+    sendTime?: number;
+    isMeetingNotice?: boolean;
+    to?: string | undefined;
+    isDanger?: boolean;
+}
+export default class BMMessageInfo {
+    userId?: any;
+    message: string;
+    time: string;
+    timeStamp: number;
+    role?: string;
+    isLocal?: boolean;
+    avatar?: any;
+    nickName?: any;
+    isMeetingNotice: boolean;
+    to: string | undefined;
+    isDanger: boolean | undefined;
+    constructor(props: IMessageInfo);
+}
+export {};

package/esm/BMRoom/BMLiveVM.d.ts

@@ -1,35 +1,35 @@
-/**
- * @name: BMLiveVM.ts
- * @author: yangliye
- * @date: 2022-07-15 13:53
- * @description：处理直播相关的流处理
- * @update: 2022-07-15 13:53
- */
-import BMRoom from "./BMRoom";
-import BMStreamModel from "../BMStream/BMStreamModel";
-declare class BMLiveVM {
-    private room;
-    constructor(room: BMRoom);
-    private get localBMUser();
-    private get localIsAudience();
-    /**
-     * 拉流处理
-     * @param bmStreamModel
-     */
-    handlePull(bmStreamModel: BMStreamModel): Promise<void>;
-    /**
-     * 切换大小流处理
-     * @param bmStreamModel
-     */
-    handleChangeStreamType(bmStreamModel: BMStreamModel): Promise<void>;
-    handlePlay(bmStreamModel: BMStreamModel, noPlayChanged: boolean): Promise<void>;
-    /**
-     * 处理观众端举手发言完了，然后在禁止发言，这个时候，没有必要在拉所有人的流，把除了混流的人的流都取消订阅，然后播放混流的声音
-     */
-    handleAudienceDisable(): Promise<void>;
-    /**
-     * 观众允许发言，允许发言之后，要把所有的流都拉，然后混流静音
-     */
-    handleAudienceEnable(): Promise<void>;
-}
-export default BMLiveVM;
+/**
+ * @name: BMLiveVM.ts
+ * @author: yangliye
+ * @date: 2022-07-15 13:53
+ * @description：处理直播相关的流处理
+ * @update: 2022-07-15 13:53
+ */
+import BMRoom from "./BMRoom";
+import BMStreamModel from "../BMStream/BMStreamModel";
+declare class BMLiveVM {
+    private room;
+    constructor(room: BMRoom);
+    private get localBMUser();
+    private get localIsAudience();
+    /**
+     * 拉流处理
+     * @param bmStreamModel
+     */
+    handlePull(bmStreamModel: BMStreamModel): Promise<void>;
+    /**
+     * 切换大小流处理
+     * @param bmStreamModel
+     */
+    handleChangeStreamType(bmStreamModel: BMStreamModel): Promise<void>;
+    handlePlay(bmStreamModel: BMStreamModel, noPlayChanged: boolean): Promise<void>;
+    /**
+     * 处理观众端举手发言完了，然后在禁止发言，这个时候，没有必要在拉所有人的流，把除了混流的人的流都取消订阅，然后播放混流的声音
+     */
+    handleAudienceDisable(): Promise<void>;
+    /**
+     * 观众允许发言，允许发言之后，要把所有的流都拉，然后混流静音
+     */
+    handleAudienceEnable(): Promise<void>;
+}
+export default BMLiveVM;

package/esm/BMUser/BMUserVM.d.ts

@@ -73,10 +73,11 @@ export default class BMUserVM {
      * @param {string} userId
      */
     getUser(userId: string): BMUser | undefined;
+    getAllUsers(pageIndex: number, allUsers: Map<string, BCUser>): Promise<void>;
     /**
      * 刚加入房间时初始化人数
      */
-    initUserList(pageIndex: number): Promise<void>;
+    initUserList(usersInRoom: Map<string, BCUser>): Promise<void>;
     /**
      * 改变userList中的主持人,返回改变后的主持人用户对象,该方法只在change-master中调用, 不对外暴露
      * @param userId

package/esm/boom-meeting/src/BMChat/BMChatVM.d.ts

@@ -1,4 +1,4 @@
-import BoomCore from '@boom/core/esm';
+import BoomCore from '@hysc/core/esm';
 import BMMessageInfo from './BMMessageInfo';
 import { BehaviorSubject, Subject } from "rxjs";
 import BMUserVM from '../BMUser/BMUserVM';

package/esm/boom-meeting/src/BMRoom/attachEvents.d.ts

@@ -1,9 +1,10 @@
-import BoomCore from '@boom/core/esm';
+import BoomCore from '@hysc/core/esm';
 import BMStreamModelVM from "../BMStream/BMStreamModelVM";
 import BMRoom from './BMRoom';
 import BMUserVM from "../BMUser/BMUserVM";
 import BMChatVM from '../BMChat/BMChatVM';
-export declare const shouldProcessQueue: Map<string, import("@boom/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
+import BMStreamModel from "../BMStream/BMStreamModel";
+export declare const shouldProcessQueue: Map<string, import("@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
 /**
  * 收到消息信令的集合
  */
@@ -23,3 +24,4 @@ export declare enum MessageType {
 }
 export declare function attachBRTCEvent(boomCore: BoomCore, bmStreamVm: BMStreamModelVM, userVM: BMUserVM): void;
 export declare function attachEvents(boomCore: BoomCore, userVM: BMUserVM, bmStreamVm: BMStreamModelVM, chatVM: BMChatVM, bmRoom: BMRoom): any;
+export declare function checkStreamIsNormal(streamModel: BMStreamModel | undefined): void;

package/esm/boom-meeting/src/BMStream/BMStreamModel.d.ts

@@ -165,7 +165,7 @@ export default class BMStreamModel {
     /**
      * 获取流的传输信息
      */
-    getStats(): Promise<import("@boom/core/esm/BoomAdapter/type/stats").RemoteStreamStats> | Promise<import("@boom/core/esm/BoomAdapter/type/stats").LocalStreamStats> | undefined;
+    getStats(): Promise<import("@hysc/core/esm/BoomAdapter/type/stats").RemoteStreamStats> | Promise<import("@hysc/core/esm/BoomAdapter/type/stats").LocalStreamStats> | undefined;
     /**
      * BIND_ELEMENT 事件
      * @param eleId

package/esm/boom-meeting/src/BMUser/BMUser.d.ts

@@ -1,6 +1,6 @@
 import BMStreamModel from '../BMStream/BMStreamModel';
 import { BehaviorSubject } from 'rxjs';
-import BCUser from '@boom/core/esm/BoomAdapter/User/User';
+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';
 interface IUserActionWatcher {

package/esm/boom-meeting/src/BMUser/BMUserVM.d.ts

@@ -0,0 +1,137 @@
+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;
+    /**
+     * 刚加入房间时初始化人数
+     */
+    initUserList(pageIndex: number): 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;
+}

package/esm/constants.d.ts

@@ -1,83 +1,83 @@
-/**
- * @name: constants
- * @author: yangliye
- * @date: 2022-04-27 10:39
- * @description：constants
- * @update: 2022-04-27 10:39
- */
-/**
- * 窗口排序常量
- */
-export declare enum MODEL_SORT_ENUM {
-    SCREEN = 0,
-    MASTER = 1,
-    LOCAL = 2,
-    MANAGER_AUDIO_VIDEO = 3,
-    MANAGER_AUDIO = 4,
-    MANAGER_VIDEO = 5,
-    MANAGER = 6,
-    RAISE_AUDIO = 7,
-    RAISE_VIDEO = 8,
-    AUDIO_VIDEO = 9,
-    AUDIO = 10,
-    SIGNAL = 11,
-    VIDEO = 12,
-    OTHER = 13
-}
-export declare enum STREAM_TYPE {
-    /**
-     * 大流
-     */
-    SUB_MAIN = 0,
-    /**
-     * 小流
-     */
-    SINGLE = 1,
-    /**
-     * 屏幕共享流
-     */
-    SHARE = 2,
-    /**
-     * 其他
-     */
-    OTHER = 3
-}
-export declare const STREAM_SUFFIX_LOW = "LowQuality";
-export declare const TOUPINGMA = "_toupingma";
-export declare const STREAM_SUFFIX_SCREEN = "_screen";
-export declare const MOBILE_STREAM_SUFFIX_SCREEN = "screen-";
-export declare const SIGNAL_SUFFIX = "xinhao_";
-export declare const IGNORE_USERS_PREFIX: string[];
-export declare const STREAM_SUFFIX_HDMI = "_hdmi";
-export declare const STREAM_CONTAIN_MIXER = "-mixer-";
-export declare const STREAM_CONTAIN_RTMP_MIXER = "-rtmpmixer-";
-/**
- * 接受到传递过来的收到订阅信息的信令
- */
-export declare const RECEIVE_SUBSCRIBE_MESSAGE = "sub-message";
-/**
- * 用户的排序改变
- */
-export declare const USER_SORT_NUM_CHANGE = "user-sort-num-change";
-/**
- * 收到业务端bindDom的事件信息，主要是处理播放逻辑的功能
- */
-export declare const BIND_ELEMENT = "bind-element";
-/**
- * 流监听到connect-error的处理
- */
-export declare const HANDLE_STREAM_CONNECT_ERROR = "stream-connect-error";
-/**
- * 举手相关的处理
- */
-export declare const RAISE_HAND = "raise-hand";
-export declare const MANUAL_SUBSCRIPTION = "manual-subscription";
-/**
- * 手动订阅模式取消订阅流
- */
-export declare const UNSUBSCRIBE_STREAM = "unsubscribe-stream";
-/**
- * 用户的嘉宾身份会发生变化，从嘉宾变为普通参会者，或者从普通参会者变为嘉宾
- */
-export declare const CHANG_IS_GUEST = "change-is-guest";
-export declare const BIND_BIG_ELEMENT = "bind-big-element";
+/**
+ * @name: constants
+ * @author: yangliye
+ * @date: 2022-04-27 10:39
+ * @description：constants
+ * @update: 2022-04-27 10:39
+ */
+/**
+ * 窗口排序常量
+ */
+export declare enum MODEL_SORT_ENUM {
+    SCREEN = 0,
+    MASTER = 1,
+    LOCAL = 2,
+    MANAGER_AUDIO_VIDEO = 3,
+    MANAGER_AUDIO = 4,
+    MANAGER_VIDEO = 5,
+    MANAGER = 6,
+    RAISE_AUDIO = 7,
+    RAISE_VIDEO = 8,
+    AUDIO_VIDEO = 9,
+    AUDIO = 10,
+    SIGNAL = 11,
+    VIDEO = 12,
+    OTHER = 13
+}
+export declare enum STREAM_TYPE {
+    /**
+     * 大流
+     */
+    SUB_MAIN = 0,
+    /**
+     * 小流
+     */
+    SINGLE = 1,
+    /**
+     * 屏幕共享流
+     */
+    SHARE = 2,
+    /**
+     * 其他
+     */
+    OTHER = 3
+}
+export declare const STREAM_SUFFIX_LOW = "LowQuality";
+export declare const TOUPINGMA = "_toupingma";
+export declare const STREAM_SUFFIX_SCREEN = "_screen";
+export declare const MOBILE_STREAM_SUFFIX_SCREEN = "screen-";
+export declare const SIGNAL_SUFFIX = "xinhao_";
+export declare const IGNORE_USERS_PREFIX: string[];
+export declare const STREAM_SUFFIX_HDMI = "_hdmi";
+export declare const STREAM_CONTAIN_MIXER = "-mixer-";
+export declare const STREAM_CONTAIN_RTMP_MIXER = "-rtmpmixer-";
+/**
+ * 接受到传递过来的收到订阅信息的信令
+ */
+export declare const RECEIVE_SUBSCRIBE_MESSAGE = "sub-message";
+/**
+ * 用户的排序改变
+ */
+export declare const USER_SORT_NUM_CHANGE = "user-sort-num-change";
+/**
+ * 收到业务端bindDom的事件信息，主要是处理播放逻辑的功能
+ */
+export declare const BIND_ELEMENT = "bind-element";
+/**
+ * 流监听到connect-error的处理
+ */
+export declare const HANDLE_STREAM_CONNECT_ERROR = "stream-connect-error";
+/**
+ * 举手相关的处理
+ */
+export declare const RAISE_HAND = "raise-hand";
+export declare const MANUAL_SUBSCRIPTION = "manual-subscription";
+/**
+ * 手动订阅模式取消订阅流
+ */
+export declare const UNSUBSCRIBE_STREAM = "unsubscribe-stream";
+/**
+ * 用户的嘉宾身份会发生变化，从嘉宾变为普通参会者，或者从普通参会者变为嘉宾
+ */
+export declare const CHANG_IS_GUEST = "change-is-guest";
+export declare const BIND_BIG_ELEMENT = "bind-big-element";