wip: fix some server-side compile errors

Author: cilki

Cargo.lock

@@ -52,6 +52,7 @@ native_db = { git = "https://github.com/vincent-herlemont/native_db", features =
 ] }
 native_model = "0.6.1"
 os_info = "3.8.2"
+passwords = { version = "3.1.16" }
 pem = "3.0.4"
 rand = "0.9.0"
 regex = "1.11.1"

Cargo.toml

@@ -12,7 +12,7 @@ serde = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
 clap = { workspace = true }
-passwords = { version = "3.1.16", optional = true, features = [
+passwords = { workspace = true, optional = true, features = [
   "common-password",
 ] }
 sandpolis-instance = { path = "../sandpolis-instance", version = "0.0.1" }

sandpolis-client/Cargo.toml

@@ -3,7 +3,7 @@ use colored::Color;
 use native_db::ToKey;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
-use std::fmt::Display;
+use std::fmt::{Display, Write};
 use std::ops::Deref;
 use std::str::FromStr;
 use strum::{EnumIter, IntoEnumIterator};
@@ -334,3 +334,19 @@ impl Default for UserName {
         UserName("admin".to_string())
     }
 }
+
+impl Display for UserName {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(&self.0)
+    }
+}
+
+impl ToKey for UserName {
+    fn to_key(&self) -> native_db::Key {
+        native_db::Key::new(self.0.as_bytes().to_vec())
+    }
+
+    fn key_names() -> Vec<String> {
+        vec!["UserName".to_string()]
+    }
+}

sandpolis-core/src/lib.rs

@@ -9,6 +9,7 @@ version = "0.0.1"
 anyhow = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true }
+futures = { workspace = true }
 native_db = { workspace = true }
 native_model = { workspace = true }
 rand = { workspace = true }

sandpolis-database/Cargo.toml

@@ -395,15 +395,12 @@ impl Default for DataRevision {
 
 impl ToKey for DataRevision {
     fn to_key(&self) -> native_db::Key {
-        native_db::Key::new(
-            match self {
-                DataRevision::Latest(v) => *v,
-                // Previous values are stored as negative so we can tell the difference
-                DataRevision::Previous(v) => -v,
-            }
-            .to_be_bytes()
-            .to_vec(),
-        )
+        match self {
+            DataRevision::Latest(v) => *v,
+            // Previous values are stored as negative so we can tell the difference
+            DataRevision::Previous(v) => -v,
+        }
+        .to_key()
     }
 
     fn key_names() -> Vec<String> {
@@ -428,7 +425,7 @@ impl Default for DataExpiration {
 
 impl ToKey for DataExpiration {
     fn to_key(&self) -> native_db::Key {
-        native_db::Key::new(self.0.timestamp_millis().to_be_bytes().to_vec())
+        self.0.timestamp_millis().to_key()
     }
 
     fn key_names() -> Vec<String> {
@@ -457,7 +454,7 @@ impl Default for DataCreation {
 
 impl ToKey for DataCreation {
     fn to_key(&self) -> native_db::Key {
-        native_db::Key::new(self.0.timestamp_millis().to_be_bytes().to_vec())
+        self.0.timestamp_millis().to_key()
     }
 
     fn key_names() -> Vec<String> {
@@ -650,7 +647,7 @@ mod test_resident {
     #[tokio::test]
     #[test_log::test]
     async fn test_temporal_data() -> Result<()> {
-        let database = test_db!(TestData);
+        let database = test_db!(TestHistoryData);
 
         let db = database.realm(RealmName::default()).await?;
         let res: Resident<TestHistoryData> = db.resident(())?;
@@ -673,8 +670,6 @@ mod test_resident {
 
         // Check history
         {
-            trace!("{:?}", DataCreation::all().start_bound());
-            trace!("{:?}", DataCreation::all().end_bound());
             assert_eq!(res.history(DataCreation::all()).await?.len(), 10);
         }
 
@@ -790,6 +785,10 @@ impl<T: Data> ResidentVec<T> {
     pub async fn iter(&self) -> IntoValues<DataIdentifier, Resident<T>> {
         self.inner.read().await.clone().into_values()
     }
+
+    pub async fn stream(&self) -> futures::stream::Iter<IntoValues<DataIdentifier, Resident<T>>> {
+        futures::stream::iter(self.inner.read().await.clone().into_values())
+    }
 }
 
 #[derive(Clone)]

sandpolis-database/src/lib.rs

@@ -22,7 +22,8 @@ pub fn main() {
                 config.clone(),
                 DatabaseLayer::new(config.database.clone(), &*sandpolis::MODELS).unwrap(),
             )
-            .await?;
+            .await
+            .unwrap();
 
             sandpolis::client::gui::main(config, state).await.unwrap();
         });

sandpolis-mobile/src/lib.rs

@@ -12,6 +12,7 @@ axum = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true }
 futures = { workspace = true }
+futures-util = { workspace = true }
 native_db = { workspace = true }
 native_model = { workspace = true }
 reqwest-websocket = { workspace = true }
@@ -27,6 +28,7 @@ serde_with = { workspace = true }
 serde = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
+validator = { workspace = true }
 
 [features]
 agent = []

sandpolis-network/Cargo.toml

@@ -3,7 +3,7 @@ use anyhow::anyhow;
 use anyhow::bail;
 use chrono::{DateTime, Utc};
 use config::NetworkLayerConfig;
-use futures::StreamExt;
+use futures_util::StreamExt;
 use messages::PingRequest;
 use messages::PingResponse;
 use native_db::ToKey;
@@ -19,7 +19,6 @@ use sandpolis_realm::RealmLayer;
 use serde::{Deserialize, Serialize};
 use serde_with::chrono::serde::{ts_seconds, ts_seconds_option};
 use std::fmt::Display;
-use std::fmt::Write;
 use std::net::ToSocketAddrs;
 use std::str::FromStr;
 use std::{cmp::min, net::SocketAddr, sync::Arc, time::Duration};

sandpolis-network/src/lib.rs

@@ -9,9 +9,13 @@ version = "0.0.1"
 anyhow = { workspace = true }
 serde = { workspace = true }
 base64 = { workspace = true }
+futures = { workspace = true }
 rand = { workspace = true }
 native_db = { workspace = true }
 native_model = { workspace = true }
+passwords = { workspace = true, optional = true, features = [
+  "common-password",
+] }
 ring = { workspace = true }
 axum = { workspace = true }
 axum-macros = { workspace = true }
@@ -39,5 +43,6 @@ server = [
   "dep:argon2",
   "dep:jsonwebtoken",
   "dep:sandpolis-server",
+  "dep:passwords",
 ]
 client = ["dep:totp-rs", "totp-rs?/qr", "dep:argon2"]