@hysc/meeting 5.0.3 → 5.0.6

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

@@ -73,6 +73,8 @@ export default class BMRoom {
      * bloud断网重连的时候的提示
      */
     bloudWSReconnectWatcher: Subject<boolean>;
+    netConnecting: boolean;
+    netConnectingWatcher: Subject<boolean>;
     /**
      * 会控底层相关处理, 比如是否取消自动拉流
      */
@@ -303,7 +305,7 @@ export default class BMRoom {
      * @param options 订阅选项
      * @returns
      */
-    subscribe(remoteStream: SingleRemoteStream, options?: SubscribeOptions): Promise<void>;
+    subscribe(remoteStream: SingleRemoteStream, options?: SubscribeOptions): Promise<any>;
     /**
      * 取消订阅远端流
      *
@@ -639,8 +641,8 @@ export default class BMRoom {
     handleResetOtherStreamStatus(): void;
     addUser2Queue(pullItem: PullItem): Promise<void>;
     queueProcessor: import("lodash-es").DebouncedFunc<(uIds: Map<string, PullItem>) => Promise<void>>;
-    handleAddStreams(streams: SingleRemoteStream[]): void;
     queryBrtcStreams(uids: string[]): Promise<any>;
+    handleAddStreams(streams: SingleRemoteStream[]): void;
     getForceUser(forceId: string): Promise<void>;
     getVersion(): string;
 }

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

@@ -1,14 +1,5 @@
 import BMUser from '../BMUser/BMUser';
 import { SingleStream } from '../type';
-/**
- * @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;

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

@@ -23,14 +23,10 @@ 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;
+    bloudStream: BloudStreamState | undefined;
     /**
      * 流类型
      */
@@ -168,7 +164,7 @@ export default class BMStreamModel {
     /**
      * 是否是屏幕共享的流
      */
-    get isShare(): boolean | undefined;
+    get isShare(): boolean;
     get isWeb(): boolean;
     /**
      * 当前音频是否开启

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

@@ -165,6 +165,7 @@ export default class BMStreamModelVM {
      * @private
      */
     private createStreamAndPublish;
+    publishBloudStream(audio: boolean, video: boolean): void;
     muteHandler(type: 'video' | 'audio'): Promise<void>;
     unpublishStream(): Promise<void>;
     /**

package/esm/src/constants.d.ts

@@ -112,3 +112,4 @@ export declare const CHANG_IS_GUEST = "change-is-guest";
 export declare const BIND_BIG_ELEMENT = "bind-big-element";
 export declare const NO_CONTAINER = "no-container";
 export declare const MODEL_SORT_NUM_CHANGE = "model-sort-num-change";
+export declare const ADD_PULL_USER = "add-pull-user";

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

@@ -32,6 +32,7 @@ export interface BloudStreamEventState {
 export interface BloudStreamState {
     video: boolean;
     audio: boolean;
+    isScreen: boolean;
 }
 export interface BloudUnPubEvent {
     userId: string;

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

@@ -9,7 +9,7 @@ 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 handleInitJoinRoomUsers(bmRoom: BMRoom): Promise<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>;

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

@@ -2,6 +2,7 @@ import BMRoom from "../BMRoom/BMRoom";
 import BCClient from "@hysc/core";
 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 reconnectBRTCShareWS(boomCore: BoomCore): Promise<unknown>;

package/esm/src/util/emitter.d.ts

@@ -1,7 +1,8 @@
 import { ConnectErrorMessage, NoPlayerContainer, SubscribeMessage } from "../BMStream/BMStreamModel";
-import { BIND_BIG_ELEMENT, BIND_ELEMENT, CHANG_IS_GUEST, HANDLE_STREAM_CONNECT_ERROR, MANUAL_SUBSCRIPTION, MODEL_SORT_NUM_CHANGE, NO_CONTAINER, RAISE_HAND, RECEIVE_SUBSCRIBE_MESSAGE, UNSUBSCRIBE_STREAM, USER_SORT_NUM_CHANGE } from "../constants";
+import { ADD_PULL_USER, BIND_BIG_ELEMENT, BIND_ELEMENT, CHANG_IS_GUEST, HANDLE_STREAM_CONNECT_ERROR, MANUAL_SUBSCRIPTION, MODEL_SORT_NUM_CHANGE, NO_CONTAINER, RAISE_HAND, RECEIVE_SUBSCRIBE_MESSAGE, UNSUBSCRIBE_STREAM, USER_SORT_NUM_CHANGE } from "../constants";
 import { RaiseHandInfo } from "../BMUser/BMUser";
 import { ChangeIsGuest } from "../BMUser/BMUserVM";
+import { PullItem } from "../SingletonQueue/SingletonQueue";
 export declare type UserSortType = {
     isCommon: boolean;
     shouldDelay: boolean;
@@ -18,6 +19,7 @@ declare type Events = {
     [BIND_BIG_ELEMENT]: SubscribeMessage;
     [NO_CONTAINER]: NoPlayerContainer;
     [MODEL_SORT_NUM_CHANGE]: null;
+    [ADD_PULL_USER]: PullItem;
 };
 export declare const emitter: import("mitt").Emitter<Events>;
 export declare const removeEmitter: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hysc/meeting",
-  "version": "5.0.3",
+  "version": "5.0.6",
   "description": "boom meeting",
   "main": "umd/index.js",
   "module": "esm/index.js",
@@ -14,7 +14,7 @@
   "author": "yangliye",
   "license": "MIT",
   "dependencies": {
-    "@hysc/core": "5.0.3",
+    "@hysc/core": "5.0.4",
     "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.3"
+    "@hysc/core": "5.0.4"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.6"

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

@@ -73,6 +73,8 @@ export default class BMRoom {
      * bloud断网重连的时候的提示
      */
     bloudWSReconnectWatcher: Subject<boolean>;
+    netConnecting: boolean;
+    netConnectingWatcher: Subject<boolean>;
     /**
      * 会控底层相关处理, 比如是否取消自动拉流
      */
@@ -303,7 +305,7 @@ export default class BMRoom {
      * @param options 订阅选项
      * @returns
      */
-    subscribe(remoteStream: SingleRemoteStream, options?: SubscribeOptions): Promise<void>;
+    subscribe(remoteStream: SingleRemoteStream, options?: SubscribeOptions): Promise<any>;
     /**
      * 取消订阅远端流
      *
@@ -639,8 +641,8 @@ export default class BMRoom {
     handleResetOtherStreamStatus(): void;
     addUser2Queue(pullItem: PullItem): Promise<void>;
     queueProcessor: any;
-    handleAddStreams(streams: SingleRemoteStream[]): void;
     queryBrtcStreams(uids: string[]): Promise<any>;
+    handleAddStreams(streams: SingleRemoteStream[]): void;
     getForceUser(forceId: string): Promise<void>;
     getVersion(): string;
 }

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

@@ -1,14 +1,5 @@
 import BMUser from '../BMUser/BMUser';
 import { SingleStream } from '../type';
-/**
- * @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;

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

@@ -23,14 +23,10 @@ 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;
+    bloudStream: BloudStreamState | undefined;
     /**
      * 流类型
      */
@@ -168,7 +164,7 @@ export default class BMStreamModel {
     /**
      * 是否是屏幕共享的流
      */
-    get isShare(): boolean | undefined;
+    get isShare(): boolean;
     get isWeb(): boolean;
     /**
      * 当前音频是否开启

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

@@ -165,6 +165,7 @@ export default class BMStreamModelVM {
      * @private
      */
     private createStreamAndPublish;
+    publishBloudStream(audio: boolean, video: boolean): void;
     muteHandler(type: 'video' | 'audio'): Promise<void>;
     unpublishStream(): Promise<void>;
     /**

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

@@ -112,3 +112,4 @@ export declare const CHANG_IS_GUEST = "change-is-guest";
 export declare const BIND_BIG_ELEMENT = "bind-big-element";
 export declare const NO_CONTAINER = "no-container";
 export declare const MODEL_SORT_NUM_CHANGE = "model-sort-num-change";
+export declare const ADD_PULL_USER = "add-pull-user";

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

@@ -32,6 +32,7 @@ export interface BloudStreamEventState {
 export interface BloudStreamState {
     video: boolean;
     audio: boolean;
+    isScreen: boolean;
 }
 export interface BloudUnPubEvent {
     userId: string;

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

@@ -9,7 +9,7 @@ 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 handleInitJoinRoomUsers(bmRoom: BMRoom): Promise<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>;

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

@@ -2,6 +2,7 @@ import BMRoom from "../BMRoom/BMRoom";
 import BCClient from "@hysc/core";
 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 reconnectBRTCShareWS(boomCore: BoomCore): Promise<unknown>;

package/umd/boom-meeting/src/util/emitter.d.ts

@@ -1,7 +1,8 @@
 import { ConnectErrorMessage, NoPlayerContainer, SubscribeMessage } from "../BMStream/BMStreamModel";
-import { BIND_BIG_ELEMENT, BIND_ELEMENT, CHANG_IS_GUEST, HANDLE_STREAM_CONNECT_ERROR, MANUAL_SUBSCRIPTION, MODEL_SORT_NUM_CHANGE, NO_CONTAINER, RAISE_HAND, RECEIVE_SUBSCRIBE_MESSAGE, UNSUBSCRIBE_STREAM, USER_SORT_NUM_CHANGE } from "../constants";
+import { ADD_PULL_USER, BIND_BIG_ELEMENT, BIND_ELEMENT, CHANG_IS_GUEST, HANDLE_STREAM_CONNECT_ERROR, MANUAL_SUBSCRIPTION, MODEL_SORT_NUM_CHANGE, NO_CONTAINER, RAISE_HAND, RECEIVE_SUBSCRIBE_MESSAGE, UNSUBSCRIBE_STREAM, USER_SORT_NUM_CHANGE } from "../constants";
 import { RaiseHandInfo } from "../BMUser/BMUser";
 import { ChangeIsGuest } from "../BMUser/BMUserVM";
+import { PullItem } from "../SingletonQueue/SingletonQueue";
 export declare type UserSortType = {
     isCommon: boolean;
     shouldDelay: boolean;
@@ -18,6 +19,7 @@ declare type Events = {
     [BIND_BIG_ELEMENT]: SubscribeMessage;
     [NO_CONTAINER]: NoPlayerContainer;
     [MODEL_SORT_NUM_CHANGE]: null;
+    [ADD_PULL_USER]: PullItem;
 };
 export declare const emitter: import("mitt").Emitter<Events>;
 export declare const removeEmitter: () => void;