Add files via upload

Author: MatrixUser

src/client.rs

@@ -204,7 +204,7 @@ impl Client {
         debug_assert!(peer == interface.get_id());
         interface.update_direct(None);
         interface.update_received(false);
-        match Self::_start(peer, key, token, conn_type, interface.clone()).await {
+        match Self::_start(peer, key, token, conn_type, interface).await {
             Err(err) => {
                 let err_str = err.to_string();
                 if err_str.starts_with("Failed") {
@@ -213,19 +213,7 @@ impl Client {
                     return Err(err);
                 }
             }
-            Ok(x) => {
-                // Set x.2 to true only in the connect() function to indicate that direct_failures needs to be updated; everywhere else it should be set to false.
-                if x.2 {
-                    let direct_failures = interface.get_lch().read().unwrap().direct_failures;
-                    let direct = x.0 .1;
-                    if !interface.is_force_relay() && (direct_failures == 0) != direct {
-                        let n = if direct { 0 } else { 1 };
-                        log::info!("direct_failures updated to {}", n);
-                        interface.get_lch().write().unwrap().set_direct_failure(n);
-                    }
-                }
-                Ok((x.0, x.1))
-            }
+            Ok(x) => Ok(x),
         }
     }
 
@@ -245,7 +233,6 @@ impl Client {
             &'static str,
         ),
         (i32, String),
-        bool,
     )> {
         if config::is_incoming_only() {
             bail!("Incoming only mode");
@@ -262,7 +249,6 @@ impl Client {
                     "TCP",
                 ),
                 (0, "".to_owned()),
-                false,
             ));
         }
         // Allow connect to {domain}:{port}
@@ -276,7 +262,6 @@ impl Client {
                     "TCP",
                 ),
                 (0, "".to_owned()),
-                false,
             ));
         }
 
@@ -358,7 +343,7 @@ impl Client {
         );
         connect_futures.push(fut.boxed());
         match select_ok(connect_futures).await {
-            Ok(conn) => Ok((conn.0 .0, conn.0 .1, conn.0 .2)),
+            Ok(conn) => Ok((conn.0 .0, conn.0 .1)),
             Err(e) => Err(e),
         }
     }
@@ -383,7 +368,6 @@ impl Client {
             &'static str,
         ),
         (i32, String),
-        bool,
     )> {
         let mut start = Instant::now();
         let mut socket = connect_tcp(&*rendezvous_server, CONNECT_TIMEOUT).await;
@@ -557,7 +541,7 @@ impl Client {
                         connect_futures.push(
                             async move {
                                 let conn = fut.await?;
-                                Ok((conn, None, if use_ws() { "WebSocket" } else { "Relay" }))
+                                Ok((conn, None, "Relay"))
                             }
                             .boxed(),
                         );
@@ -572,11 +556,7 @@ impl Client {
                         log::info!("{:?} used to establish {typ} connection", start.elapsed());
                         let pk =
                             Self::secure_connection(&peer, signed_id_pk, &key, &mut conn).await?;
-                        return Ok((
-                            (conn, typ == "IPv6", pk, kcp, typ),
-                            (feedback, rendezvous_server),
-                            false,
-                        ));
+                        return Ok(((conn, false, pk, kcp, typ), (feedback, rendezvous_server)));
                     }
                     _ => {
                         log::error!("Unexpected protobuf msg received: {:?}", msg_in);
@@ -622,7 +602,6 @@ impl Client {
             )
             .await?,
             (feedback, rendezvous_server),
-            true,
         ))
     }
 
@@ -709,6 +688,7 @@ impl Client {
         };
 
         let mut direct = !conn.is_err();
