@hysc/meeting 5.0.27 → 5.0.29

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

@@ -11,6 +11,7 @@ import BMStreamModel, { ConnectErrorMessage } from '../BMStream/BMStreamModel';
 import BMUser from '../BMUser/BMUser';
 import BMLiveVM from './BMLiveVM';
 import SingletonQueue, { PullItem } from "../SingletonQueue/SingletonQueue";
+import AudioPlay from "../audioPlay/AudioPlay";
 interface BMRoomProps {
     initDevices: boolean;
 }
@@ -99,6 +100,7 @@ export default class BMRoom {
         brtc: boolean;
     };
     brtcNetEnableWatcher: Subject<boolean>;
+    audioPlayer: AudioPlay;
     get isSingleColumns(): boolean;
     /**
      * 传递信息用的，主要是用于message信令往上层业务发送消息
@@ -110,6 +112,7 @@ export default class BMRoom {
     isInWaitRoom: boolean;
     constructor({ initDevices }?: BMRoomProps);
     handleReprocessStreamError: () => void;
+    initAudioPlayer(playerContainerId: string): void;
     /**
      * 初始化底层会控相关
      * @param options

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

@@ -141,8 +141,10 @@ export default class BMStreamModel {
     /**
      * 更新bloud的stream，设置流状态
      * @param streamState
+     * @param bmStreamVM
+     * @param forceSearch
      */
-    updateBloudStream(streamState: BloudStreamState | undefined, bmStreamVM: BMStreamModelVM): void;
+    updateBloudStream(streamState: BloudStreamState | undefined, bmStreamVM: BMStreamModelVM, forceSearch?: boolean): void;
     private onPlayerStateChange;
     handleStreamConnectError: () => void;
     /**

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

@@ -36,8 +36,12 @@ export default class BMStreamModelVM {
     localModel: BMStreamModel | null;
     room: BMRoom | null;
     bloudStream: any;
-    audioStream: SingleLocalStream | undefined;
     brtcStream: SingleLocalStream | undefined;
+    /**
+     * 后面打开摄像头存储的流，主要是关闭摄像头的时候得把它清除掉
+     */
+    videoStream: SingleLocalStream | null;
+    audioStream: SingleLocalStream | null;
     /**
      * 本地是否在屏幕共享
      */
