fix: windows release build

.github/workflows/rust-build.yml

@@ -18,6 +18,12 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Build project
-      run: cargo build --release --all-features
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Build project
+        run: cargo build --release --all-features

.github/workflows/rust-release.yml

@@ -92,6 +92,11 @@ jobs:
           toolchain: stable
           override: true
 
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
       - name: Build release
         run: cargo build --all-features --release
 

Cargo.toml

@@ -9,7 +9,8 @@ homepage = "https://github.com/cocool97/adb_client"
 keywords = ["adb", "android", "tcp", "usb"]
 license = "MIT"
 repository = "https://github.com/cocool97/adb_client"
-version = "2.1.13"
+version = "2.1.18"
+rust-version = "1.85.1"
 
 # To build locally when working on a new release
 [patch.crates-io]

README.md

@@ -8,6 +8,9 @@
         <a href="https://crates.io/crates/adb_client">
             <img alt="crates.io" src="https://img.shields.io/crates/v/adb_client.svg"/>
         </a>
+        <a href="https://crates.io/crates/adb_client">
+            <img alt="msrv" src="https://img.shields.io/crates/msrv/adb_client"/>
+        </a>
         <a href="https://github.com/cocool97/adb_client/actions">
             <img alt="ci status" src="https://github.com/cocool97/adb_client/actions/workflows/rust-build.yml/badge.svg"/>
         </a>

adb_cli/Cargo.toml

@@ -7,14 +7,15 @@ license.workspace = true
 name = "adb_cli"
 readme = "README.md"
 repository.workspace = true
+rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-adb_client = { version = "^2.0.0" }
-anyhow = { version = "1.0.94" }
-clap = { version = "4.5.23", features = ["derive"] }
-env_logger = { version = "0.11.5" }
-log = { version = "0.4.26" }
+adb_client = { version = "^2.1.17" }
+anyhow = { version = "1.0.100" }
+clap = { version = "4.5.51", features = ["derive"] }
+env_logger = { version = "0.11.8" }
+log = { version = "0.4.28" }
 
 [target.'cfg(unix)'.dependencies]
 termios = { version = "0.3.3" }

adb_cli/README.md

