Skip to content

Commit

Permalink
Preconnect RPC server to reduce cache miss latency
Browse files Browse the repository at this point in the history
  • Loading branch information
james58899 committed Mar 16, 2024
1 parent bfb4034 commit 56bb0ff
Show file tree
Hide file tree
Showing 6 changed files with 192 additions and 26 deletions.
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ futures = "0.3"
hex = "0.4"
http-body = "1.0"
http-body-util = "0.1"
hyper = { version = "1.2", features = ["http1", "server"] }
hyper = { version = "1.2", features = ["client", "http1", "server"] }
hyper-util = { version = "0.1", features = ["tokio"] }
inquire = "0.7"
log = { version = "0.4", features = ["std"] }
Expand All @@ -30,6 +30,7 @@ rand = { version = "0.8", features = ["small_rng"] }
regex = "1.10"
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream", "socks"] }
scopeguard = "1.2"
socket2 = "0.5"
tempfile = "3.10"
tokio = { version = "1", features = ["full", "parking_lot"] }
tokio-openssl = "0.6"
Expand Down
3 changes: 3 additions & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
use core::fmt;

#[allow(clippy::enum_variant_names)]
#[derive(Debug)]
pub enum Error {
VersionTooOld,
ApiResponseFail { fail_code: String, message: String },
ConnectTestFail,
InitSettingsMissing(String),
HashMismatch { expected: [u8; 20], actual: [u8; 20] },
ServerError { status: u16, body: Option<String> },
}

impl Error {
Expand All @@ -28,6 +30,7 @@ impl fmt::Display for Error {
Error::ConnectTestFail => write!(f, "Connect test failed"),
Error::InitSettingsMissing(settings) => write!(f, "Missing init settings: {settings}"),
Error::HashMismatch { expected, actual } => write!(f, "Hash missmatch. Expected={expected:?}, Actual={actual:?}"),
Error::ServerError { status, body } => write!(f, "Status={status}, Body={}", body.clone().unwrap_or_default()),
}
}
}
1 change: 1 addition & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ mod logger;
mod middleware;
mod route;
mod rpc;
mod rpc_http_client;
mod server;
mod util;

Expand Down
40 changes: 15 additions & 25 deletions src/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ use parking_lot::{RwLock, RwLockUpgradableReadGuard};
use rand::prelude::SliceRandom;
use reqwest::{IntoUrl, Url};

use crate::{
error::Error,
gallery_downloader::GalleryMeta,
util::{create_http_client, string_to_hash},
};
use crate::{error::Error, gallery_downloader::GalleryMeta, rpc_http_client::RPCHttpClient, util::string_to_hash};

