@hysc/meeting 5.0.9 → 5.0.12

package/esm/src/BMRoom/BMRoom.d.ts

@@ -7,7 +7,7 @@ import BMStreamModelVM from "../BMStream/BMStreamModelVM";
 import { Device, VideoProfile } from '@hysc/core/esm/BoomAdapter/type/value';
 import BMRoomInfo from './BMRoomInfo';
 import { BehaviorSubject, Subject } from 'rxjs';
-import BMStreamModel from '../BMStream/BMStreamModel';
+import BMStreamModel, { ConnectErrorMessage } from '../BMStream/BMStreamModel';
 import BMUser from '../BMUser/BMUser';
 import BMLiveVM from './BMLiveVM';
 import SingletonQueue, { PullItem } from "../SingletonQueue/SingletonQueue";
@@ -42,6 +42,11 @@ export default class BMRoom {
      * brtc断网重连的时候,所有的订阅和播放相关的处理,都不需要
      */
     BRTCConnectFailed: boolean;
+    /**
+     * 本端推流失败次数
+     */
+    pubFailedNum: number;
+    streamConnectedErrorQueue: Array<ConnectErrorMessage>;
     /**
      * 会议模式
      * 1 会议
@@ -75,11 +80,25 @@ export default class BMRoom {
     bloudWSReconnectWatcher: Subject<boolean>;
     netConnecting: boolean;
     netConnectingWatcher: Subject<boolean>;
+    hasSyncPermission: boolean;
     /**
      * 会控底层相关处理, 比如是否取消自动拉流
      */
     private meetingControlOptions;
     forceId: string;
+    /**
+     * bloud brtc 断网重连的处理
+     *  networkState 记录网络状态
+     *  handleReconnectedStream 防抖函数，当双方有连接断网重连之后，会执行这个方法
+     *
+     *  brtc 的sync-room 之后，本地会把所有的stream都销毁，清空，然后统一走一遍查询处理
+     *  绑定新的stream，这么做简单粗暴处理所有的brtc流，防止流重复问题i
+     */
+    networkState: {
+        bloud: boolean;
+        brtc: boolean;
+    };
+    brtcNetEnableWatcher: Subject<boolean>;
     get isSingleColumns(): boolean;
     /**
      * 传递信息用的，主要是用于message信令往上层业务发送消息
@@ -542,7 +561,7 @@ export default class BMRoom {
      */
     checkUserHasMaster(userId: string): boolean;
     changeNickName(userId: string, nickName: string): Promise<any>;
-    handleQueueTask(streamModel: BMStreamModel, noPlayChanged?: boolean): Promise<void>;
+    handleQueueTask: (streamModel: BMStreamModel, noPlayChanged?: boolean) => Promise<void>;
     handleStreamTask(streamModel: BMStreamModel, noPlayChanged?: boolean): Promise<void>;
     /**
      * 处理拉流的逻辑
@@ -640,6 +659,7 @@ export default class BMRoom {
      */
     handleResetOtherStreamStatus(): void;
     addUser2Queue(pullItem: PullItem): Promise<void>;
+    processUser: (uIds: Map<string, PullItem>) => Promise<void>;
     queueProcessor: import("lodash-es").DebouncedFunc<(uIds: Map<string, PullItem>) => Promise<void>>;
     queryBrtcStreams(uids: string[]): Promise<any>;
     handleAddStreams(streams: SingleRemoteStream[]): void;

package/esm/src/BMStream/BMStreamModelVM.d.ts

@@ -24,17 +24,6 @@ import BMSpeaker from './BMSpeaker';
 import { ShareMediaOptions } from "@hysc/core/esm/BoomCore/BCClient/BCClient";
 import { getHTMLMediaStreamOptions, Result, getMediaStreamInfo } from "./getHTMLMediaStreamOptions";
 export declare function transShareScreen2User(userId: string): string;
-export declare const pubFailedStreamMap: Map<string, import("@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
-/**
- * 全量的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 {
     streamModels: Map<string, BMStreamModel>;
     /**
@@ -242,12 +231,5 @@ export default class BMStreamModelVM {
      */
     getHTMLMediaStream: typeof getHTMLMediaStreamOptions;
     getMediaStream: typeof getMediaStreamInfo;
-    /**
-     * brtc断网重连之后，不知道在断网期间有那些用户取消了推流，
-     * 然后如果是brtc的ws没重连上，然后自己走的重新入会重连的话，就会导致
-     * 可能存在本地的流有一部分可能是不存在的流了，这个方法就是在重连入会之后
-     * 把所有远端流清空
-     */
-    resetAllRemoteStream(): void;
     clearCache(): void;
 }

package/esm/src/BMUser/BMUserVM.d.ts

@@ -83,7 +83,8 @@ export default class BMUserVM {
      * 刚加入房间时初始化人数
      */
     initUserList(usersInRoom: Map<string, BCUser>): Promise<void>;
-    addBcUsers(users: Map<string, BCUser>): void;
+    addBcUsersMap(users: Map<string, BCUser>, forceGetStream?: boolean): void;
+    addBCUser: (bcUser: BCUser, forceGetStream?: boolean) => BMUser | null;
     /**
      * 改变userList中的主持人,返回改变后的主持人用户对象,该方法只在change-master中调用, 不对外暴露
      * @param userId

package/esm/src/handleEvent/attachEvents.d.ts

@@ -39,7 +39,6 @@ export interface BloudUnPubEvent {
     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/src/handleEvent/roomErrEvent.d.ts

@@ -4,6 +4,6 @@ import BMStreamModelVM from "../BMStream/BMStreamModelVM";
 import BoomCore from "@hysc/core";
 export declare const NETWORK_ERROR_QUEUE: Set<(...args: any) => void>;
 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 reconnectBloud(bmRoom: BMRoom, 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/src/handleEvent/streamEvent.d.ts

@@ -13,22 +13,7 @@ import BMRoom from "../BMRoom/BMRoom";
 export declare const shareFailedProcessQueue: Map<string, SingleRemoteStream>;
 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: import("lodash-es").DebouncedFunc<(bmRoom: BMRoom) => void>;
 export declare function handleStreamPublished(event: any, bmStreamVm: BMStreamModelVM, bmRoom: BMRoom, observes: any): void;
 export declare function handleBloudStreamPublished(data: any, bmStreamVm: BMStreamModelVM, observes: any): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hysc/meeting",
-  "version": "5.0.9",
+  "version": "5.0.12",
   "description": "boom meeting",
   "main": "umd/index.js",
   "module": "esm/index.js",
@@ -14,7 +14,7 @@
   "author": "yangliye",
   "license": "MIT",
   "dependencies": {
-    "@hysc/core": "5.0.7",
+    "@hysc/core": "5.0.10",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "@hysc/p-queue": "6.3.0",
@@ -23,7 +23,7 @@
     "@hysc/utils": "1.2.3"
   },
   "peerDependencies": {
-    "@hysc/core": "5.0.7"
+    "@hysc/core": "5.0.10"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.6"

package/umd/boom-meeting/src/BMRoom/BMRoom.d.ts

@@ -7,7 +7,7 @@ import BMStreamModelVM from "../BMStream/BMStreamModelVM";
 import { Device, VideoProfile } from '@hysc/core/esm/BoomAdapter/type/value';
 import BMRoomInfo from './BMRoomInfo';
 import { BehaviorSubject, Subject } from 'rxjs';
-import BMStreamModel from '../BMStream/BMStreamModel';
+import BMStreamModel, { ConnectErrorMessage } from '../BMStream/BMStreamModel';
 import BMUser from '../BMUser/BMUser';
 import BMLiveVM from './BMLiveVM';
 import SingletonQueue, { PullItem } from "../SingletonQueue/SingletonQueue";
@@ -42,6 +42,11 @@ export default class BMRoom {
      * brtc断网重连的时候,所有的订阅和播放相关的处理,都不需要
      */
     BRTCConnectFailed: boolean;
+    /**
+     * 本端推流失败次数
+     */
+    pubFailedNum: number;
+    streamConnectedErrorQueue: Array<ConnectErrorMessage>;
     /**
      * 会议模式
      * 1 会议
@@ -75,11 +80,25 @@ export default class BMRoom {
     bloudWSReconnectWatcher: Subject<boolean>;
     netConnecting: boolean;
     netConnectingWatcher: Subject<boolean>;
+    hasSyncPermission: boolean;
     /**
      * 会控底层相关处理, 比如是否取消自动拉流
      */
     private meetingControlOptions;
     forceId: string;
+    /**
+     * bloud brtc 断网重连的处理
+     *  networkState 记录网络状态
+     *  handleReconnectedStream 防抖函数，当双方有连接断网重连之后，会执行这个方法
+     *
+     *  brtc 的sync-room 之后，本地会把所有的stream都销毁，清空，然后统一走一遍查询处理
+     *  绑定新的stream，这么做简单粗暴处理所有的brtc流，防止流重复问题i
+     */
+    networkState: {
+        bloud: boolean;
+        brtc: boolean;
+    };
+    brtcNetEnableWatcher: Subject<boolean>;
     get isSingleColumns(): boolean;
     /**
      * 传递信息用的，主要是用于message信令往上层业务发送消息
@@ -542,7 +561,7 @@ export default class BMRoom {
      */
     checkUserHasMaster(userId: string): boolean;
     changeNickName(userId: string, nickName: string): Promise<any>;
-    handleQueueTask(streamModel: BMStreamModel, noPlayChanged?: boolean): Promise<void>;
+    handleQueueTask: (streamModel: BMStreamModel, noPlayChanged?: boolean) => Promise<void>;
     handleStreamTask(streamModel: BMStreamModel, noPlayChanged?: boolean): Promise<void>;
     /**
      * 处理拉流的逻辑
@@ -640,6 +659,7 @@ export default class BMRoom {
      */
     handleResetOtherStreamStatus(): void;
     addUser2Queue(pullItem: PullItem): Promise<void>;
+    processUser: (uIds: Map<string, PullItem>) => Promise<void>;
     queueProcessor: any;
     queryBrtcStreams(uids: string[]): Promise<any>;
     handleAddStreams(streams: SingleRemoteStream[]): void;

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

@@ -24,17 +24,6 @@ import BMSpeaker from './BMSpeaker';
 import { ShareMediaOptions } from "@hysc/core/esm/BoomCore/BCClient/BCClient";
 import { getHTMLMediaStreamOptions, Result, getMediaStreamInfo } from "./getHTMLMediaStreamOptions";
 export declare function transShareScreen2User(userId: string): string;
-export declare const pubFailedStreamMap: Map<string, import("@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
-/**
- * 全量的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 {
     streamModels: Map<string, BMStreamModel>;
     /**
@@ -242,12 +231,5 @@ export default class BMStreamModelVM {
      */
     getHTMLMediaStream: typeof getHTMLMediaStreamOptions;
     getMediaStream: typeof getMediaStreamInfo;
-    /**
-     * brtc断网重连之后，不知道在断网期间有那些用户取消了推流，
-     * 然后如果是brtc的ws没重连上，然后自己走的重新入会重连的话，就会导致
-     * 可能存在本地的流有一部分可能是不存在的流了，这个方法就是在重连入会之后
-     * 把所有远端流清空
-     */
-    resetAllRemoteStream(): void;
     clearCache(): void;
 }

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

@@ -83,7 +83,8 @@ export default class BMUserVM {
      * 刚加入房间时初始化人数
      */
     initUserList(usersInRoom: Map<string, BCUser>): Promise<void>;
-    addBcUsers(users: Map<string, BCUser>): void;
+    addBcUsersMap(users: Map<string, BCUser>, forceGetStream?: boolean): void;
+    addBCUser: (bcUser: BCUser, forceGetStream?: boolean) => BMUser | null;
     /**
      * 改变userList中的主持人,返回改变后的主持人用户对象,该方法只在change-master中调用, 不对外暴露
      * @param userId

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

@@ -39,7 +39,6 @@ export interface BloudUnPubEvent {
     streamId: string;
     isScreen: boolean;
 }
-export declare function attachBRTCEvent(boomCore: BoomCore, bmStreamVm: BMStreamModelVM, userVM: BMUserVM): void;
 declare type Observes = {
     [K in BCEvent]: BehaviorSubject<any>;
 };

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

@@ -4,6 +4,6 @@ import BMStreamModelVM from "../BMStream/BMStreamModelVM";
 import BoomCore from "@hysc/core";
 export declare const NETWORK_ERROR_QUEUE: Set<(...args: any) => void>;
 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 reconnectBloud(bmRoom: BMRoom, 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/umd/boom-meeting/src/handleEvent/streamEvent.d.ts

@@ -13,22 +13,7 @@ import BMRoom from "../BMRoom/BMRoom";
 export declare const shareFailedProcessQueue: Map<string, SingleRemoteStream>;
 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;