@@ -2,6 +2,7 @@
 
 [![MIT licensed](https://img.shields.io/crates/l/adb_cli.svg)](./LICENSE-MIT)
 ![Crates.io Total Downloads](https://img.shields.io/crates/d/adb_cli)
+![MSRV](https://img.shields.io/crates/msrv/adb_cli)
 
 Rust binary providing an improved version of `adb` CLI.
 
@@ -10,7 +11,7 @@ Rust binary providing an improved version of `adb` CLI.
 This crate provides a lightweight binary based on the `adb_client` crate. You can install it by running the following command :
 
 ```shell
-cargo install adb_cli 
+cargo install adb_cli
 ```
 
 Usage is quite simple, and tends to look like `adb`:
@@ -64,4 +65,4 @@ Options:
   -p, --product-id <PID>                   Hexadecimal product id of this USB device
   -k, --private-key <PATH_TO_PRIVATE_KEY>  Path to a custom private key to use for authentication
   -h, --help                               Print help
-```
+```

adb_cli/src/adb_termios.rs

@@ -13,7 +13,7 @@ pub struct ADBTermios {
 }
 
 impl ADBTermios {
-    pub fn new(fd: impl AsRawFd) -> Result<Self> {
+    pub fn new(fd: &impl AsRawFd) -> Result<Self> {
         let mut new_termios = Termios::from_fd(fd.as_raw_fd())?;
         let old_termios = new_termios; // Saves previous state
         new_termios.c_lflag = 0;
@@ -36,7 +36,7 @@ impl Drop for ADBTermios {
     fn drop(&mut self) {
         // Custom drop implementation, restores previous termios structure.
         if let Err(e) = tcsetattr(self.fd, TCSANOW, &self.old_termios) {
-            log::error!("Error while dropping ADBTermios: {e}")
+            log::error!("Error while dropping ADBTermios: {e}");
         }
     }
 }

adb_cli/src/handlers/host_commands.rs

@@ -8,7 +8,7 @@ pub fn handle_host_commands(server_command: ServerCommand<HostCommand>) -> Resul
     match server_command.command {
         HostCommand::Version => {
             let version = adb_server.version()?;
-            log::info!("Android Debug Bridge version {}", version);
+            log::info!("Android Debug Bridge version {version}");
             log::info!("Package version {}-rust", std::env!("CARGO_PKG_VERSION"));
         }
         HostCommand::Kill => {
@@ -18,18 +18,18 @@ pub fn handle_host_commands(server_command: ServerCommand<HostCommand>) -> Resul
             if long {
                 log::info!("List of devices attached (extended)");
                 for device in adb_server.devices_long()? {
-                    log::info!("{}", device);
+                    log::info!("{device}");
                 }
             } else {
                 log::info!("List of devices attached");
                 for device in adb_server.devices()? {
-                    log::info!("{}", device);
+                    log::info!("{device}");
                 }
             }
         }
         HostCommand::TrackDevices => {
             let callback = |device: DeviceShort| {
-                log::info!("{}", device);
+                log::info!("{device}");
                 Ok(())
             };
             log::info!("Live list of devices attached");
@@ -53,19 +53,22 @@ pub fn handle_host_commands(server_command: ServerCommand<HostCommand>) -> Resul
                 let server_status = adb_server.server_status()?;
                 match server_status.mdns_backend {
                     MDNSBackend::Unknown => log::info!("unknown mdns backend..."),
-                    MDNSBackend::Bonjour => match check {
-                        true => log::info!("mdns daemon version [Bonjour]"),
-                        false => log::info!("ERROR: mdns daemon unavailable"),
-                    },
+                    MDNSBackend::Bonjour => {
+                        if check {
+                            log::info!("mdns daemon version [Bonjour]");
+                        } else {
+                            log::info!("ERROR: mdns daemon unavailable");
+                        }
+                    }
                     MDNSBackend::OpenScreen => {
-                        log::info!("mdns daemon version [Openscreen discovery 0.0.0]")
+                        log::info!("mdns daemon version [Openscreen discovery 0.0.0]");
                     }
                 }
             }
             MdnsCommand::Services => {
                 log::info!("List of discovered mdns services");
                 for service in adb_server.mdns_services()? {
-                    log::info!("{}", service);
+                    log::info!("{service}");
                 }
             }
         },

adb_cli/src/handlers/local_commands.rs

@@ -14,7 +14,7 @@ pub fn handle_local_commands(
             let features = device
                 .host_features()?
                 .iter()
-                .map(|v| v.to_string())
+                .map(ToString::to_string)
                 .reduce(|a, b| format!("{a},{b}"))
                 .ok_or(anyhow!("cannot list features"))?;
             log::info!("Available host features: {features}");

adb_cli/src/main.rs

@@ -79,7 +79,10 @@ fn main() -> Result<()> {
             (device.boxed(), usb_command.commands)
         }
         MainCommand::Tcp(tcp_command) => {
-            let device = ADBTcpDevice::new(tcp_command.address)?;
+            let device = match tcp_command.path_to_private_key {
+                Some(pk) => ADBTcpDevice::new_with_custom_private_key(tcp_command.address, pk)?,
+                None => ADBTcpDevice::new(tcp_command.address)?,
+            };
             (device.boxed(), tcp_command.commands)
         }
         MainCommand::Mdns => {
@@ -94,7 +97,7 @@ fn main() -> Result<()> {
                     "Found device {} with addresses {:?}",
                     device.fullname,
                     device.addresses
-                )
+                );
             }
 
             return Ok(service.shutdown()?);
@@ -108,7 +111,7 @@ fn main() -> Result<()> {
                 // Using a scope here would call drop() too early..
                 #[cfg(any(target_os = "linux", target_os = "macos"))]
                 {
-                    let mut adb_termios = ADBTermios::new(std::io::stdin())?;
+                    let mut adb_termios = ADBTermios::new(&std::io::stdin())?;
                     adb_termios.set_adb_termios()?;
                     device.shell(&mut std::io::stdin(), Box::new(std::io::stdout()))?;
                 }
@@ -118,7 +121,7 @@ fn main() -> Result<()> {
                     device.shell(&mut std::io::stdin(), Box::new(std::io::stdout()))?;
                 }
             } else {
-                let commands: Vec<&str> = commands.iter().map(|v| v.as_str()).collect();
+                let commands: Vec<&str> = commands.iter().map(String::as_str).collect();
                 device.shell_command(&commands, &mut std::io::stdout())?;
             }
         }
@@ -132,11 +135,11 @@ fn main() -> Result<()> {
         }
         DeviceCommands::Stat { path } => {
             let stat_response = device.stat(&path)?;
-            println!("{}", stat_response);
+            println!("{stat_response}");
         }
         DeviceCommands::Reboot { reboot_type } => {
-            log::info!("Reboots device in mode {:?}", reboot_type);
-            device.reboot(reboot_type.into())?
+            log::info!("Reboots device in mode {reboot_type:?}");
+            device.reboot(reboot_type.into())?;
         }
         DeviceCommands::Push { filename, path } => {
             let mut input = File::open(Path::new(&filename))?;
@@ -152,7 +155,7 @@ fn main() -> Result<()> {
             device.install(&path)?;
         }
         DeviceCommands::Uninstall { package } => {
-            log::info!("Uninstalling the package {}...", package);
+            log::info!("Uninstalling the package {package}...");
             device.uninstall(&package)?;
         }
         DeviceCommands::Framebuffer { path } => {

adb_cli/src/models/device.rs

@@ -19,7 +19,7 @@ pub enum DeviceCommands {
         /// The package whose activity is to be invoked
         #[clap(short = 'p', long = "package")]
         package: String,
-        /// The activity to be invoked itself, Usually it is MainActivity
+        /// The activity to be invoked itself, Usually it is `MainActivity`
         #[clap(short = 'a', long = "activity")]
         activity: String,
     },

adb_cli/src/models/tcp.rs

@@ -1,11 +1,15 @@
 use clap::Parser;
 use std::net::SocketAddr;
+use std::path::PathBuf;
 
 use super::DeviceCommands;
 
 #[derive(Parser, Debug)]
 pub struct TcpCommand {
     pub address: SocketAddr,
+    /// Path to a custom private key to use for authentication
+    #[clap(short = 'k', long = "private-key")]
+    pub path_to_private_key: Option<PathBuf>,
     #[clap(subcommand)]
     pub commands: DeviceCommands,
 }

adb_cli/src/utils.rs

@@ -5,10 +5,7 @@
 pub unsafe fn setup_logger(debug: bool) {
     // RUST_LOG variable has more priority then "--debug" flag
     if std::env::var("RUST_LOG").is_err() {
-        let level = match debug {
-            true => "trace",
-            false => "info",
-        };
+        let level = if debug { "trace" } else { "info" };
 
         unsafe { std::env::set_var("RUST_LOG", level) };
     }

adb_client/Cargo.toml

@@ -7,40 +7,37 @@ license.workspace = true
 name = "adb_client"
 readme = "README.md"
 repository.workspace = true
+rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
 base64 = { version = "0.22.1" }
-bincode = { version = "1.3.3" }
+bincode = { version = "2.0.1", features = ["serde"] }
 byteorder = { version = "1.5.0" }
-chrono = { version = "0.4.40", default-features = false, features = ["std"] }
-homedir = { version = "0.3.4" }
-image = { version = "0.25.5", default-features = false }
-log = { version = "0.4.26" }
-mdns-sd = { version = "0.13.9", default-features = false, features = [
+chrono = { version = "0.4.42", default-features = false, features = ["std"] }
+image = { version = "0.25.8", default-features = false }
+log = { version = "0.4.28" }
+mdns-sd = { version = "0.17.0", default-features = false, features = [
     "logging",
 ] }
-num-bigint = { version = "0.8.4", package = "num-bigint-dig" }
+num-bigint = { version = "0.8.5", package = "num-bigint-dig" }
 num-traits = { version = "0.2.19" }
 quick-protobuf = { version = "0.8.1" }
-rand = { version = "0.9.0" }
-rcgen = { version = "0.13.1", default-features = false, features = [
-    "aws_lc_rs",
-    "pem",
-] }
-regex = { version = "1.11.1", features = ["perf", "std", "unicode"] }
-rsa = { version = "0.9.7" }
+rand = { version = "0.9.2" }
+rcgen = { version = "0.14.5" }
+regex = { version = "1.12.2", features = ["perf", "std", "unicode"] }
+rsa = { version = "0.9.8" }
 rusb = { version = "0.9.4", features = ["vendored"] }
-rustls = { version = "0.23.27" }
-rustls-pki-types = { version = "1.11.0" }
-serde = { version = "1.0.216", features = ["derive"] }
-serde_repr = { version = "0.1.19" }
+rustls = { version = "0.23.35" }
+rustls-pki-types = { version = "1.13.0" }
+serde = { version = "1.0.228", features = ["derive"] }
+serde_repr = { version = "0.1.20" }
 sha1 = { version = "0.10.6", features = ["oid"] }
-thiserror = { version = "2.0.7" }
+thiserror = { version = "2.0.17" }
 
 [dev-dependencies]
-anyhow = { version = "1.0.93" }
-criterion = { version = "0.6.0" } # Used for benchmarks
+anyhow = { version = "1.0.100" }
+criterion = { version = "0.7.0" } # Used for benchmarks
 
 [[bench]]
 harness = false

adb_client/README.md

@@ -3,6 +3,7 @@
 [![MIT licensed](https://img.shields.io/crates/l/adb_client.svg)](./LICENSE-MIT)
 [![Documentation](https://docs.rs/adb_client/badge.svg)](https://docs.rs/adb_client)
 [![Crates.io Total Downloads](https://img.shields.io/crates/d/adb_client)](https://crates.io/crates/adb_client)
+![MSRV](https://img.shields.io/crates/msrv/adb_client)
 
 Rust library implementing ADB protocol.
 

adb_client/src/adb_device_ext.rs

@@ -13,7 +13,7 @@ pub trait ADBDeviceExt {
 
     /// Starts an interactive shell session on the device.
     /// Input data is read from reader and write to writer.
-    fn shell(&mut self, reader: &mut dyn Read, writer: Box<(dyn Write + Send)>) -> Result<()>;
+    fn shell(&mut self, reader: &mut dyn Read, writer: Box<dyn Write + Send>) -> Result<()>;
 
     /// Display the stat information for a remote file
     fn stat(&mut self, remote_path: &str) -> Result<AdbStatResponse>;

adb_client/src/device/adb_message_device.rs

@@ -1,10 +1,26 @@
-use byteorder::{LittleEndian, ReadBytesExt};
-use rand::Rng;
-use std::io::{Cursor, Read, Seek};
-
+use super::{ADBRsaKey, ADBTransportMessage, MessageCommand, models::MessageSubcommand};
+use crate::device::adb_transport_message::{AUTH_RSAPUBLICKEY, AUTH_SIGNATURE, AUTH_TOKEN};
 use crate::{ADBMessageTransport, AdbStatResponse, Result, RustADBError, constants::BUFFER_SIZE};
+use bincode::config::{Configuration, Fixint, LittleEndian, NoLimit};
+use byteorder::ReadBytesExt;
+use rand::Rng;
+use serde::Serialize;
+use serde::de::DeserializeOwned;
+use std::io::{Cursor, Read, Seek};
+use std::time::Duration;
 
-use super::{ADBTransportMessage, MessageCommand, models::MessageSubcommand};
+const BINCODE_CONFIG: Configuration<LittleEndian, Fixint, NoLimit> = bincode::config::legacy();
+
+pub(crate) fn bincode_serialize_to_vec<E: Serialize>(val: E) -> Result<Vec<u8>> {
+    bincode::serde::encode_to_vec(val, BINCODE_CONFIG).map_err(|_e| RustADBError::ConversionError)
+}
+
+pub(crate) fn bincode_deserialize_from_slice<D: DeserializeOwned>(data: &[u8]) -> Result<D> {
+    let (response, _) = bincode::serde::decode_from_slice(data, BINCODE_CONFIG)
+        .map_err(|_e| RustADBError::ConversionError)?;
+
+    Ok(response)
+}
 
 /// Generic structure representing an ADB device reachable over an [`ADBMessageTransport`].
 /// Structure is totally agnostic over which transport is truly used.
@@ -33,6 +49,66 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
         &mut self.transport
     }
 
+    pub(crate) fn auth_handshake(
+        &mut self,
+        message: ADBTransportMessage,
+        private_key: &ADBRsaKey,
+    ) -> Result<()> {
+        match message.header().command() {
+            MessageCommand::Auth => {
+                log::debug!("Authentication required");
+            }
+            _ => return Ok(()),
+        }
+
+        // At this point, we should have received an AUTH message with arg0 == 1
+        let auth_message = match message.header().arg0() {
+            AUTH_TOKEN => message,
+            v => {
+                return Err(RustADBError::ADBRequestFailed(format!(
+                    "Received AUTH message with type != 1 ({v})"
+                )));
+            }
+        };
+
+        let sign = private_key.sign(auth_message.into_payload())?;
+
+        let message = ADBTransportMessage::new(MessageCommand::Auth, AUTH_SIGNATURE, 0, &sign);
+
+        self.get_transport_mut().write_message(message)?;
+
+        let received_response = self.get_transport_mut().read_message()?;
+
+        if received_response.header().command() == MessageCommand::Cnxn {
+            log::info!(
+                "Authentication OK, device info {}",
+                String::from_utf8(received_response.into_payload())?
+            );
+            return Ok(());
+        }
+
+        let mut pubkey = private_key.android_pubkey_encode()?.into_bytes();
+        pubkey.push(b'\0');
+
+        let message = ADBTransportMessage::new(MessageCommand::Auth, AUTH_RSAPUBLICKEY, 0, &pubkey);
+
+        self.get_transport_mut().write_message(message)?;
+
+        let response = self
+            .get_transport_mut()
+            .read_message_with_timeout(Duration::from_secs(10))
+            .and_then(|message| {
+                message.assert_command(MessageCommand::Cnxn)?;
+                Ok(message)
+            })?;
+
+        log::info!(
+            "Authentication OK, device info {}",
+            String::from_utf8(response.into_payload())?
+        );
+        Ok(())
+    }
+
     /// Receive a message and acknowledge it by replying with an `OKAY` command
     pub(crate) fn recv_and_reply_okay(&mut self) -> Result<ADBTransportMessage> {
         let message = self.transport.read_message()?;
@@ -70,7 +146,7 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
                 match len.take() {
                     Some(0) | None => {
                         rdr.seek_relative(4)?;
-                        len.replace(rdr.read_u32::<LittleEndian>()? as u64);
+                        len.replace(u64::from(rdr.read_u32::<byteorder::LittleEndian>()?));
                     }
                     Some(length) => {
                         let remaining_bytes = payload.len() as u64 - rdr.position();
@@ -86,7 +162,7 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
                 }
             }
             if Cursor::new(&payload[(payload.len() - 8)..(payload.len() - 4)])
-                .read_u32::<LittleEndian>()?
+                .read_u32::<byteorder::LittleEndian>()?
                 == MessageSubcommand::Done as u32
             {
                 break;
@@ -101,12 +177,11 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
         remote_id: u32,
         mut reader: R,
     ) -> std::result::Result<(), RustADBError> {
-        let mut buffer = [0; BUFFER_SIZE];
+        let mut buffer = vec![0; BUFFER_SIZE].into_boxed_slice();
         let amount_read = reader.read(&mut buffer)?;
-        let subcommand_data = MessageSubcommand::Data.with_arg(amount_read as u32);
+        let subcommand_data = MessageSubcommand::Data.with_arg(u32::try_from(amount_read)?);
 
-        let mut serialized_message =
-            bincode::serialize(&subcommand_data).map_err(|_e| RustADBError::ConversionError)?;
+        let mut serialized_message = bincode_serialize_to_vec(&subcommand_data)?;
         serialized_message.append(&mut buffer[..amount_read].to_vec());
 
         let message = ADBTransportMessage::new(
@@ -119,16 +194,14 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
         self.send_and_expect_okay(message)?;
 
         loop {
-            let mut buffer = [0; BUFFER_SIZE];
+            let mut buffer = vec![0; BUFFER_SIZE].into_boxed_slice();
 
             match reader.read(&mut buffer) {
                 Ok(0) => {
                     // Currently file mtime is not forwarded
                     let subcommand_data = MessageSubcommand::Done.with_arg(0);
 
-                    let serialized_message = bincode::serialize(&subcommand_data)
-                        .map_err(|_e| RustADBError::ConversionError)?;
-
+                    let serialized_message = bincode_serialize_to_vec(&subcommand_data)?;
                     let message = ADBTransportMessage::new(
                         MessageCommand::Write,
                         local_id,
@@ -144,17 +217,15 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
                         MessageCommand::Write => return Ok(()),
                         c => {
                             return Err(RustADBError::ADBRequestFailed(format!(
-                                "Wrong command received {}",
-                                c
+                                "Wrong command received {c}"
                             )));
                         }
                     }
                 }
                 Ok(size) => {
-                    let subcommand_data = MessageSubcommand::Data.with_arg(size as u32);
+                    let subcommand_data = MessageSubcommand::Data.with_arg(u32::try_from(size)?);
 
-                    let mut serialized_message = bincode::serialize(&subcommand_data)
-                        .map_err(|_e| RustADBError::ConversionError)?;
+                    let mut serialized_message = bincode_serialize_to_vec(&subcommand_data)?;
                     serialized_message.append(&mut buffer[..size].to_vec());
 
                     let message = ADBTransportMessage::new(
@@ -179,12 +250,12 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     }
 
     pub(crate) fn stat_with_explicit_ids(&mut self, remote_path: &str) -> Result<AdbStatResponse> {
-        let stat_buffer = MessageSubcommand::Stat.with_arg(remote_path.len() as u32);
+        let stat_buffer = MessageSubcommand::Stat.with_arg(u32::try_from(remote_path.len())?);
         let message = ADBTransportMessage::new(
             MessageCommand::Write,
             self.get_local_id()?,
             self.get_remote_id()?,
-            &bincode::serialize(&stat_buffer).map_err(|_e| RustADBError::ConversionError)?,
+            &bincode_serialize_to_vec(&stat_buffer)?,
         );
         self.send_and_expect_okay(message)?;
         self.send_and_expect_okay(ADBTransportMessage::new(
@@ -196,8 +267,8 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
         let response = self.transport.read_message()?;
         // Skip first 4 bytes as this is the literal "STAT".
         // Interesting part starts right after
-        bincode::deserialize(&response.into_payload()[4..])
-            .map_err(|_e| RustADBError::ConversionError)
+
+        bincode_deserialize_from_slice(&response.into_payload()[4..])
     }
 
     pub(crate) fn end_transaction(&mut self) -> Result<()> {
@@ -206,7 +277,7 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
             MessageCommand::Write,
             self.get_local_id()?,
             self.get_remote_id()?,
-            &bincode::serialize(&quit_buffer).map_err(|_e| RustADBError::ConversionError)?,
+            &bincode_serialize_to_vec(&quit_buffer)?,
         ))?;
         let _discard_close = self.transport.read_message()?;
         Ok(())

adb_client/src/device/adb_message_device_commands.rs

@@ -11,7 +11,7 @@ impl<T: ADBMessageTransport> ADBDeviceExt for ADBMessageDevice<T> {
         self.shell_command(command, output)
     }
 
-    fn shell(&mut self, reader: &mut dyn Read, writer: Box<(dyn Write + Send)>) -> Result<()> {
+    fn shell(&mut self, reader: &mut dyn Read, writer: Box<dyn Write + Send>) -> Result<()> {
         self.shell(reader, writer)
     }
 

adb_client/src/device/adb_tcp_device.rs

@@ -1,22 +1,43 @@
 use std::io::Write;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::{io::Read, net::SocketAddr};
 
-use super::ADBTransportMessage;
 use super::adb_message_device::ADBMessageDevice;
 use super::models::MessageCommand;
+use super::{ADBRsaKey, ADBTransportMessage, get_default_adb_key_path};
+use crate::device::adb_usb_device::read_adb_private_key;
 use crate::{ADBDeviceExt, ADBMessageTransport, ADBTransport, Result, TcpTransport};
 
 /// Represent a device reached and available over USB.
 #[derive(Debug)]
 pub struct ADBTcpDevice {
+    private_key: ADBRsaKey,
     inner: ADBMessageDevice<TcpTransport>,
 }
 
 impl ADBTcpDevice {
     /// Instantiate a new [`ADBTcpDevice`]
     pub fn new(address: SocketAddr) -> Result<Self> {
+        Self::new_with_custom_private_key(address, get_default_adb_key_path()?)
+    }
+
+    /// Instantiate a new [`ADBTcpDevice`] using a custom private key path
+    pub fn new_with_custom_private_key(
+        address: SocketAddr,
+        private_key_path: PathBuf,
+    ) -> Result<Self> {
+        let private_key = if let Some(private_key) = read_adb_private_key(&private_key_path)? {
+            private_key
+        } else {
+            log::warn!(
+                "No private key found at path {}. Using a temporary random one.",
+                private_key_path.display()
+            );
+            ADBRsaKey::new_random()?
+        };
+
         let mut device = Self {
+            private_key,
             inner: ADBMessageDevice::new(TcpTransport::new(address)?),
         };
 
@@ -31,8 +52,8 @@ impl ADBTcpDevice {
 
         let message = ADBTransportMessage::new(
             MessageCommand::Cnxn,
-            0x01000000,
-            1048576,
+            0x0100_0000,
+            1_048_576,
             format!("host::{}\0", env!("CARGO_PKG_NAME")).as_bytes(),
         );
 
@@ -40,26 +61,28 @@ impl ADBTcpDevice {
 
         let message = self.get_transport_mut().read_message()?;
 
-        // Check if client is requesting a secure connection and upgrade it if necessary
+        // Check if a client is requesting a secure connection and upgrade it if necessary
         match message.header().command() {
             MessageCommand::Stls => {
                 self.get_transport_mut()
                     .write_message(ADBTransportMessage::new(MessageCommand::Stls, 1, 0, &[]))?;
                 self.get_transport_mut().upgrade_connection()?;
                 log::debug!("Connection successfully upgraded from TCP to TLS");
+                Ok(())
             }
             MessageCommand::Cnxn => {
                 log::debug!("Unencrypted connection established");
+                Ok(())
             }
-            _ => {
-                return Err(crate::RustADBError::WrongResponseReceived(
-                    "Expected CNXN or STLS command".to_string(),
-                    message.header().command().to_string(),
-                ));
+            MessageCommand::Auth => {
+                log::debug!("Authentication required");
+                self.inner.auth_handshake(message, &self.private_key)
             }
+            _ => Err(crate::RustADBError::WrongResponseReceived(
+                "Expected CNXN, STLS or AUTH command".to_string(),
+                message.header().command().to_string(),
+            )),
         }
-
-        Ok(())
     }
 
     #[inline]
@@ -75,7 +98,7 @@ impl ADBDeviceExt for ADBTcpDevice {
     }
 
     #[inline]
-    fn shell(&mut self, reader: &mut dyn Read, writer: Box<(dyn Write + Send)>) -> Result<()> {
+    fn shell(&mut self, reader: &mut dyn Read, writer: Box<dyn Write + Send>) -> Result<()> {
         self.inner.shell(reader, writer)
     }
 

adb_client/src/device/adb_transport_message.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{Result, RustADBError};
+use crate::{Result, RustADBError, device::adb_message_device};
 
 use super::models::MessageCommand;
 
@@ -58,16 +58,16 @@ impl ADBTransportMessageHeader {
     }
 
     pub(crate) fn compute_crc32(data: &[u8]) -> u32 {
-        data.iter().map(|&x| x as u32).sum()
+        data.iter().map(|&x| u32::from(x)).sum()
     }
 
     fn compute_magic(command: MessageCommand) -> u32 {
         let command_u32 = command as u32;
-        command_u32 ^ 0xFFFFFFFF
+        command_u32 ^ 0xFFFF_FFFF
     }
 
     pub fn as_bytes(&self) -> Result<Vec<u8>> {
-        bincode::serialize(&self).map_err(|_e| RustADBError::ConversionError)
+        adb_message_device::bincode_serialize_to_vec(self)
     }
 }
 
@@ -117,6 +117,6 @@ impl TryFrom<[u8; 24]> for ADBTransportMessageHeader {
     type Error = RustADBError;
 
     fn try_from(value: [u8; 24]) -> Result<Self> {
-        bincode::deserialize(&value).map_err(|_e| RustADBError::ConversionError)
+        adb_message_device::bincode_deserialize_from_slice(&value)
     }
 }

adb_client/src/device/adb_usb_device.rs

@@ -7,7 +7,6 @@ use std::io::Read;
 use std::io::Write;
 use std::path::Path;
 use std::path::PathBuf;
-use std::time::Duration;
 
 use super::adb_message_device::ADBMessageDevice;
 use super::models::MessageCommand;
@@ -15,23 +14,27 @@ use super::{ADBRsaKey, ADBTransportMessage};
 use crate::ADBDeviceExt;
 use crate::ADBMessageTransport;
 use crate::ADBTransport;
-use crate::device::adb_transport_message::{AUTH_RSAPUBLICKEY, AUTH_SIGNATURE, AUTH_TOKEN};
 use crate::{Result, RustADBError, USBTransport};
 
 pub fn read_adb_private_key<P: AsRef<Path>>(private_key_path: P) -> Result<Option<ADBRsaKey>> {
-    Ok(read_to_string(private_key_path.as_ref()).map(|pk| {
-        match ADBRsaKey::new_from_pkcs8(&pk) {
-            Ok(pk) => Some(pk),
-            Err(e) => {
-                log::error!("Error while create RSA private key: {e}");
-                None
-            }
-        }
-    })?)
+    // Try to read the private key file from given path
+    // If the file is not found, return None
+    // If there is another error while reading the file, return this error
+    // Else, return the private key content
+    let pk = match read_to_string(private_key_path.as_ref()) {
+        Ok(pk) => pk,
+        Err(e) if e.kind() == std::io::ErrorKind::NotFound => return Ok(None),
+        Err(e) => return Err(e.into()),
+    };
+
+    match ADBRsaKey::new_from_pkcs8(&pk) {
+        Ok(pk) => Ok(Some(pk)),
+        Err(e) => Err(e),
+    }
 }
 
 /// Search for adb devices with known interface class and subclass values
-fn search_adb_devices() -> Result<Option<(u16, u16)>> {
+pub fn search_adb_devices() -> Result<Option<(u16, u16)>> {
     let mut found_devices = vec![];
     for device in rusb::devices()?.iter() {
         let Ok(des) = device.device_descriptor() else {
@@ -51,13 +54,13 @@ fn search_adb_devices() -> Result<Option<(u16, u16)>> {
         (None, _) => Ok(None),
         (Some(identifiers), None) => Ok(Some(*identifiers)),
         (Some((vid1, pid1)), Some((vid2, pid2))) => Err(RustADBError::DeviceNotFound(format!(
-            "Found two Android devices {:04x}:{:04x} and {:04x}:{:04x}",
-            vid1, pid1, vid2, pid2
+            "Found two Android devices {vid1:04x}:{pid1:04x} and {vid2:04x}:{pid2:04x}",
         ))),
     }
 }
 
-fn is_adb_device<T: UsbContext>(device: &Device<T>, des: &DeviceDescriptor) -> bool {
+/// Check whether a device with given descriptor is an ADB device
+pub fn is_adb_device<T: UsbContext>(device: &Device<T>, des: &DeviceDescriptor) -> bool {
     const ADB_SUBCLASS: u8 = 0x42;
     const ADB_PROTOCOL: u8 = 0x1;
 
@@ -88,9 +91,7 @@ fn is_adb_device<T: UsbContext>(device: &Device<T>, des: &DeviceDescriptor) -> b
 }
 
 pub fn get_default_adb_key_path() -> Result<PathBuf> {
-    homedir::my_home()
-        .ok()
-        .flatten()
+    std::env::home_dir()
         .map(|home| home.join(".android").join("adbkey"))
         .ok_or(RustADBError::NoHomeDirectory)
 }
@@ -114,7 +115,7 @@ impl ADBUSBDevice {
         product_id: u16,
         private_key_path: PathBuf,
     ) -> Result<Self> {
-        Self::new_from_transport_inner(USBTransport::new(vendor_id, product_id)?, private_key_path)
+        Self::new_from_transport_inner(USBTransport::new(vendor_id, product_id)?, &private_key_path)
     }
 
     /// Instantiate a new [`ADBUSBDevice`] from a [`USBTransport`] and an optional private key path.
@@ -127,16 +128,21 @@ impl ADBUSBDevice {
             None => get_default_adb_key_path()?,
         };
 
-        Self::new_from_transport_inner(transport, private_key_path)
+        Self::new_from_transport_inner(transport, &private_key_path)
     }
 
     fn new_from_transport_inner(
         transport: USBTransport,
-        private_key_path: PathBuf,
+        private_key_path: &PathBuf,
     ) -> Result<Self> {
-        let private_key = match read_adb_private_key(private_key_path)? {
-            Some(pk) => pk,
-            None => ADBRsaKey::new_random()?,
+        let private_key = if let Some(private_key) = read_adb_private_key(private_key_path)? {
+            private_key
+        } else {
+            log::warn!(
+                "No private key found at path {}. Using a temporary random one.",
+                private_key_path.display()
+            );
+            ADBRsaKey::new_random()?
         };
 
         let mut s = Self {
@@ -172,63 +178,22 @@ impl ADBUSBDevice {
 
         let message = ADBTransportMessage::new(
             MessageCommand::Cnxn,
-            0x01000000,
-            1048576,
+            0x0100_0000,
+            1_048_576,
             format!("host::{}\0", env!("CARGO_PKG_NAME")).as_bytes(),
         );
 
         self.get_transport_mut().write_message(message)?;
 
         let message = self.get_transport_mut().read_message()?;
-        message.assert_command(MessageCommand::Auth)?;
-
-        // At this point, we should have receive an AUTH message with arg0 == 1
-        let auth_message = match message.header().arg0() {
-            AUTH_TOKEN => message,
-            v => {
-                return Err(RustADBError::ADBRequestFailed(format!(
-                    "Received AUTH message with type != 1 ({v})"
-                )));
-            }
-        };
-
-        let sign = self.private_key.sign(auth_message.into_payload())?;
-
-        let message = ADBTransportMessage::new(MessageCommand::Auth, AUTH_SIGNATURE, 0, &sign);
-
-        self.get_transport_mut().write_message(message)?;
-
-        let received_response = self.get_transport_mut().read_message()?;
-
-        if received_response.header().command() == MessageCommand::Cnxn {
-            log::info!(
-                "Authentication OK, device info {}",
-                String::from_utf8(received_response.into_payload())?
-            );
+        // If the device returned CNXN instead of AUTH it does not require authentication,
+        // so we can skip the auth steps.
+        if message.header().command() == MessageCommand::Cnxn {
             return Ok(());
         }
 
-        let mut pubkey = self.private_key.android_pubkey_encode()?.into_bytes();
-        pubkey.push(b'\0');
-
-        let message = ADBTransportMessage::new(MessageCommand::Auth, AUTH_RSAPUBLICKEY, 0, &pubkey);
-
-        self.get_transport_mut().write_message(message)?;
-
-        let response = self
-            .get_transport_mut()
-            .read_message_with_timeout(Duration::from_secs(10))
-            .and_then(|message| {
-                message.assert_command(MessageCommand::Cnxn)?;
-                Ok(message)
-            })?;
-
-        log::info!(
-            "Authentication OK, device info {}",
-            String::from_utf8(response.into_payload())?
-        );
-
-        Ok(())
+        message.assert_command(MessageCommand::Auth)?;
+        self.inner.auth_handshake(message, &self.private_key)
     }
 
     #[inline]
@@ -244,7 +209,7 @@ impl ADBDeviceExt for ADBUSBDevice {
     }
 
     #[inline]
-    fn shell<'a>(&mut self, reader: &mut dyn Read, writer: Box<(dyn Write + Send)>) -> Result<()> {
+    fn shell<'a>(&mut self, reader: &mut dyn Read, writer: Box<dyn Write + Send>) -> Result<()> {
         self.inner.shell(reader, writer)
     }
 

adb_client/src/device/commands/framebuffer.rs

@@ -32,7 +32,7 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
                 payload_cursor.read_to_end(&mut framebuffer_data)?;
 
                 loop {
-                    if framebuffer_data.len() as u32 == framebuffer_info.size {
+                    if u32::try_from(framebuffer_data.len())? == framebuffer_info.size {
                         break;
                     }
 
@@ -65,7 +65,7 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
                 payload_cursor.read_to_end(&mut framebuffer_data)?;
 
                 loop {
-                    if framebuffer_data.len() as u32 == framebuffer_info.size {
+                    if u32::try_from(framebuffer_data.len())? == framebuffer_info.size {
                         break;
                     }
 

adb_client/src/device/commands/install.rs

@@ -14,7 +14,7 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
 
         let file_size = apk_file.metadata()?.len();
 
-        self.open_session(format!("exec:cmd package 'install' -S {}\0", file_size).as_bytes())?;
+        self.open_session(format!("exec:cmd package 'install' -S {file_size}\0").as_bytes())?;
 
         let transport = self.get_transport().clone();
 

adb_client/src/device/commands/pull.rs

@@ -3,7 +3,8 @@ use std::io::Write;
 use crate::{
     ADBMessageTransport, Result, RustADBError,
     device::{
-        ADBTransportMessage, MessageCommand, adb_message_device::ADBMessageDevice,
+        ADBTransportMessage, MessageCommand,
+        adb_message_device::{self, ADBMessageDevice},
         models::MessageSubcommand,
     },
 };
@@ -29,9 +30,8 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
             std::time::Duration::from_secs(4),
         )?;
 
-        let recv_buffer = MessageSubcommand::Recv.with_arg(source.len() as u32);
-        let recv_buffer =
-            bincode::serialize(&recv_buffer).map_err(|_e| RustADBError::ConversionError)?;
+        let recv_buffer = MessageSubcommand::Recv.with_arg(u32::try_from(source.len())?);
+        let recv_buffer = adb_message_device::bincode_serialize_to_vec(&recv_buffer)?;
         self.send_and_expect_okay(ADBTransportMessage::new(
             MessageCommand::Write,
             self.get_local_id()?,

adb_client/src/device/commands/push.rs

@@ -1,10 +1,10 @@
 use std::io::Read;
 
 use crate::{
-    ADBMessageTransport, Result, RustADBError,
+    ADBMessageTransport, Result,
     device::{
         ADBTransportMessage, MessageCommand, MessageSubcommand,
-        adb_message_device::ADBMessageDevice,
+        adb_message_device::{self, ADBMessageDevice},
     },
 };
 
@@ -14,9 +14,8 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
 
         let path_header = format!("{},0777", path.as_ref());
 
-        let send_buffer = MessageSubcommand::Send.with_arg(path_header.len() as u32);
-        let mut send_buffer =
-            bincode::serialize(&send_buffer).map_err(|_e| RustADBError::ConversionError)?;
+        let send_buffer = MessageSubcommand::Send.with_arg(u32::try_from(path_header.len())?);
+        let mut send_buffer = adb_message_device::bincode_serialize_to_vec(&send_buffer)?;
         send_buffer.append(&mut path_header.as_bytes().to_vec());
 
         self.send_and_expect_okay(ADBTransportMessage::new(

adb_client/src/device/commands/reboot.rs

@@ -5,7 +5,7 @@ use crate::{
 
 impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     pub(crate) fn reboot(&mut self, reboot_type: RebootType) -> Result<()> {
-        self.open_session(format!("reboot:{}\0", reboot_type).as_bytes())?;
+        self.open_session(format!("reboot:{reboot_type}\0").as_bytes())?;
 
         self.get_transport_mut()
             .read_message()

adb_client/src/device/commands/shell.rs

@@ -36,7 +36,7 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     pub(crate) fn shell(
         &mut self,
         mut reader: &mut dyn Read,
-        mut writer: Box<(dyn Write + Send)>,
+        mut writer: Box<dyn Write + Send>,
     ) -> Result<()> {
         self.open_session(b"shell:\0")?;
 
@@ -60,7 +60,7 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
                         writer.write_all(&message.into_payload())?;
                         writer.flush()?;
                     }
-                    MessageCommand::Okay => continue,
+                    MessageCommand::Okay => {}
                     _ => return Err(RustADBError::ADBShellNotSupported),
                 }
             }

adb_client/src/device/commands/uninstall.rs

@@ -2,13 +2,13 @@ use crate::{ADBMessageTransport, Result, device::adb_message_device::ADBMessageD
 
 impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     pub(crate) fn uninstall(&mut self, package_name: &str) -> Result<()> {
-        self.open_session(format!("exec:cmd package 'uninstall' {}\0", package_name).as_bytes())?;
+        self.open_session(format!("exec:cmd package 'uninstall' {package_name}\0").as_bytes())?;
 
         let final_status = self.get_transport_mut().read_message()?;
 
         match final_status.into_payload().as_slice() {
             b"Success\n" => {
-                log::info!("Package {} successfully uninstalled", package_name);
+                log::info!("Package {package_name} successfully uninstalled");
                 Ok(())
             }
             d => Err(crate::RustADBError::ADBRequestFailed(String::from_utf8(

adb_client/src/device/message_writer.rs

@@ -35,10 +35,10 @@ impl<T: ADBMessageTransport> Write for MessageWriter<T> {
             Ok(response) => {
                 response
                     .assert_command(MessageCommand::Okay)
-                    .map_err(|e| Error::new(ErrorKind::Other, e))?;
+                    .map_err(Error::other)?;
                 Ok(buf.len())
             }
-            Err(e) => Err(Error::new(ErrorKind::Other, e)),
+            Err(e) => Err(Error::other(e)),
         }
     }
 

adb_client/src/device/mod.rs

@@ -11,7 +11,9 @@ mod shell_message_writer;
 use adb_message_device::ADBMessageDevice;
 pub use adb_tcp_device::ADBTcpDevice;
 pub use adb_transport_message::{ADBTransportMessage, ADBTransportMessageHeader};
-pub use adb_usb_device::{ADBUSBDevice, get_default_adb_key_path};
+pub use adb_usb_device::{
+    ADBUSBDevice, get_default_adb_key_path, is_adb_device, search_adb_devices,
+};
 pub use message_writer::MessageWriter;
 pub use models::{ADBRsaKey, MessageCommand, MessageSubcommand};
 pub use shell_message_writer::ShellMessageWriter;

adb_client/src/device/models/adb_rsa_key.rs

@@ -6,6 +6,7 @@ use num_traits::cast::ToPrimitive;
 use rsa::pkcs8::DecodePrivateKey;
 use rsa::traits::PublicKeyParts;
 use rsa::{Pkcs1v15Sign, RsaPrivateKey};
+use std::fmt::Write;
 
 const ADB_PRIVATE_KEY_SIZE: usize = 2048;
 const ANDROID_PUBKEY_MODULUS_SIZE_WORDS: u32 = 64;
@@ -92,15 +93,16 @@ impl ADBRsaKey {
             .to_u32()
             .ok_or(RustADBError::ConversionError)?;
 
-        Ok(self.encode_public_key(adb_rsa_pubkey.into_bytes()))
+        Self::encode_public_key(adb_rsa_pubkey.into_bytes())
     }
 
-    fn encode_public_key(&self, pub_key: Vec<u8>) -> String {
+    fn encode_public_key(pub_key: Vec<u8>) -> Result<String> {
         let mut encoded = STANDARD.encode(pub_key);
         encoded.push(' ');
-        encoded.push_str(&format!("adb_client@{}", env!("CARGO_PKG_VERSION")));
+        write!(encoded, "adb_client@{}", env!("CARGO_PKG_VERSION"))
+            .map_err(|_| RustADBError::ConversionError)?;
 
-        encoded
+        Ok(encoded)
     }
 
     pub fn sign(&self, msg: impl AsRef<[u8]>) -> Result<Vec<u8>> {

adb_client/src/device/models/message_commands.rs

@@ -6,32 +6,32 @@ use std::fmt::Display;
 #[repr(u32)]
 pub enum MessageCommand {
     /// Connect to a device
-    Cnxn = 0x4E584E43,
+    Cnxn = 0x4E58_4E43,
     /// Close connection to a device
-    Clse = 0x45534C43,
+    Clse = 0x4553_4C43,
     /// Device ask for authentication
-    Auth = 0x48545541,
+    Auth = 0x4854_5541,
     /// Open a data connection
-    Open = 0x4E45504F,
+    Open = 0x4E45_504F,
     /// Write data to connection
-    Write = 0x45545257,
+    Write = 0x4554_5257,
     /// Server understood the message
-    Okay = 0x59414B4F,
+    Okay = 0x5941_4B4F,
     /// Start a connection using TLS
-    Stls = 0x534C5453,
+    Stls = 0x534C_5453,
 }
 
 #[derive(Debug, Eq, PartialEq, Copy, Clone, Serialize_repr, Deserialize_repr)]
 #[repr(u32)]
 pub enum MessageSubcommand {
-    Stat = 0x54415453,
-    Send = 0x444E4553,
-    Recv = 0x56434552,
-    Quit = 0x54495551,
-    Fail = 0x4C494146,
-    Done = 0x454E4F44,
-    Data = 0x41544144,
-    List = 0x5453494C,
+    Stat = 0x5441_5453,
+    Send = 0x444E_4553,
+    Recv = 0x5643_4552,
+    Quit = 0x5449_5551,
+    Fail = 0x4C49_4146,
+    Done = 0x454E_4F44,
+    Data = 0x4154_4144,
+    List = 0x5453_494C,
 }
 
 #[derive(Debug, Serialize, Deserialize)]

adb_client/src/emulator_device/adb_emulator_device.rs

@@ -15,23 +15,22 @@ static EMULATOR_REGEX: LazyLock<Regex> = LazyLock::new(|| {
 pub struct ADBEmulatorDevice {
     /// Unique device identifier.
     pub identifier: String,
-    /// Internal [TCPEmulatorTransport]
+    /// Internal [`TCPEmulatorTransport`]
     transport: TCPEmulatorTransport,
 }
 
 impl ADBEmulatorDevice {
-    /// Instantiates a new [ADBEmulatorDevice]
+    /// Instantiates a new [`ADBEmulatorDevice`]
     pub fn new(identifier: String, ip_address: Option<Ipv4Addr>) -> Result<Self> {
         let ip_address = match ip_address {
             Some(ip_address) => ip_address,
-            None => Ipv4Addr::new(127, 0, 0, 1),
+            None => Ipv4Addr::LOCALHOST,
         };
 
         let groups = EMULATOR_REGEX
             .captures(&identifier)
             .ok_or(RustADBError::DeviceNotFound(format!(
-                "Device {} is likely not an emulator",
-                identifier
+                "Device {identifier} is likely not an emulator"
             )))?;
 
         let port = groups

adb_client/src/emulator_device/models/adb_emulator_command.rs

@@ -24,8 +24,7 @@ impl ADBEmulatorCommand {
     pub(crate) fn skip_response_lines(&self) -> u8 {
         match self {
             ADBEmulatorCommand::Authenticate(_) => 1,
-            ADBEmulatorCommand::Sms(_, _) => 0,
-            ADBEmulatorCommand::Rotate => 0,
+            ADBEmulatorCommand::Sms(_, _) | ADBEmulatorCommand::Rotate => 0,
         }
     }
 }

adb_client/src/error.rs

@@ -42,6 +42,9 @@ pub enum RustADBError {
     /// Indicates that an error occurred when converting a value.
     #[error("Conversion error")]
     ConversionError,
+    /// Indicates an error with the integer conversion.
+    #[error(transparent)]
+    IntegerConversionError(#[from] std::num::TryFromIntError),
     /// Remote ADB server does not support shell feature.
     #[error("Remote ADB server does not support shell feature")]
     ADBShellNotSupported,
@@ -61,8 +64,8 @@ pub enum RustADBError {
     #[error("Unimplemented framebuffer image version: {0}")]
     UnimplementedFramebufferImageVersion(u32),
     /// An error occurred while getting user's home directory
-    #[error(transparent)]
-    HomeError(#[from] homedir::GetHomeError),
+    #[error("Cannot get user home directory")]
+    HomeError,
     /// Cannot get home directory
     #[error("Cannot get home directory")]
     NoHomeDirectory,

adb_client/src/lib.rs

@@ -17,7 +17,7 @@ mod transports;
 mod utils;
 
 pub use adb_device_ext::ADBDeviceExt;
-pub use device::{ADBTcpDevice, ADBUSBDevice};
+pub use device::{ADBTcpDevice, ADBUSBDevice, is_adb_device, search_adb_devices};
 pub use emulator_device::ADBEmulatorDevice;
 pub use error::{Result, RustADBError};
 pub use mdns::*;

adb_client/src/mdns/mdns_device.rs

@@ -1,5 +1,7 @@
 use std::{collections::HashSet, net::IpAddr};
 
+use mdns_sd::{ResolvedService, ScopedIp};
+
 /// Represent a device found from mdns search
 #[derive(Debug)]
 pub struct MDNSDevice {
@@ -9,11 +11,11 @@ pub struct MDNSDevice {
     pub addresses: HashSet<IpAddr>,
 }
 
-impl From<mdns_sd::ServiceInfo> for MDNSDevice {
-    fn from(value: mdns_sd::ServiceInfo) -> Self {
+impl From<Box<ResolvedService>> for MDNSDevice {
+    fn from(value: Box<ResolvedService>) -> Self {
         Self {
-            fullname: value.get_fullname().to_string(),
-            addresses: value.get_addresses().to_owned(),
+            fullname: value.fullname,
+            addresses: value.addresses.iter().map(ScopedIp::to_ip_addr).collect(),
         }
     }
 }

adb_client/src/mdns/mdns_discovery.rs

@@ -42,13 +42,15 @@ impl MDNSDiscoveryService {
                         | ServiceEvent::ServiceFound(_, _)
                         | ServiceEvent::SearchStopped(_) => {
                             // Ignoring these events. We are only interesting in found devices
-                            continue;
                         }
                         ServiceEvent::ServiceResolved(service_info) => {
                             if let Err(e) = sender.send(MDNSDevice::from(service_info)) {
                                 return Err(e.into());
                             }
                         }
+                        e => {
+                            log::warn!("received unknown event type {e:?}");
+                        }
                     }
                 }
             }

adb_client/src/models/adb_server_command.rs

@@ -63,8 +63,8 @@ impl Display for AdbServerCommand {
             AdbServerCommand::Reboot(reboot_type) => {
                 write!(f, "reboot:{reboot_type}")
             }
-            AdbServerCommand::Connect(addr) => write!(f, "host:connect:{}", addr),
-            AdbServerCommand::Disconnect(addr) => write!(f, "host:disconnect:{}", addr),
+            AdbServerCommand::Connect(addr) => write!(f, "host:connect:{addr}"),
+            AdbServerCommand::Disconnect(addr) => write!(f, "host:disconnect:{addr}"),
             AdbServerCommand::Pair(addr, code) => {
                 write!(f, "host:pair:{code}:{addr}")
             }

adb_client/src/server/adb_server.rs

@@ -9,7 +9,7 @@ use std::process::Command;
 /// Represents an ADB Server
 #[derive(Debug, Default)]
 pub struct ADBServer {
-    /// Internal [TcpStream], lazily initialized
+    /// Internal [`TcpStream`], lazily initialized
     pub(crate) transport: Option<TCPServerTransport>,
     /// Address to connect to
     pub(crate) socket_addr: Option<SocketAddrV4>,
@@ -21,7 +21,7 @@ pub struct ADBServer {
 }
 
 impl ADBServer {
-    /// Instantiates a new [ADBServer]
+    /// Instantiates a new [`ADBServer`]
     pub fn new(address: SocketAddrV4) -> Self {
         Self {
             transport: None,
@@ -31,7 +31,7 @@ impl ADBServer {
         }
     }
 
-    /// Instantiates a new [ADBServer] with a custom adb path
+    /// Instantiates a new [`ADBServer`] with a custom adb path
     pub fn new_from_path(address: SocketAddrV4, adb_path: Option<String>) -> Self {
         Self {
             transport: None,
@@ -46,7 +46,7 @@ impl ADBServer {
         // ADB Server is local, we start it if not already running
         let mut command = Command::new(adb_path.as_deref().unwrap_or("adb"));
         command.arg("start-server");
-        for (env_k, env_v) in envs.iter() {
+        for (env_k, env_v) in envs {
             command.env(env_k, env_v);
         }
 
@@ -61,7 +61,7 @@ impl ADBServer {
         match child {
             Ok(mut child) => {
                 if let Err(e) = child.wait() {
-                    log::error!("error while starting adb server: {e}")
+                    log::error!("error while starting adb server: {e}");
                 }
             }
             Err(e) => log::error!("error while starting adb server: {e}"),

adb_client/src/server/commands/devices.rs

@@ -69,12 +69,12 @@ impl ADBServer {
             .filter(|d| d.identifier.as_str() == name)
             .collect::<Vec<DeviceShort>>()
             .len();
-        if nb_devices != 1 {
+        if nb_devices == 1 {
+            Ok(ADBServerDevice::new(name.to_string(), self.socket_addr))
+        } else {
             Err(RustADBError::DeviceNotFound(format!(
                 "could not find device {name}"
             )))
-        } else {
-            Ok(ADBServerDevice::new(name.to_string(), self.socket_addr))
         }
     }
 

adb_client/src/server/commands/mdns.rs

@@ -32,7 +32,7 @@ impl ADBServer {
                 Ok(service) => {
                     vec_services.push(MDNSServices::try_from(service.as_bytes())?);
                 }
-                Err(e) => log::error!("{}", e),
+                Err(e) => log::error!("{e}"),
             }
         }
 

adb_client/src/server/models/adb_version.rs

@@ -15,7 +15,7 @@ pub struct AdbVersion {
 }
 
 impl AdbVersion {
-    /// Instantiates a new [AdbVersion].
+    /// Instantiates a new [`AdbVersion`].
     pub fn new(minor: u32, revision: u32) -> Self {
         Self {
             major: 1,

adb_client/src/server/models/device_long.rs

@@ -86,15 +86,13 @@ impl TryFrom<&[u8]> for DeviceLong {
                 None => "Unk".to_string(),
                 Some(device) => String::from_utf8(device.as_bytes().to_vec())?,
             },
-            transport_id: u32::from_str_radix(
-                str::from_utf8(
-                    groups
-                        .name("transport_id")
-                        .ok_or(RustADBError::RegexParsingError)?
-                        .as_bytes(),
-                )?,
-                16,
-            )?,
+            transport_id: (str::from_utf8(
+                groups
+                    .name("transport_id")
+                    .ok_or(RustADBError::RegexParsingError)?
+                    .as_bytes(),
+            )?)
+            .parse::<u32>()?,
         })
     }
 }

adb_client/src/server/models/server_status.rs

@@ -48,11 +48,11 @@ impl Display for UsbBackend {
 #[derive(Debug, Clone, PartialEq, Default)]
 pub enum MDNSBackend {
     #[default]
-    /// Unknown
+    /// `Unknown`
     Unknown = 0,
-    /// Bonjour
+    /// `Bonjour`
     Bonjour = 1,
-    /// OpenScreen
+    /// `OpenScreen`
     OpenScreen = 2,
 }
 

adb_client/src/server/models/wait_for_device.rs

@@ -2,7 +2,7 @@ use std::fmt::Display;
 
 use crate::RustADBError;
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 /// List of available transports to wait for.
 pub enum WaitForDeviceTransport {
     /// USB transport
@@ -10,15 +10,10 @@ pub enum WaitForDeviceTransport {
     /// Local transport
     Local,
     /// Any transport (default value)
+    #[default]
     Any,
 }
 
-impl Default for WaitForDeviceTransport {
-    fn default() -> Self {
-        Self::Any
-    }
-}
-
 impl Display for WaitForDeviceTransport {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {

adb_client/src/server_device/adb_server_device.rs

@@ -6,12 +6,12 @@ use std::net::SocketAddrV4;
 pub struct ADBServerDevice {
     /// Unique device identifier.
     pub identifier: Option<String>,
-    /// Internal [TCPServerTransport]
+    /// Internal [`TCPServerTransport`]
     pub(crate) transport: TCPServerTransport,
 }
 
 impl ADBServerDevice {
-    /// Instantiates a new [ADBServerDevice], knowing its ADB identifier (as returned by `adb devices` command).
+    /// Instantiates a new [`ADBServerDevice`], knowing its ADB identifier (as returned by `adb devices` command).
     pub fn new(identifier: String, server_addr: Option<SocketAddrV4>) -> Self {
         let transport = TCPServerTransport::new_or_default(server_addr);
 
@@ -21,7 +21,7 @@ impl ADBServerDevice {
         }
     }
 
-    /// Instantiates a new [ADBServerDevice], assuming only one is currently connected.
+    /// Instantiates a new [`ADBServerDevice`], assuming only one is currently connected.
     pub fn autodetect(server_addr: Option<SocketAddrV4>) -> Self {
         let transport = TCPServerTransport::new_or_default(server_addr);
 

adb_client/src/server_device/adb_server_device_commands.rs

@@ -25,15 +25,14 @@ impl ADBDeviceExt for ADBServerDevice {
         self.transport
             .send_adb_request(AdbServerCommand::ShellCommand(command.join(" ")))?;
 
+        let mut buffer = vec![0; BUFFER_SIZE].into_boxed_slice();
         loop {
-            let mut buffer = [0; BUFFER_SIZE];
             match self.transport.get_raw_connection()?.read(&mut buffer) {
                 Ok(size) => {
                     if size == 0 {
                         return Ok(());
-                    } else {
-                        output.write_all(&buffer[..size])?;
                     }
+                    output.write_all(&buffer[..size])?;
                 }
                 Err(e) => {
                     return Err(RustADBError::IOError(e));
@@ -49,7 +48,7 @@ impl ADBDeviceExt for ADBServerDevice {
     fn shell(
         &mut self,
         mut reader: &mut dyn Read,
-        mut writer: Box<(dyn Write + Send)>,
+        mut writer: Box<dyn Write + Send>,
     ) -> Result<()> {
         let supported_features = self.host_features()?;
         if !supported_features.contains(&HostFeatures::ShellV2)
@@ -67,8 +66,9 @@ impl ADBDeviceExt for ADBServerDevice {
 
         // Reading thread, reads response from adb-server
         std::thread::spawn(move || -> Result<()> {
+            let mut buffer = vec![0; BUFFER_SIZE].into_boxed_slice();
+
             loop {
-                let mut buffer = [0; BUFFER_SIZE];
                 match read_stream.read(&mut buffer) {
                     Ok(0) => {
                         read_stream.shutdown(std::net::Shutdown::Both)?;

adb_client/src/server_device/commands/list.rs

@@ -26,7 +26,7 @@ impl ADBServerDevice {
     // 'DONE' directly without listing anything.
     fn handle_list_command<S: AsRef<str>>(&mut self, path: S) -> Result<()> {
         let mut len_buf = [0_u8; 4];
-        LittleEndian::write_u32(&mut len_buf, path.as_ref().len() as u32);
+        LittleEndian::write_u32(&mut len_buf, u32::try_from(path.as_ref().len())?);
 
         // 4 bytes of command name is already sent by send_sync_request
         self.transport.get_raw_connection()?.write_all(&len_buf)?;
@@ -64,7 +64,7 @@ impl ADBServerDevice {
                 "DONE" => {
                     return Ok(());
                 }
-                x => log::error!("Got an unknown response {}", x),
+                x => log::error!("Got an unknown response {x}"),
             }
         }
     }

adb_client/src/server_device/commands/logcat.rs

@@ -23,21 +23,26 @@ impl<W: Write> LogFilter<W> {
 
 impl<W: Write> Write for LogFilter<W> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        // Add newly received bytes to the internal buffer
         self.buffer.extend_from_slice(buf);
 
-        let buf_clone = self.buffer.clone();
-        let mut lines = buf_clone.split_inclusive(|&byte| byte == b'\n').peekable();
+        let mut processed = 0;
+        while let Some(pos) = self.buffer[processed..].iter().position(|&b| b == b'\n') {
+            // Found a newline, need to process it
+            let end = processed + pos + 1; // +1 to include the '\n'
+            let line = &self.buffer[processed..end];
 
-        while let Some(line) = lines.next() {
-            if lines.peek().is_some() {
-                if self.should_write(line) {
-                    self.writer.write_all(line)?;
-                }
-            } else {
-                // This is the last (unfinished) element, we keep it for next round
-                self.buffer = line.to_vec();
-                break;
+            if self.should_write(line) {
+                self.writer.write_all(line)?;
             }
+
+            processed = end;
+        }
+
+        // Keep only remaining bytes after the last complete line
+        if processed > 0 {
+            self.buffer.copy_within(processed.., 0);
+            self.buffer.truncate(self.buffer.len() - processed);
         }
 
         Ok(buf.len())

adb_client/src/server_device/commands/recv.rs

@@ -5,7 +5,7 @@ use crate::{
 use byteorder::{LittleEndian, ReadBytesExt};
 use std::io::{BufReader, BufWriter, Read, Write};
 
-/// Internal structure wrapping a [std::io::Read] and hiding underlying protocol logic.
+/// Internal structure wrapping a [`std::io::Read`] and hiding underlying protocol logic.
 struct ADBRecvCommandReader<R: Read> {
     inner: R,
     remaining_data_bytes_to_read: usize,
@@ -42,18 +42,14 @@ impl<R: Read> Read for ADBRecvCommandReader<R> {
                     let mut error_msg = vec![0; length];
                     self.inner.read_exact(&mut error_msg)?;
 
-                    Err(std::io::Error::new(
-                        std::io::ErrorKind::Other,
-                        format!(
-                            "ADB request failed: {}",
-                            String::from_utf8_lossy(&error_msg)
-                        ),
-                    ))
+                    Err(std::io::Error::other(format!(
+                        "ADB request failed: {}",
+                        String::from_utf8_lossy(&error_msg)
+                    )))
                 }
-                _ => Err(std::io::Error::new(
-                    std::io::ErrorKind::Other,
-                    format!("Unknown response from device {:#?}", header),
-                )),
+                _ => Err(std::io::Error::other(format!(
+                    "Unknown response from device {header:#?}"
+                ))),
             }
         } else {
             // Computing minimum to ensure to stop reading before next header...
@@ -90,7 +86,7 @@ impl ADBServerDevice {
 
         let from_as_bytes = from.as_ref().as_bytes();
         let mut buffer = Vec::with_capacity(4 + from_as_bytes.len());
-        buffer.extend_from_slice(&(from.as_ref().len() as u32).to_le_bytes());
+        buffer.extend_from_slice(&(u32::try_from(from.as_ref().len())?).to_le_bytes());
         buffer.extend_from_slice(from_as_bytes);
         raw_connection.write_all(&buffer)?;
 

adb_client/src/server_device/commands/send.rs

@@ -9,7 +9,7 @@ use std::{
     time::SystemTime,
 };
 
-/// Internal structure wrapping a [std::io::Write] and hiding underlying protocol logic.
+/// Internal structure wrapping a [`std::io::Write`] and hiding underlying protocol logic.
 struct ADBSendCommandWriter<W: Write> {
     inner: W,
 }
@@ -64,7 +64,7 @@ impl ADBServerDevice {
         // The name of the command is already sent by get_transport()?.send_sync_request
         let to_as_bytes = to.as_bytes();
         let mut buffer = Vec::with_capacity(4 + to_as_bytes.len());
-        buffer.extend_from_slice(&(to.len() as u32).to_le_bytes());
+        buffer.extend_from_slice(&(u32::try_from(to.len())?).to_le_bytes());
         buffer.extend_from_slice(to_as_bytes);
         raw_connection.write_all(&buffer)?;
 
@@ -77,9 +77,10 @@ impl ADBServerDevice {
 
         // Copy is finished, we can now notify as finished
         // Have to send DONE + file mtime
-        let last_modified = match SystemTime::now().duration_since(SystemTime::UNIX_EPOCH) {
-            Ok(n) => n,
-            Err(_) => panic!("SystemTime before UNIX EPOCH!"),
+        let Ok(last_modified) = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH) else {
+            return Err(RustADBError::ADBRequestFailed(
+                "SystemTime before UNIX EPOCH!".into(),
+            ));
         };
 
         let mut done_buffer = Vec::with_capacity(8);

adb_client/src/server_device/commands/stat.rs

@@ -10,7 +10,7 @@ use crate::{
 impl ADBServerDevice {
     fn handle_stat_command<S: AsRef<str>>(&mut self, path: S) -> Result<AdbStatResponse> {
         let mut len_buf = [0_u8; 4];
-        LittleEndian::write_u32(&mut len_buf, path.as_ref().len() as u32);
+        LittleEndian::write_u32(&mut len_buf, u32::try_from(path.as_ref().len())?);
 
         // 4 bytes of command name is already sent by send_sync_request
         self.transport.get_raw_connection()?.write_all(&len_buf)?;
@@ -31,8 +31,7 @@ impl ADBServerDevice {
                 Ok(data.into())
             }
             x => Err(RustADBError::UnknownResponseType(format!(
-                "Unknown response {}",
-                x
+                "Unknown response {x}"
             ))),
         }
     }

adb_client/src/server_device/commands/uninstall.rs

@@ -15,7 +15,7 @@ impl ADBServerDevice {
 
         match &data[0..read_amount] {
             b"Success\n" => {
-                log::info!("Package {} successfully uninstalled", package_name);
+                log::info!("Package {package_name} successfully uninstalled");
                 Ok(())
             }
             d => Err(crate::RustADBError::ADBRequestFailed(String::from_utf8(

adb_client/src/transports/tcp_emulator_transport.rs

@@ -4,8 +4,6 @@ use std::{
     net::{SocketAddrV4, TcpStream},
 };
 
-use homedir::my_home;
-
 use super::ADBTransport;
 use crate::{Result, RustADBError, emulator_device::ADBEmulatorCommand};
 
@@ -17,7 +15,7 @@ pub struct TCPEmulatorTransport {
 }
 
 impl TCPEmulatorTransport {
-    /// Instantiates a new instance of [TCPEmulatorTransport]
+    /// Instantiates a new instance of [`TCPEmulatorTransport`]
     pub fn new(socket_addr: SocketAddrV4) -> Self {
         Self {
             socket_addr,
@@ -34,11 +32,10 @@ impl TCPEmulatorTransport {
             )))
     }
 
-    /// Return authentication token stored in $HOME/.emulator_console_auth_token
+    /// Return authentication token stored in `$HOME/.emulator_console_auth_token`
     pub fn get_authentication_token(&mut self) -> Result<String> {
-        let home = match my_home()? {
-            Some(home) => home,
-            None => return Err(RustADBError::NoHomeDirectory),
+        let Some(home) = std::env::home_dir() else {
+            return Err(RustADBError::NoHomeDirectory);
         };
 
         let mut f = File::open(home.join(".emulator_console_auth_token"))?;
@@ -54,7 +51,7 @@ impl TCPEmulatorTransport {
         self.send_command(ADBEmulatorCommand::Authenticate(token))
     }
 
-    /// Send an [ADBEmulatorCommand] to this emulator
+    /// Send an [`ADBEmulatorCommand`] to this emulator
     pub(crate) fn send_command(&mut self, command: ADBEmulatorCommand) -> Result<()> {
         let mut connection = self.get_raw_connection()?;
 
@@ -80,10 +77,11 @@ impl TCPEmulatorTransport {
         let mut line = String::new();
         reader.read_line(&mut line)?;
 
-        match line.starts_with("OK") {
-            true => Ok(()),
-            false => Err(RustADBError::ADBRequestFailed(line)),
+        if line.starts_with("OK") {
+            return Ok(());
         }
+
+        Err(RustADBError::ADBRequestFailed(line))
     }
 }
 

adb_client/src/transports/tcp_server_transport.rs

@@ -8,7 +8,7 @@ use crate::models::{AdbRequestStatus, SyncCommand};
 use crate::{ADBTransport, models::AdbServerCommand};
 use crate::{Result, RustADBError};
 
-const DEFAULT_SERVER_IP: Ipv4Addr = Ipv4Addr::new(127, 0, 0, 1);
+const DEFAULT_SERVER_IP: Ipv4Addr = Ipv4Addr::LOCALHOST;
 const DEFAULT_SERVER_PORT: u16 = 5037;
 
 /// Server transport running on top on TCP
@@ -25,7 +25,7 @@ impl Default for TCPServerTransport {
 }
 
 impl TCPServerTransport {
-    /// Instantiates a new instance of [TCPServerTransport]
+    /// Instantiates a new instance of [`TCPServerTransport`]
     pub fn new(socket_addr: SocketAddrV4) -> Self {
         Self {
             socket_addr,
@@ -33,7 +33,7 @@ impl TCPServerTransport {
         }
     }
 
-    /// Instantiate a new instance of [TCPServerTransport] using given address, or default if not specified.
+    /// Instantiate a new instance of [`TCPServerTransport`] using given address, or default if not specified.
     pub fn new_or_default(socket_addr: Option<SocketAddrV4>) -> Self {
         match socket_addr {
             Some(s) => Self::new(s),
@@ -41,7 +41,7 @@ impl TCPServerTransport {
         }
     }
 
-    /// Get underlying [SocketAddrV4]
+    /// Get underlying [`SocketAddrV4`]
     pub fn get_socketaddr(&self) -> SocketAddrV4 {
         self.socket_addr
     }
@@ -89,7 +89,7 @@ impl TCPServerTransport {
         )?)
     }
 
-    /// Send the given [SyncCommand] to ADB server, and checks that the request has been taken in consideration.
+    /// Send the given [`SyncCommand`] to ADB server, and checks that the request has been taken in consideration.
     pub(crate) fn send_sync_request(&mut self, command: SyncCommand) -> Result<()> {
         // First 4 bytes are the name of the command we want to send
         // (e.g. "SEND", "RECV", "STAT", "LIST")
@@ -98,22 +98,22 @@ impl TCPServerTransport {
             .write_all(command.to_string().as_bytes())?)
     }
 
-    /// Gets the body length from a LittleEndian value
-    pub(crate) fn get_body_length(&mut self) -> Result<u32> {
+    /// Gets the body length from a `LittleEndian` value
+    pub(crate) fn get_body_length(&self) -> Result<u32> {
         let length_buffer = self.read_body_length()?;
         Ok(LittleEndian::read_u32(&length_buffer))
     }
 
     /// Read 4 bytes representing body length
-    fn read_body_length(&mut self) -> Result<[u8; 4]> {
+    fn read_body_length(&self) -> Result<[u8; 4]> {
         let mut length_buffer = [0; 4];
         self.get_raw_connection()?.read_exact(&mut length_buffer)?;
 
         Ok(length_buffer)
     }
 
-    /// Send the given [AdbCommand] to ADB server, and checks that the request has been taken in consideration.
-    /// If an error occurred, a [RustADBError] is returned with the response error string.
+    /// Send the given [`AdbCommand`] to ADB server, and checks that the request has been taken in consideration.
+    /// If an error occurred, a [`RustADBError`] is returned with the response error string.
     pub(crate) fn send_adb_request(&mut self, command: AdbServerCommand) -> Result<()> {
         let adb_command_string = command.to_string();
         let adb_request = format!("{:04x}{}", adb_command_string.len(), adb_command_string);

adb_client/src/transports/tcp_transport.rs

@@ -16,7 +16,6 @@ use std::{
     fs::read_to_string,
     io::{Read, Write},
     net::{Shutdown, SocketAddr, TcpStream},
-    ops::{Deref, DerefMut},
     path::PathBuf,
     sync::{Arc, Mutex},
     time::Duration,
@@ -109,7 +108,7 @@ impl TcpTransport {
         })
     }
 
-    fn get_current_connection(&mut self) -> Result<Arc<Mutex<CurrentConnection>>> {
+    fn get_current_connection(&self) -> Result<Arc<Mutex<CurrentConnection>>> {
         self.current_connection
             .as_ref()
             .ok_or(RustADBError::IOError(std::io::Error::new(
@@ -120,18 +119,15 @@ impl TcpTransport {
     }
 
     pub(crate) fn upgrade_connection(&mut self) -> Result<()> {
-        let current_connection = match self.current_connection.clone() {
-            Some(current_connection) => current_connection,
-            None => {
-                return Err(RustADBError::UpgradeError(
-                    "cannot upgrade a non-existing connection...".into(),
-                ));
-            }
+        let Some(current_connection) = self.current_connection.clone() else {
+            return Err(RustADBError::UpgradeError(
+                "cannot upgrade a non-existing connection...".into(),
+            ));
         };
 
         {
             let mut current_conn_locked = current_connection.lock()?;
-            match current_conn_locked.deref() {
+            match &*current_conn_locked {
                 CurrentConnection::Tcp(tcp_stream) => {
                     // TODO: Check if we cannot be more precise
 
@@ -175,8 +171,7 @@ impl TcpTransport {
                 Ok(())
             }
             c => Err(RustADBError::ADBRequestFailed(format!(
-                "Wrong command received {}",
-                c
+                "Wrong command received {c}"
             ))),
         }
     }
@@ -193,7 +188,7 @@ impl ADBTransport for TcpTransport {
         log::debug!("disconnecting...");
         if let Some(current_connection) = &self.current_connection {
             let mut lock = current_connection.lock()?;
-            match lock.deref_mut() {
+            match &mut *lock {
                 CurrentConnection::Tcp(tcp_stream) => {
                     let _ = tcp_stream.shutdown(Shutdown::Both);
                 }

adb_client/src/transports/usb_transport.rs

@@ -29,7 +29,7 @@ pub struct USBTransport {
 
 impl USBTransport {
     /// Instantiate a new [`USBTransport`].
-    /// Only the first device with given vendor_id and product_id is returned.
+    /// Only the first device with given `vendor_id` and `product_id` is returned.
     pub fn new(vendor_id: u16, product_id: u16) -> Result<Self> {
         for device in rusb::devices()?.iter() {
             if let Ok(descriptor) = device.device_descriptor() {
@@ -40,8 +40,7 @@ impl USBTransport {
         }
 
         Err(RustADBError::DeviceNotFound(format!(
-            "cannot find USB device with vendor_id={} and product_id={}",
-            vendor_id, product_id
+            "cannot find USB device with vendor_id={vendor_id} and product_id={product_id}",
         )))
     }
 
@@ -91,14 +90,13 @@ impl USBTransport {
         Ok(())
     }
 
-    fn find_endpoints(&self, handle: &DeviceHandle<GlobalContext>) -> Result<(Endpoint, Endpoint)> {
+    fn find_endpoints(handle: &DeviceHandle<GlobalContext>) -> Result<(Endpoint, Endpoint)> {
         let mut read_endpoint: Option<Endpoint> = None;
         let mut write_endpoint: Option<Endpoint> = None;
 
         for n in 0..handle.device().device_descriptor()?.num_configurations() {
-            let config_desc = match handle.device().config_descriptor(n) {
-                Ok(c) => c,
-                Err(_) => continue,
+            let Ok(config_desc) = handle.device().config_descriptor(n) else {
+                continue;
             };
 
             for interface in config_desc.interfaces() {
@@ -118,16 +116,14 @@ impl USBTransport {
                                 Direction::In => {
                                     if let Some(write_endpoint) = write_endpoint {
                                         return Ok((endpoint, write_endpoint));
-                                    } else {
-                                        read_endpoint = Some(endpoint);
                                     }
+                                    read_endpoint = Some(endpoint);
                                 }
                                 Direction::Out => {
                                     if let Some(read_endpoint) = read_endpoint {
                                         return Ok((read_endpoint, endpoint));
-                                    } else {
-                                        write_endpoint = Some(endpoint);
                                     }
+                                    write_endpoint = Some(endpoint);
                                 }
                             }
                         }
@@ -151,12 +147,7 @@ impl USBTransport {
             let write_amount = handle.write_bulk(endpoint.address, &data[offset..end], timeout)?;
             offset += write_amount;
 
-            log::trace!(
-                "wrote chunk of size {} - {}/{}",
-                write_amount,
-                offset,
-                data_len
-            )
+            log::trace!("wrote chunk of size {write_amount} - {offset}/{data_len}",);
         }
 
         if offset % max_packet_size == 0 {
@@ -172,14 +163,14 @@ impl ADBTransport for USBTransport {
     fn connect(&mut self) -> crate::Result<()> {
         let device = self.device.open()?;
 
-        let (read_endpoint, write_endpoint) = self.find_endpoints(&device)?;
+        let (read_endpoint, write_endpoint) = Self::find_endpoints(&device)?;
 
         Self::configure_endpoint(&device, &read_endpoint)?;
-        log::debug!("got read endpoint: {:?}", read_endpoint);
+        log::debug!("got read endpoint: {read_endpoint:?}");
         self.read_endpoint = Some(read_endpoint);
 
         Self::configure_endpoint(&device, &write_endpoint)?;
-        log::debug!("got write endpoint: {:?}", write_endpoint);
+        log::debug!("got write endpoint: {write_endpoint:?}");
         self.write_endpoint = Some(write_endpoint);
 
         self.handle = Some(Arc::new(device));
@@ -197,7 +188,7 @@ impl ADBTransport for USBTransport {
             let endpoint = self.read_endpoint.as_ref().or(self.write_endpoint.as_ref());
             if let Some(endpoint) = &endpoint {
                 match handle.release_interface(endpoint.iface) {
-                    Ok(_) => log::debug!("succesfully released interface"),
+                    Ok(()) => log::debug!("succesfully released interface"),
                     Err(e) => log::error!("error while release interface: {e}"),
                 }
             }

pyadb_client/Cargo.toml

@@ -9,6 +9,7 @@ name = "pyadb_client"
 readme = "README.md"
 repository.workspace = true
 version.workspace = true
+rust-version.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -20,7 +21,7 @@ name = "stub_gen"
 
 [dependencies]
 adb_client = { path = "../adb_client" }
-anyhow = { version = "1.0.95" }
-pyo3 = { version = "0.25.0", features = ["abi3-py37", "anyhow"] }
-pyo3-stub-gen = "0.7.0"
-pyo3-stub-gen-derive = "0.7.0"
+anyhow = { version = "1.0.100" }
+pyo3 = { version = "0.27.1", features = ["abi3-py310", "anyhow"] }
+pyo3-stub-gen = { version = "0.17.0" }
+pyo3-stub-gen-derive = { version = "0.17.0" }

pyadb_client/pyproject.toml

@@ -6,7 +6,7 @@ requires = ["maturin>=1,<2"]
 classifiers = ["Programming Language :: Python", "Programming Language :: Rust"]
 dynamic = ["authors", "keywords", "version"]
 name = "pyadb_client"
-requires-python = ">= 3.7"
+requires-python = ">= 3.10"
 
 [tool.maturin]
-features = ["pyo3/extension-module"]
+features = ["pyo3/extension-module"]

pyadb_client/src/adb_server.rs

@@ -16,7 +16,7 @@ pub struct PyADBServer(ADBServer);
 #[pymethods]
 impl PyADBServer {
     #[new]
-    /// Instantiate a new PyADBServer instance
+    /// Instantiate a new `PyADBServer` instance
     pub fn new(address: String) -> PyResult<Self> {
         let address = address.parse::<SocketAddrV4>()?;
         Ok(ADBServer::new(address).into())
@@ -24,7 +24,12 @@ impl PyADBServer {
 
     /// List available devices
     pub fn devices(&mut self) -> Result<Vec<PyDeviceShort>> {
-        Ok(self.0.devices()?.into_iter().map(|v| v.into()).collect())
+        Ok(self
+            .0
+            .devices()?
+            .into_iter()
+            .map(std::convert::Into::into)
+            .collect())
     }
 
     /// Get a device, assuming that only one is currently connected