From aa10213f5c5716a1a0e3bcbbe2298b02f28a82e9 Mon Sep 17 00:00:00 2001 From: Adam Lock Date: Mon, 11 Apr 2022 23:21:06 +0100 Subject: [PATCH] Work in progress --- lib/src/client/builder.rs | 3 +- lib/src/client/comms/tcp_transport.rs | 1 + lib/src/client/mod.rs | 2 +- lib/src/client/session/session.rs | 2 + lib/src/core/comms/security_header.rs | 9 +- lib/src/core/config.rs | 5 +- lib/src/core/mod.rs | 7 +- lib/src/core/supported_message.rs | 2 +- lib/src/crypto/security_policy.rs | 10 +- .../address_space/generated/nodeset_10.rs | 9 +- .../address_space/generated/nodeset_11.rs | 9 +- .../address_space/generated/nodeset_12_1.rs | 9 +- .../address_space/generated/nodeset_12_2.rs | 9 +- .../address_space/generated/nodeset_12_3.rs | 9 +- .../address_space/generated/nodeset_12_4.rs | 9 +- .../address_space/generated/nodeset_13.rs | 9 +- .../address_space/generated/nodeset_14_1.rs | 9 +- .../address_space/generated/nodeset_14_10.rs | 9 +- .../address_space/generated/nodeset_14_11.rs | 9 +- .../address_space/generated/nodeset_14_2.rs | 9 +- .../address_space/generated/nodeset_14_3.rs | 9 +- .../address_space/generated/nodeset_14_4.rs | 9 +- .../address_space/generated/nodeset_14_5.rs | 9 +- .../address_space/generated/nodeset_14_6.rs | 9 +- .../address_space/generated/nodeset_14_7.rs | 9 +- .../address_space/generated/nodeset_14_8.rs | 9 +- .../address_space/generated/nodeset_14_9.rs | 9 +- .../address_space/generated/nodeset_3_1.rs | 9 +- .../address_space/generated/nodeset_3_2.rs | 9 +- .../address_space/generated/nodeset_4_1.rs | 9 +- .../address_space/generated/nodeset_4_2.rs | 9 +- .../address_space/generated/nodeset_4_3.rs | 9 +- .../address_space/generated/nodeset_4_4.rs | 9 +- .../address_space/generated/nodeset_4_5.rs | 9 +- .../address_space/generated/nodeset_4_6.rs | 9 +- .../address_space/generated/nodeset_4_7.rs | 9 +- .../address_space/generated/nodeset_4_8.rs | 9 +- .../address_space/generated/nodeset_5_1.rs | 9 +- .../address_space/generated/nodeset_5_10.rs | 9 +- .../address_space/generated/nodeset_5_11.rs | 9 +- .../address_space/generated/nodeset_5_12.rs | 9 +- .../address_space/generated/nodeset_5_13.rs | 9 +- .../address_space/generated/nodeset_5_14.rs | 9 +- .../address_space/generated/nodeset_5_15.rs | 9 +- .../address_space/generated/nodeset_5_16.rs | 9 +- .../address_space/generated/nodeset_5_2.rs | 9 +- .../address_space/generated/nodeset_5_3.rs | 9 +- .../address_space/generated/nodeset_5_4.rs | 9 +- .../address_space/generated/nodeset_5_5.rs | 9 +- .../address_space/generated/nodeset_5_6.rs | 9 +- .../address_space/generated/nodeset_5_7.rs | 9 +- .../address_space/generated/nodeset_5_8.rs | 9 +- .../address_space/generated/nodeset_5_9.rs | 9 +- .../address_space/generated/nodeset_8.rs | 9 +- .../address_space/generated/nodeset_999.rs | 9 +- .../address_space/generated/nodeset_9_1.rs | 9 +- .../address_space/generated/nodeset_9_2.rs | 9 +- .../address_space/generated/nodeset_9_3.rs | 9 +- .../address_space/generated/nodeset_9_4.rs | 9 +- lib/src/server/address_space/mod.rs | 12 +- lib/src/server/comms/tcp_transport.rs | 2 + lib/src/server/diagnostics.rs | 2 + lib/src/server/discovery/mod.rs | 2 +- lib/src/server/events/audit/cancel_event.rs | 2 +- .../server/events/audit/certificate_events.rs | 2 +- lib/src/server/events/audit/event.rs | 2 +- lib/src/server/events/audit/mod.rs | 2 +- .../events/audit/node_management_event.rs | 2 +- lib/src/server/events/audit/security_event.rs | 2 +- lib/src/server/events/audit/session_events.rs | 2 +- lib/src/server/events/event.rs | 2 +- lib/src/server/historical/mod.rs | 2 +- lib/src/server/metrics.rs | 4 +- lib/src/server/mod.rs | 8 +- lib/src/server/server.rs | 4 +- lib/src/server/services/audit.rs | 4 +- lib/src/server/session.rs | 2 +- lib/src/server/state.rs | 4 +- .../server/subscriptions/monitored_item.rs | 2 +- lib/src/server/subscriptions/subscription.rs | 2 +- lib/src/server/subscriptions/subscriptions.rs | 2 +- lib/src/server/util/mod.rs | 2 +- lib/src/types/argument.rs | 2 +- lib/src/types/array.rs | 4 +- lib/src/types/basic_types.rs | 2 +- lib/src/types/byte_string.rs | 2 +- lib/src/types/data_types.rs | 2 +- lib/src/types/data_value.rs | 2 +- lib/src/types/date_time.rs | 2 +- lib/src/types/diagnostic_info.rs | 2 +- lib/src/types/encoding.rs | 2 +- lib/src/types/guid.rs | 2 +- lib/src/types/localized_text.rs | 2 +- lib/src/types/mod.rs | 2 +- lib/src/types/node_id.rs | 2 +- lib/src/types/notification_message.rs | 2 +- lib/src/types/operand.rs | 2 +- lib/src/types/qualified_name.rs | 2 +- lib/src/types/relative_path.rs | 2 +- lib/src/types/request_header.rs | 2 +- lib/src/types/response_header.rs | 2 +- lib/src/types/service_types/impls.rs | 113 ++++++++++++------ lib/src/types/status_code.rs | 2 +- lib/src/types/string.rs | 2 +- lib/src/types/variant.rs | 2 +- tools/schema/nodeset.js | 11 +- 106 files changed, 465 insertions(+), 266 deletions(-) diff --git a/lib/src/client/builder.rs b/lib/src/client/builder.rs index 769bebb89..b9c7a7c3f 100644 --- 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 index 6593f0fc3..71bb97f09 100644 --- 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 index 07a721c82..22a9a0fb7 100644 --- 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 index 3c03d5127..7819384b5 100644 --- 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 index ebfe77fcc..3fc2ad3e1 100644 --- 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 index bb416987e..94a63dec8 100644 --- 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 index 66f1d6a33..f630fa4cc 100644 --- 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 index 20d218a65..4f9f43eb4 100644 --- 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 index 558d3096f..03be8ffee 100644 --- 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 index 79d4f15cb..4dc685321 100644 --- 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 index 8a994e125..e5af1154b 100644 --- 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 index 1be10ab5f..74fe31359 100644 --- 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 index c7b78a1a3..115cbb8a6 100644 --- 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 index 13698a7ee..7c2c9e5ef 100644 --- 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 index f3d2a5030..a18aecb1c 100644 --- 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 index eac0bd814..357f80b5d 100644 --- 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 index e5504be91..f68db558c 100644 --- 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 index 2b60218d6..d476fa936 100644 --- 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 index 2b551fcc5..a61d9bd33 100644 --- 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 index feb488a23..c79a2cf48 100644 --- 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 index 3ebf05399..603c61ee7 100644 --- 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 index 83365ff46..29c871aa3 100644 --- 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 index 153ba77a7..6705c8229 100644 --- 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 index 17a5bff8e..b1d28c3ab 100644 --- 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 index 38884aabd..95dd8c134 100644 --- 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)] diff --git a/lib/src/server/address_space/generated/nodeset_14_8.rs b/lib/src/server/address_space/generated/nodeset_14_8.rs index 31015a6d7..87255a3a6 100644 --- a/lib/src/server/address_space/generated/nodeset_14_8.rs +++ b/lib/src/server/address_space/generated/nodeset_14_8.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_9.rs b/lib/src/server/address_space/generated/nodeset_14_9.rs index df7290a0e..59c9541e0 100644 --- a/lib/src/server/address_space/generated/nodeset_14_9.rs +++ b/lib/src/server/address_space/generated/nodeset_14_9.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_3_1.rs b/lib/src/server/address_space/generated/nodeset_3_1.rs index 4544249e3..634ecce6c 100644 --- a/lib/src/server/address_space/generated/nodeset_3_1.rs +++ b/lib/src/server/address_space/generated/nodeset_3_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_3_2.rs b/lib/src/server/address_space/generated/nodeset_3_2.rs index 5ab844225..82ba25707 100644 --- a/lib/src/server/address_space/generated/nodeset_3_2.rs +++ b/lib/src/server/address_space/generated/nodeset_3_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_4_1.rs b/lib/src/server/address_space/generated/nodeset_4_1.rs index 60a1af2b8..366881bcb 100644 --- a/lib/src/server/address_space/generated/nodeset_4_1.rs +++ b/lib/src/server/address_space/generated/nodeset_4_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_4_2.rs b/lib/src/server/address_space/generated/nodeset_4_2.rs index 517baaf43..0132557d1 100644 --- a/lib/src/server/address_space/generated/nodeset_4_2.rs +++ b/lib/src/server/address_space/generated/nodeset_4_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_4_3.rs b/lib/src/server/address_space/generated/nodeset_4_3.rs index ab8881321..326164339 100644 --- a/lib/src/server/address_space/generated/nodeset_4_3.rs +++ b/lib/src/server/address_space/generated/nodeset_4_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_4_4.rs b/lib/src/server/address_space/generated/nodeset_4_4.rs index e3b4d889f..f72e879e7 100644 --- a/lib/src/server/address_space/generated/nodeset_4_4.rs +++ b/lib/src/server/address_space/generated/nodeset_4_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_4_5.rs b/lib/src/server/address_space/generated/nodeset_4_5.rs index 7a69bbe75..1f7471d2d 100644 --- a/lib/src/server/address_space/generated/nodeset_4_5.rs +++ b/lib/src/server/address_space/generated/nodeset_4_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_4_6.rs b/lib/src/server/address_space/generated/nodeset_4_6.rs index 5ec47b181..5d911601e 100644 --- a/lib/src/server/address_space/generated/nodeset_4_6.rs +++ b/lib/src/server/address_space/generated/nodeset_4_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_4_7.rs b/lib/src/server/address_space/generated/nodeset_4_7.rs index 3c59e6865..6afd4c66c 100644 --- a/lib/src/server/address_space/generated/nodeset_4_7.rs +++ b/lib/src/server/address_space/generated/nodeset_4_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)] diff --git a/lib/src/server/address_space/generated/nodeset_4_8.rs b/lib/src/server/address_space/generated/nodeset_4_8.rs index ebd761b05..2adff60b3 100644 --- a/lib/src/server/address_space/generated/nodeset_4_8.rs +++ b/lib/src/server/address_space/generated/nodeset_4_8.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_5_1.rs b/lib/src/server/address_space/generated/nodeset_5_1.rs index 464700cbc..40bc11943 100644 --- a/lib/src/server/address_space/generated/nodeset_5_1.rs +++ b/lib/src/server/address_space/generated/nodeset_5_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_5_10.rs b/lib/src/server/address_space/generated/nodeset_5_10.rs index 35c7f7384..ca74b6ec8 100644 --- a/lib/src/server/address_space/generated/nodeset_5_10.rs +++ b/lib/src/server/address_space/generated/nodeset_5_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_5_11.rs b/lib/src/server/address_space/generated/nodeset_5_11.rs index cf7b8b486..889ec3fcc 100644 --- a/lib/src/server/address_space/generated/nodeset_5_11.rs +++ b/lib/src/server/address_space/generated/nodeset_5_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_5_12.rs b/lib/src/server/address_space/generated/nodeset_5_12.rs index 461f2bfe0..495fd4ee3 100644 --- a/lib/src/server/address_space/generated/nodeset_5_12.rs +++ b/lib/src/server/address_space/generated/nodeset_5_12.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_5_13.rs b/lib/src/server/address_space/generated/nodeset_5_13.rs index d2679a0e0..d0ee75141 100644 --- a/lib/src/server/address_space/generated/nodeset_5_13.rs +++ b/lib/src/server/address_space/generated/nodeset_5_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_5_14.rs b/lib/src/server/address_space/generated/nodeset_5_14.rs index a7500c207..bb4fb6e22 100644 --- a/lib/src/server/address_space/generated/nodeset_5_14.rs +++ b/lib/src/server/address_space/generated/nodeset_5_14.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_5_15.rs b/lib/src/server/address_space/generated/nodeset_5_15.rs index c2a722c03..4784d6efa 100644 --- a/lib/src/server/address_space/generated/nodeset_5_15.rs +++ b/lib/src/server/address_space/generated/nodeset_5_15.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_5_16.rs b/lib/src/server/address_space/generated/nodeset_5_16.rs index 65d511841..3131d579b 100644 --- a/lib/src/server/address_space/generated/nodeset_5_16.rs +++ b/lib/src/server/address_space/generated/nodeset_5_16.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_5_2.rs b/lib/src/server/address_space/generated/nodeset_5_2.rs index 0e4925ef0..cd8fe2fe2 100644 --- a/lib/src/server/address_space/generated/nodeset_5_2.rs +++ b/lib/src/server/address_space/generated/nodeset_5_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_5_3.rs b/lib/src/server/address_space/generated/nodeset_5_3.rs index a2927af4c..5ffe0bd25 100644 --- a/lib/src/server/address_space/generated/nodeset_5_3.rs +++ b/lib/src/server/address_space/generated/nodeset_5_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_5_4.rs b/lib/src/server/address_space/generated/nodeset_5_4.rs index d1f50f3c2..7b5c28dda 100644 --- a/lib/src/server/address_space/generated/nodeset_5_4.rs +++ b/lib/src/server/address_space/generated/nodeset_5_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_5_5.rs b/lib/src/server/address_space/generated/nodeset_5_5.rs index c78f2f440..556f932b4 100644 --- a/lib/src/server/address_space/generated/nodeset_5_5.rs +++ b/lib/src/server/address_space/generated/nodeset_5_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_5_6.rs b/lib/src/server/address_space/generated/nodeset_5_6.rs index 62660827d..7ca3b5588 100644 --- a/lib/src/server/address_space/generated/nodeset_5_6.rs +++ b/lib/src/server/address_space/generated/nodeset_5_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_5_7.rs b/lib/src/server/address_space/generated/nodeset_5_7.rs index 2c512697c..45c5643b1 100644 --- a/lib/src/server/address_space/generated/nodeset_5_7.rs +++ b/lib/src/server/address_space/generated/nodeset_5_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)] diff --git a/lib/src/server/address_space/generated/nodeset_5_8.rs b/lib/src/server/address_space/generated/nodeset_5_8.rs index 6bde4ccea..a097f2d46 100644 --- a/lib/src/server/address_space/generated/nodeset_5_8.rs +++ b/lib/src/server/address_space/generated/nodeset_5_8.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_5_9.rs b/lib/src/server/address_space/generated/nodeset_5_9.rs index 1025a4294..1b79970bb 100644 --- a/lib/src/server/address_space/generated/nodeset_5_9.rs +++ b/lib/src/server/address_space/generated/nodeset_5_9.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_8.rs b/lib/src/server/address_space/generated/nodeset_8.rs index 4350f79a4..32e8bd754 100644 --- a/lib/src/server/address_space/generated/nodeset_8.rs +++ b/lib/src/server/address_space/generated/nodeset_8.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_999.rs b/lib/src/server/address_space/generated/nodeset_999.rs index a7369b995..4774cb52e 100644 --- a/lib/src/server/address_space/generated/nodeset_999.rs +++ b/lib/src/server/address_space/generated/nodeset_999.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_9_1.rs b/lib/src/server/address_space/generated/nodeset_9_1.rs index 2742eb4bb..6087bbb83 100644 --- a/lib/src/server/address_space/generated/nodeset_9_1.rs +++ b/lib/src/server/address_space/generated/nodeset_9_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_9_2.rs b/lib/src/server/address_space/generated/nodeset_9_2.rs index 2f38e42dc..8c851a6b3 100644 --- a/lib/src/server/address_space/generated/nodeset_9_2.rs +++ b/lib/src/server/address_space/generated/nodeset_9_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_9_3.rs b/lib/src/server/address_space/generated/nodeset_9_3.rs index 982186360..728c1d9ab 100644 --- a/lib/src/server/address_space/generated/nodeset_9_3.rs +++ b/lib/src/server/address_space/generated/nodeset_9_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_9_4.rs b/lib/src/server/address_space/generated/nodeset_9_4.rs index fe1f85105..46bb9a179 100644 --- a/lib/src/server/address_space/generated/nodeset_9_4.rs +++ b/lib/src/server/address_space/generated/nodeset_9_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/mod.rs b/lib/src/server/address_space/mod.rs index 21f110ecc..ab3e3bbac 100644 --- a/lib/src/server/address_space/mod.rs +++ b/lib/src/server/address_space/mod.rs @@ -128,7 +128,9 @@ where // variables etc. macro_rules! node_builder_impl { ( $node_builder_ty:ident, $node_ty:ident ) => { - use $crate::address_space::{address_space::AddressSpace, references::ReferenceDirection}; + use $crate::server::address_space::{ + address_space::AddressSpace, references::ReferenceDirection, + }; /// A builder for constructing a node of same name. This can be used as an easy way /// to create a node and the references it has to another node in a simple fashion. @@ -379,10 +381,10 @@ macro_rules! node_builder_impl_property_of { /// node has a base: Base macro_rules! node_base_impl { ( $node_struct:ident ) => { - use crate::address_space::node::NodeType; - use crate::types::service_types::NodeClass; - use crate::types::status_code::StatusCode; - use crate::types::*; + use crate::{ + server::address_space::node::NodeType, + types::{service_types, status_code::StatusCode, *}, + }; impl Into for $node_struct { fn into(self) -> NodeType { diff --git a/lib/src/server/comms/tcp_transport.rs b/lib/src/server/comms/tcp_transport.rs index 8298aec80..20e958ece 100644 --- a/lib/src/server/comms/tcp_transport.rs +++ b/lib/src/server/comms/tcp_transport.rs @@ -29,6 +29,8 @@ use tokio::{ }; use tokio_util::codec::FramedRead; +use crate::{deregister_runtime_component, register_runtime_component}; + use crate::core::{ comms::{ message_writer::MessageWriter, diff --git a/lib/src/server/diagnostics.rs b/lib/src/server/diagnostics.rs index 2384e36aa..252d40a74 100644 --- a/lib/src/server/diagnostics.rs +++ b/lib/src/server/diagnostics.rs @@ -4,7 +4,9 @@ //! Provides diagnostics structures and functions for gathering information about the running //! state of a server. + use crate::types::service_types::ServerDiagnosticsSummaryDataType; +use crate::{deregister_runtime_component, register_runtime_component}; use crate::core::RUNTIME; diff --git a/lib/src/server/discovery/mod.rs b/lib/src/server/discovery/mod.rs index 18bf11fc3..6d52c953d 100644 --- a/lib/src/server/discovery/mod.rs +++ b/lib/src/server/discovery/mod.rs @@ -4,7 +4,7 @@ use crate::client::prelude::ClientBuilder; -use super::state::ServerState; +use crate::server::state::ServerState; // Note these two functions are presently informational, but in the future they could // be used to automatically set up trust between LDS and server if the server diff --git a/lib/src/server/events/audit/cancel_event.rs b/lib/src/server/events/audit/cancel_event.rs index d125b05e9..b74b4a50e 100644 --- a/lib/src/server/events/audit/cancel_event.rs +++ b/lib/src/server/events/audit/cancel_event.rs @@ -4,7 +4,7 @@ use crate::types::*; -use crate::{address_space::address_space::AddressSpace, events::event::Event}; +use crate::server::{address_space::address_space::AddressSpace, events::event::Event}; use super::{session_events::AuditSessionEventType, AuditEvent}; diff --git a/lib/src/server/events/audit/certificate_events.rs b/lib/src/server/events/audit/certificate_events.rs index 2f9eeadef..4a8e83379 100644 --- a/lib/src/server/events/audit/certificate_events.rs +++ b/lib/src/server/events/audit/certificate_events.rs @@ -4,7 +4,7 @@ use crate::types::*; -use super::super::{address_space::address_space::AddressSpace, events::event::Event}; +use crate::server::{address_space::address_space::AddressSpace, events::event::Event}; use super::{security_event::AuditSecurityEventType, AuditEvent}; diff --git a/lib/src/server/events/audit/event.rs b/lib/src/server/events/audit/event.rs index 1eee2893e..fab5ab312 100644 --- a/lib/src/server/events/audit/event.rs +++ b/lib/src/server/events/audit/event.rs @@ -4,7 +4,7 @@ use crate::types::*; -use crate::{ +use crate::server::{ address_space::address_space::AddressSpace, events::event::{BaseEventType, Event}, }; diff --git a/lib/src/server/events/audit/mod.rs b/lib/src/server/events/audit/mod.rs index 03a070f24..03717d3c5 100644 --- a/lib/src/server/events/audit/mod.rs +++ b/lib/src/server/events/audit/mod.rs @@ -12,7 +12,7 @@ use std::sync::{Arc, RwLock}; use crate::types::*; -use crate::{address_space::address_space::AddressSpace, events::event::Event}; +use crate::server::{address_space::address_space::AddressSpace, events::event::Event}; pub trait AuditEvent: Event { fn parent_node() -> NodeId { diff --git a/lib/src/server/events/audit/node_management_event.rs b/lib/src/server/events/audit/node_management_event.rs index 643aa8685..0f633d4ca 100644 --- a/lib/src/server/events/audit/node_management_event.rs +++ b/lib/src/server/events/audit/node_management_event.rs @@ -4,7 +4,7 @@ use crate::types::*; -use crate::{address_space::address_space::AddressSpace, events::event::Event}; +use crate::server::{address_space::address_space::AddressSpace, events::event::Event}; use super::{event::AuditEventType, AuditEvent}; diff --git a/lib/src/server/events/audit/security_event.rs b/lib/src/server/events/audit/security_event.rs index 3de0dbf37..36a20f38c 100644 --- a/lib/src/server/events/audit/security_event.rs +++ b/lib/src/server/events/audit/security_event.rs @@ -4,7 +4,7 @@ use crate::types::*; -use crate::{address_space::address_space::AddressSpace, events::event::Event}; +use crate::server::{address_space::address_space::AddressSpace, events::event::Event}; use super::{event::AuditEventType, AuditEvent}; diff --git a/lib/src/server/events/audit/session_events.rs b/lib/src/server/events/audit/session_events.rs index e0be12060..2329b74b9 100644 --- a/lib/src/server/events/audit/session_events.rs +++ b/lib/src/server/events/audit/session_events.rs @@ -5,7 +5,7 @@ use crate::crypto::X509; use crate::types::*; -use crate::{address_space::address_space::AddressSpace, events::event::Event}; +use crate::server::{address_space::address_space::AddressSpace, events::event::Event}; use super::{security_event::AuditSecurityEventType, AuditEvent}; diff --git a/lib/src/server/events/event.rs b/lib/src/server/events/event.rs index ef4627f86..9d1218d0a 100644 --- a/lib/src/server/events/event.rs +++ b/lib/src/server/events/event.rs @@ -9,7 +9,7 @@ use crate::types::{ QualifiedName, TimestampsToReturn, UAString, VariableTypeId, Variant, }; -use crate::address_space::{ +use crate::server::address_space::{ object::ObjectBuilder, relative_path::*, variable::VariableBuilder, AddressSpace, }; diff --git a/lib/src/server/historical/mod.rs b/lib/src/server/historical/mod.rs index 25ed8867f..2454077e3 100644 --- a/lib/src/server/historical/mod.rs +++ b/lib/src/server/historical/mod.rs @@ -10,7 +10,7 @@ use std::{ use crate::types::status_code::StatusCode; use crate::types::*; -use crate::address_space::AddressSpace; +use crate::server::address_space::AddressSpace; /// Values that should be set in the address space via `AddressSpace::set_history_server_capabilities()` /// to denote to clients what history capabilities the server has. diff --git a/lib/src/server/metrics.rs b/lib/src/server/metrics.rs index 17e9b3ce1..1f14922ee 100644 --- a/lib/src/server/metrics.rs +++ b/lib/src/server/metrics.rs @@ -6,9 +6,11 @@ //! to see what is happening in the server. State is updated by the server as sessions are added, removed, //! and when subscriptions / monitored items are added, removed. +use crate::runtime_components; + use crate::types::DateTime; -use crate::{ +use crate::server::{ comms::transport::{Transport, TransportState}, config, diagnostics::ServerDiagnostics, diff --git a/lib/src/server/mod.rs b/lib/src/server/mod.rs index ef242c736..f0bafc4a8 100644 --- a/lib/src/server/mod.rs +++ b/lib/src/server/mod.rs @@ -69,10 +69,7 @@ pub mod prelude { //! single use statement. pub use crate::core::prelude::*; pub use crate::crypto::*; - pub use crate::types::service_types::*; - pub use crate::types::status_code::StatusCode; - pub use crate::types::*; - pub use crate::{ + pub use crate::server::{ address_space::types::*, address_space::{AccessLevel, EventNotifier, UserAccessLevel}, builder::*, @@ -84,6 +81,9 @@ pub mod prelude { subscriptions::*, util::*, }; + pub use crate::types::service_types::*; + pub use crate::types::status_code::StatusCode; + pub use crate::types::*; } pub mod constants { diff --git a/lib/src/server/server.rs b/lib/src/server/server.rs index d4736e892..5d302c7b5 100644 --- a/lib/src/server/server.rs +++ b/lib/src/server/server.rs @@ -21,7 +21,7 @@ use crate::core::{config::Config, prelude::*}; use crate::crypto::*; use crate::types::service_types::ServerState as ServerStateType; -use crate::{ +use crate::server::{ address_space::types::AddressSpace, comms::tcp_transport::*, comms::transport::Transport, @@ -514,7 +514,7 @@ impl Server { /// to register itself with a discovery server. #[cfg(feature = "discovery-server-registration")] fn start_discovery_server_registration_timer(&self, discovery_server_url: &str) { - use crate::discovery; + use crate::server::discovery; use std::sync::Mutex; let discovery_server_url = discovery_server_url.to_string(); diff --git a/lib/src/server/services/audit.rs b/lib/src/server/services/audit.rs index 613c04717..6291af9ff 100644 --- a/lib/src/server/services/audit.rs +++ b/lib/src/server/services/audit.rs @@ -6,13 +6,13 @@ use std::sync::{Arc, RwLock}; use crate::types::{status_code::StatusCode, *}; -use super::super::{ +use crate::server::prelude::SecureChannel; +use crate::server::{ address_space::address_space::AddressSpace, events::audit::{certificate_events::*, session_events::*}, session::Session, state::ServerState, }; -use crate::prelude::SecureChannel; fn next_node_id(address_space: Arc>) -> NodeId { let audit_namespace = { diff --git a/lib/src/server/session.rs b/lib/src/server/session.rs index e006dca6b..4cb5ffe8e 100644 --- a/lib/src/server/session.rs +++ b/lib/src/server/session.rs @@ -14,7 +14,7 @@ use chrono::Utc; use crate::crypto::X509; use crate::types::{service_types::PublishRequest, status_code::StatusCode, *}; -use crate::{ +use crate::server::{ address_space::{AddressSpace, UserAccessLevel}, continuation_point::BrowseContinuationPoint, diagnostics::ServerDiagnostics, diff --git a/lib/src/server/state.rs b/lib/src/server/state.rs index b4e9e335f..1670dd467 100644 --- a/lib/src/server/state.rs +++ b/lib/src/server/state.rs @@ -18,7 +18,7 @@ use crate::types::{ status_code::StatusCode, }; -use crate::{ +use crate::server::{ callbacks::{RegisterNodes, UnregisterNodes}, config::{ServerConfig, ServerEndpoint}, constants, @@ -506,7 +506,7 @@ impl ServerState { Err(StatusCode::BadIdentityTokenRejected) } else { debug!("Anonymous identity is authenticated"); - Ok(String::from(crate::config::ANONYMOUS_USER_TOKEN_ID)) + Ok(String::from(crate::server::config::ANONYMOUS_USER_TOKEN_ID)) } } diff --git a/lib/src/server/subscriptions/monitored_item.rs b/lib/src/server/subscriptions/monitored_item.rs index 7ee744893..07de10279 100644 --- a/lib/src/server/subscriptions/monitored_item.rs +++ b/lib/src/server/subscriptions/monitored_item.rs @@ -15,7 +15,7 @@ use crate::types::{ *, }; -use crate::{ +use crate::server::{ address_space::{node::Node, AddressSpace, EventNotifier}, events::event_filter, state::ServerState, diff --git a/lib/src/server/subscriptions/subscription.rs b/lib/src/server/subscriptions/subscription.rs index 52ed847d9..d5a9b7545 100644 --- a/lib/src/server/subscriptions/subscription.rs +++ b/lib/src/server/subscriptions/subscription.rs @@ -16,7 +16,7 @@ use crate::types::{ use crate::core::handle::Handle; -use crate::{ +use crate::server::{ address_space::AddressSpace, constants, diagnostics::ServerDiagnostics, diff --git a/lib/src/server/subscriptions/subscriptions.rs b/lib/src/server/subscriptions/subscriptions.rs index 928e41bde..4b2f19985 100644 --- a/lib/src/server/subscriptions/subscriptions.rs +++ b/lib/src/server/subscriptions/subscriptions.rs @@ -10,7 +10,7 @@ use crate::types::{ *, }; -use crate::{ +use crate::server::{ address_space::types::AddressSpace, subscriptions::{ subscription::{Subscription, TickReason}, diff --git a/lib/src/server/util/mod.rs b/lib/src/server/util/mod.rs index 131d24200..394b66ca5 100644 --- a/lib/src/server/util/mod.rs +++ b/lib/src/server/util/mod.rs @@ -10,7 +10,7 @@ use tokio::time::{interval_at, Duration, Instant}; use crate::types::service_types::ServerState as ServerStateType; -use crate::state::ServerState; +use crate::server::state::ServerState; /// This is a convenience for a polling action. This struct starts a repeating timer that calls /// an action repeatedly. diff --git a/lib/src/types/argument.rs b/lib/src/types/argument.rs index f61100049..0bc1aeb7c 100644 --- a/lib/src/types/argument.rs +++ b/lib/src/types/argument.rs @@ -4,7 +4,7 @@ use std::io::{Read, Write}; -use crate::{ +use crate::types::{ encoding::*, localized_text::LocalizedText, node_id::NodeId, status_codes::StatusCode, string::UAString, }; diff --git a/lib/src/types/array.rs b/lib/src/types/array.rs index 2b12b5d6b..a99626375 100644 --- a/lib/src/types/array.rs +++ b/lib/src/types/array.rs @@ -1,5 +1,5 @@ -use crate::variant::*; -use crate::StatusCode; +use crate::types::variant::*; +use crate::types::StatusCode; /// An array is a vector of values with an optional number of dimensions. /// It is expected that the multi-dimensional array is valid, or it might not be encoded or decoded diff --git a/lib/src/types/basic_types.rs b/lib/src/types/basic_types.rs index 9f3f3c1d2..d9ee029e5 100644 --- a/lib/src/types/basic_types.rs +++ b/lib/src/types/basic_types.rs @@ -5,7 +5,7 @@ //! Contains definitions of the simple OPC UA scalar types. use std::io::{Read, Write}; -use crate::encoding::*; +use crate::types::encoding::*; // OPC UA Part 6 - Mappings 1.03 Specification diff --git a/lib/src/types/byte_string.rs b/lib/src/types/byte_string.rs index 020e22644..0753ea32d 100644 --- a/lib/src/types/byte_string.rs +++ b/lib/src/types/byte_string.rs @@ -7,7 +7,7 @@ use std::convert::TryFrom; use std::io::{Read, Write}; -use crate::{ +use crate::types::{ encoding::{ process_decode_io_result, process_encode_io_result, write_i32, BinaryEncoder, DecodingOptions, EncodingResult, diff --git a/lib/src/types/data_types.rs b/lib/src/types/data_types.rs index 707875b5b..ab7eae9d7 100644 --- a/lib/src/types/data_types.rs +++ b/lib/src/types/data_types.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MPL-2.0 // Copyright (C) 2017-2022 Adam Lock -use crate::date_time::DateTime; +use crate::types::date_time::DateTime; /// This primitive data type is a UInt32 that is used as an identifier, such as a handle. /// All values, except for 0, are valid. IntegerId = 288, diff --git a/lib/src/types/data_value.rs b/lib/src/types/data_value.rs index ad303d5c7..6b51ef892 100644 --- a/lib/src/types/data_value.rs +++ b/lib/src/types/data_value.rs @@ -6,7 +6,7 @@ use std::io::{Read, Write}; -use crate::{ +use crate::types::{ byte_string::ByteString, date_time::*, encoding::*, guid::Guid, localized_text::LocalizedText, node_id::NodeId, qualified_name::QualifiedName, service_types::TimestampsToReturn, status_codes::StatusCode, string::UAString, variant::Variant, diff --git a/lib/src/types/date_time.rs b/lib/src/types/date_time.rs index dcbdca867..2898c867f 100644 --- a/lib/src/types/date_time.rs +++ b/lib/src/types/date_time.rs @@ -15,7 +15,7 @@ use std::{ use chrono::{Datelike, Duration, TimeZone, Timelike, Utc}; use serde::{Deserialize, Deserializer, Serialize, Serializer}; -use crate::encoding::*; +use crate::types::encoding::*; const NANOS_PER_SECOND: i64 = 1_000_000_000; const NANOS_PER_TICK: i64 = 100; diff --git a/lib/src/types/diagnostic_info.rs b/lib/src/types/diagnostic_info.rs index 5eca97208..9bfe4b4d7 100644 --- a/lib/src/types/diagnostic_info.rs +++ b/lib/src/types/diagnostic_info.rs @@ -6,7 +6,7 @@ use std::io::{Read, Write}; -use crate::{encoding::*, status_codes::StatusCode, string::UAString}; +use crate::types::{encoding::*, status_codes::StatusCode, string::UAString}; bitflags! { pub struct DiagnosticInfoMask: u8 { diff --git a/lib/src/types/encoding.rs b/lib/src/types/encoding.rs index 21d8f39e9..eedc7b71a 100644 --- a/lib/src/types/encoding.rs +++ b/lib/src/types/encoding.rs @@ -13,7 +13,7 @@ use std::{ use byteorder::{ByteOrder, LittleEndian, WriteBytesExt}; use chrono::Duration; -use crate::{constants, status_codes::StatusCode}; +use crate::types::{constants, status_codes::StatusCode}; pub type EncodingResult = std::result::Result; diff --git a/lib/src/types/guid.rs b/lib/src/types/guid.rs index d1f1460fc..9c7205852 100644 --- a/lib/src/types/guid.rs +++ b/lib/src/types/guid.rs @@ -12,7 +12,7 @@ use std::{ }; use uuid::Uuid; -use crate::encoding::*; +use crate::types::encoding::*; /// A Guid is a 16 byte Globally Unique Identifier. #[derive(Eq, PartialEq, Clone, Hash)] diff --git a/lib/src/types/localized_text.rs b/lib/src/types/localized_text.rs index 63934373e..4568eaf07 100644 --- a/lib/src/types/localized_text.rs +++ b/lib/src/types/localized_text.rs @@ -8,7 +8,7 @@ use std::{ io::{Read, Write}, }; -use crate::{encoding::*, string::*}; +use crate::types::{encoding::*, string::*}; /// A human readable text with an optional locale identifier. #[derive(PartialEq, Default, Debug, Clone, Serialize, Deserialize)] diff --git a/lib/src/types/mod.rs b/lib/src/types/mod.rs index 6d09351ae..52fd279a6 100644 --- a/lib/src/types/mod.rs +++ b/lib/src/types/mod.rs @@ -211,7 +211,7 @@ pub mod status_code; pub mod string; pub mod variant; -pub use crate::{ +pub use crate::types::{ argument::*, array::*, attribute::*, basic_types::*, byte_string::*, data_types::*, data_value::*, date_time::*, diagnostic_info::*, encoding::*, extension_object::*, guid::*, localized_text::*, node_id::*, node_ids::*, numeric_range::*, operand::*, qualified_name::*, diff --git a/lib/src/types/node_id.rs b/lib/src/types/node_id.rs index 1c27d0f74..39adaa3f8 100644 --- a/lib/src/types/node_id.rs +++ b/lib/src/types/node_id.rs @@ -14,7 +14,7 @@ use std::{ u16, u32, }; -use crate::{ +use crate::types::{ byte_string::ByteString, encoding::*, guid::Guid, diff --git a/lib/src/types/notification_message.rs b/lib/src/types/notification_message.rs index 3487076e3..e130b0115 100644 --- a/lib/src/types/notification_message.rs +++ b/lib/src/types/notification_message.rs @@ -3,7 +3,7 @@ // Copyright (C) 2017-2022 Adam Lock ///! Helpers for NotificationMessage types -use crate::{ +use crate::types::{ date_time::DateTime, diagnostic_info::DiagnosticInfo, encoding::DecodingOptions, diff --git a/lib/src/types/operand.rs b/lib/src/types/operand.rs index 31c5f5dae..b47bc47fa 100644 --- a/lib/src/types/operand.rs +++ b/lib/src/types/operand.rs @@ -4,7 +4,7 @@ use std::convert::TryFrom; -use crate::{ +use crate::types::{ attribute::AttributeId, node_ids::ObjectId, service_types::{ diff --git a/lib/src/types/qualified_name.rs b/lib/src/types/qualified_name.rs index 518369422..55e00fa29 100644 --- a/lib/src/types/qualified_name.rs +++ b/lib/src/types/qualified_name.rs @@ -5,7 +5,7 @@ //! Contains the definition of `QualifiedName`. use std::io::{Read, Write}; -use crate::{encoding::*, string::*}; +use crate::types::{encoding::*, string::*}; /// An identifier for a error or condition that is associated with a value or an operation. /// diff --git a/lib/src/types/relative_path.rs b/lib/src/types/relative_path.rs index 66c412e6e..de4078564 100644 --- a/lib/src/types/relative_path.rs +++ b/lib/src/types/relative_path.rs @@ -11,7 +11,7 @@ use std::{error::Error, fmt}; use regex::Regex; -use crate::{ +use crate::types::{ node_id::{Identifier, NodeId}, node_ids::*, qualified_name::QualifiedName, diff --git a/lib/src/types/request_header.rs b/lib/src/types/request_header.rs index 105755351..e1e6d281b 100644 --- a/lib/src/types/request_header.rs +++ b/lib/src/types/request_header.rs @@ -7,7 +7,7 @@ use std::{ io::{Read, Write}, }; -use crate::{ +use crate::types::{ data_types::*, date_time::DateTime, diagnostic_info::DiagnosticBits, encoding::*, extension_object::ExtensionObject, node_id::NodeId, string::UAString, }; diff --git a/lib/src/types/response_header.rs b/lib/src/types/response_header.rs index 3a8911711..7e982dd47 100644 --- a/lib/src/types/response_header.rs +++ b/lib/src/types/response_header.rs @@ -7,7 +7,7 @@ use std::{ io::{Read, Write}, }; -use crate::{ +use crate::types::{ data_types::*, date_time::DateTime, diagnostic_info::DiagnosticInfo, encoding::*, extension_object::ExtensionObject, request_header::RequestHeader, status_codes::StatusCode, string::UAString, diff --git a/lib/src/types/service_types/impls.rs b/lib/src/types/service_types/impls.rs index d21dcc11a..48b145be8 100644 --- a/lib/src/types/service_types/impls.rs +++ b/lib/src/types/service_types/impls.rs @@ -1,6 +1,6 @@ use std::{self, fmt}; -use crate::{ +use crate::types::{ attribute::AttributeId, byte_string::ByteString, constants, @@ -14,9 +14,10 @@ use crate::{ request_header::RequestHeader, response_header::ResponseHeader, service_types::{ - AnonymousIdentityToken, ApplicationDescription, ApplicationType, Argument, CallMethodRequest, - DataChangeFilter, DataChangeTrigger, EndpointDescription, enums::DeadbandType, MessageSecurityMode, MonitoredItemCreateRequest, MonitoringMode, - MonitoringParameters, ReadValueId, ServerDiagnosticsSummaryDataType, ServiceCounterDataType, ServiceFault, + enums::DeadbandType, AnonymousIdentityToken, ApplicationDescription, ApplicationType, + Argument, CallMethodRequest, DataChangeFilter, DataChangeTrigger, EndpointDescription, + MessageSecurityMode, MonitoredItemCreateRequest, MonitoringMode, MonitoringParameters, + ReadValueId, ServerDiagnosticsSummaryDataType, ServiceCounterDataType, ServiceFault, SignatureData, UserNameIdentityToken, UserTokenPolicy, UserTokenType, }, status_codes::StatusCode, @@ -33,7 +34,7 @@ pub trait MessageInfo { impl ServiceFault { pub fn new(request_header: &RequestHeader, service_result: StatusCode) -> ServiceFault { ServiceFault { - response_header: ResponseHeader::new_service_result(request_header, service_result) + response_header: ResponseHeader::new_service_result(request_header, service_result), } } } @@ -55,27 +56,27 @@ impl DataChangeFilter { /// type of status, status/value or status/value/timestamp pub fn compare(&self, v1: &DataValue, v2: &DataValue, eu_range: Option<(f64, f64)>) -> bool { match self.trigger { - DataChangeTrigger::Status => { - v1.status == v2.status - } + DataChangeTrigger::Status => v1.status == v2.status, DataChangeTrigger::StatusValue => { - v1.status == v2.status && - self.compare_value_option(&v1.value, &v2.value, eu_range) + v1.status == v2.status && self.compare_value_option(&v1.value, &v2.value, eu_range) } DataChangeTrigger::StatusValueTimestamp => { - v1.status == v2.status && - self.compare_value_option(&v1.value, &v2.value, eu_range) && - v1.server_timestamp == v2.server_timestamp + v1.status == v2.status + && self.compare_value_option(&v1.value, &v2.value, eu_range) + && v1.server_timestamp == v2.server_timestamp } } } /// Compares two variant values to each other. Returns true if they are considered the "same". - pub fn compare_value_option(&self, v1: &Option, v2: &Option, eu_range: Option<(f64, f64)>) -> bool { + pub fn compare_value_option( + &self, + v1: &Option, + v2: &Option, + eu_range: Option<(f64, f64)>, + ) -> bool { match (v1, v2) { - (Some(_), None) | (None, Some(_)) => { - false - } + (Some(_), None) | (None, Some(_)) => false, (None, None) => { // If it's always none then it hasn't changed true @@ -99,7 +100,12 @@ impl DataChangeFilter { /// /// BadDeadbandFilterInvalid indicates the deadband settings were invalid, e.g. an invalid /// type, or the args were invalid. A (low, high) range must be supplied for a percentage deadband compare. - pub fn compare_value(&self, v1: &Variant, v2: &Variant, eu_range: Option<(f64, f64)>) -> std::result::Result { + pub fn compare_value( + &self, + v1: &Variant, + v2: &Variant, + eu_range: Option<(f64, f64)>, + ) -> std::result::Result { // TODO be able to compare arrays of numbers if self.deadband_type == DeadbandType::None as u32 { // Straight comparison of values @@ -120,7 +126,13 @@ impl DataChangeFilter { if low >= high { Err(StatusCode::BadDeadbandFilterInvalid) } else { - Ok(DataChangeFilter::pct_compare(v1, v2, low, high, self.deadband_value)) + Ok(DataChangeFilter::pct_compare( + v1, + v2, + low, + high, + self.deadband_value, + )) } } } @@ -212,7 +224,10 @@ impl UserNameIdentityToken { // TODO See 7.36.3. UserTokenPolicy and SecurityPolicy should be used to provide // a means to encrypt a password and not send it plain text. Sending a plaintext // password over unsecured network is a bad thing!!! - error!("Authentication error: Unsupported encryption algorithm {}", self.encryption_algorithm.as_ref()); + error!( + "Authentication error: Unsupported encryption algorithm {}", + self.encryption_algorithm.as_ref() + ); false } } else { @@ -253,7 +268,7 @@ impl<'a> From<(u16, &'a str)> for ReadValueId { impl Default for AnonymousIdentityToken { fn default() -> Self { AnonymousIdentityToken { - policy_id: UAString::from(profiles::SECURITY_USER_TOKEN_POLICY_ANONYMOUS) + policy_id: UAString::from(profiles::SECURITY_USER_TOKEN_POLICY_ANONYMOUS), } } } @@ -269,13 +284,21 @@ impl SignatureData { impl Into for NodeId { fn into(self) -> MonitoredItemCreateRequest { - MonitoredItemCreateRequest::new(self.into(), MonitoringMode::Reporting, MonitoringParameters::default()) + MonitoredItemCreateRequest::new( + self.into(), + MonitoringMode::Reporting, + MonitoringParameters::default(), + ) } } impl MonitoredItemCreateRequest { /// Adds an item to monitor to the subscription - pub fn new(item_to_monitor: ReadValueId, monitoring_mode: MonitoringMode, requested_parameters: MonitoringParameters) -> MonitoredItemCreateRequest { + pub fn new( + item_to_monitor: ReadValueId, + monitoring_mode: MonitoringMode, + requested_parameters: MonitoringParameters, + ) -> MonitoredItemCreateRequest { MonitoredItemCreateRequest { item_to_monitor, monitoring_mode, @@ -341,7 +364,11 @@ impl Default for ServerDiagnosticsSummaryDataType { impl<'a> From<&'a str> for EndpointDescription { fn from(v: &'a str) -> Self { - EndpointDescription::from((v, constants::SECURITY_POLICY_NONE_URI, MessageSecurityMode::None)) + EndpointDescription::from(( + v, + constants::SECURITY_POLICY_NONE_URI, + MessageSecurityMode::None, + )) } } @@ -357,14 +384,30 @@ impl<'a> From<(&'a str, &'a str, MessageSecurityMode, UserTokenPolicy)> for Endp } } -impl<'a> From<(&'a str, &'a str, MessageSecurityMode, Vec)> for EndpointDescription { +impl<'a> From<(&'a str, &'a str, MessageSecurityMode, Vec)> + for EndpointDescription +{ fn from(v: (&'a str, &'a str, MessageSecurityMode, Vec)) -> Self { EndpointDescription::from((v.0, v.1, v.2, Some(v.3))) } } -impl<'a> From<(&'a str, &'a str, MessageSecurityMode, Option>)> for EndpointDescription { - fn from(v: (&'a str, &'a str, MessageSecurityMode, Option>)) -> Self { +impl<'a> + From<( + &'a str, + &'a str, + MessageSecurityMode, + Option>, + )> for EndpointDescription +{ + fn from( + v: ( + &'a str, + &'a str, + MessageSecurityMode, + Option>, + ), + ) -> Self { EndpointDescription { endpoint_url: UAString::from(v.0), security_policy_uri: UAString::from(v.1), @@ -396,14 +439,12 @@ impl fmt::Display for MessageSecurityMode { impl From for String { fn from(security_mode: MessageSecurityMode) -> Self { - String::from( - match security_mode { - MessageSecurityMode::None => MESSAGE_SECURITY_MODE_NONE, - MessageSecurityMode::Sign => MESSAGE_SECURITY_MODE_SIGN, - MessageSecurityMode::SignAndEncrypt => MESSAGE_SECURITY_MODE_SIGN_AND_ENCRYPT, - _ => "", - } - ) + String::from(match security_mode { + MessageSecurityMode::None => MESSAGE_SECURITY_MODE_NONE, + MessageSecurityMode::Sign => MESSAGE_SECURITY_MODE_SIGN, + MessageSecurityMode::SignAndEncrypt => MESSAGE_SECURITY_MODE_SIGN_AND_ENCRYPT, + _ => "", + }) } } @@ -451,4 +492,4 @@ impl ServiceCounterDataType { self.total_count += 1; self.error_count += 1; } -} \ No newline at end of file +} diff --git a/lib/src/types/status_code.rs b/lib/src/types/status_code.rs index 971135a70..f14c2a7f0 100644 --- a/lib/src/types/status_code.rs +++ b/lib/src/types/status_code.rs @@ -17,7 +17,7 @@ use serde::{ Deserialize, Deserializer, Serialize, Serializer, }; -pub use crate::{encoding::*, status_codes::StatusCode}; +pub use crate::types::{encoding::*, status_codes::StatusCode}; // The bitflags! macro implements Debug for StatusCode but it fouls the display because status // codes are a combination of bits and unique values. diff --git a/lib/src/types/string.rs b/lib/src/types/string.rs index e77922132..746f2ffea 100644 --- a/lib/src/types/string.rs +++ b/lib/src/types/string.rs @@ -9,7 +9,7 @@ use std::{ io::{Read, Write}, }; -use crate::{ +use crate::types::{ encoding::{ process_decode_io_result, process_encode_io_result, write_i32, BinaryEncoder, DecodingOptions, EncodingResult, diff --git a/lib/src/types/variant.rs b/lib/src/types/variant.rs index 47e5fa609..55256e0eb 100644 --- a/lib/src/types/variant.rs +++ b/lib/src/types/variant.rs @@ -12,7 +12,7 @@ use std::{ {i16, i32, i64, i8, u16, u32, u64, u8}, }; -use crate::{ +use crate::types::{ array::*, byte_string::ByteString, date_time::DateTime, diff --git a/tools/schema/nodeset.js b/tools/schema/nodeset.js index 5087d887a..67c91d6ae 100644 --- a/tools/schema/nodeset.js +++ b/tools/schema/nodeset.js @@ -95,8 +95,6 @@ function generate_node_set_files(xml_name, rs_name, part_nr, nodes, alias_map, c let module_name = part_nr > 0 ? `${rs_name}_${part_nr}` : `${rs_name}`; let file_name = `${module_name}.rs`; - let opcua_server_crate = config.opcua_server_crate ? "crate::server" : "crate"; - let contents = ""; if (config.copyright) { contents = `// OPCUA for Rust @@ -113,9 +111,12 @@ function generate_node_set_files(xml_name, rs_name, part_nr, nodes, alias_map, c use std::{convert::TryFrom, str::FromStr}; #[allow(unused_imports)] -use ${opcua_server_crate}::{ - 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, + }, }; `;