@hysc/meeting 5.0.2 → 5.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/esm/boom-meeting/src/BMRoom/BMRoom.d.ts +13 -3
  2. package/esm/boom-meeting/src/BMRoom/BMRoomVM.d.ts +10 -0
  3. package/esm/boom-meeting/src/BMStream/BMSpeaker.d.ts +0 -9
  4. package/esm/boom-meeting/src/BMStream/BMStreamModel.d.ts +2 -6
  5. package/esm/boom-meeting/src/BMStream/BMStreamModelVM.d.ts +2 -0
  6. package/esm/boom-meeting/src/constants.d.ts +1 -0
  7. package/esm/boom-meeting/src/handleEvent/attachEvents.d.ts +1 -0
  8. package/esm/boom-meeting/src/handleEvent/handleRoomEvent.d.ts +1 -1
  9. package/esm/boom-meeting/src/handleEvent/roomErrEvent.d.ts +1 -0
  10. package/esm/boom-meeting/src/type/customStats.d.ts +2 -0
  11. package/esm/boom-meeting/src/util/emitter.d.ts +3 -1
  12. package/esm/index.js +3 -35641
  13. package/esm/index.js.map +2 -2
  14. package/esm/src/BMRoom/BMRoom.d.ts +4 -2
  15. package/esm/src/BMStream/BMSpeaker.d.ts +0 -9
  16. package/esm/src/BMStream/BMStreamModel.d.ts +2 -6
  17. package/esm/src/BMStream/BMStreamModelVM.d.ts +1 -0
  18. package/esm/src/constants.d.ts +1 -0
  19. package/esm/src/handleEvent/attachEvents.d.ts +1 -0
  20. package/esm/src/handleEvent/handleRoomEvent.d.ts +1 -1
  21. package/esm/src/handleEvent/roomErrEvent.d.ts +1 -0
  22. package/esm/src/index.d.ts +2 -2
  23. package/esm/src/util/emitter.d.ts +3 -1
  24. package/package.json +3 -3
  25. package/umd/boom-meeting/src/BMRoom/BMRoom.d.ts +13 -3
  26. package/umd/boom-meeting/src/BMRoom/BMRoomVM.d.ts +10 -0
  27. package/umd/boom-meeting/src/BMStream/BMSpeaker.d.ts +0 -9
  28. package/umd/boom-meeting/src/BMStream/BMStreamModel.d.ts +2 -6
  29. package/umd/boom-meeting/src/BMStream/BMStreamModelVM.d.ts +2 -0
  30. package/umd/boom-meeting/src/constants.d.ts +1 -0
  31. package/umd/boom-meeting/src/handleEvent/attachEvents.d.ts +1 -0
  32. package/umd/boom-meeting/src/handleEvent/handleRoomEvent.d.ts +1 -1
  33. package/umd/boom-meeting/src/handleEvent/roomErrEvent.d.ts +1 -0
  34. package/umd/boom-meeting/src/type/customStats.d.ts +2 -0
  35. package/umd/boom-meeting/src/util/emitter.d.ts +3 -1
  36. package/umd/index.js +1 -1
  37. package/umd/src/BMRoom/BMRoom.d.ts +3 -10
@@ -3,13 +3,14 @@ import BMRoomVM, { AudioProfileInfo } from "./BMRoomVM";
3
3
  import BMUserVM from '../BMUser/BMUserVM';
4
4
  import { SingleLocalStream, SingleRemoteStream, SubscribeOptions } from '../type';
5
5
  import BMChatVM from '../BMChat/BMChatVM';
6
- import BMStreamModelVM from '../BMStream/BMStreamModelVM';
6
+ import BMStreamModelVM from "../BMStream/BMStreamModelVM";
7
7
  import { Device, VideoProfile } from '@hysc/core/esm/BoomAdapter/type/value';
8
8
  import BMRoomInfo from './BMRoomInfo';
9
9
  import { BehaviorSubject, Subject } from 'rxjs';
10
10
  import BMStreamModel from '../BMStream/BMStreamModel';
11
11
  import BMUser from '../BMUser/BMUser';
12
12
  import BMLiveVM from './BMLiveVM';
13
+ import SingletonQueue, { PullItem } from "../SingletonQueue/SingletonQueue";
13
14
  interface BMRoomProps {
14
15
  initDevices: boolean;
15
16
  }
