nik/chorus
1
0
Fork 0
mirror of https://github.com/mikedilger/chorus.git synced 2026-02-02 06:25:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement a hyper Service (instead of using service_fn())

Browse Source
This commit is contained in:
Mike Dilger 2024-02-15 10:22:51 +13:00
parent 1394543b4e
commit bc6decdac6
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main.rs
View File

@ -13,12 +13,16 @@ use crate::error::Error;
use crate::globals::GLOBALS;
use crate::store::Store;
use crate::tls::MaybeTlsStream;
use hyper::service::Service;
use hyper::{Body, Request, Response};
use std::env;
use std::error::Error as StdError;
use std::fs::OpenOptions;
use std::future::Future;
use std::io::Read;
use std::net::SocketAddr;
use std::pin::Pin;
use std::task::{Context, Poll};
use tokio::net::{TcpListener, TcpStream};
#[tokio::main]
@ -84,9 +88,10 @@ async fn main() -> Result<(), Error> {
// Serve a single network connection
async fn serve(stream: MaybeTlsStream<TcpStream>, peer_addr: SocketAddr) -> Result<(), Error> {
let connection = GLOBALS
.http_server
.serve_connection(stream, hyper::service::service_fn(handle_request));
// Serve the network stream with our http server and our HttpService
let service = HttpService { peer: peer_addr };
let connection = GLOBALS.http_server.serve_connection(stream, service);
tokio::spawn(async move {
// If our service exits with an error, log the error
@ -109,7 +114,32 @@ async fn serve(stream: MaybeTlsStream<TcpStream>, peer_addr: SocketAddr) -> Resu
Ok(())
}
async fn handle_request(request: Request<Body>) -> Result<Response<Body>, Error> {
// This is our per-connection HTTP service
struct HttpService {
peer: SocketAddr,
}
impl Service<Request<Body>> for HttpService {
type Response = Response<Body>;
type Error = Error;
type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
fn poll_ready(&mut self, _: &mut Context) -> Poll<Result<(), Self::Error>> {
Poll::Ready(Ok(()))
}
// This is called for each HTTP request made by the client
// NOTE: it is not called for each websocket message once upgraded.
fn call(&mut self, req: Request<Body>) -> Self::Future {
let peer = self.peer;
Box::pin(async move { handle_http_request(peer, req).await })
}
}
async fn handle_http_request(
_peer: SocketAddr,
request: Request<Body>,
) -> Result<Response<Body>, Error> {
// check for Accept header of application/nostr+json
if let Some(accept) = request.headers().get("Accept") {
if let Ok(s) = accept.to_str() {