mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 05:17:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move body related types from ntex::http

Browse source
This commit is contained in:
Nikolay Kim 2024-11-28 10:47:32 -08:00
parent 49d83848b2
commit 3d296530f5
7 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ntex-compio/Cargo.toml
View file

@ -20,5 +20,6 @@ path = "src/lib.rs"
ntex-bytes = "0.1"
ntex-io = "2.5"
ntex-util = "2"
ntex-rt = "0.4"
log = "0.4"
compio = { version = "0.13.0", features = ["macros", "runtime", "io", "io-uring", "polling"], default-features = false }

4
ntex-http/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes
## [0.1.13] - 2024-01-xx
* Move body related types from ntex::http
## [0.1.12] - 2024-01-16
* Update http dependency

5
ntex-http/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-http"
version = "0.1.12"
version = "0.1.13"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Http types for ntex framework"
keywords = ["network", "framework", "async", "futures"]
@ -20,8 +20,9 @@ http = "1"
log = "0.4"
fxhash = "0.2.1"
itoa = "1.0.4"
ntex-bytes = "0.1.21"
ntex-bytes = "0.1"
serde = "1"
futures-core = { version = "0.3", default-features = false, features = ["alloc"] }
[dev-dependencies]
bincode = "1"

25
ntex/src/http/body.rs → ntex-http/src/body.rs
View file

@ -1,8 +1,10 @@
//! Traits and structures to aid consuming and writing HTTP payloads.
use std::{
error::Error, fmt, marker::PhantomData, mem, pin::Pin, task::Context, task::Poll,
};
use crate::util::{Bytes, BytesMut, Stream};
use futures_core::Stream;
use ntex_bytes::{Bytes, BytesMut};
#[derive(Debug, PartialEq, Eq, Copy, Clone)]
/// Body size hint
@ -19,8 +21,9 @@ impl BodySize {
}
}
/// Type that provides this trait can be streamed to a peer.
/// Interface for types that can be streamed to a peer.
pub trait MessageBody: 'static {
/// Message body size hind
fn size(&self) -> BodySize;
fn poll_next_chunk(
@ -30,10 +33,12 @@ pub trait MessageBody: 'static {
}
impl MessageBody for () {
#[inline]
fn size(&self) -> BodySize {
BodySize::Empty
}
#[inline]
fn poll_next_chunk(
&mut self,
_: &mut Context<'_>,
@ -43,10 +48,12 @@ impl MessageBody for () {
}
impl<T: MessageBody> MessageBody for Box<T> {
#[inline]
fn size(&self) -> BodySize {
self.as_ref().size()
}
#[inline]
fn poll_next_chunk(
&mut self,
cx: &mut Context<'_>,
@ -56,6 +63,7 @@ impl<T: MessageBody> MessageBody for Box<T> {
}
#[derive(Debug)]
/// Represents http response body
pub enum ResponseBody<B> {
Body(B),
Other(Body),
@ -86,10 +94,12 @@ impl<B> From<Body> for ResponseBody<B> {
}
impl<B> ResponseBody<B> {
#[inline]
pub fn new(body: B) -> Self {
ResponseBody::Body(body)
}
#[inline]
pub fn take_body(&mut self) -> ResponseBody<B> {
std::mem::replace(self, ResponseBody::Other(Body::None))
}
@ -106,6 +116,7 @@ impl<B: MessageBody> ResponseBody<B> {
}
impl<B: MessageBody> MessageBody for ResponseBody<B> {
#[inline]
fn size(&self) -> BodySize {
match self {
ResponseBody::Body(ref body) => body.size(),
@ -113,6 +124,7 @@ impl<B: MessageBody> MessageBody for ResponseBody<B> {
}
}
#[inline]
fn poll_next_chunk(
&mut self,
cx: &mut Context<'_>,
@ -154,12 +166,13 @@ impl Body {
}
/// Create body from generic message body.
pub fn from_message<B: MessageBody + 'static>(body: B) -> Body {
pub fn from_message<B: MessageBody>(body: B) -> Body {
Body::Message(Box::new(body))
}
}
impl MessageBody for Body {
#[inline]
fn size(&self) -> BodySize {
match self {
Body::None => BodySize::None,
@ -253,12 +266,6 @@ impl From<BytesMut> for Body {
}
}
impl From<serde_json::Value> for Body {
fn from(v: serde_json::Value) -> Body {
Body::Bytes(v.to_string().into())
}
}
impl<S> From<SizedStream<S>> for Body
where
S: Stream<Item = Result<Bytes, Box<dyn Error>>> + Unpin + 'static,

1
ntex-http/src/lib.rs
View file

@ -1,6 +1,7 @@
//! Http protocol support.
#![deny(rust_2018_idioms, unreachable_pub, missing_debug_implementations)]
pub mod body;
pub mod error;
mod map;
mod serde;

4
ntex/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex"
version = "2.8.0"
version = "2.9.0"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Framework for composable network services"
readme = "README.md"
@ -62,7 +62,7 @@ brotli = ["dep:brotli2"]
[dependencies]
ntex-codec = "0.6"
ntex-http = "0.1.12"
ntex-http = "0.1.13"
ntex-router = "0.5"
ntex-service = "3.3"
ntex-macros = "0.1"

3
ntex/src/http/mod.rs
View file

@ -1,5 +1,4 @@
//! Http protocol support.
pub mod body;
mod builder;
pub mod client;
mod config;
@ -36,4 +35,4 @@ pub use crate::io::types::HttpProtocol;
// re-exports
pub use ntex_http::uri::{self, Uri};
pub use ntex_http::{HeaderMap, Method, StatusCode, Version};
pub use ntex_http::{body, HeaderMap, Method, StatusCode, Version};