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

distinguish RateLimitExceeded error from ErrorClose

Browse Source
This commit is contained in:
Mike Dilger 2024-07-14 11:38:06 +12:00
parent bf87d53e01
commit 94b7dfa57a
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/error.rs
View File

@ -112,6 +112,9 @@ pub enum ChorusError {
// Pocket Types Error
PocketType(pocket_types::Error),
// Rate limit exceeded
RateLimitExceeded,
// X-Real-Ip header is missing
RealIpHeaderMissing,
@ -186,6 +189,7 @@ impl std::fmt::Display for ChorusError {
ChorusError::PocketDb(e) => write!(f, "{e}"),
ChorusError::PocketDbHeed(e) => write!(f, "{e}"),
ChorusError::PocketType(e) => write!(f, "{e}"),
ChorusError::RateLimitExceeded => write!(f, "Rate limit exceeded"),
ChorusError::ProtectedEvent => write!(f, "Protected event"),
ChorusError::RealIpHeaderMissing => write!(f, "X-Real-Ip header is missing"),
ChorusError::Restricted => write!(f, "Restricted"),
@ -270,6 +274,7 @@ impl ChorusError {
ChorusError::PocketDb(_) => 0.0,
ChorusError::PocketDbHeed(_) => 0.0,
ChorusError::PocketType(_) => 0.25,
ChorusError::RateLimitExceeded => 1.0,
ChorusError::ProtectedEvent => 0.35,
ChorusError::RealIpHeaderMissing => 0.0,
ChorusError::Restricted => 0.1,

10
src/lib.rs
View File

@ -247,6 +247,10 @@ async fn websocket_thread(peer: HashedPeer, websocket: HyperWebsocket, origin: S
session_exit = SessionExit::TooManyErrors;
msg = "Errored Out";
}
ChorusError::RateLimitExceeded => {
session_exit = SessionExit::TooManyErrors; // close enough for now.
msg = "Rate Limit Exceeded";
}
ChorusError::TimedOut => {
session_exit = SessionExit::Timeout;
msg = "Timed Out (with no subscriptions)";
@ -437,10 +441,12 @@ impl WebSocketService {
// Consume tokens, possibly closing the connection if there are not enough
if message.len() > self.burst_tokens {
log::info!(target: "Client", "{}: Rate limited exceeded", self.peer);
let reply = NostrReply::Notice("Rate limit exceeded.".into());
self.websocket.send(Message::text(reply.as_json())).await?;
self.error_punishment += 1.0;
return Err(ChorusError::ErrorClose.into());
let error = ChorusError::RateLimitExceeded;
self.error_punishment += error.punishment();
return Err(error.into());
} else {
self.burst_tokens = self.burst_tokens - message.len();
}