add reconnect and forware remove all

cocool97 · Nov 13, 2024 · 4268383 · 4268383
1 parent 95f925d
commit 4268383
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 15 deletions.
diff --git a/adb_client/src/models/adb_server_command.rs b/adb_client/src/models/adb_server_command.rs
@@ -23,10 +23,12 @@ pub(crate) enum AdbServerCommand {
     Sync,
     Reboot(RebootType),
     Forward(String, String, String),
+    ForwardRemoveAll,
     Reverse(String, String),
     MDNSCheck,
     MDNSServices,
     ServerStatus,
+    Reconnect,
     ReconnectOffline,
     TcpIP(u16),
     USB,
@@ -61,30 +63,22 @@ impl Display for AdbServerCommand {
                 write!(f, "host:pair:{code}:{addr}")
             }
             AdbServerCommand::FrameBuffer => write!(f, "framebuffer:"),
+            AdbServerCommand::ForwardRemoveAll => write!(f, "host:killforward-all"),
             AdbServerCommand::Forward(serial, remote, local) => {
                 write!(f, "host-serial:{serial}:forward:{local};{remote}")
             }
             AdbServerCommand::Reverse(remote, local) => {
                 write!(f, "reverse:forward:{remote};{local}")
             }
-            AdbServerCommand::MDNSCheck => {
-                write!(f, "host:mdns:check")
-            }
-            AdbServerCommand::MDNSServices => {
-                write!(f, "host:mdns:services")
-            }
-            AdbServerCommand::ServerStatus => {
-                write!(f, "host:server-status")
-            }
-            AdbServerCommand::ReconnectOffline => {
-                write!(f, "host:reconnect-offline")
-            }
+            AdbServerCommand::MDNSCheck => write!(f, "host:mdns:check"),
+            AdbServerCommand::MDNSServices => write!(f, "host:mdns:services"),
+            AdbServerCommand::ServerStatus => write!(f, "host:server-status"),
+            AdbServerCommand::Reconnect => write!(f, "reconnect"),
+            AdbServerCommand::ReconnectOffline => write!(f, "host:reconnect-offline"),
             AdbServerCommand::TcpIP(port) => {
                 write!(f, "tcpip:{port}")
             }
-            AdbServerCommand::USB => {
-                write!(f, "usb:")
-            }
+            AdbServerCommand::USB => write!(f, "usb:"),
         }
     }
 }

diff --git a/adb_client/src/server/device_commands/forward.rs b/adb_client/src/server/device_commands/forward.rs
@@ -11,4 +11,15 @@ impl ADBServerDevice {
             .proxy_connection(AdbServerCommand::Forward(serial, remote, local), false)
             .map(|_| ())
     }
+
+    /// remove all forward rules
+    pub fn forward_remove_all(&mut self) -> Result<()> {
+        let serial = self.identifier.clone();
+        self.connect()?
+            .send_adb_request(AdbServerCommand::TransportSerial(serial.clone()))?;
+
+        self.get_transport_mut()
+            .proxy_connection(AdbServerCommand::ForwardRemoveAll, false)
+            .map(|_| ())
+    }
 }
diff --git a/adb_client/src/server/device_commands/mod.rs b/adb_client/src/server/device_commands/mod.rs
@@ -11,3 +11,4 @@ mod stat;
 mod transport;
 mod tcpip;
 mod usb;
+mod reconnect;
diff --git a/adb_client/src/server/device_commands/reconnect.rs b/adb_client/src/server/device_commands/reconnect.rs
@@ -0,0 +1,17 @@
+use crate::{
+    models::AdbServerCommand,
+    ADBServerDevice, Result,
+};
+
+impl ADBServerDevice {
+    /// reconnect device
+    pub fn reconnect(&mut self) -> Result<()> {
+        let serial = self.identifier.clone();
+        self.connect()?
+            .send_adb_request(AdbServerCommand::TransportSerial(serial))?;
+
+        self.get_transport_mut()
+            .proxy_connection(AdbServerCommand::Reconnect, false)
+            .map(|_| ())
+    }
+}