Merge branch '0.1.6'

MyJetTools · Sep 4, 2022 · e5e1d1b · e5e1d1b
2 parents 789a9a3 + 15de781
commit e5e1d1b
Show file tree

Hide file tree

Showing 32 changed files with 590 additions and 1,198 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,14 +1,15 @@
 [package]
 name = "my-service-bus-tcp-client"
-version = "0.1.0"
+version = "0.1.6"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-my-service-bus-shared = { branch = "main", git = "https://github.com/MyJetTools/my-service-bus-shared.git" }
-my-service-bus-tcp-shared = { branch = "main", git = "https://github.com/MyJetTools/my-service-bus-tcp-shared.git" }
-rust-extensions = { branch = "main", git = "https://github.com/MyJetTools/rust-extensions.git" }
+my-service-bus-shared = { tag = "0.2.4", git = "https://github.com/MyJetTools/my-service-bus-shared.git" }
+my-service-bus-tcp-shared = { tag = "0.2.6", git = "https://github.com/MyJetTools/my-service-bus-tcp-shared.git" }
+my-tcp-sockets = { tag = "0.1.6", git = "https://github.com/MyJetTools/my-tcp-sockets.git" }
+rust-extensions = { tag = "0.1.2", git = "https://github.com/MyJetTools/rust-extensions.git" }
 
 tokio = { version = "*", features = ["full"] }
 tokio-util = "*"

diff --git a/src/date_utils.rs b/src/date_utils.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,10 +1,6 @@
-mod date_utils;
-mod logger;
-mod my_sb_client;
 mod publishers;
 pub mod subscribers;
 mod tcp;
 
-pub use logger::MySbLogger;
-pub use my_sb_client::MyServiceBusClient;
-pub use publishers::{MySbPublisherData, MySbPublishers};
+pub use publishers::{MySbPublisherData, MySbPublishers, PublishError};
+pub use tcp::{MessageToPublish, MyServiceBusClient};
diff --git a/src/logger/log_event.rs b/src/logger/log_event.rs
diff --git a/src/logger/logger.rs b/src/logger/logger.rs
diff --git a/src/logger/logger_reader.rs b/src/logger/logger_reader.rs
diff --git a/src/logger/mod.rs b/src/logger/mod.rs
diff --git a/src/my_sb_client.rs b/src/my_sb_client.rs
diff --git a/src/publishers/my_sb_publisher.rs b/src/publishers/my_sb_publisher.rs
@@ -1,9 +1,12 @@
 use std::sync::Arc;
 
+use my_service_bus_tcp_shared::{MySbTcpSerializer, TcpContract};
+use my_tcp_sockets::{tcp_connection::SocketConnection, ConnectionId};
 use tokio::sync::Mutex;
 
+use crate::tcp::MessageToPublish;
+
 use super::{MySbPublisherData, PublishError, PublishProcessByConnection};
-use crate::tcp::SocketConnection;
 use rust_extensions::TaskCompletionAwaiter;
 
 pub struct MySbPublishers {
@@ -17,12 +20,16 @@ impl MySbPublishers {
             data: Mutex::new(data),
         }
     }
-    pub async fn publish(&self, topic_id: &str, payload: Vec<u8>) -> Result<(), PublishError> {
+    pub async fn publish(
+        &self,
+        topic_id: &str,
+        message: MessageToPublish,
+    ) -> Result<(), PublishError> {
         let awaiter: TaskCompletionAwaiter<(), PublishError>;
         {
             let mut write_access = self.data.lock().await;
             awaiter = write_access
-                .publish_to_socket(topic_id, vec![payload])
+                .publish_to_socket(topic_id, vec![message])
                 .await?;
         }
         awaiter.get_result().await?;
@@ -33,24 +40,24 @@ impl MySbPublishers {
     pub async fn publish_chunk(
         &self,
         topic_id: &str,
-        payload: Vec<Vec<u8>>,
+        messages: Vec<MessageToPublish>,
     ) -> Result<(), PublishError> {
         let awaiter: TaskCompletionAwaiter<(), PublishError>;
         {
             let mut write_access = self.data.lock().await;
-            awaiter = write_access.publish_to_socket(topic_id, payload).await?;
+            awaiter = write_access.publish_to_socket(topic_id, messages).await?;
         }
         awaiter.get_result().await?;
 
         return Ok(());
     }
 
-    pub async fn publish_confirmed(&self, connection_id: i64, request_id: i64) {
+    pub async fn publish_confirmed(&self, connection_id: ConnectionId, request_id: i64) {
         let mut write_access = self.data.lock().await;
         write_access.confirm(connection_id, request_id).await;
     }
 
-    pub async fn new_connection(&self, ctx: Arc<SocketConnection>) {
+    pub async fn new_connection(&self, ctx: Arc<SocketConnection<TcpContract, MySbTcpSerializer>>) {
         let mut write_access = self.data.lock().await;
 
         if let Some(current_connection) = &write_access.connection {
@@ -61,7 +68,7 @@ impl MySbPublishers {
         write_access.connection = Some(PublishProcessByConnection::new(ctx));
     }
 
-    pub async fn disconnect(&self, connection_id: i64) {
+    pub async fn disconnect(&self, connection_id: ConnectionId) {
         let mut write_access = self.data.lock().await;
 
         if let Some(current_connection) = &write_access.connection {