@@ -50,10 +54,6 @@ export default class BMStreamModelVM {
      */
     mixStreamModelWatcher: BehaviorSubject<BMStreamModel | null>;
     canvasTimer: NodeJS.Timeout | null;
-    /**
-     * 后面打开摄像头存储的流，主要是关闭摄像头的时候得把它清除掉
-     */
-    videoStream: SingleLocalStream | null;
     private _recorder;
     private _isRecording;
     private _slicingRecord;

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

@@ -6,9 +6,17 @@
  * @update: 2023-06-08 16:35
  */
 import { SingleStream } from "../type";
+import { AudioPlayer } from '@hysc/core';
 export default class AudioPlay {
     playMap: WeakSet<SingleStream>;
-    audioCtx: AudioContext;
+    playerMap: Map<string, AudioPlayer>;
+    container: HTMLDivElement | undefined;
+    muted: boolean;
+    constructor(containerId: string);
     addStream(stream: SingleStream): void;
-    play(stream: SingleStream): void;
+    removeStream(stream: SingleStream): void;
+    play(stream: SingleStream): Promise<void>;
+    mute(mute: boolean): void;
+    setVolume(streamId: string, volume: number): void;
+    setDevice(deviceId: string): void;
 }

package/esm/src/constants.d.ts

@@ -113,3 +113,4 @@ 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";
+export declare const SET_VOLUME = "set-volume";

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

@@ -17,7 +17,7 @@ export declare function handleBloudReconnectStreamEvent(bmStreamVm: BMStreamMode
 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;
-export declare function handleBloudStreamPubAUpdate(data: BloudStreamEventState, bmStreamVm: BMStreamModelVM): void;
+export declare function handleBloudStreamPubAUpdate(data: BloudStreamEventState, bmStreamVm: BMStreamModelVM, isPublish?: boolean): 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/src/util/emitter.d.ts

@@ -1,5 +1,5 @@
 import { ConnectErrorMessage, NoPlayerContainer, SubscribeMessage } from "../BMStream/BMStreamModel";
-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 { 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, SET_VOLUME, UNSUBSCRIBE_STREAM, USER_SORT_NUM_CHANGE } from "../constants";
 import { RaiseHandInfo } from "../BMUser/BMUser";
 import { ChangeIsGuest } from "../BMUser/BMUserVM";
 import { PullItem } from "../SingletonQueue/SingletonQueue";
@@ -7,6 +7,10 @@ export declare type UserSortType = {
     isCommon: boolean;
     shouldDelay: boolean;
 };
+export declare type VolumeInfo = {
+    streamId: string;
+    volume: number;
+};
 declare type Events = {
     [RECEIVE_SUBSCRIBE_MESSAGE]: SubscribeMessage;
     [USER_SORT_NUM_CHANGE]: UserSortType;
@@ -20,6 +24,7 @@ declare type Events = {
     [NO_CONTAINER]: NoPlayerContainer;
     [MODEL_SORT_NUM_CHANGE]: null;
     [ADD_PULL_USER]: PullItem;
+    [SET_VOLUME]: VolumeInfo;
 };
 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.27",
+  "version": "5.0.29",
   "description": "boom meeting",
   "main": "umd/index.js",
   "module": "esm/index.js",
@@ -14,7 +14,7 @@
   "author": "yangliye",
   "license": "MIT",
   "dependencies": {
-    "@hysc/core": "5.0.25",
+    "@hysc/core": "5.0.27",
     "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.25"
+    "@hysc/core": "5.0.27"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.6"

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

@@ -141,8 +141,10 @@ export default class BMStreamModel {
     /**
      * 更新bloud的stream，设置流状态
      * @param streamState
+     * @param bmStreamVM
+     * @param forceSearch
      */
-    updateBloudStream(streamState: BloudStreamState | undefined, bmStreamVM: BMStreamModelVM): void;
+    updateBloudStream(streamState: BloudStreamState | undefined, bmStreamVM: BMStreamModelVM, forceSearch?: boolean): void;
     private onPlayerStateChange;
     handleStreamConnectError: () => void;
     /**

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

@@ -36,8 +36,12 @@ export default class BMStreamModelVM {
     localModel: BMStreamModel | null;
     room: BMRoom | null;
     bloudStream: any;
-    audioStream: SingleLocalStream | undefined;
     brtcStream: SingleLocalStream | undefined;
+    /**
+     * 后面打开摄像头存储的流，主要是关闭摄像头的时候得把它清除掉
+     */
+    videoStream: SingleLocalStream | null;
+    audioStream: SingleLocalStream | null;
     /**
      * 本地是否在屏幕共享
      */
@@ -50,10 +54,6 @@ export default class BMStreamModelVM {
      */
     mixStreamModelWatcher: BehaviorSubject<BMStreamModel | null>;
     canvasTimer: NodeJS.Timeout | null;
-    /**
-     * 后面打开摄像头存储的流，主要是关闭摄像头的时候得把它清除掉
-     */
-    videoStream: SingleLocalStream | null;
     private _recorder;
     private _isRecording;
     private _slicingRecord;

package/umd/boom-meeting/src/audioPlay/AudioPlay.d.ts

@@ -6,9 +6,17 @@
  * @update: 2023-06-08 16:35
  */
 import { SingleStream } from "../type";
+import { AudioPlayer } from '@hysc/core';
 export default class AudioPlay {
     playMap: WeakSet<SingleStream>;
-    audioCtx: AudioContext;
+    playerMap: Map<string, AudioPlayer>;
+    container: HTMLDivElement | undefined;
+    muted: boolean;
+    constructor(containerId: string);
     addStream(stream: SingleStream): void;
-    play(stream: SingleStream): void;
+    removeStream(stream: SingleStream): void;
+    play(stream: SingleStream): Promise<void>;
+    mute(mute: boolean): void;
+    setVolume(streamId: string, volume: number): void;
+    setDevice(deviceId: string): void;
 }

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

@@ -113,3 +113,4 @@ 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";
+export declare const SET_VOLUME = "set-volume";

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

@@ -17,7 +17,7 @@ export declare function handleBloudReconnectStreamEvent(bmStreamVm: BMStreamMode
 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 handleBloudStreamPubAUpdate(data: BloudStreamEventState, bmStreamVm: BMStreamModelVM, isPublish?: boolean): 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/umd/boom-meeting/src/util/emitter.d.ts

@@ -1,5 +1,5 @@
 import { ConnectErrorMessage, NoPlayerContainer, SubscribeMessage } from "../BMStream/BMStreamModel";
-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 { 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, SET_VOLUME, UNSUBSCRIBE_STREAM, USER_SORT_NUM_CHANGE } from "../constants";
 import { RaiseHandInfo } from "../BMUser/BMUser";
 import { ChangeIsGuest } from "../BMUser/BMUserVM";
 import { PullItem } from "../SingletonQueue/SingletonQueue";
@@ -7,6 +7,10 @@ export declare type UserSortType = {
     isCommon: boolean;
     shouldDelay: boolean;
 };
+export declare type VolumeInfo = {
+    streamId: string;
+    volume: number;
+};
 declare type Events = {
     [RECEIVE_SUBSCRIBE_MESSAGE]: SubscribeMessage;
     [USER_SORT_NUM_CHANGE]: UserSortType;
@@ -20,6 +24,7 @@ declare type Events = {
     [NO_CONTAINER]: NoPlayerContainer;
     [MODEL_SORT_NUM_CHANGE]: null;
     [ADD_PULL_USER]: PullItem;
+    [SET_VOLUME]: VolumeInfo;
 };
 export declare const emitter: import("mitt").Emitter<Events>;
 export declare const removeEmitter: () => void;