@hysc/meeting 2.6.65 → 2.6.66

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

@@ -18,6 +18,11 @@ export interface ConnectErrorMessage {
     stream: BMStreamModel;
     isLocal: boolean;
 }
+export interface NoPlayerContainer {
+    type: 'share' | 'normal';
+    container: 'small' | 'big';
+    id: string;
+}
 export default class BMStreamModel {
     private user;
     private _stream;
@@ -233,7 +238,7 @@ export default class BMStreamModel {
      */
     updateUser(user: BMUser): void;
     updateSortNum(): void;
-    updateSort(): void;
+    updateSort(): STREAM_SORT_NUM;
     /**
    * 启动音频音量检测
    */

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

@@ -21,8 +21,9 @@ import BMRoom from '../BMRoom/BMRoom';
 import { BehaviorSubject, Subject } from 'rxjs';
 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 { ShareMediaOptions } from '@hysc/core/esm/BoomCore/BCClient/BCClient';
+import { getHTMLMediaStreamOptions, Result, getMediaStreamInfo } from './getHTMLMediaStreamOptions';
+import { NoPlayerContainer } from './BMStreamModel';
 export declare function transShareScreen2User(userId: string): string;
 export declare const pubFailedStreamMap: Map<string, import("@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
 /**
@@ -73,7 +74,12 @@ export default class BMStreamModelVM {
     private _speakerDetector;
     private _speakers;
     speakerWatcher: BehaviorSubject<BMUser | null>;
+    /** * 窗口没有播放容器的错误处理 */
+    noContainerWatcher: Subject<BMStreamModel>;
+    /** * 窗口没有大窗口播放容器的错误处理 */
+    noBigContainerWatcher: Subject<BMStreamModel>;
     constructor();
+    handleNoContainer: (info: NoPlayerContainer) => void;
     private static filterStreamModels;
     initWithRoom(room: BMRoom): this;
     /**
@@ -180,7 +186,8 @@ export default class BMStreamModelVM {
     /**
      * 排序变化之后的处理逻辑
      */
-    updateSort: any;
+    updateUserSort: any;
+    updateStreamSort: any;
     /**
      * 创建canvas，目的是为了捕获空track流，给brtc使用
      */

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

@@ -1,6 +1,7 @@
 import BMStreamModel from '../BMStream/BMStreamModel';
 import { BehaviorSubject } from 'rxjs';
 import BCUser from '@hysc/core/esm/BoomAdapter/User/User';
+import { MODEL_SORT_ENUM } from "../constants";
 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';
 interface IUserActionWatcher {
@@ -150,6 +151,6 @@ export default class BMUser {
      * 更新当前用户的排序
      */
     updateSortNum(): void;
-    updateSort(): void;
+    updateSort(): MODEL_SORT_ENUM;
 }
 export {};

package/esm/src/constants.d.ts

@@ -27,13 +27,13 @@ export declare enum MODEL_SORT_ENUM {
 }
 export declare enum STREAM_SORT_NUM {
     MASTER_AUDIO_VIDEO = 0,
-    MASTER_AUDIO = 1,
-    MASTER_VIDEO = 2,
-    MANAGER_AUDIO_VIDEO = 3,
+    MANAGER_AUDIO_VIDEO = 1,
+    AUDIO_VIDEO = 2,
+    MASTER_AUDIO = 3,
     MANAGER_AUDIO = 4,
-    MANAGER_VIDEO = 5,
-    AUDIO_VIDEO = 6,
-    AUDIO = 7,
+    AUDIO = 5,
+    MASTER_VIDEO = 6,
+    MANAGER_VIDEO = 7,
     VIDEO = 8,
     MASTER = 9,
     MANAGER = 10,
@@ -75,6 +75,7 @@ export declare const RECEIVE_SUBSCRIBE_MESSAGE = "sub-message";
  * 用户的排序改变
  */
 export declare const USER_SORT_NUM_CHANGE = "user-sort-num-change";
+export declare const STREAM_SORT_NUM_CHANGE = "stream-sort-num-change";
 /**
  * 收到业务端bindDom的事件信息，主要是处理播放逻辑的功能
  */
@@ -97,3 +98,4 @@ export declare const UNSUBSCRIBE_STREAM = "unsubscribe-stream";
  */
 export declare const CHANG_IS_GUEST = "change-is-guest";
 export declare const BIND_BIG_ELEMENT = "bind-big-element";
+export declare const NO_CONTAINER = "no-container";

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

@@ -1,10 +1,11 @@
-import { ConnectErrorMessage, SubscribeMessage } from "../BMStream/BMStreamModel";
-import { BIND_BIG_ELEMENT, BIND_ELEMENT, CHANG_IS_GUEST, HANDLE_STREAM_CONNECT_ERROR, MANUAL_SUBSCRIPTION, RAISE_HAND, RECEIVE_SUBSCRIBE_MESSAGE, UNSUBSCRIBE_STREAM, USER_SORT_NUM_CHANGE } from "../constants";
+import { ConnectErrorMessage, NoPlayerContainer, SubscribeMessage } from "../BMStream/BMStreamModel";
+import { BIND_BIG_ELEMENT, BIND_ELEMENT, CHANG_IS_GUEST, HANDLE_STREAM_CONNECT_ERROR, MANUAL_SUBSCRIPTION, NO_CONTAINER, RAISE_HAND, RECEIVE_SUBSCRIBE_MESSAGE, STREAM_SORT_NUM_CHANGE, UNSUBSCRIBE_STREAM, USER_SORT_NUM_CHANGE } from "../constants";
 import { RaiseHandInfo } from "../BMUser/BMUser";
 import { ChangeIsGuest } from "../BMUser/BMUserVM";
 declare type Events = {
     [RECEIVE_SUBSCRIBE_MESSAGE]: SubscribeMessage;
     [USER_SORT_NUM_CHANGE]: null;
+    [STREAM_SORT_NUM_CHANGE]: null;
     [HANDLE_STREAM_CONNECT_ERROR]: ConnectErrorMessage;
     [RAISE_HAND]: RaiseHandInfo;
     [UNSUBSCRIBE_STREAM]: SubscribeMessage;
@@ -12,6 +13,7 @@ declare type Events = {
     [CHANG_IS_GUEST]: ChangeIsGuest;
     [BIND_ELEMENT]: SubscribeMessage;
     [BIND_BIG_ELEMENT]: SubscribeMessage;
+    [NO_CONTAINER]: NoPlayerContainer;
 };
 export declare const emitter: import("mitt").Emitter<Events>;
 export declare const removeEmitter: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hysc/meeting",
-  "version": "2.6.65",
+  "version": "2.6.66",
   "description": "boom meeting",
   "main": "umd/index.js",
   "module": "esm/index.js",
@@ -14,7 +14,7 @@
   "author": "yangliye",
   "license": "MIT",
   "dependencies": {
-    "@hysc/core": "2.6.44",
+    "@hysc/core": "2.6.45",
     "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": "2.6.44"
+    "@hysc/core": "2.6.45"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.6"