Merge remote-tracking branch 'refs/remotes/origin/main'

Author: iaiuse

.gitignore

@@ -11,6 +11,7 @@ node_modules
 dist
 dist-ssr
 *.local
+tx-example*
 
 # Editor directories and files
 .vscode/*

package.json

@@ -37,6 +37,7 @@
     "axios": "^1.7.7",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
+    "crypt-js": "^1.0.4",
     "date-fns": "^4.1.0",
     "dexie": "^4.0.8",
     "face-api.js": "^0.22.2",

pnpm-lock.yaml

@@ -12,7 +12,6 @@ mod http_client;
 use crate::logger::setup_logging;
 use crate::device_manager::DeviceManager;
 use std::sync::Arc;
-use tauri::Manager; 
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

src-tauri/src/main.rs

@@ -3,7 +3,7 @@
   "build": {
     "beforeDevCommand": "pnpm dev",
     "beforeBuildCommand": "pnpm build",
-    "devPath": "http://localhost:1420",
+    "devPath": "http://localhost:1421",
     "distDir": "../dist"
   },
   "package": {

src-tauri/tauri.conf.json

@@ -0,0 +1,26 @@
+import { NextResponse } from 'next/server';
+
+export async function POST(request: Request) {
+  try {
+    const body = await request.json();
+    
+    // 调用火山引擎的语音识别 API
+    const response = await fetch('https://rtc.volcengineapi.com', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        // 添加其他必要的认证头
+      },
+      body: JSON.stringify(body)
+    });
+
+    const data = await response.json();
+    return NextResponse.json(data);
+    
+  } catch (error) {
+    return NextResponse.json(
+      { error: 'Failed to start voice chat' },
+      { status: 500 }
+    );
+  }
+} 

src/app/api/startVoiceChat/route.ts

@@ -0,0 +1,26 @@
+import { NextResponse } from 'next/server';
+
+export async function POST(request: Request) {
+  try {
+    const { taskId } = await request.json();
+    
+    // 调用火山引擎的API停止语音识别任务
+    const response = await fetch('https://rtc.volcengineapi.com/stop', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        // 添加其他必要的认证头
+      },
+      body: JSON.stringify({ taskId })
+    });
+
+    const data = await response.json();
+    return NextResponse.json(data);
+    
+  } catch (error) {
+    return NextResponse.json(
+      { error: 'Failed to stop voice chat' },
+      { status: 500 }
+    );
+  }
+} 

src/app/api/stopVoiceChat/route.ts

@@ -28,8 +28,6 @@ import {
   AlertDialogTitle,
 } from "@/components/ui/alert-dialog";
 import { generateBytedanceSpeech } from '@/lib/bytedanceTts';
-import { messageQueueService } from '../lib/messageQueueService';
-
 
 const ModelName = "InteractionInterface";
 
@@ -66,6 +64,8 @@ export const InteractionInterface: React.FC = () => {
   const [selectedVoice, setSelectedVoice] = useState<string>(defaultVoices[0].id);
   const [isVoiceCloningOpen, setIsVoiceCloningOpen] = useState(false);
   const [voiceToDelete, setVoiceToDelete] = useState<string | null>(null);
+  const [isVoiceRecognitionEnabled, setIsVoiceRecognitionEnabled] = useState(false);
+  const [isRecording, setIsRecording] = useState(false);
 
   useEffect(() => {
     const loadVoices = async () => {
@@ -281,30 +281,6 @@ export const InteractionInterface: React.FC = () => {
     }
   };
 
-  const handleSendToApp = async () => {
-    try {
-      logger.log(`Starting app submission with prompt: ${prompt}`, 'INFO', ModelName);
-
-      const result = await generateResponse(prompt);
-      logger.log(`Generated response: ${JSON.stringify(result)}`, 'INFO', ModelName);
-      setResponse(result);
-
-      const audioBuffer = await generateAudioForResponse(result.response, selectedVoice);
-      logger.log(`Generated speech buffer size: ${audioBuffer.byteLength}`, 'DEBUG', ModelName);
-      setAudioBuffer(audioBuffer);
-
-      // 直接使用 ArrayBuffer 发送
-      await messageQueueService.addMessage(
-        result.kaomoji || 'neutral',
-        audioBuffer
-      );
-      logger.log('Message added to app queue successfully', 'INFO', ModelName);
-
-    } catch (error) {
-      logger.log(`Error in app submission: ${error}`, 'ERROR', ModelName);
-    }
-  };
-
   return (
     <div className="container max-w-[1100px] mx-auto p-6 space-y-8">
       <Card>
@@ -345,6 +321,14 @@ export const InteractionInterface: React.FC = () => {
                 ))}
               </SelectContent>
             </Select>
+            <div className="flex items-center gap-2">
+              <label className="text-sm">语音识别</label>
+              <Switch
+                checked={isVoiceRecognitionEnabled}
+                onCheckedChange={setIsVoiceRecognitionEnabled}
+              />
+              {isRecording && <span className="text-sm text-green-500">录音中...</span>}
+            </div>
           </div>
         </CardHeader>
         <CardContent>

src/components/InteractionInterface.tsx

@@ -9,6 +9,7 @@ import { db } from '../lib/db';
 import { useSerialPorts } from '../hooks/useSerialPorts';
 import { RefreshCw } from 'lucide-react';
 import { invoke } from '@tauri-apps/api';
+import { Label } from "@/components/ui/label";
 
 interface Device {
   deviceId: string;
@@ -38,6 +39,12 @@ export const SettingsPanel: React.FC<SettingsPanelProps> = ({ setIsConfigured })
     bytedance_tts_appId: '',
     bytedance_tts_token: '',
     bytedance_tts_cluster: '',
+    bytedance_tts_voiceAppId: '',
+    bytedance_tts_voiceAccessToken: '',
+    bytedance_tts_asrAppId: '',
+    tencent_asr_appId: '',
+    tencent_asr_secretId: '',
+    tencent_asr_secretKey: ''
   });
 
   const [devices, setDevices] = useState<Device[]>([]);
@@ -78,7 +85,29 @@ export const SettingsPanel: React.FC<SettingsPanelProps> = ({ setIsConfigured })
     }));
   };
 
-  const saveSettings = async () => {
+  const validateVoiceSettings = () => {
+    const { bytedance_tts_voiceAppId, bytedance_tts_voiceAccessToken } = settings;
+    const missingFields = [];
+    
+    if (!bytedance_tts_voiceAppId) {
+      missingFields.push('语音应用ID');
+    }
+    if (!bytedance_tts_voiceAccessToken) {
+      missingFields.push('访问令牌');
+    }
+    
+    if (missingFields.length > 0) {
+      alert(`请完善以下语音识别设置：\n${missingFields.join('\n')}`);
+      return false;
+    }
+    return true;
+  };
+
+  const handleSave = async () => {
+    if (!validateVoiceSettings()) {
+      console.error('Voice recognition settings are incomplete');
+      return;
+    }
     const settingsToSave = Object.entries(settings).map(([key, value]) => ({
       key,
       value
@@ -151,6 +180,8 @@ export const SettingsPanel: React.FC<SettingsPanelProps> = ({ setIsConfigured })
           <TabsTrigger value="device">设备设置</TabsTrigger>
           <TabsTrigger value="tts">TTS设置</TabsTrigger>
           <TabsTrigger value="bytedance_tts">ByteDance TTS设置</TabsTrigger>
+          <TabsTrigger value="bytedance_shibie">ByteDance 实时语音识别设置</TabsTrigger>
+          <TabsTrigger value="tentcent_asr">腾讯云 实时语音识别设置</TabsTrigger>
         </TabsList>
         <TabsContent value="api">
           <Card>
@@ -344,6 +375,7 @@ export const SettingsPanel: React.FC<SettingsPanelProps> = ({ setIsConfigured })
                 <div>
                   <label className="block mb-1">Token</label>
                   <Input
+                  type="password"
                     value={settings.bytedance_tts_token}
                     onChange={(e) => handleChange('bytedance_tts_token', e.target.value)}
                   />
@@ -355,12 +387,76 @@ export const SettingsPanel: React.FC<SettingsPanelProps> = ({ setIsConfigured })
                     onChange={(e) => handleChange('bytedance_tts_cluster', e.target.value)}
                   />
                 </div>
+                
+              </div>
+            </CardContent>
+          </Card>
+        </TabsContent>
+        <TabsContent value="bytedance_shibie">
+          <Card>
+            <CardHeader>ByteDance 实时语音识别设置</CardHeader>
+            <CardContent>
+              <div className="space-y-4">
+                <div className="pt-6">
+                  <div className="space-y-4">
+                    <div>
+                      <Label htmlFor="voiceAppId">语音应用ID</Label>
+                      <Input
+                        id="voiceAppId"
+                        value={settings.bytedance_tts_voiceAppId}
+                        onChange={(e) => handleChange('bytedance_tts_voiceAppId', e.target.value)}
+                        placeholder="输入语音应用ID"
+                      />
+                    </div>
+                    <div>
+                      <Label htmlFor="voiceAccessToken">访问令牌</Label>
+                      <Input
+                        id="voiceAccessToken"
+                        value={settings.bytedance_tts_voiceAccessToken}
+                        onChange={(e) => handleChange('bytedance_tts_voiceAccessToken', e.target.value)}
+                        placeholder="输入访问令牌"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </TabsContent>
+        <TabsContent value="tentcent_asr"> 
+          <Card>
+            <CardHeader>腾讯云 实时语音识别设置</CardHeader>
+            <CardContent>
+              <div className="space-y-4"> 
+                <div>
+                  <label className="block mb-1">App ID</label>
+                  <Input
+                    value={settings.tencent_asr_appId}
+                    onChange={(e) => handleChange('tencent_asr_appId', e.target.value)}
+                  />
+                </div>
+                <div>
+                  <label className="block mb-1">Secret ID</label>
+                  <Input
+                    value={settings.tencent_asr_secretId}
+                    onChange={(e) => handleChange('tencent_asr_secretId', e.target.value)}
+                  />
+                </div>
+                <div>
+                  <label className="block mb-1">Secret Key</label>
+                  <Input
+                    type="password"
+                    value={settings.tencent_asr_secretKey}
+                    onChange={(e) => handleChange('tencent_asr_secretKey', e.target.value)}
+                  />
+                </div>
               </div>
+                        
             </CardContent>
           </Card>
         </TabsContent>
       </Tabs>
-      <Button onClick={saveSettings} className="mt-4">保存所有设置</Button>
+      <Button onClick={handleSave} className="mt-4">保存所有设置</Button>
     </div>
   );
 };