wip: bump bevy to release version

Author: cilki

.github/images/sandpolis_arch.svg

@@ -82,3 +82,5 @@ reqwest-websocket = "0.4.4"
 # Client exclusive
 ratatui = { version = "0.29.0", features = ["unstable"] }
 ratatui-image = { version = "5.0.0" }
+tui-popup = { version = "0.6.0" }
+tui-prompts = { version = "0.6.0-alpha.0" }

Cargo.lock

@@ -19,7 +19,7 @@ sandpolis-instance = { path = "../sandpolis-instance", version = "0.0.1" }
 sandpolis-database = { path = "../sandpolis-database", version = "0.0.1" }
 
 # GUI dependencies
-bevy = { version = "0.16.0-rc.3", optional = true }
+bevy = { version = "0.16", optional = true }
 bevy_svg = { version = "0.15.1", optional = true, features = ["2d"] }
 bevy_rapier2d = { version = "0.28.0", optional = true }
 

Cargo.toml

@@ -2,7 +2,7 @@ use anyhow::Result;
 use clap::Parser;
 use colored::Color;
 use sandpolis_database::Document;
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use serde::{Deserialize, Serialize, de::DeserializeOwned};
 use std::{cmp::Ordering, fmt::Display, ops::Deref, path::PathBuf, str::FromStr};
 use strum::{EnumIter, IntoEnumIterator};
 use uuid::Uuid;
@@ -42,8 +42,8 @@ fn format_uuid(src: u128) -> [u8; 36] {
     dst
 }
 
-/// Shared ID across the entire cluster. This never changes throughout the cluster's
-/// lifetime.
+/// Shared ID across the entire cluster. This never changes throughout the
+/// cluster's lifetime.
 #[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct ClusterId(u128);
 
@@ -145,15 +145,16 @@ impl Display for InstanceId {
     Serialize, Deserialize, Clone, Copy, EnumIter, Debug, PartialEq, Eq, PartialOrd, Ord, Hash,
 )]
 pub enum InstanceType {
-    /// Runs continuously on hosts and responds to management requests from servers
-    /// and clients.
+    /// Runs continuously on hosts and responds to management requests from
+    /// servers and clients.
     Agent,
 
     /// User interface for managing instances in the Sandpolis network.
     Client,
 
-    /// Runs continously and coordinates interactions among instances in a Sandpolis
-    /// network. All networks include at least one server instance.
+    /// Runs continously and coordinates interactions among instances in a
+    /// Sandpolis network. All networks include at least one server
+    /// instance.
     Server,
 }
 
