@hysc/meeting 1.6.16 → 1.6.17

package/esm/types/customStats.d.ts

@@ -0,0 +1,103 @@
+/**
+ * @name: customStats
+ * @author: yangliye
+ * @date: 2022-07-14 17:35
+ * @description：customStats 类型声明定义
+ * @update: 2022-07-14 17:35
+ */
+export interface From {
+    fromTag: string;
+}
+export interface Tile {
+    index: number;
+    user: string;
+    nickname: string;
+    stream: string;
+}
+export interface NextTile {
+    index: number;
+    nickname: string;
+    user: string;
+    stream: string;
+}
+export interface MainLayout {
+    user: string;
+    layout: number;
+    activeSubtiles: boolean;
+    tiles: Tile[];
+    nextTiles: NextTile[];
+}
+export interface Tile2 {
+    index: number;
+    nickname: string;
+    user: string;
+    stream: string;
+}
+export interface ForceOn {
+    user?: string;
+    isShare?: boolean;
+    active?: boolean;
+    laterScreen?: boolean;
+    tiles?: Tile2[];
+}
+export interface Tile3 {
+    index: number;
+    nickname: string;
+    user: string;
+    stream: string;
+}
+export interface Tiles4 {
+    index: number;
+    nickname: string;
+    user: string;
+    stream: string;
+    isSubStream?: boolean;
+}
+export interface HostLayout {
+    user: string;
+    layout: number;
+    activeSubtiles: boolean;
+    tiles: Tiles4[];
+}
+export interface DefaultLayout {
+    mode: number;
+    allowSwitchingLayout: boolean;
+    tiles: Tile3[];
+}
+export interface Roll {
+    active: boolean;
+    start: number;
+    interval: number;
+}
+export interface ShareList {
+    user: string;
+    stream: string;
+}
+export interface CustomStats {
+    /**
+     * 默认为0，自由模式，可随时切换；
+     *
+     * 1时使用 defaultLayout，布局内可控；
+     *
+     * 2时使用 mainLayout，主会场同内容
+     */
+    layoutMode: number;
+    from: From;
+    mainLayout: MainLayout;
+    forceOn: ForceOn;
+    defaultLayout: DefaultLayout;
+    roll: Roll;
+    shareList: ShareList[];
+    chatNotice: string;
+    giveLikeEnable: number;
+    chatEnable: number;
+    fileUpdateModel: number;
+    fileUpdateLook: number;
+    fileUpdateDown: number;
+    fileUpdateEdit: number;
+    screenShareModel: number;
+    activeSubtiles: boolean;
+    hostLayout: HostLayout;
+    updateKeys: any[];
+}
+export declare type PartialCustomStats = Partial<CustomStats>;

package/esm/types/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @name: index.ts
+ * @author: yangliye
+ * @date: 2022-04-25 13:42
+ * @description：index.ts
+ * @update: 2022-04-25 13:42
+ */
+export * from './stream';
+export * from './user';

package/esm/types/stream.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @name: stream
+ * @author: yangliye
+ * @date: 2022-04-25 13:42
+ * @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';
+export declare type SingleLocalStream = LocalStream;
+export declare type SingleRemoteStream = RemoteStream;
+export declare type SingleStream = SingleLocalStream | SingleRemoteStream;
+export declare type SingleStreamDeviceOption = StreamDeviceOption;
+export declare type SingleRemoteStreamOption = Pick<RemoteStreamOptions, 'uid' | 'stream' | 'subStream' | 'sid'>;

package/esm/types/user.d.ts

@@ -0,0 +1,11 @@
+import BCUser from '@boom/core/esm/BoomAdapter/User/User';
+import BMUser from '../BMUser/BMUser';
+export declare type BCUSer = BCUser;
+export declare type UpdateMasterType = {
+    master: BMUser;
+    oldMaster: BMUser;
+};
+export declare type audioOffWatcherValue = {
+    audioOff: boolean;
+    selfopenaudio: boolean;
+};

package/esm/util/emitter.d.ts

