Merge branch 'next'

Author: L-jasmine

resources/index.html

@@ -498,12 +498,18 @@ <h1 class="card-title text-2xl justify-center mb-6">Voice Chat</h1>
                         int16Array[i] = Math.max(-32768, Math.min(32767, audioData[i] * 32767));
                     }
 
+                    if (this.recordingMode) {
+                        this.websocket.send(JSON.stringify({ event: 'StartRecord' }));
+                    } else {
+                        this.websocket.send(JSON.stringify({ event: 'StartChat' }));
+                    }
+
                     this.websocket.send(int16Array.buffer);
                     console.log('Sent VAD audio data to server, length:', int16Array.length);
 
                     // Send different end markers based on recording mode
-                    const endMarker = this.recordingMode ? "End:Recording" : "End:Normal";
-                    this.websocket.send(endMarker);
+                    const endMarker = this.recordingMode ? "Recording" : "Normal";
+                    this.websocket.send(JSON.stringify({ event: 'Submit' }));
                     console.log('Sent end marker:', endMarker);
 
                     // Show sent end marker in debug mode

resources/index_zh.html

@@ -498,12 +498,18 @@ <h1 class="card-title text-2xl justify-center mb-6">语音聊天</h1>
                         int16Array[i] = Math.max(-32768, Math.min(32767, audioData[i] * 32767));
                     }
 
+                    if (this.recordingMode) {
+                        this.websocket.send(JSON.stringify({ event: 'StartRecord' }));
+                    } else {
+                        this.websocket.send(JSON.stringify({ event: 'StartChat' }));
+                    }
+
                     this.websocket.send(int16Array.buffer);
                     console.log('发送 VAD 音频数据到服务器，长度:', int16Array.length);
 
                     // 根据录制模式发送不同的结束标识
-                    const endMarker = this.recordingMode ? "End:Recording" : "End:Normal";
-                    this.websocket.send(endMarker);
+                    const endMarker = this.recordingMode ? "Recording" : "Normal";
+                    this.websocket.send(JSON.stringify({ event: 'Submit' }));
                     console.log('发送结束标识:', endMarker);
 
                     // 在调试模式下显示发送的结束标识

src/ai/bailian/cosyvoice.rs

@@ -181,7 +181,7 @@ impl CosyVoiceTTS {
                         log::debug!("Synthesis task finished");
                         return Ok(None);
                     } else if response.is_result_generated() {
-                        log::debug!("Result generated");
+                        log::trace!("Result generated:{text}");
                     } else {
                         return Err(anyhow::anyhow!("Synthesis error: {:?}", response));
                     }

src/main.rs

@@ -79,7 +79,7 @@ async fn routes(
         // .route("/", get(handler))
         .route("/ws/{id}", any(services::ws::ws_handler))
         .nest("/record", services::file::new_file_service("./record"))
-        .layer(axum::Extension(Arc::new(services::ws::WsPool::new(
+        .layer(axum::Extension(Arc::new(services::ws::WsSetting::new(
             hello_wav,
             config.config,
             tool_set,

src/protocol.rs

@@ -36,3 +36,28 @@ fn test_rmp_command() {
         _ => panic!("Unexpected command: {:?}", cmd),
     }
 }
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[serde(tag = "event")]
+pub enum ClientCommand {
+    StartRecord,
+    StartChat,
+    Submit,
+    Text { input: String },
+}
+
+#[test]
+fn test_rmp_client_command() {
+    let cmd = ClientCommand::Text {
+        input: "Hello".to_string(),
+    };
+    let data = serde_json::to_string(&cmd).unwrap();
+    println!("Serialized data: {}", data);
+    let cmd2: ClientCommand = serde_json::from_str(&data).unwrap();
+    match cmd2 {
+        ClientCommand::Text { input } => {
+            assert_eq!(input, "Hello");
+        }
+        _ => panic!("Unexpected command: {:?}", cmd2),
+    }
+}