feat: removed utils and moved getting path to jarouter

jarust/src/jaconnection.rs

@@ -9,8 +9,6 @@ use crate::prelude::*;
 use crate::tmanager::TransactionManager;
 use crate::transport::trans::Transport;
 use crate::transport::trans::TransportProtocol;
-use crate::utils::get_route_path_from_request;
-use crate::utils::get_route_path_from_response;
 use serde_json::json;
 use serde_json::Value;
 use std::collections::HashMap;
@@ -86,7 +84,7 @@ impl JaConnection {
             }
 
             // Try get the route from the response
-            if let Some(path) = get_route_path_from_response(message.clone()) {
+            if let Some(path) = JaRouter::path_from_response(message.clone()) {
                 router.pub_subroute(&path, message).await?;
                 continue;
             }
@@ -206,7 +204,7 @@ impl JaConnection {
         };
 
         let path =
-            get_route_path_from_request(&request).unwrap_or(self.shared.config.namespace.clone());
+            JaRouter::path_from_request(&request).unwrap_or(self.shared.config.namespace.clone());
 
         let mut guard = self.exclusive.lock().await;
         guard

jarust/src/jarouter.rs

@@ -1,6 +1,7 @@
 use crate::jaconfig::CHANNEL_BUFFER_SIZE;
 use crate::japrotocol::JaResponse;
 use crate::prelude::*;
+use serde_json::Value;
 use std::collections::HashMap;
 use std::ops::Deref;
 use std::ops::DerefMut;
@@ -109,6 +110,29 @@ impl JaRouter {
     pub fn root_path(&self) -> String {
         self.shared.root_path.clone()
     }
+
+    pub fn path_from_request(request: &Value) -> Option<String> {
+        if let (Some(session_id), Some(handle_id)) = (
+            request["session_id"].as_u64(),
+            request["handle_id"].as_u64(),
+        ) {
+            Some(format!("{session_id}/{handle_id}"))
+        } else {
+            request["session_id"]
+                .as_u64()
+                .map(|session_id| format!("{session_id}"))
+        }
+    }
+
+    pub fn path_from_response(response: JaResponse) -> Option<String> {
+        let Some(session_id) = response.session_id else {
+            return None;
+        };
+        let Some(sender) = response.sender else {
+            return Some(format!("{session_id}"));
+        };
+        Some(format!("{session_id}/{sender}"))
+    }
 }
 
 #[cfg(test)]

jarust/src/lib.rs

@@ -10,7 +10,6 @@ pub mod transport;
 
 mod jarouter;
 mod tmanager;
-mod utils;
 
 use crate::transport::trans::Transport;
 use jaconfig::JaConfig;