Skip to content

Added request raw body handler #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Added request raw body handler #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0698255
Added request raw body handler
Arpita-Jaiswal Jul 9, 2024
55ff837
raw_data
Arpita-Jaiswal Jul 10, 2024
783339a
raw_data
Arpita-Jaiswal Jul 10, 2024
a0cb45d
Merge remote-tracking branch 'origin/main' into raw_bytes_handler
Arpita-Jaiswal Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ft-derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ pub fn processor(
handle(item, "processor", "handler")
}

#[proc_macro_attribute]
pub fn raw_data(
_attr: proc_macro::TokenStream,
item: proc_macro::TokenStream,
) -> proc_macro::TokenStream {
handle(item, "data", "raw_bytes_handler")
}

#[proc_macro_attribute]
pub fn wrapped_processor(
_attr: proc_macro::TokenStream,
Expand Down
7 changes: 7 additions & 0 deletions ft-sdk/src/from_request/headers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@ impl ft_sdk::FromRequest for http::HeaderMap {
Ok(req.headers().clone())
}
}


impl ft_sdk::FromRawRequest for http::HeaderMap {
fn from_request(req: &http::Request<bytes::Bytes>) -> Result<Self, ft_sdk::Error> {
Ok(req.headers().clone())
}
}
14 changes: 14 additions & 0 deletions ft-sdk/src/from_request/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ mod query;
#[cfg(feature = "field-extractors")]
mod required;
pub mod wrapped_processor;
mod text;
pub mod raw_bytes_handler;

pub use form::Form;
pub use text::Text;
pub use host::Host;
pub use mountpoint::Mountpoint;
pub use path::Path;
Expand All @@ -28,6 +31,11 @@ pub trait FromRequest: Sized {
fn from_request(req: &http::Request<serde_json::Value>) -> Result<Self, ft_sdk::Error>;
}


pub trait FromRawRequest: Sized {
fn from_request(req: &http::Request<bytes::Bytes>) -> Result<Self, ft_sdk::Error>;
}

impl FromRequest for chrono::DateTime<chrono::Utc> {
fn from_request(_req: &http::Request<serde_json::Value>) -> Result<Self, ft_sdk::Error> {
Ok(ft_sdk::env::now())
Expand All @@ -40,6 +48,12 @@ impl FromRequest for ft_sdk::Connection {
}
}

impl FromRawRequest for ft_sdk::Connection {
fn from_request(_req: &http::Request<bytes::Bytes>) -> Result<Self, ft_sdk::Error> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not fond of this approach. Lets create our own type, so we can do:

fn from_request(_req: &http::Request<ft_sys::Body>) -> Result<Self, ft_sdk::Error> {}

And inside body we store Bytes. And we have a private .json which is a refcell option serde_json::value, and we compute it the first time it is accessed via public .json().

Ok(ft_sdk::default_connection()?)
}
}

// TODO: need better name
pub trait WrappedFromRequest: FromRequest {
fn wrap(self, output: serde_json::Value) -> Result<serde_json::Value, ft_sdk::Error>;
Expand Down
312 changes: 312 additions & 0 deletions ft-sdk/src/from_request/raw_bytes_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,312 @@

// https://github.com/alexpusch/rust-magic-patterns/blob/master/axum-style-magic-function-param/Readme.md
// https://joshchoo.com/writing/how-actix-web-app-state-and-data-extractor-works
pub fn handle<T, O: Into<Result<http::Response<bytes::Bytes>, ft_sdk::Error>>, H: RawHandler<T, O>>(
h: H,
) {
let req = ft_sys::http::current_request();
let resp = h.call(&req).and_then(Into::into).unwrap_or_else(|e| {
ft_sdk::println!("Error: {:?}", e);
ft_sdk::error::handle_error(e)
});
ft_sdk::http::send_response(resp);
}

pub trait RawHandler<T, O>: Sized {
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error>;
}

impl<F, O> RawHandler<(), O> for F
where
F: Fn() -> Result<O, ft_sdk::Error>,
{
fn call(self, _req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
(self)()
}
}

impl<F, T, O> RawHandler<T, O> for F
where
F: Fn(T) -> Result<O, ft_sdk::Error>,
T: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
(self)(T::from_request(req)?)
}
}

impl<F, T1, T2, O> RawHandler<(T1, T2), O> for F
where
F: Fn(T1, T2) -> Result<O, ft_sdk::Error>,
T1: ft_sdk::FromRawRequest,
T2: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
// TODO: try to parse both t1 and t2 and return result for both together to clients
(self)(T1::from_request(req)?, T2::from_request(req)?)
}
}

impl<F, T1, T2, T3, O> RawHandler<(T1, T2, T3), O> for F
where
F: Fn(T1, T2, T3) -> Result<O, ft_sdk::Error>,
T1: ft_sdk::FromRawRequest,
T2: ft_sdk::FromRawRequest,
T3: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
// TODO: try to parse both t1 and t2 and return result for both together to clients
(self)(
T1::from_request(req)?,
T2::from_request(req)?,
T3::from_request(req)?,
)
}
}

