Mirrors/leptos
2
0
Fork 0
mirror of https://github.com/leptos-rs/leptos synced 2024-09-20 06:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

automatically include server function handler in .leptos_router()

Browse source
This commit is contained in:
Greg Johnston 2024-01-03 20:45:27 -05:00
parent c3e3ce7878
commit af62d2e900
13 changed files with 77 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
examples/todo_app_sqlite_axum/Todos.db
View file

Binary file not shown.

1
examples/todo_app_sqlite_axum/src/main.rs
View file

@ -52,7 +52,6 @@ cfg_if! {
// build our application with a route
let app = Router::new()
.route("/api/*fn_name", post(leptos_axum::handle_server_fns))
.route("/special/:id", get(custom_handler))
.leptos_routes(&leptos_options, routes, || view! { <TodoApp/> } )
.fallback(file_and_error_handler)

30
integrations/axum/src/lib.rs
View file

@ -39,11 +39,10 @@ use axum::{
http::{
header::{self, HeaderName, HeaderValue},
request::Parts,
HeaderMap, Request, Response, StatusCode,
HeaderMap, Method, Request, Response, StatusCode,
},
response::IntoResponse,
routing::{delete, get, patch, post, put},
RequestPartsExt,
};
use futures::{
channel::mpsc::{Receiver, Sender},
@ -1540,6 +1539,8 @@ where
IV: IntoView + 'static,
{
let mut router = self;
// register router paths
for listing in paths.iter() {
let path = listing.path();
@ -1631,6 +1632,31 @@ where
};
}
}
// register server functions
for (path, method) in server_fn::axum::server_fn_paths() {
let additional_context = additional_context.clone();
let handler = move |req: Request<Body>| async move {
handle_server_fns_with_context(additional_context, req).await
};
router = router.route(
path,
match method {
Method::GET => get(handler),
Method::POST => post(handler),
Method::PUT => put(handler),
Method::DELETE => delete(handler),
Method::PATCH => patch(handler),
_ => {
panic!(
"Unsupported server function HTTP method: \
{method:?}"
);
}
},
);
}
router
}

5
server_fn/Cargo.toml
View file