@@ -190,12 +191,14 @@ mod test_instance_id {
 
     #[test]
     fn test_types() {
-        assert!(InstanceId::new(&[
-            InstanceType::Agent,
-            InstanceType::Server,
-            InstanceType::Client
-        ])
-        .is_type(InstanceType::Agent));
+        assert!(
+            InstanceId::new(&[
+                InstanceType::Agent,
+                InstanceType::Server,
+                InstanceType::Client
+            ])
+            .is_type(InstanceType::Agent)
+        );
         assert!(InstanceId::new(&[InstanceType::Agent]).is_type(InstanceType::Agent));
         assert!(InstanceId::new(&[InstanceType::Server]).is_type(InstanceType::Server));
         assert!(InstanceId::new(&[InstanceType::Client]).is_type(InstanceType::Client));
@@ -283,7 +286,7 @@ where
     Self: Serialize + DeserializeOwned,
 {
     /// Override the config with values from the command line
-    fn override_cli(&mut self, args: C) {
+    fn override_cli(&mut self, args: &C) {
         // Default no-op
     }
 

sandpolis-client/Cargo.toml

@@ -13,7 +13,7 @@ name = "sandpolis_mobile"
 crate-type = ["staticlib", "cdylib"]
 
 [dependencies]
-bevy = { version = "0.16.0-rc.3" }
+bevy = { version = "0.16" }
 sandpolis = { path = "../sandpolis", version = "8.0.0", features = [
   "client",
   "agent",

sandpolis-instance/src/lib.rs

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

sandpolis-mobile/Cargo.toml

@@ -1,6 +1,7 @@
-use crate::ServerAddress;
+use crate::{ServerAddress, cli::NetworkCommandLine};
 use sandpolis_instance::OverridableConfig;
 use serde::{Deserialize, Serialize};
+use tracing::debug;
 
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct NetworkLayerConfig {
@@ -11,16 +12,26 @@ pub struct NetworkLayerConfig {
     /// can be maintained at a time.
     pub servers: Option<Vec<ServerAddress>>,
 
-    /// Instead of maintaining a persistent connection, poll the server on this cron expression
+    /// Instead of maintaining a persistent connection, poll the server on this
+    /// cron expression
     pub poll: Option<String>,
 }
 
-// impl OverridableConfig<NetworkCommandLine> for NetworkLayerConfig {
+impl OverridableConfig<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) {
-//         match std::env::var("S7S_SERVER") {
-//             Ok(server) => todo!(),
-//             Err(_) => todo!(),
-//         }
-//     }
-// }
+    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());
+        }
+    }
+}

sandpolis-network/src/cli.rs

@@ -19,9 +19,11 @@ use std::fmt::Write;
 use std::net::ToSocketAddrs;
 use std::str::FromStr;
 use std::{cmp::min, net::SocketAddr, sync::Arc, time::Duration};
+use tokio::sync::RwLock;
 use tokio::time::sleep;
 use tracing::debug;
 
+pub mod cli;
 pub mod config;
 pub mod messages;
 pub mod routes;
@@ -95,7 +97,15 @@ impl NetworkLayer {
     }
 
     /// Request the server to coordinate a direct connection to the given agent.
-    pub async fn direct_connect(&self, agent: InstanceId, port: Option<u16>) {}
+    pub async fn direct_connect(&self, agent: InstanceId, port: Option<u16>) {
+        todo!()
+    }
+
+    pub async fn run(&self) {
+        for server in self.servers.iter() {
+            server.run().await;
+        }
+    }
 }
 
 /// Convenience type to be used as return of request handler.
@@ -133,35 +143,6 @@ pub struct ConnectionData {
     disconnected: Option<DateTime<Utc>>,
 }
 
-/// Request the server for a new direct connection to an agent.
-// #[from = "client"]
-// #[to = "server"]
-#[derive(Serialize, Deserialize)]
-pub struct AgentConnectionRequest {
-    // The requested node
-    id: InstanceId,
-
-    // An optional listener port. If specified, the requested node will attempt
-    // a connection on this port. Otherwise, the server will coordinate the connection.
-    port: Option<u16>,
-}
-
-// Request that the recieving instance establish a new connection to the given
-// host. message RQ_CoordinateConnection {
-
-//     // The host IP address
-//     string host = 1;
-
-//     // The port
-//     int32 port = 2;
-
-//     // The transport protocol type
-//     string transport = 3;
-
-//     // The initial encryption key for the new connection.
-//     bytes encryption_key = 4;
-// }
-
 /// A direct connection to an agent from a client.
 pub struct AgentConnection {}
 
@@ -207,7 +188,9 @@ impl Default for ConnectionCooldown {
     }
 }
 
-pub struct ServerConnectionData {}
+pub struct ServerConnectionData {
+    iterations: u64,
+}
 
 /// A connection to a server from any other instance (including another server).
 ///
@@ -230,9 +213,9 @@ pub struct ServerConnectionData {}
 pub struct ServerConnection {
     pub address: ServerAddress,
     group: GroupName,
-    iterations: u64, // TODO Data?
     cooldown: ConnectionCooldown,
     pub client: reqwest::Client,
+    pub data: RwLock<ServerConnectionData>,
 }
 
 impl ServerConnection {
@@ -243,7 +226,7 @@ impl ServerConnection {
     ) -> Result<Self> {
         Ok(Self {
             group: cert.name()?,
-            iterations: 0,
+            data: RwLock::new(ServerConnectionData { iterations: 0 }),
             cooldown,
             client: ClientBuilder::new()
                 .add_root_certificate(cert.ca()?)
@@ -256,10 +239,10 @@ impl ServerConnection {
     }
 
     /// Run the connection routine forever.
-    pub async fn run(mut self) {
+    pub async fn run(&self) {
         loop {
-            if self.iterations > 0 {
-                sleep(self.cooldown.next(self.iterations)).await;
+            if self.data.read().await.iterations > 0 {
+                sleep(self.cooldown.next(self.data.read().await.iterations)).await;
             }
 
             debug!("Attempting server connection");
@@ -281,7 +264,7 @@ impl ServerConnection {
                 },
                 Err(e) => debug!(error = ?e, "Connection failed"),
             }
-            self.iterations += 1;
+            self.data.write().await.iterations += 1;
         }
     }
 }

sandpolis-network/src/config.rs

@@ -12,3 +12,43 @@ pub struct PingResponse {
     pub id: InstanceId,
     pub from: Option<Box<PingResponse>>,
 }
+
+/// Request the server for a new direct connection to an agent.
+#[cfg(any(feature = "server", feature = "client"))]
+#[derive(Serialize, Deserialize)]
+pub struct AgentConnectionRequest {
+    /// Requested agent
+    id: InstanceId,
+    // TODO transport TCP/UDP?
+    /// Current time of this instance which allows the server to forecast the
+    /// connection start time.
+    clock: u64,
+}
+
+#[cfg(any(feature = "server", feature = "client"))]
+#[derive(Serialize, Deserialize)]
+pub struct AgentConnectionResponse {
+    /// Agent's public address
+    address: String,
+
+    /// Randomized port that the client will attempt a connection on.
+    port: u16,
+
+    /// Randomized encryption key for the connection
+    key: String,
+}
+
+/// Request an agent to establish a direct connection to a client or another
+/// agent.
+#[cfg(any(feature = "server", feature = "agent"))]
+#[derive(Serialize, Deserialize)]
+pub struct DirectConnectionRequest {
+    /// Instance's public address
+    address: String,
+
+    /// Randomized port
+    port: u16,
+
+    /// Randomized encryption key for the connection
+    key: String,
+}