git bankruptcy

This adds Serde deserialization. It also needs to add an error for
handling the failure on these deserializations.

I broke strong_ref into its own file because it was starting to grow a
lot.

Cargo.lock

@@ -70,8 +70,8 @@ name = "api"
 version = "0.1.0"
 dependencies = [
  "atproto",
- "axum",
  "http 1.3.1",
+ "router",
  "serde",
  "serde_json",
  "tokio",
@@ -123,6 +123,7 @@ dependencies = [
  "time",
  "tracing",
  "tracing-subscriber",
+ "unicode-segmentation",
 ]
 
 [[package]]
@@ -293,9 +294,9 @@ dependencies = [
 
 [[package]]
 name = "bon"
-version = "3.6.3"
+version = "3.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced38439e7a86a4761f7f7d5ded5ff009135939ecb464a24452eaa4c1696af7d"
+checksum = "f61138465baf186c63e8d9b6b613b508cd832cba4ce93cf37ce5f096f91ac1a6"
 dependencies = [
  "bon-macros",
  "rustversion",
@@ -303,9 +304,9 @@ dependencies = [
 
 [[package]]
 name = "bon-macros"
-version = "3.6.3"
+version = "3.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce61d2d3844c6b8d31b2353d9f66cf5e632b3e9549583fe3cac2f4f6136725e"
+checksum = "40d1dad34aa19bf02295382f08d9bc40651585bd497266831d40ee6296fb49ca"
 dependencies = [
  "darling",
  "ident_case",
@@ -662,6 +663,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "entryway"
+version = "0.1.0"
+dependencies = [
+ "atproto",
+ "http 1.3.1",
+ "router",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -1813,6 +1828,21 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "router"
+version = "0.1.0"
+dependencies = [
+ "atproto",
+ "axum",
+ "bon",
+ "http 1.3.1",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "rsa"
 version = "0.9.8"
@@ -2708,6 +2738,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
 [[package]]
 name = "unsigned-varint"
 version = "0.8.0"

Cargo.toml

@@ -1,11 +1,13 @@
 [workspace]
 resolver = "3"
-members = [ "api", "atproto","db", "ingestor"]
+members = [ "api", "atproto", "entryway", "db", "router", "ingestor" ]
 
 [workspace.dependencies]
 async-trait = "0.1.88"
 atproto = { path = "./atproto" }
-serde = "1.0.219"
+db = { path = "./db" }
+router = { path = "./router" }
+serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio"] }
 thiserror = "2.0.12"

api/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2024"
 
 [dependencies]
 atproto.workspace = true
-axum = { version = "0.8.3", features = ["json"] }
+router.workspace = true
 http = "1.3.1"
 serde.workspace = true
 serde_json.workspace = true

api/src/main.rs

@@ -1,4 +1,4 @@
-use crate::router::{
+use router::{
   Router,
   Endpoint,
   xrpc::{

api/src/router.rs

@@ -1,59 +0,0 @@
-use crate::router::xrpc::{
-  XrpcEndpoint,
-  XrpcHandler,
-  QueryInput,
-  ProcedureInput,
-};
-use atproto::Nsid;
-use axum::Router as AxumRouter;
-use core::net::SocketAddr;
-use std::net::{IpAddr, Ipv4Addr};
-use tokio::net::TcpListener;
-
-pub struct Router {
-  addr: SocketAddr,
-  router: AxumRouter,
-}
-
-// In case server ever needs to support more than just XRPC
-pub enum Endpoint {
-  Xrpc(XrpcEndpoint),
-}
-impl Endpoint {
-  pub fn new_xrpc_query<Q>(nsid: Nsid, query: Q) -> Self
-  where
-    Q: XrpcHandler<QueryInput> + Clone
-  {
-    Endpoint::Xrpc(XrpcEndpoint::new_query(nsid,query))
-  }
-  pub fn new_xrpc_procedure<P>(nsid: Nsid, procedure: P) -> Self
-  where
-    P: XrpcHandler<ProcedureInput> + Clone
-  {
-    Endpoint::Xrpc(XrpcEndpoint::new_procedure(nsid,procedure))
-  }
-}
-
-pub mod xrpc;
-
-impl Router {
-  pub fn new() -> Self {
-    let mut router = AxumRouter::new();
-    router = XrpcEndpoint::not_implemented().add_to_router(router);
-    let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127,0,0,1)), 6702);
-    Router { router, addr }
-  }
-
-  pub fn add_endpoint(mut self, endpoint: Endpoint) -> Self {
-    match endpoint {
-      Endpoint::Xrpc(ep) => self.router = ep.add_to_router(self.router),
-    };
-    self
-  }
-
-  pub async fn serve(self) {
-    let listener = TcpListener::bind(self.addr).await.unwrap();
-
-    axum::serve(listener, self.router).await.unwrap();
-  }
-}

atproto/Cargo.toml

@@ -13,6 +13,7 @@ time = { version = "0.3.41", features = ["parsing", "formatting"] }
 tracing-subscriber.workspace = true
 tracing.workspace = true
 thiserror.workspace = true
+unicode-segmentation = "1.9.0"
 
 [features]
 default = []

atproto/src/error.rs

@@ -20,8 +20,12 @@ pub enum FormatError {
 pub enum ParseError {
   #[error("Time Parse Error: {0}")]
   Datetime(#[from] time::error::Parse),
+  #[error("Json Parse Error: {0}")]
+  Serde(#[from] serde_json::error::Error),
   #[error("Length of parsed object too long, max: {max:?}, got: {got:?}.")]
   Length { max: usize, got: usize },
+  #[error("Length of parsed object too short, min: {min:?}, got: {got:?}.")]
+  MinLength { min: usize, got: usize },
   #[error("Currently Did is enforced, cannot use handle, {handle:?}")]
   ForceDid { handle: String },
   #[error("Incorrectly formatted")]

atproto/src/lexicons/mod.rs

@@ -1,3 +1 @@
-// @generated - This file is generated by esquema-codegen (forked from atrium-codegen). DO NOT EDIT.
+pub mod myspoor;
-pub mod record;
-pub mod my;

atproto/src/lexicons/my.rs

@@ -1,3 +0,0 @@
-// @generated - This file is generated by esquema-codegen (forked from atrium-codegen). DO NOT EDIT.
-//!Definitions for the `my` namespace.
-pub mod spoor;

atproto/src/lexicons/my/spoor.rs

@@ -1,4 +0,0 @@
-// @generated - This file is generated by esquema-codegen (forked from atrium-codegen). DO NOT EDIT.
-//!Definitions for the `my.spoor` namespace.
-pub mod content;
-pub mod log;

atproto/src/lexicons/my/spoor/log.rs

@@ -1,16 +0,0 @@
-// @generated - This file is generated by esquema-codegen (forked from atrium-codegen). DO NOT EDIT.
-//!Definitions for the `my.spoor.log` namespace.
-pub mod activity;
-pub mod session;
-#[derive(Debug)]
-pub struct Activity;
-impl atrium_api::types::Collection for Activity {
-    const NSID: &'static str = "my.spoor.log.activity";
-    type Record = activity::Record;
-}
-#[derive(Debug)]
-pub struct Session;
-impl atrium_api::types::Collection for Session {
-    const NSID: &'static str = "my.spoor.log.session";
-    type Record = session::Record;
-}

atproto/src/lexicons/myspoor/log.rs

@@ -0,0 +1,11 @@
+use serde::Deserialize;
+use crate::types::{BoundString, StrongRef, Uri, Did, Datetime};
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Session {
+  pub content: StrongRef<Uri>,
+  pub label: Option<BoundString<64, 640>>,
+  pub other_participants: Option<Vec<Did>>,
+  pub created_at: Datetime,
+}

atproto/src/lexicons/myspoor/mod.rs

@@ -0,0 +1,2 @@
+pub mod content;
+pub mod log;

atproto/src/lexicons/record.rs

@@ -1,65 +0,0 @@
-// @generated - This file is generated by esquema-codegen (forked from atrium-codegen). DO NOT EDIT.
-//!A collection of known record types.
-#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)]
-#[serde(tag = "$type")]
-pub enum KnownRecord {
-    #[serde(rename = "my.spoor.content.external")]
-    LexiconsMySpoorContentExternal(
-        Box<crate::lexicons::my::spoor::content::external::Record>,
-    ),
-    #[serde(rename = "my.spoor.content.media")]
-    LexiconsMySpoorContentMedia(Box<crate::lexicons::my::spoor::content::media::Record>),
-    #[serde(rename = "my.spoor.log.activity")]
-    LexiconsMySpoorLogActivity(Box<crate::lexicons::my::spoor::log::activity::Record>),
-    #[serde(rename = "my.spoor.log.session")]
-    LexiconsMySpoorLogSession(Box<crate::lexicons::my::spoor::log::session::Record>),
-}
-impl From<crate::lexicons::my::spoor::content::external::Record> for KnownRecord {
-    fn from(record: crate::lexicons::my::spoor::content::external::Record) -> Self {
-        KnownRecord::LexiconsMySpoorContentExternal(Box::new(record))
-    }
-}
-impl From<crate::lexicons::my::spoor::content::external::RecordData> for KnownRecord {
-    fn from(
-        record_data: crate::lexicons::my::spoor::content::external::RecordData,
-    ) -> Self {
-        KnownRecord::LexiconsMySpoorContentExternal(Box::new(record_data.into()))
-    }
-}
-impl From<crate::lexicons::my::spoor::content::media::Record> for KnownRecord {
-    fn from(record: crate::lexicons::my::spoor::content::media::Record) -> Self {
-        KnownRecord::LexiconsMySpoorContentMedia(Box::new(record))
-    }
-}
-impl From<crate::lexicons::my::spoor::content::media::RecordData> for KnownRecord {
-    fn from(
-        record_data: crate::lexicons::my::spoor::content::media::RecordData,
-    ) -> Self {
-        KnownRecord::LexiconsMySpoorContentMedia(Box::new(record_data.into()))
-    }
-}
-impl From<crate::lexicons::my::spoor::log::activity::Record> for KnownRecord {
-    fn from(record: crate::lexicons::my::spoor::log::activity::Record) -> Self {
-        KnownRecord::LexiconsMySpoorLogActivity(Box::new(record))
-    }
-}
-impl From<crate::lexicons::my::spoor::log::activity::RecordData> for KnownRecord {
-    fn from(record_data: crate::lexicons::my::spoor::log::activity::RecordData) -> Self {
-        KnownRecord::LexiconsMySpoorLogActivity(Box::new(record_data.into()))
-    }
-}
-impl From<crate::lexicons::my::spoor::log::session::Record> for KnownRecord {
-    fn from(record: crate::lexicons::my::spoor::log::session::Record) -> Self {
-        KnownRecord::LexiconsMySpoorLogSession(Box::new(record))
-    }
-}
-impl From<crate::lexicons::my::spoor::log::session::RecordData> for KnownRecord {
-    fn from(record_data: crate::lexicons::my::spoor::log::session::RecordData) -> Self {
-        KnownRecord::LexiconsMySpoorLogSession(Box::new(record_data.into()))
-    }
-}
-impl Into<atrium_api::types::Unknown> for KnownRecord {
-    fn into(self) -> atrium_api::types::Unknown {
-        atrium_api::types::TryIntoUnknown::try_into_unknown(&self).unwrap()
-    }
-}

atproto/src/lib.rs

@@ -1,5 +1,7 @@
-pub mod lexicons;
+// pub mod lexicons;
 pub mod types;
 pub mod error;
 #[cfg(feature = "sqlx-support")]
 pub mod sqlx;
+
+pub use atrium_api::types::Collection;

atproto/src/types.rs

@@ -1,5 +1,20 @@
 use crate::error::{Error, ParseError};
 
+#[macro_export]
+macro_rules! basic_deserializer {
+  ($name:ident) => {
+    impl<'de> serde::de::Deserialize<'de> for $name {
+      fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> 
+      where
+        D: serde::de::Deserializer<'de>,
+      {
+        let value: String = serde::de::Deserialize::deserialize(deserializer)?;
+        value.parse::<$name>().map_err(<D::Error as serde::de::Error>::custom)
+      }
+    }
+  }
+}
+
 macro_rules! basic_string_type {
   ($name:ident, $regex:literal, $max_len:literal) => {
     pub struct $name { value: String, }
@@ -35,20 +50,26 @@ macro_rules! basic_string_type {
         })
       }
     }
+    
+    basic_deserializer!($name);
   }
 }
 
-mod did;
-pub use did::Did;
-mod cid;
-pub use cid::Cid;
 mod authority;
-pub use authority::Authority;
+mod bound_string;
+mod cid;
 mod datetime;
-pub use datetime::Datetime;
+mod did;
 mod record_key;
-pub use record_key::RecordKey;
+mod strong_ref;
 mod uri;
+pub use authority::Authority;
+pub use bound_string::BoundString;
+pub use cid::Cid;
+pub use datetime::Datetime;
+pub use did::Did;
+pub use record_key::RecordKey;
+pub use strong_ref::StrongRef;
 pub use uri::Uri;
 
 basic_string_type!(Handle,
@@ -63,22 +84,3 @@ basic_string_type!(Tid,
   r"^[234567abcdefghij][234567abcdefghijklmnopqrstuvwxyz]{12}$",
   13
 );
-
-pub struct StrongRef<T> {
-  content: T,
-  cid: Cid,
-}
-
-impl<T> StrongRef<T> {
-  pub fn get_content(&self) -> &T {
-    &self.content
-  }
-
-  pub fn extract_content(self) -> (T, Cid) {
-    (self.content, self.cid)
-  }
-
-  pub fn get_cid(&self) -> &Cid {
-    &self.cid
-  }
-}

atproto/src/types/authority.rs

@@ -1,12 +1,16 @@
 use crate::{
-  types::{Did, Handle},
+  types::{
+    Did, Handle
+  },
   error::{Error, ParseError},
 };
+use serde::Deserialize;
 use std::{
   fmt::{Display, Formatter, Result as FmtResult},
   str::FromStr,
 };
 
+#[derive(Deserialize)]
 pub enum Authority {
   Did(Did),
   Handle(Handle),

atproto/src/types/bound_string.rs

@@ -0,0 +1,57 @@
+use unicode_segmentation::UnicodeSegmentation;
+use crate::error::{Error, ParseError};
+use std::{
+  fmt::{Display, Formatter, Result as FmtResult},
+  str::FromStr,
+};
+
+pub struct BoundString<
+  const MIN: usize, const MAX: usize>
+{
+  value: String,
+}
+
+impl<const MIN: usize, const MAX: usize> BoundString<MIN, MAX> {
+  fn check_length(s: &str) -> Result<(), Error> {
+    let grapheme_count: usize = s.graphemes(true).take(MAX + 1).count();
+    if grapheme_count > MAX {
+      return Err(Error::Parse {
+        err: ParseError::Length { max: MAX, got: grapheme_count },
+        object: "String".to_string(),
+      });
+    }
+    if grapheme_count < MIN {
+      return Err(Error::Parse {
+        err: ParseError::MinLength { min: MIN, got: grapheme_count },
+        object: "String".to_string(),
+      });
+    }
+    Ok(())
+  }
+}
+
+impl<const MIN: usize, const MAX: usize> Display for BoundString<MIN, MAX> {
+  fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
+    write!(f, "{}", self.value)
+  }
+}
+
+impl<const MIN: usize, const MAX: usize> FromStr for BoundString<MIN, MAX> {
+  type Err = Error;
+  fn from_str(s: &str) -> Result<Self, Self::Err> {
+    Self::check_length(s)?;
+
+    Ok(BoundString { value: s.to_string() })
+  }
+}
+
+impl<'de, const MIN: usize, const MAX: usize> serde::de::Deserialize<'de> 
+    for BoundString<MIN, MAX> {
+  fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> 
+  where
+    D: serde::de::Deserializer<'de>,
+  {
+    let value: String = serde::de::Deserialize::deserialize(deserializer)?;
+    value.parse::<BoundString<MIN,MAX>>().map_err(<D::Error as serde::de::Error>::custom)
+  }
+}

atproto/src/types/cid.rs

@@ -1,4 +1,7 @@
-use crate::error::Error;
+use crate::{
+  basic_deserializer,
+  error::Error
+};
 
 pub struct Cid { value: String, }
 
@@ -14,3 +17,5 @@ impl std::str::FromStr for Cid {
     Ok(Self { value: s.to_string() })
   }
 }
+
+basic_deserializer!(Cid);

atproto/src/types/datetime.rs

@@ -1,4 +1,7 @@
-use crate::error::{Error, ParseError, FormatError};
+use crate::{
+  basic_deserializer,
+  error::{Error, ParseError, FormatError},
+};
 use time::{
   UtcDateTime,
   format_description::well_known::{Rfc3339, Iso8601},
@@ -61,3 +64,5 @@ impl FromStr for Datetime {
     Ok(Datetime { time: datetime, derived_string: s.to_string() })
   }
 }
+
+basic_deserializer!(Datetime);

atproto/src/types/did.rs

@@ -1,4 +1,7 @@
-use crate::error::{Error, ParseError};
+use crate::{
+  basic_deserializer,
+  error::{Error, ParseError},
+};
 use std::{
   fmt::{Display, Formatter, Result as FmtResult},
   str::FromStr,
@@ -31,6 +34,8 @@ impl FromStr for DidMethod {
   }
 }
 
+basic_deserializer!(DidMethod);
+
 pub struct Did {
   method: DidMethod,
   identifier: String,
@@ -70,3 +75,5 @@ impl FromStr for Did {
     })
   }
 }
+
+basic_deserializer!(Did);

atproto/src/types/record_key.rs

@@ -61,3 +61,5 @@ impl FromStr for RecordKey {
     Ok(RecordKey::Any(s.to_string()))
   }
 }
+
+basic_deserializer!(RecordKey);

atproto/src/types/strong_ref.rs

@@ -0,0 +1,46 @@
+use crate::{
+  basic_deserializer,
+  types::{Cid, Uri},
+  error::{Error, ParseError},
+};
+
+pub struct StrongRef<T> {
+  content: T,
+  cid: Cid,
+}
+
+impl StrongRef<Uri> {
+  pub fn from_atrium_api(strong_ref: atrium_api::com::atproto::repo::strong_ref::MainData) -> Result<Self, Error> {
+    let str_cid = serde_json::to_string(&strong_ref.cid).map_err(|e| {
+      Error::Parse { err: ParseError::Serde(e), object: "Uri".to_string() }
+    })?;
+    Ok(Self {
+      content: strong_ref.uri.parse::<Uri>()?,
+      cid: str_cid.parse::<Cid>()?,
+    })
+  }
+}
+
+impl<T> StrongRef<T> {
+  pub fn map_content<U, F>(self, f: F) -> StrongRef<U> 
+  where
+    F: FnOnce(T) -> U,
+  {
+    StrongRef {
+      content: f(self.content),
+      cid: self.cid,
+    }
+  }
+
+  pub fn get_content(&self) -> &T {
+    &self.content
+  }
+
+  pub fn extract_content(self) -> (T, Cid) {
+    (self.content, self.cid)
+  }
+
+  pub fn get_cid(&self) -> &Cid {
+    &self.cid
+  }
+}

atproto/src/types/uri.rs

@@ -1,4 +1,5 @@
 use crate::{
+  basic_deserializer,
   types::{Did, Authority, Nsid, RecordKey},
   error::{Error, ParseError},
 };
@@ -33,16 +34,11 @@ impl Display for Uri {
 impl FromStr for Uri {
   type Err = Error;
   fn from_str(s: &str) -> Result<Self, Self::Err> {
-    if s.len() > 8000 {
+    Self::check_length(s)?;
-      return Err(Error::Parse {
-        err: ParseError::Length { max: 8000, got: s.len() },
-        object: "Did".to_string(),
-      });
-    }
 
     let Some((
       _whole, unchecked_authority, unchecked_collection, unchecked_rkey
-    )) = regex_captures!(
+    )): Option<(&str, &str, &str, &str)> = regex_captures!(
       r"/^at:\/\/([\w\.\-_~:]+)(?:\/([\w\.\-_~:]+)(?:)\/([\w\.\-_~:]+))?$/i",
       s,
     ) else {
@@ -52,28 +48,64 @@ impl FromStr for Uri {
       });
     };
 
-    let did = match Authority::from_str(unchecked_authority)? {
+    let did = Self::check_authority(unchecked_authority.to_string())?;
-      Authority::Handle(h) => 
-        return Err(Error::Parse {
-          err: ParseError::ForceDid { handle: h.to_string() },
-          object: "Uri".to_string(),
-        }),
-      Authority::Did(d) => d,
-    };
 
     let collection = if unchecked_collection.is_empty() { None }
-      else { Some(unchecked_collection.parse::<Nsid>()?) };
+      else { Some(Self::check_collection(unchecked_collection.to_string())?) };
 
     let rkey = if unchecked_rkey.is_empty() { None }
-      else { Some(unchecked_rkey.parse::<RecordKey>()?) };
+      else { Some(Self::check_rkey(unchecked_rkey.to_string())?) };
 
     Ok(Uri { authority: did, collection, rkey })
   }
 }
 
 impl Uri {
+  pub fn from_components(
+    authority_str: String, collection_str: Option<String>,
+    rkey_str: Option<String>
+  ) -> Result<Self, Error> {
+    let authority = Self::check_authority(authority_str)?;
+    let collection = collection_str.map(Self::check_collection).transpose()?;
+    let rkey = rkey_str.map(Self::check_rkey).transpose()?;
+    let uri = Uri { authority, collection, rkey };
+    Self::check_length(&uri.to_string())?;
+
+    Ok(uri)
+  }
+
+  fn check_length(s: &str) -> Result<(), Error> {
+    if s.len() > 8000 {
+      return Err(Error::Parse {
+        err: ParseError::Length { max: 8000, got: s.len() },
+        object: "Did".to_string(),
+      });
+    }
+    Ok(())
+  }
+
+  fn check_authority(authority: String) -> Result<Did, Error> {
+    Ok(match Authority::from_str(&authority)? {
+      Authority::Handle(h) => 
+        return Err(Error::Parse {
+          err: ParseError::ForceDid { handle: h.to_string() },
+          object: "Uri".to_string(),
+        }),
+      Authority::Did(d) => d,
+    })
+  }
+
+  fn check_collection(collection: String) -> Result<Nsid, Error> {
+    Ok(collection.parse::<Nsid>()?)
+  }
+
+  fn check_rkey(rkey: String) -> Result<RecordKey, Error> {
+    Ok(rkey.parse::<RecordKey>()?)
+  }
+
   pub fn authority_as_did(&self) -> &Did {
     &self.authority
   }
 }
 
+basic_deserializer!(Uri);

entryway/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "entryway"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+atproto.workspace = true
+router.workspace = true
+http = "1.3.1"
+serde.workspace = true
+serde_json.workspace = true
+tokio.workspace = true
+tracing-subscriber.workspace = true
+tracing.workspace = true

entryway/src/main.rs

@@ -0,0 +1,57 @@
+use router::{
+  Router,
+  xrpc::{
+    XrpcEndpoint,
+    ProcedureInput,
+    Response,
+    error,
+  },
+};
+use serde::Deserialize;
+use atproto::types::Nsid;
+use http::status::StatusCode;
+use tracing::{
+  event,
+  instrument,
+  Level,
+};
+use std::fmt::Debug;
+
+struct Config {
+  entryway_url: String,
+  entryway_did: String,
+  entryway_plc_rotation_key: String,
+  entryway_jwt_key_256_hex: String,
+}
+
+#[tokio::main]
+async fn main() {
+  let subscriber = tracing_subscriber::FmtSubscriber::new();
+  let _ = tracing::subscriber::set_global_default(subscriber);
+
+  let mut router = Router::new();
+  let create_account_nsid: Nsid = "com.atproto.server.createAccount".parse::<Nsid>().expect("valid nsid");
+  router = router.add_endpoint(XrpcEndpoint::not_implemented());
+  router = router.add_endpoint(XrpcEndpoint::new_procedure(create_account_nsid, create_account));
+  router.serve().await;
+}
+
+#[derive(Deserialize, Debug)]
+struct CreateAccountInput {
+  email: Option<String>,
+  handle: String,
+  did: Option<String>,
+  invite_code: Option<String>,
+  verification_code: Option<String>,
+  verification_phone: Option<String>,
+  password: Option<String>,
+  recovery_key: Option<String>,
+  plc_op: Option<String>,
+}
+
+#[instrument]
+async fn create_account(data: ProcedureInput<CreateAccountInput>) -> Response {
+  event!(Level::INFO, "In create_account");
+  
+  error(StatusCode::OK, "error", "message")
+}

flake.lock

@@ -2,16 +2,18 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735563628,
+        "lastModified": 1752436162,
-        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
+        "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=",
-        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
+        "owner": "NixOS",
-        "revCount": 637546,
+        "repo": "nixpkgs",
-        "type": "tarball",
+        "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.637546%2Brev-b134951a4c9f3c995fd7be05f3243f8ecd65d798/01941dc2-2ab2-7453-8ebd-88712e28efae/source.tar.gz"
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
+        "owner": "NixOS",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2405.%2A.tar.gz"
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs_2": {
@@ -41,11 +43,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1749695868,
+        "lastModified": 1752547600,
-        "narHash": "sha256-debjTLOyqqsYOUuUGQsAHskFXH5+Kx2t3dOo/FCoNRA=",
+        "narHash": "sha256-0vUE42ji4mcCvQO8CI0Oy8LmC6u2G4qpYldZbZ26MLc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "55f914d5228b5c8120e9e0f9698ed5b7214d09cd",
+        "rev": "9127ca1f5a785b23a2fc1c74551a27d3e8b9a28b",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,13 +3,15 @@
 
   # Flake inputs
   inputs = {
-    nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2405.*.tar.gz";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     rust-overlay.url = "github:oxalica/rust-overlay"; # A helper for Rust + Nix
   };
 
   # Flake outputs
   outputs = { self, nixpkgs, rust-overlay }:
     let
+      pdsDirectory = "/home/pan/prog/atproto/appview";
+      
       # Overlays enable you to customize the Nixpkgs attribute set
       overlays = [
         # Makes a `rust-bin` attribute available in Nixpkgs
@@ -33,19 +35,88 @@
       forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
         pkgs = import nixpkgs { inherit overlays system; };
       });
+
+      # Systemd service configuration
+      createSystemdService = pkgs: pdsDir: pkgs.writeTextFile {
+        name = "pds.service";
+        text = ''
+          [Unit]
+          Description=Development Environment Service
+          After=network-online.target
+          Wants=network-online.target
+
+          [Service]
+          Type=simple
+          ExecStart=${pkgs.pds}/bin/pds
+          WorkingDirectory=${pdsDir}
+          EnvironmentFile=${pdsDir}/.env
+          Environment=PDS_DATA_DIRECTORY=${pdsDir}/.pds-data
+          Environment=PDS_BLOBSTORE_DISK_LOCATION=${pdsDir}/.pds-data/blocks
+        '';
+      };
+
+      # Scripts for managing the systemd service
+      createServiceScripts = pkgs: pdsDir: 
+        let
+          serviceFile = createSystemdService pkgs pdsDir;
+          serviceName = "pds";
+        in {
+          startScript = pkgs.writeShellScript "start-dev-service" ''
+            set -e
+
+            # Create user systemd directory if it doesn't exist
+            mkdir -p ~/.config/systemd/user
+
+            # Copy service file
+            cp -f ${serviceFile} ~/.config/systemd/user/${serviceName}.service
+
+            # Reload systemd and start service
+            systemctl --user daemon-reload
+            systemctl --user start ${serviceName}
+            systemctl --user enable ${serviceName}
+
+            systemctl --user status ${serviceName} --no-pager
+          '';
+
+          stopScript = pkgs.writeShellScript "stop-dev-service" ''
+            set -e
+            if systemctl --user is-enabled --quiet ${serviceName}; then
+              # Stop and disable service
+              systemctl --user stop ${serviceName} || true
+              systemctl --user disable ${serviceName} || true
+
+              # Remove service file
+              rm -f ~/.config/systemd/user/${serviceName}.service
+
+              # Reload systemd
+              systemctl --user daemon-reload
+            fi
+          '';
+        };
     in
     {
       # Development environment output
-      devShells = forAllSystems ({ pkgs }: {
+      devShells = forAllSystems ({ pkgs }:
-        default = pkgs.mkShell {
+        let
-          # The Nix packages provided in the environment
+          scripts = createServiceScripts pkgs pdsDirectory;
-          packages = (with pkgs; [
+        in {
-            # The package provided by our custom overlay. Includes cargo, Clippy, cargo-fmt,
+          default = pkgs.mkShell {
-            # rustdoc, rustfmt, and other tools.
+            # The Nix packages provided in the environment
-            sqlx-cli
+            packages = (with pkgs; [
-            rustToolchain
+              # The package provided by our custom overlay. Includes cargo, Clippy, cargo-fmt,
-          ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ libiconv ]);
+              # rustdoc, rustfmt, and other tools.
-        };
+              sqlx-cli
-      });
+              rustToolchain
+            ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ libiconv ]);
+
+            shellHook = pkgs.lib.optionalString pkgs.stdenv.isLinux ''
+              # Cleanup
+              ${scripts.stopScript}
+
+              # Start the systemd service
+              ${scripts.startScript}
+            '';
+          };
+        });
     };
 }

router/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "router"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+atproto.workspace = true
+axum = { version = "0.8.3", features = ["json"] }
+bon = "3.6.4"
+http = "1.3.1"
+serde.workspace = true
+serde_json.workspace = true
+tokio.workspace = true
+tracing-subscriber.workspace = true
+tracing.workspace = true

router/src/lib.rs

@@ -0,0 +1,42 @@
+use crate::xrpc::XrpcEndpoint;
+use axum::Router as AxumRouter;
+use core::net::SocketAddr;
+use std::net::{IpAddr, Ipv4Addr};
+use tokio::net::TcpListener;
+
+pub mod xrpc;
+pub mod wellknown;
+
+pub enum Error {}
+
+pub struct Router {
+  addr: SocketAddr,
+  router: AxumRouter,
+}
+impl Default for Router {
+  fn default() -> Self {
+    Self::new()
+  }
+}
+impl Router {
+  pub fn new() -> Self {
+    let router = AxumRouter::new();
+    let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127,0,0,1)), 6702);
+    Router { router, addr }
+  }
+
+  pub fn add_endpoint<E: Endpoint>(mut self, endpoint: E) -> Self {
+    self.router = endpoint.add_to_router(self.router);
+    self
+  }
+
+  pub async fn serve(self) {
+    let listener = TcpListener::bind(self.addr).await.unwrap();
+
+    axum::serve(listener, self.router).await.unwrap();
+  }
+}
+
+pub trait Endpoint {
+  fn add_to_router(self, router: AxumRouter) -> AxumRouter;
+}

