@hysc/meeting 3.6.33 → 4.0.2

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

@@ -0,0 +1,45 @@
+import { MsaterRes, ProbeServerRes, SigRes } from '../type/type';
+/**
+ * 设置请求环境
+ *
+ * @internal
+ * @param e 环境
+ */
+export declare function setRequestEnv(e: string): void;
+export declare function getURL(path: string): string;
+export declare function getTokenAuthUrl(): string;
+/**
+ * 发送 post 请求
+ *
+ * @internal
+ * @param path fetch 路径
+ * @param data post 发送 data
+ * @returns 返回数据
+ */
+export declare function post(path: string, data: Object): Promise<any>;
+/**
+ * 发送 get 请求
+ *
+ * @internal
+ * @param path fetch 路径
+ * @param data get 发送 data
+ * @returns 返回数据
+ */
+export declare function get(path: string, data: Object): Promise<any>;
+/**
+ * 获取 token
+ *
+ * @internal
+ * @param sign
+ * @returns 返回数据
+ */
+export declare function checkSign(sign: string, roomId: string, userId: number): Promise<SigRes>;
+/**
+ * 获取 Proxies
+ *
+ * @internal
+ * @param MasterRes
+ * @returns 返回数据
+ */
+export declare function fetchMaster(master: string): Promise<MsaterRes>;
+export declare function fetchProbeServers(): Promise<ProbeServerRes>;

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

@@ -0,0 +1,9 @@
+import { SingleRemoteStream } from "../type";
+/**
+ * @name: roomUtils
+ * @author: yangliye
+ * @date: 2022-12-06 09:31
+ * @description：roomUtils
+ * @update: 2022-12-06 09:31
+ */
+export declare function isShareStream(remoteStream: SingleRemoteStream): boolean;

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

@@ -0,0 +1,10 @@
+/**
+ * @name: sortUtils
+ * @author: yangliye
+ * @date: 2023-02-22 18:17
+ * @description：sortUtils
+ * @update: 2023-02-22 18:17
+ */
+import BMUser from "../BMUser/BMUser";
+import { MODEL_SORT_ENUM_STAND, MODEL_SORT_ENUM_ZY } from "../constants";
+export declare function getSortNum(user: BMUser): MODEL_SORT_ENUM_ZY | MODEL_SORT_ENUM_STAND;

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

@@ -0,0 +1,77 @@
+import BMUser from '../BMUser/BMUser';
+import BMStreamModel from '../BMStream/BMStreamModel';
+export declare const notGetTalkInterval: number;
+/**
+ * 生成唯一 id
+ *
+ * @internal
+ * @returns id
+ */
+export declare function generateUUID(): string;
+/**
+ * 将函数回调转换为 Promise
+ *
+ * @internal
+ * @typeParam T 回调结果类型
+ * @typeParam This 函数执行上下文
+ * @param fn 回调函数
+ * @param args 函数执行参数
+ * @param ctx 函数执行上下文
+ * @param hasResolve 是否有成功回调
+ * @returns 回调结果
+ */
+export declare function callbackToPromise<T, This>(fn: any, args: any[], ctx: any, hasResolve?: boolean): Promise<T | void>;
+/**
+ * 创建 AudioContext
+ *
+ * @internal
+ * @returns AudioContext
+ */
+export declare function getAudioContext(): AudioContext;
+/**
+ * 创建 AudioMeter
+ *
+ * @internal
+ * @param audioContext
+ * @param clipLevel
+ * @param averaging
+ * @param clipLag
+ * @returns ScriptProcessorNode
+ */
+export declare function createAudioMeter(audioContext: AudioContext, clipLevel?: number, averaging?: number, clipLag?: number): ScriptProcessorNode;
+/**
+ * 放置 AudioMeter
+ *
+ * @internal
+ * @param stream
+ * @param mediaStream
+ */
+export declare function createVolumeMeter(stream: any, audioTrack: MediaStreamTrack): void;
+/**
+ * 解析 vloud 流数据
+ *
+ * @internal
+ * @param streamDeviceOption
+ * @param streamCodecOption
+ * @returns 解析结果
+ */
+export declare function parseVloudStreamOptions(streamDeviceOption: any, streamCodecOption: any): Object;
+export declare function timestamp(): number;
+export declare function resumeContext(): Promise<void>;
+export declare function getEmptyVloudStats(): any;
+export declare function timestampMillisecond(diffNTP?: number): number;
+/**
+ * 处理时间戳
+ * @param {number} timeStamp
+ * @returns {string} 12:09
+ */
+export declare function handleTime(timeStamp: number): string;
+export declare function sortStreamModelsOrUser<T extends BMUser | BMStreamModel>(list: T[], reverse?: boolean): T[];
+/**
+ * 根据权限判断是不是普通参会者
+ * @param permission
+ */
+export declare function getIsCommonUser(permission: string): boolean;
+export declare function getIsManager(permission: string): boolean;
+export declare function getIsMaster(permission: string): boolean;
+export declare function getPermission(permission: string, p: string): boolean;

