swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fullstack cleanups: loaders serialize, ServeConfig only (#4785)

Browse Source 
* some opinionated cleanups in dioxus-server

* add serialize to loader

* add `result` to Resource

* clippy

* fix

* writable memos, resources, `onmount`, `.pending`, and `.value()` on actions

* fix compile issues

* fix typo
This commit is contained in:
Jonathan Kelley authored and GitHub committed 2025-10-14 17:34:52 -07:00
1 parent a3e40a5ea2
commit 7102bc3b6a
33 files changed
+2085 -672
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/fullstack-server/src/serverfn.rs
+8 -65
View File
@@ -1,5 +1,4 @@
use axum::body::Body;
use axum::handler::Handler;
use axum::routing::MethodRouter;
use axum::Router;
use dashmap::DashMap;
@@ -19,10 +18,6 @@ pub struct ServerFunction<Caller = ()> {
_phantom: PhantomData<Caller>,
}
pub struct MakeRequest<T> {
_phantom: PhantomData<T>,
}
impl ServerFunction {
/// Create a new server function object.
pub const fn new(
@@ -52,56 +47,14 @@ impl ServerFunction {
inventory::iter::<ServerFunction>().collect()
}
pub fn handler(&self) -> fn() -> MethodRouter<DioxusServerState> {
self.handler
}
pub fn register_server_fn_on_router<S>(&'static self, router: Router<S>) -> Router<S>
where
S: Send + Sync + Clone + 'static,
{
tracing::info!(
"Registering server function: {} {}",
self.method(),
self.path()
);
use http::method::Method;
let path = self.path();
let method = self.method();
let handler = move |req| self.handle_server_fns_inner(req);
match method {
Method::GET => router.route(path, axum::routing::get(handler)),
Method::POST => router.route(path, axum::routing::post(handler)),
Method::PUT => router.route(path, axum::routing::put(handler)),
Method::DELETE => router.route(path, axum::routing::delete(handler)),
Method::PATCH => router.route(path, axum::routing::patch(handler)),
Method::HEAD => router.route(path, axum::routing::head(handler)),
Method::OPTIONS => router.route(path, axum::routing::options(handler)),
Method::CONNECT => router.route(path, axum::routing::connect(handler)),
Method::TRACE => router.route(path, axum::routing::trace(handler)),
_ => unimplemented!("Unsupported server function method: {}", method),
}
}
pub async fn handle_server_fns_inner(&self, req: http::Request<Body>) -> http::Response<Body> {
// todo: jon
// - bring back middleware to serverfns. the new layer system is fine but isn't a full replacement
//
// use axum::body;
// use axum::extract::State;
// use axum::routing::*;
// use axum::{
// body::Body,
// http::{Request, Response, StatusCode},
// response::IntoResponse,
// };
// use http::header::*;
// let (parts, body) = req.into_parts();
// let req = Request::from_parts(parts.clone(), body);
// // Create the server context with info from the request
// let server_context = DioxusServerContext::new(parts);
// // Provide additional context from the render state
// server_context.add_server_context(&additional_context);
// // store Accepts and Referrer in case we need them for redirect (below)
// let referrer = req.headers().get(REFERER).cloned();
// let accepts_html = req
@@ -111,13 +64,6 @@ impl ServerFunction {
// .map(|v| v.contains("text/html"))
// .unwrap_or(false);
// actually run the server fn (which may use the server context)
// let fut = crate::with_server_context(server_context.clone(), || service.run(req));
// let fut = crate::with_server_context(server_context.clone(), || service.run(req));
// let res = ProvideServerContext::new(fut, server_context.clone()).await;
// let mut res = res.res;
// // it it accepts text/html (i.e., is a plain form post) and doesn't already have a
// // Location set, then redirect to Referer
// if accepts_html {
@@ -130,13 +76,10 @@ impl ServerFunction {
// }
// }
// // apply the response parts from the server context to the response
// server_context.send_response(&mut res);
let mthd: MethodRouter<DioxusServerState> =
(self.handler)().with_state(DioxusServerState {});
mthd.call(req, DioxusServerState {}).await
router.route(
self.path(),
((self.handler)()).with_state(DioxusServerState {}),
)
}
}