shrink JsWorkerRequest & use the right HashMap/Set

Author: Centril

Cargo.lock

@@ -7,6 +7,7 @@ license-file = "LICENSE"
 description = "Auth helpers for SpacetimeDB"
 
 [dependencies]
+spacetimedb-data-structures.workspace = true
 spacetimedb-lib = { workspace = true, features = ["serde"] }
 
 anyhow.workspace = true

crates/auth/Cargo.toml

@@ -3,14 +3,14 @@ pub use jsonwebtoken::errors::ErrorKind as JwtErrorKind;
 pub use jsonwebtoken::{DecodingKey, EncodingKey};
 use serde::Deserializer;
 use serde::{Deserialize, Serialize};
+use spacetimedb_data_structures::map::HashMap;
 use spacetimedb_lib::Identity;
-use std::collections::HashMap;
 use std::time::SystemTime;
 
 #[derive(Debug, Clone)]
 pub struct ConnectionAuthCtx {
     pub claims: SpacetimeIdentityClaims,
-    pub jwt_payload: String,
+    pub jwt_payload: Box<str>,
 }
 
 impl TryFrom<SpacetimeIdentityClaims> for ConnectionAuthCtx {
@@ -19,7 +19,7 @@ impl TryFrom<SpacetimeIdentityClaims> for ConnectionAuthCtx {
         let payload = serde_json::to_string(&claims).map_err(|e| anyhow::anyhow!("Failed to serialize claims: {e}"))?;
         Ok(ConnectionAuthCtx {
             claims,
-            jwt_payload: payload,
+            jwt_payload: payload.into(),
         })
     }
 }
