Refactor libgsh to split client and server features

Reorganized libgsh by separating client and server functionality into distinct modules, replacing the previous async/simple structure. Introduced new codecs and handshake logic for both client and server, updated example dependencies to use the 'server' feature, and removed obsolete async and sync modules. Updated imports and usage throughout the codebase to reflect the new structure, improving maintainability and feature isolation.

Author: WilliamRagstad

client/Cargo.toml

@@ -11,7 +11,7 @@ webpki-roots = "0.26.8"
 # NOTE: The SDL3 Rust binding crate and feature names may differ; if this crate name/version
 # doesn't exist in your registry, update to the correct crate (for example `sdl3`, `sdl3-sys`,
 # or a specific git repo). This change is the first step to migrate code to SDL3.
-# Use sdl3 with a couple features enabled; adjust if you need different feature set.
+# Use sdl3 with a couple of features enabled; adjust if you need different feature set.
 sdl3 = { version = "0.16.1", features = [
 	"build-from-source",
 	"static-link",

client/src/config.rs

@@ -1,13 +1,15 @@
-use std::fs::File;
-use std::io::Write;
-use std::path::PathBuf;
-use std::{collections::HashMap, io::Read};
-
 use homedir::my_home;
-use libgsh::cert;
-use libgsh::rsa::rand_core::OsRng;
-use libgsh::rsa::{RsaPrivateKey, RsaPublicKey};
+use libgsh::{
+    rsa::{rand_core::OsRng, RsaPrivateKey, RsaPublicKey},
+    shared::cert,
+};
 use serde::{Deserialize, Serialize};
+use std::{
+    collections::HashMap,
+    fs::File,
+    io::{Read, Write},
+    path::PathBuf,
+};
 
 fn gsh_dir() -> PathBuf {
     let mut path = my_home()
@@ -27,7 +29,7 @@ pub struct KnownHost {
 }
 
 impl KnownHost {
-    /// Check if the provided fingerprints contains all of the known fingerprints
+    /// Check if the provided fingerprints contains all the known fingerprints
     pub fn compare(&self, fingerprints: &[Vec<u8>]) -> bool {
         self.fingerprints
             .iter()

client/src/network.rs

@@ -1,36 +1,34 @@
-use std::sync::Arc;
-
+use crate::{auth::ClientAuthProvider, config};
 use dialoguer::Confirm;
-use libgsh::sha2::{Digest, Sha256};
-use libgsh::shared::{
-    protocol::{self, client_hello::MonitorInfo, status_update::StatusType, ServerHelloAck},
-    r#async::AsyncMessageCodec,
+use libgsh::{
+    sha2::{Digest, Sha256},
+    shared::{
+        codec::{GshStreamClient, GshStreamServer},
+        protocol::{
+            client_hello::MonitorInfo, status_update::StatusType, ServerHelloAck, StatusUpdate,
+        },
+    },
 };
+use std::sync::Arc;
 use tokio::{io::AsyncWriteExt, net::TcpStream};
 use tokio_rustls::rustls::{
     self,
     client::danger::{ServerCertVerified, ServerCertVerifier},
     crypto::{ring as provider, CryptoProvider},
     time_provider,
 };
-// use std::{net::TcpStream, sync::Arc};
-use tokio_rustls::{client::TlsStream, TlsConnector};
-
-use crate::{auth::ClientAuthProvider, config};
-
-// pub type Messages = MessageCodec<StreamOwned<ClientConnection, TcpStream>>;
-pub type Messages = AsyncMessageCodec<TlsStream<TcpStream>>;
+use tokio_rustls::TlsConnector;
 
-pub async fn shutdown_tls(messages: &mut Messages) -> anyhow::Result<()> {
+pub async fn shutdown_tls(stream: &mut GshStreamServer) -> anyhow::Result<()> {
     log::trace!("Exiting gracefully...");
-    messages.get_stream().get_mut().1.send_close_notify();
-    messages
-        .write_event(protocol::StatusUpdate {
+    stream.get_inner().get_mut().1.send_close_notify();
+    stream
+        .send(StatusUpdate {
             kind: StatusType::Exit as i32,
             details: None,
         })
         .await?;
-    messages.get_stream().get_mut().0.shutdown().await?;
+    stream.get_inner().get_mut().0.shutdown().await?;
     log::trace!("Connection closed.");
     Ok(())
 }
@@ -121,7 +119,7 @@ pub async fn connect_tls(
     mut known_hosts: config::KnownHosts,
     id_files: config::IdFiles,
     id_override: Option<String>,
-) -> anyhow::Result<(ServerHelloAck, Messages)> {
+) -> anyhow::Result<(ServerHelloAck, GshStreamClient)> {
     let server_name = host.to_string().try_into()?;
     let tls_config = Arc::new(tls_config(insecure)?);
     let tls_connector = TlsConnector::from(tls_config);
@@ -137,8 +135,8 @@ pub async fn connect_tls(
             return Err(anyhow::anyhow!("Host verification failed."));
         }
     }
-    let mut messages = Messages::new(tls_stream);
-    let hello = libgsh::shared::r#async::handshake_client(
+    let mut messages = GshStreamClient::new(tls_stream);
+    let hello = libgsh::client::handshake(
         &mut messages,
         monitors,
         ClientAuthProvider::new(known_hosts, id_files, id_override),

examples/colors/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-libgsh = { workspace = true }
+libgsh = { workspace = true, features = ["server"] }
 rand = "0.9.1"
 log = "0.4.27"
 env_logger = "0.11.8"

examples/cube/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-libgsh = { workspace = true }
+libgsh = { workspace = true, features = ["server"] }
 vek = "0.17.1"
 log = "0.4.27"
 env_logger = "0.11.8"

examples/liquid_sim/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-libgsh = { workspace = true }
+libgsh = { workspace = true, features = ["server"] }
 glam = "0.29.2"
 log = "0.4.27"
 env_logger = "0.11.8"

examples/password_auth/Cargo.toml

@@ -4,6 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-libgsh = { workspace = true }
+libgsh = { workspace = true, features = ["server"] }
 log = "0.4.27"
 env_logger = "0.11.8"

examples/password_auth/src/main.rs

@@ -17,7 +17,7 @@ fn main() {
         .format_target(false)
         .format_timestamp(None)
         .init();
-    let (key, private_key) = libgsh::cert::self_signed(&["localhost"]).unwrap();
+    let (key, private_key) = libgsh::shared::cert::self_signed(&["localhost"]).unwrap();
     let config = libgsh::tokio_rustls::rustls::ServerConfig::builder()
         .with_no_client_auth()
         .with_single_cert(vec![key.cert.der().clone()], private_key)

examples/remote_desktop/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-libgsh = { workspace = true }
+libgsh = { workspace = true, features = ["server"] }
 log = "0.4.27"
 env_logger = "0.11.8"
 xcap = { version = "0.5.1", features = ["image"] }

examples/remote_desktop/src/main.rs

@@ -1,12 +1,12 @@
 use libgsh::{
     async_trait::async_trait,
-    cert,
-    frame::full_frame_segment,
-    r#async::{
+    server::{
         server::AsyncServer,
         service::{AsyncService, AsyncServiceExt},
         Messages,
     },
+    shared::cert,
+    shared::frame::full_frame_segment,
     shared::protocol::{
         client_message,
         server_hello_ack::{self, window_settings, FrameFormat, WindowSettings, ZstdCompression},