@hysc/meeting 0.1.0 → 0.3.0

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

@@ -16,26 +16,36 @@
 /// <reference types="node" />
 import BMStreamModel from './BMStreamModel';
 import BMUser from '../BMUser/BMUser';
-import { SingleRemoteStream, SingleStream } from '../type';
+import { SingleLocalStream, SingleRemoteStream, SingleStream } from '../type';
 import BMRoom from '../BMRoom/BMRoom';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { Device } from '@boom/core/esm/BoomAdapter/type/value';
 import BMSpeaker from './BMSpeaker';
+import { ShareMediaOptions } from "@boom/core/esm/BoomCore/BCClient/BCClient";
+import { getHTMLMediaStreamOptions, Result, getMediaStreamInfo } from "./getHTMLMediaStreamOptions";
+/**
+ * 全量的brtc流记录，把所有brtc用户推的流都做记录
+ * stream-added 的时候添加
+ * stream-removed 的时候删除
+ * mute/unmute-video/audio 的时候更新流
+ * 当用户进来的时候，去查看这个流对象，如果流存在，就给这个人添加流
+ *
+ */
+export declare const BRTCStreamMap: Map<string, import("@boom/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
+export declare const BRTCShareStreamMap: Map<string, import("@boom/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
 export default class BMStreamModelVM {
-    /**
-     * 这个是为了记录当前bloud入会之前brtc推的流
-     */
-    hadJoinedStreamModels: Set<any>;
     streamModels: Map<string, BMStreamModel>;
     /**
      * 因为投屏码用户进来以后，他是不在小窗口展示的，所以要把投屏的用户过滤掉给业务的展示
      */
     streamModelsWatcher: BehaviorSubject<BMStreamModel[]>;
-    shareStreamModels: BMStreamModel[];
+    shareStreamModels: Map<string, BMStreamModel>;
     shareStreamModelsWatcher: BehaviorSubject<BMStreamModel[]>;
     localModel: BMStreamModel | null;
     private room;
     bloudStream: any;
+    audioStream: SingleLocalStream | undefined;
+    brtcStream: SingleLocalStream | undefined;
     /**
      * 本地是否在屏幕共享
      */
@@ -51,7 +61,7 @@ export default class BMStreamModelVM {
     /**
      * 后面打开摄像头存储的流，主要是关闭摄像头的时候得把它清除掉
      */
-    private videoStream;
+    videoStream: SingleLocalStream | null;
     private _recorder;
     private _isRecording;
     private _slicingRecord;
@@ -102,8 +112,9 @@ export default class BMStreamModelVM {
     /**
      * 开关本地摄像头
      * @param status true:开,false:关
+     * @param videoTrack 开启美颜之后，需要传递这个参数，携带美颜之后的videoTrack
      */
-    setLocalVideoEnable(status: boolean): Promise<undefined>;
+    setLocalVideoEnable(status: boolean, videoTrack?: MediaStreamTrack): Promise<void>;
     /**
      * 开关本地麦克风
      * @param status true:开,false:关
@@ -141,6 +152,7 @@ export default class BMStreamModelVM {
      * @private
      */
     private createStreamAndPublish;
+    videoMuteHandler(): Promise<void>;
     /**
      * 更改音视频状态或者取消发布
      * @param type 更改类型
@@ -153,13 +165,14 @@ export default class BMStreamModelVM {
      * 是否开启屏幕共享
      * @param enable
      * @param opts 开启屏幕共享参数
+     * @param customShare
      * @param opts.audio 是否开启音频
      * @param opts.source_name Electron 下窗口名称
      * @param opts.width 共享屏幕宽度
      * @param opts.height 共享屏幕高度
      * @param opts.contentHint 视频的contentHint 可选值： '' | 'motion' | 'detail' | 'text'
      */
-    toggleShareScreen(enable: boolean, opts: any): Promise<unknown>;
+    toggleShareScreen(enable: boolean, opts: any, customShare?: Result): Promise<unknown>;
     setShareScreenContentHint(contentHint: '' | 'motion' | 'detail' | 'text'): Promise<void>;
     /**
      * 排序变化之后的处理逻辑
@@ -210,4 +223,11 @@ export default class BMStreamModelVM {
     startSpeakerDetector(): void;
     addToDetector(speaker: BMSpeaker): void;
     removeFromDetector(speakerId: string): void;
+    shareCustomMedia(enable: boolean, shareOptions: ShareMediaOptions): Promise<undefined>;
+    /**
+     * 根据videoElement 获取内部流数据
+     */
+    getHTMLMediaStream: typeof getHTMLMediaStreamOptions;
+    getMediaStream: typeof getMediaStreamInfo;
+    clearCache(): void;
 }

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

@@ -1,147 +1,147 @@
-import BMStreamModel from '../BMStream/BMStreamModel';
-import { BehaviorSubject } from 'rxjs';
-import BCUser from '@boom/core/esm/BoomAdapter/User/User';
-import BMRoom from '../BMRoom/BMRoom';
-declare type Operation = 'none' | 'getMaster' | 'getManager' | 'removeMaster' | 'removeManager' | 'changeNickName' | 'speakerEnable' | 'changeShare' | 'updateUser' | 'raiseHandsVideo' | 'raiseHandsAudio' | 'audienceEnableSpeaking';
-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;
-    /**
-     * 是不是web端入会
-     */
-    get isWeb(): boolean;
-    constructor(user: any, isLocal?: boolean);
-    setup(userId: string, userinfo: UserInfo): 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 {};
+import BMStreamModel from '../BMStream/BMStreamModel';
+import { BehaviorSubject } from 'rxjs';
+import BCUser from '@boom/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 {
+    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;
+    /**
+     * 是不是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/esm/boom-meeting/src/BMUser/BMUserVM.d.ts

@@ -1,111 +1,137 @@
-import BoomCore from '@boom/core/esm';
-import BMUser from './BMUser';
-import BCUser from '@boom/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[]>;
-    localUser: BMUser;
-    constructor(boomCore: BoomCore, localUser: BMUser);
-    initWithRoom(room: BMRoom): void;
-    handleUserRoleChange(info: ChangeIsGuest): 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(): Promise<void>;
-    /**
-     * 改变userList中的主持人,返回改变后的主持人用户对象,该方法只在change-master中调用, 不对外暴露
-     * @param userId
-     */
-    updateMaster(userId: string): UpdateMasterType;
-    /**
-     * 改变联席主持人,返回设置为联席主持人的bmuser对象
-     * @param userId
-     * @param status true:设置成联席主持人 false:取消联席主持人身份
-     * @returns
-     */
-    updateManager(userId: string, status: boolean): BMUser;
-    /**
-     * 获取我自己
-     */
-    getLocalUser(): BMUser;
-    private updateSelf;
-    /**
-     * bcUser变成BMUser
-     * @param bcUser
-     * @returns
-     */
-    toBMUser(bcUser: BCUser): BMUser;
-    private sortUsers;
-    private sortAudiences;
-    private sortCommonUsers;
-    private sortSignalUsers;
-    private static filterUsers;
-    /**
-     * 排序变化之后的处理逻辑
-     */
-    updateSort: () => void;
-}
+import BoomCore from '@boom/core/esm';
+import BMUser from './BMUser';
+import BCUser from '@boom/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: any;
+    }>;
+    getTotalUserNumber(): Promise<any>;
+    clearUsers(): void;
+}

package/esm/boom-meeting/src/error/RTCError.d.ts

@@ -0,0 +1,20 @@
+export default class BoomError extends Error {
+    static instanceOf(error: any): boolean;
+    private BoomErrorFlag;
+    private code;
+    private eName?;
+    private error;
+    /**
+     * @internal
+     * @param code
+     * @param name
+     * @param message
+     */
+    constructor(code: number, message?: any, error?: any, name?: string);
+    /**
+     * 获取错误码
+     *
+     * @returns 错误码
+     */
+    getCode(): number;
+}