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

Pass peer and request into serve_http() and serve_nip11()

Browse Source
This commit is contained in:
Mike Dilger 2024-02-15 11:14:57 +13:00
parent bc6decdac6
commit a1bcec359c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.rs
View File

@ -137,17 +137,17 @@ impl Service<Request<Body>> for HttpService {
}
async fn handle_http_request(
_peer: SocketAddr,
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() {
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
}

9
src/web.rs
View File

@ -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<Response<Body>, Error> {
pub async fn serve_http(peer: SocketAddr, request: Request<Body>) -> Result<Response<Body>, 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<Response<Body>, Error> {
Ok(response)
}
pub async fn serve_nip11() -> Result<Response<Body>, Error> {
pub async fn serve_nip11(peer: SocketAddr) -> Result<Response<Body>, Error> {
log::debug!("{}: sent NIP-11", peer);
let rid = {
let config = GLOBALS.config.read().await;
GLOBALS.rid.get_or_init(|| build_rid(&config))