Refactor Cargo.toml and response handling to streamline dependencies and improve type handling

Author: rakshith-ravi

models/Cargo.toml

@@ -25,7 +25,7 @@ headers           = { workspace = true, features = [] }
 hex               = { workspace = true, features = ["default"] }
 http              = { workspace = true, features = ["default"] }
 ipnetwork         = { workspace = true, features = ["default"] }
-leptos            = { workspace = true, default-features = false }
+leptos            = { workspace = true, features = [] }
 macros            = { workspace = true, features = [] }
 preprocess        = { workspace = true, features = [] }
 regex             = { workspace = true, features = ["default"] }
@@ -35,7 +35,6 @@ serde             = { workspace = true, features = ["default", "derive"] }
 serde_json        = { workspace = true, features = ["default"] }
 serde_test        = { workspace = true, features = [] }
 serde_urlencoded  = { workspace = true, features = [] }
-server_fn         = { workspace = true, features = ["reqwest"] }
 strum             = { workspace = true, features = ["default", "derive"] }
 thiserror         = { workspace = true, features = [] }
 tokio             = { workspace = true, features = [] }
@@ -48,6 +47,7 @@ url               = { workspace = true, features = ["default"] }
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 axum-typed-websockets = { workspace = true, features = ["default"] }
 getrandom_03          = { workspace = true, features = [] }
+server_fn             = { workspace = true, features = ["reqwest"] }
 sqlx                  = { workspace = true, features = ["macros", "postgres", "sqlite", "uuid"] }
 time                  = { workspace = true, features = ["default", "serde-human-readable"] }
 uuid                  = { workspace = true, features = ["default", "v1", "v4"] }

models/src/request.rs

@@ -1,7 +1,10 @@
 use std::marker::PhantomData;
 
 use http::Method;
-use leptos::server_fn::codec::{Encoding, GetUrl};
+use leptos::server_fn::{
+	ContentType,
+	codec::{Encoding, GetUrl},
+};
 use preprocess::Preprocessable;
 use typed_builder::TypedBuilder;
 
@@ -13,7 +16,7 @@ pub struct ApiEncoding<E>(PhantomData<E>)
 where
 	E: ApiEndpoint;
 
-impl<E> Encoding for ApiEncoding<E>
+impl<E> ContentType for ApiEncoding<E>
 where
 	E: ApiEndpoint,
 {
@@ -24,6 +27,12 @@ where
 		// of the response. So we just return the default content type of binary data.
 		"application/octet-stream"
 	};
+}
+
+impl<E> Encoding for ApiEncoding<E>
+where
+	E: ApiEndpoint,
+{
 	const METHOD: Method = E::FRONTEND_API_METHOD;
 }
 

models/src/response.rs

@@ -55,9 +55,7 @@ where
 	E: ApiEndpoint,
 	<E::RequestBody as Preprocessable>::Processed: Send,
 {
-	async fn into_res(
-		self,
-	) -> Result<leptos::server_fn::response::BrowserMockRes, ServerFnError<ErrorType>> {
+	async fn into_res(self) -> Result<leptos::server_fn::response::BrowserMockRes, ErrorType> {
 		unreachable!()
 	}
 }
@@ -68,7 +66,7 @@ where
 	E: ApiEndpoint,
 	<E::RequestBody as Preprocessable>::Processed: Send,
 {
-	async fn into_res(self) -> Result<http::Response<axum::body::Body>, ServerFnError<ErrorType>> {
+	async fn into_res(self) -> Result<http::Response<axum::body::Body>, ErrorType> {
 		let AppResponse {
 			status_code,
 			headers,
@@ -85,7 +83,7 @@ where
 
 		response
 			.body(body.into_axum_response().into_body())
-			.map_err(|err| ServerFnError::Response(err.to_string()))
+			.map_err(ErrorType::server_error)
 	}
 }
 
@@ -96,11 +94,11 @@ where
 	E::RequestBody: Serialize + DeserializeOwned,
 	E::ResponseBody: Serialize + DeserializeOwned,
 {
-	async fn from_res(res: BrowserResponse) -> Result<Self, ServerFnError<ErrorType>> {
+	async fn from_res(res: BrowserResponse) -> Result<Self, ErrorType> {
 		let status_code = <BrowserResponse as ClientRes<ErrorType>>::status(&res);
 		let status_code = StatusCode::from_u16(status_code)
 			.map_err(|err| ServerFnError::Response(err.to_string()))?;
-		let headers = E::ResponseHeaders::from_header_map(res.headers())
+		let headers = E::ResponseHeaders::from_header_map(&res.generate_headers())
 			.map_err(|err| ServerFnError::Response(err.to_string()))?;
 		let body = res.try_into_string().await?;
 		let body = serde_urlencoded::from_str(&body)