Merge pull request #156 from cocool97/mdns-feature

feat(mdns): add feature flag + example

.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-quality.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: rustup component add clippy
       - name: Run clippy
-        run: cargo clippy --all-features
+        run: cargo clippy --all-features -- -Dwarnings
 
   fmt:
     name: "fmt"

.github/workflows/rust-release.yml

@@ -36,10 +36,10 @@ jobs:
           CRATES_IO_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}
 
       - name: Build release
-        run: cargo build --all-features --release
+        run: cargo build -p adb_cli --release
 
       - name: Rename binary
-        run: mv target/release/adb_cli target/release/adb_cli-linux
+        run: cp target/release/adb_cli target/release/adb_cli-linux
 
       - name: Build DEB package
         run: cargo deb -p adb_cli
@@ -69,10 +69,10 @@ jobs:
           override: true
 
       - name: Build release
-        run: cargo build --all-features --release
+        run: cargo build -p adb_cli --release
 
       - name: Rename binary
-        run: mv target/release/adb_cli target/release/adb_cli-macos
+        run: cp target/release/adb_cli target/release/adb_cli-macos
 
       - name: Upload macOS binary
         uses: softprops/action-gh-release@v2
@@ -92,8 +92,13 @@ 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
+        run: cargo build -p adb_cli --release
 
       - name: Rename binary
         run: Rename-Item -Path target/release/adb_cli.exe -NewName adb_cli-windows.exe

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["adb_cli", "adb_client", "pyadb_client"]
+members = ["adb_cli", "adb_client", "pyadb_client", "examples/mdns"]
 resolver = "2"
 
 [workspace.package]
@@ -9,8 +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.16"
-rust-version = "1.85.1"
+version = "2.1.19"
+rust-version = "1.91.0"
 
 # To build locally when working on a new release
 [patch.crates-io]

README.md

@@ -42,6 +42,12 @@ Rust library implementing both ADB protocols (server and end-devices) and provid
 
 Improved documentation available [here](./adb_client/README.md).
 
+## examples
+
+Some examples showing of to use this library are available in the `examples` directory:
+
+- `examples/mdns`: mDNS device discovery
+
 ## adb_cli
 
 Rust binary providing an improved version of Google's official `adb` CLI, by using `adb_client` library.

adb_cli/Cargo.toml

@@ -11,11 +11,10 @@ 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.19", features = ["mdns"] }
+clap = { version = "4.5.53", features = ["derive"] }
+env_logger = { version = "0.11.8" }
+log = { version = "0.4.29" }
 
 [target.'cfg(unix)'.dependencies]
 termios = { version = "0.3.3" }

adb_cli/README.md

@@ -1,4 +1,4 @@
-# adb_cli
+# `adb_cli`
 
 [![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)

adb_cli/src/adb_termios.rs

@@ -4,7 +4,7 @@ use std::os::unix::prelude::{AsRawFd, RawFd};
 
 use termios::{TCSANOW, Termios, VMIN, VTIME, tcsetattr};
 
-use crate::Result;
+use crate::models::{ADBCliError, ADBCliResult};
 
 pub struct ADBTermios {
     fd: RawFd,
@@ -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, ADBCliError> {
         let mut new_termios = Termios::from_fd(fd.as_raw_fd())?;
         let old_termios = new_termios; // Saves previous state
         new_termios.c_lflag = 0;
@@ -27,7 +27,7 @@ impl ADBTermios {
         })
     }
 
-    pub fn set_adb_termios(&mut self) -> Result<()> {
+    pub fn set_adb_termios(&mut self) -> ADBCliResult<()> {
         Ok(tcsetattr(self.fd, TCSANOW, &self.new_termios)?)
     }
 }
@@ -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/emulator_commands.rs

@@ -1,8 +1,8 @@
 use adb_client::ADBEmulatorDevice;
 
-use crate::models::{EmuCommand, EmulatorCommand};
+use crate::models::{ADBCliResult, EmuCommand, EmulatorCommand};
 
-pub fn handle_emulator_commands(emulator_command: EmulatorCommand) -> anyhow::Result<()> {
+pub fn handle_emulator_commands(emulator_command: EmulatorCommand) -> ADBCliResult<()> {
     let mut emulator = ADBEmulatorDevice::new(emulator_command.serial, None)?;
 
     match emulator_command.command {

adb_cli/src/handlers/host_commands.rs

@@ -53,12 +53,15 @@ 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]");
                     }
                 }
             }

adb_cli/src/handlers/local_commands.rs

@@ -1,27 +1,25 @@
 use std::{fs::File, io::Write};
 
-use adb_client::ADBServerDevice;
-use anyhow::{Result, anyhow};
-
+use crate::ADBCliResult;
 use crate::models::LocalDeviceCommand;