@@ -27,6 +28,7 @@ export default class BMRoom {
27
28
  selectVideoDevice: Device | null;
28
29
  selectAudioDevice: Device | null;
29
30
  selectAudioOutputDevice: Device | null;
31
+ streamQueue: SingletonQueue;
30
32
  /**
31
33
  * 这个参数是和业务相关的功能,业务上的参会者列表是可以配置的,如果设置了只展示一列,那么所有的用户都要存储
32
34
  * 在commonUserList中
@@ -71,10 +73,13 @@ export default class BMRoom {
71
73
  * bloud断网重连的时候的提示
72
74
  */
73
75
  bloudWSReconnectWatcher: Subject<boolean>;
76
+ netConnecting: boolean;
77
+ netConnectingWatcher: Subject<boolean>;
74
78
  /**
75
79
  * 会控底层相关处理, 比如是否取消自动拉流
76
80
  */
77
81
  private meetingControlOptions;
82
+ forceId: string;
78
83
  get isSingleColumns(): boolean;
79
84
  /**
80
85
  * 传递信息用的,主要是用于message信令往上层业务发送消息
@@ -246,7 +251,6 @@ export default class BMRoom {
246
251
  */
247
252
  setLocalSpeakerEnable(status: boolean): Promise<void>;
248
253
  private _attachEvents;
249
- private _attachBrtcEvent;
250
254
  /**
251
255
  * 创建本地流
252
256
  * @param options
@@ -301,7 +305,7 @@ export default class BMRoom {
301
305
  * @param options 订阅选项
302
306
  * @returns
303
307
  */
304
- subscribe(remoteStream: SingleRemoteStream, options?: SubscribeOptions): Promise<void>;
308
+ subscribe(remoteStream: SingleRemoteStream, options?: SubscribeOptions): Promise<any>;
305
309
  /**
306
310
  * 取消订阅远端流
307
311
  *
@@ -587,6 +591,7 @@ export default class BMRoom {
587
591
  /**
588
592
  * 处理流出现connect-error的逻辑,本地流需要重新推流,远端流需要重新拉流
589
593
  * @param event
594
+ * @param failed
590
595
  */
591
596
  private handleStreamConnectError;
592
597
  /**
@@ -634,6 +639,11 @@ export default class BMRoom {
634
639
  * 重拉远端流
635
640
  */
636
641
  handleResetOtherStreamStatus(): void;
642
+ addUser2Queue(pullItem: PullItem): Promise<void>;
643
+ queueProcessor: any;
644
+ queryBrtcStreams(uids: string[]): Promise<any>;
645
+ handleAddStreams(streams: SingleRemoteStream[]): void;
646
+ getForceUser(forceId: string): Promise<void>;
637
647
  getVersion(): string;
638
648
  }
639
649
  export {};
