feat: add reboot to ADBDeviceExt

adb_cli/src/commands/local.rs

@@ -19,7 +19,7 @@ pub enum LocalCommand {
     /// Reboot the device
     Reboot {
         #[clap(subcommand)]
-        sub_command: RebootTypeCommand,
+        reboot_type: RebootTypeCommand,
     },
     /// Dump framebuffer of device
     Framebuffer { path: String },

adb_cli/src/commands/usb.rs

@@ -3,6 +3,8 @@ use std::path::PathBuf;
 
 use clap::Parser;
 
+use crate::models::RebootTypeCommand;
+
 fn parse_hex_id(id: &str) -> Result<u16, ParseIntError> {
     u16::from_str_radix(id, 16)
 }
@@ -26,4 +28,9 @@ pub struct UsbCommand {
 pub enum UsbCommands {
     /// Spawn an interactive shell or run a list of commands on the device
     Shell { commands: Vec<String> },
+    /// Reboot the device
+    Reboot {
+        #[clap(subcommand)]
+        reboot_type: RebootTypeCommand,
+    },
 }

adb_cli/src/main.rs

@@ -74,9 +74,9 @@ fn main() -> Result<()> {
                         .ok_or(anyhow!("cannot list features"))?;
                     log::info!("Available host features: {features}");
                 }
-                LocalCommand::Reboot { sub_command } => {
-                    log::info!("Reboots device");
-                    device.reboot(sub_command.into())?
+                LocalCommand::Reboot { reboot_type } => {
+                    log::info!("Reboots device in mode {:?}", reboot_type);
+                    device.reboot(reboot_type.into())?
                 }
                 LocalCommand::Framebuffer { path } => {
                     device.framebuffer(&path)?;
@@ -181,6 +181,10 @@ fn main() -> Result<()> {
                         device.shell_command(commands, std::io::stdout())?;
                     }
                 }
+                UsbCommands::Reboot { reboot_type } => {
+                    log::info!("Reboots device in mode {:?}", reboot_type);
+                    device.reboot(reboot_type.into())?
+                }
             }
         }
     }

adb_client/src/adb_device_ext.rs

@@ -1,6 +1,6 @@
 use std::io::{Read, Write};
 
-use crate::Result;
+use crate::{RebootType, Result};
 
 /// Trait representing all features available on both [`ADBServerDevice`] and [`ADBUSBDevice`]
 pub trait ADBDeviceExt {
@@ -15,4 +15,7 @@ pub trait ADBDeviceExt {
     /// Input data is read from [reader] and write to [writer].
     /// [W] has a 'static bound as it is internally used in a thread.
     fn shell<R: Read, W: Write + Send + 'static>(&mut self, reader: R, writer: W) -> Result<()>;
+
+    /// Reboots the device using given reboot type
+    fn reboot(&mut self, reboot_type: RebootType) -> Result<()>;
 }

adb_client/src/server/adb_server_device_commands.rs

@@ -105,4 +105,8 @@ impl ADBDeviceExt for ADBServerDevice {
 
         Ok(())
     }
+
+    fn reboot(&mut self, reboot_type: crate::RebootType) -> Result<()> {
+        self.reboot(reboot_type)
+    }
 }

adb_client/src/usb/adb_usb_device_commands.rs

@@ -4,7 +4,7 @@ use rand::Rng;
 
 use crate::{
     usb::{ADBUsbMessage, USBCommand},
-    ADBDeviceExt, ADBUSBDevice, Result, RustADBError,
+    ADBDeviceExt, ADBUSBDevice, RebootType, Result, RustADBError,
 };
 
 use super::USBShellWriter;
@@ -112,4 +112,24 @@ impl ADBDeviceExt for ADBUSBDevice {
 
         Ok(())
     }
+
+    fn reboot(&mut self, reboot_type: RebootType) -> Result<()> {
+        let mut rng = rand::thread_rng();
+
+        let message = ADBUsbMessage::new(
+            USBCommand::Open,
+            rng.gen(), // Our 'local-id'
+            0,
+            format!("reboot:{}\0", reboot_type).as_bytes().to_vec(),
+        );
+        self.transport.write_message(message)?;
+
+        let message = self.transport.read_message()?;
+
+        if message.header().command() != USBCommand::Okay {
+            return Err(RustADBError::ADBShellNotSupported);
+        }
+
+        Ok(())
+    }
 }