Hass/open-xiaoai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: handlers

Browse Source
This commit is contained in:
Del Wang
2026-01-02 15:16:31 +08:00
parent 4ed8d3dca9
commit 6f55021651
13 changed files with 458 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/client-v2/src/app/server/core.rs
+17 -70
View File
@@ -1,53 +1,19 @@
use crate::app::server::handlers;
use crate::app::server::session::ServerSession;
use crate::audio::codec::OpusCodec;
use crate::audio::config::AudioConfig;
use crate::audio::wav::{WavReader, WavWriter};
use crate::net::discovery::Discovery;
use crate::net::network::{AudioSocket, ControlConnection, ServerNetwork};
use crate::net::protocol::{AudioPacket, ControlPacket, DeviceInfo, RpcResult};
use crate::net::protocol::{AudioPacket, ControlPacket, RpcResult};
use anyhow::{Context, Result};
use parking_lot::Mutex;
use std::collections::HashMap;
use std::net::SocketAddr;
use std::sync::Arc;
use std::sync::atomic::{AtomicU32, Ordering};
use tokio::sync::{broadcast, oneshot};
pub struct RpcManager {
next_id: AtomicU32,
pending: Mutex<HashMap<u32, oneshot::Sender<RpcResult>>>,
}
impl RpcManager {
pub fn new() -> Self {
Self {
next_id: AtomicU32::new(1),
pending: Mutex::new(HashMap::new()),
}
}
pub fn alloc_id(&self) -> (u32, oneshot::Receiver<RpcResult>) {
let id = self.next_id.fetch_add(1, Ordering::SeqCst);
let (tx, rx) = oneshot::channel();
self.pending.lock().insert(id, tx);
(id, rx)
}
pub fn fulfill(&self, id: u32, result: RpcResult) {
if let Some(tx) = self.pending.lock().remove(&id) {
let _ = tx.send(result);
}
}
}
pub struct Session {
pub info: DeviceInfo,
pub control: Arc<tokio::sync::Mutex<ControlConnection>>,
pub addr: SocketAddr,
pub rpc: Arc<RpcManager>,
}
pub struct Server {
sessions: Arc<Mutex<HashMap<SocketAddr, Arc<Session>>>>,
sessions: Arc<Mutex<HashMap<SocketAddr, Arc<ServerSession>>>>,
audio_socket: Arc<AudioSocket>,
}
@@ -98,36 +64,20 @@ impl Server {
);
control.send_packet(&ControlPacket::IdentifyOk).await?;
let rpc = Arc::new(RpcManager::new());
let control = Arc::new(tokio::sync::Mutex::new(control));
let session = Arc::new(Session {
info,
control: control.clone(),
addr,
rpc: rpc.clone(),
});
let (mut reader, writer) = control.split();
let session = Arc::new(ServerSession::new(info, writer, addr));
self.sessions.lock().insert(addr, session.clone());
// 处理控制消息循环
loop {
let mut ctrl = control.lock().await;
let packet = ctrl.recv_packet().await?;
drop(ctrl); // 释放锁以允许发送
match packet {
ControlPacket::RpcResponse { id, result } => {
rpc.fulfill(id, result);
let packet = reader.recv_packet().await?;
let session = session.clone();
tokio::spawn(async move {
if let Err(e) = handlers::handle_packet(session, packet).await {
eprintln!("处理来自 {} 的包时出错: {}", addr, e);
}
ControlPacket::Ping => {
control
.lock()
.await
.send_packet(&ControlPacket::Pong)
.await?;
}
_ => {}
}
});
}
}
@@ -141,7 +91,7 @@ impl Server {
.context("未找到 Session")?;
let (id, rx) = session.rpc.alloc_id();
session
.control
.writer
.lock()
.await
.send_packet(&ControlPacket::RpcRequest {
@@ -163,7 +113,7 @@ impl Server {
// 发送开始录音指令
session
.control
.writer
.lock()
.await
.send_packet(&ControlPacket::StartRecording {
@@ -189,7 +139,7 @@ impl Server {
.cloned()
.context("未找到 Session")?;
session
.control
.writer
.lock()
.await
.send_packet(&ControlPacket::StopRecording)
@@ -206,7 +156,7 @@ impl Server {
.context("未找到 Session")?;
session
.control
.writer
.lock()
.await
.send_packet(&ControlPacket::StartPlayback {
@@ -233,7 +183,7 @@ impl Server {
.cloned()
.context("未找到 Session")?;
session
.control
.writer
.lock()
.await
.send_packet(&ControlPacket::StopPlayback)
@@ -259,8 +209,6 @@ async fn save_audio_to_wav(
println!("正在录制到 {}...", path);
// 这里需要一个停止机制，目前简单起见，如果一段时间没收到包就停止，或者通过全局状态
// 为简单演示，我们录制 100 个包
for _ in 0..100 {
let (packet, _) = socket.recv_packet(&mut udp_buf).await?;
let pcm_len = codec.decode(&packet.data, &mut pcm_buf)?;
@@ -296,7 +244,6 @@ async fn stream_wav_to_client(
};
socket.send_packet(&packet, target).await?;
// 控制发送频率，约 20ms 一帧
tokio::time::sleep(std::time::Duration::from_millis(20)).await;
}
packages/client-v2/src/app/server/handlers.rs
+50
View File
@@ -0,0 +1,50 @@
use crate::app::server::session::ServerSession;
use crate::net::protocol::{ControlPacket, RpcResult};
use anyhow::Result;
use std::sync::Arc;
pub async fn handle_packet(session: Arc<ServerSession>, packet: ControlPacket) -> Result<()> {
match packet {
ControlPacket::RpcResponse { id, result } => {
session.rpc.fulfill(id, result);
}
ControlPacket::RpcRequest { id, method, args } => {
println!(
"收到来自客户端 {} 的 RPC 请求: {} {:?}",
session.addr, method, args
);
let result = handle_server_rpc(&method, args).await;
session
.writer
.lock()
.await
.send_packet(&ControlPacket::RpcResponse { id, result })
.await?;
}
ControlPacket::Ping => {
session
.writer
.lock()
.await
.send_packet(&ControlPacket::Pong)
.await?;
}
_ => {}
}
Ok(())
}
async fn handle_server_rpc(method: &str, _args: Vec<String>) -> RpcResult {
match method {
"status" => RpcResult {
stdout: "Server is running normally".to_string(),
stderr: "".to_string(),
code: 0,
},
_ => RpcResult {
stdout: "".to_string(),
stderr: format!("Server does not support method: {}", method),
code: -1,
},
}
}
packages/client-v2/src/app/server/mod.rs
+2
View File
@@ -1,2 +1,4 @@
pub mod core;
pub mod entry;
pub mod handlers;
pub mod session;
packages/client-v2/src/app/server/session.rs
+23
View File
@@ -0,0 +1,23 @@
use crate::net::network::ControlWriter;
use crate::net::protocol::DeviceInfo;
use crate::net::rpc::RpcManager;
use std::net::SocketAddr;
use std::sync::Arc;
pub struct ServerSession {
pub info: DeviceInfo,
pub writer: Arc<tokio::sync::Mutex<ControlWriter>>,
pub addr: SocketAddr,
pub rpc: Arc<RpcManager>,
}
impl ServerSession {
pub fn new(info: DeviceInfo, writer: ControlWriter, addr: SocketAddr) -> Self {
Self {
info,
writer: Arc::new(tokio::sync::Mutex::new(writer)),
addr,
rpc: Arc::new(RpcManager::new()),
}
}
}