@ -34,7 +34,7 @@ multer = { version = "3", optional = true }
# serde
serde_json = "1"
futures = "0.3"
http = { version = "1", optional = true }
http = { version = "1" }
ciborium = { version = "0.2", optional = true }
hyper = { version = "1", optional = true }
bytes = "1"
@ -67,7 +67,6 @@ reqwest = { version = "0.11", default-features = false, optional = true, feature
actix = ["dep:actix-web", "dep:send_wrapper"]
axum = [
"dep:axum",
"dep:http",
"dep:hyper",
"dep:http-body-util",
"dep:tower",
@ -88,5 +87,5 @@ cbor = ["dep:ciborium"]
rkyv = ["dep:rkyv"]
default-tls = ["reqwest/default-tls"]
rustls = ["reqwest/rustls-tls"]
reqwest = ["dep:http", "dep:reqwest"]
reqwest = ["dep:reqwest"]
ssr = ["inventory"]

2
server_fn/src/codec/cbor.rs
View file

@ -5,6 +5,7 @@ use crate::{
response::{ClientRes, Res},
};
use bytes::Bytes;
use http::Method;
use serde::{de::DeserializeOwned, Serialize};
/// Pass arguments and receive responses using `cbor` in a `POST` request.
@ -12,6 +13,7 @@ pub struct Cbor;
impl Encoding for Cbor {
const CONTENT_TYPE: &'static str = "application/cbor";
const METHOD: Method = Method::POST;
}
impl<CustErr, T, Request> IntoReq<CustErr, Request, Cbor> for T

2
server_fn/src/codec/json.rs
View file

@ -5,12 +5,14 @@ use crate::{
response::{ClientRes, Res},
IntoReq, IntoRes,
};
use http::Method;
use serde::{de::DeserializeOwned, Serialize};
/// Pass arguments and receive responses as JSON in the body of a `POST` request.
pub struct Json;
impl Encoding for Json {
const CONTENT_TYPE: &'static str = "application/json";
const METHOD: Method = Method::POST;
}
impl<CustErr, T, Request> IntoReq<CustErr, Request, Json> for T

2
server_fn/src/codec/mod.rs
View file

@ -4,6 +4,7 @@ mod cbor;
pub use cbor::*;
#[cfg(feature = "json")]
mod json;
use http::Method;
#[cfg(feature = "json")]
pub use json::*;
#[cfg(feature = "rkyv")]
@ -59,6 +60,7 @@ pub trait IntoRes<CustErr, Response, Encoding> {
pub trait Encoding {
const CONTENT_TYPE: &'static str;
const METHOD: Method;
}
pub trait FormDataEncoding<Client, CustErr, Request>

2
server_fn/src/codec/multipart.rs
View file

@ -5,6 +5,7 @@ use crate::{
IntoReq,
};
use futures::StreamExt;
use http::Method;
use multer::Multipart;
use web_sys::FormData;
@ -12,6 +13,7 @@ pub struct MultipartFormData;
impl Encoding for MultipartFormData {
const CONTENT_TYPE: &'static str = "multipart/form-data";
const METHOD: Method = Method::POST;
}
#[derive(Debug)]

2
server_fn/src/codec/rkyv.rs
View file

@ -5,6 +5,7 @@ use crate::{
response::{ClientRes, Res},
};
use bytes::Bytes;
use http::Method;
use rkyv::{
de::deserializers::SharedDeserializeMap, ser::serializers::AllocSerializer,
validation::validators::DefaultValidator, Archive, CheckBytes, Deserialize,
@ -16,6 +17,7 @@ pub struct Rkyv;
impl Encoding for Rkyv {
const CONTENT_TYPE: &'static str = "application/rkyv";
const METHOD: Method = Method::POST;
}
impl<CustErr, T, Request> IntoReq<CustErr, Request, Rkyv> for T

3
server_fn/src/codec/stream.rs
View file

@ -6,12 +6,14 @@ use crate::{
};
use bytes::Bytes;
use futures::{Stream, StreamExt};
use http::Method;
use std::pin::Pin;
pub struct Streaming;
impl Encoding for Streaming {
const CONTENT_TYPE: &'static str = "application/octet-stream";
const METHOD: Method = Method::POST;
}
/* impl<CustErr, T, Request> IntoReq<CustErr, Request, ByteStream> for T
@ -81,6 +83,7 @@ pub struct StreamingText;
impl Encoding for StreamingText {
const CONTENT_TYPE: &'static str = "text/plain";
const METHOD: Method = Method::POST;
}
pub struct TextStream<CustErr = NoCustomError>(

3
server_fn/src/codec/url.rs
View file

@ -3,6 +3,7 @@ use crate::{
error::ServerFnError,
request::{ClientReq, Req},
};
use http::Method;
use serde::{de::DeserializeOwned, Serialize};
/// Pass arguments as a URL-encoded query string of a `GET` request.
@ -13,6 +14,7 @@ pub struct PostUrl;
impl Encoding for GetUrl {
const CONTENT_TYPE: &'static str = "application/x-www-form-urlencoded";
const METHOD: Method = Method::GET;
}
impl<CustErr, T, Request> IntoReq<CustErr, Request, GetUrl> for T
@ -46,6 +48,7 @@ where
impl Encoding for PostUrl {
const CONTENT_TYPE: &'static str = "application/x-www-form-urlencoded";
const METHOD: Method = Method::POST;
}
impl<CustErr, T, Request> IntoReq<CustErr, Request, PostUrl> for T

39
server_fn/src/lib.rs
View file

@ -20,6 +20,7 @@ pub use const_format;
use dashmap::DashMap;
pub use error::ServerFnError;
use error::ServerFnErrorSerde;
use http::Method;
use middleware::{Layer, Service};
use once_cell::sync::Lazy;
use request::Req;
@ -155,7 +156,7 @@ macro_rules! initialize_server_fn_map {
once_cell::sync::Lazy::new(|| {
$crate::inventory::iter::<ServerFnTraitObj<$req, $res>>
.into_iter()
.map(|obj| (obj.path(), *obj))
.map(|obj| (obj.path(), obj.clone()))
.collect()
})
};
@ -163,6 +164,7 @@ macro_rules! initialize_server_fn_map {
pub struct ServerFnTraitObj<Req, Res> {
path: &'static str,
method: Method,
handler: fn(Req) -> Pin<Box<dyn Future<Output = Res> + Send>>,
middleware: fn() -> Vec<Arc<dyn Layer<Req, Res>>>,
}
@ -170,11 +172,13 @@ pub struct ServerFnTraitObj<Req, Res> {
impl<Req, Res> ServerFnTraitObj<Req, Res> {
pub const fn new(
path: &'static str,
method: Method,
handler: fn(Req) -> Pin<Box<dyn Future<Output = Res> + Send>>,
middleware: fn() -> Vec<Arc<dyn Layer<Req, Res>>>,
) -> Self {
Self {
path,
method,
handler,
middleware,
}
@ -183,6 +187,10 @@ impl<Req, Res> ServerFnTraitObj<Req, Res> {
pub fn path(&self) -> &'static str {
self.path
}
pub fn method(&self) -> Method {
self.method.clone()
}
}
impl<Req, Res> Service<Req, Res> for ServerFnTraitObj<Req, Res>
@ -198,12 +206,15 @@ where
impl<Req, Res> Clone for ServerFnTraitObj<Req, Res> {
fn clone(&self) -> Self {
*self
Self {
path: self.path,
method: self.method.clone(),
handler: self.handler,
middleware: self.middleware,
}
}
}
impl<Req, Res> Copy for ServerFnTraitObj<Req, Res> {}
type LazyServerFnMap<Req, Res> =
Lazy<DashMap<&'static str, ServerFnTraitObj<Req, Res>>>;
@ -212,10 +223,10 @@ type LazyServerFnMap<Req, Res> =
pub mod axum {
use crate::{
middleware::{BoxedService, Layer, Service},
LazyServerFnMap, ServerFn, ServerFnTraitObj,
Encoding, LazyServerFnMap, ServerFn, ServerFnTraitObj,
};
use axum::body::Body;
use http::{Request, Response, StatusCode};
use http::{Method, Request, Response, StatusCode};
inventory::collect!(ServerFnTraitObj<Request<Body>, Response<Body>>);
@ -235,12 +246,19 @@ pub mod axum {
T::PATH,
ServerFnTraitObj::new(
T::PATH,
T::InputEncoding::METHOD,
|req| Box::pin(T::run_on_server(req)),
T::middlewares,
),
);
}
pub fn server_fn_paths() -> impl Iterator<Item = (&'static str, Method)> {
REGISTERED_SERVER_FUNCTIONS
.iter()
.map(|item| (item.path(), item.method()))
}
pub async fn handle_server_fn(req: Request<Body>) -> Response<Body> {
let path = req.uri().path();
@ -268,7 +286,7 @@ pub mod axum {
) -> Option<BoxedService<Request<Body>, Response<Body>>> {
REGISTERED_SERVER_FUNCTIONS.get(path).map(|server_fn| {
let middleware = (server_fn.middleware)();
let mut service = BoxedService::new(*server_fn);
let mut service = BoxedService::new(server_fn.clone());
for middleware in middleware {
service = middleware.layer(service);
}
@ -282,11 +300,10 @@ pub mod axum {
pub mod actix {
use crate::{
middleware::BoxedService, request::actix::ActixRequest,
response::actix::ActixResponse, LazyServerFnMap, ServerFn,
response::actix::ActixResponse, Encoding, LazyServerFnMap, ServerFn,
ServerFnTraitObj,
};
use actix_web::{HttpRequest, HttpResponse};
use send_wrapper::SendWrapper;
inventory::collect!(ServerFnTraitObj<ActixRequest, ActixResponse>);
@ -306,6 +323,7 @@ pub mod actix {
T::PATH,
ServerFnTraitObj::new(
T::PATH,
T::InputEncoding::METHOD,
|req| Box::pin(T::run_on_server(req)),
T::middlewares,
),
@ -316,7 +334,8 @@ pub mod actix {
let path = req.uri().path();
if let Some(server_fn) = REGISTERED_SERVER_FUNCTIONS.get(path) {
let middleware = (server_fn.middleware)();
let mut service = BoxedService::new(*server_fn);
// http::Method is the only non-Copy type here
let mut service = BoxedService::new(server_fn.clone());
for middleware in middleware {
service = middleware.layer(service);
}

3
server_fn_macro/src/lib.rs
View file

@ -237,9 +237,10 @@ pub fn server_macro_impl(
let inventory = if cfg!(feature = "ssr") {
quote! {
#server_fn_path::inventory::submit! {{
use #server_fn_path::ServerFn;
use #server_fn_path::{ServerFn, codec::Encoding};
#server_fn_path::ServerFnTraitObj::new(
#struct_name::PATH,
<#struct_name as ServerFn>::InputEncoding::METHOD,
|req| {
Box::pin(#struct_name::run_on_server(req))
},