@@ -1,18 +1,18 @@
-import { ConnectErrorMessage, SubscribeMessage } from "../BMStream/BMStreamModel";
-import { BIND_BIG_ELEMENT, BIND_ELEMENT, CHANG_IS_GUEST, HANDLE_STREAM_CONNECT_ERROR, MANUAL_SUBSCRIPTION, RAISE_HAND, RECEIVE_SUBSCRIBE_MESSAGE, UNSUBSCRIBE_STREAM, USER_SORT_NUM_CHANGE } from "../constants";
-import { RaiseHandInfo } from "../BMUser/BMUser";
-import { ChangeIsGuest } from "../BMUser/BMUserVM";
-declare type Events = {
-    [RECEIVE_SUBSCRIBE_MESSAGE]: SubscribeMessage;
-    [USER_SORT_NUM_CHANGE]: null;
-    [HANDLE_STREAM_CONNECT_ERROR]: ConnectErrorMessage;
-    [RAISE_HAND]: RaiseHandInfo;
-    [UNSUBSCRIBE_STREAM]: SubscribeMessage;
-    [MANUAL_SUBSCRIPTION]: SubscribeMessage;
-    [CHANG_IS_GUEST]: ChangeIsGuest;
-    [BIND_ELEMENT]: SubscribeMessage;
-    [BIND_BIG_ELEMENT]: SubscribeMessage;
-};
-export declare const emitter: import("mitt").Emitter<Events>;
-export declare const removeEmitter: () => void;
-export {};
+import { ConnectErrorMessage, SubscribeMessage } from "../BMStream/BMStreamModel";
+import { BIND_BIG_ELEMENT, BIND_ELEMENT, CHANG_IS_GUEST, HANDLE_STREAM_CONNECT_ERROR, MANUAL_SUBSCRIPTION, RAISE_HAND, RECEIVE_SUBSCRIBE_MESSAGE, UNSUBSCRIBE_STREAM, USER_SORT_NUM_CHANGE } from "../constants";
+import { RaiseHandInfo } from "../BMUser/BMUser";
+import { ChangeIsGuest } from "../BMUser/BMUserVM";
+declare type Events = {
+    [RECEIVE_SUBSCRIBE_MESSAGE]: SubscribeMessage;
+    [USER_SORT_NUM_CHANGE]: null;
+    [HANDLE_STREAM_CONNECT_ERROR]: ConnectErrorMessage;
+    [RAISE_HAND]: RaiseHandInfo;
+    [UNSUBSCRIBE_STREAM]: SubscribeMessage;
+    [MANUAL_SUBSCRIPTION]: SubscribeMessage;
+    [CHANG_IS_GUEST]: ChangeIsGuest;
+    [BIND_ELEMENT]: SubscribeMessage;
+    [BIND_BIG_ELEMENT]: SubscribeMessage;
+};
+export declare const emitter: import("mitt").Emitter<Events>;
+export declare const removeEmitter: () => void;
+export {};

package/esm/utils/ErrorTypes.d.ts

