fixed session

src/lib.rs

@@ -1,4 +1,4 @@
-use std::pin::Pin;
+use std::{pin::Pin, sync::Arc};
 
 use serde::{Deserialize, Serialize};
 
@@ -9,7 +9,7 @@ pub mod ws;
 pub type Result<T> = std::result::Result<T, Error>;
 pub type BoxFuture<'a, T = Option<(bool, serde_json::Value)>> =
     Pin<Box<dyn Future<Output = T> + Send + 'a>>;
-pub type MethodHandler = Box<dyn Fn(u32, serde_json::Value) -> BoxFuture<'static> + Send + Sync>;
+pub type MethodHandler = Arc<dyn Fn(u32, serde_json::Value) -> BoxFuture<'static> + Send + Sync>;
 
 pub trait Method {
     const NAME: &'static str;

src/session.rs

@@ -87,7 +87,12 @@ impl Session {
 
                         match msg {
                             Message::Request { id, method, data } => {
-                                if let Some(m) = s.methods.lock().await.get(&method) {
+                                let handler = {
+                                    let methods = s.methods.lock().await;
+                                    methods.get(&method).cloned()
+                                };
+
+                                if let Some(m) = handler {
                                     if let Some((err, res)) = (m)(id, data).await {
                                         if err {
                                             s.respond_error(id, res)
@@ -157,7 +162,7 @@ impl Session {
 
         self.methods.lock().await.insert(
             M::NAME.to_string(),
-            Box::new(move |id, value| {
+            Arc::new(move |id, value| {
                 let handler = Arc::clone(&handler);
 
                 Box::pin(async move {