const API_VERSION: i32 = 160; // For server check capabilities.
const DEFAULT_SERVER: &str = "rpc.hentaiathome.net";
Expand All @@ -39,7 +35,7 @@ pub struct RPCClient {
clock_offset: AtomicI64,
id: i32,
key: String,
reqwest: reqwest::Client,
http_client: RPCHttpClient,
rpc_servers: RwLock<Vec<String>>,
running: AtomicBool,
settings: Arc<Settings>,
Expand Down Expand Up @@ -128,7 +124,7 @@ impl RPCClient {
clock_offset: AtomicI64::new(0),
id,
key: key.to_string(),
reqwest: create_http_client(Duration::from_secs(600), None),
http_client: RPCHttpClient::new(Duration::from_secs(600)),
rpc_servers: RwLock::new(vec![]),
running: AtomicBool::new(false),
settings: Arc::new(Settings {
Expand Down Expand Up @@ -206,11 +202,9 @@ impl RPCClient {
pub async fn get_cert(&self) -> Option<ParsedPkcs12_2> {
let _provider = Provider::try_load(None, "legacy", true).unwrap();
let cert = self
.reqwest
.http_client
.get(self.build_url("get_cert", "", None))
.send()
.and_then(|res| async { res.error_for_status() })
.and_then(|res| res.bytes())
.and_then(|res| self.http_client.to_bytes(res))
.await
.ok()
.and_then(|data| Pkcs12::from_der(&data[..]).ok())
Expand Down Expand Up @@ -475,10 +469,9 @@ The program will now terminate.
return Ok(response);
}
Err(err) => {
if err.is_connect() || err.is_timeout() || err.status().map_or(false, |s| s.is_server_error()) {
self.change_server();
}
error = Box::new(err);
error!("Send request error: {}", err);
self.change_server();
error = err;
}
}
retry -= 1;
Expand All @@ -487,17 +480,14 @@ The program will now terminate.
Err(error)
}

async fn send_request<U: IntoUrl>(&self, url: U) -> Result<String, reqwest::Error> {
let res = self.reqwest.get(url).timeout(Duration::from_secs(600)).send().await?;

if let Err(err) = res.error_for_status_ref() {
let status = res.status();
let body = res.text().await.unwrap_or_default();
warn!("Server response error: code={}, body={}", status, body);
return Err(err);
async fn send_request<U: IntoUrl>(&self, url: U) -> Result<String, RequestError> {
match self.http_client.get(url).await {
Ok(res) => self.http_client.to_text(res).await,
Err(err) => {
warn!("Server response error: {}", err);
Err(err)
}
}

res.text().await
}

fn build_url(&self, action: &str, additional: &str, endpoint: Option<&str>) -> Url {
Expand Down
169 changes: 169 additions & 0 deletions src/rpc_http_client.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
use std::{
io::{
Error as IoError,
ErrorKind::{AddrNotAvailable, InvalidInput, TimedOut},
},
net::ToSocketAddrs,
sync::Arc,
time::Duration,
};

use bytes::Bytes;
use http_body_util::{BodyExt, Collected, Empty};
use hyper::{body::Incoming, client::conn::http1::handshake, http::Error as HttpError, Request, Response};
use hyper_util::rt::TokioIo;
use log::{debug, error};
use parking_lot::Mutex;
use rand::{seq::IteratorRandom, thread_rng};
use reqwest::{IntoUrl, Url};
use socket2::{SockRef, TcpKeepalive};
use tokio::{
net::{TcpSocket, TcpStream},
task::AbortHandle,
time::timeout,
};

use crate::CLIENT_VERSION;

type Connection = Arc<Mutex<Option<(String, TokioIo<TcpStream>)>>>;
type RequestError = Box<dyn std::error::Error + Send + Sync>;

#[derive(Default)]
pub struct RPCHttpClient {
timeout: Duration,
preconnect: Connection,
connecting: Mutex<Option<AbortHandle>>,
}

impl RPCHttpClient {
pub fn new(timeout: Duration) -> Self {
Self {
timeout,
..Default::default()
}
}

pub async fn get<U: IntoUrl>(&self, url: U) -> Result<Response<Incoming>, RequestError> {
let url = url.into_url()?;
let host = url.host().ok_or(IoError::new(InvalidInput, "uri has no host"))?;
let port = url.port().unwrap_or_else(|| if url.scheme() == "https" { 443 } else { 80 });
let server = format!("{host}:{port}");

let conn = self.preconnect.lock().take();
let conn = match conn.and_then(|(key, stream)| if key == server { Some(stream) } else { None }) {
Some(v) => {
// Connection timeout 5s
match timeout(Duration::from_secs(5), v.inner().writable()).await {
Ok(Ok(_)) => v,
_ => create_stream(&server).await?,
}
}
None => create_stream(&server).await?,
};
let (mut sender, conn) = handshake(conn).await?;
// spawn a task to poll the connection and drive the HTTP state
tokio::spawn(async move {
if let Err(e) = conn.await {
error!("Error in connection: {}", e);
}
});

match timeout(self.timeout, sender.send_request(build_request(&url)?)).await.ok() {
Some(v) => {
self.preconnect(&server);
match v {
Ok(r) => self.check_status(r).await,
Err(e) => Err(e.into()),
}
}
None => Err(Box::new(IoError::new(TimedOut, format!("Request timeout: url={}", url)))),
}
}

pub fn preconnect(&self, server: &str) {
// Connected
if self.preconnect.lock().is_some() {
return;
}
// Connecting
let mut job = self.connecting.lock();
if !job.as_ref().map_or(true, |job| job.is_finished()) {
return;
}

let server = server.to_owned();
let preconnect = Arc::downgrade(&self.preconnect);
job.replace(
tokio::spawn(async move {
debug!("Preconnecting to {}", server);
match create_stream(&server).await {
Ok(stream) => {
debug!("Preconnected to {}", server);
if let Some(preconnect) = preconnect.upgrade() {
preconnect.lock().replace((server.to_owned(), stream));
}
}
Err(err) => debug!("Pre connect error: {}", err),
}
})
.abort_handle(),
);
}

async fn check_status(&self, res: Response<Incoming>) -> Result<Response<Incoming>, RequestError> {
let status = res.status();
if status.is_client_error() || status.is_server_error() {
Err(crate::error::Error::ServerError {
status: res.status().as_u16(),
body: self.to_bytes(res).await.ok().and_then(|b| String::from_utf8(b.to_vec()).ok()),
}
.into())
} else {
Ok(res)
}
}

pub async fn to_text(&self, res: Response<Incoming>) -> Result<String, RequestError> {
Ok(String::from_utf8(self.to_bytes(res).await?.to_vec())?)
}

pub async fn to_bytes(&self, res: Response<Incoming>) -> Result<Bytes, RequestError> {
match timeout(self.timeout, res.into_body().collect()).await.ok() {
Some(v) => Ok(v.map(Collected::to_bytes)?),
None => Err(Box::new(IoError::new(TimedOut, "Read response timeout".to_string()))),
}
}
}

async fn create_stream(server: &str) -> Result<TokioIo<TcpStream>, IoError> {
if let Ok(addrs) = server.to_socket_addrs() {
let addr = addrs
.choose(&mut thread_rng())
.ok_or(IoError::new(AddrNotAvailable, format!("Fail to resolve {}", server)))?;

// Socket settings
let socket = if addr.is_ipv4() { TcpSocket::new_v4() } else { TcpSocket::new_v6() }?;
let socket2 = SockRef::from(&socket);
let keepalive = TcpKeepalive::new()
.with_time(Duration::from_secs(30))
.with_interval(Duration::from_secs(15));
let _ = socket2.set_tcp_keepalive(&keepalive);
let _ = socket2.set_nodelay(true);

// Connect
match timeout(Duration::from_secs(5), socket.connect(addr)).await.ok() {
Some(r) => r.map(TokioIo::new),
None => Err(IoError::new(TimedOut, format!("Connect timeout: addr={addr}"))),
}
} else {
Err(IoError::new(InvalidInput, format!("Fail parse host {}", server)))
}
}

fn build_request(url: &Url) -> Result<Request<Empty<Bytes>>, HttpError> {
Request::builder()
.header("Host", url.host_str().unwrap())
.header("User-Agent", format!("Hentai@Home {CLIENT_VERSION}"))
.uri(url.as_str())
.body(Empty::<Bytes>::new())
}

0 comments on commit 56bb0ff

Please sign in to comment.