refactor: 调整模块位置

packages/client-v2/Cargo.toml

@@ -11,6 +11,10 @@ panic = "abort"
 strip = true
 debug = false
 
+[features]
+default = []
+app = []
+
 [dependencies]
 opus = "0.3"
 anyhow = "1.0"

packages/client-v2/Makefile

@@ -1,10 +1,16 @@
-build:
+build-server:
+	cargo build --release --bin server --features app
+
+build-client:
 	docker run --rm -v $(shell pwd):/app idootop/open-xiaoai-runtime:oh2p \
-	cargo build --target armv7-unknown-linux-gnueabihf --release
+	cargo build --target armv7-unknown-linux-gnueabihf --release --bin client --features app
+
+run-server:
+	cargo run --bin server --features app
 
 # 部署到小爱音箱（调试自用）
 deploy:
-	dd if=target/armv7-unknown-linux-gnueabihf/release/xiao \
-	| sshpass -p open-xiaoai ssh -o HostKeyAlgorithms=+ssh-rsa root@192.168.31.153 "dd of=/data/xiao"
-	dd if=target/armv7-unknown-linux-gnueabihf/release/xiao \
-	| sshpass -p open-xiaoai ssh -o HostKeyAlgorithms=+ssh-rsa root@192.168.31.235 "dd of=/data/xiao"
+	dd if=target/armv7-unknown-linux-gnueabihf/release/client \
+	| sshpass -p open-xiaoai ssh -o HostKeyAlgorithms=+ssh-rsa root@192.168.31.153 "dd of=/data/client"
+	dd if=target/armv7-unknown-linux-gnueabihf/release/client \
+	| sshpass -p open-xiaoai ssh -o HostKeyAlgorithms=+ssh-rsa root@192.168.31.235 "dd of=/data/client"

packages/client-v2/src/app/client/entry.rs

@@ -0,0 +1,8 @@
+#![cfg(target_os = "linux")]
+
+use anyhow::Result;
+
+pub async fn run_client() -> Result<()> {
+    println!("Hello, Client!");
+    Ok(())
+}

packages/client-v2/src/app/client/mod.rs

@@ -0,0 +1 @@
+pub mod entry;

packages/client-v2/src/app/mod.rs

@@ -1,3 +1,3 @@
-pub mod entry;
-pub mod master;
-pub mod slave;
+pub mod client;
+pub mod server;
+pub mod stereo;

packages/client-v2/src/app/server/entry.rs

@@ -0,0 +1,6 @@
+use anyhow::Result;
+
+pub async fn run_server() -> Result<()> {
+    println!("Hello, Server!");
+    Ok(())
+}

packages/client-v2/src/app/server/mod.rs

@@ -0,0 +1 @@
+pub mod entry;

packages/client-v2/src/app/stereo/entry.rs

@@ -6,7 +6,7 @@ use crate::net::protocol::ChannelRole;
 use anyhow::Result;
 use std::env;
 
-pub async fn run_xiao() -> Result<()> {
+pub async fn run_stereo() -> Result<()> {
     let args: Vec<String> = env::args().collect();
     if args.len() < 3 {
         eprintln!("用法: {} [master|slave] [left|right]", args[0]);

packages/client-v2/src/app/stereo/mod.rs

@@ -0,0 +1,3 @@
+pub mod entry;
+pub mod master;
+pub mod slave;

packages/client-v2/src/bin/client.rs

@@ -2,10 +2,13 @@ use anyhow::Result;
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    #[cfg(target_os = "linux")]
+    #[cfg(feature = "app")]
     {
-        xiao::app::entry::run_xiao().await.unwrap();
+        xiao::app::client::entry::run_client().await?;
+    }
+    #[cfg(not(target_os = "linux"))]
+    {
+        eprintln!("Only support Linux");
     }
-    println!("Only support Linux");
     Ok(())
 }

packages/client-v2/src/bin/server.rs

@@ -0,0 +1,10 @@
+use anyhow::Result;
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    #[cfg(feature = "app")]
+    {
+        xiao::app::server::entry::run_server().await?;
+    }
+    Ok(())
+}

packages/client-v2/src/bin/stereo.rs

@@ -0,0 +1,14 @@
+use anyhow::Result;
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    #[cfg(feature = "app")]
+    {
+        xiao::app::stereo::entry::run_stereo().await?;
+    }
+    #[cfg(not(target_os = "linux"))]
+    {
+        eprintln!("Only support Linux");
+    }
+    Ok(())
+}

packages/client-v2/src/lib.rs

@@ -1,4 +1,6 @@
-pub mod app;
 pub mod audio;
 pub mod net;
 pub mod utils;
+
+#[cfg(feature = "app")]
+pub mod app;