@ray-js/t-agent-ui-ray 0.2.0-beta-9 → 0.2.0-beta-10

package/dist/MessageInput/MessageInputAIStream/AsrInput.js

@@ -1,5 +1,5 @@
 import "core-js/modules/web.dom-collections.iterator.js";
-import React, { useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Button, View } from '@ray-js/ray';
 import cx from 'clsx';
 import { useTranslate } from '../../hooks';
@@ -39,6 +39,12 @@ const AsrInput = props => {
     }
     props.onConfirm();
   };
+  useEffect(() => {
+    if (active && !props.recording) {
+      setActive(false);
+      setCancel(false);
+    }
+  }, [props.recording]);
   return /*#__PURE__*/React.createElement(View, {
     className: "t-agent-message-input-ptt-bar"
   }, /*#__PURE__*/React.createElement(View, {

package/dist/MessageInput/MessageInputAIStream/index.js

@@ -47,7 +47,7 @@ export default function MessageInputAIStream(props) {
     setUploaded,
     upload
   } = attachmentInput;
-  const acRef = useRef(null);
+  const abortRef = useRef(null);
   const [responding, setResponding] = useState(false);
   const [mode, setMode] = useState('text');
   const agent = useChatAgent();
@@ -70,16 +70,26 @@ export default function MessageInputAIStream(props) {
     setUploaded([]);
     setText('');
     setResponding(true);
-    const ac = new AbortController();
-    acRef.current = ac;
-    ac.signal.addEventListener('abort', () => {
-      if (acRef.current === ac) {
-        acRef.current = null;
+    const controller = new AbortController();
+    let abortResolve;
+    abortRef.current = {
+      controller,
+      promise: new Promise(resolve => {
+        abortResolve = resolve;
+      })
+    };
+    controller.signal.addEventListener('abort', () => {
+      var _abortRef$current;
+      if (((_abortRef$current = abortRef.current) === null || _abortRef$current === void 0 ? void 0 : _abortRef$current.controller) === controller) {
+        abortRef.current = null;
         setResponding(false);
       }
     });
     try {
-      await agent.pushInputBlocks(inputBlocks, ac.signal);
+      await agent.pushInputBlocks(inputBlocks, controller.signal);
+      if (controller.signal.aborted) {
+        abortResolve();
+      }
     } finally {
       if (!isUnmounted()) {
         setResponding(false);
@@ -97,16 +107,25 @@ export default function MessageInputAIStream(props) {
     setMoreOpen(false);
     setUploaded([]);
     setResponding(true);
-    const ac = new AbortController();
-    acRef.current = ac;
-    ac.signal.addEventListener('abort', () => {
-      if (acRef.current === ac) {
-        acRef.current = null;
+    const controller = new AbortController();
+    let abortResolve;
+    abortRef.current = {
+      controller,
+      promise: new Promise(resolve => {
+        abortResolve = resolve;
+      })
+    };
+    controller.signal.addEventListener('abort', () => {
+      if (abortRef.current.controller === controller) {
+        abortRef.current = null;
       }
       setResponding(false);
     });
     try {
-      await agent.pushInputBlocks(blocks, ac.signal);
+      await agent.pushInputBlocks(blocks, controller.signal);
+      if (controller.signal.aborted) {
+        abortResolve();
+      }
     } finally {
       if (!isUnmounted()) {
         setResponding(false);
@@ -143,7 +162,7 @@ export default function MessageInputAIStream(props) {
       });
     }
   };
-  const sleep = useSleep();
+  useSleep();
   let container;
   const canSend = text.trim().length && !responding && !attachmentInput.uploading;
   if (mode === 'text') {
@@ -203,8 +222,8 @@ export default function MessageInputAIStream(props) {
       "data-testid": "t-agent-message-input-button-main",
       onClick: async () => {
         if (responding) {
-          if (acRef.current) {
-            acRef.current.abort('User abort');
+          if (abortRef.current) {
+            abortRef.current.controller.abort('User abort');
           }
         } else if (isMore) {
           openMoreClick();
@@ -226,14 +245,19 @@ export default function MessageInputAIStream(props) {
         if (attachmentInput.uploading) {
           return;
         }
-        if (responding && acRef.current) {
-          acRef.current.abort('User abort');
-          // 中断后等待一会再开始
-          await sleep(50);
+        const abort = abortRef.current;
+        if (responding && abort) {
+          abort.controller.abort('User abort');
+          // 中断后等待上次结束再开始
+          await abort.promise;
         }
         const emitter = new Emitter();
-        setTimeout(() => {
+        const id = setTimeout(() => {
           if (r.recording) {
+            ty.showToast({
+              icon: 'none',
+              title: t('t-agent.input.asr.error.timeout')
+            });
             r.confirm();
           }
         }, props.maxAudioMs || 30000);
@@ -242,6 +266,7 @@ export default function MessageInputAIStream(props) {
           recording: true,
           confirm: () => {
             r.recording = false;
+            clearTimeout(id);
             emitter.dispatchEvent(new EmitterEvent('confirm'));
             setRecord({
               startAt: 0,
@@ -252,6 +277,7 @@ export default function MessageInputAIStream(props) {
           },
           cancel: () => {
             r.recording = false;
+            clearTimeout(id);
             emitter.dispatchEvent(new EmitterEvent('cancel'));
             setRecord({
               startAt: 0,
@@ -294,8 +320,8 @@ export default function MessageInputAIStream(props) {
         setMoreOpen(false);
       },
       onAbort: () => {
-        if (responding && acRef.current) {
-          acRef.current.abort('User abort');
+        if (responding && abortRef.current) {
+          abortRef.current.controller.abort('User abort');
         }
       }
     });

package/dist/i18n/strings.d.ts

@@ -22,6 +22,7 @@ declare const _default: {
         't-agent.input.asr.ptt': string;
         't-agent.input.asr.error.too-short': string;
         't-agent.input.asr.error.empty': string;
+        't-agent.input.asr.error.timeout': string;
         't-agent.message.feedback.success': string;
         't-agent.message.bubble.aborted': string;
         't-agent.message.action.copy': string;
@@ -164,6 +165,7 @@ declare const _default: {
         't-agent.input.asr.ptt': string;
         't-agent.input.asr.error.too-short': string;
         't-agent.input.asr.error.empty': string;
+        't-agent.input.asr.error.timeout': string;
         't-agent.message.feedback.success': string;
         't-agent.message.bubble.aborted': string;
         't-agent.message.action.copy': string;

package/dist/i18n/strings.js

@@ -22,6 +22,7 @@ export default {
     't-agent.input.asr.ptt': '按住说话',
     't-agent.input.asr.error.too-short': '说话时间太短',
     't-agent.input.asr.error.empty': '未能从语音中识别到文字',
+    't-agent.input.asr.error.timeout': '语音识别已达时长限制，将直接发送',
     't-agent.message.feedback.success': '反馈成功',
     't-agent.message.bubble.aborted': '用户中断',
     't-agent.message.action.copy': '复制消息',
@@ -160,15 +161,11 @@ export default {
     't-agent.input.voice.require-permission': 'Recording Permission Required',
     't-agent.input.upload.failed': 'File Upload Failed',
     't-agent.input.asr.oninput.text.top': 'Listening, speak now',
-    // 语音激活态顶部提示
     't-agent.input.asr.oninput.text.center': 'Release to send · Swipe up to cancel',
-    // 交互操作指引
     't-agent.input.asr.ptt': 'Press & hold to talk',
-    // Push-to-Talk 按钮提示
     't-agent.input.asr.error.too-short': 'Speaking time too short',
-    // 语音输入时间过短
     't-agent.input.asr.error.empty': 'No text recognized from voice',
-    // 语音识别未能识别到文字
+    't-agent.input.asr.error.timeout': 'Voice recognition has reached time limit, sending directly',
     't-agent.message.feedback.success': 'Feedback Successful',
     't-agent.message.bubble.aborted': 'User Aborted',
     't-agent.message.action.copy': 'Copy Message',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent-ui-ray",
-  "version": "0.2.0-beta-9",
+  "version": "0.2.0-beta-10",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -40,5 +40,5 @@
     "@types/echarts": "^4.9.22",
     "@types/markdown-it": "^14.1.1"
   },
-  "gitHead": "cfe00de066a09da4a63e7c965d42a622f95cda4c"
+  "gitHead": "a17ba630a9ec71afe6a0fc46c427f664d46acf82"
 }