@hysc/meeting 5.0.115 → 5.0.117

package/esm/src/BMChat/BMChatVM.d.ts

@@ -1,16 +1,16 @@
-import BoomCore from '@hysc/core/esm';
+import BCClient from '@hysc/core';
 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;
+    boomCore: BCClient;
     userVM: BMUserVM;
     bmRoom: BMRoom;
     messageListWatcher: BehaviorSubject<Array<BMMessageInfo>>;
     hasDangerMessageWatcher: Subject<boolean>;
-    constructor(boomCore: BoomCore, userVM: BMUserVM, bmRoom: BMRoom);
+    constructor(boomCore: BCClient, userVM: BMUserVM, bmRoom: BMRoom);
     /**
      * 发送聊天消息
      * @param talkMsg 聊天信息

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

@@ -1,10 +1,11 @@
 import BoomCore from "@hysc/core";
 import BMRoomVM, { AudioProfileInfo } from "./BMRoomVM";
 import BMUserVM from "../BMUser/BMUserVM";
-import { SingleLocalStream, SingleRemoteStream, SubscribeOptions } from "../type";
+import { SingleLocalStream, SingleRemoteStream } from "../type";
+import type { SubscribeOptions } from '@hysc/brtc';
 import BMChatVM from "../BMChat/BMChatVM";
 import BMStreamModelVM from "../BMStream/BMStreamModelVM";
-import { Device, VideoProfile } from "@hysc/core/esm/BoomAdapter/type/value";
+import { Device, VideoProfile, AudioHint } from "@hysc/brtc";
 import BMRoomInfo from "./BMRoomInfo";
 import { BehaviorSubject, Subject } from "rxjs";
 import BMStreamModel, { ConnectErrorMessage } from "../BMStream/BMStreamModel";
@@ -78,6 +79,8 @@ export default class BMRoom {
     mediaPermission: MediaPermission;
     videoProfile: VideoProfile;
     audioProfile: AudioProfileInfo | null;
+    voiceMode: AudioHint;
+    setVoiceMode(mode: AudioHint): void;
     /**
      * brtc断网重连要给端上事件响应，所有端上把流单独做处理的，需要在收到这个事件之后，重新处理所有的effect
      */
@@ -315,31 +318,31 @@ export default class BMRoom {
     createPBSingleLocalStream(options?: {
         video: boolean;
         audio: boolean;
-    }, sid?: string): Promise<any>;
+    }, sid?: string): Promise<import("@hysc/brtc").LocalStream>;
     /**
      * 枚举视频输入设备
      *
      * @returns 设备列表
      */
-    enumVideoDevices: any;
+    enumVideoDevices: typeof import("@hysc/brtc").enumVideoDevices;
     /**
      * 枚举音频输入设备
      *
      * @returns 设备列表
      */
-    enumAudioInputDevices: any;
+    enumAudioInputDevices: typeof import("@hysc/brtc").enumAudioInputDevices;
     /**
      * 枚举音频输出设备
      *
      * @returns 设备列表
      */
-    enumAudioOutputDevices: any;
+    enumAudioOutputDevices: typeof import("@hysc/brtc").enumAudioOutputDevices;
     /**
      * 检查音视频权限
      */
-    getPermissions: any;
-    checkSystemSupport: any;
-    createStream: any;
+    getPermissions: typeof import("@hysc/brtc").getPermissions;
+    checkSystemSupport: typeof import("@hysc/brtc").checkSystemSupport;
+    createStream: typeof import("@hysc/brtc").createStream;
     participantNotice: boolean;
     /**
      * 订阅远端流
@@ -588,6 +591,12 @@ export default class BMRoom {
      */
     checkUserHasMaster(userId: string): boolean;
     changeNickName(userId: string, nickName: string): Promise<any>;
