Refactor Session into its own module, and use traits to define caller…

… interfaces
schroeder- · Aug 5, 2021 · 5a3da2e · 5a3da2e
1 parent 86a0e18
commit 5a3da2e
Show file tree

Hide file tree

Showing 9 changed files with 2,130 additions and 1,920 deletions.
diff --git a/client/src/client.rs b/client/src/client.rs
@@ -26,8 +26,11 @@ use opcua_types::{
 
 use crate::{
     config::{ClientConfig, ClientEndpoint, ANONYMOUS_USER_TOKEN_ID},
-    session::{Session, SessionInfo},
-    session_retry::SessionRetryPolicy,
+    session::{
+        services::*,
+        session::{Session, SessionInfo},
+    },
+    session_retry_policy::SessionRetryPolicy,
 };
 
 #[derive(Debug, Clone)]

diff --git a/client/src/comms/tcp_transport.rs b/client/src/comms/tcp_transport.rs
@@ -42,7 +42,7 @@ use crate::{
     callbacks::OnSessionClosed,
     comms::transport::Transport,
     message_queue::{self, MessageQueue},
-    session_state::{ConnectionState, ConnectionStateMgr, SessionState},
+    session::session_state::{ConnectionState, ConnectionStateMgr, SessionState},
 };
 use tokio::io::AsyncWriteExt;
 

diff --git a/client/src/config.rs b/client/src/config.rs
@@ -10,7 +10,7 @@ use opcua_core::config::Config;
 use opcua_crypto::SecurityPolicy;
 use opcua_types::{ApplicationType, MessageSecurityMode, UAString};
 
-use crate::session_retry::SessionRetryPolicy;
+use crate::session_retry_policy::SessionRetryPolicy;
 
 pub const ANONYMOUS_USER_TOKEN_ID: &str = "ANONYMOUS";
 

diff --git a/client/src/lib.rs b/client/src/lib.rs
@@ -106,7 +106,6 @@ use opcua_types::{response_header::ResponseHeader, status_code::StatusCode};
 
 mod comms;
 mod message_queue;
-mod session_state;
 mod subscription;
 mod subscription_state;
 
@@ -116,7 +115,7 @@ mod callbacks;
 mod client;
 mod config;
 mod session;
-mod session_retry;
+mod session_retry_policy;
 
 /// Process the service result, i.e. where the request "succeeded" but the response
 /// contains a failure status code.
@@ -154,7 +153,12 @@ pub mod prelude {
     pub use opcua_types::{service_types::*, status_code::StatusCode};
 
     pub use crate::{
-        builder::*, callbacks::*, client::*, config::*, session::*, subscription::MonitoredItem,
+        builder::*,
+        callbacks::*,
+        client::*,
+        config::*,
+        session::{services::*, session::*},
+        subscription::MonitoredItem,
     };
 }
 

diff --git a/client/src/session/mod.rs b/client/src/session/mod.rs
@@ -0,0 +1,3 @@
+pub mod services;
+pub mod session;
+pub mod session_state;