From a1bcec359cc6de5bf763d7b1a4e1ab77dddcf9c8 Mon Sep 17 00:00:00 2001 From: Mike Dilger Date: Thu, 15 Feb 2024 11:14:57 +1300 Subject: [PATCH] Pass peer and request into serve_http() and serve_nip11() --- src/main.rs | 6 +++--- src/web.rs | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index 37ba97c..b992bf0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -137,17 +137,17 @@ impl Service> for HttpService { } async fn handle_http_request( - _peer: SocketAddr, + peer: SocketAddr, request: Request, ) -> Result, Error> { // check for Accept header of application/nostr+json if let Some(accept) = request.headers().get("Accept") { if let Ok(s) = accept.to_str() { if s == "application/nostr+json" { - return web::serve_nip11().await; + return web::serve_nip11(peer).await; } } } - web::serve_http().await + web::serve_http(peer, request).await } diff --git a/src/web.rs b/src/web.rs index f98339d..592106a 100644 --- a/src/web.rs +++ b/src/web.rs @@ -1,9 +1,11 @@ use crate::config::Config; use crate::error::Error; use crate::globals::GLOBALS; -use hyper::{Body, Response, StatusCode}; +use hyper::{Body, Request, Response, StatusCode}; +use std::net::SocketAddr; -pub async fn serve_http() -> Result, Error> { +pub async fn serve_http(peer: SocketAddr, request: Request) -> Result, Error> { + log::debug!("{}: HTTP request for {}", peer, request.uri()); let response = Response::builder() .header("Access-Control-Allow-Origin", "*") .header("Access-Control-Allow-Headers", "*") @@ -13,7 +15,8 @@ pub async fn serve_http() -> Result, Error> { Ok(response) } -pub async fn serve_nip11() -> Result, Error> { +pub async fn serve_nip11(peer: SocketAddr) -> Result, Error> { + log::debug!("{}: sent NIP-11", peer); let rid = { let config = GLOBALS.config.read().await; GLOBALS.rid.get_or_init(|| build_rid(&config))