+        interface.update_direct(Some(direct));
         if interface.is_force_relay() || conn.is_err() {
             if !relay_server.is_empty() {
                 conn = Self::request_relay(
@@ -721,9 +701,8 @@ impl Client {
                     conn_type,
                 )
                 .await;
+                interface.update_direct(Some(false));
                 if let Err(e) = conn {
-                    // this direct is mainly used by on_establish_connection_error, so we update it here before bail
-                    interface.update_direct(Some(false));
                     bail!("Failed to connect via relay server: {}", e);
                 }
                 typ = "Relay";
@@ -732,22 +711,19 @@ impl Client {
                 bail!("Failed to make direct connection to remote desktop");
             }
         }
+        if !relay_server.is_empty() && (direct_failures == 0) != direct {
+            let n = if direct { 0 } else { 1 };
+            log::info!("direct_failures updated to {}", n);
+            interface.get_lch().write().unwrap().set_direct_failure(n);
+        }
         let mut conn = conn?;
         log::info!(
             "{:?} used to establish {typ} connection with {} punch",
             start.elapsed(),
             punch_type
         );
-        let res = Self::secure_connection(peer_id, signed_id_pk, key, &mut conn).await;
-        let pk: Option<Vec<u8>> = match res {
-            Ok(pk) => pk,
-            Err(e) => {
-                // this direct is mainly used by on_establish_connection_error, so we update it here before bail
-                interface.update_direct(Some(direct));
-                bail!(e);
-            }
-        };
-        log::debug!("{} punch secure_connection ok", punch_type);
+        let pk = Self::secure_connection(peer_id, signed_id_pk, key, &mut conn).await?;
+        log::info!("{} punch secure_connection ok", punch_type);
         Ok((conn, direct, pk, kcp, typ))
     }
 
@@ -2027,7 +2003,7 @@ impl LoginConfigHandler {
     ///
     // It's Ok to check the option empty in this function.
     // `toggle_option()` is only called in a session.
-    // Custom client advanced settings will not effect this function.
+    // Custom client advanced settings will not affact this function.
     pub fn toggle_option(&mut self, name: String) -> Option<Message> {
         let mut option = OptionMessage::default();
         let mut config = self.load_config();
@@ -2132,19 +2108,7 @@ impl LoginConfigHandler {
                 option.show_remote_cursor = f(self.get_toggle_option("show-remote-cursor"));
                 option.enable_file_transfer = f(self.config.enable_file_copy_paste.v);
                 option.lock_after_session_end = f(self.config.lock_after_session_end.v);
-                if config.show_my_cursor.v {
-                    config.show_my_cursor.v = false;
-                    option.show_my_cursor = BoolOption::No.into();
-                }
-            }
-        } else if name == "show-my-cursor" {
-            config.show_my_cursor.v = !config.show_my_cursor.v;
-            option.show_my_cursor = if config.show_my_cursor.v {
-                BoolOption::Yes
-            } else {
-                BoolOption::No
             }
-            .into();
         } else {
             let is_set = self
                 .options
@@ -2237,9 +2201,6 @@ impl LoginConfigHandler {
         if view_only || self.get_toggle_option("show-remote-cursor") {
             msg.show_remote_cursor = BoolOption::Yes.into();
         }
-        if view_only && self.get_toggle_option("show-my-cursor") {
-            msg.show_my_cursor = BoolOption::Yes.into();
-        }
         if self.get_toggle_option("follow-remote-cursor") {
             msg.follow_remote_cursor = BoolOption::Yes.into();
         }
@@ -2302,7 +2263,7 @@ impl LoginConfigHandler {
     ///
     // It's Ok to check the option empty in this function.
     // `get_toggle_option()` is only called in a session.
-    // Custom client advanced settings will not effect this function.
+    // Custom client advanced settings will not affact this function.
     pub fn get_toggle_option(&self, name: &str) -> bool {
         if name == "show-remote-cursor" {
             self.config.show_remote_cursor.v
@@ -2324,8 +2285,6 @@ impl LoginConfigHandler {
             self.config.allow_swap_key.v
         } else if name == "view-only" {
             self.config.view_only.v
-        } else if name == "show-my-cursor" {
-            self.config.show_my_cursor.v
         } else if name == "follow-remote-cursor" {
             self.config.follow_remote_cursor.v
         } else if name == "follow-remote-window" {
@@ -3829,11 +3788,7 @@ pub fn check_if_retry(msgtype: &str, title: &str, text: &str, retry_for_relay: b
         && ((text.contains("10054") || text.contains("104")) && retry_for_relay
             || (!text.to_lowercase().contains("offline")
                 && !text.to_lowercase().contains("not exist")
-                && (!text.to_lowercase().contains("handshake")
-                    // https://github.com/snapview/tungstenite-rs/blob/e7e060a89a72cb08e31c25a6c7284dc1bd982e23/src/error.rs#L248
-                    || text
-                        .to_lowercase()
-                        .contains("connection reset without closing handshake") && use_ws())
+                && !text.to_lowercase().contains("handshake")
                 && !text.to_lowercase().contains("failed")
                 && !text.to_lowercase().contains("resolve")
                 && !text.to_lowercase().contains("mismatch")