From db15f43610b7dae1a041134c0b19e7654cccfc50 Mon Sep 17 00:00:00 2001 From: shadow cat Date: Tue, 18 Nov 2025 02:32:10 -0500 Subject: [PATCH] binary refactor --- Cargo.toml | 2 +- src/bin/client.rs | 8 ------- src/{client => bin/openworm-client}/app.rs | 2 +- .../openworm-client}/assets/sungals.png | Bin src/{client => bin/openworm-client}/input.rs | 0 .../mod.rs => bin/openworm-client/main.rs} | 22 +++++++++++------- .../client.rs => bin/openworm-client/net.rs} | 10 +++----- .../openworm-client}/render/mod.rs | 0 src/{client => bin/openworm-client}/ui.rs | 8 +++---- src/bin/server.rs | 6 ----- src/{server/mod.rs => bin/server/main.rs} | 16 ++++++++----- src/{net/server.rs => bin/server/net.rs} | 5 ++-- src/lib.rs | 2 -- src/net/mod.rs | 7 +++--- 14 files changed, 37 insertions(+), 51 deletions(-) delete mode 100644 src/bin/client.rs rename src/{client => bin/openworm-client}/app.rs (98%) rename src/{client => bin/openworm-client}/assets/sungals.png (100%) rename src/{client => bin/openworm-client}/input.rs (100%) rename src/{client/mod.rs => bin/openworm-client/main.rs} (96%) rename src/{net/client.rs => bin/openworm-client/net.rs} (95%) rename src/{client => bin/openworm-client}/render/mod.rs (100%) rename src/{client => bin/openworm-client}/ui.rs (97%) delete mode 100644 src/bin/server.rs rename src/{server/mod.rs => bin/server/main.rs} (91%) rename src/{net/server.rs => bin/server/net.rs} (96%) diff --git a/Cargo.toml b/Cargo.toml index b4e4302..367654e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "openworm" version = "0.1.0" edition = "2024" -default-run = "client" +default-run = "openworm-client" [dependencies] arboard = { version = "3.6.1", features = ["wayland-data-control"] } diff --git a/src/bin/client.rs b/src/bin/client.rs deleted file mode 100644 index f79392b..0000000 --- a/src/bin/client.rs +++ /dev/null @@ -1,8 +0,0 @@ -#![windows_subsystem = "windows"] - -use openworm::{client::App, net::install_crypto_provider}; - -fn main() { - install_crypto_provider(); - App::run(); -} diff --git a/src/client/app.rs b/src/bin/openworm-client/app.rs similarity index 98% rename from src/client/app.rs rename to src/bin/openworm-client/app.rs index c26062d..1ea16b7 100644 --- a/src/client/app.rs +++ b/src/bin/openworm-client/app.rs @@ -7,7 +7,7 @@ use winit::{ window::{Window, WindowId}, }; -use crate::client::ClientEvent; +use crate::ClientEvent; use super::Client; diff --git a/src/client/assets/sungals.png b/src/bin/openworm-client/assets/sungals.png similarity index 100% rename from src/client/assets/sungals.png rename to src/bin/openworm-client/assets/sungals.png diff --git a/src/client/input.rs b/src/bin/openworm-client/input.rs similarity index 100% rename from src/client/input.rs rename to src/bin/openworm-client/input.rs diff --git a/src/client/mod.rs b/src/bin/openworm-client/main.rs similarity index 96% rename from src/client/mod.rs rename to src/bin/openworm-client/main.rs index b58ccb6..ac16155 100644 --- a/src/client/mod.rs +++ b/src/bin/openworm-client/main.rs @@ -1,29 +1,33 @@ -use std::sync::Arc; +#![windows_subsystem = "windows"] -pub use app::App; +use crate::{app::App, net::NetSender, ui::*}; +pub use app::AppHandle; use arboard::Clipboard; use input::Input; use iris::prelude::*; +use openworm::{ + net::{ClientMsg, ServerMsg, install_crypto_provider}, + rsc::{CLIENT_DATA, ClientData, DataDir}, +}; use render::Renderer; +use std::sync::Arc; use winit::{ event::{Ime, WindowEvent}, event_loop::{ActiveEventLoop, EventLoopProxy}, window::Window, }; -use crate::{ - client::ui::{Edited, Submit, main_view, msg_widget}, - net::{ClientMsg, ServerMsg, client::NetSender}, - rsc::{CLIENT_DATA, ClientData, DataDir}, -}; +fn main() { + install_crypto_provider(); + App::run(); +} mod app; mod input; +mod net; mod render; mod ui; -pub use app::AppHandle; - pub enum ClientEvent { Connect { send: NetSender, username: String }, ServerMsg(ServerMsg), diff --git a/src/net/client.rs b/src/bin/openworm-client/net.rs similarity index 95% rename from src/net/client.rs rename to src/bin/openworm-client/net.rs index 9b6ec82..91c877d 100644 --- a/src/net/client.rs +++ b/src/bin/openworm-client/net.rs @@ -1,10 +1,6 @@ -use crate::{ - client::{AppHandle, ClientEvent}, - net::{ - ClientMsg, SERVER_NAME, ServerMsg, - no_cert::SkipServerVerification, - transfer::{RecvHandler, recv_uni, send_uni}, - }, +use crate::{AppHandle, ClientEvent}; +use openworm::net::{ + ClientMsg, RecvHandler, SERVER_NAME, ServerMsg, SkipServerVerification, recv_uni, send_uni, }; use quinn::{ ClientConfig, Connection, Endpoint, IdleTimeout, TransportConfig, diff --git a/src/client/render/mod.rs b/src/bin/openworm-client/render/mod.rs similarity index 100% rename from src/client/render/mod.rs rename to src/bin/openworm-client/render/mod.rs diff --git a/src/client/ui.rs b/src/bin/openworm-client/ui.rs similarity index 97% rename from src/client/ui.rs rename to src/bin/openworm-client/ui.rs index 6b1d539..0df7b36 100644 --- a/src/client/ui.rs +++ b/src/bin/openworm-client/ui.rs @@ -1,13 +1,11 @@ use iris::prelude::*; use len_fns::*; +use openworm::net::{ClientMsg, Msg}; use winit::dpi::{LogicalPosition, LogicalSize}; use crate::{ - client::Client, - net::{ - ClientMsg, Msg, - client::{ConnectInfo, NetSender, connect}, - }, + Client, + net::{ConnectInfo, NetSender, connect}, }; #[derive(Eq, PartialEq, Hash, Clone)] diff --git a/src/bin/server.rs b/src/bin/server.rs deleted file mode 100644 index a1ca80d..0000000 --- a/src/bin/server.rs +++ /dev/null @@ -1,6 +0,0 @@ -use openworm::{net::install_crypto_provider, server::run_server}; - -fn main() { - install_crypto_provider(); - run_server(); -} diff --git a/src/server/mod.rs b/src/bin/server/main.rs similarity index 91% rename from src/server/mod.rs rename to src/bin/server/main.rs index 537f34c..40ea625 100644 --- a/src/server/mod.rs +++ b/src/bin/server/main.rs @@ -1,9 +1,8 @@ -use crate::{ - net::{ - ClientMsg, Msg, ServerMsg, - server::{ClientSender, ConAccepter, listen}, - transfer::{DisconnectReason, RecvHandler}, - }, +mod net; + +use net::{ClientSender, ConAccepter, listen}; +use openworm::{ + net::{ClientMsg, DisconnectReason, Msg, RecvHandler, ServerMsg, install_crypto_provider}, rsc::DataDir, }; use std::{ @@ -15,6 +14,11 @@ use std::{ }; use tokio::sync::RwLock; +fn main() { + install_crypto_provider(); + run_server(); +} + #[tokio::main] pub async fn run_server() { let dir = DataDir::default(); diff --git a/src/net/server.rs b/src/bin/server/net.rs similarity index 96% rename from src/net/server.rs rename to src/bin/server/net.rs index e230e31..6f5fd25 100644 --- a/src/net/server.rs +++ b/src/bin/server/net.rs @@ -1,6 +1,5 @@ -use crate::net::{ - ClientMsg, SERVER_NAME, ServerMsg, - transfer::{RecvHandler, SendResult, recv_uni, send_uni}, +use openworm::net::{ + ClientMsg, RecvHandler, SERVER_NAME, SendResult, ServerMsg, recv_uni, send_uni, }; use quinn::{ Connection, Endpoint, ServerConfig, diff --git a/src/lib.rs b/src/lib.rs index 15700d3..2605742 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,2 @@ -pub mod client; pub mod net; -pub mod server; pub mod rsc; diff --git a/src/net/mod.rs b/src/net/mod.rs index 6aed4b4..94bc8fa 100644 --- a/src/net/mod.rs +++ b/src/net/mod.rs @@ -1,9 +1,10 @@ use bincode::config::Configuration; -pub mod client; mod no_cert; -pub mod server; -pub mod transfer; +mod transfer; + +pub use no_cert::*; +pub use transfer::*; pub const SERVER_NAME: &str = "openworm"; pub const BINCODE_CONFIG: Configuration = bincode::config::standard();