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

refactor http server config

Browse source
This commit is contained in:
Nikolay Kim 2020-04-04 22:58:28 +06:00
parent 94790da9fd
commit 29fbecc5c5
10 changed files with 53 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ntex/src/http/builder.rs
View file

@ -1,6 +1,6 @@
use std::fmt;
use std::marker::PhantomData;
use std::rc::Rc;
use std::{fmt, net};
use crate::codec::Framed;
use crate::http::body::MessageBody;
@ -22,8 +22,6 @@ pub struct HttpServiceBuilder<T, S, X = ExpectHandler, U = UpgradeHandler<T>> {
keep_alive: KeepAlive,
client_timeout: u64,
client_disconnect: u64,
secure: bool,
local_addr: Option<net::SocketAddr>,
expect: X,
upgrade: Option<U>,
on_connect: Option<Rc<dyn Fn(&T) -> Box<dyn DataFactory>>>,
@ -37,8 +35,6 @@ impl<T, S> HttpServiceBuilder<T, S, ExpectHandler, UpgradeHandler<T>> {
keep_alive: KeepAlive::Timeout(5),
client_timeout: 5000,
client_disconnect: 0,
secure: false,
local_addr: None,
expect: ExpectHandler,
upgrade: None,
on_connect: None,
@ -70,18 +66,6 @@ where
self
}
/// Set connection secure state
pub fn secure(mut self) -> Self {
self.secure = true;
self
}
/// Set the local address that this service is bound to.
pub fn local_addr(mut self, addr: net::SocketAddr) -> Self {
self.local_addr = Some(addr);
self
}
/// Set server client timeout in milliseconds for first request.
///
/// Defines a timeout for reading client request header. If a client does not transmit
@ -126,8 +110,6 @@ where
keep_alive: self.keep_alive,
client_timeout: self.client_timeout,
client_disconnect: self.client_disconnect,
secure: self.secure,
local_addr: self.local_addr,
expect: expect.into_factory(),
upgrade: self.upgrade,
on_connect: self.on_connect,
@ -155,8 +137,6 @@ where
keep_alive: self.keep_alive,
client_timeout: self.client_timeout,
client_disconnect: self.client_disconnect,
secure: self.secure,
local_addr: self.local_addr,
expect: self.expect,
upgrade: Some(upgrade.into_factory()),
on_connect: self.on_connect,
@ -190,8 +170,6 @@ where
self.keep_alive,
self.client_timeout,
self.client_disconnect,
self.secure,
self.local_addr,
);
H1Service::with_config(cfg, service.into_factory())
.expect(self.expect)
@ -213,8 +191,6 @@ where
self.keep_alive,
self.client_timeout,
self.client_disconnect,
self.secure,
self.local_addr,
);
H2Service::with_config(cfg, service.into_factory()).on_connect(self.on_connect)
}
@ -233,8 +209,6 @@ where
self.keep_alive,
self.client_timeout,
self.client_disconnect,
self.secure,
self.local_addr,
);
HttpService::with_config(cfg, service.into_factory())
.expect(self.expect)

122
ntex/src/http/config.rs
View file

