@hysc/meeting 5.0.66 → 5.0.67

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

@@ -1,20 +1,25 @@
-import BoomCore from '@hysc/core';
+import BoomCore from "@hysc/core";
 import BMRoomVM, { AudioProfileInfo } from "./BMRoomVM";
-import BMUserVM from '../BMUser/BMUserVM';
-import { SingleLocalStream, SingleRemoteStream, SubscribeOptions } from '../type';
-import BMChatVM from '../BMChat/BMChatVM';
+import BMUserVM from "../BMUser/BMUserVM";
+import { SingleLocalStream, SingleRemoteStream, SubscribeOptions } from "../type";
+import BMChatVM from "../BMChat/BMChatVM";
 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, { ConnectErrorMessage } from '../BMStream/BMStreamModel';
-import BMUser from '../BMUser/BMUser';
-import BMLiveVM from './BMLiveVM';
+import { Device, VideoProfile } from "@hysc/core/esm/BoomAdapter/type/value";
+import BMRoomInfo from "./BMRoomInfo";
+import { BehaviorSubject, Subject } from "rxjs";
+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;
 }
+interface MediaPermission {
+    microphone: boolean;
+    camera: boolean;
+    screen: boolean;
+}
 export declare let _selfSortType: number;
 export declare let autoPlayAudio: boolean;
 export default class BMRoom {
@@ -70,6 +75,7 @@ export default class BMRoom {
         raiseHands: boolean;
     }>;
     enableAudienceSpeakingWatcher: Subject<boolean>;
+    mediaPermission: MediaPermission;
     videoProfile: VideoProfile;
     audioProfile: AudioProfileInfo | null;
     /**
@@ -119,6 +125,7 @@ export default class BMRoom {
      * @param value
      */
     setAutoPlayAudio(value: boolean): void;
+    setMediaPermission(permission: MediaPermission): void;
     /**
      * 是否应该播放声音
      * @param value
@@ -297,7 +304,7 @@ export default class BMRoom {
         audio: boolean;
         videoSource?: MediaStreamTrack | undefined;
         audioSource?: MediaStreamTrack | undefined;
-    } | undefined, sid: string): Promise<any>;
+    } | undefined, sid: string): Promise<SingleLocalStream>;
     /**
      * 这个方法只是为了生成brtc的流，目的是在用户只打开音频的情况下，然后在打开视频的时候，去创建一个只有视频的track的流
      * @param options
@@ -358,7 +365,7 @@ export default class BMRoom {
      * @param stream 创建的本地流对象
      * @return
      */
-    publish(stream: SingleLocalStream): Promise<any>;
+    publish(stream: SingleLocalStream): Promise<unknown>;
     /**
      * 取消发布本地流。
      * 取消发布本地流后远端会收到 'participant-unpublished' 事件通知。
@@ -548,6 +555,8 @@ export default class BMRoom {
     /**
      * 发送聊天室消息
      * @param msg
+     * @param userId
+     * @param lostNet
      */
     sendChatMessage(msg: string, userId: string | undefined, lostNet: boolean): Promise<any>;
     /**
@@ -627,7 +636,6 @@ export default class BMRoom {
     /**
      * 处理流出现connect-error的逻辑，本地流需要重新推流，远端流需要重新拉流
      * @param event
-     * @param failed
      */
     private handleStreamConnectError;
     /**

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

@@ -15,15 +15,16 @@
  */
 /// <reference types="node" />
 import BMStreamModel, { NoPlayerContainer } from "./BMStreamModel";
-import BMUser from '../BMUser/BMUser';
-import { SingleLocalStream, SingleRemoteStream, SingleStream } from '../type';
-import BMRoom from '../BMRoom/BMRoom';
-import { BehaviorSubject, Subject } from 'rxjs';
-import { Device } from '@hysc/core/esm/BoomAdapter/type/value';
-import BMSpeaker from './BMSpeaker';
+import BMUser from "../BMUser/BMUser";
+import { SingleLocalStream, SingleRemoteStream, SingleStream } from "../type";
+import BMRoom from "../BMRoom/BMRoom";
+import { BehaviorSubject, Subject } from "rxjs";
+import BoomError from "../error/RTCError";
+import { Device } from "@hysc/core/esm/BoomAdapter/type/value";
+import BMSpeaker from "./BMSpeaker";
 import { ShareMediaOptions } from "@hysc/core/esm/BoomCore/BCClient/BCClient";
-import { getHTMLMediaStreamOptions, Result, getMediaStreamInfo } from "./getHTMLMediaStreamOptions";
-import { BloudStream } from '@hysc/core';
+import { getHTMLMediaStreamOptions, getMediaStreamInfo, Result } from "./getHTMLMediaStreamOptions";
+import { BloudStream } from "@hysc/core";
 export declare function transShareScreen2User(userId: string): string;
 export default class BMStreamModelVM {
     streamModels: Map<string, BMStreamModel>;
@@ -73,6 +74,13 @@ export default class BMStreamModelVM {
      * 窗口没有大窗口播放容器的错误处理
      */
     noBigContainerWatcher: Subject<BMStreamModel>;
+    localStreamConnectErrorWatcher: Subject<BoomError>;
+    /**
+     * 共享屏幕相关错误
+     * 包括，共享客户端错误
+     * 共享屏幕流错误
+     */
+    localShareError: Subject<BoomError>;
     constructor();
     private static filterStreamModels;
     initWithRoom(room: BMRoom): this;
@@ -161,7 +169,7 @@ export default class BMStreamModelVM {
      * @private
      */
     private createStreamAndPublish;
-    publishBloudStream(audio: boolean, video: boolean): void;
+    publishBloudStream(audio: boolean, video: boolean): Promise<void>;
     muteHandler(type: 'video' | 'audio'): Promise<void>;
     unpublishStream(): Promise<void>;
     /**
@@ -184,7 +192,7 @@ export default class BMStreamModelVM {
      * @param opts.contentHint 视频的contentHint 可选值： '' | 'motion' | 'detail' | 'text'
      */
     toggleShareScreen(enable: boolean, opts: any, customShare?: Result): Promise<boolean>;
-    setShareScreenContentHint(contentHint: '' | 'motion' | 'detail' | 'text'): Promise<void>;
+    setShareScreenContentHint(contentHint: '' | 'motion' | 'detail' | 'text'): void;
     updateModelSort: import("lodash-es").DebouncedFunc<() => void>;
     handleNoContainer: (info: NoPlayerContainer) => void;
     /**

package/esm/utils/ErrorTypes.d.ts

@@ -97,3 +97,43 @@ export declare const BmUpdateCustomStatsError: (msg: string) => BoomError;
 export declare const BmChangeVideoProfileError: (msg: string) => BoomError;
 export declare const BmChangeAudioProfileError: (msg: string) => BoomError;
 export declare const BmCheckDeviceError: (msg: string) => BoomError;
+export declare enum StreamErrorMap {
+    createStream = 1302,
+    noCameraDevice = 1303,
+    noMicroDevice = 1304,
+    noSpeakerDevice = 1305,
+    openCamera = 1301,
+    cameraNotAuth = 1314,
+    cameraOccupy = 1315,
+    openMicro = 1302,
+    micNotAuth = 1317,
+    micOccupy = 1319,
+    streamDisconnected = 1320,
+    syncFail = 1321,
+    getStreamFail = 1322,
+    streamConnectError = 1323,
+    streamReconnectSuccess = 1324,
+    streamReconnectFailed = 1325,
+    shareStreamConnectError = 1326,
+    shareStreamConnectSuccess = 1327,
+    shareStreamConnectFailed = 1328
+}
+export declare const BMCreateStreamError: (message: string) => BoomError;
+export declare const getStreamError: (message: string) => BoomError;
+export declare const BMNoCameraError: () => BoomError;
+export declare const BMNoMicroError: () => BoomError;
+export declare const BMNoSpeakerError: () => BoomError;
+export declare const BMOpenCameraError: () => BoomError;
+export declare const BMCameraNotAuthError: () => BoomError;
+export declare const BMCameraOccupyError: () => BoomError;
+export declare const BMOpenMicroError: () => BoomError;
+export declare const BMMicNotAuthError: () => BoomError;
+export declare const BMMicOccupyError: () => BoomError;
+export declare const BMStreamDisconnectedError: (type: string) => BoomError;
+export declare const BmSyncStreamFailError: () => BoomError;
+export declare const BMStreamConnectError: () => BoomError;
+export declare const BMShareStreamConnectError: () => BoomError;
+export declare const BMStreamReconnectSuccess: (audio: boolean, video: boolean) => BoomError | undefined;
+export declare const BMShareStreamReconnectSuccess: () => BoomError;
+export declare const BMStreamReconnectFailed: () => BoomError;
+export declare const BMShareStreamReconnectFailed: () => BoomError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hysc/meeting",
-  "version": "5.0.66",
+  "version": "5.0.67",
   "description": "boom meeting",
   "main": "umd/index.js",
   "module": "esm/index.js",
@@ -14,17 +14,17 @@
   "author": "yangliye",
   "license": "MIT",
   "dependencies": {
-    "@hysc/core": "5.0.64",
+    "@hysc/core": "5.0.65",
     "@hysc/logger": "1.0.0",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "@hysc/p-queue": "6.3.0",
     "rxjs": "^7.5.5",
     "typescript": "^4.6.3",
-    "@hysc/utils": "1.2.3"
+    "@hysc/utils": "1.2.4"
   },
   "peerDependencies": {
-    "@hysc/core": "5.0.64"
+    "@hysc/core": "5.0.65"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.6"

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

@@ -1,20 +1,25 @@
-import BoomCore from '@hysc/core';
+import BoomCore from "@hysc/core";
 import BMRoomVM, { AudioProfileInfo } from "./BMRoomVM";
-import BMUserVM from '../BMUser/BMUserVM';
-import { SingleLocalStream, SingleRemoteStream, SubscribeOptions } from '../type';
-import BMChatVM from '../BMChat/BMChatVM';
+import BMUserVM from "../BMUser/BMUserVM";
+import { SingleLocalStream, SingleRemoteStream, SubscribeOptions } from "../type";
+import BMChatVM from "../BMChat/BMChatVM";
 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, { ConnectErrorMessage } from '../BMStream/BMStreamModel';
-import BMUser from '../BMUser/BMUser';
-import BMLiveVM from './BMLiveVM';
+import { Device, VideoProfile } from "@hysc/core/esm/BoomAdapter/type/value";
+import BMRoomInfo from "./BMRoomInfo";
+import { BehaviorSubject, Subject } from "rxjs";
+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;
 }
+interface MediaPermission {
+    microphone: boolean;
+    camera: boolean;
+    screen: boolean;
+}
 export declare let _selfSortType: number;
 export declare let autoPlayAudio: boolean;
 export default class BMRoom {
@@ -70,6 +75,7 @@ export default class BMRoom {
         raiseHands: boolean;
     }>;
     enableAudienceSpeakingWatcher: Subject<boolean>;
+    mediaPermission: MediaPermission;
     videoProfile: VideoProfile;
     audioProfile: AudioProfileInfo | null;
     /**
@@ -119,6 +125,7 @@ export default class BMRoom {
      * @param value
      */
     setAutoPlayAudio(value: boolean): void;
+    setMediaPermission(permission: MediaPermission): void;
     /**
      * 是否应该播放声音
      * @param value
@@ -297,7 +304,7 @@ export default class BMRoom {
         audio: boolean;
         videoSource?: MediaStreamTrack | undefined;
         audioSource?: MediaStreamTrack | undefined;
-    } | undefined, sid: string): Promise<any>;
+    } | undefined, sid: string): Promise<SingleLocalStream>;
     /**
      * 这个方法只是为了生成brtc的流，目的是在用户只打开音频的情况下，然后在打开视频的时候，去创建一个只有视频的track的流
      * @param options
@@ -358,7 +365,7 @@ export default class BMRoom {
      * @param stream 创建的本地流对象
      * @return
      */
-    publish(stream: SingleLocalStream): Promise<any>;
+    publish(stream: SingleLocalStream): Promise<unknown>;
     /**
      * 取消发布本地流。
      * 取消发布本地流后远端会收到 'participant-unpublished' 事件通知。
@@ -548,6 +555,8 @@ export default class BMRoom {
     /**
      * 发送聊天室消息
      * @param msg
+     * @param userId
+     * @param lostNet
      */
     sendChatMessage(msg: string, userId: string | undefined, lostNet: boolean): Promise<any>;
     /**
@@ -627,7 +636,6 @@ export default class BMRoom {
     /**
      * 处理流出现connect-error的逻辑，本地流需要重新推流，远端流需要重新拉流
      * @param event
-     * @param failed
      */
     private handleStreamConnectError;
     /**

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

@@ -15,15 +15,16 @@
  */
 /// <reference types="node" />
 import BMStreamModel, { NoPlayerContainer } from "./BMStreamModel";
-import BMUser from '../BMUser/BMUser';
-import { SingleLocalStream, SingleRemoteStream, SingleStream } from '../type';
-import BMRoom from '../BMRoom/BMRoom';
-import { BehaviorSubject, Subject } from 'rxjs';
-import { Device } from '@hysc/core/esm/BoomAdapter/type/value';
-import BMSpeaker from './BMSpeaker';
+import BMUser from "../BMUser/BMUser";
+import { SingleLocalStream, SingleRemoteStream, SingleStream } from "../type";
+import BMRoom from "../BMRoom/BMRoom";
+import { BehaviorSubject, Subject } from "rxjs";
+import BoomError from "../error/RTCError";
+import { Device } from "@hysc/core/esm/BoomAdapter/type/value";
+import BMSpeaker from "./BMSpeaker";
 import { ShareMediaOptions } from "@hysc/core/esm/BoomCore/BCClient/BCClient";
-import { getHTMLMediaStreamOptions, Result, getMediaStreamInfo } from "./getHTMLMediaStreamOptions";
-import { BloudStream } from '@hysc/core';
+import { getHTMLMediaStreamOptions, getMediaStreamInfo, Result } from "./getHTMLMediaStreamOptions";
+import { BloudStream } from "@hysc/core";
 export declare function transShareScreen2User(userId: string): string;
 export default class BMStreamModelVM {
     streamModels: Map<string, BMStreamModel>;
@@ -73,6 +74,13 @@ export default class BMStreamModelVM {
      * 窗口没有大窗口播放容器的错误处理
      */
     noBigContainerWatcher: Subject<BMStreamModel>;
+    localStreamConnectErrorWatcher: Subject<BoomError>;
+    /**
+     * 共享屏幕相关错误
+     * 包括，共享客户端错误
+     * 共享屏幕流错误
+     */
+    localShareError: Subject<BoomError>;
     constructor();
     private static filterStreamModels;
     initWithRoom(room: BMRoom): this;
@@ -161,7 +169,7 @@ export default class BMStreamModelVM {
      * @private
      */
     private createStreamAndPublish;
-    publishBloudStream(audio: boolean, video: boolean): void;
+    publishBloudStream(audio: boolean, video: boolean): Promise<void>;
     muteHandler(type: 'video' | 'audio'): Promise<void>;
     unpublishStream(): Promise<void>;
     /**
@@ -184,7 +192,7 @@ export default class BMStreamModelVM {
      * @param opts.contentHint 视频的contentHint 可选值： '' | 'motion' | 'detail' | 'text'
      */
     toggleShareScreen(enable: boolean, opts: any, customShare?: Result): Promise<boolean>;
-    setShareScreenContentHint(contentHint: '' | 'motion' | 'detail' | 'text'): Promise<void>;
+    setShareScreenContentHint(contentHint: '' | 'motion' | 'detail' | 'text'): void;
     updateModelSort: any;
     handleNoContainer: (info: NoPlayerContainer) => void;
     /**