Start9/rpc-toolkit
2
0
Fork 0
mirror of https://github.com/Start9Labs/rpc-toolkit.git synced 2026-03-30 20:24:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

middleware improvements

Browse Source
This commit is contained in:
Aiden McClelland
2021-08-09 11:58:40 -06:00
parent d45cbcdd8a
commit 9aae157d60
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rpc-toolkit-macro-internals/src/rpc_server/build.rs
View File

@@ -19,6 +19,14 @@ pub fn build(args: RpcServerArgs) -> TokenStream {
let status_fn = args.status_fn.unwrap_or_else(|| { let status_fn = args.status_fn.unwrap_or_else(|| {
syn::parse2(quote! { |_| ::rpc_toolkit::hyper::StatusCode::OK }).unwrap() syn::parse2(quote! { |_| ::rpc_toolkit::hyper::StatusCode::OK }).unwrap()
}); });
let middleware_name_clone = (0..)
.map(|i| Ident::new(&format!("middleware_clone_{}", i), Span::call_site()))
.take(args.middleware.len());
let middleware_name_clone2 = middleware_name_clone.clone();
let middleware_name_clone3 = middleware_name_clone.clone();
let middleware_name_clone4 = middleware_name_clone.clone();
let middleware_name_clone5 = middleware_name_clone.clone();
let middleware_name_clone6 = middleware_name_clone.clone();
let middleware_name_pre = (0..) let middleware_name_pre = (0..)
.map(|i| Ident::new(&format!("middleware_pre_{}", i), Span::call_site())) .map(|i| Ident::new(&format!("middleware_pre_{}", i), Span::call_site()))
.take(args.middleware.len()); .take(args.middleware.len());
@@ -41,15 +49,24 @@ pub fn build(args: RpcServerArgs) -> TokenStream {
let ctx = #ctx; let ctx = #ctx;
let status_fn = #status_fn; let status_fn = #status_fn;
let builder = ::rpc_toolkit::rpc_server_helpers::make_builder(&ctx); let builder = ::rpc_toolkit::rpc_server_helpers::make_builder(&ctx);
#(
let #middleware_name_clone = ::std::sync::Arc::new(#middleware);
)*
let make_svc = ::rpc_toolkit::hyper::service::make_service_fn(move |_| { let make_svc = ::rpc_toolkit::hyper::service::make_service_fn(move |_| {
let ctx = ctx.clone(); let ctx = ctx.clone();
#(
let #middleware_name_clone3 = #middleware_name_clone2.clone();
)*
async move { async move {
Ok::<_, ::rpc_toolkit::hyper::Error>(::rpc_toolkit::hyper::service::service_fn(move |mut req| { Ok::<_, ::rpc_toolkit::hyper::Error>(::rpc_toolkit::hyper::service::service_fn(move |mut req| {
let ctx = ctx.clone(); let ctx = ctx.clone();
let metadata = #command_module::Metadata::default(); let metadata = #command_module::Metadata::default();
#(
let #middleware_name_clone5 = #middleware_name_clone4.clone();
)*
async move { async move {
#( #(
let #middleware_name_pre = match ::rpc_toolkit::rpc_server_helpers::constrain_middleware(#middleware)(&mut req, metadata).await? { let #middleware_name_pre = match ::rpc_toolkit::rpc_server_helpers::constrain_middleware(&*#middleware_name_clone6)(&mut req, metadata).await? {
Ok(a) => a, Ok(a) => a,
Err(res) => return Ok(res), Err(res) => return Ok(res),
}; };

3
rpc-toolkit/src/rpc_server_helpers.rs
View File

@@ -1,4 +1,5 @@
use std::future::Future; use std::future::Future;
use std::sync::Arc;
use futures::future::BoxFuture; use futures::future::BoxFuture;
use futures::FutureExt; use futures::FutureExt;
@@ -163,7 +164,7 @@ pub fn constrain_middleware<
'c, 'c,
'd, 'd,
M: Metadata, M: Metadata,
ReqFn: Fn(&'a mut Request<Body>, M) -> ReqFut, ReqFn: Fn(&'a mut Request<Body>, M) -> ReqFut + Clone,
ReqFut: Future<Output = Result<Result<RpcReqFn, Response<Body>>, HttpError>> + 'a, ReqFut: Future<Output = Result<Result<RpcReqFn, Response<Body>>, HttpError>> + 'a,
RpcReqFn: FnOnce( RpcReqFn: FnOnce(
&'b mut RequestParts, &'b mut RequestParts,

8
rpc-toolkit/tests/test.rs
View File

@@ -8,7 +8,8 @@ use rpc_toolkit::clap::Arg;
use rpc_toolkit::hyper::http::Error as HttpError; use rpc_toolkit::hyper::http::Error as HttpError;
use rpc_toolkit::hyper::{Body, Response}; use rpc_toolkit::hyper::{Body, Response};
use rpc_toolkit::rpc_server_helpers::{ use rpc_toolkit::rpc_server_helpers::{
DynMiddlewareStage2, DynMiddlewareStage3, DynMiddlewareStage4, constrain_middleware, DynMiddleware, DynMiddlewareStage2, DynMiddlewareStage3,
DynMiddlewareStage4,
}; };
use rpc_toolkit::serde::{Deserialize, Serialize}; use rpc_toolkit::serde::{Deserialize, Serialize};
use rpc_toolkit::url::Host; use rpc_toolkit::url::Host;
@@ -215,3 +216,8 @@ fn cli_example() {
}), data: () } }), data: () }
) )
} }
fn type_check() {
let middleware: DynMiddleware<dothething::Metadata> = todo!();
constrain_middleware(&middleware);
}