router/src/wellknown.rs

@@ -0,0 +1,19 @@
+use crate::Endpoint;
+use axum::{
+  routing::method_routing::MethodRouter,
+  Router as axumRouter,
+};
+
+pub mod atproto;
+pub mod oauth;
+
+trait WellKnownEndpoint {
+  fn get_known_route(&self) -> String;
+  fn get_resolver(self) -> MethodRouter;
+}
+
+impl<WK: WellKnownEndpoint> Endpoint for WK {
+  fn add_to_router(self, router: axumRouter) -> axumRouter {
+    router.route(&format!(".well-known/{}", self.get_known_route()), self.get_resolver())
+  }
+}

router/src/wellknown/atproto.rs

@@ -0,0 +1 @@
+pub mod handle_resolution;

router/src/wellknown/atproto/handle_resolution.rs

@@ -0,0 +1,52 @@
+use crate::{
+  wellknown::WellKnownEndpoint,
+  Error,
+};
+use atproto::types::{Handle, Did};
+use axum::{
+  routing::{
+    method_routing::MethodRouter,
+    get,
+  },
+  http::{
+    StatusCode,
+    HeaderMap,
+  },
+};
+
+pub struct HandleResolutionEndpoint {
+  resolver: MethodRouter,
+}
+
+impl HandleResolutionEndpoint {
+  pub fn new<HR>(handle_resolver: HR) -> Self where
+  HR: HandleResolver + Clone
+  {
+    HandleResolutionEndpoint {
+      resolver: get(async move | headers: HeaderMap | -> (StatusCode, String) {
+        let Some(Ok(hostname)) = headers.get("host").map(|header_value| {
+          header_value.to_str()
+        }) else {
+          return (StatusCode::INTERNAL_SERVER_ERROR, String::from("Internal Server Error"));
+        };
+        let Ok(valid_handle) = hostname.parse::<atproto::types::Handle>() else {
+          return (StatusCode::NOT_FOUND, String::from("User not found"));
+        };
+        match handle_resolver.call(valid_handle) {
+          Ok(Some(did)) => (StatusCode::OK, did.to_string()),
+          Ok(None) => (StatusCode::NOT_FOUND, String::from("User not found")),
+          Err(_) => (StatusCode::INTERNAL_SERVER_ERROR, String::from("Internal Server Error")),
+        }
+      })
+    }
+  }
+}
+
+pub trait HandleResolver: Send + Sync + 'static {
+  fn call(&self, handle: Handle) -> Result<Option<Did>, Error>;
+}
+
+impl WellKnownEndpoint for HandleResolutionEndpoint {
+  fn get_known_route(&self) -> String { String::from("atproto-did") }
+  fn get_resolver(self) -> MethodRouter { self.resolver }
+}