impl<F, T1, T2, T3, T4, O> RawHandler<(T1, T2, T3, T4), O> for F
where
F: Fn(T1, T2, T3, T4) -> Result<O, ft_sdk::Error>,
T1: ft_sdk::FromRawRequest,
T2: ft_sdk::FromRawRequest,
T3: ft_sdk::FromRawRequest,
T4: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
// TODO: try to parse both t1 and t2 and return result for both together to clients
(self)(
T1::from_request(req)?,
T2::from_request(req)?,
T3::from_request(req)?,
T4::from_request(req)?,
)
}
}

impl<F, T1, T2, T3, T4, T5, O> RawHandler<(T1, T2, T3, T4, T5), O> for F
where
F: Fn(T1, T2, T3, T4, T5) -> Result<O, ft_sdk::Error>,
T1: ft_sdk::FromRawRequest,
T2: ft_sdk::FromRawRequest,
T3: ft_sdk::FromRawRequest,
T4: ft_sdk::FromRawRequest,
T5: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
// TODO: try to parse both t1 and t2 and return result for both together to clients
(self)(
T1::from_request(req)?,
T2::from_request(req)?,
T3::from_request(req)?,
T4::from_request(req)?,
T5::from_request(req)?,
)
}
}

impl<F, T1, T2, T3, T4, T5, T6, O> RawHandler<(T1, T2, T3, T4, T5, T6), O> for F
where
F: Fn(T1, T2, T3, T4, T5, T6) -> Result<O, ft_sdk::Error>,
T1: ft_sdk::FromRawRequest,
T2: ft_sdk::FromRawRequest,
T3: ft_sdk::FromRawRequest,
T4: ft_sdk::FromRawRequest,
T5: ft_sdk::FromRawRequest,
T6: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
// TODO: try to parse both t1 and t2 and return result for both together to clients
(self)(
T1::from_request(req)?,
T2::from_request(req)?,
T3::from_request(req)?,
T4::from_request(req)?,
T5::from_request(req)?,
T6::from_request(req)?,
)
}
}

impl<F, T1, T2, T3, T4, T5, T6, T7, O> RawHandler<(T1, T2, T3, T4, T5, T6, T7), O> for F
where
F: Fn(T1, T2, T3, T4, T5, T6, T7) -> Result<O, ft_sdk::Error>,
T1: ft_sdk::FromRawRequest,
T2: ft_sdk::FromRawRequest,
T3: ft_sdk::FromRawRequest,
T4: ft_sdk::FromRawRequest,
T5: ft_sdk::FromRawRequest,
T6: ft_sdk::FromRawRequest,
T7: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
// TODO: try to parse both t1 and t2 and return result for both together to clients
(self)(
T1::from_request(req)?,
T2::from_request(req)?,
T3::from_request(req)?,
T4::from_request(req)?,
T5::from_request(req)?,
T6::from_request(req)?,
T7::from_request(req)?,
)
}
}

impl<F, T1, T2, T3, T4, T5, T6, T7, T8, O> RawHandler<(T1, T2, T3, T4, T5, T6, T7, T8), O> for F
where
F: Fn(T1, T2, T3, T4, T5, T6, T7, T8) -> Result<O, ft_sdk::Error>,
T1: ft_sdk::FromRawRequest,
T2: ft_sdk::FromRawRequest,
T3: ft_sdk::FromRawRequest,
T4: ft_sdk::FromRawRequest,
T5: ft_sdk::FromRawRequest,
T6: ft_sdk::FromRawRequest,
T7: ft_sdk::FromRawRequest,
T8: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
// TODO: try to parse both t1 and t2 and return result for both together to clients
(self)(
T1::from_request(req)?,
T2::from_request(req)?,
T3::from_request(req)?,
T4::from_request(req)?,
T5::from_request(req)?,
T6::from_request(req)?,
T7::from_request(req)?,
T8::from_request(req)?,
)
}
}

impl<F, T1, T2, T3, T4, T5, T6, T7, T8, T9, O> RawHandler<(T1, T2, T3, T4, T5, T6, T7, T8, T9), O>
for F
where
F: Fn(T1, T2, T3, T4, T5, T6, T7, T8, T9) -> Result<O, ft_sdk::Error>,
T1: ft_sdk::FromRawRequest,
T2: ft_sdk::FromRawRequest,
T3: ft_sdk::FromRawRequest,
T4: ft_sdk::FromRawRequest,
T5: ft_sdk::FromRawRequest,
T6: ft_sdk::FromRawRequest,
T7: ft_sdk::FromRawRequest,
T8: ft_sdk::FromRawRequest,
T9: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
// TODO: try to parse both t1 and t2 and return result for both together to clients
(self)(
T1::from_request(req)?,
T2::from_request(req)?,
T3::from_request(req)?,
T4::from_request(req)?,
T5::from_request(req)?,
T6::from_request(req)?,
T7::from_request(req)?,
T8::from_request(req)?,
T9::from_request(req)?,
)
}
}

