From dccc130b3adc4e205307e240cff67cbcf08172c8 Mon Sep 17 00:00:00 2001
From: Loakesh Indiran <66478092+Loaki07@users.noreply.github.com>
Date: Wed, 26 Feb 2025 10:05:51 +0530
Subject: [PATCH] fix: remove `CloseFrame` delay (#6106)

---
 src/config/src/config.rs                      |  2 --
 src/handler/http/request/websocket/session.rs | 11 -----------
 2 files changed, 13 deletions(-)

diff --git a/src/config/src/config.rs b/src/config/src/config.rs
index 72314cba71..a281cdacaa 100644
--- a/src/config/src/config.rs
+++ b/src/config/src/config.rs
@@ -385,8 +385,6 @@ pub struct Config {
 pub struct WebSocket {
     #[env_config(name = "ZO_WEBSOCKET_ENABLED", default = false)]
     pub enabled: bool,
-    #[env_config(name = "ZO_WEBSOCKET_CLOSE_FRAME_DELAY", default = 50)]
-    pub close_frame_delay: u64, // in milliseconds
     #[env_config(name = "ZO_WEBSOCKET_SESSION_IDLE_TIMEOUT_SECS", default = 300)]
     pub session_idle_timeout_secs: i64,
     #[env_config(name = "ZO_WEBSOCKET_SESSION_MAX_LIFETIME_SECS", default = 3600)]
diff --git a/src/handler/http/request/websocket/session.rs b/src/handler/http/request/websocket/session.rs
index c677b561ce..5e71d9c50f 100644
--- a/src/handler/http/request/websocket/session.rs
+++ b/src/handler/http/request/websocket/session.rs
@@ -347,17 +347,6 @@ async fn cleanup_and_close_session(req_id: &str, close_reason: Option<CloseReaso
             );
         }
 
-        #[cfg(feature = "enterprise")]
-        {
-            // sleep for the interval duration in milliseconds to avoid race condition
-            // between the close frame (control frame) and the data frame
-            let cfg = get_config();
-            let interval = cfg.websocket.close_frame_delay;
-            if interval > 0 {
-                tokio::time::sleep(std::time::Duration::from_millis(interval)).await;
-            }
-        }
-
         // Attempt to close the session
         if let Err(e) = session.close(close_reason).await {
             log::error!(