@tencentcloud/roomkit-electron-vue3 2.7.0 → 2.7.1

package/lib/services/function/aiTask.js

@@ -5,18 +5,20 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const mitt = require("mitt");
 const environment = require("../../utils/environment.js");
+const utils = require("../../utils/utils.js");
 var AI_TASK = /* @__PURE__ */ ((AI_TASK2) => {
   AI_TASK2["TRANSCRIPTION_TASK"] = "transcription";
   return AI_TASK2;
 })(AI_TASK || {});
+const ASR_EVENT_CODE = 1e4;
 class AITask {
   constructor(service) {
     __publicField(this, "emitter", mitt());
     __publicField(this, "trtc");
     __publicField(this, "service");
-    __publicField(this, "subtitleMsg", []);
-    __publicField(this, "subtitleText", { value: "" });
-    __publicField(this, "transcriptionText", { value: "" });
+    __publicField(this, "subtitleMessages", {});
+    __publicField(this, "transcribedMessageList", []);
+    __publicField(this, "subtitleTimeout", {});
     this.service = service;
     if (environment.isElectron || environment.isMobile) return;
     this.bindCtx();
@@ -45,126 +47,87 @@ class AITask {
     if (typeof ((_a = this.service.roomEngine.instance) == null ? void 0 : _a.getTRTCCloud) === "undefined" || typeof ((_c = (_b = this.service.roomEngine.instance) == null ? void 0 : _b.getTRTCCloud()) == null ? void 0 : _c._trtc) === "undefined") {
       return;
     }
-    const trtc = (_d = this.service.roomEngine.instance) == null ? void 0 : _d.getTRTCCloud()._trtc;
-    this.trtc = trtc;
-    trtc.on("custom-message", this.handleAIMessage);
+    this.trtc = (_d = this.service.roomEngine.instance) == null ? void 0 : _d.getTRTCCloud()._trtc;
+    this.trtc.on("custom-message", this.handleAIMessage);
   }
   handleUnmount() {
     var _a;
-    this.subtitleMsg = [];
-    this.subtitleText.value = "";
-    this.transcriptionText.value = "";
+    this.subtitleMessages = {};
+    this.transcribedMessageList = [];
     (_a = this.trtc) == null ? void 0 : _a.off("custom-message", this.handleAIMessage);
   }
   bindEvent() {
     this.service.lifeCycleManager.on("mount", this.handleMount);
     this.service.lifeCycleManager.on("unmount", this.handleUnmount);
   }
-  // todo trtc defines this type as any
+  resetSubtitleTimeout(id, fn) {
+    if (this.subtitleTimeout[id]) {
+      clearTimeout(this.subtitleTimeout[id]);
+    }
+    this.subtitleTimeout[id] = setTimeout(fn, 3e3);
+  }
   handleAIMessage(event) {
     if (event.cmdId !== 1) return;
     const data = new TextDecoder().decode(event.data);
     const jsonData = JSON.parse(data);
     this.handleMessage(jsonData);
     this.emit("transcription", {
-      subtitleText: this.subtitleText,
-      transcriptionText: this.transcriptionText,
-      subtitleMsg: this.subtitleMsg
+      subtitleMessages: this.subtitleMessages,
+      transcribedMessageList: this.transcribedMessageList
     });
   }
   handleMessage(data) {
-    const refreshSubtitle = () => {
-      let displayText = "";
-      for (let i = 0; i < this.subtitleMsg.length; i++) {
-        displayText += `${this.service.roomStore.getDisplayName(this.subtitleMsg[i].userid)}: ${this.subtitleMsg[i].text}
-`;
-        if (this.subtitleMsg[i].translation_text !== "") {
-          displayText += `${this.service.roomStore.getDisplayName(this.subtitleMsg[i].userid)}: ${this.subtitleMsg[i].translation_text}
-`;
-        }
-      }
-      this.subtitleText.value = displayText;
+    if (data.type !== ASR_EVENT_CODE) return;
+    const { sender, payload } = data;
+    const { end } = payload;
+    const createSubtitleMsg = () => {
+      return {
+        sender,
+        text: payload.text,
+        translationText: payload.translation_text,
+        startMsTs: data.start_ms_ts,
+        end
+      };
     };
-    if (data.type === 1e4 && data.payload.end === false) {
-      let exist = false;
-      for (let i = 0; i < this.subtitleMsg.length; i++) {
-        if (data.sender === this.subtitleMsg[i].userid) {
-          this.subtitleMsg[i].text = data.payload.text;
-          this.subtitleMsg[i].translation_text = data.payload.translation_text;
-          exist = true;
-          break;
-        }
-      }
-      if (!exist) {
-        this.subtitleMsg.push({
-          userid: data.sender,
-          text: data.payload.text,
-          translation_text: data.payload.translation_text
-        });
-      }
-      refreshSubtitle();
-    } else if (data.type === 1e4 && data.payload.end === true) {
-      for (let i = 0; i < this.subtitleMsg.length; i++) {
-        if (data.sender === this.subtitleMsg[i].userid) {
-          this.subtitleMsg[i].text = data.payload.text;
-          this.subtitleMsg[i].translation_text = data.payload.translation_text;
-          break;
-        }
-      }
-      refreshSubtitle();
-      let content = `${data.payload.start_time}->${data.payload.end_time}  ${data.sender}: ${data.payload.text}
-`;
-      if (data.payload.translation_text !== "") {
-        content += `${data.payload.start_time}->${data.payload.end_time}  ${data.sender}: ${data.payload.translation_text}
-`;
+    const updateMsg = (msg) => {
+      msg.text = payload.text;
+      msg.translationText = payload.translation_text;
+      msg.end = end;
+    };
+    const appendMsg = (msg, target) => {
+      if (Array.isArray(target)) {
+        target.push(msg);
+      } else if (typeof target === "object") {
+        const recordTarget = target;
+        recordTarget[msg.sender] = msg;
+      } else {
+        throw new Error("Invalid target type");
       }
-      this.transcriptionText.value += content;
+    };
+    const existingSubtitle = this.subtitleMessages[sender];
+    if (existingSubtitle) {
+      updateMsg(existingSubtitle);
+    } else {
+      appendMsg(createSubtitleMsg(), this.subtitleMessages);
     }
-    if (data.type === "subtitle") {
-      let exist = false;
-      for (let i = 0; i < this.subtitleMsg.length; i++) {
-        if (data.userid === this.subtitleMsg[i].userid) {
-          this.subtitleMsg[i].text = data.text;
-          this.subtitleMsg[i].translation_text = data.translation_text;
-          exist = true;
-          break;
-        }
-      }
-      if (!exist) {
-        this.subtitleMsg.push({
-          userid: data.userid,
-          text: data.text,
-          translation_text: data.translation_text
-        });
-      }
-      refreshSubtitle();
-    } else if (data.type === "transcription") {
-      for (let i = 0; i < this.subtitleMsg.length; i++) {
-        if (data.userid === this.subtitleMsg[i].userid) {
-          this.subtitleMsg[i].text = data.text;
-          this.subtitleMsg[i].translation_text = data.translation_text;
-          break;
-        }
-      }
-      refreshSubtitle();
-      let content = `${formatTimestampToTime(data.start_ms_ts)}->${formatTimestampToTime(data.end_ms_ts)}  ${this.service.roomStore.getDisplayName(data.userid)}: ${data.text}
-`;
-      if (data.translation_text !== "") {
-        content += `${formatTimestampToTime(data.start_ms_ts)}->${formatTimestampToTime(data.end_ms_ts)}  ${this.service.roomStore.getDisplayName(data.userid)}: ${data.translation_text}
-`;
-      }
-      this.transcriptionText.value += content;
+    const transcriptionIndex = utils.findLastIndex(
+      this.transcribedMessageList,
+      (msg) => msg.sender === sender && !msg.end
+    );
+    if (transcriptionIndex !== -1) {
+      updateMsg(this.transcribedMessageList[transcriptionIndex]);
+    } else {
+      appendMsg(createSubtitleMsg(), this.transcribedMessageList);
     }
+    this.resetSubtitleTimeout(sender, () => {
+      if (!end) return;
+      delete this.subtitleMessages[sender];
+      this.emit("transcription", {
+        subtitleMessages: this.subtitleMessages,
+        transcribedMessageList: this.transcribedMessageList
+      });
+    });
   }
-  StartAITranscription() {
-  }
-}
-function formatTimestampToTime(timestamp) {
-  const date = new Date(timestamp);
-  const hours = date.getHours().toString().padStart(2, "0");
-  const minutes = date.getMinutes().toString().padStart(2, "0");
-  const seconds = date.getSeconds().toString().padStart(2, "0");
-  return `${hours}:${minutes}:${seconds}`;
 }
 exports.AITask = AITask;
 exports.AI_TASK = AI_TASK;

package/lib/services/manager/dataReportManager.d.ts

@@ -10,7 +10,10 @@ export declare enum MetricsKey {
     disableScreenSharing = 106053,
     enableWatermark = 106054,
     enableVirtualBackground = 106055,
-    hideFeatureButton = 106056
+    hideFeatureButton = 106056,
+    openChat = 106057,
+    setBasicBeauty = 106058,
+    aiTask = 106059
 }
 export declare class DataReportManager {
     private taskQueue;

package/lib/services/manager/dataReportManager.js

@@ -18,6 +18,9 @@ var MetricsKey = /* @__PURE__ */ ((MetricsKey2) => {
   MetricsKey2[MetricsKey2["enableWatermark"] = 106054] = "enableWatermark";
   MetricsKey2[MetricsKey2["enableVirtualBackground"] = 106055] = "enableVirtualBackground";
   MetricsKey2[MetricsKey2["hideFeatureButton"] = 106056] = "hideFeatureButton";
+  MetricsKey2[MetricsKey2["openChat"] = 106057] = "openChat";
+  MetricsKey2[MetricsKey2["setBasicBeauty"] = 106058] = "setBasicBeauty";
+  MetricsKey2[MetricsKey2["aiTask"] = 106059] = "aiTask";
   return MetricsKey2;
 })(MetricsKey || {});
 class DataReportManager {

package/lib/utils/utils.d.ts

@@ -60,3 +60,5 @@ export declare function convertSecondsToHMS(seconds: number): {
     seconds: number;
 };
 export declare function getNanoId(size?: number): string;
+export declare function findLastIndex<T>(array: T[], predicate: (value: T, index: number, obj: T[]) => boolean, thisArg?: any): number;
+export declare function formatTimestampToTime(timestamp: number, format?: string): string;

package/lib/utils/utils.js

@@ -147,12 +147,45 @@ function getNanoId(size = 21) {
   }
   return id;
 }
+function findLastIndex(array, predicate, thisArg) {
+  const len = array.length >>> 0;
+  let k = len - 1;
+  while (k >= 0) {
+    const kValue = array[k];
+    if (predicate.call(thisArg, kValue, k, array)) {
+      return k;
+    }
+    k = k - 1;
+  }
+  return -1;
+}
+function formatTimestampToTime(timestamp, format = "MM-DD HH:mm") {
+  const date = new Date(timestamp);
+  const padStart = (value, length = 2) => value.toString().padStart(length, "0");
+  const replacements = {
+    YYYY: date.getFullYear().toString(),
+    YY: (date.getFullYear() % 100).toString().padStart(2, "0"),
+    MM: padStart(date.getMonth() + 1),
+    DD: padStart(date.getDate()),
+    HH: padStart(date.getHours()),
+    hh: padStart(date.getHours() % 12),
+    mm: padStart(date.getMinutes()),
+    ss: padStart(date.getSeconds()),
+    A: date.getHours() >= 12 ? "PM" : "AM"
+  };
+  return format.replace(
+    /YYYY|YY|MM|DD|HH|hh|mm|ss|A/g,
+    (match) => replacements[match]
+  );
+}
 exports.addSuffix = addSuffix;
 exports.calculateByteLength = calculateByteLength;
 exports.convertSecondsToHMS = convertSecondsToHMS;
 exports.debounce = debounce;
 exports.deepClone = deepClone;
 exports.exitFullScreen = exitFullScreen;
+exports.findLastIndex = findLastIndex;
+exports.formatTimestampToTime = formatTimestampToTime;
 exports.getNanoId = getNanoId;
 exports.getUrlParam = getUrlParam;
 exports.getUrlWithRoomId = getUrlWithRoomId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencentcloud/roomkit-electron-vue3",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "main": "./lib/index.js",
   "module": "./es/index.mjs",
   "types": "./es/index.d.ts",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@tencentcloud/chat": "latest",
     "@tencentcloud/tui-core": "latest",
-    "@tencentcloud/tuiroom-engine-electron": "^2.7.0",
+    "@tencentcloud/tuiroom-engine-electron": "^2.7.1",
     "@tencentcloud/chat-uikit-engine": "2.2.7",
     "@tencentcloud/chat-uikit-vue": "2.2.7",
     "@tencentcloud/universal-api": "^2.0.9",

package/src/TUIRoom/components/AITools/AISubtitles.vue

@@ -1,37 +1,40 @@
 <template>
   <div v-if="subtitleLines.length" class="ai-subtitles">
-    <div v-for="(line, index) in subtitleLines" :key="index">{{ line }}</div>
+    <div v-for="line in subtitleLines" :key="line.sender">
+      {{
+        `${roomService.roomStore.getDisplayName(line.sender)}: ${line?.text}`
+      }}
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onUnmounted } from 'vue';
-import { roomService, AI_TASK, AITaskEvent } from '../../services';
-
-const rawSubtitleText = ref('');
-const subtitleLines = computed(() =>
-  rawSubtitleText.value.split('\n').filter(item => item)
-);
-
-let subtitleTimeout: ReturnType<typeof setTimeout> | null = null;
-
-const resetSubtitleTimeout = () => {
-  if (subtitleTimeout) {
-    clearTimeout(subtitleTimeout);
-  }
-
-  subtitleTimeout = setTimeout(() => {
-    rawSubtitleText.value = '';
-  }, 3000);
-};
+import { computed, onMounted, onUnmounted, ref } from 'vue';
+import {
+  AI_TASK,
+  AITaskEvent,
+  MetricsKey,
+  roomService,
+  SubtitleMessage,
+} from '../../services';
+
+const subtitleMessages = ref<Record<string, SubtitleMessage>>({});
+const subtitleLines = computed(() => {
+  const arr = Object.keys(subtitleMessages.value).map(userId => {
+    return subtitleMessages.value[userId];
+  });
+  return arr.sort((a, b) => a.startMsTs - b.startMsTs);
+});
 
 const handleAISubtitles = (data?: AITaskEvent[AI_TASK.TRANSCRIPTION_TASK]) => {
   if (!data) return;
-  rawSubtitleText.value = data.subtitleText.value;
-  resetSubtitleTimeout();
+  subtitleMessages.value = Object.assign({}, data.subtitleMessages);
 };
 
-roomService.aiTask.on(AI_TASK.TRANSCRIPTION_TASK, handleAISubtitles);
+onMounted(() => {
+  roomService.dataReportManager.reportCount(MetricsKey.AITask);
+  roomService.aiTask.on(AI_TASK.TRANSCRIPTION_TASK, handleAISubtitles);
+});
 
 onUnmounted(() => {
   roomService.aiTask.off(AI_TASK.TRANSCRIPTION_TASK, handleAISubtitles);

package/src/TUIRoom/components/AITools/AITranscription.vue

@@ -1,141 +1,138 @@
 <template>
-  <div class="conversation" ref="conversationContainer">
+  <div
+    class="conversation"
+    ref="conversationContainerRef"
+    @scroll="handleScroll"
+  >
     <div
-      v-for="(item, index) in conversations"
-      :key="index"
-      class="conversation-item"
+      v-for="group in transcribedMessageList"
+      :key="group.startMsTs"
+      class="conversation-group"
     >
       <div class="title">
-        <span class="speaker">{{ item.speaker }}</span>
-        <span class="timestamp">{{ item.timestamp }}</span>
+        <span class="speaker">{{
+          roomService.roomStore.getDisplayName(group.sender)
+        }}</span>
+        <span class="timestamp">
+          {{ formatTimestampToTime(group.startMsTs) }}
+        </span>
       </div>
-      <div class="content">
-        <div v-for="(msg, msgIndex) in item.messages" :key="msgIndex">
-          {{ msg }}
-        </div>
+      <div
+        v-for="(message, messageIndex) in group.messages"
+        :key="messageIndex"
+        class="content"
+      >
+        {{ message.text }}
       </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, nextTick } from 'vue';
-import { roomService, AI_TASK } from '../../services';
-
-const conversationContainer = ref<HTMLElement | null>(null);
-
-onMounted(() => scrollToBottom());
-
-const processedConversations = ref<
-  {
-    timestamp: string;
-    speaker: string;
-    content: string;
-  }[]
->(processConversation(roomService.aiTask.transcriptionText.value));
+import { ref, onMounted, computed, nextTick, watch, onUnmounted } from 'vue';
+import {
+  roomService,
+  AI_TASK,
+  SubtitleMessage,
+  MetricsKey,
+} from '../../services';
+import { formatTimestampToTime } from '../../utils/utils.ts';
+
+const conversationContainerRef = ref<HTMLElement>();
+const isUserScrolling = ref(false);
+const timeInterval = 60 * 1000;
+const rawTranscribedMessageList = ref<SubtitleMessage[]>(
+  roomService.aiTask.transcribedMessageList
+);
+
+onMounted(() => {
+  scrollToBottom();
+});
 
 const scrollToBottom = async () => {
-  if (conversationContainer.value) {
+  if (conversationContainerRef.value && !isUserScrolling.value) {
     await nextTick();
-    conversationContainer.value.scrollIntoView({ block: 'end' });
+    conversationContainerRef.value.scrollTop =
+      conversationContainerRef.value.scrollHeight;
   }
 };
 
-const conversations = computed(() => {
-  const result = [];
-  let currentSpeaker: string | null = null;
-  let currentTimestamp: string | null = null;
-  let currentMessages: string[] = [];
+const handleScroll = () => {
+  if (conversationContainerRef.value) {
+    const isAtBottom =
+      conversationContainerRef.value.scrollTop +
+        conversationContainerRef.value.clientHeight >=
+      conversationContainerRef.value.scrollHeight - 5;
+    if (isAtBottom) {
+      isUserScrolling.value = false;
+      scrollToBottom();
+    } else {
+      isUserScrolling.value = true;
+    }
+  }
+};
 
-  processedConversations.value.forEach(item => {
-    const [start, end] = item.timestamp.split('->');
-    const timestampMinute = start.slice(0, 5); // Take the "HH:MM" part
+const transcribedMessageList = computed(() => {
+  const aggregatedMessageList: {
+    sender: string;
+    startMsTs: number;
+    messages: SubtitleMessage[];
+  }[] = [];
+  let currentAggregatedMessage: {
+    sender: string;
+    startMsTs: number;
+    messages: SubtitleMessage[];
+  } | null = null;
 
+  for (const message of rawTranscribedMessageList.value) {
     if (
-      item.speaker === currentSpeaker &&
-      timestampMinute === currentTimestamp
+      !currentAggregatedMessage ||
+      message.sender !== currentAggregatedMessage.sender ||
+      message.startMsTs - currentAggregatedMessage.startMsTs > timeInterval
     ) {
-      // Aggregate messages from the same speaker and within the same minute
-      currentMessages.push(item.content);
+      currentAggregatedMessage = {
+        messages: [message],
+        sender: message.sender,
+        startMsTs: message.startMsTs,
+      };
+      aggregatedMessageList.push(currentAggregatedMessage);
     } else {
-      // New speakers or different minutes, save previous aggregation results
-      if (currentSpeaker !== null) {
-        result.push({
-          timestamp: currentTimestamp,
-          speaker: currentSpeaker,
-          messages: currentMessages,
-        });
-      }
-      // Update active speaker, timestamp, and message
-      currentSpeaker = item.speaker;
-      currentTimestamp = timestampMinute;
-      currentMessages = [item.content];
+      currentAggregatedMessage.messages.push(message);
     }
-  });
-
-  // Save the last set of aggregation results
-  if (currentSpeaker !== null) {
-    result.push({
-      timestamp: currentTimestamp,
-      speaker: currentSpeaker,
-      messages: currentMessages,
-    });
   }
 
-  return result;
+  return aggregatedMessageList;
 });
 
-roomService.aiTask.on(AI_TASK.TRANSCRIPTION_TASK, data => {
-  if (!data) return;
-  processedConversations.value = processConversation(
-    data.transcriptionText.value
-  );
+watch(rawTranscribedMessageList, () => {
+  scrollToBottom();
 });
 
-function processConversation(data: string) {
-  const pattern =
-    /(\d{2}:\d{2}:\d{2}->\d{2}:\d{2}:\d{2})\s+([\u4e00-\u9fa5\w]+):\s*(.*)/;
-
-  const conversations: {
-    timestamp: string;
-    speaker: string;
-    content: string;
-  }[] = [];
-
-  const lines = data.split('\n');
-
-  lines.forEach(line => {
-    const match = pattern.exec(line);
-    if (match) {
-      const timestamp = match[1];
-      const speaker = match[2];
-      const content = match[3];
-      conversations.push({
-        timestamp,
-        speaker,
-        content,
-      });
-    }
-  });
-
-  conversations.sort((a, b) => {
-    const timeA = a.timestamp.split('->')[0];
-    const timeB = b.timestamp.split('->')[0];
-    return timeA.localeCompare(timeB);
-  });
-
-  return conversations;
-}
+const handleAITranscriptionTask = async (data?: {
+  subtitleMessages: { [key: string]: SubtitleMessage };
+  transcribedMessageList: SubtitleMessage[];
+}) => {
+  if (!data) return;
+  rawTranscribedMessageList.value = [...data.transcribedMessageList];
+};
+onMounted(() => {
+  roomService.dataReportManager.reportCount(MetricsKey.AITask);
+  roomService.aiTask.on(AI_TASK.TRANSCRIPTION_TASK, handleAITranscriptionTask);
+});
+onUnmounted(() => {
+  roomService.aiTask.off(AI_TASK.TRANSCRIPTION_TASK, handleAITranscriptionTask);
+});
 </script>
 
 <style scoped lang="scss">
 .conversation {
+  height: 100%;
   padding: 20px;
   overflow-y: auto;
 }
 
-.conversation-item {
-  margin-bottom: 10px;
+.conversation-group {
+  margin-bottom: 20px;
 }
 
 .title {
@@ -147,10 +144,18 @@ function processConversation(data: string) {
   line-height: 22px;
   color: var(--font-color-4);
   text-align: left;
+
+  .speaker {
+    max-width: 150px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 }
 
 .content {
   padding: 8px;
+  margin-top: 5px;
   font-size: 14px;
   font-weight: 400;
   line-height: 22px;

package/src/TUIRoom/components/ManageMember/MemberControl/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="member-control-container">
     <tui-button
+      v-if="singleControl"
       class="button"
       size="default"
       @click="singleControl.func(props.userInfo)"
-      v-if="!isCanOperateMySelf"
     >
       {{ singleControl?.title }}
     </tui-button>
@@ -105,9 +105,14 @@ const {
 
 const { isCanOperateMySelf } = useMemberItemHooks(props.userInfo);
 
-const singleControl = computed(() => controlList.value[0]);
+const singleControl = computed(() => {
+  return isCanOperateMySelf.value ? null : controlList.value[0];
+});
+
 const moreControlList = computed(() => {
-  return isCanOperateMySelf ? controlList.value : controlList.value.slice(1);
+  return isCanOperateMySelf.value
+    ? controlList.value
+    : controlList.value.slice(1);
 });
 const dropdownClass = ref('down');
 const moreBtnRef = ref();

package/src/TUIRoom/components/ManageMember/MemberItemCommon/MemberInfo.vue

@@ -221,7 +221,7 @@ const iconList = computed(() => {
     height: 100%;
     color: var(--icon-color);
 
-    .state-icon .member-invite {
+    .state-icon {
       margin-left: 16px;
     }