router/src/wellknown/oauth.rs

@@ -0,0 +1 @@
+pub mod authorization_server;

router/src/wellknown/oauth/authorization_server.rs

@@ -0,0 +1,103 @@
+use serde::de::{
+  Error,
+  Unexpected,
+};
+use serde_json::{
+  json,
+  Result, 
+  Value
+};
+use bon::Builder;
+
+trait Metadata {
+  fn format_metadata(self, required: RequiredMetadata) -> Result<Value>;
+}
+
+pub struct RequiredMetadata {
+  issuer: String,
+  authorization_endpoint: String,
+  token_endpoint: String,
+}
+
+impl RequiredMetadata {
+  fn new(
+    issuer: String, 
+    authorization_endpoint: String, 
+    token_endpoint: String
+  ) -> Self {
+    RequiredMetadata {
+      issuer, authorization_endpoint, token_endpoint
+    }
+  }
+}
+
+#[derive(Builder)]
+struct AtprotoMetadata {
+  additional_response_types_supported: Option<Vec<String>>,
+  additional_grant_types_supported: Option<Vec<String>>,
+  additional_code_challenge_methods_supported: Option<Vec<String>>,
+  additional_token_endpoint_auth_methods_supported: Option<Vec<String>>,
+  additional_token_endpoint_auth_signing_alg_values_supported: Option<Vec<String>>,
+  additional_scopes_supported: Option<Vec<String>>,
+  pushed_authorization_request_endpoint: String,
+  additional_dpop_signing_alg_values_supported: Option<Vec<String>>,
+}
+
+impl AtprotoMetadata {
+  fn check_fields(&self) -> Result<()> {
+    // TODO: Issuer check (https scheme, no default port, no path segments
+
+    if self.additional_token_endpoint_auth_signing_alg_values_supported
+      .as_ref()
+      .is_none_or(|vec| vec.iter().any(|s| s == "none")) {
+      return Err(Error::invalid_value(
+        Unexpected::Other("\"none\" in token_endpoint_auth_signing_alg_values_supported"),
+        &"\"none\" to be omitted from token_endpoint_auth_signing_alg_values_supported"
+      ));
+    }
+
+    Ok(())
+  }
+}
+
+impl Metadata for AtprotoMetadata {
+  fn format_metadata(self, required: RequiredMetadata) -> Result<Value> {
+    self.check_fields()?;
+    Ok(json!({
+      "issuer": required.issuer,
+      "authorization_endpoint": required.authorization_endpoint,
+      "token_endpoint": required.token_endpoint,
+      "response_types_supported": 
+        self.additional_response_types_supported.unwrap_or_default()
+        .extend(["code".to_string()]),
+      "grant_types_supported": 
+        self.additional_grant_types_supported.unwrap_or_default()
+        .extend([
+          "authorization_code".to_string(), 
+          "refresh_token".to_string()
+        ]),
+      "code_challenge_methods_supported": 
+        self.additional_code_challenge_methods_supported.unwrap_or_default()
+        .extend(["S256".to_string()]),
+      "token_endpoint_auth_methods_supported": 
+        self.additional_token_endpoint_auth_methods_supported.unwrap_or_default()
+        .extend([
+          "none".to_string(),
+          "private_key_jwt".to_string()
+        ]),
+      "token_endpoint_auth_signing_alg_values_supported": 
+        self.additional_token_endpoint_auth_signing_alg_values_supported.unwrap_or_default()
+        .extend(["ES256".to_string()]),
+      "scopes_supported":
+        self.additional_scopes_supported.unwrap_or_default()
+        .extend(["atproto".to_string()]),
+      "authorization_response_iss_parameter_supported": true,
+      "require_pushed_authorization_requests": true,
+      "pushed_authorization_request_endpoint": self.pushed_authorization_request_endpoint,
+      "dpop_signing_alg_values_supported":
+        self.additional_dpop_signing_alg_values_supported.unwrap_or_default()
+        .extend(["ES256".to_string()]),
+      "client_id_metadata_document_supported": true,
+    }))
+  }
+}