package/esm/type/customStats.d.ts

@@ -113,6 +113,5 @@ export interface CustomStats {
     forceOpenUserMic: boolean;
     forceOpenUserCamera: boolean;
     onlyOnePersonShare: number;
-    raiseHandEnable: number;
 }
 export declare type PartialCustomStats = Partial<CustomStats>;

package/esm/util/sortUtils.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @name: sortUtils
+ * @author: yangliye
+ * @date: 2023-02-22 18:17
+ * @description：sortUtils
+ * @update: 2023-02-22 18:17
+ */
+import BMUser from "../BMUser/BMUser";
+import { MODEL_SORT_ENUM_STAND, MODEL_SORT_ENUM_ZY } from "../constants";
+export declare function getSortNum(user: BMUser): MODEL_SORT_ENUM_ZY | MODEL_SORT_ENUM_STAND;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hysc/meeting",
-  "version": "3.6.33",
+  "version": "4.0.2",
   "description": "boom meeting",
   "main": "umd/index.js",
   "module": "esm/index.js",
@@ -14,7 +14,7 @@
   "author": "yangliye",
   "license": "MIT",
   "dependencies": {
-    "@hysc/core": "3.6.21",
+    "@hysc/core": "4.0.2",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "@hysc/p-queue": "6.3.0",
@@ -23,7 +23,7 @@
     "@hysc/utils": "1.2.0"
   },
   "peerDependencies": {
-    "@hysc/core": "3.6.21"
+    "@hysc/core": "4.0.2"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.6"

package/umd/BMChat/BMMessageInfo.d.ts

@@ -9,6 +9,8 @@ interface IMessageInfo {
     isMeetingNotice?: boolean;
     to?: string | undefined;
     isDanger?: boolean;
+    seq?: number;
+    failed?: boolean;
 }
 export default class BMMessageInfo {
     userId?: any;
@@ -22,6 +24,8 @@ export default class BMMessageInfo {
     isMeetingNotice: boolean;
     to: string | undefined;
     isDanger: boolean | undefined;
+    seq: number | undefined;
+    failed: boolean | undefined;
     constructor(props: IMessageInfo);
 }
 export {};

package/umd/BMRoom/BMRoom.d.ts

@@ -1,4 +1,5 @@
 import BoomCore from '@hysc/core';
+import { MessageType } from './attachEvents';
 import BMRoomVM, { AudioProfileInfo } from "./BMRoomVM";
 import BMUserVM from '../BMUser/BMUserVM';
 import { SingleLocalStream, SingleRemoteStream, SingleRemoteStreamOption, SubscribeOptions } from '../type';
@@ -13,6 +14,7 @@ import BMLiveVM from './BMLiveVM';
 interface BMRoomProps {
     initDevices: boolean;
 }
+export declare let _selfSortType: number;
 export default class BMRoom {
     roomVM: BMRoomVM | null;
     userVM: BMUserVM;
@@ -26,6 +28,15 @@ export default class BMRoom {
     selectVideoDevice: Device | null;
     selectAudioDevice: Device | null;
     selectAudioOutputDevice: Device | null;
+    /**
+     * 这个参数是和业务相关的功能，业务上的参会者列表是可以配置的，如果设置了只展示一列，那么所有的用户都要存储
+     * 在commonUserList中
+     */
+    userListColumns: number;
+    /**
+     * 排序规则 1 是标品排序， 2 是中移排序
+     */
+    sortType: number;
     /**
      * brtc断网重连的时候,所有的订阅和播放相关的处理,都不需要
      */
@@ -47,12 +58,12 @@ export default class BMRoom {
     videoDevicesWatcher: Subject<Device[]>;
     audioOutputDevicesWatcher: Subject<Device[]>;
     raiseHandleRespWatcher: Subject<{
-        raiseHandsType: 0 | 1 | 2 | 3;
+        raiseHandsType: 0 | 1 | 2;
         raiseHands: boolean;
     }>;
     enableAudienceSpeakingWatcher: Subject<boolean>;
     videoProfile: VideoProfile;
-    audioProfile: AudioProfileInfo | null;
+    private audioProfile;
     /**
      * brtc断网重连要给端上事件响应，所有端上把流单独做处理的，需要在收到这个事件之后，重新处理所有的effect
      */
@@ -68,7 +79,10 @@ export default class BMRoom {
     /**
      * 传递信息用的，主要是用于message信令往上层业务发送消息
      */
-    messageWatcher: BehaviorSubject<any>;
+    messageWatcher: BehaviorSubject<{
+        type: MessageType;
+        status: boolean;
+    }>;
     roomInfo: BMRoomInfo;
     localUser: BMUser;
     bmLiveVM: BMLiveVM;
@@ -89,6 +103,8 @@ export default class BMRoom {
      * @param profile 设置视频分辨率
      */
     setVideoProfile(profile: VideoProfile): void;
+    setUserListColumns(column: number): void;
+    setSortType(type: number): void;
     /**
      * 设置声音增益的属性，回音消除 音频降噪 声音增益等
      * @param audioProfile
@@ -212,9 +228,8 @@ export default class BMRoom {
      * 开关对端麦克风(现在还不知道怎么实现, 未找到实现逻辑)
      * @param status true:开,false:关
      * @param uid 用户id
-     * @param isNotCancelRootReport 当打开麦克风时, 是否不取消音频权限申请
      */
-    setRemoteAudioEnable(status: boolean, uid: string, isNotCancelRootReport: boolean | undefined): Promise<void>;
+    setRemoteAudioEnable(status: boolean, uid: string): Promise<void>;
     /**
      * 开关本地摄像头
      * @param status true:开,false:关

package/umd/BMRoom/BMRoomInfo.d.ts

@@ -77,10 +77,6 @@ interface OperationCustomStats {
      * 是否允许开启虚拟背景 0全员 1嘉宾 2主持人
      */
     backgroundAIEnable: 0 | 1 | 2;
-    /**
-     * 是否允许举手 0禁止全员 1允许嘉宾 2全员可举手
-     */
-    raiseHandEnable: 0 | 1 | 2;
 }
 export default class BMRoomInfo {
     private room;
@@ -135,11 +131,6 @@ export default class BMRoomInfo {
      */
     private raiseVideoHandsList;
     raiseVideoHandsWatcher: BehaviorSubject<BMUser[]>;
-    /**
-    * 所有的举手的人员
-    */
-    private raiseSimpleHandsList;
-    raiseSimpleHandsWatcher: BehaviorSubject<BMUser[]>;
     operationPermission: OperationCustomStats | undefined;
     operationPermissionWatcher: Subject<OperationCustomStats>;
     chatNoticeWatcher: Subject<unknown>;
@@ -183,27 +174,16 @@ export default class BMRoomInfo {
      */
     removeRaiseHandUser(user: BMUser): void;
     /**
-     * 视频申请处理
+     * 视频举手处理
      * @param user
      */
     addVideoRaiseHandUser(user: BMUser): void;
     /**
-     * 取消视频申请处理
+     * 取消视频举手处理
      * @param user
      */
     removeVideoRaiseHandUser(user: BMUser): void;
-    /**
-     * 举手处理
-     * @param user
-     */
-    addSimpleRaiseHandUser(user: BMUser): void;
-    /**
-     * 取消举手处理
-     * @param user
-     */
-    removeSimpleRaiseHandUser(user: BMUser): void;
     private setRaiseHandsWatcherValue;
     private setVideoRaiseHandsWatcherValue;
-    private setSimpleRaiseHandsWatcherValue;
 }
 export {};

package/umd/BMRoom/BMRoomVM.d.ts

@@ -59,10 +59,6 @@ export interface AudioProfileInfo {
      * 调整扬声器音量 0 - 100
      */
     speakerVolume?: number;
-    /**
-     * 调整麦克风音量 0 - 100
-     */
-    microVolume?: number;
 }
 export default class BMRoomVM {
     roomInfo: BMRoomInfo;
@@ -109,9 +105,8 @@ export default class BMRoomVM {
      * 开关对端麦克风-信令发送
      * @param status true:开,false:关
      * @param uid 用户id
-     * @param isNotCancelRootReport 当打开麦克风时, 是否不取消音频权限申请
      */
-    setRemoteAudioEnable(status: boolean, uid: string, isNotCancelRootReport: boolean | undefined): Promise<void>;
+    setRemoteAudioEnable(status: boolean, uid: string): Promise<void>;
     /**
      * 开关对端摄像头-信令发送
      * @param status true:开,false:关
@@ -134,15 +129,15 @@ export default class BMRoomVM {
      * @param type 视频还是音频举手 audio/video
      * @param raise 举手还是放下举手 true/false
      */
-    raiseHands(type: 'audio' | 'video' | 'raiseHand', raise: boolean): Promise<void>;
+    raiseHands(type: 'audio' | 'video', raise: boolean): Promise<void>;
     /**
      * 主持人处理举手操作
-     * @param raiseHandsType 0 音视频 1 音频 2 视频 3 单纯的举手
+     * @param raiseHandsType 0 音视频 1 音频 2 视频
      * @param raiseHands true 同意 false 拒绝
      * @param uid 指定的用户Id
      * @description 如果不指定用户ID就是广播处理所有的举手的人员
      */
-    handleRaiseHands(raiseHandsType: 0 | 1 | 2 | 3, raiseHands: boolean, uid?: string): Promise<undefined>;
+    handleRaiseHands(raiseHandsType: 0 | 1 | 2, raiseHands: boolean, uid?: string): Promise<undefined>;
     /**
      * 更新自定义属性 updateCustomStats
      * @param stats
@@ -219,11 +214,6 @@ export default class BMRoomVM {
     */
     recordEnable(enable: 0 | 1 | 2): Promise<void>;
     /**
-   * 是否全员可录制
-   * @param enable 0禁止全员举手 1嘉宾可举手 2全员可举手
-   */
-    raiseHandEnable(enable: 0 | 1 | 2): Promise<void>;
-    /**
     * 入会麦克风禁用
     * @param enable 0全员禁止使用 1嘉宾和学员不可使用 2不开启
     */
@@ -277,7 +267,7 @@ export default class BMRoomVM {
      * @param {boolean} status 设置是否成功
      * @param {string} userId
      */
-    resp2ChangeRemoteVideoProfile(status: boolean, userId: string, profile: string): Promise<any>;
+    resp2ChangeRemoteVideoProfile(status: boolean, userId: string): Promise<any>;
     /**
      * 调节远端的音频参数
      * @param {Object} profileInfo

package/umd/BMStream/BMStreamModel.d.ts

@@ -185,6 +185,14 @@ export default class BMStreamModel {
     sendMessage2Room: any;
     emitBindElement: any;
     emitBindBigElement: any;
+    /**
+     * 判断当前是不是正在小窗口播放
+     */
+    currentIsPlaying: () => boolean;
+    /**
+     * 判断当前是不是正在小窗口播放
+     */
+    currentBigIsPlaying: () => boolean | null | undefined;
     /**
      * 播放当前流
      */

package/umd/BMStream/BMStreamModelVM.d.ts

@@ -23,6 +23,7 @@ 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";
+export declare const pubFailedStreamMap: Map<string, import("@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
 /**
  * 全量的brtc流记录，把所有brtc用户推的流都做记录
  * stream-added 的时候添加
@@ -35,6 +36,7 @@ export declare const BRTCStreamMap: Map<string, import("@hysc/core/esm/BoomAdapt
 export declare const BRTCShareStreamMap: Map<string, import("@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
 export default class BMStreamModelVM {
     streamModels: Map<string, BMStreamModel>;
+    sendStreamModels: BMStreamModel[];
     /**
      * 因为投屏码用户进来以后，他是不在小窗口展示的，所以要把投屏的用户过滤掉给业务的展示
      */
@@ -106,7 +108,7 @@ export default class BMStreamModelVM {
      * @returns
      */
     remoteStreamUnpublished(stream: SingleRemoteStream): BMStreamModel | undefined;
-    sortStreamModels(): BMStreamModel[];
+    sortStreamModels(): void;
     updateStreamModel(streamModel: BMStreamModel, stream: SingleStream): void;
     updateShareStreamModel(streamModel: BMStreamModel, stream: SingleStream): void;
     /**

package/umd/BMUser/BMUser.d.ts

@@ -1,8 +1,8 @@
 import BMStreamModel from '../BMStream/BMStreamModel';
 import { BehaviorSubject } from 'rxjs';
 import BCUser from '@hysc/core/esm/BoomAdapter/User/User';
-import BMRoom from '../BMRoom/BMRoom';
-declare type Operation = 'none' | 'getMaster' | 'getManager' | 'removeMaster' | 'getGuest' | 'removeGuest' | 'removeManager' | 'changeNickName' | 'speakerEnable' | 'changeShare' | 'updateUser' | 'raiseHandsVideo' | 'raiseHandsAudio' | 'audienceEnableSpeaking' | 'inBackground' | 'raiseHand' | 'audienceEnableSpeaking';
+import BMRoom from "../BMRoom/BMRoom";
+declare type Operation = 'none' | 'getMaster' | 'getManager' | 'removeMaster' | 'getGuest' | 'removeGuest' | 'removeManager' | 'changeNickName' | 'speakerEnable' | 'changeShare' | 'updateUser' | 'raiseHandsVideo' | 'raiseHandsAudio' | 'audienceEnableSpeaking' | 'inBackground';
 interface IUserActionWatcher {
     operation: Operation;
     user: BMUser;
@@ -19,7 +19,7 @@ interface UserInfo {
     };
 }
 export interface RaiseHandInfo {
-    status: 'raiseHandsAudio' | 'raiseHandsVideo' | 'raiseHand';
+    status: 'raiseHandsAudio' | 'raiseHandsVideo';
     user: BMUser;
 }
 export default class BMUser {
@@ -57,7 +57,6 @@ export default class BMUser {
      * 'changeShare': 是否在屏幕共享
      * 'raiseHandsVideo': 是否视频举手
      * 'raiseHandsAudio': 是否音频举手
-     * 'raiseHand':单纯的举手
      * @property {BMUser} user
      */
     watcher: BehaviorSubject<IUserActionWatcher>;
@@ -70,7 +69,6 @@ export default class BMUser {
      */
     raiseVideoHands: boolean;
     raiseAudioHands: boolean;
-    raiseHand: boolean;
     isAudience: boolean;
     /**
      * 是不是普通参会者
@@ -87,6 +85,7 @@ export default class BMUser {
     constructor(user: any, isLocal?: boolean);
     setup(userId: string, userinfo: UserInfo, nickname: string): void;
     getMainStreamModel(): BMStreamModel | undefined;
+    get nickname(): string;
     getShareStreamModel(): BMStreamModel | undefined;
     /**
      * 获取用户麦克风开启状态
@@ -149,5 +148,6 @@ export default class BMUser {
      * 更新当前用户的排序
      */
     updateSortNum(): void;
+    setSortNum(sortNum: number): void;
 }
 export {};

package/umd/BMUser/BMUserVM.d.ts

@@ -96,7 +96,6 @@ export default class BMUserVM {
      * 获取我自己
      */
     getLocalUser(): BMUser;
-    updateSelf(bcUser: BCUser): void;
     updateUser(bmUser: BMUser, bcUser: BCUser): void;
     /**
      * bcUser变成BMUser
@@ -129,13 +128,4 @@ export default class BMUserVM {
     }>;
     getTotalUserNumber(): Promise<number>;
     clearUsers(): void;
-    /**
-   * 参会者列表搜索(嘉宾及以上才能搜索)
-   * @param searchTxt 搜索文本
-   * @param pageSize 一页几个
-   */
-    searchUsers(searchTxt: string, pageSize: number): Promise<{
-        userList: BMUser[];
-        commonUserList: BMUser[];
-    }>;
 }

package/umd/bjy-common/function/getErrorMessage.d.ts

@@ -0,0 +1 @@
+export default function getErrorMessage(error: any): string;