Merge pull request #107 from Woody4618/error-handling

Error handling

src/api/client.rs

@@ -5,6 +5,7 @@ use reqwest::{Client, Response};
 use serde_json::json;
 use solana_client::rpc_client::RpcClient;
 use solana_sdk::pubkey::Pubkey;
+use std::sync::atomic::{Ordering};
 use std::thread;
 use std::time::{Duration, Instant};
 
@@ -13,6 +14,7 @@ use crate::api::models::{
     VerifyResponse,
 };
 use crate::solana_program::get_program_pda;
+use crate::SIGNAL_RECEIVED;
 use crate::{get_genesis_hash, MAINNET_GENESIS_HASH};
 
 // URL for the remote server
@@ -27,8 +29,16 @@ fn loading_animation(receiver: Receiver<bool>) {
 
     let pb = ProgressBar::new_spinner();
     pb.set_style(spinner_style);
+    pb.enable_steady_tick(Duration::from_millis(100));
     pb.set_message("Request sent. Awaiting server response. This may take a moment... ⏳");
+
     loop {
+        // Check if interrupt signal was received
+        if SIGNAL_RECEIVED.load(Ordering::Relaxed) {
+            pb.finish_with_message("❌ Operation interrupted by user.");
+            break;
+        }
+
         match receiver.try_recv() {
             Ok(result) => {
                 if result {
@@ -42,13 +52,16 @@ fn loading_animation(receiver: Receiver<bool>) {
                 }
                 break;
             }
-
             Err(_) => {
-                pb.inc(1);
-                thread::sleep(Duration::from_millis(100));
+                if SIGNAL_RECEIVED.load(Ordering::Relaxed) {
+                    pb.finish_with_message("❌ Operation interrupted by user.");
+                    break;
+                }
+                thread::sleep(Duration::from_millis(10));
             }
         }
     }
+    pb.abandon(); // Ensure the progress bar is cleaned up
 }
 
 fn print_verification_status(
@@ -163,16 +176,28 @@ pub async fn handle_submission_response(
         let request_id = status_response.request_id;
         println!("Verification request sent with request id: {}", request_id);
         println!("Verification in progress... ⏳");
+
         // Span new thread for polling the server for status
         // Create a channel for communication between threads
         let (sender, receiver) = unbounded();
-
         let handle = thread::spawn(move || loading_animation(receiver));
-        // Poll the server for status
+
         loop {
+            // Check for interrupt signal before polling
+            if SIGNAL_RECEIVED.load(Ordering::Relaxed) {
+                let _ = sender.send(false);
+                handle.join().unwrap();
+                break; // Exit the loop and continue with normal error handling
+            }
+
             let status = check_job_status(&client, &request_id).await?;
             match status.status {
                 JobStatus::InProgress => {
+                    if SIGNAL_RECEIVED.load(Ordering::Relaxed) {
+                        let _ = sender.send(false);
+                        handle.join().unwrap();
+                        break;
+                    }
                     thread::sleep(Duration::from_secs(10));
                 }
                 JobStatus::Completed => {
@@ -197,7 +222,6 @@ pub async fn handle_submission_response(
                 }
                 JobStatus::Failed => {
                     let _ = sender.send(false);
-
                     handle.join().unwrap();
                     let status_response: JobVerificationResponse = status.respose.unwrap();
                     println!("Program {} has not been verified. ❌", program_id);