router/src/xrpc.rs

@@ -1,9 +1,10 @@
+use crate::Endpoint;
 use std::{
   collections::HashMap,
   pin::Pin,
   future::Future,
 };
-use atproto::Nsid;
+use atproto::types::Nsid;
 use axum::{
   extract::{
     Json,
@@ -52,7 +53,7 @@ pub fn response(code: StatusCode, message: &str) -> Response {
 }
 
 pub struct QueryInput {
-  parameters: HashMap<String, String>,
+  pub parameters: HashMap<String, String>,
 }
 impl<S> FromRequestParts<S> for QueryInput
 where
@@ -69,12 +70,16 @@ where
     }
   }
 }
-pub struct ProcedureInput {
+
-  parameters: HashMap<String, String>,
+#[derive(Debug)]
-  input: Json<Value>,
+pub struct ProcedureInput<J> {
+  pub parameters: HashMap<String, String>,
+  pub input: J,
 }
-impl<S> FromRequest<S> for ProcedureInput 
+
+impl<J, S> FromRequest<S> for ProcedureInput<J> 
 where
+  J: for<'de> serde::Deserialize<'de> + Send + 'static,
   Bytes: FromRequest<S>,
   S: Send + Sync,
 {
@@ -82,17 +87,13 @@ where
 
   async fn from_request(req: Request, state: &S)
     -> Result<Self, Self::Rejection> {
-    let query_params: Result<Query<HashMap<String, String>>, QueryRejection> = Query::try_from_uri(req.uri());
+    let parameters: HashMap<String, String> = Query::try_from_uri(req.uri())
-    let parameters = match query_params {
+      .map(|p| p.0)
-      Ok(p) => p.0,
+      .map_err(|e| error(StatusCode::BAD_REQUEST, "Bad Paramters", &e.body_text()))?;
-      Err(e) => return Err(error(StatusCode::BAD_REQUEST, "Bad Parameters", &e.body_text())),
-    };
 
-    let json_value = Json::<Value>::from_request(req, state).await;
+    let input: J = Json::<J>::from_request(req, state).await
-    let input: Json<Value> = match json_value {
+      .map(|Json(v)| v)
-      Ok(v) => v,
+      .map_err(|e| error(StatusCode::BAD_REQUEST, "Bad Parameters", &e.body_text()))?;
-      Err(e) => return Err(error(StatusCode::BAD_REQUEST, "Bad Parameters", &e.body_text())),
-    };
 
     Ok(ProcedureInput { parameters, input })
   }
@@ -112,12 +113,12 @@ where
     Box::pin((self)(input))
   }
 }