@ -1,8 +1,8 @@
use std::cell::UnsafeCell;
use std::fmt;
use std::fmt::Write;
use std::rc::Rc;
use std::time::Duration;
use std::{fmt, net};
use bytes::BytesMut;
use futures::{future, FutureExt};
@ -41,7 +41,6 @@ impl From<Option<usize>> for KeepAlive {
}
pub(super) struct DispatcherConfig<S, X, U> {
pub(super) config: ServiceConfig,
pub(super) service: S,
pub(super) expect: X,
pub(super) upgrade: Option<U>,
@ -68,7 +67,6 @@ impl<S, X, U> DispatcherConfig<S, X, U> {
client_disconnect: cfg.0.client_disconnect,
ka_enabled: cfg.0.ka_enabled,
timer: cfg.0.timer.clone(),
config: cfg,
}
}
@ -130,8 +128,6 @@ pub(super) struct Inner {
pub(super) client_timeout: u64,
pub(super) client_disconnect: u64,
pub(super) ka_enabled: bool,
pub(super) secure: bool,
pub(super) local_addr: Option<std::net::SocketAddr>,
pub(super) timer: DateService,
}
@ -143,7 +139,7 @@ impl Clone for ServiceConfig {
impl Default for ServiceConfig {
fn default() -> Self {
Self::new(KeepAlive::Timeout(5), 0, 0, false, None)
Self::new(KeepAlive::Timeout(5), 0, 0)
}
}
@ -153,8 +149,6 @@ impl ServiceConfig {
keep_alive: KeepAlive,
client_timeout: u64,
client_disconnect: u64,
secure: bool,
local_addr: Option<net::SocketAddr>,
) -> ServiceConfig {
let (keep_alive, ka_enabled) = match keep_alive {
KeepAlive::Timeout(val) => (val as u64, true),
@ -172,98 +166,9 @@ impl ServiceConfig {
ka_enabled,
client_timeout,
client_disconnect,
secure,
local_addr,
timer: DateService::new(),
}))
}
#[inline]
/// Returns true if connection is secure(https)
pub fn secure(&self) -> bool {
self.0.secure
}
#[inline]
/// Returns the local address that this server is bound to.
pub fn local_addr(&self) -> Option<net::SocketAddr> {
self.0.local_addr
}
#[inline]
/// Keep alive duration if configured.
pub fn keep_alive(&self) -> Option<Duration> {
self.0.keep_alive
}
#[inline]
/// Return state of connection keep-alive funcitonality
pub fn keep_alive_enabled(&self) -> bool {
self.0.ka_enabled
}
#[inline]
/// Client timeout for first request.
pub fn client_timer(&self) -> Option<Delay> {
let delay_time = self.0.client_timeout;
if delay_time != 0 {
Some(delay_until(
self.0.timer.now() + Duration::from_millis(delay_time),
))
} else {
None
}
}
/// Client timeout for first request.
pub fn client_timer_expire(&self) -> Option<Instant> {
let delay = self.0.client_timeout;
if delay != 0 {
Some(self.0.timer.now() + Duration::from_millis(delay))
} else {
None
}
}
/// Client disconnect timer
pub fn client_disconnect_timer(&self) -> Option<Instant> {
let delay = self.0.client_disconnect;
if delay != 0 {
Some(self.0.timer.now() + Duration::from_millis(delay))
} else {
None
}
}
#[inline]
/// Return keep-alive timer delay is configured.
pub fn keep_alive_timer(&self) -> Option<Delay> {
if let Some(ka) = self.0.keep_alive {
Some(delay_until(self.0.timer.now() + ka))
} else {
None
}
}
/// Keep-alive expire time
pub fn keep_alive_expire(&self) -> Option<Instant> {
if let Some(ka) = self.0.keep_alive {
Some(self.0.timer.now() + ka)
} else {
None
}
}
#[doc(hidden)]
pub fn set_date(&self, dst: &mut BytesMut) {
let mut buf: [u8; 39] = [0; 39];
buf[..6].copy_from_slice(b"date: ");
self.0
.timer
.set_date(|date| buf[6..35].copy_from_slice(&date.bytes));
buf[35..].copy_from_slice(b"\r\n\r\n");
dst.extend_from_slice(&buf);
}
}
#[derive(Copy, Clone)]
@ -302,7 +207,13 @@ impl fmt::Write for Date {
}
#[derive(Clone)]
pub(super) struct DateService(Rc<DateServiceInner>);
pub struct DateService(Rc<DateServiceInner>);
impl Default for DateService {
fn default() -> Self {
DateService(Rc::new(DateServiceInner::new()))
}
}
struct DateServiceInner {
current: UnsafeCell<Option<(Date, Instant)>>,
@ -353,6 +264,15 @@ impl DateService {
self.check_date();
f(&unsafe { (&*self.0.current.get()).as_ref().unwrap().0 })
}
#[doc(hidden)]
pub fn set_date_header(&self, dst: &mut BytesMut) {
let mut buf: [u8; 39] = [0; 39];
buf[..6].copy_from_slice(b"date: ");
self.set_date(|date| buf[6..35].copy_from_slice(&date.bytes));
buf[35..].copy_from_slice(b"\r\n\r\n");
dst.extend_from_slice(&buf);
}
}
#[cfg(test)]
@ -366,11 +286,11 @@ mod tests {
#[ntex_rt::test]
async fn test_date() {
let settings = ServiceConfig::new(KeepAlive::Os, 0, 0, false, None);
let date = DateService::default();
let mut buf1 = BytesMut::with_capacity(DATE_VALUE_LENGTH + 10);
settings.set_date(&mut buf1);
date.set_date_header(&mut buf1);
let mut buf2 = BytesMut::with_capacity(DATE_VALUE_LENGTH + 10);
settings.set_date(&mut buf2);
date.set_date_header(&mut buf2);
assert_eq!(buf1, buf2);
}
}

