Pick up vault history id and refactor aborting

sync-server/src/consts.rs

@@ -17,7 +17,9 @@ pub const DEFAULT_MAX_CLIENTS_PER_VAULT: usize = 256;
 pub const DEFAULT_LOG_DIRECTORY: &str = "logs";
 pub const DEFAULT_LOG_ROTATION_INTERVAL: Duration = Duration::from_secs(60 * 60 * 24); // 1 day
 pub const DEFAULT_LOG_LEVEL: LogLevel = LogLevel::Info;
+
 pub const WEBSOCKET_SEND_TIMEOUT: Duration = Duration::from_secs(10);
+pub const WEBSOCKET_HANDSHAKE_TIMEOUT: Duration = Duration::from_secs(5);
 
 pub const DEFAULT_MERGEABLE_FILE_EXTENSIONS: &[&str] = &["md", "txt"];
 

sync-server/src/server/endpoints/websocket.rs

@@ -8,7 +8,7 @@ use crate::{
             utils::{get_authenticated_handshake, send_update_over_websocket},
         },
     },
-    consts::WEBSOCKET_SEND_TIMEOUT,
+    consts::WEBSOCKET_HANDSHAKE_TIMEOUT,
     errors::{SyncServerError, client_error, server_error},
 };
 use axum::{
@@ -59,7 +59,7 @@ async fn websocket(
     let authenticated = get_authenticated_handshake(
         &state,
         &vault,
-        tokio::time::timeout(WEBSOCKET_SEND_TIMEOUT, receiver.next())
+        tokio::time::timeout(WEBSOCKET_HANDSHAKE_TIMEOUT, receiver.next())
             .await
             .map_err(|_| client_error(anyhow::anyhow!("WebSocket handshake deadline expired")))?
             .transpose()