Work in progress

miaokong0724 · Apr 11, 2022 · aa10213 · aa10213
1 parent 200ea9d
commit aa10213
Show file tree

Hide file tree

Showing 106 changed files with 465 additions and 266 deletions.
diff --git a/lib/src/client/builder.rs b/lib/src/client/builder.rs
@@ -4,10 +4,9 @@
 
 use std::path::PathBuf;
 
+use crate::client::{config::*, *};
 use crate::core::config::Config;
 
-use super::{config::*, *};
-
 /// The `ClientBuilder` is a builder for producing a [`Client`]. It is an alternative to constructing
 /// a [`ClientConfig`] from file or from scratch.
 ///

diff --git a/lib/src/client/comms/tcp_transport.rs b/lib/src/client/comms/tcp_transport.rs
@@ -37,6 +37,7 @@ use crate::core::{
     RUNTIME,
 };
 use crate::types::status_code::StatusCode;
+use crate::{deregister_runtime_component, register_runtime_component};
 
 use crate::client::{
     callbacks::OnSessionClosed,

diff --git a/lib/src/client/mod.rs b/lib/src/client/mod.rs
@@ -146,7 +146,7 @@ pub mod prelude {
         types::{service_types::*, status_code::StatusCode},
     };
 
-    pub use self::{
+    pub use crate::client::{
         builder::*,
         callbacks::*,
         client::*,

diff --git a/lib/src/client/session/session.rs b/lib/src/client/session/session.rs
@@ -21,6 +21,8 @@ use tokio::{
     time::{interval, Duration, Instant},
 };
 
+use crate::{deregister_runtime_component, register_runtime_component};
+
 use crate::core::{
     comms::{
         secure_channel::{Role, SecureChannel},

diff --git a/lib/src/core/comms/security_header.rs b/lib/src/core/comms/security_header.rs
@@ -4,12 +4,9 @@
 
 use std::io::{Read, Write};
 
-use crate::types::{
-    constants,
-    crypto::{SecurityPolicy, Thumbprint, X509},
-    status_code::StatusCode,
-    *,
-};
+use crate::types::{constants, status_code::StatusCode, *};
+
+use crate::crypto::{SecurityPolicy, Thumbprint, X509};
 
 /// Holds the security header associated with the chunk. Secure channel requests use an asymmetric
 /// security header, regular messages use a symmetric security header.

diff --git a/lib/src/core/config.rs b/lib/src/core/config.rs
@@ -10,8 +10,9 @@ use std::result::Result;
 use serde;
 use serde_yaml;
 
-use crate::types::service_types::{
-    ApplicationDescription, ApplicationType, LocalizedText, UAString,
+use crate::types::{
+    service_types::{ApplicationDescription, ApplicationType},
+    LocalizedText, UAString,
 };
 
 /// A trait that handles the loading / saving and validity of configuration information for a

diff --git a/lib/src/core/mod.rs b/lib/src/core/mod.rs
@@ -17,7 +17,8 @@ macro_rules! supported_message_as {
 }
 
 lazy_static! {
-    pub static ref RUNTIME: crate::runtime::Runtime = crate::runtime::Runtime::default();
+    pub static ref RUNTIME: crate::core::runtime::Runtime =
+        crate::core::runtime::Runtime::default();
 }
 
 /// Returns a vector of all currently existing runtime components as a vector of strings.
@@ -101,8 +102,6 @@ pub mod supported_message;
 
 /// Contains most of the things that are typically required from a client / server.
 pub mod prelude {
-    pub use self::comms::prelude::*;
-    pub use self::config::Config;
-    pub use self::supported_message::*;
+    pub use super::{comms::prelude::*, config::Config, supported_message::*};
     pub use crate::types::{status_code::StatusCode, *};
 }
diff --git a/lib/src/core/supported_message.rs b/lib/src/core/supported_message.rs
@@ -13,7 +13,7 @@ use crate::types::{
     response_header::ResponseHeader, service_types::*,
 };
 
-pub use crate::comms::tcp_types::AcknowledgeMessage;
+pub use crate::core::comms::tcp_types::AcknowledgeMessage;
 
 /// This macro helps avoid tedious repetition as new messages are added
 /// The first form just handles the trailing comma after the last entry to save some pointless

diff --git a/lib/src/crypto/security_policy.rs b/lib/src/crypto/security_policy.rs
@@ -37,7 +37,7 @@ use super::{
 ///   AsymmetricKeyLength - 2048-4096 bits
 ///   SecureChannelNonceLength - 32 bytes
 mod aes_128_sha_256_rsa_oaep {
-    use super::algorithms::*;
+    use crate::crypto::algorithms::*;
 
     pub const SECURITY_POLICY: &str = "Aes128-Sha256-RsaOaep";
     pub const SECURITY_POLICY_URI: &str =
@@ -65,7 +65,7 @@ mod aes_128_sha_256_rsa_oaep {
 ///   AsymmetricKeyLength - 2048-4096 bits
 ///   SecureChannelNonceLength - 32 bytes
 mod aes_256_sha_256_rsa_pss {
-    use super::algorithms::*;
+    use crate::crypto::algorithms::*;
 
     pub const SECURITY_POLICY: &str = "Aes256-Sha256-RsaPss";
     pub const SECURITY_POLICY_URI: &str =
@@ -93,7 +93,7 @@ mod aes_256_sha_256_rsa_pss {
 ///   AsymmetricKeyLength - 2048-4096 bits
 ///   SecureChannelNonceLength - 32 bytes
 mod basic_256_sha_256 {
-    use super::algorithms::*;
+    use crate::crypto::*;
 
     pub const SECURITY_POLICY: &str = "Basic256Sha256";
     pub const SECURITY_POLICY_URI: &str =
@@ -120,7 +120,7 @@ mod basic_256_sha_256 {
 ///   AsymmetricKeyLength - 1024-2048 bits
 ///   SecureChannelNonceLength - 16 bytes
 mod basic_128_rsa_15 {
-    use super::algorithms::*;
+    use crate::crypto::*;
 
     pub const SECURITY_POLICY: &str = "Basic128Rsa15";
     pub const SECURITY_POLICY_URI: &str =
@@ -147,7 +147,7 @@ mod basic_128_rsa_15 {
 ///   AsymmetricKeyLength - 1024-2048 bits
 ///   SecureChannelNonceLength - 32 bytes
 mod basic_256 {
-    use super::algorithms::*;
+    use crate::crypto::*;
 
     pub const SECURITY_POLICY: &str = "Basic256";
     pub const SECURITY_POLICY_URI: &str = "http://opcfoundation.org/UA/SecurityPolicy#Basic256";

diff --git a/lib/src/server/address_space/generated/nodeset_10.rs b/lib/src/server/address_space/generated/nodeset_10.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_11.rs b/lib/src/server/address_space/generated/nodeset_11.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_12_1.rs b/lib/src/server/address_space/generated/nodeset_12_1.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_12_2.rs b/lib/src/server/address_space/generated/nodeset_12_2.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_12_3.rs b/lib/src/server/address_space/generated/nodeset_12_3.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_12_4.rs b/lib/src/server/address_space/generated/nodeset_12_4.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_13.rs b/lib/src/server/address_space/generated/nodeset_13.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_14_1.rs b/lib/src/server/address_space/generated/nodeset_14_1.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_14_10.rs b/lib/src/server/address_space/generated/nodeset_14_10.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_14_11.rs b/lib/src/server/address_space/generated/nodeset_14_11.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_14_2.rs b/lib/src/server/address_space/generated/nodeset_14_2.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_14_3.rs b/lib/src/server/address_space/generated/nodeset_14_3.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_14_4.rs b/lib/src/server/address_space/generated/nodeset_14_4.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_14_5.rs b/lib/src/server/address_space/generated/nodeset_14_5.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_14_6.rs b/lib/src/server/address_space/generated/nodeset_14_6.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]

diff --git a/lib/src/server/address_space/generated/nodeset_14_7.rs b/lib/src/server/address_space/generated/nodeset_14_7.rs
@@ -8,9 +8,12 @@
 use std::{convert::TryFrom, str::FromStr};
 
 #[allow(unused_imports)]
-use crate::server::{
-    address_space::{EventNotifier, types::*},
-    prelude::{DataTypeId, ExtensionObject, LocalizedText, NodeId, ReferenceTypeId, service_types::Argument, UAString, Variant, VariantTypeId}
+use crate::{
+    server::address_space::{types::*, EventNotifier},
+    types::{
+        service_types::Argument, DataTypeId, ExtensionObject, LocalizedText, NodeId,
+        ReferenceTypeId, UAString, Variant, VariantTypeId,
+    },
 };
 
 #[allow(unused_variables)]