14
ntex/src/http/h1/client.rs
View file

@ -5,7 +5,7 @@ use bytes::{Bytes, BytesMut};
use crate::codec::{Decoder, Encoder};
use crate::http::body::BodySize;
use crate::http::config::ServiceConfig;
use crate::http::config::DateService;
use crate::http::error::{ParseError, PayloadError};
use crate::http::message::{ConnectionType, RequestHeadType, ResponseHead};
use crate::http::{Method, Version};
@ -33,7 +33,7 @@ pub struct ClientPayloadCodec {
}
struct ClientCodecInner {
config: ServiceConfig,
timer: DateService,
decoder: decoder::MessageDecoder<ResponseHead>,
payload: Option<PayloadDecoder>,
version: Version,
@ -46,7 +46,7 @@ struct ClientCodecInner {
impl Default for ClientCodec {
fn default() -> Self {
ClientCodec::new(ServiceConfig::default())
ClientCodec::new(DateService::default(), true)
}
}
@ -54,15 +54,15 @@ impl ClientCodec {
/// Create HTTP/1 codec.
///
/// `keepalive_enabled` how response `connection` header get generated.
pub fn new(config: ServiceConfig) -> Self {
let flags = if config.keep_alive_enabled() {
pub fn new(timer: DateService, keep_alive: bool) -> Self {
let flags = if keep_alive {
Flags::KEEPALIVE_ENABLED
} else {
Flags::empty()
};
ClientCodec {
inner: ClientCodecInner {
config,
timer,
decoder: decoder::MessageDecoder::default(),
payload: None,
version: Version::HTTP_11,
@ -212,7 +212,7 @@ impl Encoder for ClientCodec {
inner.version,
length,
inner.ctype,
&inner.config,
&inner.timer,
)?;
}
Message::Chunk(Some(bytes)) => {

20
ntex/src/http/h1/codec.rs
View file

@ -6,7 +6,7 @@ use http::{Method, Version};
use crate::codec::{Decoder, Encoder};
use crate::http::body::BodySize;
use crate::http::config::ServiceConfig;
use crate::http::config::DateService;
use crate::http::error::ParseError;
use crate::http::message::ConnectionType;
use crate::http::request::Request;
@ -26,7 +26,7 @@ bitflags! {
/// HTTP/1 Codec
pub struct Codec {
config: ServiceConfig,
timer: DateService,
decoder: decoder::MessageDecoder<Request>,
payload: Option<PayloadDecoder>,
version: Version,
@ -39,7 +39,7 @@ pub struct Codec {
impl Default for Codec {
fn default() -> Self {
Codec::new(ServiceConfig::default())
Codec::new(DateService::default(), false)
}
}
@ -53,15 +53,16 @@ impl Codec {
/// Create HTTP/1 codec.
///
/// `keepalive_enabled` how response `connection` header get generated.
pub fn new(config: ServiceConfig) -> Self {
let flags = if config.keep_alive_enabled() {
pub fn new(timer: DateService, keep_alive: bool) -> Self {
let flags = if keep_alive {
Flags::KEEPALIVE_ENABLED
} else {
Flags::empty()
};
Codec {
config,
flags,
timer,
decoder: decoder::MessageDecoder::default(),
payload: None,
version: Version::HTTP_11,
@ -99,11 +100,6 @@ impl Codec {
MessageType::Payload
}
}
#[inline]
pub fn config(&self) -> &ServiceConfig {
&self.config
}
}
impl Decoder for Codec {
@ -179,7 +175,7 @@ impl Encoder for Codec {
self.version,
length,
self.ctype,
&self.config,
&self.timer,
)?;
// self.headers_size = (dst.len() - len) as u32;
}

4
ntex/src/http/h1/dispatcher.rs
View file

@ -165,7 +165,7 @@ where
peer_addr: Option<net::SocketAddr>,
on_connect: Option<Box<dyn DataFactory>>,
) -> Self {
let codec = Codec::new(config.config.clone());
let codec = Codec::new(config.timer.clone(), config.keep_alive_enabled());
// slow request timer
let timeout = config.client_timer();
@ -768,7 +768,7 @@ where
}
if updated && self.ka_timer.is_some() {
if let Some(expire) = self.codec.config().keep_alive_expire() {
if let Some(expire) = self.config.keep_alive_expire() {
self.ka_expire = expire;
}
}

23
ntex/src/http/h1/encoder.rs
View file

@ -7,9 +7,8 @@ use std::{cmp, io, mem, ptr, slice};
use bytes::{buf::BufMutExt, BufMut, BytesMut};
use crate::http::body::BodySize;
use crate::http::config::ServiceConfig;
use crate::http::header::map;
use crate::http::header::{CONNECTION, CONTENT_LENGTH, DATE, TRANSFER_ENCODING};
use crate::http::config::DateService;
use crate::http::header::{map, CONNECTION, CONTENT_LENGTH, DATE, TRANSFER_ENCODING};
use crate::http::helpers;
use crate::http::message::{ConnectionType, RequestHeadType};
use crate::http::response::Response;
@ -55,7 +54,7 @@ pub(crate) trait MessageType: Sized {
version: Version,
mut length: BodySize,
ctype: ConnectionType,
config: &ServiceConfig,
timer: &DateService,
) -> io::Result<()> {
let chunked = self.chunked();
let mut skip_len = length != BodySize::Stream;
@ -225,7 +224,7 @@ pub(crate) trait MessageType: Sized {
// optimized date header, set_date writes \r\n
if !has_date {
config.set_date(dst);
timer.set_date_header(dst);
} else {
// msg eof
dst.extend_from_slice(b"\r\n");
@ -334,7 +333,7 @@ impl<T: MessageType> MessageEncoder<T> {
version: Version,
length: BodySize,
ctype: ConnectionType,
config: &ServiceConfig,
timer: &DateService,
) -> io::Result<()> {
// transfer encoding
if !head {
@ -356,7 +355,7 @@ impl<T: MessageType> MessageEncoder<T> {
}
message.encode_status(dst)?;
message.encode_headers(dst, version, length, ctype, config)
message.encode_headers(dst, version, length, ctype, timer)
}
}
@ -701,7 +700,7 @@ mod tests {
Version::HTTP_11,
BodySize::Empty,
ConnectionType::Close,
&ServiceConfig::default(),
&DateService::default(),
);
let data =
String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
@ -715,7 +714,7 @@ mod tests {
Version::HTTP_11,
BodySize::Stream,
ConnectionType::KeepAlive,
&ServiceConfig::default(),
&DateService::default(),
);
let data =
String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
@ -728,7 +727,7 @@ mod tests {
Version::HTTP_11,
BodySize::Sized64(100),
ConnectionType::KeepAlive,
&ServiceConfig::default(),
&DateService::default(),
);
let data =
String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
@ -750,7 +749,7 @@ mod tests {
Version::HTTP_11,
BodySize::Stream,
ConnectionType::KeepAlive,
&ServiceConfig::default(),
&DateService::default(),
);
let data =
String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
@ -784,7 +783,7 @@ mod tests {
Version::HTTP_11,
BodySize::Empty,
ConnectionType::Close,
&ServiceConfig::default(),
&DateService::default(),
);
let data =
String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();

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

@ -25,7 +25,7 @@ pub mod ws;
pub(crate) use self::message::Message;
pub use self::builder::HttpServiceBuilder;
pub use self::config::{KeepAlive, ServiceConfig};
pub use self::config::{DateService, KeepAlive, ServiceConfig};
pub use self::error::ResponseError;
pub use self::extensions::Extensions;
pub use self::header::HeaderMap;

2
ntex/src/http/service.rs
View file

@ -59,7 +59,7 @@ where
{
/// Create new `HttpService` instance.
pub fn new<F: IntoServiceFactory<S>>(service: F) -> Self {
let cfg = ServiceConfig::new(KeepAlive::Timeout(5), 5000, 0, false, None);
let cfg = ServiceConfig::new(KeepAlive::Timeout(5), 5000, 0);
HttpService {
cfg,

1
ntex/src/web/server.rs
View file

@ -259,7 +259,6 @@ where
HttpService::build()
.keep_alive(c.keep_alive)
.client_timeout(c.client_timeout)
.local_addr(addr)
.finish(map_config(factory(), move |_| cfg.clone()))
.tcp()
},

2
ntex/tests/web_httpserver.rs
View file

@ -133,7 +133,7 @@ async fn test_start_ssl() {
.connector(
ntex::http::client::Connector::default()
.ssl(builder.build())
.timeout(Duration::from_millis(100))
.timeout(Duration::from_millis(3000))
.finish(),
)
.finish();