@hysc/meeting 0.2.0 → 0.4.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 { Device } from '@hysc/core/esm/BoomAdapter/type/value';
 import BMSpeaker from './BMSpeaker';
+import { ShareMediaOptions } from "@hysc/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("@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
+export declare const BRTCShareStreamMap: Map<string, import("@hysc/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,8 +1,8 @@
 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' | 'removeManager' | 'changeNickName' | 'speakerEnable' | 'changeShare' | 'updateUser' | 'raiseHandsVideo' | 'raiseHandsAudio' | 'audienceEnableSpeaking';
+declare type Operation = 'none' | 'getMaster' | 'getManager' | 'removeMaster' | 'getGuest' | 'removeGuest' | 'removeManager' | 'changeNickName' | 'speakerEnable' | 'changeShare' | 'updateUser' | 'raiseHandsVideo' | 'raiseHandsAudio' | 'audienceEnableSpeaking';
 interface IUserActionWatcher {
     operation: Operation;
     user: BMUser;
@@ -79,7 +79,7 @@ export default class BMUser {
      */
     get isWeb(): boolean;
     constructor(user: any, isLocal?: boolean);
-    setup(userId: string, userinfo: UserInfo): void;
+    setup(userId: string, userinfo: UserInfo, nickname: string): void;
     getMainStreamModel(): BMStreamModel | undefined;
     getShareStreamModel(): BMStreamModel | undefined;
     /**

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

@@ -1,6 +1,6 @@
-import BoomCore from '@boom/core/esm';
+import BoomCore from '@hysc/core/esm';
 import BMUser from './BMUser';
-import BCUser from '@boom/core/esm/BoomAdapter/User/User';
+import BCUser from '@hysc/core/esm/BoomAdapter/User/User';
 import BMRoom from '../BMRoom/BMRoom';
 import { BehaviorSubject } from 'rxjs';
 import { UpdateMasterType } from '../type';
@@ -24,10 +24,11 @@ export default class BMUserVM {
     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): void;
+    handleUserRoleChange(info: ChangeIsGuest): Promise<void>;
     /**
      * 添加用户, 并返回已添加的用户对象
      * @param bcUser bcUser对象
@@ -75,24 +76,33 @@ export default class BMUserVM {
     /**
      * 刚加入房间时初始化人数
      */
-    initUserList(): Promise<void>;
+    initUserList(pageIndex: number): Promise<void>;
     /**
      * 改变userList中的主持人,返回改变后的主持人用户对象,该方法只在change-master中调用, 不对外暴露
      * @param userId
+     * @param oldMasterId
+     * @param isKeep
      */
-    updateMaster(userId: string): UpdateMasterType;
+    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): BMUser;
+    updateManager(userId: string, status: boolean, hasS?: boolean): BMUser;
     /**
      * 获取我自己
      */
     getLocalUser(): BMUser;
-    private updateSelf;
+    updateSelf(bcUser: BCUser): void;
+    updateUser(bmUser: BMUser, bcUser: BCUser): void;
     /**
      * bcUser变成BMUser
      * @param bcUser
@@ -108,4 +118,20 @@ export default class BMUserVM {
      * 排序变化之后的处理逻辑
      */
     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/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;
+}

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

@@ -1,96 +1,96 @@
-/**
- * 本地一般错误
- */
-export declare const LOCAL_ERROR = 1000;
-/**
- * 无效参数
- */
-export declare const INVALID_PARAMETER = 1001;
-/**
- * 非法操作
- */
-export declare const INVALID_OPERATION = 1002;
-/**
- * 不支持
- */
-export declare const NOT_SUPPORTED = 1003;
-/**
- * 没有权限
- */
-export declare const PERMISSION_DENY = 1010;
-/**
- * 没有推送音频权限
- */
-export declare const PERMISSION_DENY_AUDIO = 1011;
-/**
- * 没有推送视频权限
- */
-export declare const PERMISSION_DENY_VIDEO = 1012;
-/**
- * 进入频道失败
- */
-export declare const JOIN_CHANNEL_ERROR = 4000;
-/**
- * 信令通道建立失败
- */
-export declare const SIGNAL_SETUP_FAILED = 4001;
-/**
- * 信令通道错误
- */
-export declare const SIGNAL_ERROR = 4002;
-/**
- * ICE Tansport 连接错误
- */
-export declare const ICE_TRANSPORT_ERROR = 4003;
-/**
- * 创建 sdp offer 失败
- */
-export declare const CREATE_OFFER_FAILED = 4004;
-/**
- * 端被踢出
- */
-export declare const CLIENT_BANNED = 4005;
-/**
- * 媒体传输超时
- */
-export declare const MEDIA_SERVER_TIMEOUT = 4006;
-/**
- * 订阅远端流超时
- */
-export declare const SUBSCRIPTION_TIMEOUT = 4007;
-/**
- * 推流错误
- */
-export declare const MEDIA_PUBLISH_ERROR = 4008;
-/**
- * 用户被踢出
- */
-export declare const USER_KICKED = 4009;
-/**
- * 订阅重试的过程中出现 stream 已被销毁
- */
-export declare const MEDIA_SUBSCRIPTION_RETRY_NULL_ERROR = 4010;
-/**
- * HTTP 请求失败
- */
-export declare const FETCH_ERROR = 5000;
-/**
- * userSig 校验失败
- */
-export declare const USER_SIG_ERROR = 5001;
-/**
- * token 过期
- */
-export declare const TOKEN_EXPIRE_ERROR = 5002;
-/**
- * 房间关闭
- */
-export declare const ROOM_CLOSED_ERROR = 5003;
-/**
- * 未知错误
- */
-export declare const UNKNOWN = 9000;
-/**
- * 用户不存在
- */
-export declare const USER_NOT_EXIT = 9001;
+/**
+ * 本地一般错误
+ */
+export declare const LOCAL_ERROR = 1000;
+/**
+ * 无效参数
+ */
+export declare const INVALID_PARAMETER = 1001;
+/**
+ * 非法操作
+ */
+export declare const INVALID_OPERATION = 1002;
+/**
+ * 不支持
+ */
+export declare const NOT_SUPPORTED = 1003;
+/**
+ * 没有权限
+ */
+export declare const PERMISSION_DENY = 1010;
+/**
+ * 没有推送音频权限
+ */
+export declare const PERMISSION_DENY_AUDIO = 1011;
+/**
+ * 没有推送视频权限
+ */
+export declare const PERMISSION_DENY_VIDEO = 1012;
+/**
+ * 进入频道失败
+ */
+export declare const JOIN_CHANNEL_ERROR = 4000;
+/**
+ * 信令通道建立失败
+ */
+export declare const SIGNAL_SETUP_FAILED = 4001;
+/**
+ * 信令通道错误
+ */
+export declare const SIGNAL_ERROR = 4002;
+/**
+ * ICE Tansport 连接错误
+ */
+export declare const ICE_TRANSPORT_ERROR = 4003;
+/**
+ * 创建 sdp offer 失败
+ */
+export declare const CREATE_OFFER_FAILED = 4004;
+/**
+ * 端被踢出
+ */
+export declare const CLIENT_BANNED = 4005;
+/**
+ * 媒体传输超时
+ */
+export declare const MEDIA_SERVER_TIMEOUT = 4006;
+/**
+ * 订阅远端流超时
+ */
+export declare const SUBSCRIPTION_TIMEOUT = 4007;
+/**
+ * 推流错误
+ */
+export declare const MEDIA_PUBLISH_ERROR = 4008;
+/**
+ * 用户被踢出
+ */
+export declare const USER_KICKED = 4009;
+/**
+ * 订阅重试的过程中出现 stream 已被销毁
+ */
+export declare const MEDIA_SUBSCRIPTION_RETRY_NULL_ERROR = 4010;
+/**
+ * HTTP 请求失败
+ */
+export declare const FETCH_ERROR = 5000;
+/**
+ * userSig 校验失败
+ */
+export declare const USER_SIG_ERROR = 5001;
+/**
+ * token 过期
+ */
+export declare const TOKEN_EXPIRE_ERROR = 5002;
+/**
+ * 房间关闭
+ */
+export declare const ROOM_CLOSED_ERROR = 5003;
+/**
+ * 未知错误
+ */
+export declare const UNKNOWN = 9000;
+/**
+ * 用户不存在
+ */
+export declare const USER_NOT_EXIT = 9001;

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

@@ -0,0 +1,2 @@
+import BoomMeetingSDK from './BMRoom/BMRoom';
+export default BoomMeetingSDK;

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

@@ -1,86 +1,86 @@
-/**
- * debug 级别
- */
-export declare const DEBUG = 1;
-/**
- * info 级别
- */
-export declare const INFO = 2;
-/**
- * info 级别
- */
-/**
- * warn 级别
- */
-export declare const WARN = 3;
-/**
- * error 级别
- */
-export declare const ERROR = 4;
-/**
- * 关闭所有日志
- */
-export declare const CLOSE = 5;
-/**
- * fatal 级别
- * @internal
- */
-export declare const FATAL = 6;
-/**
- * 设置日志输出级别
- *
- * @param level 日志输出级别
- */
-export declare function setLevel(level: number): void;
-/**
- * 打印 debug 日志
- *
- * @param msg 日志内容
- */
-export declare function debug(msg: string, tag?: string, userId?: any, args?: any): void;
-/**
- * 打印 info 日志
- *
- * @param msg 日志内容
- */
-export declare function info(msg: string, tag?: string, userId?: any, args?: any): void;
-/**
- * 打印 call 日志
- *
- * @param msg
- * @param args
- */
-/**
- * 打印 warn 日志
- *
- * @param msg 日志内容
- */
-export declare function warn(msg: string, tag?: string, userId?: any, args?: any): void;
-/**
- * 打印 error 日志
- *
- * @param msg 日志内容
- */
-export declare function error(msg: string, tag?: string, userId?: any, args?: any): void;
-/**
- * 致命错误，中断程序
- *
- * @param msg 日志内容
- */
-export declare function fatal(code: number, name?: string, message?: string): void;
-/**
- * 打开日志上传
- *
- */
-export declare function enableUploadLog(): void;
-/**
- * 关闭日志上传
- *
- */
-export declare function disableUploadLog(): void;
-export declare const LogMap: {
-    1: typeof debug;
-    2: typeof info;
-    3: typeof warn;
-    4: typeof error;
-};
+/**
+ * debug 级别
+ */
+export declare const DEBUG = 1;
+/**
+ * info 级别
+ */
+export declare const INFO = 2;
+/**
+ * info 级别
+ */
+/**
+ * warn 级别
+ */
+export declare const WARN = 3;
+/**
+ * error 级别
+ */
+export declare const ERROR = 4;
+/**
+ * 关闭所有日志
+ */
+export declare const CLOSE = 5;
+/**
+ * fatal 级别
+ * @internal
+ */
+export declare const FATAL = 6;
+/**
+ * 设置日志输出级别
+ *
+ * @param level 日志输出级别
+ */
+export declare function setLevel(level: number): void;
+/**
+ * 打印 debug 日志
+ *
+ * @param msg 日志内容
+ */
+export declare function debug(msg: string, tag?: string, userId?: any, args?: any): void;
+/**
+ * 打印 info 日志
+ *
+ * @param msg 日志内容
+ */
+export declare function info(msg: string, tag?: string, userId?: any, args?: any): void;
+/**
+ * 打印 call 日志
+ *
+ * @param msg
+ * @param args
+ */
+/**
+ * 打印 warn 日志
+ *
+ * @param msg 日志内容
+ */
+export declare function warn(msg: string, tag?: string, userId?: any, args?: any): void;
+/**
+ * 打印 error 日志
+ *
+ * @param msg 日志内容
+ */
+export declare function error(msg: string, tag?: string, userId?: any, args?: any): void;
+/**
+ * 致命错误，中断程序
+ *
+ * @param msg 日志内容
+ */
+export declare function fatal(code: number, name?: string, message?: string): void;
+/**
+ * 打开日志上传
+ *
+ */
+export declare function enableUploadLog(): void;
+/**
+ * 关闭日志上传
+ *
+ */
+export declare function disableUploadLog(): void;
+export declare const LogMap: {
+    1: typeof debug;
+    2: typeof info;
+    3: typeof warn;
+    4: typeof error;
+};

package/esm/boom-meeting/src/type/stream.d.ts

@@ -5,11 +5,11 @@
  * @description：stream
  * @update: 2022-04-25 13:42
  */
-import LocalStream from '@boom/core/esm/BoomAdapter/singleMode/stream/LocalStream';
-import RemoteStream from '@boom/core/esm/BoomAdapter/singleMode/stream/RemoteStream';
-import { StreamDeviceOption } from '@boom/core/esm/BoomAdapter/type/BRTCStream';
-import { RemoteStreamOptions } from '@boom/core/esm/BoomCore/BCClient/BCClient';
-export { SubscribeOptions } from '@boom/core/esm/BoomAdapter/type/BRTCClient';
+import LocalStream from '@hysc/core/esm/BoomAdapter/singleMode/stream/LocalStream';
+import RemoteStream from '@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream';
+import { StreamDeviceOption } from '@hysc/core/esm/BoomAdapter/type/BRTCStream';
+import { RemoteStreamOptions } from '@hysc/core/esm/BoomCore/BCClient/BCClient';
+export { SubscribeOptions } from '@hysc/core/esm/BoomAdapter/type/BRTCClient';
 export declare type SingleLocalStream = LocalStream;
 export declare type SingleRemoteStream = RemoteStream;
 export declare type SingleStream = SingleLocalStream | SingleRemoteStream;

package/esm/boom-meeting/src/util/Pqueue.d.ts

@@ -0,0 +1,61 @@
+/**
+ * @ Author: zhaozhidan
+ * @ Create Time: 2020-04-26 11:47:55
+ * @ Modified by: zhaozhidan
+ * @ Modified time: 2020-09-19 22:19:21
+ * @ Description: Boom
+ */
+declare class Pqueue {
+    private queueArray;
+    private isTaskPending;
+    private queue;
+    constructor(maxTask: number, isStart?: boolean);
+    /**
+     *  添加队列
+     * @param {*} fn            生成Promise函数
+     * @param {String} taskId   任务标识别
+     * @param {Number} priority    任务优先级
+     * @param {String} nickName 要打印的值
+     */
+    addQueue(fn: any, taskId: string, priority?: number, nickName?: string): void;
+    /**
+     * 清空队列
+     */
+    clearQueue(): void;
+    /**
+     * 队列开始执行
+     */
+    startQueue(): void;
+    /**
+     * 暂停队列
+     */
+    pauseQueue(): any[];
+    /**
+     * 返回队列里还未pending和执行完的任务数
+     * @returns {number}
+     */
+    size(): number;
+    /**
+     * 返回队列里还未pending和执行完的任务数
+     * @returns {number}
+     */
+    pending(): number;
+    /**
+     * 查询任务是否结束
+     */
+    checkTaskStatus(): boolean;
+    /**
+     * 修改任务的状态
+     */
+    setTaskStatus(res: boolean): void;
+    /**
+     * 队列是否执行完了.
+     */
+    onIdle(): Promise<void>;
+    /**
+     * 队列是否执行完了.
+     */
+    onEmpty(): Promise<void>;
+}
+export declare const streamPullQueue: Pqueue;
+export {};