@@ -0,0 +1,97 @@
+/**
+ * @name: ErrorTypes
+ * @author: yangliye
+ * @date: 2022-07-08 11:20
+ * @description：ErrorTypes
+ * @update: 2022-07-08 11:20
+ */
+/**
+ * boom-core层的错误
+ */
+export declare type ErrorTypes = {
+    code: number;
+    message: string;
+};
+export declare enum BoomCoreErrorCode {
+    'BloudLock' = 28,
+    'ShareScreenNoPermission' = 100,
+    'ShareScreenCanceled' = 101,
+    'ShareScreenOtherError' = 102,
+    'ShareScreenContentHintError' = 103,
+    'ShareScreenClientJoinedError' = 104,
+    'BrtcShareSigError' = 105,
+    'ToggleShareScreenError' = 106,
+    'BrtcCreateStreamError' = 107,
+    'BrtcSubscribeError' = 108,
+    'BrtcPublishError' = 109,
+    'BrtcUnsubscribeError' = 110,
+    'BrtcUnPublishError' = 111,
+    'RepeatJoinError' = 112,
+    'ProxiesUrlTypeError' = 113,
+    'getBloudProxiesUrlError' = 114,
+    'JoinUserInfoError' = 115,
+    'JoinTypeError' = 116,
+    'JoinBrtcError' = 117,
+    'JoinBloudError' = 118,
+    'UpdateCustomStatsError' = 119,
+    'CreateBloudError' = 120
+}
+export declare const ShareScreenNoPermission: ErrorTypes;
+export declare const ShareScreenCanceled: ErrorTypes;
+export declare const ShareScreenOtherError: (msg: string) => ErrorTypes;
+export declare const ShareScreenContentHintError: ErrorTypes;
+export declare const ShareScreenClientJoinedError: ErrorTypes;
+export declare const BrtcShareSigError: ErrorTypes;
+export declare const ToggleShareScreenError: (msg: string) => ErrorTypes;
+export declare const RepeatJoinError: ErrorTypes;
+export declare const ProxiesUrlTypeError: ErrorTypes;
+export declare const getBloudProxiesUrlError: (msg: string) => ErrorTypes;
+export declare const JoinUserInfoError: ErrorTypes;
+export declare const JoinTypeError: ErrorTypes;
+export declare const JoinBrtcError: (msg: string) => ErrorTypes;
+export declare const JoinBloudError: (msg: string) => ErrorTypes;
+export declare const BloudLockError: (msg: string) => ErrorTypes;
+export declare const BrtcCreateStreamError: (msg: string) => ErrorTypes;
+export declare const BrtcSubscribeError: (msg: string) => ErrorTypes;
+export declare const BrtcPublishError: (msg: string) => ErrorTypes;
+export declare const BrtcUnsubscribeError: (msg: string) => ErrorTypes;
+export declare const BrtcUnPublishError: (msg: string) => ErrorTypes;
+export declare const updateCustomStatsError: (msg: string) => ErrorTypes;
+export declare enum BoomMeetingErrorCode {
+    'BmJoinError' = 200,
+    'BMLeaveError' = 201,
+    'BmSetRemoteVideoEnable' = 202,
+    'BmSetRemoteAudioEnable' = 203,
+    'BmSetLocalVideoEnable' = 204,
+    'BmSetLocalAudioEnable' = 205,
+    'BmSetLocalSpeakerEnable' = 206,
+    'BmChangeMasterError' = 207,
+    'BmUpdateManagerError' = 208,
+    'BmEvictUserError' = 209,
+    'BmUpdateUserError' = 210,
+    'BmSetAudioOffError' = 211,
+    'BmSetVideoOffError' = 212,
+    'BmSetMsgOffError' = 213,
+    'BmUpdateCustomStatsError' = 214,
+    'BmChangeVideoProfileError' = 215,
+    'BmChangeAudioProfileError' = 216,
+    'BmCheckDeviceError' = 217
+}
+export declare const BmJoinError: (msg: string) => ErrorTypes;
+export declare const BmLeaveError: (msg: string) => ErrorTypes;
+export declare const BmSetRemoteVideoEnable: (msg: string) => ErrorTypes;
+export declare const BmSetRemoteAudioEnable: (msg: string) => ErrorTypes;
+export declare const BmSetLocalVideoEnable: (msg: string) => ErrorTypes;
+export declare const BmSetLocalAudioEnable: (msg: string) => ErrorTypes;
+export declare const BmSetLocalSpeakerEnable: (msg: string) => ErrorTypes;
+export declare const BmChangeMasterError: (msg: string) => ErrorTypes;
+export declare const BmUpdateManagerError: (msg: string) => ErrorTypes;
+export declare const BmEvictUserError: (msg: string) => ErrorTypes;
+export declare const BmUpdateUserError: (msg: string) => ErrorTypes;
+export declare const BmSetAudioOffError: (msg: string) => ErrorTypes;
+export declare const BmSetVideoOffError: (msg: string) => ErrorTypes;
+export declare const BmSetMsgOffError: (msg: string) => ErrorTypes;
+export declare const BmUpdateCustomStatsError: (msg: string) => ErrorTypes;
+export declare const BmChangeVideoProfileError: (msg: string) => ErrorTypes;
+export declare const BmChangeAudioProfileError: (msg: string) => ErrorTypes;
+export declare const BmCheckDeviceError: (msg: string) => ErrorTypes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hysc/meeting",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "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.9",
     "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.9"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.6"

package/umd/BMChat/BMChatVM.d.ts

@@ -0,0 +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[]>;
+}

package/umd/BMChat/BMMessageInfo.d.ts

@@ -0,0 +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 {};

package/umd/BMRoom/BMLiveVM.d.ts

@@ -0,0 +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;

package/umd/BMStream/BMSpeaker.d.ts

@@ -0,0 +1,44 @@
+import BMUser from '../BMUser/BMUser';
+import { SingleStream } from '../types';
+/**
+ * @name: BMSpeaker
+ * @author: liuxinghai
+ * @date: 2022-06-07 11:41
+ * @description：BMSpeaker
+ *    适配 brtc 流对象到 bloud 流对象接口，
+ *    用户辅助采用 bloud SpeakerDetector 做说话人检测
+ * @date: 2022-06-07 11:41
+ */
+export default class BMSpeaker {
+    private _user;
+    private _stream;
+    private _emitter;
+    constructor(user: BMUser, stream: SingleStream);
+    /**
+     * 获取对象 ID 标识，此处使用流 ID 标识
+     * @returns
+     */
+    getID(): string;
+    /**
+     * 获取用户 BMUser 对象
+     * @returns
+     */
+    getUser(): BMUser;
+    /**
+     * 监听事件
+     *
+     * @param type 事件类型
+     * @param fn 事件回调
+     * @return 实例本身 {@link Client}
+     */
+    on(type: string, fn: Function): this;
+    /**
+     * 启动音频音量检测
+     */
+    collectAudioLevel(): void;
+    private handleAudioLevel;
+    /**
+     * 关闭音频音量检测
+     */
+    close(): void;
+}

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/boom-meeting/src/BMChat/BMChatVM.d.ts

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