rust-extensions:0.1.5

MyJetTools · Nov 19, 2024 · ad35369 · ad35369
1 parent 657e603
commit ad35369
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 39 deletions.
diff --git a/my-no-sql-abstractions/Cargo.toml b/my-no-sql-abstractions/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "my-no-sql-abstractions"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/my-no-sql-core/Cargo.toml b/my-no-sql-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "my-no-sql-core"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 
 [features]
@@ -13,8 +13,8 @@ debug_db_row = []
 
 [dependencies]
 my-no-sql-abstractions = { path = "../my-no-sql-abstractions" }
-my-json = { tag = "0.3.0", git = "https://github.com/MyJetTools/my-json.git" }
-rust-extensions = { tag = "0.1.4", git = "https://github.com/MyJetTools/rust-extensions.git" }
+my-json = { tag = "0.3.1", git = "https://github.com/MyJetTools/my-json.git" }
+rust-extensions = { tag = "0.1.5", git = "https://github.com/MyJetTools/rust-extensions.git" }
 tokio = { version = "*", features = ["full"] }
 serde_json = { version = "*" }
 serde = { version = "*", features = ["derive"] }
diff --git a/my-no-sql-data-writer/Cargo.toml b/my-no-sql-data-writer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "my-no-sql-data-writer"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -12,14 +12,14 @@ with-ssh = ["flurl/with-ssh"]
 
 [dependencies]
 my-no-sql-abstractions = { path = "../my-no-sql-abstractions" }
-my-logger = { tag = "1.1.0", git = "https://github.com/MyJetTools/my-logger.git" }
+my-logger = { tag = "1.2.1", git = "https://github.com/MyJetTools/my-logger.git" }
 