-impl<F, Fut> XrpcHandler<ProcedureInput> for F
+impl<J, F, Fut> XrpcHandler<ProcedureInput<J>> for F
 where
-  F: Fn(ProcedureInput) -> Fut + Send + Sync + 'static,
+  F: Fn(ProcedureInput<J>) -> Fut + Send + Sync + 'static,
   Fut: Future<Output = Response> + Send + 'static,
 {
-  fn call(&self, input: ProcedureInput) 
+  fn call(&self, input: ProcedureInput<J>) 
     -> Pin<Box<dyn Future<Output = Response>+ Send>> {
     Box::pin((self)(input))
   }
@@ -139,14 +140,15 @@ impl XrpcEndpoint {
     }
   }
 
-  pub fn new_procedure<P>(nsid: Nsid, procedure: P) -> Self
+  pub fn new_procedure<P, J>(nsid: Nsid, procedure: P) -> Self
   where
-    P: XrpcHandler<ProcedureInput> + Clone
+    P: XrpcHandler<ProcedureInput<J>> + Clone,
+    J: for<'de> serde::Deserialize<'de> + Send + 'static,
   {
     XrpcEndpoint {
       path: Path::Nsid(nsid),
       resolver: post(async move | req: Request | -> Response {
-        match ProcedureInput::from_request(req, &()).await {
+        match ProcedureInput::<J>::from_request(req, &()).await {
           Ok(pi) => procedure.call(pi).await,
           Err(e) => e
         }
@@ -154,15 +156,6 @@ impl XrpcEndpoint {
     }
   }
 
-  pub fn add_to_router(self, router: axumRouter) -> axumRouter {
-    let path = match self.path {
-      Path::Nsid(nsid) => &("/xrpc/".to_owned() + nsid.as_str()),
-      Path::NotImplemented => "/xrpc/{*nsid}",
-    };
-
-    router.route(path, self.resolver)
-  }
-
   pub fn not_implemented() -> Self {
     let resolver = (
       StatusCode::NOT_IMPLEMENTED,
@@ -179,3 +172,13 @@ impl XrpcEndpoint {
   }
 }
 
+impl Endpoint for XrpcEndpoint {
+  fn add_to_router(self, router: axumRouter) -> axumRouter {
+    let path = match self.path {
+      Path::Nsid(nsid) => &("/xrpc/".to_owned() + &nsid.to_string()),
+      Path::NotImplemented => "/xrpc/{*nsid}",
+    };
+
+    router.route(path, self.resolver)
+  }
+}