@hysc/meeting 4.0.53 → 5.0.2

package/esm/boom-core/src/BoomCore/BCClient/clientEventType.d.ts

@@ -418,6 +418,8 @@ export declare enum BCEvent {
     NETWORK_ERROR = "network-error",
     BRTC_SYNC_ROOM_COMPLETED = "sync-room-completed",
     BRTC_ROOM_ROCONNECTING = "brtc-room-reconnecting",
-    BRTC_ROOM_RECONNECTED = "brtc-room-reconnected"
+    BRTC_ROOM_RECONNECTED = "brtc-room-reconnected",
+    JOIN_READY = "join-ready",
+    BRTC_SHARE_SYNC_ROOM_COMPLETED = "brtc-share-sync-room-completed"
 }
 export default BCEvent;

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

@@ -165,16 +165,6 @@ export default class BMRoomVM {
      * @param enable
      */
     changeAutoMute(enable: 0 | 1 | 2): Promise<void>;
-    /**
-     * 允许成员接收进入/离开会议通知配置 0 关闭 1 开启自动静音
-     * @param enable
-     */
-    allUserReceiveJoinLeaveMessages(enable: 0 | 1): Promise<void>;
-    /**
-     * 成员入会时给主持人播放提示音配置 0 关闭 1 开启自动静音
-     * @param enable
-     */
-    userJoinMasterVoice(enable: 0 | 1): Promise<void>;
     /**
      * 观众点赞(走customMessage)
      * @param type 1:点赞, 2:送花, 3:爱心, 4: 鼓掌, 5: 喝彩

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

@@ -2,6 +2,7 @@ import { SingleStream, SubscribeOptions } from "../type";
 import BMUser from "../BMUser/BMUser";
 import { BehaviorSubject, Subject } from "rxjs";
 import BMStreamModelVM from "./BMStreamModelVM";
+import { BloudStreamState } from "../handleEvent/attachEvents";
 /**
  * @name: BMStreamModel
  * @author: yangliye
@@ -22,9 +23,14 @@ export interface NoPlayerContainer {
     container: 'small' | 'big';
     id: string;
 }
+export interface BloudStream {
+    video: boolean;
+    audio: boolean;
+}
 export default class BMStreamModel {
     private user;
     private _stream;
+    bloudStream: BloudStream | undefined;
     /**
      * 流类型
      */
@@ -136,6 +142,11 @@ export default class BMStreamModel {
      * @param bmStreamVm
      */
     updateStream(stream: SingleStream | undefined, needReProcess: boolean | undefined, bmStreamVm: BMStreamModelVM): void;
+    /**
+     * 更新bloud的stream，设置流状态
+     * @param streamState
+     */
+    updateBloudStream(streamState: BloudStreamState | undefined, bmStreamVM: BMStreamModelVM): void;
     private onPlayerStateChange;
     handleStreamConnectError: () => void;
     /**
@@ -158,6 +169,7 @@ export default class BMStreamModel {
      * 是否是屏幕共享的流
      */
     get isShare(): boolean | undefined;
+    get isWeb(): boolean;
     /**
      * 当前音频是否开启
      */
@@ -254,7 +266,7 @@ export default class BMStreamModel {
     /**
    * 启动音频音量检测
    */
-    collectAudioLevel(): void;
+    collectAudioLevel: () => void;
     private handleAudioLevel;
     checkVideo(): void;
     /**

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

@@ -45,7 +45,7 @@ export default class BMStreamModelVM {
     shareStreamModelsWatcher: BehaviorSubject<BMStreamModel[]>;
     localStreamErrorWatcher: Subject<string>;
     localModel: BMStreamModel | null;
-    private room;
+    room: BMRoom | null;
     bloudStream: any;
     audioStream: SingleLocalStream | undefined;
     brtcStream: SingleLocalStream | undefined;
@@ -53,13 +53,13 @@ export default class BMStreamModelVM {
      * 本地是否在屏幕共享
      */
     localIsShare: boolean;
+    isShareWatcher: Subject<boolean>;
     _speaker_enable: boolean;
     speakerEnableWatcher: BehaviorSubject<boolean>;
     /**
      * 混流
      */
     mixStreamModelWatcher: BehaviorSubject<BMStreamModel | null>;
-    isShareWatcher: Subject<boolean>;
     canvasTimer: NodeJS.Timeout | null;
     /**
      * 后面打开摄像头存储的流，主要是关闭摄像头的时候得把它清除掉

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

@@ -14,6 +14,14 @@ export interface ChangeIsGuest {
     preIsGuest: boolean;
     isGuest: boolean;
 }
+/**
+ * bloud 一页用户拉取数量
+ */
+export declare const BLOUD_PAGE_SIZE = 500;
+/**
+ * 嘉宾及以上身份用户
+ */
+export declare const PERMISSION_NOT_COMMON = "RWPSAVMO,RWPSAVM,RWPSAV";
 export default class BMUserVM {
     userList: Map<string, BMUser>;
     audiencesList: Map<string, BMUser>;
@@ -75,6 +83,7 @@ export default class BMUserVM {
      * 刚加入房间时初始化人数
      */
     initUserList(usersInRoom: Map<string, BCUser>): Promise<void>;
+    addBcUsers(users: Map<string, BCUser>): void;
     /**
      * 改变userList中的主持人,返回改变后的主持人用户对象,该方法只在change-master中调用, 不对外暴露
      * @param userId
@@ -132,7 +141,7 @@ export default class BMUserVM {
      * @param permission
      * @param useNew 是否使用getUsersList
      */
-    transBloudUsers: (page: number, permission?: string, useNew?: boolean) => Promise<void>;
+    transBloudUsers: (page: number, permission?: string, useNew?: boolean, failedNum?: number) => Promise<void>;
     /**
      * 本地嘉宾用户降级为普通参会者之后要取消拉流
      */

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

@@ -22,6 +22,22 @@ export declare enum MessageType {
      */
     AUDIO_FORCE_CHANGE = "audio-force-change"
 }
+export interface BloudStreamEventState {
+    userId: string;
+    streamId: string;
+    isScreen: boolean;
+    video: boolean;
+    audio: boolean;
+}
+export interface BloudStreamState {
+    video: boolean;
+    audio: boolean;
+}
+export interface BloudUnPubEvent {
+    userId: string;
+    streamId: string;
+    isScreen: boolean;
+}
 export declare function attachBRTCEvent(boomCore: BoomCore, bmStreamVm: BMStreamModelVM, userVM: BMUserVM): void;
 declare type Observes = {
     [K in BCEvent]: BehaviorSubject<any>;

package/esm/boom-meeting/src/handleEvent/handleParticipantEvent.d.ts

@@ -20,4 +20,4 @@ export declare function handleEvict(data: any, userVM: BMUserVM, bmStreamVm: BMS
 export declare function handleUpdateUser(data: any, userVM: BMUserVM, bmRoom: BMRoom, bmStreamVm: BMStreamModelVM, observes: any): void;
 export declare function updateBMUser(allUsers: Map<string, BCUser>, bmUser: BMUser, userVm: BMUserVM): void;
 export declare const handleUserRejoined: any;
-export declare function handleMoveUserRoom(bmRoom: BMRoom, userVM: BMUserVM, data: any, observes: any): void;
+export declare function handleMoveUserRoom(bmRoom: BMRoom, userVM: BMUserVM, data: any, observes: any): Promise<void>;

package/esm/boom-meeting/src/handleEvent/handleRoomEvent.d.ts

@@ -9,6 +9,12 @@ import BMRoom from "../BMRoom/BMRoom";
 import BMUserVM from "../BMUser/BMUserVM";
 import BMStreamModelVM from "../BMStream/BMStreamModelVM";
 export declare function handleRoomConnected(data: any, bmRoom: BMRoom, userVM: BMUserVM, observes: any, shouldNotification?: boolean): Promise<void>;
+export declare function handleInitJoinRoomUsers(bmRoom: BMRoom): void;
 export declare function handleRoomUpdated(data: any, bmRoom: BMRoom): void;
 export declare function handleInitRoomInfo(data: any, bmRoom: BMRoom): Promise<void>;
 export declare function handleRoomSync(data: any, bmRoom: BMRoom, userVm: BMUserVM, bmStreamVm: BMStreamModelVM): Promise<void>;
+export declare function handleBrtcRoomReconnecting(data: any, bmRoom: BMRoom, observes: any): void;
+export declare function handleBrtcRoomReconnected(data: any, bmRoom: BMRoom, observes: any): void;
+export declare function handleBloudRoomReconnecting(data: any, bmRoom: BMRoom, observes: any): void;
+export declare function handleBloudRoomReconnected(data: any, bmRoom: BMRoom, observes: any): Promise<void>;
+export declare function handleBloudRoomSync(data: any, userVM: BMUserVM, bmRoom: BMRoom, bmStreamVm: BMStreamModelVM, observes: any): Promise<void>;

package/esm/boom-meeting/src/handleEvent/roomErrEvent.d.ts

@@ -5,3 +5,4 @@ import BoomCore from "@hysc/core";
 export declare function handleBRTCRoomError(data: any, bmRoom: BMRoom, boomCore: BCClient, bmStreamVm: BMStreamModelVM, observes: any): Promise<void>;
 export declare function reconnectBloud(boomCore: BoomCore, observes: any, data: any): Promise<unknown>;
 export declare function reconnectBRTCShareWS(boomCore: BoomCore): Promise<unknown>;
+export declare function handleBloudError(bmRoom: BMRoom, boomCore: BCClient, bmStreamVm: BMStreamModelVM, data: any, observes: any): Promise<void>;

package/esm/boom-meeting/src/handleEvent/streamEvent.d.ts

@@ -8,9 +8,32 @@
 import BMStreamModel from "../BMStream/BMStreamModel";
 import { SingleRemoteStream } from "../type";
 import BMStreamModelVM from "../BMStream/BMStreamModelVM";
+import { BloudStreamEventState, BloudUnPubEvent } from "./attachEvents";
+import BMRoom from "../BMRoom/BMRoom";
+export declare const shareFailedProcessQueue: Map<string, SingleRemoteStream>;
 export declare function handleUpdateStreamModelWithStream(stream: SingleRemoteStream, bmStreamVm: BMStreamModelVM): BMStreamModel | undefined;
 export declare function checkStreamIsNormal(streamModel: BMStreamModel | undefined): void;
 export declare function handleStreamUpdated(event: any, bmStreamVm: BMStreamModelVM, observes: any): void;
 export declare function addStreamToBrtcStreamMap(remoteStream: SingleRemoteStream): void;
 export declare function removeSteamToBrtcStreamMap(remoteStream: SingleRemoteStream): void;
 export declare function getStreamFromBrtcStreamMap(remoteStream: SingleRemoteStream): import("@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default | undefined;
+export declare function handleBloudReconnectStreamEvent(bmStreamVm: BMStreamModelVM): void;
+/**
+ * bloud brtc 断网重连的处理
+*  networkState 记录网络状态
+ *  handleReconnectedStream 防抖函数，当双方有连接断网重连之后，会执行这个方法
+ *
+ *  brtc 的sync-room 之后，本地会把所有的stream都销毁，清空，然后统一走一遍查询处理
+ *  绑定新的stream，这么做简单粗暴处理所有的brtc流，防止流重复问题i
+ */
+export declare const networkState: {
+    bloud: boolean;
+    brtc: boolean;
+};
+export declare const handleReconnectedStream: any;
+export declare function handleStreamPublished(event: any, bmStreamVm: BMStreamModelVM, bmRoom: BMRoom, observes: any): void;
+export declare function handleBloudStreamPublished(data: any, bmStreamVm: BMStreamModelVM, observes: any): void;
+export declare function handleBloudStreamPubAUpdate(data: BloudStreamEventState, bmStreamVm: BMStreamModelVM): void;
+export declare function handleBloudStreamUnPublished(data: any, bmStreamVm: BMStreamModelVM, observes: any): void;
+export declare function handleBloudStreamUnpublish(data: BloudUnPubEvent, bmStreamVm: BMStreamModelVM): void;
+export declare function handleShareStreamFailed(bmRoom: BMRoom, bmStreamVm: BMStreamModelVM): void;

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

@@ -116,7 +116,5 @@ export interface CustomStats {
     raiseHandEnable: number;
     joinCueVoice: number;
     autoMute: number;
-    allUserReceiveJoinLeaveMessages: number;
-    userJoinMasterVoice: number;
 }
 export declare type PartialCustomStats = Partial<CustomStats>;

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

@@ -58,4 +58,5 @@ declare class Pqueue {
     onEmpty(): Promise<void>;
 }
 export declare const streamPullQueue: Pqueue;
+export declare const eventQueue: Pqueue;
 export {};