From 6ea0d8676b686bb40ba920e82528a7fd868b0e58 Mon Sep 17 00:00:00 2001
From: Makosai <kristopher.ali.dev@gmail.com>
Date: Sun, 29 Dec 2024 14:41:37 -0500
Subject: [PATCH] Improve error handling for joining a cluster server. Create a
 function for stopping the server.

---
 rust/client/src/lib.rs | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/rust/client/src/lib.rs b/rust/client/src/lib.rs
index a724661..5ab7523 100644
--- a/rust/client/src/lib.rs
+++ b/rust/client/src/lib.rs
@@ -160,7 +160,6 @@ pub async fn start() {
                                     success(format!("Received {amount} Cluster servers from the {connection_type}.").as_str());
                                     println!("{:?}", *cluster_servers);
                                 }
-                                join_cluster(0).await;
                             }
                         },
                         _ => (),
@@ -266,11 +265,24 @@ pub async fn send_data(data: Box<[u8]>) {
 }
 
 pub async fn join_cluster(id: usize) {
+    if id < (0 as usize) {
+        error("Failed to join a cluster. The cluster ID is invalid (less than 0).");
+        return;
+    }
+
     let cluster_servers = CLUSTER_SERVERS.read().await;
     if cluster_servers.is_empty() {
         error("Failed to join a cluster. No cluster servers are available.");
         return;
     }
+
+    if id >= cluster_servers.len() {
+        error(
+            "Failed to join a cluster. The cluster ID is invalid (greater than the amount of clusters)."
+        );
+        return;
+    }
+
     let cluster = (
         match cluster_servers.get(id) {
             Some(cluster) => cluster,
@@ -293,18 +305,22 @@ pub async fn join_cluster(id: usize) {
     {
         // Overwrite the current connection with the cluster connection.
         *CONNECTION.write().await = Some(connection);
-        let tx = SENDER.lock().await;
-        let tx = match tx.as_ref() {
-            Some(tx) => tx,
-            None => {
-                error("Failed to send data to the Server. The Sender is not set.");
-                return;
-            }
-        };
-        tx.send(Box::new([])).await.expect("Failed to shutdown.");
+        stop().await;
     }
 }
 
+async fn stop() {
+    let tx = SENDER.lock().await;
+    let tx = match tx.as_ref() {
+        Some(tx) => tx,
+        None => {
+            error("Failed to send data to the Server. The Sender is not set.");
+            return;
+        }
+    };
+    tx.send(Box::new([])).await.expect("Failed to shutdown.");
+}
+
 // region: Logging
 // fn debug(message: &str) {
 //     if !constants::DEBUGGING {