+    /**
+     * boom-web-sdk中，会存在缓存的情况
+     * 所以可能会出现设置已经不存在的窗口的值，去拉不存在的窗口的流
+     * 增加一层逻辑判断去处理该情况
+     */
+    streamModelExits(streamModel: BMStreamModel): boolean;
     handleQueueTask: (streamModel: BMStreamModel, noPlayChanged?: boolean) => Promise<void>;
     handleStreamTask(streamModel: BMStreamModel, noPlayChanged?: boolean): Promise<void>;
     /**
@@ -688,7 +697,7 @@ export default class BMRoom {
     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>;
+    queryBrtcStreams(uids: string[]): Promise<import("@hysc/brtc").RemoteStream[]>;
     handleAddStreams(streams: SingleRemoteStream[]): void;
     getForceUser(forceId: string): Promise<void>;
     getVersion(): string;

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

@@ -1,10 +1,11 @@
-import { SingleStream, SubscribeOptions } from "../type";
+import { SingleStream } from "../type";
+import { SubscribeOptions } from "@hysc/brtc";
 import BMUser from "../BMUser/BMUser";
 import { BehaviorSubject, Subject } from "rxjs";
-import { Player } from "@hysc/core/esm";
+import { Player } from "@hysc/core";
 import BMStreamModelVM from "./BMStreamModelVM";
 import { BloudStreamState } from "../handleEvent/attachEvents";
-import type { StreamCustomInfo } from '@hysc/bloud';
+import type { StreamCustomInfo } from '@hysc/bloud/src/core/Room';
 /**
  * @name: BMStreamModel
  * @author: yangliye
@@ -212,7 +213,7 @@ export default class BMStreamModel {
     /**
      * 获取流的传输信息
      */
-    getStats(): Promise<import("@hysc/core/esm/BoomAdapter/type/stats").RemoteStreamStats> | Promise<import("@hysc/core/esm/BoomAdapter/type/stats").LocalStreamStats> | undefined;
+    getStats(): Promise<import("@hysc/brtc").LocalStreamStats> | Promise<import("@hysc/brtc").RemoteStreamStats> | undefined;
     /**
      * BIND_ELEMENT 事件
      * @param eleId
@@ -283,7 +284,7 @@ export default class BMStreamModel {
     collectAudioLevel: () => void;
     private handleAudioLevel;
     checkSmallVideo(): void;
-    checkBigVideo(): void;
+    checkBigVideo: import("lodash-es").DebouncedFunc<() => void>;
     /**
      * 播放黑窗处理，主要是做一个容错处理，又可能这股流拉下来或者存在订阅就出现问题的情况
      * 播放时黑窗的，这个时候需要，检测，然后重新拉流

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

@@ -20,12 +20,12 @@ import { SingleLocalStream, SingleRemoteStream, SingleStream } from "../type";
 import BMRoom from "../BMRoom/BMRoom";
 import { BehaviorSubject, Subject } from "rxjs";
 import { BoomError } from "@hysc/utils";
-import { Device } from "@hysc/core/esm/BoomAdapter/type/value";
+import type { Device } from "@hysc/brtc";
 import BMSpeaker from "./BMSpeaker";
-import { ShareMediaOptions } from "@hysc/core/esm/BoomCore/BCClient/BCClient";
+import { ShareMediaOptions } from "@hysc/core";
 import { getHTMLMediaStreamOptions, getMediaStreamInfo, Result } from "./getHTMLMediaStreamOptions";
 import { BloudStream } from "@hysc/core";
-import type { StreamCustomInfo } from '@hysc/bloud';
+import type { StreamCustomInfo } from '@hysc/bloud/src/core/Room';
 import { BloudStreamEventState } from "../handleEvent/attachEvents";
 export declare function transShareScreen2User(userId: string): string;
 export default class BMStreamModelVM {
@@ -152,8 +152,9 @@ export default class BMStreamModelVM {
     /**
      * 切换扬声器
      * @param device
+     * @param force 是否需要强制更新
      */
-    changeSpeaker(device: Device): Promise<void>;
+    changeSpeaker(device: Device, force?: boolean): Promise<void>;
     /**
      * 设置单个流的扬声器
      * @param streamModel
@@ -190,17 +191,6 @@ export default class BMStreamModelVM {
      * @private
      */
     private muteOrUnpublishStream;
-    /**
-     * 是否开启屏幕共享
-     * @param enable
-     * @param opts 开启屏幕共享参数
-     * @param customShare
-     * @param opts.audio 是否开启音频
-     * @param opts.source_name Electron 下窗口名称
-     * @param opts.width 共享屏幕宽度
-     * @param opts.height 共享屏幕高度
-     * @param opts.contentHint 视频的contentHint 可选值： '' | 'motion' | 'detail' | 'text'
-     */
     toggleShareScreen(enable: boolean, opts: any, customShare?: Result): Promise<boolean>;
     setShareScreenContentHint(contentHint: '' | 'motion' | 'detail' | 'text'): void;
     updateModelSort: import("lodash-es").DebouncedFunc<() => void>;

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

@@ -1,6 +1,6 @@
 import BMStreamModel from '../BMStream/BMStreamModel';
 import { BehaviorSubject } from 'rxjs';
