@tencentcloud/roomkit-electron-vue3 2.5.0 → 2.6.0

package/es/services/manager/configManager.mjs

@@ -1,13 +1,11 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import i18n from "../../locales/index.mjs";
+import { EventType } from "../types.mjs";
 const THEME = {
-  LIGHT: "tui-theme-white",
-  DARK: "tui-theme-black"
+  LIGHT: "white",
+  DARK: "black"
 };
 class ConfigManager {
   constructor(service) {
@@ -15,15 +13,22 @@ class ConfigManager {
     this.service = service;
   }
   setTheme(theme) {
-    const isDarkTheme = theme === "DARK";
-    document.body.classList.toggle(THEME.DARK, isDarkTheme);
-    document.body.classList.toggle(THEME.LIGHT, !isDarkTheme);
-    localStorage.setItem("tuiRoom-currentTheme", isDarkTheme ? THEME.DARK : THEME.LIGHT);
+    const isDarkTheme = theme === THEME.DARK;
+    document.body.classList.toggle(`tui-theme-${THEME.DARK}`, isDarkTheme);
+    document.body.classList.toggle(`tui-theme-${THEME.LIGHT}`, !isDarkTheme);
+    this.service.basicStore.setDefaultTheme(
+      isDarkTheme ? THEME.DARK : THEME.LIGHT
+    );
+    this.service.emit(
+      EventType.THEME_CHANGED,
+      isDarkTheme ? THEME.DARK : THEME.LIGHT
+    );
   }
   setLanguage(language) {
+    if (language === i18n.global.locale.value) return;
     i18n.global.locale.value = language;
     this.service.basicStore.setLang(language);
-    localStorage.setItem("tuiRoom-language", language);
+    this.service.emit(EventType.LANGUAGE_CHANGED, language);
   }
 }
 export {

package/es/services/manager/lifeCycleManager.mjs

@@ -1,9 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import mitt from "mitt";
 import { EventType } from "../types.mjs";
 class LifeCycleManager {
@@ -37,15 +34,42 @@ class LifeCycleManager {
       return callback.bind(this, reason);
     };
     const eventReasonMap = {
-      [EventType.ROOM_START]: { reason: "room start", type: "mount" },
-      [EventType.ROOM_JOIN]: { reason: "room join", type: "mount" },
-      [EventType.USER_LOGOUT]: { reason: "room logout", type: "unmount" },
-      [EventType.ROOM_LEAVE]: { reason: "room leave", type: "unmount" },
-      [EventType.ROOM_DISMISS]: { reason: "room destroy", type: "unmount" },
-      [EventType.KICKED_OFFLINE]: { reason: "room kicked offline", type: "unmount" },
-      [EventType.KICKED_OUT]: { reason: "room kicked out", type: "unmount" },
-      [EventType.USER_SIG_EXPIRED]: { reason: "room user sig expired", type: "unmount" },
-      [EventType.ROOM_ERROR]: { reason: "room error", type: "unmount" }
+      [EventType.ROOM_START]: {
+        reason: "room start",
+        type: "mount"
+      },
+      [EventType.ROOM_JOIN]: {
+        reason: "room join",
+        type: "mount"
+      },
+      [EventType.USER_LOGOUT]: {
+        reason: "room logout",
+        type: "unmount"
+      },
+      [EventType.ROOM_LEAVE]: {
+        reason: "room leave",
+        type: "unmount"
+      },
+      [EventType.ROOM_DISMISS]: {
+        reason: "room destroy",
+        type: "unmount"
+      },
+      [EventType.KICKED_OFFLINE]: {
+        reason: "room kicked offline",
+        type: "unmount"
+      },
+      [EventType.KICKED_OUT]: {
+        reason: "room kicked out",
+        type: "unmount"
+      },
+      [EventType.USER_SIG_EXPIRED]: {
+        reason: "room user sig expired",
+        type: "unmount"
+      },
+      [EventType.ROOM_ERROR]: {
+        reason: "room error",
+        type: "unmount"
+      }
     };
     Object.entries(eventReasonMap).forEach(([event, { reason, type }]) => {
       const callback = handleCallback(type, reason);

package/es/services/manager/roomActionManager.d.ts

@@ -1,3 +1,4 @@
+import { TUIRoomType } from '@tencentcloud/tuiroom-engine-electron';
 import { IRoomService, RoomParam } from '../types';
 
 export interface DeviceParams {
@@ -12,7 +13,12 @@ export interface StartParams extends DeviceParams {
     isSeatEnabled?: boolean;
 }
 export interface JoinParams extends DeviceParams {
+    password?: string;
 }
+export type RoomParamsInfo = {
+    roomId: string;
+    roomType: TUIRoomType;
+};
 export declare class RoomActionManager {
     private service;
     constructor(service: IRoomService);
@@ -31,9 +37,13 @@ export declare class RoomActionManager {
         roomId: string;
         roomParam?: RoomParam;
     }): Promise<void>;
+    private setRoomParams;
     private doEnterRoom;
     private getUserList;
+    private getInvitationList;
+    private fetchAttendeeList;
     private syncUserInfo;
     private getSeatList;
     private closeMediaBeforeLeave;
+    fetchRoomInfo(options?: RoomParamsInfo): Promise<any>;
 }

package/es/services/manager/roomActionManager.mjs

@@ -1,12 +1,9 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-import { TRTCVideoEncParam, TRTCVideoResolution, TUIRoomType, TUISeatMode } from "@tencentcloud/tuiroom-engine-electron";
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+import { TRTCVideoEncParam, TRTCVideoResolution, TUIRoomType, TUISeatMode, TUIMediaDeviceType, TUIVideoStreamType } from "@tencentcloud/tuiroom-engine-electron";
 import { EventType } from "../types.mjs";
-import { isMobile, isWeChat } from "../../utils/environment.mjs";
+import { isWeChat, isMobile } from "../../utils/environment.mjs";
 import logger from "../../utils/common/logger/index.mjs";
 const logPrefix = "[RoomService:roomActionManager]";
 const smallParam = new TRTCVideoEncParam();
@@ -59,7 +56,8 @@ class RoomActionManager {
       isOpenMicrophone = false,
       defaultCameraId,
       defaultMicrophoneId,
-      defaultSpeakerId
+      defaultSpeakerId,
+      password
     } = params;
     await this.enterRoom({
       roomId,
@@ -68,7 +66,8 @@ class RoomActionManager {
         isOpenMicrophone,
         defaultCameraId,
         defaultMicrophoneId,
-        defaultSpeakerId
+        defaultSpeakerId,
+        password
       }
     });
     this.service.emit(EventType.ROOM_JOIN);
@@ -128,14 +127,16 @@ class RoomActionManager {
     var _a;
     try {
       const { roomId, roomParam } = options;
-      const roomParams = {
+      const roomInfo = await this.doEnterRoom({
         roomId,
-        roomType: TUIRoomType.kConference
-      };
-      const roomInfo = await this.doEnterRoom(roomParams);
+        roomType: TUIRoomType.kConference,
+        password: (roomParam == null ? void 0 : roomParam.password) || ""
+      });
       this.service.roomStore.setRoomInfo(roomInfo);
       await this.getUserList();
       await this.syncUserInfo(this.service.basicStore.userId);
+      await this.fetchAttendeeList(roomId);
+      await this.getInvitationList(roomId);
       if (roomInfo.isSeatEnabled) {
         await this.getSeatList();
         this.service.roomStore.isMaster && await ((_a = this.service.roomEngine.instance) == null ? void 0 : _a.takeSeat({
@@ -143,26 +144,117 @@ class RoomActionManager {
           timeout: 0
         }));
       }
-      this.service.roomStore.setRoomParam(roomParam);
+      this.setRoomParams(roomParam);
     } catch (error) {
       logger.error(`${logPrefix}enterRoom error:`, error);
       this.service.errorHandler.handleError(error, "enterRoom");
       throw error;
     }
   }
-  async doEnterRoom(options) {
+  async setRoomParams(roomParam) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    if (!roomParam) {
+      return;
+    }
+    const {
+      isOpenCamera,
+      isOpenMicrophone,
+      defaultCameraId,
+      defaultMicrophoneId,
+      defaultSpeakerId
+    } = roomParam;
+    if (defaultCameraId) {
+      this.service.roomStore.setCurrentCameraId(defaultCameraId);
+      (_a = this.service.roomEngine.instance) == null ? void 0 : _a.setCurrentCameraDevice({
+        deviceId: defaultCameraId
+      });
+    }
+    if (defaultMicrophoneId) {
+      this.service.roomStore.setCurrentMicrophoneId(defaultMicrophoneId);
+      (_b = this.service.roomEngine.instance) == null ? void 0 : _b.setCurrentMicDevice({
+        deviceId: defaultMicrophoneId
+      });
+    }
+    if (defaultSpeakerId) {
+      this.service.roomStore.setCurrentSpeakerId(defaultSpeakerId);
+      (_c = this.service.roomEngine.instance) == null ? void 0 : _c.setCurrentSpeakerDevice({
+        deviceId: defaultSpeakerId
+      });
+    }
+    const {
+      isMaster,
+      isMicrophoneDisableForAllUser,
+      isCameraDisableForAllUser,
+      isFreeSpeakMode
+    } = this.service.roomStore;
+    const isCanOpenMicrophone = isMaster || !isMicrophoneDisableForAllUser && isFreeSpeakMode;
+    if (isCanOpenMicrophone) {
+      if (isOpenMicrophone) {
+        await ((_d = this.service.roomEngine.instance) == null ? void 0 : _d.unmuteLocalAudio());
+        if (!this.service.basicStore.isOpenMic) {
+          (_e = this.service.roomEngine.instance) == null ? void 0 : _e.openLocalMicrophone();
+          this.service.basicStore.setIsOpenMic(true);
+        }
+        if (!isWeChat && !isMobile) {
+          const microphoneList = await ((_f = this.service.roomEngine.instance) == null ? void 0 : _f.getMicDevicesList());
+          const speakerList = await ((_g = this.service.roomEngine.instance) == null ? void 0 : _g.getSpeakerDevicesList());
+          if ((microphoneList == null ? void 0 : microphoneList.length) === 0 || (speakerList == null ? void 0 : speakerList.length) === 0) return;
+          if (!this.service.roomStore.currentMicrophoneId && microphoneList.length > 0) {
+            this.service.roomStore.setCurrentMicrophoneId(
+              microphoneList[0].deviceId
+            );
+          }
+          if (!this.service.roomStore.currentSpeakerId && speakerList.length > 0) {
+            this.service.roomStore.setCurrentSpeakerId(speakerList[0].deviceId);
+          }
+          await ((_h = this.service.roomEngine.instance) == null ? void 0 : _h.setCurrentMicDevice({
+            deviceId: this.service.roomStore.currentMicrophoneId
+          }));
+        }
+      } else {
+        await ((_i = this.service.roomEngine.instance) == null ? void 0 : _i.muteLocalAudio());
+      }
+    }
+    const isCanOpenCamera = isMaster || !isCameraDisableForAllUser && isFreeSpeakMode;
+    if (isCanOpenCamera && isOpenCamera) {
+      if (isMobile) {
+        await ((_j = this.service.roomEngine.instance) == null ? void 0 : _j.openLocalCamera({
+          isFrontCamera: this.service.basicStore.isFrontCamera
+        }));
+        return;
+      }
+      const deviceManager = (_k = this.service.roomEngine.instance) == null ? void 0 : _k.getMediaDeviceManager();
+      if (!this.service.roomStore.currentCameraId) {
+        const cameraList = await deviceManager.getDevicesList({
+          type: TUIMediaDeviceType.kMediaDeviceTypeVideoCamera
+        });
+        if (cameraList && cameraList.length > 0) {
+          this.service.roomStore.setCurrentCameraId(cameraList[0].deviceId);
+        }
+      }
+      await deviceManager.setCurrentDevice({
+        type: TUIMediaDeviceType.kMediaDeviceTypeVideoCamera,
+        deviceId: this.service.roomStore.currentCameraId
+      });
+      await ((_l = this.service.roomEngine.instance) == null ? void 0 : _l.openLocalCamera());
+    }
+  }
+  async doEnterRoom(params) {
     var _a, _b, _c, _d;
     const { roomEngine } = this.service;
-    const { roomId, roomType } = options;
+    const { roomId, roomType, password } = params;
     this.service.basicStore.setRoomId(roomId);
     const isH5 = isMobile && !isWeChat;
     const trtcCloud = (_a = roomEngine.instance) == null ? void 0 : _a.getTRTCCloud();
     trtcCloud == null ? void 0 : trtcCloud.setDefaultStreamRecvMode(true, false);
-    trtcCloud == null ? void 0 : trtcCloud.enableSmallVideoStream(!isH5, smallParam);
     const roomInfo = await ((_b = roomEngine.instance) == null ? void 0 : _b.enterRoom({
       roomId,
-      roomType
+      roomType,
+      options: {
+        password
+      }
     }));
+    trtcCloud == null ? void 0 : trtcCloud.enableSmallVideoStream(!isH5, smallParam);
     (_c = roomEngine.instance) == null ? void 0 : _c.muteLocalAudio();
     if (!roomInfo.isSeatEnabled) {
       (_d = roomEngine.instance) == null ? void 0 : _d.openLocalMicrophone();
@@ -179,17 +271,64 @@ class RoomActionManager {
         const result = await ((_a = roomEngine.instance) == null ? void 0 : _a.getUserList({
           nextSequence
         }));
-        this.service.roomStore.updateUserList(result.userInfoList);
+        result.userInfoList.forEach((user) => {
+          this.service.roomStore.addUserInfo(
+            Object.assign(user, { isInRoom: true })
+          );
+          if (this.service.roomStore.isFreeSpeakMode) {
+            this.service.roomStore.addStreamInfo(
+              user.userId,
+              TUIVideoStreamType.kCameraStream
+            );
+          }
+        });
         nextSequence = result.nextSequence;
       } while (nextSequence !== 0);
     } catch (error) {
       logger.error("TUIRoomEngine.getUserList", error.code, error.message);
     }
   }
+  async getInvitationList(roomId, cursor = "", result = []) {
+    const res = await this.service.conferenceInvitationManager.getInvitationList({
+      roomId,
+      cursor,
+      count: 20
+    });
+    if (!(res == null ? void 0 : res.invitationList)) return [];
+    result.push(...res == null ? void 0 : res.invitationList);
+    if (res.cursor !== "") {
+      await this.getInvitationList(roomId, res.cursor, result);
+    }
+    const list = result.map(({ invitee, status }) => ({
+      ...invitee,
+      status
+    }));
+    this.service.roomStore.updateInviteeList(list);
+  }
+  async fetchAttendeeList(roomId, cursor = "", result = []) {
+    const res = await this.service.scheduleConferenceManager.fetchAttendeeList({
+      roomId,
+      cursor,
+      count: 20
+    });
+    if (!(res == null ? void 0 : res.attendeeList)) return [];
+    result.push(...res == null ? void 0 : res.attendeeList);
+    if (res.cursor !== "") {
+      await this.fetchAttendeeList(roomId, res.cursor, result);
+    }
+    const inviteeList = result.filter((user) => {
+      return !this.service.roomStore.userList.some(
+        (item) => item.userId === user.userId
+      );
+    });
+    this.service.roomStore.updateInviteeList(inviteeList);
+  }
   async syncUserInfo(userId) {
     var _a;
     const { roomEngine } = this.service;
-    const userInfo = await ((_a = roomEngine.instance) == null ? void 0 : _a.getUserInfo({ userId }));
+    const userInfo = await ((_a = roomEngine.instance) == null ? void 0 : _a.getUserInfo({
+      userId
+    }));
     const { isMessageDisabled } = userInfo;
     this.service.chatStore.setSendMessageDisableChanged(isMessageDisabled);
   }
@@ -198,7 +337,26 @@ class RoomActionManager {
     const { roomEngine } = this.service;
     try {
       const seatList = await ((_a = roomEngine.instance) == null ? void 0 : _a.getSeatList());
-      this.service.roomStore.setSeatList(seatList);
+      seatList.forEach((seat) => {
+        const { userId } = seat;
+        if (!userId) {
+          return;
+        }
+        const user = this.service.roomStore.userInfoObj[userId];
+        if (user) {
+          this.service.roomStore.updateUserInfo({ userId, onSeat: true });
+        } else {
+          this.service.roomStore.addUserInfo({
+            userId,
+            onSeat: true,
+            isInRoom: true
+          });
+        }
+        this.service.roomStore.addStreamInfo(
+          userId,
+          TUIVideoStreamType.kCameraStream
+        );
+      });
     } catch (error) {
       logger.error("TUIRoomEngine.getSeatList", error.code, error.message);
     }
@@ -213,6 +371,10 @@ class RoomActionManager {
       (_b = roomEngine.instance) == null ? void 0 : _b.closeLocalCamera();
     }
   }
+  async fetchRoomInfo(options) {
+    var _a;
+    return await ((_a = this.service.roomEngine.instance) == null ? void 0 : _a.fetchRoomInfo(options));
+  }
 }
 export {
   RoomActionManager

package/es/services/manager/scheduleConferenceManager.d.ts

@@ -1,5 +1,5 @@
-import { IRoomService } from '../types';
 import { TUIConferenceInfo, TUIConferenceListManagerEvents, TUIRoomType, TUISeatMode, TUIUserInfo, TUIConferenceStatus } from '@tencentcloud/tuiroom-engine-electron';
+import { IRoomService } from '../types';
 
 export * from '@tencentcloud/tuiroom-engine-electron';
 interface IScheduleConferenceManager {

package/es/services/manager/scheduleConferenceManager.mjs

@@ -1,9 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { TUIConferenceListManagerEvents } from "@tencentcloud/tuiroom-engine-electron";
 export * from "@tencentcloud/tuiroom-engine-electron";
 import { EventType } from "../types.mjs";
@@ -42,10 +39,22 @@ class ScheduleConferenceManager {
   bindEvent() {
     var _a;
     const conferenceListManager = (_a = this.service.roomEngine) == null ? void 0 : _a.instance.getConferenceListManager();
-    conferenceListManager.on(TUIConferenceListManagerEvents.onConferenceScheduled, this.onConferenceScheduled);
-    conferenceListManager.on(TUIConferenceListManagerEvents.onConferenceWillStart, this.onConferenceWillStart);
-    conferenceListManager.on(TUIConferenceListManagerEvents.onConferenceCancelled, this.onConferenceCancelled);
-    conferenceListManager.on(TUIConferenceListManagerEvents.onConferenceInfoChanged, this.onConferenceInfoChanged);
+    conferenceListManager.on(
+      TUIConferenceListManagerEvents.onConferenceScheduled,
+      this.onConferenceScheduled
+    );
+    conferenceListManager.on(
+      TUIConferenceListManagerEvents.onConferenceWillStart,
+      this.onConferenceWillStart
+    );
+    conferenceListManager.on(
+      TUIConferenceListManagerEvents.onConferenceCancelled,
+      this.onConferenceCancelled
+    );
+    conferenceListManager.on(
+      TUIConferenceListManagerEvents.onConferenceInfoChanged,
+      this.onConferenceInfoChanged
+    );
     conferenceListManager.on(
       TUIConferenceListManagerEvents.onScheduleAttendeesChanged,
       this.onScheduleAttendeesChanged
@@ -58,10 +67,22 @@ class ScheduleConferenceManager {
   unbindEvent() {
     var _a;
     const conferenceListManager = (_a = this.service.roomEngine) == null ? void 0 : _a.instance.getConferenceListManager();
-    conferenceListManager.off(TUIConferenceListManagerEvents.onConferenceScheduled, this.onConferenceScheduled);
-    conferenceListManager.off(TUIConferenceListManagerEvents.onConferenceWillStart, this.onConferenceWillStart);
-    conferenceListManager.off(TUIConferenceListManagerEvents.onConferenceCancelled, this.onConferenceCancelled);
-    conferenceListManager.off(TUIConferenceListManagerEvents.onConferenceInfoChanged, this.onConferenceInfoChanged);
+    conferenceListManager.off(
+      TUIConferenceListManagerEvents.onConferenceScheduled,
+      this.onConferenceScheduled
+    );
+    conferenceListManager.off(
+      TUIConferenceListManagerEvents.onConferenceWillStart,
+      this.onConferenceWillStart
+    );
+    conferenceListManager.off(
+      TUIConferenceListManagerEvents.onConferenceCancelled,
+      this.onConferenceCancelled
+    );
+    conferenceListManager.off(
+      TUIConferenceListManagerEvents.onConferenceInfoChanged,
+      this.onConferenceInfoChanged
+    );
     conferenceListManager.off(
       TUIConferenceListManagerEvents.onScheduleAttendeesChanged,
       this.onScheduleAttendeesChanged
@@ -84,8 +105,7 @@ class ScheduleConferenceManager {
     this.emit(TUIConferenceListManagerEvents.onConferenceInfoChanged, data);
     const { roomId, roomName } = data.conferenceModifyInfo.basicRoomInfo;
     const isCurrentRoom = this.service.basicStore.roomId === roomId;
-    if (!isCurrentRoom)
-      return;
+    if (!isCurrentRoom) return;
     roomName !== void 0 && roomName !== null && this.service.roomStore.setRoomInfo({
       roomName
     });
@@ -98,8 +118,7 @@ class ScheduleConferenceManager {
   }
   async fetchFriendList() {
     var _a;
-    if (this.customFriendList)
-      return this.customFriendList;
+    if (this.customFriendList) return this.customFriendList;
     const tim = (_a = this.service.roomEngine.instance) == null ? void 0 : _a.getTIM();
     const { data } = await tim.getFriendList();
     return data;

package/es/services/manager/userManager.d.ts

@@ -1,5 +1,5 @@
-import { UserInfo } from '../../stores/room';
 import { IRoomService } from '../types';
+import { UserInfo } from '../../stores/room';
 
 interface IUserManager {
     setSelfInfo(options: SelfInfoOptions): Promise<void>;
@@ -20,5 +20,15 @@ export declare class UserManager implements IUserManager {
     setSelfInfo(options: SelfInfoOptions): Promise<void>;
     setCustomInfoForUser(options: CustomInfoForUser): Promise<any>;
     getDisplayName(options: UserInfo): string;
+    setLocalUser(userInfo: {
+        userId: string;
+    }): void;
+    private onRemoteUserEnterRoom;
+    private onRemoteUserLeaveRoom;
+    private onSeatListChanged;
+    private onUserAudioStateChanged;
+    private onUserVideoStateChanged;
+    private bindRoomEngineEvents;
+    private unbindRoomEngineEvents;
 }
 export {};