wip: migrate some types from network to server crate

Author: cilki

Cargo.lock

@@ -89,7 +89,7 @@ reqwest-websocket = "0.5.0"
 # Terminal client exclusive
 ratatui = { version = "0.30.0", features = ["unstable"] }
 ratatui-image = { version = "8.0.1" }
-tui-popup = { version = "0.6.0" }
+tui-popup = { version = "0.7.2" }
 
 # GUI client exclusive
 bevy = { version = "0.17.3" }

Cargo.toml

@@ -41,7 +41,7 @@ rand = { workspace = true, optional = true }
 # TUI dependencies
 ratatui = { workspace = true, optional = true }
 color-eyre = { version = "0.6.3", optional = true }
-crossterm = { version = "0.28.1", optional = true, features = ["event-stream"] }
+crossterm = { version = "0.29.0", optional = true, features = ["event-stream"] }
 tui-popup = { workspace = true, optional = true }
 
 [features]

sandpolis-client/Cargo.toml

@@ -2,7 +2,7 @@ use crate::gui::input::{LoginDialogState, LoginPhase};
 use crate::gui::listeners::{DatabaseUpdate, DatabaseUpdateSender};
 use bevy::prelude::*;
 use sandpolis_database::{DataCreation, DataIdentifier};
-use sandpolis_network::ServerUrl;
+use sandpolis_server::ServerUrl;
 use sandpolis_server::client::SavedServerData;
 use sandpolis_user::LoginPassword;
 use sandpolis_user::messages::{LoginRequest, LoginResponse};
