mirror of
https://github.com/arabianq/pipewire-soundpad.git
synced 2026-06-19 12:13:32 +00:00
refactor(daemon): Refactor commands_loop to use handle_connection (#126)
- Extracted the main token processing loop body in `commands_loop` into `handle_connection` to resolve deep nesting and improve code readability. - Improved request reading logic by using `(&mut stream).take(request_len as u64).read_to_end(&mut buffer)` to strictly bound allocation to `request_len` and prevent initialization overhead. - Passed `cargo fmt` and `cargo clippy`. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
0f8abbc443
commit
105be87222
+17
-8
@@ -15,7 +15,7 @@ use std::os::unix::fs::PermissionsExt;
|
|||||||
use std::{fs, time::Duration};
|
use std::{fs, time::Duration};
|
||||||
use tokio::{
|
use tokio::{
|
||||||
io::{AsyncReadExt, AsyncWriteExt},
|
io::{AsyncReadExt, AsyncWriteExt},
|
||||||
net::UnixListener,
|
net::{UnixListener, UnixStream},
|
||||||
time::sleep,
|
time::sleep,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -83,9 +83,15 @@ async fn main() -> Result<()> {
|
|||||||
|
|
||||||
async fn commands_loop(listener: UnixListener) -> Result<()> {
|
async fn commands_loop(listener: UnixListener) -> Result<()> {
|
||||||
loop {
|
loop {
|
||||||
let (mut stream, _addr) = listener.accept().await?;
|
let (stream, _addr) = listener.accept().await?;
|
||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
|
handle_connection(stream).await;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_connection(mut stream: UnixStream) {
|
||||||
// ---------- Read request (start) ----------
|
// ---------- Read request (start) ----------
|
||||||
let mut len_bytes = [0u8; 4];
|
let mut len_bytes = [0u8; 4];
|
||||||
if stream.read_exact(&mut len_bytes).await.is_err() {
|
if stream.read_exact(&mut len_bytes).await.is_err() {
|
||||||
@@ -103,8 +109,14 @@ async fn commands_loop(listener: UnixListener) -> Result<()> {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut buffer = vec![0u8; request_len];
|
let mut buffer = Vec::new();
|
||||||
if stream.read_exact(&mut buffer).await.is_err() {
|
if (&mut stream)
|
||||||
|
.take(request_len as u64)
|
||||||
|
.read_to_end(&mut buffer)
|
||||||
|
.await
|
||||||
|
.is_err()
|
||||||
|
|| buffer.len() != request_len
|
||||||
|
{
|
||||||
eprintln!("Failed to read message from client!");
|
eprintln!("Failed to read message from client!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -112,8 +124,7 @@ async fn commands_loop(listener: UnixListener) -> Result<()> {
|
|||||||
let request: Request = match serde_json::from_slice(&buffer) {
|
let request: Request = match serde_json::from_slice(&buffer) {
|
||||||
Ok(req) => req,
|
Ok(req) => req,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
let response =
|
let response = Response::new(false, format!("Failed to parse request: {}", err));
|
||||||
Response::new(false, format!("Failed to parse request: {}", err));
|
|
||||||
let response_data = match serde_json::to_vec(&response) {
|
let response_data = match serde_json::to_vec(&response) {
|
||||||
Ok(data) => data,
|
Ok(data) => data,
|
||||||
Err(_) => return, // Should not happen with this simple Response
|
Err(_) => return, // Should not happen with this simple Response
|
||||||
@@ -159,8 +170,6 @@ async fn commands_loop(listener: UnixListener) -> Result<()> {
|
|||||||
if response.status && response.message.eq("killed") {
|
if response.status && response.message.eq("killed") {
|
||||||
std::process::exit(0);
|
std::process::exit(0);
|
||||||
}
|
}
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn player_loop() {
|
async fn player_loop() {
|
||||||
|
|||||||
Reference in New Issue
Block a user