feat(improve): stabilise UI & communication

Signed-off-by: Martichou <[email protected]>
Martichou · Feb 28, 2024 · 7120162 · 7120162
1 parent acbb5aa
commit 7120162
Show file tree

Hide file tree

Showing 7 changed files with 376 additions and 261 deletions.
diff --git a/core_lib/bindings/State.ts b/core_lib/bindings/State.ts
@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type State = "Initial" | "ReceivedConnectionRequest" | "SentUkeyServerInit" | "SentUkeyClientInit" | "SentUkeyClientFinish" | "SentPairedKeyEncryption" | "ReceivedUkeyClientFinish" | "SentConnectionResponse" | "SentPairedKeyResult" | "SentIntroduction" | "ReceivedPairedKeyResult" | "WaitingForUserConsent" | "ReceivingFiles" | "SendingFiles" | "Disconnected" | "Finished";
+export type State = "Initial" | "ReceivedConnectionRequest" | "SentUkeyServerInit" | "SentUkeyClientInit" | "SentUkeyClientFinish" | "SentPairedKeyEncryption" | "ReceivedUkeyClientFinish" | "SentConnectionResponse" | "SentPairedKeyResult" | "SentIntroduction" | "ReceivedPairedKeyResult" | "WaitingForUserConsent" | "ReceivingFiles" | "SendingFiles" | "Disconnected" | "Cancelled" | "Finished";
diff --git a/core_lib/src/hdl/inbound.rs b/core_lib/src/hdl/inbound.rs
@@ -96,7 +96,14 @@ impl InboundRequest {
                                 )).await?;
                             },
                             Some(ChannelAction::CancelTransfer) => {
-                                todo!()
+                                self.update_state(
+                                    |e| {
+                                        e.state = State::Cancelled;
+                                    },
+                                    true,
+                                );
+                                self.disconnection().await?;
+                                return Err(anyhow!(crate::errors::AppError::NotAnError));
                             },
                             None => {
                                 trace!("inbound: nothing to do")
@@ -634,7 +641,14 @@ impl InboundRequest {
 
         if v1_frame.r#type() == sharing_nearby::v1_frame::FrameType::Cancel {
             info!("Transfer canceled");
-            return self.disconnection().await;
+            self.update_state(
+                |e| {
+                    e.state = State::Disconnected;
+                },
+                true,
+            );
+            self.disconnection().await?;
+            return Err(anyhow!(crate::errors::AppError::NotAnError));
         }
 
         match self.state.state {

diff --git a/core_lib/src/hdl/mod.rs b/core_lib/src/hdl/mod.rs
@@ -38,6 +38,7 @@ pub enum State {
     ReceivingFiles,
     SendingFiles,
     Disconnected,
+    Cancelled,
     Finished,
 }
 

diff --git a/core_lib/src/hdl/outbound.rs b/core_lib/src/hdl/outbound.rs
@@ -121,10 +121,17 @@ impl OutboundRequest {
                             return Ok(());
                         }
 
-                        debug!("inbound: got: {:?}", channel_msg);
+                        debug!("outbound: got: {:?}", channel_msg);
                         match channel_msg.action {
                             Some(ChannelAction::CancelTransfer) => {
-                                todo!()
+                                self.update_state(
+                                    |e| {
+                                        e.state = State::Cancelled;
+                                    },
+                                    true,
+                                );
+                                self.disconnection().await?;
+                                return Err(anyhow!(crate::errors::AppError::NotAnError));
                             },
                             None => {
                                 trace!("inbound: nothing to do")
@@ -551,7 +558,14 @@ impl OutboundRequest {
 
         if v1_frame.r#type() == sharing_nearby::v1_frame::FrameType::Cancel {
             info!("Transfer canceled");
-            return self.disconnection().await;
+            self.update_state(
+                |e| {
+                    e.state = State::Disconnected;
+                },
+                true,
+            );
+            self.disconnection().await?;
+            return Err(anyhow!(crate::errors::AppError::NotAnError));
         }
 
         match self.state.state {
@@ -750,13 +764,14 @@ impl OutboundRequest {
                         Some(i) => i,
                         None => {
                             info!("All files have been transferred");
-                            self.disconnection().await?;
                             self.update_state(
                                 |e| {
                                     e.state = State::Finished;
                                 },
                                 true,
                             );
+                            self.disconnection().await?;
+                            // Breaking instead of NotAnError to allow peacefull termination
                             break;
                         }
                     };
@@ -892,11 +907,23 @@ impl OutboundRequest {
                     "Cannot process: consent denied: {:?}",
                     v1_frame.connection_response.as_ref().unwrap().status()
                 );
+                self.update_state(
+                    |e| {
+                        e.state = State::Disconnected;
+                    },
+                    true,
+                );
                 self.disconnection().await?;
                 return Err(anyhow!(crate::errors::AppError::NotAnError));
             }
             sharing_nearby::connection_response_frame::Status::Unknown => {
                 error!("Unknown consent type: aborting");
+                self.update_state(
+                    |e| {
+                        e.state = State::Disconnected;
+                    },
+                    true,
+                );
                 self.disconnection().await?;
                 return Err(anyhow!(crate::errors::AppError::NotAnError));
             }

diff --git a/core_lib/src/manager.rs b/core_lib/src/manager.rs
@@ -152,7 +152,7 @@ impl TcpServer {
                                     break;
                                 }
 
-                                if or.state.state != State::Finished {
+                                if or.state.state != State::Finished && or.state.state != State::Cancelled {
                                     let _ = self.sender.clone().send(ChannelMessage {
                                         id: si.addr,
                                         direction: ChannelDirection::LibToFront,