impl<F, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, O>
RawHandler<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10), O> for F
where
F: Fn(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) -> Result<O, ft_sdk::Error>,
T1: ft_sdk::FromRawRequest,
T2: ft_sdk::FromRawRequest,
T3: ft_sdk::FromRawRequest,
T4: ft_sdk::FromRawRequest,
T5: ft_sdk::FromRawRequest,
T6: ft_sdk::FromRawRequest,
T7: ft_sdk::FromRawRequest,
T8: ft_sdk::FromRawRequest,
T9: ft_sdk::FromRawRequest,
T10: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
// TODO: try to parse both t1 and t2 and return result for both together to clients
(self)(
T1::from_request(req)?,
T2::from_request(req)?,
T3::from_request(req)?,
T4::from_request(req)?,
T5::from_request(req)?,
T6::from_request(req)?,
T7::from_request(req)?,
T8::from_request(req)?,
T9::from_request(req)?,
T10::from_request(req)?,
)
}
}

impl<F, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, O>
RawHandler<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11), O> for F
where
F: Fn(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11) -> Result<O, ft_sdk::Error>,
T1: ft_sdk::FromRawRequest,
T2: ft_sdk::FromRawRequest,
T3: ft_sdk::FromRawRequest,
T4: ft_sdk::FromRawRequest,
T5: ft_sdk::FromRawRequest,
T6: ft_sdk::FromRawRequest,
T7: ft_sdk::FromRawRequest,
T8: ft_sdk::FromRawRequest,
T9: ft_sdk::FromRawRequest,
T10: ft_sdk::FromRawRequest,
T11: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
// TODO: try to parse both t1 and t2 and return result for both together to clients
(self)(
T1::from_request(req)?,
T2::from_request(req)?,
T3::from_request(req)?,
T4::from_request(req)?,
T5::from_request(req)?,
T6::from_request(req)?,
T7::from_request(req)?,
T8::from_request(req)?,
T9::from_request(req)?,
T10::from_request(req)?,
T11::from_request(req)?,
)
}
}

impl<F, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, O>
RawHandler<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12), O> for F
where
F: Fn(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12) -> Result<O, ft_sdk::Error>,
T1: ft_sdk::FromRawRequest,
T2: ft_sdk::FromRawRequest,
T3: ft_sdk::FromRawRequest,
T4: ft_sdk::FromRawRequest,
T5: ft_sdk::FromRawRequest,
T6: ft_sdk::FromRawRequest,
T7: ft_sdk::FromRawRequest,
T8: ft_sdk::FromRawRequest,
T9: ft_sdk::FromRawRequest,
T10: ft_sdk::FromRawRequest,
T11: ft_sdk::FromRawRequest,
T12: ft_sdk::FromRawRequest,
{
fn call(self, req: &http::Request<bytes::Bytes>) -> Result<O, ft_sdk::Error> {
// TODO: try to parse both t1 and t2 and return result for both together to clients
(self)(
T1::from_request(req)?,
T2::from_request(req)?,
T3::from_request(req)?,
T4::from_request(req)?,
T5::from_request(req)?,
T6::from_request(req)?,
T7::from_request(req)?,
T8::from_request(req)?,
T9::from_request(req)?,
T10::from_request(req)?,
T11::from_request(req)?,
T12::from_request(req)?,
)
}
}
7 changes: 7 additions & 0 deletions ft-sdk/src/from_request/text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pub struct Text(pub String);

impl ft_sdk::FromRawRequest for Text {
fn from_request(req: &http::Request<bytes::Bytes>) -> Result<Self, ft_sdk::Error> {
Ok(Text(String::from_utf8(req.body().as_ref().to_vec())?))
}
}
4 changes: 2 additions & 2 deletions ft-sdk/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ pub use email::{send_email, EmailError};
pub use error::{not_found_, server_error_, single_error, unauthorised_, SpecialError};
#[cfg(feature = "field-extractors")]
pub use from_request::{Cookie, Hidden, Optional, Query, Required};
pub use from_request::{Form, FromRequest, Host, Mountpoint, Path, WrappedFromRequest};
pub use ft_derive::{data, form, processor, wrapped_processor};
pub use from_request::{Form, Text, FromRequest, FromRawRequest, Host, Mountpoint, Path, WrappedFromRequest};
pub use ft_derive::{data, form, processor, wrapped_processor, raw_data};
#[cfg(feature = "postgres")]
pub use ft_sys::PgConnection;
#[cfg(feature = "sqlite")]
Expand Down