@@ -31,11 +31,11 @@ pub struct SpacetimeIdentityClaims {
     #[serde(rename = "hex_identity")]
     pub identity: Identity,
     #[serde(rename = "sub")]
-    pub subject: String,
+    pub subject: Box<str>,
     #[serde(rename = "iss")]
-    pub issuer: String,
+    pub issuer: Box<str>,
     #[serde(rename = "aud")]
-    pub audience: Vec<String>,
+    pub audience: Box<[Box<str>]>,
 
     /// The unix timestamp the token was issued at
     #[serde_as(as = "serde_with::TimestampSeconds")]
@@ -44,27 +44,27 @@ pub struct SpacetimeIdentityClaims {
     pub exp: Option<SystemTime>,
 
     #[serde(flatten)]
-    pub extra: Option<HashMap<String, serde_json::Value>>,
+    pub extra: Option<HashMap<Box<str>, serde_json::Value>>,
 }
 
-fn deserialize_audience<'de, D>(deserializer: D) -> Result<Vec<String>, D::Error>
+fn deserialize_audience<'de, D>(deserializer: D) -> Result<Box<[Box<str>]>, D::Error>
 where
     D: Deserializer<'de>,
 {
     // By using `untagged`, it will try the different options.
     #[derive(Deserialize)]
     #[serde(untagged)]
     enum Audience {
-        Single(String),
-        Multiple(Vec<String>),
+        Single(Box<str>),
+        Multiple(Box<[Box<str>]>),
     }
 
     // Deserialize into the enum
     let audience = Audience::deserialize(deserializer)?;
 
-    // Convert the enum into a Vec<String>
+    // Convert the enum into a list.
     Ok(match audience {
-        Audience::Single(s) => vec![s],
+        Audience::Single(s) => [s].into(),
         Audience::Multiple(v) => v,
     })
 }
@@ -77,11 +77,11 @@ pub struct IncomingClaims {
     #[serde(rename = "hex_identity")]
     pub identity: Option<Identity>,
     #[serde(rename = "sub")]
-    pub subject: String,
+    pub subject: Box<str>,
     #[serde(rename = "iss")]
-    pub issuer: String,
+    pub issuer: Box<str>,
     #[serde(rename = "aud", default, deserialize_with = "deserialize_audience")]
-    pub audience: Vec<String>,
+    pub audience: Box<[Box<str>]>,
 
     /// The unix timestamp the token was issued at
     #[serde_as(as = "serde_with::TimestampSeconds")]
@@ -91,7 +91,7 @@ pub struct IncomingClaims {
 
     /// All remaining claims from the JWT payload
     #[serde(flatten)]
-    pub extra: Option<HashMap<String, serde_json::Value>>,
+    pub extra: Option<HashMap<Box<str>, serde_json::Value>>,
 }
 
 impl TryInto<SpacetimeIdentityClaims> for IncomingClaims {
@@ -153,9 +153,9 @@ mod tests {
 
         let claims: IncomingClaims = serde_json::from_value(json_data).unwrap();
 
-        assert_eq!(claims.audience, vec!["audience1"]);
-        assert_eq!(claims.subject, "123");
-        assert_eq!(claims.issuer, "example.com");
+        assert_eq!(claims.audience, ["audience1".into()].into());
+        assert_eq!(&*claims.subject, "123");
+        assert_eq!(&*claims.issuer, "example.com");
         assert_eq!(claims.iat, UNIX_EPOCH + std::time::Duration::from_secs(1693425600));
         assert_eq!(
             claims.exp,
@@ -175,9 +175,9 @@ mod tests {
 
         let claims: IncomingClaims = serde_json::from_value(json_data).unwrap();
 
-        assert_eq!(claims.audience, vec!["audience1", "audience2"]);
-        assert_eq!(claims.subject, "123");
-        assert_eq!(claims.issuer, "example.com");
+        assert_eq!(claims.audience, ["audience1".into(), "audience2".into()].into());
+        assert_eq!(&*claims.subject, "123");
+        assert_eq!(&*claims.issuer, "example.com");
         assert_eq!(claims.iat, UNIX_EPOCH + std::time::Duration::from_secs(1693425600));
         assert_eq!(
             claims.exp,
@@ -197,8 +197,8 @@ mod tests {
         let claims: IncomingClaims = serde_json::from_value(json_data).unwrap();
 
         assert!(claims.audience.is_empty()); // Since `default` is used, it should be an empty vector
-        assert_eq!(claims.subject, "123");
-        assert_eq!(claims.issuer, "example.com");
+        assert_eq!(&*claims.subject, "123");
+        assert_eq!(&*claims.issuer, "example.com");
         assert_eq!(claims.iat, UNIX_EPOCH + std::time::Duration::from_secs(1693425600));
         assert_eq!(
             claims.exp,

crates/auth/src/identity.rs

@@ -72,7 +72,7 @@ fn generate_template_files() {
     let discovered_templates = discover_templates(&templates_dir);
 
     let mut generated_code = String::new();
-    generated_code.push_str("use std::collections::HashMap;\n\n");
+    generated_code.push_str("use spacetimedb_data_structures::map::HashMap;\n\n");
 
     generated_code.push_str("pub fn get_templates_json() -> &'static str {\n");
     generated_code.push_str("    r#\"");

crates/cli/build.rs

@@ -2,9 +2,9 @@ use crate::errors::CliError;
 use crate::util::{contains_protocol, host_or_url_to_host_and_protocol};
 use anyhow::Context;
 use jsonwebtoken::DecodingKey;
+use spacetimedb_data_structures::map::HashMap;
 use spacetimedb_fs_utils::atomic_write;
 use spacetimedb_paths::cli::CliTomlPath;
-use std::collections::HashMap;
 use std::io;
 use std::path::Path;
 use toml_edit::ArrayOfTables;

crates/cli/src/config.rs

@@ -9,7 +9,7 @@ use dialoguer::{theme::ColorfulTheme, Confirm, Input, Select};
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use std::collections::HashMap;
+use spacetimedb_data_structures::map::{HashCollectionExt as _, HashMap};
 use std::path::{Path, PathBuf};
 use std::{fmt, fs};
 use toml_edit::{value, DocumentMut, Item};
@@ -18,6 +18,7 @@ use xmltree::{Element, XMLNode};
 use crate::subcommands::login::{spacetimedb_login_force, DEFAULT_AUTH_HOST};
 
 mod embedded {
+    use spacetimedb_data_structures::map::HashCollectionExt as _;
     include!(concat!(env!("OUT_DIR"), "/embedded_templates.rs"));
 }