-rust-extensions = { tag = "0.1.4", git = "https://github.com/MyJetTools/rust-extensions.git", features = [
+rust-extensions = { tag = "0.1.5", git = "https://github.com/MyJetTools/rust-extensions.git", features = [
     "with-tokio",
 ] }
-flurl = { tag = "0.6.0", git = "https://github.com/MyJetTools/fl-url" }
+flurl = { tag = "0.6.1", git = "https://github.com/MyJetTools/fl-url" }
 
-my-json = { tag = "0.3.0", git = "https://github.com/MyJetTools/my-json.git" }
+my-json = { tag = "0.3.1", git = "https://github.com/MyJetTools/my-json.git" }
 
 tokio = { version = "*", features = ["full"] }
 tokio-util = "*"

diff --git a/my-no-sql-macros/Cargo.toml b/my-no-sql-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "my-no-sql-macros"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,7 +9,7 @@ edition = "2021"
 proc-macro = true
 
 [dependencies]
-types-reader = { tag = "0.5.0", git = "https://github.com/MyJetTools/types-reader.git" }
+types-reader = { tag = "0.5.1", git = "https://github.com/MyJetTools/types-reader.git" }
 
 
 syn = { version = "*", features = ["extra-traits"] }

diff --git a/my-no-sql-sdk/Cargo.toml b/my-no-sql-sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "my-no-sql-sdk"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -25,5 +25,5 @@ my-no-sql-macros = { optional = true, path = "../my-no-sql-macros" }
 my-no-sql-tcp-reader = { optional = true, path = "../my-no-sql-tcp-reader" }
 my-no-sql-tcp-shared = { optional = true, path = "../my-no-sql-tcp-shared" }
 
-rust-extensions = { optional = true, tag = "0.1.4", git = "https://github.com/MyJetTools/rust-extensions.git" }
+rust-extensions = { optional = true, tag = "0.1.5", git = "https://github.com/MyJetTools/rust-extensions.git" }
 # my_no_sql::macros::my_no_sql_entity
diff --git a/my-no-sql-tcp-reader/Cargo.toml b/my-no-sql-tcp-reader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "my-no-sql-tcp-reader"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -13,10 +13,10 @@ my-no-sql-tcp-shared = { path = "../my-no-sql-tcp-shared" }
 my-no-sql-abstractions = { path = "../my-no-sql-abstractions" }
 my-no-sql-core = { path = "../my-no-sql-core" }
 
-rust-extensions = { tag = "0.1.4", git = "https://github.com/MyJetTools/rust-extensions.git" }
-my-tcp-sockets = { tag = "0.1.9", git = "https://github.com/MyJetTools/my-tcp-sockets.git" }
-my-logger = { tag = "1.1.0", git = "https://github.com/MyJetTools/my-logger.git" }
-my-json = { tag = "0.3.0", git = "https://github.com/MyJetTools/my-json.git" }
+rust-extensions = { tag = "0.1.5", git = "https://github.com/MyJetTools/rust-extensions.git" }
+my-tcp-sockets = { tag = "0.1.11", git = "https://github.com/MyJetTools/my-tcp-sockets.git" }
+my-logger = { tag = "1.2.1", git = "https://github.com/MyJetTools/my-logger.git" }
+my-json = { tag = "0.3.1", git = "https://github.com/MyJetTools/my-json.git" }
 
 tokio = { version = "*", features = ["full"] }
 tokio-util = "*"

diff --git a/my-no-sql-tcp-reader/src/my_no_sql_tcp_connection.rs b/my-no-sql-tcp-reader/src/my_no_sql_tcp_connection.rs
@@ -2,7 +2,7 @@ use std::{sync::Arc, time::Duration};
 
 use my_no_sql_abstractions::{MyNoSqlEntity, MyNoSqlEntitySerializer};
 use my_no_sql_tcp_shared::{sync_to_main::SyncToMainNodeHandler, MyNoSqlTcpSerializerFactory};
-use my_tcp_sockets::TcpClient;
+use my_tcp_sockets::{TcpClient, TlsSettings};
 use rust_extensions::{AppStates, StrOrString};
 
 use crate::{
@@ -18,6 +18,10 @@ impl my_tcp_sockets::TcpClientSocketSettings for TcpConnectionSettings {
     async fn get_host_port(&self) -> Option<String> {
         self.settings.get_host_port().await.into()
     }
+
+    async fn get_tls_settings(&self) -> Option<TlsSettings> {
+        None
+    }
 }
 
 pub struct MyNoSqlTcpConnection {

diff --git a/my-no-sql-tcp-reader/src/tcp_events.rs b/my-no-sql-tcp-reader/src/tcp_events.rs
@@ -3,7 +3,9 @@ use std::sync::Arc;
 use my_no_sql_tcp_shared::{
     sync_to_main::SyncToMainNodeHandler, MyNoSqlReaderTcpSerializer, MyNoSqlTcpContract,
 };
-use my_tcp_sockets::{tcp_connection::TcpSocketConnection, SocketEventCallback};
+use my_tcp_sockets::{
+    tcp_connection::TcpSocketConnection, SocketEventCallback, TcpSerializerState,
+};
 
 use crate::subscribers::Subscribers;
 
@@ -22,12 +24,6 @@ impl TcpEvents {
             sync_handler,
         }
     }
-    pub async fn handle_incoming_packet(
-        &self,
-        _tcp_contract: MyNoSqlTcpContract,
-        _connection: Arc<TcpConnection>,
-    ) {
-    }
 }
 
 #[async_trait::async_trait]

diff --git a/my-no-sql-tcp-shared/Cargo.toml b/my-no-sql-tcp-shared/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "my-no-sql-tcp-shared"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-my-tcp-sockets = { tag = "0.1.9", git = "https://github.com/MyJetTools/my-tcp-sockets.git" }
-rust-extensions = { tag = "0.1.4", git = "https://github.com/MyJetTools/rust-extensions.git" }
+my-tcp-sockets = { tag = "0.1.11", git = "https://github.com/MyJetTools/my-tcp-sockets.git" }
+rust-extensions = { tag = "0.1.5", git = "https://github.com/MyJetTools/rust-extensions.git" }
 
 tokio = { version = "*", features = ["full"] }
 tokio-util = "*"

diff --git a/my-no-sql-tcp-shared/src/tcp_contracts.rs b/my-no-sql-tcp-shared/src/tcp_contracts.rs
@@ -1,6 +1,6 @@
 use my_tcp_sockets::{
     socket_reader::{ReadingTcpContractFail, SocketReader, SocketReaderInMem},
-    TcpWriteBuffer,
+    TcpSerializerState, TcpWriteBuffer,
 };
 use rust_extensions::date_time::DateTimeAsMicroseconds;
 
@@ -496,3 +496,11 @@ impl my_tcp_sockets::TcpContract for MyNoSqlTcpContract {
         }
     }
 }
+
+impl TcpSerializerState<MyNoSqlTcpContract> for () {
+    fn is_tcp_contract_related_to_metadata(&self, contract: &MyNoSqlTcpContract) -> bool {
+        false
+    }
+
+    fn apply_tcp_contract(&mut self, contract: &MyNoSqlTcpContract) {}
+}
diff --git a/my-no-sql-tcp-shared/src/tcp_serializer.rs b/my-no-sql-tcp-shared/src/tcp_serializer.rs
@@ -1,6 +1,6 @@
 use my_tcp_sockets::{
     socket_reader::{ReadingTcpContractFail, SocketReader},
-    TcpSerializerFactory, TcpSerializerState, TcpSocketSerializer, TcpWriteBuffer,
+    TcpSerializerFactory, TcpSocketSerializer, TcpWriteBuffer,
 };
 
 use crate::MyNoSqlTcpContract;
@@ -38,13 +38,6 @@ impl TcpSocketSerializer<MyNoSqlTcpContract, ()> for MyNoSqlReaderTcpSerializer
     }
 }
 
-impl TcpSerializerState<MyNoSqlTcpContract> for () {
-    fn is_tcp_contract_related_to_metadata(&self, _: &MyNoSqlTcpContract) -> bool {
-        false
-    }
-    fn apply_tcp_contract(&mut self, _: &MyNoSqlTcpContract) {}
-}
-
 pub struct MyNoSqlTcpSerializerFactory;
 
 #[async_trait::async_trait]

diff --git a/my-no-sql-tests/Cargo.toml b/my-no-sql-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "my-no-sql-tests"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html