perf: remove unnecesarry mutex in the session store

hashemix · hashemix · commit ea5d58013ac0 · 2025-10-13T11:29:45.000-03:00
diff --git a/.release-config.json b/.release-config.json
@@ -1,112 +1,110 @@
 {
-    "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
-    "release-type": "rust",
-    "release-as": "",
-    "include-component-in-tag": true,
-    "changelog-sections": [
-        {
-            "type": "feature",
-            "section": "🚀 Features"
-        },
-        {
-            "type": "feat",
-            "section": "🚀 Features"
-        },
-        {
-            "type": "fix",
-            "section": "🐛 Bug Fixes"
-        },
-        {
-            "type": "perf",
-            "section": "⚡ Performance Improvements"
-        },
-        {
-            "type": "revert",
-            "section": "◀️ Reverts"
-        },
-        {
-            "type": "docs",
-            "section": "📚 Documentation",
-            "hidden": false
-        },
-        {
-            "type": "style",
-            "section": "🎨 Styles",
-            "hidden": true
-        },
-        {
-            "type": "chore",
-            "section": "⚙️ Miscellaneous Chores",
-            "hidden": true
-        },
-        {
-            "type": "refactor",
-            "section": "🚜 Code Refactoring",
-            "hidden": true
-        },
-        {
-            "type": "test",
-            "section": "🧪 Tests",
-            "hidden": true
-        },
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
+  "release-type": "rust",
+  "release-as": "",
+  "include-component-in-tag": true,
+  "changelog-sections": [
+    {
+      "type": "feature",
+      "section": "🚀 Features"
+    },
+    {
+      "type": "feat",
+      "section": "🚀 Features"
+    },
+    {
+      "type": "fix",
+      "section": "🐛 Bug Fixes"
+    },
+    {
+      "type": "perf",
+      "section": "⚡ Performance Improvements",
+      "hidden": false
+    },
+    {
+      "type": "revert",
+      "section": "◀️ Reverts"
+    },
+    {
+      "type": "docs",
+      "section": "📚 Documentation",
+      "hidden": false
+    },
+    {
+      "type": "style",
+      "section": "🎨 Styles",
+      "hidden": true
+    },
+    {
+      "type": "chore",
+      "section": "⚙️ Miscellaneous Chores",
+      "hidden": true
+    },
+    {
+      "type": "refactor",
+      "section": "🚜 Code Refactoring",
+      "hidden": false
+    },
+    {
+      "type": "test",
+      "section": "🧪 Tests",
+      "hidden": true
+    },
+    {
+      "type": "build",
+      "section": "🛠️ Build System",
+      "hidden": true
+    },
+    {
+      "type": "ci",
+      "section": "🥏 Continuous Integration",
+      "hidden": true
+    }
+  ],
+  "plugins": ["cargo-workspace", "sentence-case"],
+  "pull-request-header": ":robot: Auto-generated release PR",
+  "packages": {
+    "crates/rust-mcp-macros": {
+      "release-type": "rust",
+      "draft": false,
+      "prerelease": false,
+      "bump-minor-pre-major": true,
+      "bump-patch-for-minor-pre-major": true,
+      "changelogPath": "CHANGELOG.md",
+      "extra-files": [
         {
-            "type": "build",
-            "section": "🛠️ Build System",
-            "hidden": true
-        },
+          "type": "generic",
+          "path": "CHANGELOG.md"
+        }
+      ]
+    },
+    "crates/rust-mcp-transport": {
+      "release-type": "rust",
+      "draft": false,
+      "prerelease": false,
+      "bump-minor-pre-major": true,
+      "bump-patch-for-minor-pre-major": true,
+      "changelogPath": "CHANGELOG.md",
+      "extra-files": [
         {
-            "type": "ci",
-            "section": "🥏 Continuous Integration",
-            "hidden": true
+          "type": "generic",
+          "path": "CHANGELOG.md"
         }
-    ],
-    "plugins": [
-        "cargo-workspace",
-        "sentence-case"
-    ],
-    "pull-request-header": ":robot: Auto-generated release PR",
-    "packages": {
-        "crates/rust-mcp-macros": {
-            "release-type": "rust",
-            "draft": false,
-            "prerelease": false,
-            "bump-minor-pre-major": true,
-            "bump-patch-for-minor-pre-major": true,
-            "changelogPath": "CHANGELOG.md",
-            "extra-files": [
-                {
-                    "type": "generic",
-                    "path": "CHANGELOG.md"
-                }
-            ]
-        },
-        "crates/rust-mcp-transport": {
-            "release-type": "rust",
-            "draft": false,
-            "prerelease": false,
-            "bump-minor-pre-major": true,
-            "bump-patch-for-minor-pre-major": true,
-            "changelogPath": "CHANGELOG.md",
-            "extra-files": [
-                {
-                    "type": "generic",
-                    "path": "CHANGELOG.md"
-                }
-            ]
-        },
-        "crates/rust-mcp-sdk": {
-            "release-type": "rust",
-            "draft": false,
-            "prerelease": false,
-            "bump-minor-pre-major": true,
-            "bump-patch-for-minor-pre-major": true,
-            "changelogPath": "CHANGELOG.md",
-            "extra-files": [
-                {
-                    "type": "generic",
-                    "path": "CHANGELOG.md"
-                }
-            ]
+      ]
+    },
+    "crates/rust-mcp-sdk": {
+      "release-type": "rust",
+      "draft": false,
+      "prerelease": false,
+      "bump-minor-pre-major": true,
+      "bump-patch-for-minor-pre-major": true,
+      "changelogPath": "CHANGELOG.md",
+      "extra-files": [
+        {
+          "type": "generic",
+          "path": "CHANGELOG.md"
         }
+      ]
     }
-}
+  }
+}
diff --git a/crates/rust-mcp-sdk/src/hyper_servers/hyper_runtime.rs b/crates/rust-mcp-sdk/src/hyper_servers/hyper_runtime.rs
@@ -15,7 +15,7 @@ use crate::{
 
 use axum_server::Handle;
 use rust_mcp_transport::SessionId;
-use tokio::{sync::Mutex, task::JoinHandle};
+use tokio::task::JoinHandle;
 
 use crate::{
     error::SdkResult,
@@ -79,7 +79,7 @@ impl HyperRuntime {
     pub async fn runtime_by_session(
         &self,
         session_id: &SessionId,
-    ) -> TransportServerResult<Arc<Mutex<Arc<ServerRuntime>>>> {
+    ) -> TransportServerResult<Arc<ServerRuntime>> {
         self.state.session_store.get(session_id).await.ok_or(
             TransportServerError::SessionIdInvalid(session_id.to_string()),
         )
@@ -92,7 +92,6 @@ impl HyperRuntime {
         timeout: Option<Duration>,
     ) -> SdkResult<ResultFromClient> {
         let runtime = self.runtime_by_session(session_id).await?;
-        let runtime = runtime.lock().await.to_owned();
         runtime.request(request, timeout).await
     }
 
@@ -102,7 +101,6 @@ impl HyperRuntime {
         notification: NotificationFromServer,
     ) -> SdkResult<()> {
         let runtime = self.runtime_by_session(session_id).await?;
-        let runtime = runtime.lock().await.to_owned();
         runtime.send_notification(notification).await
     }
 
@@ -117,7 +115,6 @@ impl HyperRuntime {
         params: Option<ListRootsRequestParams>,
     ) -> SdkResult<ListRootsResult> {
         let runtime = self.runtime_by_session(session_id).await?;
-        let runtime = runtime.lock().await.to_owned();
         runtime.list_roots(params).await
     }
 
@@ -127,7 +124,6 @@ impl HyperRuntime {
         params: LoggingMessageNotificationParams,
     ) -> SdkResult<()> {
         let runtime = self.runtime_by_session(session_id).await?;
-        let runtime = runtime.lock().await.to_owned();
         runtime.send_logging_message(params).await
     }
 
@@ -140,7 +136,6 @@ impl HyperRuntime {
         params: Option<PromptListChangedNotificationParams>,
     ) -> SdkResult<()> {
         let runtime = self.runtime_by_session(session_id).await?;
-        let runtime = runtime.lock().await.to_owned();
         runtime.send_prompt_list_changed(params).await
     }
 
@@ -153,7 +148,6 @@ impl HyperRuntime {
         params: Option<ResourceListChangedNotificationParams>,
     ) -> SdkResult<()> {
         let runtime = self.runtime_by_session(session_id).await?;
-        let runtime = runtime.lock().await.to_owned();
         runtime.send_resource_list_changed(params).await
     }
 
@@ -166,7 +160,6 @@ impl HyperRuntime {
         params: ResourceUpdatedNotificationParams,
     ) -> SdkResult<()> {
         let runtime = self.runtime_by_session(session_id).await?;
-        let runtime = runtime.lock().await.to_owned();
         runtime.send_resource_updated(params).await
     }
 
@@ -179,7 +172,6 @@ impl HyperRuntime {
         params: Option<ToolListChangedNotificationParams>,
     ) -> SdkResult<()> {
         let runtime = self.runtime_by_session(session_id).await?;
-        let runtime = runtime.lock().await.to_owned();
         runtime.send_tool_list_changed(params).await
     }
 
@@ -199,7 +191,6 @@ impl HyperRuntime {
         timeout: Option<Duration>,
     ) -> SdkResult<crate::schema::Result> {
         let runtime = self.runtime_by_session(session_id).await?;
-        let runtime = runtime.lock().await.to_owned();
         runtime.ping(timeout).await
     }
 
@@ -214,7 +205,6 @@ impl HyperRuntime {
         params: CreateMessageRequestParams,
     ) -> SdkResult<CreateMessageResult> {
         let runtime = self.runtime_by_session(session_id).await?;
-        let runtime = runtime.lock().await.to_owned();
         runtime.create_message(params).await
     }
 
@@ -223,7 +213,6 @@ impl HyperRuntime {
         session_id: &SessionId,
     ) -> SdkResult<Option<InitializeRequestParams>> {
         let runtime = self.runtime_by_session(session_id).await?;
-        let runtime = runtime.lock().await.to_owned();
         Ok(runtime.client_info())
     }
 }
diff --git a/crates/rust-mcp-sdk/src/mcp_http/mcp_http_handler.rs b/crates/rust-mcp-sdk/src/mcp_http/mcp_http_handler.rs
@@ -115,7 +115,6 @@ impl McpHttpHandler {
             TransportServerError::SessionIdInvalid(session_id.to_string()),
         )?;
 
-        let transmit = transmit.lock().await;
         let message = *request.body();
         transmit
             .consume_payload_string(DEFAULT_STREAM_ID, message)
diff --git a/crates/rust-mcp-sdk/src/mcp_http/mcp_http_utils.rs b/crates/rust-mcp-sdk/src/mcp_http/mcp_http_utils.rs
@@ -240,7 +240,6 @@ pub async fn create_standalone_stream(
     let runtime = state.session_store.get(&session_id).await.ok_or(
         TransportServerError::SessionIdInvalid(session_id.to_string()),
     )?;
-    let runtime = runtime.lock().await.to_owned();
 
     if runtime.stream_id_exists(DEFAULT_STREAM_ID).await {
         let error =
@@ -410,8 +409,6 @@ pub async fn process_incoming_message_return(
 ) -> TransportServerResult<http::Response<GenericBody>> {
     match state.session_store.get(&session_id).await {
         Some(runtime) => {
-            let runtime = runtime.lock().await.to_owned();
-
             single_shot_stream(
                 runtime.clone(),
                 session_id,
@@ -437,7 +434,6 @@ pub async fn process_incoming_message(
 ) -> TransportServerResult<http::Response<GenericBody>> {
     match state.session_store.get(&session_id).await {
         Some(runtime) => {
-            let runtime = runtime.lock().await.to_owned();
             // when receiving a result in a streamable_http server, that means it was sent by the standalone sse transport
             // it should be processed by the same transport , therefore no need to call create_sse_stream
             let Ok(is_result) = is_result(payload) else {
@@ -494,7 +490,6 @@ pub async fn delete_session(
 ) -> TransportServerResult<http::Response<GenericBody>> {
     match state.session_store.get(&session_id).await {
         Some(runtime) => {
-            let runtime = runtime.lock().await.to_owned();
             runtime.shutdown().await;
             state.session_store.delete(&session_id).await;
             tracing::info!("client disconnected : {}", &session_id);
diff --git a/crates/rust-mcp-sdk/src/session_store.rs b/crates/rust-mcp-sdk/src/session_store.rs
diff --git a/crates/rust-mcp-sdk/src/session_store/in_memory_session_store.rs b/crates/rust-mcp-sdk/src/session_store/in_memory_session_store.rs