@@ -165,6 +165,16 @@ export default class BMRoomVM {
165
165
  * @param enable
166
166
  */
167
167
  changeAutoMute(enable: 0 | 1 | 2): Promise<void>;
168
+ /**
169
+ * 允许成员接收进入/离开会议通知配置 0 关闭 1 开启自动静音
170
+ * @param enable
171
+ */
172
+ allUserReceiveJoinLeaveMessages(enable: 0 | 1): Promise<void>;
173
+ /**
174
+ * 成员入会时给主持人播放提示音配置 0 关闭 1 开启自动静音
175
+ * @param enable
176
+ */
177
+ userJoinMasterVoice(enable: 0 | 1): Promise<void>;
168
178
  /**
169
179
  * 观众点赞(走customMessage)
170
180
  * @param type 1:点赞, 2:送花, 3:爱心, 4: 鼓掌, 5: 喝彩
@@ -1,14 +1,5 @@
1
1
  import BMUser from '../BMUser/BMUser';
2
2
  import { SingleStream } from '../type';
3
- /**
4
- * @name: BMSpeaker
5
- * @author: liuxinghai
6
- * @date: 2022-06-07 11:41
7
- * @description:BMSpeaker
8
- * 适配 brtc 流对象到 bloud 流对象接口,
9
- * 用户辅助采用 bloud SpeakerDetector 做说话人检测
10
- * @date: 2022-06-07 11:41
11
- */
12
3
  export default class BMSpeaker {
13
4
  private _user;
14
5
  private _stream;
@@ -23,14 +23,10 @@ export interface NoPlayerContainer {
23
23
  container: 'small' | 'big';
24
24
  id: string;
25
25
  }
26
- export interface BloudStream {
27
- video: boolean;
28
- audio: boolean;
29
- }
30
26
  export default class BMStreamModel {
31
27
  private user;
32
28
  private _stream;
33
- bloudStream: BloudStream | undefined;
29
+ bloudStream: BloudStreamState | undefined;
34
30
  /**
35
31
  * 流类型
36
32
  */
@@ -168,7 +164,7 @@ export default class BMStreamModel {
168
164
  /**
169
165
  * 是否是屏幕共享的流
170
166
  */
171
- get isShare(): boolean | undefined;
167
+ get isShare(): boolean;
172
168
  get isWeb(): boolean;
173
169
  /**
174
170
  * 当前音频是否开启
@@ -103,6 +103,7 @@ export default class BMStreamModelVM {
103
103
  addStreamModel(streamModel: BMStreamModel): void;
104
104
  addShareStreamModel(streamModel: BMStreamModel): void;
105
105
  removeStreamModel(streamModel: BMStreamModel): void;
106
+ removeShareStreamModelByUId(uid: string): void;
106
107
  removeShareStreamModel(streamModel: BMStreamModel): void;
107
108
  /**`
108
109
  * 通过用户id删除streamModel
@@ -164,6 +165,7 @@ export default class BMStreamModelVM {
164
165
  * @private
165
166
  */
166
167
  private createStreamAndPublish;
168
+ publishBloudStream(audio: boolean, video: boolean): void;
167
169
  muteHandler(type: 'video' | 'audio'): Promise<void>;
168
170
  unpublishStream(): Promise<void>;
169
171
  /**
@@ -112,3 +112,4 @@ export declare const CHANG_IS_GUEST = "change-is-guest";
112
112
  export declare const BIND_BIG_ELEMENT = "bind-big-element";
113
113
  export declare const NO_CONTAINER = "no-container";
114
114
  export declare const MODEL_SORT_NUM_CHANGE = "model-sort-num-change";
115
+ export declare const ADD_PULL_USER = "add-pull-user";
@@ -32,6 +32,7 @@ export interface BloudStreamEventState {
32
32
  export interface BloudStreamState {
33
33
  video: boolean;
34
34
  audio: boolean;
35
+ isScreen: boolean;
35
36
  }
36
37
  export interface BloudUnPubEvent {
37
38
  userId: string;
@@ -9,7 +9,7 @@ import BMRoom from "../BMRoom/BMRoom";
9
9
  import BMUserVM from "../BMUser/BMUserVM";
10
10
  import BMStreamModelVM from "../BMStream/BMStreamModelVM";
11
11
  export declare function handleRoomConnected(data: any, bmRoom: BMRoom, userVM: BMUserVM, observes: any, shouldNotification?: boolean): Promise<void>;
12
- export declare function handleInitJoinRoomUsers(bmRoom: BMRoom): void;
12
+ export declare function handleInitJoinRoomUsers(bmRoom: BMRoom): Promise<void>;
13
13
  export declare function handleRoomUpdated(data: any, bmRoom: BMRoom): void;
14
14
  export declare function handleInitRoomInfo(data: any, bmRoom: BMRoom): Promise<void>;
15
15
  export declare function handleRoomSync(data: any, bmRoom: BMRoom, userVm: BMUserVM, bmStreamVm: BMStreamModelVM): Promise<void>;
@@ -2,6 +2,7 @@ import BMRoom from "../BMRoom/BMRoom";
2
2
  import BCClient from "@hysc/core";
3
3
  import BMStreamModelVM from "../BMStream/BMStreamModelVM";
4
4
  import BoomCore from "@hysc/core";
5
+ export declare const NETWORK_ERROR_QUEUE: Set<(...args: any) => void>;
5
6
  export declare function handleBRTCRoomError(data: any, bmRoom: BMRoom, boomCore: BCClient, bmStreamVm: BMStreamModelVM, observes: any): Promise<void>;
6
7
  export declare function reconnectBloud(boomCore: BoomCore, observes: any, data: any): Promise<unknown>;
7
8
  export declare function reconnectBRTCShareWS(boomCore: BoomCore): Promise<unknown>;
@@ -116,5 +116,7 @@ export interface CustomStats {
116
116
  raiseHandEnable: number;
117
117
  joinCueVoice: number;
118
118
  autoMute: number;
119
+ allUserReceiveJoinLeaveMessages: number;
120
+ userJoinMasterVoice: number;
119
121
  }
120
122
  export declare type PartialCustomStats = Partial<CustomStats>;
@@ -1,7 +1,8 @@
1
1
  import { ConnectErrorMessage, NoPlayerContainer, SubscribeMessage } from "../BMStream/BMStreamModel";
2
- 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";
2
+ 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";
3
3
  import { RaiseHandInfo } from "../BMUser/BMUser";
4
4
  import { ChangeIsGuest } from "../BMUser/BMUserVM";
5
+ import { PullItem } from "../SingletonQueue/SingletonQueue";
5
6
  export declare type UserSortType = {
6
7
  isCommon: boolean;
7
8
  shouldDelay: boolean;
@@ -18,6 +19,7 @@ declare type Events = {
18
19
  [BIND_BIG_ELEMENT]: SubscribeMessage;
19
20
  [NO_CONTAINER]: NoPlayerContainer;
20
21
  [MODEL_SORT_NUM_CHANGE]: null;
22
+ [ADD_PULL_USER]: PullItem;
21
23
  };
22
24
  export declare const emitter: import("mitt").Emitter<Events>;
23
25
  export declare const removeEmitter: () => void;