@@ -145,12 +145,12 @@ pub fn handle_login_phase2(
                 .map_err(|e| format!("Connection failed: {}", e))?;
 
             // Get the server's instance ID from the connection
-            let server_instance_id = connection.inner.data.read().remote_instance;
+            let server_instance_id = connection.data.read().remote_instance;
 
             // Create login request with hashed password
             let login_request = LoginRequest {
                 username: username_clone.clone(),
-                password: LoginPassword::new(connection.inner.cluster_id, &password),
+                password: LoginPassword::new(connection.cluster_id, &password),
                 totp_token,
                 lifetime: Some(Duration::from_secs(86400)), // 24 hours
             };

sandpolis-client/src/gui/login.rs

@@ -1,7 +1,7 @@
 use crate::tui::EventHandler;
+use crossterm::event::{Event, KeyCode, KeyEventKind};
 use ratatui::{
     buffer::Buffer,
-    crossterm::event::{Event, KeyCode, KeyEventKind},
     layout::{Constraint, Layout, Rect},
     style::{Color, Style, Stylize},
     text::{Line, Span, Text},
@@ -200,9 +200,11 @@ impl WidgetRef for HelpWidget {
 
         let help_text = Text::from(lines);
 
-        Paragraph::new(help_text)
-            .style(Style::default().bg(Color::Black))
-            .render_ref(area, buf);
+        ratatui::widgets::Widget::render(
+            Paragraph::new(help_text).style(Style::default().bg(Color::Black)),
+            area,
+            buf,
+        );
     }
 }
 

sandpolis-client/src/tui/help.rs

@@ -1,13 +1,12 @@
 use ratatui::{
     buffer::Buffer,
     layout::{Alignment, Constraint, Layout, Rect},
-    prelude::*,
     style::{Style, Stylize},
     text::Line,
     widgets::{Block, Borders, Paragraph, Widget, WidgetRef},
 };
 use std::time::{Duration, Instant};
-use tui_popup::SizedWidgetRef;
+use tui_popup::KnownSize;
 
 #[derive(Debug, Clone)]
 pub struct LoadingWidget {
@@ -50,7 +49,7 @@ impl LoadingWidget {
     }
 }
 
-impl SizedWidgetRef for LoadingWidget {
+impl KnownSize for LoadingWidget {
     fn width(&self) -> usize {
         40
     }

sandpolis-client/src/tui/loading.rs

@@ -1,11 +1,6 @@
 use color_eyre::Result;
-use ratatui::{
-    crossterm::event::Event,
-    crossterm::event::EventStream,
-    crossterm::event::KeyCode,
-    crossterm::event::KeyEventKind,
-    widgets::{Widget, WidgetRef},
-};
+use crossterm::event::{Event, EventStream, KeyCode, KeyEventKind};
+use ratatui::widgets::WidgetRef;
 use std::time::Duration;
 use tokio_stream::StreamExt;
 
@@ -27,7 +22,7 @@ where
 
     while !should_quit {
         tokio::select! {
-            _ = interval.tick() => { terminal.draw(|frame| frame.render_widget(&widget, frame.area()))?; },
+            _ = interval.tick() => { terminal.draw(|frame| widget.render_ref(frame.area(), frame.buffer_mut()))?; },
             Some(Ok(event)) = events.next() => {
                 if let Event::Key(key) = event {
                     if key.kind == KeyEventKind::Press {

sandpolis-client/src/tui/mod.rs

@@ -261,3 +261,22 @@ fn struct_name_to_id(name: &str) -> u32 {
     name.hash(&mut hasher);
     (hasher.finish() & 0xFFFF_FFFF) as u32
 }
+
+/// Derive macro that implements the `Stream` trait for a struct.
+/// Generates a unique 32-bit type tag based on crate name + struct name.
+#[proc_macro_derive(Stream)]
+pub fn derive_stream(input: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+    let name = &input.ident;
+    let type_tag = struct_name_to_id(&name.to_string());
+
+    let expanded = quote! {
+        impl sandpolis_network::stream::Stream for #name {
+            fn generate_id() -> sandpolis_network::stream::StreamId {
+                ((#type_tag as u64) << 32) | (rand::random::<u32>() as u64)
+            }
+        }
+    };
+
+    TokenStream::from(expanded)
+}

sandpolis-macros/src/lib.rs

@@ -1,9 +1,4 @@
-use crate::ServerUrl;
 use clap::Parser;
 
 #[derive(Parser, Debug, Clone)]
-pub struct NetworkCommandLine {
-    /// Server addresses ($S7S_SERVER)
-    #[clap(long)]
-    pub server: Option<Vec<ServerUrl>>,
-}
+pub struct NetworkCommandLine {}

sandpolis-network/src/cli.rs

@@ -1,17 +1,9 @@
-use crate::{ServerUrl, cli::NetworkCommandLine};
+use crate::cli::NetworkCommandLine;
 use sandpolis_core::LayerConfig;
 use serde::{Deserialize, Serialize};
-use tracing::debug;
 
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct NetworkLayerConfig {
-    /// Servers to connect to.
-    ///
-    /// For GS servers, connections will be established to all given values at
-    /// the same time. For LS servers, agents, and clients, only one connection
-    /// can be maintained at a time.
-    pub servers: Option<Vec<ServerUrl>>,
-
     /// Instead of maintaining a persistent connection, poll the server on this
     /// cron expression
     #[cfg(not(feature = "bootagent"))]
@@ -27,20 +19,7 @@ pub struct NetworkLayerConfig {
 }
 
 impl LayerConfig<NetworkCommandLine> for NetworkLayerConfig {
-    fn override_env(&mut self) {
-        match std::env::var("S7S_SERVER") {
-            Ok(server) => {
-                debug!("Overriding server address from environment");
-                todo!();
-            }
-            Err(_) => todo!(),
-        }
-    }
+    fn override_env(&mut self) {}
 
-    fn override_cli(&mut self, args: &NetworkCommandLine) {
-        if let Some(servers) = &args.server {
-            debug!("Overriding server address from CLI");
-            self.servers = Some(servers.to_owned());
-        }
-    }
+    fn override_cli(&mut self, _args: &NetworkCommandLine) {}
 }