+use adb_client::ADBServerDevice;
 
 pub fn handle_local_commands(
     mut device: ADBServerDevice,
     local_device_commands: LocalDeviceCommand,
-) -> Result<()> {
+) -> ADBCliResult<()> {
     match local_device_commands {
         LocalDeviceCommand::HostFeatures => {
             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"))?;
+                .unwrap_or_default();
             log::info!("Available host features: {features}");
 
             Ok(())
         }
-        LocalDeviceCommand::List { path } => Ok(device.list(path)?),
         LocalDeviceCommand::Logcat { path } => {
             let writer: Box<dyn Write> = if let Some(path) = path {
                 let f = File::create(path)?;

adb_cli/src/main.rs

@@ -8,13 +8,13 @@ mod models;
 mod utils;
 
 use adb_client::{
-    ADBDeviceExt, ADBServer, ADBServerDevice, ADBTcpDevice, ADBUSBDevice, MDNSDiscoveryService,
+    ADBDeviceExt, ADBListItemType, ADBServer, ADBServerDevice, ADBTcpDevice, ADBUSBDevice,
+    mdns::MDNSDiscoveryService,
 };
 
 #[cfg(any(target_os = "linux", target_os = "macos"))]
 use adb_termios::ADBTermios;
 
-use anyhow::Result;
 use clap::Parser;
 use handlers::{handle_emulator_commands, handle_host_commands, handle_local_commands};
 use models::{DeviceCommands, LocalCommand, MainCommand, Opts};
@@ -22,23 +22,112 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::io::Write;
 use std::path::Path;
+use std::process::ExitCode;
 use utils::setup_logger;
 
-fn main() -> Result<()> {
+use crate::models::{ADBCliError, ADBCliResult};
+
+fn run_command(mut device: Box<dyn ADBDeviceExt>, command: DeviceCommands) -> ADBCliResult<()> {
+    match command {
+        DeviceCommands::Shell { commands } => {
+            if commands.is_empty() {
+                // Need to duplicate some code here as ADBTermios [Drop] implementation resets terminal state.
+                // 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())?;
+                    adb_termios.set_adb_termios()?;
+                    device.shell(&mut std::io::stdin(), Box::new(std::io::stdout()))?;
+                }
+
+                #[cfg(not(any(target_os = "linux", target_os = "macos")))]
+                {
+                    device.shell(&mut std::io::stdin(), Box::new(std::io::stdout()))?;
+                }
+            } else {
+                let commands: Vec<&str> = commands.iter().map(String::as_str).collect();
+                device.shell_command(&commands, &mut std::io::stdout())?;
+            }
+        }
+        DeviceCommands::Pull {
+            source,
+            destination,
+        } => {
+            let mut output = File::create(Path::new(&destination))?;
+            device.pull(&source, &mut output)?;
+            log::info!("Downloaded {source} as {destination}");
+        }
+        DeviceCommands::Stat { path } => {
+            let stat_response = device.stat(&path)?;
+            println!("{stat_response}");
+        }
+        DeviceCommands::Reboot { reboot_type } => {
+            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))?;
+            device.push(&mut input, &path)?;
+            log::info!("Uploaded {filename} to {path}");
+        }
+        DeviceCommands::Run { package, activity } => {
+            let output = device.run_activity(&package, &activity)?;
+            std::io::stdout().write_all(&output)?;
+        }
+        DeviceCommands::Install { path } => {
+            log::info!("Starting installation of APK {}...", path.display());
+            device.install(&path)?;
+        }
+        DeviceCommands::Uninstall { package } => {
+            log::info!("Uninstalling the package {package}...");
+            device.uninstall(&package)?;
+        }
+        DeviceCommands::Framebuffer { path } => {
+            device.framebuffer(&path)?;
+            log::info!("Successfully dumped framebuffer at path {path}");
+        }
+        DeviceCommands::List { path } => {
+            let dirs = device.list(&path)?;
+            for dir in dirs {
+                let list_item_type = match dir.item_type {
+                    ADBListItemType::File => "File".to_string(),
+                    ADBListItemType::Directory => "Directory".to_string(),
+                    ADBListItemType::Symlink => "Symlink".to_string(),
+                };
+                log::info!(
+                    "type: {}, name: {}, time: {}, size: {}, permissions: {:#o}",
+                    list_item_type,
+                    dir.name,
+                    dir.time,
+                    dir.size,
+                    dir.permissions
+                );
+            }
+        }
+    }
+
+    Ok(())
+}
+
+fn main() -> ExitCode {
+    if let Err(err) = inner_main() {
+        log::error!("{err}");
+        return ExitCode::FAILURE;
+    }
+
+    ExitCode::SUCCESS
+}
+
+fn inner_main() -> ADBCliResult<()> {
     // This depends on `clap`
     let opts = Opts::parse();
 
-    // SAFETY:
-    // We are assuming the entire process is single-threaded
-    // at this point.
-    // This seems true for the current version of `clap`,
-    // but there's no guarantee for future updates
-    unsafe { setup_logger(opts.debug) };
+    setup_logger(opts.debug);
 
     // Directly handling methods / commands that aren't linked to [`ADBDeviceExt`] trait.
     // Other methods just have to create a concrete [`ADBDeviceExt`] instance, and return it.
     // This instance will then be used to execute desired command.
-    let (mut device, commands) = match opts.command {
+    let (device, commands) = match opts.command {
         MainCommand::Host(server_command) => return Ok(handle_host_commands(server_command)?),
         MainCommand::Emu(emulator_command) => return handle_emulator_commands(emulator_command),
         MainCommand::Local(server_command) => {
@@ -71,15 +160,19 @@ fn main() -> Result<()> {
                     None => ADBUSBDevice::autodetect()?,
                 },
                 _ => {
-                    anyhow::bail!(
-                        "please either supply values for both the --vendor-id and --product-id flags or none."
-                    );
+                    return Err(ADBCliError::Standard(
+                        "cannot specify flags --vendor-id without --product-id or vice versa"
+                            .into(),
+                    ));
                 }
             };
             (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 => {
@@ -91,75 +184,18 @@ fn main() -> Result<()> {
             log::info!("Starting mdns discovery...");
             while let Ok(device) = rx.recv() {
                 log::info!(
-                    "Found device {} with addresses {:?}",
+                    "Found device fullname='{}' with ipv4 addresses={:?} and ipv6 addresses={:?}",
                     device.fullname,
-                    device.addresses
-                )
+                    device.ipv4_addresses(),
+                    device.ipv6_addresses()
+                );
             }
 
             return Ok(service.shutdown()?);
         }
     };
 
-    match commands {
-        DeviceCommands::Shell { commands } => {
-            if commands.is_empty() {
-                // Need to duplicate some code here as ADBTermios [Drop] implementation resets terminal state.
-                // 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())?;
-                    adb_termios.set_adb_termios()?;
-                    device.shell(&mut std::io::stdin(), Box::new(std::io::stdout()))?;
-                }
-
-                #[cfg(not(any(target_os = "linux", target_os = "macos")))]
-                {
-                    device.shell(&mut std::io::stdin(), Box::new(std::io::stdout()))?;
-                }
-            } else {
-                let commands: Vec<&str> = commands.iter().map(|v| v.as_str()).collect();
-                device.shell_command(&commands, &mut std::io::stdout())?;
-            }
-        }
-        DeviceCommands::Pull {
-            source,
-            destination,
-        } => {
-            let mut output = File::create(Path::new(&destination))?;
-            device.pull(&source, &mut output)?;
-            log::info!("Downloaded {source} as {destination}");
-        }
-        DeviceCommands::Stat { path } => {
-            let stat_response = device.stat(&path)?;
-            println!("{stat_response}");
-        }
-        DeviceCommands::Reboot { reboot_type } => {
-            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))?;
-            device.push(&mut input, &path)?;
-            log::info!("Uploaded {filename} to {path}");
-        }
-        DeviceCommands::Run { package, activity } => {
-            let output = device.run_activity(&package, &activity)?;
-            std::io::stdout().write_all(&output)?;
-        }
-        DeviceCommands::Install { path } => {
-            log::info!("Starting installation of APK {}...", path.display());
-            device.install(&path)?;
-        }
-        DeviceCommands::Uninstall { package } => {
-            log::info!("Uninstalling the package {package}...");
-            device.uninstall(&package)?;
-        }
-        DeviceCommands::Framebuffer { path } => {
-            device.framebuffer(&path)?;
-            log::info!("Successfully dumped framebuffer at path {path}");
-        }
-    }
+    run_command(device, commands)?;
 
     Ok(())
 }

adb_cli/src/models/adb_cli_error.rs

@@ -0,0 +1,84 @@
+use std::fmt::Display;
+
+use adb_client::RustADBError;
+
+pub type ADBCliResult<T> = Result<T, ADBCliError>;
+
+pub enum ADBCliError {
+    Standard(Box<dyn std::error::Error>),
+    MayNeedAnIssue(Box<dyn std::error::Error>),
+}
+
+impl Display for ADBCliError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ADBCliError::Standard(error) => write!(f, "{error}"),
+            ADBCliError::MayNeedAnIssue(error) => {
+                write!(
+                    f,
+                    r"Error: {error}
+                    An unexpected error occurred and may indicate a bug.
+                    Please report this issue on the project repository (including steps to reproduce if possible): https://github.com/cocool97/adb_client/issues.",
+                )
+            }
+        }
+    }
+}
+
+impl From<std::io::Error> for ADBCliError {
+    fn from(value: std::io::Error) -> Self {
+        // We do not consider adb_cli related `std::io::error` as critical
+        Self::Standard(Box::new(value))
+    }
+}
+
+impl From<adb_client::RustADBError> for ADBCliError {
+    fn from(value: adb_client::RustADBError) -> Self {
+        let value = Box::new(value);
+
+        match value.as_ref() {
+            // List of [`RustADBError`] that may need an issue as abnormal
+            RustADBError::RegexParsingError
+            | RustADBError::WrongResponseReceived(_, _)
+            | RustADBError::FramebufferImageError(_)
+            | RustADBError::FramebufferConversionError
+            | RustADBError::UnimplementedFramebufferImageVersion(_)
+            | RustADBError::IOError(_)
+            | RustADBError::ADBRequestFailed(_)
+            | RustADBError::UnknownDeviceState(_)
+            | RustADBError::Utf8StrError(_)
+            | RustADBError::Utf8StringError(_)
+            | RustADBError::RegexError(_)
+            | RustADBError::ParseIntError(_)
+            | RustADBError::ConversionError
+            | RustADBError::IntegerConversionError(_)
+            | RustADBError::HomeError
+            | RustADBError::NoHomeDirectory
+            | RustADBError::UsbError(_)
+            | RustADBError::InvalidIntegrity(_, _)
+            | RustADBError::Base64DecodeError(_)
+            | RustADBError::Base64EncodeError(_)
+            | RustADBError::RSAError(_)
+            | RustADBError::TryFromSliceError(_)
+            | RustADBError::RsaPkcs8Error(_)
+            | RustADBError::CertificateGenerationError(_)
+            | RustADBError::TLSError(_)
+            | RustADBError::PemCertError(_)
+            | RustADBError::PoisonError
+            | RustADBError::UpgradeError(_)
+            | RustADBError::MDNSError(_)
+            | RustADBError::SendError
+            | RustADBError::UnknownFileMode(_)
+            | RustADBError::UnknownTransport(_) => Self::MayNeedAnIssue(value),
+            // List of [`RustADBError`] that may occur in standard contexts and therefore do not require for issues
+            RustADBError::ADBDeviceNotPaired
+            | RustADBError::UnknownResponseType(_)
+            | RustADBError::DeviceNotFound(_)
+            | RustADBError::USBNoDescriptorFound
+            | RustADBError::ADBShellNotSupported
+            | RustADBError::USBDeviceNotFound(_, _)
+            | RustADBError::WrongFileExtension(_)
+            | RustADBError::AddrParseError(_) => Self::Standard(value),
+        }
+    }
+}

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,
     },
@@ -43,4 +43,9 @@ pub enum DeviceCommands {
         /// Framebuffer image destination path
         path: String,
     },
+    /// List files on device
+    List {
+        /// Path to list files from
+        path: String,
+    },
 }

adb_cli/src/models/host.rs

@@ -1,4 +1,4 @@
-use std::net::SocketAddrV4;
+use std::{net::SocketAddrV4, str::FromStr};
 
 use adb_client::{RustADBError, WaitForDeviceTransport};
 use clap::Parser;
@@ -6,7 +6,7 @@ use clap::Parser;
 fn parse_wait_for_device_device_transport(
     value: &str,
 ) -> Result<WaitForDeviceTransport, RustADBError> {
-    WaitForDeviceTransport::try_from(value)
+    WaitForDeviceTransport::from_str(value)
 }
 
 #[derive(Parser, Debug)]

adb_cli/src/models/local.rs

