Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 4 deletions ohkami/src/fang/builtin/jwt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,8 @@ impl<Payload: for<'de> Deserialize<'de>> Jwt<Payload> {
.header("Authorization", "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE3MDY4MTEwNzUsInVzZXJfaWQiOiI5ZmMwMDViMi1mODU4LTQzMzYtODkwYS1mMWEyYWVmNjBhMjQifQ.AKp-0zvKK4Hwa6qCgxskckD04Snf0gpSG7U1LOpcC_I")
.encode();
let mut req_bytes = &req_bytes[..];
let mut req = Request::init(crate::util::IP_0000);
let mut req = unsafe {Pin::new_unchecked(&mut req)};
let mut req = Request::uninit(crate::util::IP_0000);
let mut req = Pin::new(&mut req);
crate::__rt__::testing::block_on({
req.as_mut().read(&mut req_bytes)
}).unwrap();
Expand All @@ -460,8 +460,8 @@ impl<Payload: for<'de> Deserialize<'de>> Jwt<Payload> {
.header("Authorization", "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE3MDY4MTEwNzUsInVzZXJfaWQiOiI5ZmMwMDViMi1mODU4LTQzMzYtODkwYS1mMWEyYWVmNjBhMjQifQ.AKp-0zvKK4Hwa6qCgxskckD04Snf0gpSG7U1LOpcC_X")
.encode();
let mut req_bytes = &req_bytes[..];
let mut req = Request::init(crate::util::IP_0000);
let mut req = unsafe {Pin::new_unchecked(&mut req)};
let mut req = Request::uninit(crate::util::IP_0000);
let mut req = Pin::new(&mut req);
crate::__rt__::testing::block_on({
req.as_mut().read(&mut req_bytes)
}).unwrap();
Expand Down
8 changes: 4 additions & 4 deletions ohkami/src/ohkami/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -771,10 +771,10 @@ impl Ohkami {
) -> ::worker::Response {
crate::DEBUG!("Called `#[ohkami::worker]`; req: {req:?}");

let mut ohkami_req = crate::Request::init();
let mut ohkami_req = crate::Request::uninit();
crate::DEBUG!("Done `ohkami::Request::init`");

let mut ohkami_req = unsafe {std::pin::Pin::new_unchecked(&mut ohkami_req)};
let mut ohkami_req = std::pin::Pin::new(&mut ohkami_req);
crate::DEBUG!("Put request in `Pin`");

let take_over = ohkami_req.as_mut().take_over(req, env, ctx).await;
Expand Down Expand Up @@ -918,8 +918,8 @@ const _: () = {
req: lambda_runtime::LambdaEvent<crate::x_lambda::LambdaHTTPRequest>
) -> Self::Future {
let f = async move {
let mut ohkami_req = crate::Request::init();
let mut ohkami_req = unsafe {std::pin::Pin::new_unchecked(&mut ohkami_req)};
let mut ohkami_req = crate::Request::uninit();
let mut ohkami_req = std::pin::Pin::new(&mut ohkami_req);
ohkami_req.as_mut().take_over(req)?;

let mut ohkami_res = ROUTER.get().unwrap().handle(&mut ohkami_req).await;
Expand Down
4 changes: 2 additions & 2 deletions ohkami/src/request/_test_parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ macro_rules! assert_parse {
($case:expr, $expected:expr) => {
let mut case = $case.as_bytes();

let mut actual = Request::init(crate::util::IP_0000);
let mut actual = unsafe {Pin::new_unchecked(&mut actual)};
let mut actual = Request::uninit(crate::util::IP_0000);
let mut actual = Pin::new(&mut actual);

let result = crate::__rt__::testing::block_on({
actual.as_mut().read(&mut case)
Expand Down
2 changes: 1 addition & 1 deletion ohkami/src/request/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ pub struct Request {
impl Request {
#[cfg(feature="__rt__")]
#[inline]
pub(crate) fn init(
pub(crate) fn uninit(
#[cfg(feature="__rt_native__")]
ip: std::net::IpAddr
) -> Self {
Expand Down
12 changes: 5 additions & 7 deletions ohkami/src/session/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,15 @@ impl Session {
}
}

let mut req = Request::init(self.ip);
let mut req = unsafe { Pin::new_unchecked(&mut req) };
let mut req = Request::uninit(self.ip);
let mut req = Pin::new(&mut req);
let upgrade = loop {
req.clear();
// Apply a fresh timeout for each read, thus resetting the timer on activity.
let read_result = with_timeout(
match with_timeout(
Duration::from_secs(crate::CONFIG.keepalive_timeout()),
async { req.as_mut().read(&mut self.connection).await }
).await;

match read_result {
req.as_mut().read(&mut self.connection)
).await {
None => {
crate::DEBUG!("\
Reached Keep-Alive timeout. In Ohkami, Keep-Alive timeout \
Expand Down
2 changes: 1 addition & 1 deletion ohkami/src/testing/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ impl TestingOhkami {
let router = self.0.clone();

let res = async move {
let mut request = Request::init(#[cfg(feature="__rt_native__")] crate::util::IP_0000);
let mut request = Request::uninit(#[cfg(feature="__rt_native__")] crate::util::IP_0000);
let mut request = unsafe {Pin::new_unchecked(&mut request)};

let res = match request.as_mut().read(&mut &req.encode()[..]).await {
Expand Down