filip/smalltalk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli arg server ip

Browse Source
This commit is contained in:
filip
2026-08-23 16:16:25 +02:00
parent fe94daf1f4
commit 09bcc4271b
5 changed files with 158 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+128
View File
@@ -24,6 +24,56 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "anstream"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"is_terminal_polyfill",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
[[package]]
name = "anstyle-parse"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
dependencies = [
"windows-sys",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
dependencies = [
"anstyle",
"once_cell_polyfill",
"windows-sys",
]
[[package]]
name = "autocfg"
version = "1.5.1"
@@ -74,10 +124,51 @@ dependencies = [
"rand_core",
]
[[package]]
name = "clap"
version = "4.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "473c7e07f409a8d772161724aa8db6a765a2532a70f9667eeb7b49d3d02fbdca"
dependencies = [
"clap_builder",
"clap_derive",
]
[[package]]
name = "clap_builder"
version = "4.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b48fea5a88e9ae728a2dcbedbfc0e730f7d60da42e1cb049a83c9fb8b789889"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim",
]
[[package]]
name = "clap_derive"
version = "4.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d012d2b9d65aca7f18f4d9878a045bc17899bba951561ba5ec3c2ba1eed9a061"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 3.0.3",
]
[[package]]
name = "clap_lex"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
[[package]]
name = "client"
version = "0.1.0"
dependencies = [
"clap",
"cpal",
"rand",
"ringbuf",
@@ -87,6 +178,12 @@ dependencies = [
"tokio",
]
[[package]]
name = "colorchoice"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
[[package]]
name = "combine"
version = "4.6.7"
@@ -230,6 +327,12 @@ version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
[[package]]
name = "heck"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "indexmap"
version = "2.14.0"
@@ -240,6 +343,12 @@ dependencies = [
"hashbrown",
]
[[package]]
name = "is_terminal_polyfill"
version = "1.70.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
[[package]]
name = "itoa"
version = "1.0.18"
@@ -526,6 +635,12 @@ version = "1.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
[[package]]
name = "once_cell_polyfill"
version = "1.70.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
[[package]]
name = "parking_lot"
version = "0.12.5"
@@ -729,6 +844,7 @@ dependencies = [
name = "server"
version = "0.1.0"
dependencies = [
"clap",
"rand",
"serde",
"serde_json",
@@ -791,6 +907,12 @@ dependencies = [
"windows-sys",
]
[[package]]
name = "strsim"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "syn"
version = "2.0.119"
@@ -917,6 +1039,12 @@ version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
[[package]]
name = "utf8parse"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "walkdir"
version = "2.5.0"
client/Cargo.toml
+1
View File
@@ -11,3 +11,4 @@ serde = { version = "1.0.229", features = ["derive"] }
serde_json = "1.0.151"
tokio = { version = "1.53.1", features = ["full"] }
rand = "0.10.2"
clap = { version = "4.6.6", features = ["derive"] }
client/src/main.rs
+14 -4
View File
@@ -1,3 +1,4 @@
use clap::Parser;
use cpal::{
Device,
traits::{DeviceTrait, HostTrait, StreamTrait},
@@ -18,6 +19,13 @@ use tokio::{
net::{TcpStream, UdpSocket},
};
#[derive(Parser)]
#[command(version, about)]
struct Cli {
#[arg(short, long, required(true))]
server_ip: Option<String>,
}
#[derive(Clone)]
enum ClientEvent {
NewConnection,
@@ -36,15 +44,17 @@ type InputAudioStreamsInfo = Arc<RwLock<HashMap<AudioStreamKey, AudioStreamInfo>
struct ClientInfo {
client_id: u32,
server_address: &'static str,
server_address: String,
connected: bool,
}
#[tokio::main]
async fn main() {
let cli = Cli::parse();
let client_info: Arc<RwLock<ClientInfo>> = Arc::new(RwLock::new(ClientInfo {
client_id: 0,
server_address: "127.0.0.1:8080",
server_address: cli.server_ip.unwrap(),
connected: false,
}));
@@ -63,7 +73,7 @@ async fn main() {
let server_address = {
let info = client_info.read().unwrap();
info.server_address
info.server_address.clone()
};
let mut tcp_stream = TcpStream::connect(server_address)
@@ -435,7 +445,7 @@ async fn audio_stream_spawner(
let (server_address, client_id) = {
let info = clinet_info.read().unwrap();
(info.server_address, info.client_id)
(info.server_address.clone(), info.client_id)
};
payload.extend(client_id.to_be_bytes());
server/Cargo.toml
+1
View File
@@ -9,3 +9,4 @@ serde = { version = "1.0.229", features = ["derive"] }
serde_json = "1.0.151"
tokio = { version = "1.53.1", features = ["full"] }
rand = "0.10.2"
clap = { version = "4.6.6", features = ["derive"] }
server/src/main.rs
+14 -3
View File
@@ -1,3 +1,4 @@
use clap::Parser;
use shared::{AudioStreamInfo, ResponseStatus, TcpRequest, TcpRequestData, TcpResponse};
use std::sync::Arc;
use std::{collections::HashMap, net::SocketAddr};
@@ -6,6 +7,14 @@ use tokio::{
net::{TcpListener, UdpSocket},
sync::{RwLock, broadcast},
};
#[derive(Parser)]
#[command(version, about)]
struct Cli {
#[arg(short, long, default_value("0.0.0.0:8080"))]
server_ip: Option<String>,
}
// TODO: add auth to this
struct Client {
udp_addr: Option<SocketAddr>,
@@ -36,7 +45,9 @@ fn scrape_all_client_streams_info(clients: &HashMap<u32, Client>) -> Vec<AudioSt
#[tokio::main]
async fn main() {
let listen_address = "0.0.0.0:8080";
let cli = Cli::parse();
let listen_address = cli.server_ip.unwrap();
let (global_event_tx, _) = broadcast::channel::<ServerEvent>(16);
@@ -44,10 +55,10 @@ async fn main() {
let udp_state = state.clone();
let tcp_listener = TcpListener::bind(listen_address)
let tcp_listener = TcpListener::bind(listen_address.clone())
.await
.expect("cant make tcp listener");
let udp_socket = UdpSocket::bind(listen_address)
let udp_socket = UdpSocket::bind(listen_address.clone())
.await
.expect("cant udp socket");