Hot-Reloading Refactor

Signed-off-by: Jason Volk <jason@zemos.net>

src/api/ruma_wrapper/axum.rs

@@ -3,30 +3,26 @@ use std::{collections::BTreeMap, str};
 use axum::{
 	async_trait,
 	extract::{FromRequest, Path},
-	response::{IntoResponse, Response},
 	RequestExt, RequestPartsExt,
 };
 use axum_extra::{
-	headers::{
-		authorization::{Bearer, Credentials},
-		Authorization,
-	},
+	headers::{authorization::Bearer, Authorization},
 	typed_header::TypedHeaderRejectionReason,
 	TypedHeader,
 };
 use bytes::{BufMut, BytesMut};
-use http::{uri::PathAndQuery, StatusCode};
-use http_body_util::Full;
+use conduit::debug_warn;
+use http::uri::PathAndQuery;
 use hyper::Request;
 use ruma::{
-	api::{client::error::ErrorKind, AuthScheme, IncomingRequest, OutgoingResponse},
-	CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId, UserId,
+	api::{client::error::ErrorKind, AuthScheme, IncomingRequest},
+	CanonicalJsonValue, OwnedDeviceId, OwnedUserId, UserId,
 };
 use serde::Deserialize;
 use tracing::{debug, error, trace, warn};
 
-use super::{Ruma, RumaResponse};
-use crate::{debug_warn, service::appservice::RegistrationInfo, services, Error, Result};
+use super::{xmatrix::XMatrix, Ruma};
+use crate::{service::appservice::RegistrationInfo, services, Error, Result};
 
 enum Token {
 	Appservice(Box<RegistrationInfo>),
@@ -332,68 +328,3 @@ where
 		})
 	}
 }
-
-struct XMatrix {
-	origin: OwnedServerName,
-	destination: Option<String>,
-	key: String, // KeyName?
-	sig: String,
-}
-
-impl Credentials for XMatrix {
-	const SCHEME: &'static str = "X-Matrix";
-
-	fn decode(value: &http::HeaderValue) -> Option<Self> {
-		debug_assert!(
-			value.as_bytes().starts_with(b"X-Matrix "),
-			"HeaderValue to decode should start with \"X-Matrix ..\", received = {value:?}",
-		);
-
-		let parameters = str::from_utf8(&value.as_bytes()["X-Matrix ".len()..])
-			.ok()?
-			.trim_start();
-
-		let mut origin = None;
-		let mut destination = None;
-		let mut key = None;
-		let mut sig = None;
-
-		for entry in parameters.split_terminator(',') {
-			let (name, value) = entry.split_once('=')?;
-
-			// It's not at all clear why some fields are quoted and others not in the spec,
-			// let's simply accept either form for every field.
-			let value = value
-				.strip_prefix('"')
-				.and_then(|rest| rest.strip_suffix('"'))
-				.unwrap_or(value);
-
-			// FIXME: Catch multiple fields of the same name
-			match name {
-				"origin" => origin = Some(value.try_into().ok()?),
-				"key" => key = Some(value.to_owned()),
-				"sig" => sig = Some(value.to_owned()),
-				"destination" => destination = Some(value.to_owned()),
-				_ => debug!("Unexpected field `{name}` in X-Matrix Authorization header"),
-			}
-		}
-
-		Some(Self {
-			origin: origin?,
-			key: key?,
-			sig: sig?,
-			destination,
-		})
-	}
-
-	fn encode(&self) -> http::HeaderValue { todo!() }
-}
-
-impl<T: OutgoingResponse> IntoResponse for RumaResponse<T> {
-	fn into_response(self) -> Response {
-		match self.0.try_into_http_response::<BytesMut>() {
-			Ok(res) => res.map(BytesMut::freeze).map(Full::new).into_response(),
-			Err(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
-		}
-	}
-}

src/api/ruma_wrapper/mod.rs

@@ -1,10 +1,11 @@
+pub(crate) mod axum;
+mod xmatrix;
+
 use std::ops::Deref;
 
-use ruma::{api::client::uiaa::UiaaResponse, CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId};
+use ruma::{CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId};
 
-use crate::{service::appservice::RegistrationInfo, Error};
-
-mod axum;
+use crate::service::appservice::RegistrationInfo;
 
 /// Extractor for Ruma request structs
 pub(crate) struct Ruma<T> {
@@ -21,14 +22,3 @@ impl<T> Deref for Ruma<T> {
 
 	fn deref(&self) -> &Self::Target { &self.body }
 }
-
-#[derive(Clone)]
-pub(crate) struct RumaResponse<T>(pub(crate) T);
-
-impl<T> From<T> for RumaResponse<T> {
-	fn from(t: T) -> Self { Self(t) }
-}
-
-impl From<Error> for RumaResponse<UiaaResponse> {
-	fn from(t: Error) -> Self { t.to_response() }
-}

src/api/ruma_wrapper/xmatrix.rs

@@ -0,0 +1,61 @@
+use std::str;
+
+use axum_extra::headers::authorization::Credentials;
+use ruma::OwnedServerName;
+use tracing::debug;
+
+pub(crate) struct XMatrix {
+	pub(crate) origin: OwnedServerName,
+	pub(crate) destination: Option<String>,
+	pub(crate) key: String, // KeyName?
+	pub(crate) sig: String,
+}
+
+impl Credentials for XMatrix {
+	const SCHEME: &'static str = "X-Matrix";
+
+	fn decode(value: &http::HeaderValue) -> Option<Self> {
+		debug_assert!(
+			value.as_bytes().starts_with(b"X-Matrix "),
+			"HeaderValue to decode should start with \"X-Matrix ..\", received = {value:?}",
+		);
+
+		let parameters = str::from_utf8(&value.as_bytes()["X-Matrix ".len()..])
+			.ok()?
+			.trim_start();
+
+		let mut origin = None;
+		let mut destination = None;
+		let mut key = None;
+		let mut sig = None;
+
+		for entry in parameters.split_terminator(',') {
+			let (name, value) = entry.split_once('=')?;
+
+			// It's not at all clear why some fields are quoted and others not in the spec,
+			// let's simply accept either form for every field.
+			let value = value
+				.strip_prefix('"')
+				.and_then(|rest| rest.strip_suffix('"'))
+				.unwrap_or(value);
+
+			// FIXME: Catch multiple fields of the same name
+			match name {
+				"origin" => origin = Some(value.try_into().ok()?),
+				"key" => key = Some(value.to_owned()),
+				"sig" => sig = Some(value.to_owned()),
+				"destination" => destination = Some(value.to_owned()),
+				_ => debug!("Unexpected field `{name}` in X-Matrix Authorization header"),
+			}
+		}
+
+		Some(Self {
+			origin: origin?,
+			key: key?,
+			sig: sig?,
+			destination,
+		})
+	}
+
+	fn encode(&self) -> http::HeaderValue { todo!() }
+}