remove support for custom time frame in rate limiter

Author: br0kenpixel

README.md

@@ -42,10 +42,9 @@ limits:
 
 # Configuration for the built-in rate limiter.
 rate_limiter:
-  time_frame: 1 # second(s)
-  # Maximum amount of requests a client can make within the specified time frame above.
+  # Maximum amount of requests a client can make per second.
   max_requests: 20
-  # Maximum amount of connections that may be accepted within the specified time frame above.
+  # Maximum amount of connections that may be accepted within 1 second.
   max_connections: 4
 
 # Logging configuration

src/server/client_handle.rs

@@ -6,7 +6,7 @@ use super::{
 };
 use crate::{error::Error, server::db::DatabaseBackend};
 use pwmp_client::pwmp_msg::{request::Request, response::Response};
-use std::{io::Read, net::SocketAddr, sync::Arc, time::Duration};
+use std::{io::Read, net::SocketAddr, sync::Arc};
 use tokio::{net::TcpStream, time::timeout};
 use tracing::{debug, error, warn};
 
@@ -18,10 +18,7 @@ pub async fn handle_client(
     config: Arc<Config>,
 ) -> Result<(), Error> {
     let client = Client::new(client, peer_addr);
-    let mut rate_limiter = RateLimiter::new(
-        Duration::from_secs(config.rate_limits.time_frame),
-        config.rate_limits.max_requests,
-    );
+    let mut rate_limiter = RateLimiter::new(config.rate_limits.max_requests);
     let mut client = client.authorize(db).await?;
 
     loop {

src/server/config.rs

@@ -53,7 +53,6 @@ pub struct LimitsConfig {
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct RateLimitConfig {
-    pub time_frame: u64,
     pub max_requests: usize,
     pub max_connections: usize,
 }
@@ -67,7 +66,6 @@ pub struct LogConfig {
 impl Default for RateLimitConfig {
     fn default() -> Self {
         Self {
-            time_frame: 1,
             max_requests: 20,
             max_connections: 4,
         }

src/server/handle.rs

@@ -1,7 +1,7 @@
 use super::{config::Config, db::DatabaseClient, rate_limit::RateLimiter};
 use crate::server::client_handle::handle_client;
 use semaphore::Semaphore;
-use std::{net::SocketAddr, panic, sync::Arc, time::Duration};
+use std::{net::SocketAddr, panic, sync::Arc};
 use tokio::{
     net::{TcpListener, TcpStream},
     runtime::Handle,
@@ -20,10 +20,7 @@ pub async fn server_loop(
 ) {
     let shared_db = Arc::new(db);
     let connections = Semaphore::new(config.limits.devices as _, ());
-    let mut rate_limiter = RateLimiter::new(
-        Duration::from_secs(config.rate_limits.time_frame),
-        config.rate_limits.max_connections,
-    );
+    let mut rate_limiter = RateLimiter::new(config.rate_limits.max_connections);
 
     loop {
         select! {

src/server/rate_limit.rs

@@ -1,24 +1,22 @@
 use std::time::{Duration, Instant};
 
 pub struct RateLimiter {
-    time_frame: Duration,
     time: Instant,
     max_hits: usize,
     hits: usize,
 }
 
 impl RateLimiter {
-    pub fn new(time_frame: Duration, max_hits: usize) -> Self {
+    pub fn new(max_hits: usize) -> Self {
         Self {
-            time_frame,
             time: Instant::now(),
             max_hits,
             hits: 0,
         }
     }
 
     pub fn hit(&mut self) -> bool {
-        if self.time.elapsed() >= self.time_frame {
+        if self.time.elapsed() >= Duration::from_secs(1) {
             self.hits = 0;
             self.time = Instant::now();
         }