@@ -14,8 +14,6 @@ pub enum LocalCommand {
 pub enum LocalDeviceCommand {
     /// List available server features.
     HostFeatures,
-    /// List a directory on device
-    List { path: String },
     /// Get logs of device
     Logcat {
         /// Path to output file (created if not exists)

adb_cli/src/models/mod.rs

@@ -1,3 +1,4 @@
+mod adb_cli_error;
 mod device;
 mod emu;
 mod host;
@@ -7,6 +8,7 @@ mod reboot_type;
 mod tcp;
 mod usb;
 
+pub use adb_cli_error::{ADBCliError, ADBCliResult};
 pub use device::DeviceCommands;
 pub use emu::{EmuCommand, EmulatorCommand};
 pub use host::{HostCommand, MdnsCommand};

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

@@ -1,17 +1,9 @@
-/// # Safety
-///
-/// This conditionally mutates the process' environment.
-/// See [`std::env::set_var`] for more info.
-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",
-        };
+use env_logger::{Builder, Env};
 
-        unsafe { std::env::set_var("RUST_LOG", level) };
-    }
-
-    env_logger::init();
+/// Sets up appropriate logger level:
+/// - if `RUST_LOG` environment variable is set, use its value
+/// - else, use `debug` CLI option
+pub fn setup_logger(debug: bool) {
+    Builder::from_env(Env::default().default_filter_or(if debug { "debug" } else { "info" }))
+        .init();
 }

adb_client/Cargo.toml

@@ -10,38 +10,46 @@ repository.workspace = true
 rust-version.workspace = true
 version.workspace = true
 
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[features]
+default = []
+mdns = ["dep:mdns-sd"]
+
 [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 = [
-    "logging",
-] }
-num-bigint = { version = "0.8.4", package = "num-bigint-dig" }
+chrono = { version = "0.4.42", default-features = false, features = ["std"] }
+image = { version = "0.25.9", default-features = false, features = ["png"] }
+log = { version = "0.4.29" }
+num-bigint = { version = "0.8.6", 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.6" }
+regex = { version = "1.12.2", features = ["perf", "std", "unicode"] }
+rsa = { version = "0.9.9" }
 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.2" }
+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" }
+
+#########
+# `mdns` feature-specific dependencies
+mdns-sd = { version = "0.17.1", default-features = false, features = [
+    "logging",
+], optional = true }
+#########
 
 [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

@@ -1,4 +1,4 @@
-# adb_client
+# `adb_client`
 
 [![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)
@@ -16,6 +16,19 @@ Add `adb_client` crate as a dependency by simply adding it to your `Cargo.toml`:
 adb_client = "*"
 ```
 
+## Crate features
+
+| Feature |                   Description                   | Default? |
+| :-----: | :---------------------------------------------: | :------: |
+| `mdns`  | Enables mDNS device discovery on local network. |    No    |
+
+To deactivate some default features you can use the `default-features = false` option in your `Cargo.toml` file and manually specify the features you want to activate:
+
+```toml
+[dependencies]
+adb_client = { version = "*", default-features = false, features = ["mdns"] }
+```
+
 ## Benchmarks
 
 Benchmarks run on `v2.0.6`, on a **Samsung S10 SM-G973F** device and an **Intel i7-1265U** CPU laptop
@@ -24,11 +37,11 @@ Benchmarks run on `v2.0.6`, on a **Samsung S10 SM-G973F** device and an **Intel
 
 `ADBServerDevice` performs all operations by using adb server as a bridge.
 
-|File size|Sample size|`ADBServerDevice`|`adb`|Difference|
-|:-------:|:---------:|:----------:|:---:|:-----:|
-|10 MB|100|350,79 ms|356,30 ms|<div style="color:green">-1,57 %</div>|
-|500 MB|50|15,60 s|15,64 s|<div style="color:green">-0,25 %</div>|
-|1 GB|20|31,09 s|31,12 s|<div style="color:green">-0,10 %</div>|
+| File size | Sample size | `ADBServerDevice` |   `adb`   |               Difference               |
+| :-------: | :---------: | :---------------: | :-------: | :------------------------------------: |
+|   10 MB   |     100     |     350,79 ms     | 356,30 ms | <div style="color:green">-1,57 %</div> |
+|  500 MB   |     50      |      15,60 s      |  15,64 s  | <div style="color:green">-0,25 %</div> |
+|   1 GB    |     20      |      31,09 s      |  31,12 s  | <div style="color:green">-0,10 %</div> |
 
 ## Examples
 

adb_client/src/adb_device_ext.rs

@@ -4,7 +4,7 @@ use std::path::Path;
 use image::{ImageBuffer, ImageFormat, Rgba};
 
 use crate::models::AdbStatResponse;
-use crate::{RebootType, Result};
+use crate::{ADBListItem, RebootType, Result};
 
 /// Trait representing all features available on both [`crate::ADBServerDevice`] and [`crate::ADBUSBDevice`]
 pub trait ADBDeviceExt {
@@ -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>;
@@ -24,6 +24,9 @@ pub trait ADBDeviceExt {
     /// Push `stream` to `path` on the device.
     fn push(&mut self, stream: &mut dyn Read, path: &dyn AsRef<str>) -> Result<()>;
 
+    /// List the items in a directory on the device
+    fn list(&mut self, path: &dyn AsRef<str>) -> Result<Vec<ADBListItem>>;
+
     /// Reboot the device using given reboot type
     fn reboot(&mut self, reboot_type: RebootType) -> Result<()>;
 
@@ -47,7 +50,9 @@ pub trait ADBDeviceExt {
     /// Inner method requesting framebuffer from an Android device
     fn framebuffer_inner(&mut self) -> Result<ImageBuffer<Rgba<u8>, Vec<u8>>>;
 
-    /// Dump framebuffer of this device into given path
+    /// Dump framebuffer of this device into given path.
+    ///
+    /// Output data format is currently only `PNG`.
     fn framebuffer(&mut self, path: &dyn AsRef<Path>) -> Result<()> {
         // Big help from AOSP source code (<https://android.googlesource.com/platform/system/adb/+/refs/heads/main/framebuffer_service.cpp>)
         let img = self.framebuffer_inner()?;

adb_client/src/device/adb_message_device.rs

@@ -1,28 +1,39 @@
-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::device::models::ADBSession;
 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.
 #[derive(Debug)]
 pub struct ADBMessageDevice<T: ADBMessageTransport> {
     transport: T,
-    local_id: Option<u32>,
-    remote_id: Option<u32>,
 }
 
 impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     /// Instantiate a new [`ADBMessageTransport`]
     pub fn new(transport: T) -> Self {
-        Self {
-            transport,
-            local_id: None,
-            remote_id: None,
-        }
+        Self { transport }
     }
 
     pub(crate) fn get_transport(&mut self) -> &T {
@@ -33,13 +44,76 @@ 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> {
+    pub(crate) fn recv_and_reply_okay(
+        &mut self,
+        session: ADBSession,
+    ) -> Result<ADBTransportMessage> {
         let message = self.transport.read_message()?;
         self.transport.write_message(ADBTransportMessage::new(
             MessageCommand::Okay,
-            self.get_local_id()?,
-            self.get_remote_id()?,
+            session.local_id(),
+            session.remote_id(),
             &[],
         ))?;
         Ok(message)
@@ -60,17 +134,18 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
 
     pub(crate) fn recv_file<W: std::io::Write>(
         &mut self,
+        session: ADBSession,
         mut output: W,
     ) -> std::result::Result<(), RustADBError> {
         let mut len: Option<u64> = None;
         loop {
-            let payload = self.recv_and_reply_okay()?.into_payload();
+            let payload = self.recv_and_reply_okay(session)?.into_payload();
             let mut rdr = Cursor::new(&payload);
             while rdr.position() != payload.len() as u64 {
                 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 +161,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;
@@ -97,42 +172,38 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
 
     pub(crate) fn push_file<R: std::io::Read>(
         &mut self,
-        local_id: u32,
-        remote_id: u32,
+        session: ADBSession,
         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(
             MessageCommand::Write,
-            local_id,
-            remote_id,
+            session.local_id(),
+            session.remote_id(),
             &serialized_message,
         );
 
         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,
-                        remote_id,
+                        session.local_id(),
+                        session.remote_id(),
                         &serialized_message,
                     );
 
@@ -150,16 +221,15 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
                     }
                 }
                 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(
                         MessageCommand::Write,
-                        local_id,
-                        remote_id,
+                        session.local_id(),
+                        session.remote_id(),
                         &serialized_message,
                     );
 
@@ -172,51 +242,55 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
         }
     }
 
-    pub(crate) fn begin_synchronization(&mut self) -> Result<()> {
-        self.open_session(b"sync:\0")?;
-        Ok(())
+    pub(crate) fn begin_synchronization(&mut self) -> Result<ADBSession> {
+        self.open_session(b"sync:\0")
     }
 
-    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);
+    pub(crate) fn stat_with_explicit_ids(
+        &mut self,
+        session: ADBSession,
+        remote_path: &str,
+    ) -> Result<AdbStatResponse> {
+        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)?,
+            session.local_id(),
+            session.remote_id(),
+            &bincode_serialize_to_vec(&stat_buffer)?,
         );
         self.send_and_expect_okay(message)?;
         self.send_and_expect_okay(ADBTransportMessage::new(
             MessageCommand::Write,
-            self.get_local_id()?,
-            self.get_remote_id()?,
+            session.local_id(),
+            session.remote_id(),
             remote_path.as_bytes(),
         ))?;
         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<()> {
+    pub(crate) fn end_transaction(&mut self, session: ADBSession) -> Result<()> {
         let quit_buffer = MessageSubcommand::Quit.with_arg(0u32);
         self.send_and_expect_okay(ADBTransportMessage::new(
             MessageCommand::Write,
-            self.get_local_id()?,
-            self.get_remote_id()?,
-            &bincode::serialize(&quit_buffer).map_err(|_e| RustADBError::ConversionError)?,
+            session.local_id(),
+            session.remote_id(),
+            &bincode_serialize_to_vec(&quit_buffer)?,
         ))?;
         let _discard_close = self.transport.read_message()?;
         Ok(())
     }
 
-    pub(crate) fn open_session(&mut self, data: &[u8]) -> Result<ADBTransportMessage> {
+    pub(crate) fn open_session(&mut self, data: &[u8]) -> Result<ADBSession> {
         let mut rng = rand::rng();
+        let local_id: u32 = rng.random();
 
         let message = ADBTransportMessage::new(
             MessageCommand::Open,
-            rng.random(), // Our 'local-id'
+            local_id, // Our 'local-id'
             0,
             data,
         );
@@ -224,21 +298,20 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
 
         let response = self.get_transport_mut().read_message()?;
 
-        self.local_id = Some(response.header().arg1());
-        self.remote_id = Some(response.header().arg0());
+        if response.header().command() != MessageCommand::Okay {
+            return Err(RustADBError::ADBRequestFailed(format!(
+                "Open session failed: got {} in respone instead of OKAY",
+                response.header().command()
+            )));
+        }
 
-        Ok(response)
-    }
+        if response.header().arg1() != local_id {
+            return Err(RustADBError::ADBRequestFailed(format!(
+                "Open session failed: respones used {} for our local_id instead of {local_id}",
+                response.header().arg1()
+            )));
+        }
 
-    pub(crate) fn get_local_id(&self) -> Result<u32> {
-        self.local_id.ok_or(RustADBError::ADBRequestFailed(
-            "connection not opened, no local_id".into(),
-        ))
-    }
-
-    pub(crate) fn get_remote_id(&self) -> Result<u32> {
-        self.remote_id.ok_or(RustADBError::ADBRequestFailed(
-            "connection not opened, no remote_id".into(),
-        ))
+        Ok(ADBSession::new(local_id, response.header().arg0()))
     }
 }

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)
     }
 
@@ -42,4 +42,8 @@ impl<T: ADBMessageTransport> ADBDeviceExt for ADBMessageDevice<T> {
     fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
         self.framebuffer_inner()
     }
+
+    fn list(&mut self, path: &dyn AsRef<str>) -> Result<Vec<crate::ADBListItem>> {
+        self.list(path)
+    }
 }

adb_client/src/device/adb_tcp_device.rs

@@ -2,21 +2,42 @@ use std::io::Write;
 use std::path::Path;
 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.
+/// Represent a device reached and available over TCP.
 #[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<P: AsRef<Path>>(
+        address: SocketAddr,
+        private_key_path: P,
+    ) -> 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.as_ref().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)
     }
 
@@ -113,6 +136,10 @@ impl ADBDeviceExt for ADBTcpDevice {
     fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
         self.inner.framebuffer_inner()
     }
+
+    fn list(&mut self, path: &dyn AsRef<str>) -> Result<Vec<crate::ADBListItem>> {
+        self.inner.list(path)
+    }
 }
 
 impl Drop for ADBTcpDevice {

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,7 +14,6 @@ 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>> {
@@ -93,9 +91,7 @@ pub fn is_adb_device<T: UsbContext>(device: &Device<T>, des: &DeviceDescriptor)
 }
 
 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,10 +110,10 @@ impl ADBUSBDevice {
     }
 
     /// Instantiate a new [`ADBUSBDevice`] using a custom private key path
-    pub fn new_with_custom_private_key(
+    pub fn new_with_custom_private_key<P: AsRef<Path>>(
         vendor_id: u16,
         product_id: u16,
-        private_key_path: PathBuf,
+        private_key_path: P,
     ) -> Result<Self> {
         Self::new_from_transport_inner(USBTransport::new(vendor_id, product_id)?, private_key_path)
     }
@@ -132,22 +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(
+    fn new_from_transport_inner<P: AsRef<Path>>(
         transport: USBTransport,
-        private_key_path: PathBuf,
+        private_key_path: P,
     ) -> Result<Self> {
-        let private_key = match read_adb_private_key(&private_key_path)? {
-            Some(pk) => pk,
-            None => {
-                log::warn!(
-                    "No private key found at path {}. Using a temporary random one.",
-                    private_key_path.display()
-                );
-                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.as_ref().display()
+            );
+            ADBRsaKey::new_random()?
         };
 
         let mut s = Self {
@@ -183,8 +178,8 @@ impl ADBUSBDevice {
 
         let message = ADBTransportMessage::new(
             MessageCommand::Cnxn,
-            0x01000000,
-            1048576,
+            0x0100_0000,
+            1_048_576,
             format!("host::{}\0", env!("CARGO_PKG_NAME")).as_bytes(),
         );
 
@@ -196,55 +191,9 @@ impl ADBUSBDevice {
         if message.header().command() == MessageCommand::Cnxn {
             return Ok(());
         }
+
         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())?
-            );
-            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(())
+        self.inner.auth_handshake(message, &self.private_key)
     }
 
     #[inline]
@@ -260,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)
     }
 
@@ -298,6 +247,10 @@ impl ADBDeviceExt for ADBUSBDevice {
     fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
         self.inner.framebuffer_inner()
     }
+
+    fn list(&mut self, path: &dyn AsRef<str>) -> Result<Vec<crate::ADBListItem>> {
+        self.inner.list(path)
+    }
 }
 
 impl Drop for ADBUSBDevice {

adb_client/src/device/commands/framebuffer.rs

@@ -11,9 +11,9 @@ use crate::{
 
 impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     pub(crate) fn framebuffer_inner(&mut self) -> Result<ImageBuffer<Rgba<u8>, Vec<u8>>> {
-        self.open_session(b"framebuffer:\0")?;
+        let session = self.open_session(b"framebuffer:\0")?;
 
-        let response = self.recv_and_reply_okay()?;
+        let response = self.recv_and_reply_okay(session)?;
 
         let mut payload_cursor = Cursor::new(response.payload());
 
@@ -32,11 +32,11 @@ 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;
                     }
 
-                    let response = self.recv_and_reply_okay()?;
+                    let response = self.recv_and_reply_okay(session)?;
 
                     framebuffer_data.extend_from_slice(&response.into_payload());
 
@@ -65,11 +65,11 @@ 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;
                     }
 
-                    let response = self.recv_and_reply_okay()?;
+                    let response = self.recv_and_reply_okay(session)?;
 
                     framebuffer_data.extend_from_slice(&response.into_payload());
 

adb_client/src/device/commands/install.rs

@@ -14,11 +14,12 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
 
         let file_size = apk_file.metadata()?.len();
 
-        self.open_session(format!("exec:cmd package 'install' -S {file_size}\0").as_bytes())?;
+        let session =
+            self.open_session(format!("exec:cmd package 'install' -S {file_size}\0").as_bytes())?;
 
         let transport = self.get_transport().clone();
 
-        let mut writer = MessageWriter::new(transport, self.get_local_id()?, self.get_remote_id()?);
+        let mut writer = MessageWriter::new(transport, session.local_id(), session.remote_id());
 
         std::io::copy(&mut apk_file, &mut writer)?;
 

adb_client/src/device/commands/list.rs

@@ -0,0 +1,177 @@
+use crate::{
+    ADBListItem, ADBListItemType, ADBMessageTransport, Result, RustADBError,
+    device::{
+        ADBTransportMessage, MessageCommand, MessageSubcommand,
+        adb_message_device::{ADBMessageDevice, bincode_serialize_to_vec},
+    },
+};
+use byteorder::ByteOrder;
+use byteorder::LittleEndian;
+use std::str;
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    /// List the entries in the given directory on the device.
+    /// note: path uses internal file paths, so Documents is at /storage/emulated/0/Documents
+    pub(crate) fn list<A: AsRef<str>>(&mut self, path: A) -> Result<Vec<ADBListItem>> {
+        let session = self.begin_synchronization()?;
+
+        let output = self.handle_list(path, session.local_id(), session.remote_id());
+
+        self.end_transaction(session)?;
+        output
+    }
+
+    /// Request amount of bytes from transport, potentially across payloads
+    ///
+    /// This automatically request a new payload by sending back "Okay" and waiting for the next payload
+    /// It reads the request bytes across the existing payload, and if there is not enough bytes left,
+    /// reads the rest from the next payload
+    ///
+    ///   Current index
+    /// ┼───────────────┼   Requested
+    ///                 ┌─────────────┐
+    /// ┌───────────────┼───────┐     │
+    /// └───────────────────────┘
+    ///     Current             └─────┘
+    ///     payload          Wanted in
+    ///                      Next payload
+    fn read_bytes_from_transport(
+        requested_bytes: usize,
+        current_index: &mut usize,
+        transport: &mut T,
+        payload: &mut Vec<u8>,
+        local_id: u32,
+        remote_id: u32,
+    ) -> Result<Vec<u8>> {
+        if *current_index + requested_bytes <= payload.len() {
+            // if there is enough bytes in this payload
+            // Copy from existing payload
+            let slice = &payload[*current_index..*current_index + requested_bytes];
+            *current_index += requested_bytes;
+            Ok(slice.to_vec())
+        } else {
+            // Read the rest of the existing payload, then continue with the next message
+            let mut slice = Vec::new();
+            let bytes_read_from_existing_payload = payload.len() - *current_index;
+            slice.extend_from_slice(
+                &payload[*current_index..*current_index + bytes_read_from_existing_payload],
+            );
+
+            // Request the next message
+            let send_message =
+                ADBTransportMessage::new(MessageCommand::Okay, local_id, remote_id, &[]);
+            transport.write_message(send_message)?;
+            // Read the new message
+            *payload = transport.read_message()?.into_payload();
+            let bytes_read_from_new_payload = requested_bytes - bytes_read_from_existing_payload;
+            slice.extend_from_slice(&payload[..bytes_read_from_new_payload]);
+            *current_index = bytes_read_from_new_payload;
+            Ok(slice)
+        }
+    }
+
+    fn handle_list<A: AsRef<str>>(
+        &mut self,
+        path: A,
+        local_id: u32,
+        remote_id: u32,
+    ) -> Result<Vec<ADBListItem>> {
+        // TODO: use LIS2 to support files over 2.14 GB in size.
+        // SEE: https://github.com/cstyan/adbDocumentation?tab=readme-ov-file#adb-list
+        {
+            let mut len_buf = Vec::from([0_u8; 4]);
+            LittleEndian::write_u32(&mut len_buf, u32::try_from(path.as_ref().len())?);
+
+            let subcommand_data = MessageSubcommand::List;
+
+            let mut serialized_message = bincode_serialize_to_vec(subcommand_data)
+                .map_err(|_e| RustADBError::ConversionError)?;
+
+            serialized_message.append(&mut len_buf);
+            let mut path_bytes: Vec<u8> = Vec::from(path.as_ref().as_bytes());
+            serialized_message.append(&mut path_bytes);
+
+            let message = ADBTransportMessage::new(
+                MessageCommand::Write,
+                local_id,
+                remote_id,
+                &serialized_message,
+            );
+            self.send_and_expect_okay(message)?;
+        }
+
+        let mut list_items = Vec::new();
+
+        let transport = self.get_transport_mut();
+        let mut payload = transport.read_message()?.into_payload();
+        let mut current_index = 0;
+        loop {
+            // Loop though the response for all the entries
+            const STATUS_CODE_LENGTH_IN_BYTES: usize = 4;
+            let status_code = Self::read_bytes_from_transport(
+                STATUS_CODE_LENGTH_IN_BYTES,
+                &mut current_index,
+                transport,
+                &mut payload,
+                local_id,
+                remote_id,
+            )?;
+            match str::from_utf8(&status_code)? {
+                "DENT" => {
+                    // Read the file mode, size, mod time and name length in one go, since all their sizes are predictable
+                    const U32_SIZE_IN_BYTES: usize = 4;
+                    const SIZE_OF_METADATA: usize = U32_SIZE_IN_BYTES * 4;
+                    let metadata = Self::read_bytes_from_transport(
+                        SIZE_OF_METADATA,
+                        &mut current_index,
+                        transport,
+                        &mut payload,
+                        local_id,
+                        remote_id,
+                    )?;
+                    let mode = metadata[..U32_SIZE_IN_BYTES].to_vec();
+                    let size = metadata[U32_SIZE_IN_BYTES..2 * U32_SIZE_IN_BYTES].to_vec();
+                    let time = metadata[2 * U32_SIZE_IN_BYTES..3 * U32_SIZE_IN_BYTES].to_vec();
+                    let name_len = metadata[3 * U32_SIZE_IN_BYTES..4 * U32_SIZE_IN_BYTES].to_vec();
+
+                    let mode = LittleEndian::read_u32(&mode);
+                    let size = LittleEndian::read_u32(&size);
+                    let time = LittleEndian::read_u32(&time);
+                    let name_len = LittleEndian::read_u32(&name_len) as usize;
+                    // Read the file name, since it requires the length from the name_len
+                    let name_buf = Self::read_bytes_from_transport(
+                        name_len,
+                        &mut current_index,
+                        transport,
+                        &mut payload,
+                        local_id,
+                        remote_id,
+                    )?;
+                    let name = String::from_utf8(name_buf)?;
+
+                    // First 9 bits are the file permissions
+                    let permissions = mode & 0b1_1111_1111;
+                    // Bits 14 to 16 are the file type
+                    let item_type = match (mode >> 13) & 0b111 {
+                        0b010 => ADBListItemType::Directory,
+                        0b100 => ADBListItemType::File,
+                        0b101 => ADBListItemType::Symlink,
+                        type_code => return Err(RustADBError::UnknownFileMode(type_code)),
+                    };
+                    let entry = ADBListItem {
+                        item_type,
+                        name,
+                        time,
+                        size,
+                        permissions,
+                    };
+                    list_items.push(entry);
+                }
+                "DONE" => {
+                    return Ok(list_items);
+                }
+                x => log::error!("Got an unknown response {x}"),
+            }
+        }
+    }
+}

adb_client/src/device/commands/mod.rs

@@ -1,5 +1,6 @@
 mod framebuffer;
 mod install;
+mod list;
 mod pull;
 mod push;
 mod reboot;

adb_client/src/device/commands/pull.rs

@@ -3,17 +3,18 @@ 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,
     },
 };
 
 impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     pub(crate) fn pull<A: AsRef<str>, W: Write>(&mut self, source: A, output: W) -> Result<()> {
-        self.begin_synchronization()?;
+        let session = self.begin_synchronization()?;
         let source = source.as_ref();
 
-        let adb_stat_response = self.stat_with_explicit_ids(source)?;
+        let adb_stat_response = self.stat_with_explicit_ids(session, source)?;
 
         if adb_stat_response.file_perm == 0 {
             return Err(RustADBError::UnknownResponseType(
@@ -21,32 +22,33 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
             ));
         }
 
-        let local_id = self.get_local_id()?;
-        let remote_id = self.get_remote_id()?;
-
         self.get_transport_mut().write_message_with_timeout(
-            ADBTransportMessage::new(MessageCommand::Okay, local_id, remote_id, &[]),
+            ADBTransportMessage::new(
+                MessageCommand::Okay,
+                session.local_id(),
+                session.remote_id(),
+                &[],
+            ),
             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()?,
-            self.get_remote_id()?,
+            session.local_id(),
+            session.remote_id(),
             &recv_buffer,
         ))?;
         self.send_and_expect_okay(ADBTransportMessage::new(
             MessageCommand::Write,
-            self.get_local_id()?,
-            self.get_remote_id()?,
+            session.local_id(),
+            session.remote_id(),
             source.as_bytes(),
         ))?;
 
-        self.recv_file(output)?;
-        self.end_transaction()?;
+        self.recv_file(session, output)?;
+        self.end_transaction(session)?;
         Ok(())
     }
 }

adb_client/src/device/commands/push.rs

@@ -1,34 +1,32 @@
 use std::io::Read;
 
 use crate::{
-    ADBMessageTransport, Result, RustADBError,
+    ADBMessageTransport, Result,
     device::{
         ADBTransportMessage, MessageCommand, MessageSubcommand,
-        adb_message_device::ADBMessageDevice,
+        adb_message_device::{self, ADBMessageDevice},
     },
 };
 
 impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     pub(crate) fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
-        self.begin_synchronization()?;
+        let session = self.begin_synchronization()?;
 
         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(
             MessageCommand::Write,
-            self.get_local_id()?,
-            self.get_remote_id()?,
+            session.local_id(),
+            session.remote_id(),
             &send_buffer,
         ))?;
 
-        self.push_file(self.get_local_id()?, self.get_remote_id()?, stream)?;
-
-        self.end_transaction()?;
+        self.push_file(session, stream)?;
+        self.end_transaction(session)?;
 
         Ok(())
     }

adb_client/src/device/commands/shell.rs

@@ -1,4 +1,5 @@
 use std::io::{ErrorKind, Read, Write};
+use std::time::Duration;
 
 use crate::Result;
 use crate::device::ShellMessageWriter;
@@ -10,24 +11,35 @@ use crate::{
 impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     /// Runs 'command' in a shell on the device, and write its output and error streams into output.
     pub(crate) fn shell_command(&mut self, command: &[&str], output: &mut dyn Write) -> Result<()> {
-        let response = self.open_session(format!("shell:{}\0", command.join(" "),).as_bytes())?;
+        let session = self.open_session(format!("shell:{}\0", command.join(" "),).as_bytes())?;
 
-        if response.header().command() != MessageCommand::Okay {
-            return Err(RustADBError::ADBRequestFailed(format!(
-                "wrong command {}",
-                response.header().command()
-            )));
-        }
+        let mut transport = self.get_transport().clone();
 
         loop {
-            let response = self.get_transport_mut().read_message()?;
-            if response.header().command() != MessageCommand::Write {
+            let message = transport.read_message()?;
+            let command = message.header().command();
+
+            if command == MessageCommand::Clse {
                 break;
             }
 
-            output.write_all(&response.into_payload())?;
+            self.get_transport_mut()
+                .write_message(ADBTransportMessage::new(
+                    MessageCommand::Okay,
+                    session.local_id(),
+                    session.remote_id(),
+                    &[],
+                ))?;
+
+            output.write_all(&message.into_payload())?;
         }
 
+        // some devices will repeat the trailing CLSE command to ensure
+        // the client has acknowledged it. Read them quickly if present.
+        while let Ok(_discard_close_message) =
+            transport.read_message_with_timeout(Duration::from_millis(20))
+        {}
+
         Ok(())
     }
 
@@ -36,23 +48,24 @@ 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")?;
+        let session = self.open_session(b"shell:\0")?;
 
         let mut transport = self.get_transport().clone();
 
-        let local_id = self.get_local_id()?;
-        let remote_id = self.get_remote_id()?;
-
         // Reading thread, reads response from adbd
         std::thread::spawn(move || -> Result<()> {
             loop {
                 let message = transport.read_message()?;
 
                 // Acknowledge for more data
-                let response =
-                    ADBTransportMessage::new(MessageCommand::Okay, local_id, remote_id, &[]);
+                let response = ADBTransportMessage::new(
+                    MessageCommand::Okay,
+                    session.local_id(),
+                    session.remote_id(),
+                    &[],
+                );
                 transport.write_message(response)?;
 
                 match message.header().command() {
@@ -60,14 +73,15 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
                         writer.write_all(&message.into_payload())?;
                         writer.flush()?;
                     }
-                    MessageCommand::Okay => continue,
+                    MessageCommand::Okay => {}
                     _ => return Err(RustADBError::ADBShellNotSupported),
                 }
             }
         });
 
         let transport = self.get_transport().clone();
-        let mut shell_writer = ShellMessageWriter::new(transport, local_id, remote_id);
+        let mut shell_writer =
+            ShellMessageWriter::new(transport, session.local_id(), session.remote_id());
 
         // Read from given reader (that could be stdin e.g), and write content to device adbd
         if let Err(e) = std::io::copy(&mut reader, &mut shell_writer) {

adb_client/src/device/commands/stat.rs

@@ -4,9 +4,9 @@ use crate::{
 
 impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     pub(crate) fn stat(&mut self, remote_path: &str) -> Result<AdbStatResponse> {
-        self.begin_synchronization()?;
-        let adb_stat_response = self.stat_with_explicit_ids(remote_path)?;
-        self.end_transaction()?;
+        let session = self.begin_synchronization()?;
+        let adb_stat_response = self.stat_with_explicit_ids(session, remote_path)?;
+        self.end_transaction(session)?;
         Ok(adb_stat_response)
     }
 }

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/adb_session.rs

@@ -0,0 +1,23 @@
+/// Represent a session between an `ADBDevice` and remote `adbd`.
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct ADBSession {
+    local_id: u32,
+    remote_id: u32,
+}
+
+impl ADBSession {
+    pub fn new(local_id: u32, remote_id: u32) -> Self {
+        Self {
+            local_id,
+            remote_id,
+        }
+    }
+
+    pub fn local_id(self) -> u32 {
+        self.local_id
+    }
+
+    pub fn remote_id(self) -> u32 {
+        self.remote_id
+    }
+}

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/device/models/mod.rs

@@ -1,5 +1,7 @@
 mod adb_rsa_key;
+mod adb_session;
 mod message_commands;
 
 pub use adb_rsa_key::ADBRsaKey;
+pub(crate) use adb_session::ADBSession;
 pub use message_commands::{MessageCommand, MessageSubcommand};

adb_client/src/emulator_device/adb_emulator_device.rs

@@ -15,16 +15,16 @@ 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

adb_client/src/emulator_device/commands/rotate.rs

@@ -3,6 +3,6 @@ use crate::{ADBEmulatorDevice, Result, emulator_device::ADBEmulatorCommand};
 impl ADBEmulatorDevice {
     /// Send a SMS to this emulator with given content with given phone number
     pub fn rotate(&mut self) -> Result<()> {
-        self.connect()?.send_command(ADBEmulatorCommand::Rotate)
+        self.connect()?.send_command(&ADBEmulatorCommand::Rotate)
     }
 }

adb_client/src/emulator_device/commands/sms.rs

@@ -3,7 +3,7 @@ use crate::{ADBEmulatorDevice, Result, emulator_device::ADBEmulatorCommand};
 impl ADBEmulatorDevice {
     /// Send a SMS to this emulator with given content with given phone number
     pub fn send_sms(&mut self, phone_number: &str, content: &str) -> Result<()> {
-        self.connect()?.send_command(ADBEmulatorCommand::Sms(
+        self.connect()?.send_command(&ADBEmulatorCommand::Sms(
             phone_number.to_string(),
             content.to_string(),
         ))

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,
@@ -112,14 +115,19 @@ pub enum RustADBError {
     #[error("upgrade error: {0}")]
     UpgradeError(String),
     /// An error occurred while getting mdns devices
+    #[cfg(feature = "mdns")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "mdns")))]
     #[error(transparent)]
     MDNSError(#[from] mdns_sd::Error),
     /// An error occurred while sending data to channel
-    #[error(transparent)]
-    SendError(#[from] std::sync::mpsc::SendError<crate::MDNSDevice>),
+    #[error("error sending data to channel")]
+    SendError,
     /// An unknown transport has been provided
     #[error("unknown transport: {0}")]
     UnknownTransport(String),
+    /// An unknown file mode was encountered in list
+    #[error("Unknown file mode {0}")]
+    UnknownFileMode(u32),
 }
 
 impl<T> From<std::sync::PoisonError<T>> for RustADBError {

adb_client/src/lib.rs

@@ -3,13 +3,23 @@
 #![forbid(missing_debug_implementations)]
 #![forbid(missing_docs)]
 #![doc = include_str!("../README.md")]
+// Feature `doc_cfg` is currently only available on nightly builds.
+// It is activated when cfg `docsrs` is enabled.
+// Documentation can be build locally using:
+// `RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --no-deps --all-features`
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 mod adb_device_ext;
 mod constants;
 mod device;
 mod emulator_device;
 mod error;
-mod mdns;
+
+/// MDNS-related definitions
+#[cfg(feature = "mdns")]
+#[cfg_attr(docsrs, doc(cfg(feature = "mdns")))]
+pub mod mdns;
+
 mod models;
 mod server;
 mod server_device;
@@ -20,8 +30,7 @@ pub use adb_device_ext::ADBDeviceExt;
 pub use device::{ADBTcpDevice, ADBUSBDevice, is_adb_device, search_adb_devices};
 pub use emulator_device::ADBEmulatorDevice;
 pub use error::{Result, RustADBError};
-pub use mdns::*;
-pub use models::{AdbStatResponse, RebootType};
+pub use models::{ADBListItem, ADBListItemType, AdbStatResponse, RebootType};
 pub use server::*;
 pub use server_device::ADBServerDevice;
 pub use transports::*;

adb_client/src/mdns/mdns_device.rs

@@ -1,4 +1,10 @@
-use std::{collections::HashSet, net::IpAddr};
+use std::{
+    collections::HashSet,
+    fmt::Display,
+    net::{IpAddr, Ipv4Addr, Ipv6Addr},
+};
+
+use mdns_sd::{ResolvedService, ScopedIp};
 
 /// Represent a device found from mdns search
 #[derive(Debug)]
@@ -6,14 +12,58 @@ pub struct MDNSDevice {
     /// Full device address when resolved
     pub fullname: String,
     /// Device IP addresses
-    pub addresses: HashSet<IpAddr>,
+    addresses: HashSet<IpAddr>,
 }
 
-impl From<mdns_sd::ServiceInfo> for MDNSDevice {
-    fn from(value: mdns_sd::ServiceInfo) -> Self {
+impl MDNSDevice {
+    /// Return all adresses linked to this device
+    #[must_use]
+    pub fn addresses(&self) -> HashSet<IpAddr> {
+        self.addresses.clone()
+    }
+
+    /// Return all IPv4 addresses linked to this device
+    #[must_use]
+    pub fn ipv4_addresses(&self) -> HashSet<Ipv4Addr> {
+        self.addresses
+            .iter()
+            .filter_map(|addr| match addr {
+                IpAddr::V4(addr) => Some(addr),
+                IpAddr::V6(_) => None,
+            })
+            .copied()
+            .collect()
+    }
+
+    /// Return all IPv6 addresses linked to this device
+    #[must_use]
+    pub fn ipv6_addresses(&self) -> HashSet<Ipv6Addr> {
+        self.addresses
+            .iter()
+            .filter_map(|addr| match addr {
+                IpAddr::V4(_) => None,
+                IpAddr::V6(addr) => Some(addr),
+            })
+            .copied()
+            .collect()
+    }
+}
+
+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(),
         }
     }
 }
+
+impl Display for MDNSDevice {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "Device fullname: {}", self.fullname)?;
+        writeln!(f, "IPv4 Addresses: {:?}", self.ipv4_addresses())?;
+        write!(f, "IPv6 Addresses: {:?}", self.ipv6_addresses())?;
+
+        Ok(())
+    }
+}

adb_client/src/mdns/mdns_discovery.rs

@@ -1,7 +1,8 @@
 use mdns_sd::{ServiceDaemon, ServiceEvent};
 use std::{sync::mpsc::Sender, thread::JoinHandle};
 
-use crate::{MDNSDevice, Result, RustADBError};
+use super::MDNSDevice;
+use crate::{Result, RustADBError};
 
 const ADB_SERVICE_NAME: &str = "_adb-tls-connect._tcp.local.";
 
@@ -29,7 +30,7 @@ impl MDNSDiscoveryService {
         })
     }
 
-    /// Start discovery by spawning a new thread responsible of getting events.
+    /// Start discovery by spawning a new background thread responsible of getting events.
     pub fn start(&mut self, sender: Sender<MDNSDevice>) -> Result<()> {
         let receiver = self.daemon.browse(ADB_SERVICE_NAME)?;
 
@@ -42,12 +43,14 @@ 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());
-                            }
+                            sender
+                                .send(MDNSDevice::from(service_info))
+                                .map_err(|_| RustADBError::SendError)?;
+                        }
+                        e => {
+                            log::warn!("received unknown event type {e:?}");
                         }
                     }
                 }

adb_client/src/models/adb_server_command.rs

@@ -26,7 +26,7 @@ pub(crate) enum AdbServerCommand {
     Install(u64),
     WaitForDevice(WaitForDeviceState, WaitForDeviceTransport),
     // Local commands
-    ShellCommand(String),
+    ShellCommand(String, Vec<String>),
     Shell,
     FrameBuffer,
     Sync,
@@ -51,10 +51,14 @@ impl Display for AdbServerCommand {
             AdbServerCommand::TrackDevices => write!(f, "host:track-devices"),
             AdbServerCommand::TransportAny => write!(f, "host:transport-any"),
             AdbServerCommand::TransportSerial(serial) => write!(f, "host:transport:{serial}"),
-            AdbServerCommand::ShellCommand(command) => match std::env::var("TERM") {
-                Ok(term) => write!(f, "shell,TERM={term},raw:{command}"),
-                Err(_) => write!(f, "shell,raw:{command}"),
-            },
+            AdbServerCommand::ShellCommand(command, args) => {
+                let args_s = args.join(",");
+                write!(
+                    f,
+                    "shell{}{args_s},raw:{command}",
+                    if args.is_empty() { "" } else { "," }
+                )
+            }
             AdbServerCommand::Shell => match std::env::var("TERM") {
                 Ok(term) => write!(f, "shell,TERM={term},raw:"),
                 Err(_) => write!(f, "shell,raw:"),

adb_client/src/models/list_info.rs

@@ -0,0 +1,25 @@
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd)]
+/// A list entry on the remote device
+pub struct ADBListItem {
+    /// The name of the file, not the path
+    pub name: String,
+    /// The unix time stamp of when it was last modified
+    pub time: u32,
+    /// The unix mode of the file, used for permissions and special bits
+    pub permissions: u32,
+    /// The size of the file
+    pub size: u32,
+    /// The type of item this is, file, directory or symlink
+    pub item_type: ADBListItemType,
+}
+
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd)]
+/// The different types of item that the list item can be
+pub enum ADBListItemType {
+    /// The entry is a file
+    File,
+    /// The entry is a directory
+    Directory,
+    /// The entry is a symlink
+    Symlink,
+}

adb_client/src/models/mod.rs

@@ -3,6 +3,7 @@ mod adb_server_command;
 mod adb_stat_response;
 mod framebuffer_info;
 mod host_features;
+mod list_info;
 mod reboot_type;
 mod sync_command;
 
@@ -11,5 +12,6 @@ pub(crate) use adb_server_command::AdbServerCommand;
 pub use adb_stat_response::AdbStatResponse;
 pub(crate) use framebuffer_info::{FrameBufferInfoV1, FrameBufferInfoV2};
 pub use host_features::HostFeatures;
+pub use list_info::{ADBListItem, ADBListItemType};
 pub use reboot_type::RebootType;
 pub use sync_command::SyncCommand;

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,8 @@ pub struct ADBServer {
 }
 
 impl ADBServer {
-    /// Instantiates a new [ADBServer]
+    /// Instantiates a new [`ADBServer`]
+    #[must_use]
     pub fn new(address: SocketAddrV4) -> Self {
         Self {
             transport: None,
@@ -31,7 +32,8 @@ impl ADBServer {
         }
     }
 
-    /// Instantiates a new [ADBServer] with a custom adb path
+    /// Instantiates a new [`ADBServer`] with a custom adb path
+    #[must_use]
     pub fn new_from_path(address: SocketAddrV4, adb_path: Option<String>) -> Self {
         Self {
             transport: None,
@@ -46,7 +48,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 +63,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/models/adb_version.rs

@@ -15,7 +15,8 @@ pub struct AdbVersion {
 }
 
 impl AdbVersion {
-    /// Instantiates a new [AdbVersion].
+    /// Instantiates a new [`AdbVersion`].
+    #[must_use]
     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

@@ -1,8 +1,8 @@
-use std::fmt::Display;
+use std::{fmt::Display, str::FromStr};
 
 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 {
@@ -29,10 +24,10 @@ impl Display for WaitForDeviceTransport {
     }
 }
 
-impl TryFrom<&str> for WaitForDeviceTransport {
-    type Error = RustADBError;
+impl FromStr for WaitForDeviceTransport {
+    type Err = RustADBError;
 
-    fn try_from(value: &str) -> Result<Self, Self::Error> {
+    fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value {
             "usb" => Ok(Self::Usb),
             "local" => Ok(Self::Local),

adb_client/src/server_device/adb_server_device.rs

@@ -6,12 +6,13 @@ 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).
+    #[must_use]
     pub fn new(identifier: String, server_addr: Option<SocketAddrV4>) -> Self {
         let transport = TCPServerTransport::new_or_default(server_addr);
 
@@ -21,7 +22,8 @@ impl ADBServerDevice {
         }
     }
 
-    /// Instantiates a new [ADBServerDevice], assuming only one is currently connected.
+    /// Instantiates a new [`ADBServerDevice`], assuming only one is currently connected.
+    #[must_use]
     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

@@ -22,18 +22,33 @@ impl ADBDeviceExt for ADBServerDevice {
 
         self.set_serial_transport()?;
 
-        self.transport
-            .send_adb_request(AdbServerCommand::ShellCommand(command.join(" ")))?;
+        // Prepare shell command arguments
+        let mut args = Vec::new();
+        let command_string = command.join(" ");
 
+        // Add v2 mode if supported
+        if supported_features.contains(&HostFeatures::ShellV2) {
+            log::debug!("using shell_v2 feature");
+            args.push("v2".to_string());
+        }
+
+        // Include terminal information if available
+        if let Ok(term) = std::env::var("TERM") {
+            args.push(format!("TERM={term}"));
+        }
+
+        // Send the request
+        self.transport
+            .send_adb_request(AdbServerCommand::ShellCommand(command_string, args))?;
+
+        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 +64,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 +82,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)?;
@@ -119,4 +135,8 @@ impl ADBDeviceExt for ADBServerDevice {
     fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
         self.framebuffer_inner()
     }
+
+    fn list(&mut self, path: &dyn AsRef<str>) -> Result<Vec<crate::ADBListItem>> {
+        self.list(path)
+    }
 }

adb_client/src/server_device/commands/list.rs

@@ -1,8 +1,8 @@
 use crate::{
-    ADBServerDevice, Result,
-    models::{AdbServerCommand, SyncCommand},
+    ADBServerDevice, Result, RustADBError,
+    models::{ADBListItem, ADBListItemType, AdbServerCommand, SyncCommand},
 };
-use byteorder::{ByteOrder, LittleEndian};
+use byteorder::{ByteOrder, LittleEndian, ReadBytesExt};
 use std::{
     io::{Read, Write},
     str,
@@ -10,23 +10,24 @@ use std::{
 
 impl ADBServerDevice {
     /// Lists files in path on the device.
-    pub fn list<A: AsRef<str>>(&mut self, path: A) -> Result<()> {
+    /// note: path uses internal file paths, so Documents is at /storage/emulated/0/Documents
+    pub fn list<A: AsRef<str>>(&mut self, path: A) -> Result<Vec<ADBListItem>> {
         self.set_serial_transport()?;
 
         // Set device in SYNC mode
         self.transport.send_adb_request(AdbServerCommand::Sync)?;
 
         // Send a list command
-        self.transport.send_sync_request(SyncCommand::List)?;
+        self.transport.send_sync_request(&SyncCommand::List)?;
 
         self.handle_list_command(path)
     }
 
-    // This command does not seem to work correctly. The devices I test it on just resturn
-    // 'DONE' directly without listing anything.
-    fn handle_list_command<S: AsRef<str>>(&mut self, path: S) -> Result<()> {
+    fn handle_list_command<A: AsRef<str>>(&mut self, path: A) -> Result<Vec<ADBListItem>> {
+        // TODO: use LIS2 to support files over 2.14 GB in size.
+        // SEE: https://github.com/cstyan/adbDocumentation?tab=readme-ov-file#adb-list
         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)?;
@@ -36,6 +37,8 @@ impl ADBServerDevice {
             .get_raw_connection()?
             .write_all(path.as_ref().to_string().as_bytes())?;
 
+        let mut list_items = Vec::new();
+
         // Reads returned status code from ADB server
         let mut response = [0_u8; 4];
         loop {
@@ -44,25 +47,36 @@ impl ADBServerDevice {
                 .read_exact(&mut response)?;
             match str::from_utf8(response.as_ref())? {
                 "DENT" => {
-                    // TODO: Move this to a struct that extract this data, but as the device
-                    // I test this on does not return anything, I can't test it.
-                    let mut file_mod = [0_u8; 4];
-                    let mut file_size = [0_u8; 4];
-                    let mut mod_time = [0_u8; 4];
-                    let mut name_len = [0_u8; 4];
-
                     let mut connection = self.transport.get_raw_connection()?;
-                    connection.read_exact(&mut file_mod)?;
-                    connection.read_exact(&mut file_size)?;
-                    connection.read_exact(&mut mod_time)?;
-                    connection.read_exact(&mut name_len)?;
 
-                    let name_len = LittleEndian::read_u32(&name_len);
+                    let mode = connection.read_u32::<LittleEndian>()?;
+                    let size = connection.read_u32::<LittleEndian>()?;
+                    let time = connection.read_u32::<LittleEndian>()?;
+                    let name_len = connection.read_u32::<LittleEndian>()?;
                     let mut name_buf = vec![0_u8; name_len as usize];
                     connection.read_exact(&mut name_buf)?;
+                    let name = String::from_utf8(name_buf)?;
+
+                    // First 9 bits are the file permissions
+                    let permissions = mode & 0b1_1111_1111;
+                    // Bits 14 to 16 are the file type
+                    let item_type = match (mode >> 13) & 0b111 {
+                        0b010 => ADBListItemType::Directory,
+                        0b100 => ADBListItemType::File,
+                        0b101 => ADBListItemType::Symlink,
+                        type_code => return Err(RustADBError::UnknownFileMode(type_code)),
+                    };
+                    let entry = ADBListItem {
+                        item_type,
+                        name,
+                        time,
+                        size,
+                        permissions,
+                    };
+                    list_items.push(entry);
                 }
                 "DONE" => {
-                    return Ok(());
+                    return Ok(list_items);
                 }
                 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,
@@ -72,7 +72,7 @@ impl ADBServerDevice {
         self.transport.send_adb_request(AdbServerCommand::Sync)?;
 
         // Send a recv command
-        self.transport.send_sync_request(SyncCommand::Recv)?;
+        self.transport.send_sync_request(&SyncCommand::Recv)?;
 
         self.handle_recv_command(path, stream)
     }
@@ -86,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

@@ -4,12 +4,12 @@ use crate::{
 };
 use std::{
     convert::TryInto,
-    io::{BufReader, BufWriter, Read, Write},
+    io::{self, BufReader, BufWriter, Read, Write},
     str::{self, FromStr},
     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,
 }
@@ -22,7 +22,7 @@ impl<W: Write> ADBSendCommandWriter<W> {
 
 impl<W: Write> Write for ADBSendCommandWriter<W> {
     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-        let chunk_len = buf.len() as u32;
+        let chunk_len = u32::try_from(buf.len()).map_err(io::Error::other)?;
 
         // 8 = "DATA".len() + sizeof(u32)
         let mut buffer = Vec::with_capacity(8 + buf.len());
@@ -50,7 +50,7 @@ impl ADBServerDevice {
         self.transport.send_adb_request(AdbServerCommand::Sync)?;
 
         // Send a send command
-        self.transport.send_sync_request(SyncCommand::Send)?;
+        self.transport.send_sync_request(&SyncCommand::Send)?;
 
         self.handle_send_command(stream, path)
     }
@@ -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)?;
@@ -44,7 +44,7 @@ impl ADBServerDevice {
         self.transport.send_adb_request(AdbServerCommand::Sync)?;
 
         // Send a "Stat" command
-        self.transport.send_sync_request(SyncCommand::Stat)?;
+        self.transport.send_sync_request(&SyncCommand::Stat)?;
 
         self.handle_stat_command(path)
     }

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,8 @@ pub struct TCPEmulatorTransport {
 }
 
 impl TCPEmulatorTransport {
-    /// Instantiates a new instance of [TCPEmulatorTransport]
+    /// Instantiates a new instance of [`TCPEmulatorTransport`]
+    #[must_use]
     pub fn new(socket_addr: SocketAddrV4) -> Self {
         Self {
             socket_addr,
@@ -34,11 +33,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"))?;
@@ -51,11 +49,11 @@ impl TCPEmulatorTransport {
     /// Send an authenticate request to this emulator
     pub fn authenticate(&mut self) -> Result<()> {
         let token = self.get_authentication_token()?;
-        self.send_command(ADBEmulatorCommand::Authenticate(token))
+        self.send_command(&ADBEmulatorCommand::Authenticate(token))
     }
 
-    /// Send an [ADBEmulatorCommand] to this emulator
-    pub(crate) fn send_command(&mut self, command: ADBEmulatorCommand) -> Result<()> {
+    /// Send an [`ADBEmulatorCommand`] to this emulator
+    pub(crate) fn send_command(&mut self, command: &ADBEmulatorCommand) -> Result<()> {
         let mut connection = self.get_raw_connection()?;
 
         // Send command
@@ -80,10 +78,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,8 @@ impl Default for TCPServerTransport {
 }
 
 impl TCPServerTransport {
-    /// Instantiates a new instance of [TCPServerTransport]
+    /// Instantiates a new instance of [`TCPServerTransport`]
+    #[must_use]
     pub fn new(socket_addr: SocketAddrV4) -> Self {
         Self {
             socket_addr,
@@ -33,7 +34,8 @@ 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.
+    #[must_use]
     pub fn new_or_default(socket_addr: Option<SocketAddrV4>) -> Self {
         match socket_addr {
             Some(s) => Self::new(s),
@@ -41,7 +43,8 @@ impl TCPServerTransport {
         }
     }
 
-    /// Get underlying [SocketAddrV4]
+    /// Get underlying [`SocketAddrV4`]
+    #[must_use]
     pub fn get_socketaddr(&self) -> SocketAddrV4 {
         self.socket_addr
     }
@@ -89,8 +92,8 @@ impl TCPServerTransport {
         )?)
     }
 
-    /// 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<()> {
+    /// 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")
         Ok(self
@@ -98,7 +101,7 @@ impl TCPServerTransport {
             .write_all(command.to_string().as_bytes())?)
     }
 
-    /// Gets the body length from a LittleEndian value
+    /// 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))
@@ -112,8 +115,8 @@ impl TCPServerTransport {
         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,
@@ -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
 
@@ -192,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,13 +29,14 @@ 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() {
-                if descriptor.vendor_id() == vendor_id && descriptor.product_id() == product_id {
-                    return Ok(Self::new_from_device(device));
-                }
+            if let Ok(descriptor) = device.device_descriptor()
+                && descriptor.vendor_id() == vendor_id
+                && descriptor.product_id() == product_id
+            {
+                return Ok(Self::new_from_device(device));
             }
         }
 
@@ -47,6 +48,7 @@ impl USBTransport {
     /// Instantiate a new [`USBTransport`] from a [`rusb::Device`].
     ///
     /// Devices can be enumerated using [`rusb::devices()`] and then filtered out to get desired device.
+    #[must_use]
     pub fn new_from_device(rusb_device: rusb::Device<GlobalContext>) -> Self {
         Self {
             device: rusb_device,
@@ -90,14 +92,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() {
@@ -117,16 +118,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);
                                 }
                             }
                         }
@@ -150,7 +149,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 {
@@ -166,7 +165,7 @@ 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:?}");

adb_client/src/utils.rs

@@ -3,13 +3,13 @@ use std::{ffi::OsStr, path::Path};
 use crate::{Result, RustADBError};
 
 pub fn check_extension_is_apk<P: AsRef<Path>>(path: P) -> Result<()> {
-    if let Some(extension) = path.as_ref().extension() {
-        if ![OsStr::new("apk")].contains(&extension) {
-            return Err(RustADBError::WrongFileExtension(format!(
-                "{} is not an APK file",
-                extension.to_string_lossy()
-            )));
-        }
+    if let Some(extension) = path.as_ref().extension()
+        && ![OsStr::new("apk")].contains(&extension)
+    {
+        return Err(RustADBError::WrongFileExtension(format!(
+            "{} is not an APK file",
+            extension.to_string_lossy()
+        )));
     }
 
     log::debug!("Given file is an APK");

examples/mdns/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "mdns"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+keywords.workspace = true
+license.workspace = true
+repository.workspace = true
+version.workspace = true
+rust-version.workspace = true
+
+[[bin]]
+name = "mdns"
+path = "main.rs"
+
+[dependencies]
+adb_client = { path = "../../adb_client", default-features = false, features = [
+    "mdns",
+] }

examples/mdns/main.rs

@@ -0,0 +1,19 @@
+use std::sync::mpsc;
+
+use adb_client::mdns::{MDNSDevice, MDNSDiscoveryService};
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("Starting mDNS device discovery...");
+
+    // Create a channel to receive discovered devices information
+    let (sender, receiver) = mpsc::channel::<MDNSDevice>();
+
+    // Create and start the discovery service
+    let mut discovery = MDNSDiscoveryService::new()?;
+    discovery.start(sender)?;
+
+    loop {
+        let device = receiver.recv()?;
+        println!("{device}");
+    }
+}

pyadb_client/Cargo.toml

@@ -21,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.2", features = ["abi3-py310", "anyhow"] }
+pyo3-stub-gen = { version = "0.17.2" }
+pyo3-stub-gen-derive = { version = "0.17.2" }

pyadb_client/README.md

@@ -1,4 +1,4 @@
-# pyadb_client
+# `pyadb_client`
 
 <p align="center">
     <p align="center">Python library to communicate with ADB devices. Built on top of Rust adb_client library.</p>

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

pyadb_client/src/adb_server_device.rs

@@ -12,6 +12,7 @@ pub struct PyADBServerDevice(pub ADBServerDevice);
 #[gen_stub_pymethods]
 #[pymethods]
 impl PyADBServerDevice {
+    #[must_use]
     #[getter]
     /// Device identifier
     pub fn identifier(&self) -> Option<String> {

pyadb_client/src/adb_usb_device.rs

@@ -21,6 +21,7 @@ impl PyADBUSBDevice {
     }
 
     /// Run shell commands on device and return the output (stdout + stderr merged)
+    #[expect(clippy::needless_pass_by_value)]
     pub fn shell_command(&mut self, commands: Vec<String>) -> Result<Vec<u8>> {
         let mut output = Vec::new();
         let commands: Vec<&str> = commands.iter().map(|x| &**x).collect();
@@ -41,6 +42,7 @@ impl PyADBUSBDevice {
     }
 
     /// Install a package installed on the device
+    #[expect(clippy::needless_pass_by_value)]
     pub fn install(&mut self, apk_path: PathBuf) -> Result<()> {
         Ok(self.0.install(&apk_path)?)
     }

pyadb_client/src/models/devices.rs

@@ -12,12 +12,14 @@ pub struct PyDeviceShort(DeviceShort);
 #[gen_stub_pymethods]
 #[pymethods]
 impl PyDeviceShort {
+    #[must_use]
     #[getter]
     /// Device identifier
     pub fn identifier(&self) -> String {
         self.0.identifier.clone()
     }
 
+    #[must_use]
     #[getter]
     /// Device state
     pub fn state(&self) -> String {