-import BCUser from '@hysc/core/esm/BoomAdapter/User/User';
+import { BCUser } from "@hysc/core";
 import BMRoom from '../BMRoom/BMRoom';
 export declare type Operation = 'none' | 'getMaster' | 'getManager' | 'removeMaster' | 'getGuest' | 'removeGuest' | 'removeManager' | 'changeNickName' | 'speakerEnable' | 'changeShare' | 'updateUser' | 'raiseHandsVideo' | 'raiseHandsAudio' | 'audienceEnableSpeaking' | 'inBackground' | 'raiseHand';
 interface IUserActionWatcher {

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

@@ -1,6 +1,6 @@
-import BoomCore from '@hysc/core/esm';
+import BCClient from '@hysc/core';
 import BMUser from "./BMUser";
-import BCUser from '@hysc/core/esm/BoomAdapter/User/User';
+import { BCUser } from "@hysc/core";
 import BMRoom from '../BMRoom/BMRoom';
 import { BehaviorSubject } from "rxjs";
 import { UpdateMasterType } from '../type';
@@ -27,7 +27,7 @@ export default class BMUserVM {
     audiencesList: Map<string, BMUser>;
     signalList: Map<string, BMUser>;
     commonUserList: Map<string, BMUser>;
-    boomCore: BoomCore;
+    boomCore: BCClient;
     room: BMRoom;
     userListWatcher: BehaviorSubject<BMUser[]>;
     audiencesListWatcher: BehaviorSubject<BMUser[]>;
@@ -37,7 +37,7 @@ export default class BMUserVM {
     getForceUserWatcher: BehaviorSubject<boolean>;
     localUser: BMUser;
     commTimer: number;
-    constructor(boomCore: BoomCore, localUser: BMUser, room: BMRoom);
+    constructor(boomCore: BCClient, localUser: BMUser, room: BMRoom);
     handleUserRoleChange(info: ChangeIsGuest): Promise<void>;
     /**
      * 添加用户, 并返回已添加的用户对象

package/esm/src/audioPlay/AudioPlay.d.ts

@@ -24,7 +24,7 @@ export default class AudioPlay {
     play(stream: SingleRemoteStream): Promise<void>;
     mute(mute: boolean): void;
     setVolume(streamId: string, volume: number): void;
-    setDevice(deviceId: string): void;
+    setDevice(deviceId: string, force?: boolean): Promise<void>;
     addPlayerEvent(player: AudioPlayer): void;
     clear(): void;
     destroy(): void;

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

@@ -4,8 +4,7 @@ import BMRoom from '../BMRoom/BMRoom';
 import BMUserVM from "../BMUser/BMUserVM";
 import BMChatVM from '../BMChat/BMChatVM';
 import { BehaviorSubject } from 'rxjs';
-import { BCEvent } from "@hysc/core/src/BoomCore/BCClient/clientEventType";
-import type { StreamCustomInfo } from '@hysc/bloud';
+import type { StreamCustomInfo } from '@hysc/bloud/src/core/Room';
 /**
  * 收到消息信令的集合
  */
@@ -43,6 +42,6 @@ export interface BloudUnPubEvent {
     isScreen: boolean;
 }
 export declare type Observes = {
-    [K in BCEvent]: BehaviorSubject<any>;
+    [k: string]: BehaviorSubject<any>;
 };
 export declare function attachEvents(boomCore: BoomCore, userVM: BMUserVM, bmStreamVm: BMStreamModelVM, chatVM: BMChatVM, bmRoom: BMRoom): Observes;

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

@@ -11,7 +11,7 @@ import BMStreamModelVM from "../BMStream/BMStreamModelVM";
 import BCClient from "@hysc/core";
 import BMChatVM from "../BMChat/BMChatVM";
 import BoomCore from "@hysc/core";
-import BCUser from "@hysc/core/esm/BoomAdapter/User/User";
+import { BCUser } from "@hysc/core";
 import BMUser from "../BMUser/BMUser";
 export declare function handleParticipantJoin(data: any, userVM: BMUserVM, bmStreamVm: BMStreamModelVM, boomCore: BoomCore, chatVM: BMChatVM, observes: any): void;
 export declare function handleLeaveUsers(data: any, userVM: BMUserVM, bmRoom: BMRoom, observes: any, bmStreamVm: BMStreamModelVM, boomCore: BCClient, chatVM: BMChatVM): void;
@@ -20,5 +20,5 @@ export declare function handleChangeMaster(data: any, userVM: BMUserVM, bmRoom:
 export declare function handleEvict(data: any, userVM: BMUserVM, bmStreamVm: BMStreamModelVM, bmRoom: BMRoom, observes: any): void;
 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: import("lodash-es").DebouncedFunc<(observes: any, eventsList: any, data: any) => void>;
+export declare const handleUserRejoined: import("lodash-es").DebouncedFunc<(observes: any, data: any) => void>;
 export declare function handleMoveUserRoom(bmRoom: BMRoom, userVM: BMUserVM, data: any, observes: any): Promise<void>;

package/esm/src/index.d.ts

@@ -1,2 +1,4 @@
-import BoomMeetingSDK from './BMRoom/BMRoom';
-export default BoomMeetingSDK;
+import BoomMeetingSDK from './BMRoom/BMRoom';
+import { Logger } from "@hysc/utils";
+export default BoomMeetingSDK;
+export { Logger };

package/esm/src/type/stream.d.ts

@@ -5,10 +5,7 @@
  * @description：stream
  * @update: 2022-04-25 13:42
  */
-import LocalStream from '@hysc/core/esm/BoomAdapter/singleMode/stream/LocalStream';
-import RemoteStream from '@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream';
-import { StreamDeviceOption } from '@hysc/core/esm/BoomAdapter/type/BRTCStream';
-export { SubscribeOptions } from '@hysc/core/esm/BoomAdapter/type/BRTCClient';
+import { LocalStream, RemoteStream, StreamDeviceOption } from '@hysc/brtc';
 export declare type SingleLocalStream = LocalStream;
 export declare type SingleRemoteStream = RemoteStream;
 export declare type SingleStream = SingleLocalStream | SingleRemoteStream;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@hysc/meeting",
-  "version": "5.0.115",
+  "version": "5.0.117",
   "description": "boom meeting",
   "main": "umd/index.js",
   "module": "esm/index.js",
-  "types": "esm/index.d.ts",
+  "types": "esm/src/index.d.ts",
   "private": false,
   "keywords": [],
   "files": [
@@ -19,16 +19,17 @@
     "@hysc/p-queue": "6.3.0",
     "rxjs": "^7.5.5",
     "typescript": "^4.6.3",
-    "@hysc/bloud": "1.0.113",
-    "@hysc/core": "5.0.113",
+    "@hysc/bloud": "1.0.114",
+    "@hysc/core": "0.0.0",
     "@hysc/logger": "1.0.0",
-    "@hysc/utils": "1.2.4"
+    "@hysc/utils": "0.0.0"
   },
   "peerDependencies": {
-    "@hysc/core": "5.0.113"
+    "@hysc/core": "0.0.0"
   },
   "devDependencies": {
-    "@types/lodash-es": "^4.17.6"
+    "@types/lodash-es": "^4.17.6",
+    "@hysc/brtc": "0.0.0"
   },
   "scripts": {
     "dev": "tsc --watch",

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

@@ -20,6 +20,7 @@ interface MediaPermission {
     camera: boolean;
     screen: boolean;
 }
+export declare type VoiceMode = 'speech' | 'speech-recognition' | 'music' | '';
 export declare let _selfSortType: number;
 export declare let autoPlayAudio: boolean;
 export default class BMRoom {
@@ -78,6 +79,8 @@ export default class BMRoom {
     mediaPermission: MediaPermission;
     videoProfile: VideoProfile;
     audioProfile: AudioProfileInfo | null;
+    voiceMode: string;
+    setVoiceMode(mode: VoiceMode): void;
     /**
      * brtc断网重连要给端上事件响应，所有端上把流单独做处理的，需要在收到这个事件之后，重新处理所有的effect
      */

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

@@ -283,7 +283,7 @@ export default class BMStreamModel {
     collectAudioLevel: () => void;
     private handleAudioLevel;
     checkSmallVideo(): void;
-    checkBigVideo(): void;
+    checkBigVideo: any;
     /**
      * 播放黑窗处理，主要是做一个容错处理，又可能这股流拉下来或者存在订阅就出现问题的情况
      * 播放时黑窗的，这个时候需要，检测，然后重新拉流

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

@@ -190,17 +190,6 @@ export default class BMStreamModelVM {
      * @private
      */
     private muteOrUnpublishStream;
-    /**
-     * 是否开启屏幕共享
-     * @param enable
-     * @param opts 开启屏幕共享参数
-     * @param customShare
-     * @param opts.audio 是否开启音频
-     * @param opts.source_name Electron 下窗口名称
-     * @param opts.width 共享屏幕宽度
-     * @param opts.height 共享屏幕高度
-     * @param opts.contentHint 视频的contentHint 可选值： '' | 'motion' | 'detail' | 'text'
-     */
     toggleShareScreen(enable: boolean, opts: any, customShare?: Result): Promise<boolean>;
     setShareScreenContentHint(contentHint: '' | 'motion' | 'detail' | 'text'): void;
     updateModelSort: any;