nik/chorus
1
0
Fork 0
mirror of https://github.com/mikedilger/chorus.git synced 2026-08-01 07:21:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Log websocket text messages which result in errors (not just the error)

Browse Source
This commit is contained in:
Mike Dilger 2024-02-19 19:55:37 +13:00
parent c98060943a
commit 6e51b65cc9
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.rs
View File

@ -394,8 +394,9 @@ impl WebSocketService {
Message::Text(msg) => {
log::debug!("{}: <= {}", self.peer, msg);
// This is defined in nostr.rs
if let Err(e) = self.handle_nostr_message(msg).await {
if let Err(e) = self.handle_nostr_message(&msg).await {
log::error!("{e}");
log::error!("msg was {}", msg);
let reply = NostrReply::Notice(format!("error: {}", e));
self.websocket.send(Message::text(reply.as_json())).await?;
}

10
src/nostr.rs
View File

@ -10,7 +10,7 @@ use hyper_tungstenite::tungstenite::Message;
use url::Url;
impl WebSocketService {
pub async fn handle_nostr_message(&mut self, msg: String) -> Result<(), Error> {
pub async fn handle_nostr_message(&mut self, msg: &str) -> Result<(), Error> {
// If the msg is large, grow the session buffer
// (it will be freed when they disconnect)
if msg.len() > 4096 {
@ -41,7 +41,7 @@ impl WebSocketService {
Ok(())
}
pub async fn req(&mut self, msg: String, mut inpos: usize) -> Result<(), Error> {
pub async fn req(&mut self, msg: &str, mut inpos: usize) -> Result<(), Error> {
let input = msg.as_bytes();
// ["REQ", <subid>, json-filter, json-filter, ... ]
@ -148,7 +148,7 @@ impl WebSocketService {
Ok(())
}
pub async fn event(&mut self, msg: String, mut inpos: usize) -> Result<(), Error> {
pub async fn event(&mut self, msg: &str, mut inpos: usize) -> Result<(), Error> {
const PERSONAL_MSG: &str = "this personal relay only accepts events related to its users";
let input = msg.as_bytes();
@ -228,7 +228,7 @@ impl WebSocketService {
Ok(())
}
pub async fn close(&mut self, msg: String, mut inpos: usize) -> Result<(), Error> {
pub async fn close(&mut self, msg: &str, mut inpos: usize) -> Result<(), Error> {
let input = msg.as_bytes();
// ["CLOSE", <subid>]
@ -256,7 +256,7 @@ impl WebSocketService {
Ok(())
}
pub async fn auth(&mut self, msg: String, mut inpos: usize) -> Result<(), Error> {
pub async fn auth(&mut self, msg: &str, mut inpos: usize) -> Result<(), Error> {
let input = msg.as_bytes();
eat_whitespace(input, &mut inpos);