@tencentcloud/roomkit-electron-vue3 2.6.0 → 2.6.3

package/src/TUIRoom/services/manager/componentManager.ts

@@ -1,4 +1,4 @@
-import { IRoomService } from '..';
+import { IRoomService } from '../';
 import logger from '../../utils/common/logger';
 
 interface IComponentManager {
@@ -20,6 +20,8 @@ const componentNames = [
   'ChatControl',
   'MoreControl',
   'VirtualBackground',
+  'BasicBeauty',
+  'AIControl',
 ] as const;
 
 export type ComponentName = (typeof componentNames)[number];
@@ -49,6 +51,8 @@ const defaultConfig = {
   ChatControl: { visible: true },
   MoreControl: { visible: true },
   VirtualBackground: { visible: false },
+  AIControl: { visible: false },
+  BasicBeauty: { visible: true },
 };
 
 export class ComponentManager implements IComponentManager {

package/src/TUIRoom/services/manager/configManager.ts

@@ -34,7 +34,6 @@ export class ConfigManager implements IConfigManager {
   }
 
   public setLanguage(language: LanguageOption) {
-    if (language === i18n.global.locale.value) return;
     i18n.global.locale.value = language;
     this.service.basicStore.setLang(language);
     this.service.emit(EventType.LANGUAGE_CHANGED, language);

package/src/TUIRoom/services/manager/dataReportManager.ts

@@ -0,0 +1,27 @@
+import TUIRoomEngine from '@tencentcloud/tuiroom-engine-electron';
+import packageConfig from '../../../../package.json';
+const appVersion = packageConfig.version;
+const KEY_METRICS_API = 'KeyMetricsStats';
+
+export enum MetricsKey {
+  startSharingWhiteboard = 106000,
+  stopSharingWhiteboard = 106001,
+  startAnnotating = 106002,
+  stopAnnotating = 106003,
+  saveWhiteboard = 106004,
+}
+
+export class DataReportManager {
+  static reportCount(key: MetricsKey) {
+    TUIRoomEngine.callExperimentalAPI(
+      JSON.stringify({
+        api: KEY_METRICS_API,
+        params: {
+          opt: 'count',
+          key,
+          version: appVersion,
+        },
+      })
+    );
+  }
+}

package/src/TUIRoom/services/manager/roomActionManager.ts

@@ -31,6 +31,7 @@ export interface DeviceParams {
 export interface StartParams extends DeviceParams {
   roomName?: string;
   isSeatEnabled?: boolean;
+  password?: string;
 }
 
 export interface JoinParams extends DeviceParams {
@@ -58,6 +59,7 @@ export class RoomActionManager {
       defaultCameraId,
       defaultMicrophoneId,
       defaultSpeakerId,
+      password,
     } = params;
     const roomMode = isSeatEnabled ? 'SpeakAfterTakingSeat' : 'FreeToSpeak';
     await this.createRoom({
@@ -70,6 +72,7 @@ export class RoomActionManager {
         defaultCameraId,
         defaultMicrophoneId,
         defaultSpeakerId,
+        password,
       },
     });
     await this.enterRoom({
@@ -80,9 +83,10 @@ export class RoomActionManager {
         defaultCameraId,
         defaultMicrophoneId,
         defaultSpeakerId,
+        password,
       },
     });
-    this.service.emit(EventType.ROOM_START);
+    this.service.emit(EventType.ROOM_START, { roomId });
   }
 
   public async join(roomId: string, params: JoinParams = {}) {
@@ -105,7 +109,7 @@ export class RoomActionManager {
         password,
       },
     });
-    this.service.emit(EventType.ROOM_JOIN);
+    this.service.emit(EventType.ROOM_JOIN, { roomId });
   }
 
   public async leaveRoom() {
@@ -136,10 +140,10 @@ export class RoomActionManager {
     roomId: string;
     roomName?: string;
     roomMode?: 'FreeToSpeak' | 'SpeakAfterTakingSeat';
-    roomParam?: DeviceParams;
+    roomParam?: StartParams;
   }) {
     try {
-      const { roomId, roomName, roomMode } = options;
+      const { roomId, roomName, roomMode, roomParam } = options;
 
       const roomParams = {
         roomId,
@@ -150,6 +154,7 @@ export class RoomActionManager {
           roomMode === 'SpeakAfterTakingSeat'
             ? TUISeatMode.kApplyToTake
             : undefined,
+        password: roomParam?.password || '',
       };
 
       await this.handleRoomCreation(roomParams, options);

package/src/TUIRoom/services/roomService.ts

@@ -34,9 +34,13 @@ import {
 } from './manager/roomActionManager';
 import { WaterMark } from './function/waterMark';
 import { VirtualBackground } from './function/virtualBackground';
+import { BasicBeauty } from './function/basicBeauty';
 import { ScheduleConferenceManager } from './manager/scheduleConferenceManager';
 import { ConferenceInvitationManager } from './manager/conferenceInvitationManager';
 import { ErrorHandler } from './function/errorHandler';
+import { ChatManager } from './manager/chatManager';
+import { TUILogin } from '@tencentcloud/tui-core';
+import { AITask } from './function/aiTask';
 
 const { t } = i18n.global;
 
@@ -54,11 +58,14 @@ export class RoomService implements IRoomService {
   public roomActionManager: RoomActionManager = new RoomActionManager(this);
   public waterMark = new WaterMark(this);
   public virtualBackground = new VirtualBackground(this);
+  public basicBeauty = new BasicBeauty(this);
   public scheduleConferenceManager: ScheduleConferenceManager =
     new ScheduleConferenceManager(this);
   public conferenceInvitationManager: ConferenceInvitationManager =
     new ConferenceInvitationManager(this);
   public errorHandler: ErrorHandler = new ErrorHandler(this);
+  public chatManager: ChatManager = new ChatManager(this);
+  public aiTask: AITask = new AITask(this);
 
   public roomEngine = roomEngine;
   public t = t;
@@ -118,9 +125,11 @@ export class RoomService implements IRoomService {
     RoomService.instance.unBindRoomEngineEvents();
     RoomService.instance.waterMark.dispose();
     RoomService.instance.virtualBackground.dispose();
+    RoomService.instance.basicBeauty.dispose();
     RoomService.instance.scheduleConferenceManager.dispose();
     RoomService.instance.conferenceInvitationManager.dispose();
     RoomService.instance.mediaManager.dispose();
+    RoomService.instance.chatManager.dispose();
     RoomService.instance = undefined;
   }
 
@@ -450,7 +459,14 @@ export class RoomService implements IRoomService {
       userName = userId,
       avatarUrl = '',
     } = option;
-    await TUIRoomEngine.login({ sdkAppId, userId, userSig });
+    TUILogin.login({
+      SDKAppID: sdkAppId,
+      userID: userId,
+      userSig,
+      useUploadPlugin: true,
+    });
+    const { chat } = TUILogin.getContext();
+    await TUIRoomEngine.login({ sdkAppId, userId, userSig, tim: chat });
     await TUIRoomEngine.setSelfInfo({ userName, avatarUrl });
     this.emit(EventType.ROOM_LOGIN);
   }

package/src/TUIRoom/services/types.ts

@@ -6,6 +6,7 @@ import { LifeCycleManager } from './manager/lifeCycleManager';
 import { ScheduleConferenceManager } from './manager/scheduleConferenceManager';
 import { RoomActionManager } from './manager/roomActionManager';
 import { ErrorHandler } from './function/errorHandler';
+import { AITask } from './function/aiTask';
 import { ConferenceInvitationManager } from './manager/conferenceInvitationManager';
 export interface IRoomService {
   t: any;
@@ -18,6 +19,7 @@ export interface IRoomService {
   scheduleConferenceManager: ScheduleConferenceManager;
   conferenceInvitationManager: ConferenceInvitationManager;
   errorHandler: ErrorHandler;
+  aiTask: AITask;
   on: (eventType: EventType, callback: (data?: any) => any) => void;
   off: (eventType: EventType, callback: (data?: any) => void) => void;
   emit: (eventType: EventType, data?: any) => void;

package/src/TUIRoom/stores/basic.ts

@@ -12,6 +12,7 @@ type SideBarType =
   | 'more'
   | 'transfer-leave'
   | 'apply'
+  | 'aiTranscription'
   | '';
 type SceneType = 'chat' | 'default';
 
@@ -52,9 +53,6 @@ interface BasicState {
   isShowScreenShareAntiFraud: boolean;
   isOpenMic: boolean;
   scene: SceneType;
-  isSharing: boolean;
-  isWhiteboardVisiable: boolean;
-  isSharingScreen: boolean;
   componentConfig: {
     InviteControl: {
       visible?: boolean;
@@ -123,9 +121,6 @@ export const useBasicStore = defineStore('basic', {
       },
     },
     scene: 'default',
-    isSharing: false,
-    isWhiteboardVisiable: false,
-    isSharingScreen: false,
   }),
   getters: {},
   actions: {
@@ -244,15 +239,6 @@ export const useBasicStore = defineStore('basic', {
     setScene(scene: SceneType) {
       this.scene = scene;
     },
-    setIsSharing(isSharing: boolean) {
-      this.isSharing = isSharing;
-    },
-    setWhiteboardVisiable(visible: boolean) {
-      this.isWhiteboardVisiable = visible;
-    },
-    setIsSharingScreen(isSharingScreen: boolean) {
-      this.isSharingScreen = isSharingScreen;
-    },
     reset() {
       this.isSidebarOpen = false;
       this.layout = getDefaultLayout();
@@ -270,9 +256,6 @@ export const useBasicStore = defineStore('basic', {
       this.showHeaderTool = true;
       this.shareLink = '';
       this.isOpenMic = false;
-      this.isSharing = false;
-      this.isWhiteboardVisiable = false;
-      this.isSharingScreen = false;
     },
   },
 });

package/src/TUIRoom/stores/room.ts

@@ -139,6 +139,10 @@ interface RoomState {
   roomName: string;
   hasOtherScreenShare: boolean;
   isOnStateTabActive: boolean;
+  isLocalUserSharing: boolean;
+  isWhiteboardVisiable: boolean;
+  isSharingScreen: boolean;
+  isAnnotationVisiable: boolean;
 }
 
 export const useRoomStore = defineStore('room', {
@@ -170,6 +174,10 @@ export const useRoomStore = defineStore('room', {
     // Visual area user flow list
     hasOtherScreenShare: false,
     isOnStateTabActive: true,
+    isLocalUserSharing: false,
+    isWhiteboardVisiable: false,
+    isSharingScreen: false,
+    isAnnotationVisiable: false,
   }),
   getters: {
     localUser(state: RoomState): UserInfo {
@@ -681,6 +689,10 @@ export const useRoomStore = defineStore('room', {
       this.maxSeatCount = 20;
       this.password = '';
       this.roomName = '';
+      this.isLocalUserSharing = false;
+      this.isWhiteboardVisiable = false;
+      this.isSharingScreen = false;
+      this.isAnnotationVisiable = false;
     },
   },
 });

package/vite.config.ts

@@ -2,6 +2,7 @@ import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import dts from 'vite-plugin-dts';
 import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
+import { viteCommonjs } from '@originjs/vite-plugin-commonjs';
 import { dependencies, peerDependencies } from './package.json';
 
 // https://vitejs.dev/config/
@@ -49,10 +50,14 @@ export default defineConfig({
   },
   plugins: [
     vue(),
+    viteCommonjs(),
     cssInjectedByJsPlugin(),
     dts({
       entryRoot: './src/TUIRoom',
       outDir: ['lib/', 'es/'],
     }),
   ],
+  optimizeDeps: {
+    include: ['dayjs'],
+  },
 });

package/es/components/Chat/index.vue2.mjs

@@ -1,20 +0,0 @@
-import { defineComponent, openBlock, createElementBlock, normalizeClass, unref, createVNode, createBlock, createCommentVNode } from "vue";
-import MessageList from "./MessageList/index.vue.mjs";
-import ChatEditor from "./ChatEditor/index.vue.mjs";
-import { isMobile } from "../../utils/environment.mjs";
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "index",
-  setup(__props) {
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", {
-        class: normalizeClass([unref(isMobile) ? "chat-container-h5" : "chat-container"])
-      }, [
-        createVNode(MessageList),
-        !unref(isMobile) ? (openBlock(), createBlock(ChatEditor, { key: 0 })) : createCommentVNode("", true)
-      ], 2);
-    };
-  }
-});
-export {
-  _sfc_main as default
-};

package/lib/components/Chat/index.vue2.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const Vue = require("vue");
-const index = require("./MessageList/index.vue.js");
-const index$1 = require("./ChatEditor/index.vue.js");
-const environment = require("../../utils/environment.js");
-const _sfc_main = /* @__PURE__ */ Vue.defineComponent({
-  __name: "index",
-  setup(__props) {
-    return (_ctx, _cache) => {
-      return Vue.openBlock(), Vue.createElementBlock("div", {
-        class: Vue.normalizeClass([Vue.unref(environment.isMobile) ? "chat-container-h5" : "chat-container"])
-      }, [
-        Vue.createVNode(index.default),
-        !Vue.unref(environment.isMobile) ? (Vue.openBlock(), Vue.createBlock(index$1.default, { key: 0 })) : Vue.createCommentVNode("", true)
-      ], 2);
-    };
-  }
-});
-exports.default = _sfc_main;

package/src/TUIRoom/components/Chat/index.vue

@@ -1,25 +0,0 @@
-<template>
-  <div :class="[isMobile ? 'chat-container-h5' : 'chat-container']">
-    <message-list />
-    <chat-editor v-if="!isMobile" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import MessageList from './MessageList/index.vue';
-import ChatEditor from './ChatEditor/index.vue';
-import { isMobile } from '../../utils/environment';
-</script>
-
-<style lang="scss" scoped>
-.chat-container {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  padding: 20px;
-}
-
-.chat-container-h5 {
-  height: 100%;
-}
-</style>