feat: add mdns devices discovery (#54)

* feat: add mdns devices discovery

---------

Co-authored-by: Jinke <164604729+JinkeJ@users.noreply.github.com>

.github/workflows/rust-build.yml

@@ -1,6 +1,6 @@
 name: Rust - Build
 
-on: [push]
+on: [push, pull_request]
 
 env:
   CARGO_TERM_COLOR: always
@@ -12,4 +12,4 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Build project
-      run: cargo build --release
+      run: cargo build --release --all-features

.github/workflows/rust-quality.yml

@@ -1,6 +1,6 @@
 name: Rust - Quality
 
-on: [push]
+on: [push, pull_request]
 
 env:
   CARGO_TERM_COLOR: always
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: rustup component add clippy
       - name: Run clippy
-        run : cargo clippy
+        run: cargo clippy --all-features
 
   fmt:
     name: "fmt"
@@ -21,7 +21,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run formatter
-        run : cargo fmt --all --check
+        run: cargo fmt --all --check
+
+  doc:
+    name: "doc"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run doc
+        run: cargo doc --all-features --no-deps
+        env:
+          RUSTDOCFLAGS: "-D warnings"
 
   tests:
     name: "tests"
@@ -29,4 +39,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run tests
-        run: cargo test --verbose
+        run: cargo test --verbose --all-features

.github/workflows/rust-release.yml

@@ -0,0 +1,50 @@
+name: Rust - Release creation
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: "Checkout repository"
+        uses: actions/checkout@v4
+
+      - name: "Set up Rust"
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+
+      - name: "Install dependencies"
+        run: |
+          sudo apt update
+          sudo apt install -y rpm
+          cargo install cargo-deb
+          cargo install cargo-generate-rpm
+
+      - name: "build-release"
+        run: cargo build --all-features --release
+
+      - name: "Build DEB package"
+        run: cargo deb -p adb_cli
+
+      - name: "Build RPM package"
+        run: cargo generate-rpm -p adb_cli
+
+      - name: "Publish GitHub artefacts"
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            target/debian/*.deb
+            target/generate-rpm/*.rpm
+            target/release/adb_cli
+
+      - name: "Publish crates"
+        run: |
+          cargo publish -p adb_client --token ${CRATES_IO_TOKEN}
+          cargo publish -p adb_cli --token ${CRATES_IO_TOKEN}
+        env:
+          CRATES_IO_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}

Cargo.toml

@@ -3,11 +3,13 @@ members = ["adb_cli", "adb_client"]
 resolver = "2"
 
 [workspace.package]
+authors = ["Corentin LIAUD"]
 edition = "2021"
+homepage = "https://github.com/cocool97/adb_client"
 keywords = ["adb", "android", "tcp", "usb"]
 license = "MIT"
 repository = "https://github.com/cocool97/adb_client"
-version = "2.0.0"
+version = "2.0.6"
 
 # To build locally when working on a new release
 [patch.crates-io]

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023-2024 Corentin LIAUD
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -8,33 +8,42 @@
         <a href="https://crates.io/crates/adb_client">
             <img alt="crates.io" src="https://img.shields.io/crates/v/adb_client.svg"/>
         </a>
+        <a href="https://github.com/cocool97/adb_client/actions">
+            <img alt="ci status" src="https://github.com/cocool97/adb_client/actions/workflows/rust-build.yml/badge.svg"/>
+        </a>
         <a href="https://deps.rs/repo/github/cocool97/adb_client">
             <img alt="dependency status" src="https://deps.rs/repo/github/cocool97/adb_client/status.svg"/>
         </a>
+        <a href="https://opensource.org/licenses/MIT">
+            <img alt="dependency status" src="https://img.shields.io/badge/License-MIT-yellow.svg"/>
+        </a>
     </p>
 </p>
 
 Main features of this library:
 
 - Full Rust, don't use `adb *` shell commands to interact with devices
-- Supports:
+- Supports
-  - **TCP/IP** protocol, using ADB server as a proxy (standard behavior when using `adb` CLI)
+  - Using ADB server as a proxy (standard behavior when using `adb` CLI)
-  - **USB** protocol, interacting directly with end devices
+  - Connecting directly to end devices (without using adb-server)
+    - Over **USB**
+    - Over **TCP/IP**
 - Implements hidden `adb` features, like `framebuffer`
 - Highly configurable
 - Easy to use !
 
 ## adb_client
 
-Rust library implementing both ADB protocols and providing a high-level abstraction over many supported commands.
+Rust library implementing both ADB protocols (server and end-devices) and providing a high-level abstraction over the many supported commands.
 
-Improved documentation [here](./adb_client/README.md).
+Improved documentation available [here](./adb_client/README.md).
 
 ## adb_cli
 
-Rust binary providing an improved version of official `adb` CLI, wrapping `adb_client` library. Can act as an usage example of the library.
+Rust binary providing an improved version of Google's official `adb` CLI, by using `adb_client` library.
+Provides an usage example of the library.
 
-Improved documentation [here](./adb_cli/README.md).
+Improved documentation available [here](./adb_cli/README.md).
 
 ## Related publications
 

adb_cli/Cargo.toml

@@ -1,4 +1,5 @@
 [package]
+authors.workspace = true
 description = "Rust ADB (Android Debug Bridge) CLI"
 edition.workspace = true
 keywords.workspace = true
@@ -9,7 +10,7 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
-adb_client = { version = "2.0.0" }
+adb_client = { version = "2.0.5" }
 anyhow = { version = "1.0.89" }
 clap = { version = "4.5.18", features = ["derive"] }
 env_logger = { version = "0.11.5" }
@@ -17,3 +18,22 @@ log = { version = "0.4.22" }
 
 [target.'cfg(unix)'.dependencies]
 termios = { version = "0.3.3" }
+
+#####################################
+# Debian package build instructions #
+#####################################
+[package.metadata.deb]
+assets = [
+    { source = "target/release/adb_cli", dest = "usr/bin/", mode = "755" },
+]
+priority = "optional"
+section = "utility"
+
+##################################
+# RPM package build instructions #
+##################################
+[package.metadata.generate-rpm]
+assets = [
+    { source = "target/release/adb_cli", dest = "/usr/bin/adb_cli", mode = "755" },
+]
+license = "MIT"

adb_cli/src/commands/host.rs

@@ -21,4 +21,19 @@ pub enum HostCommand {
     Connect { address: SocketAddrV4 },
     /// Disconnect device over WI-FI
     Disconnect { address: SocketAddrV4 },
+    /// MDNS services
+    Mdns {
+        #[clap(subcommand)]
+        subcommand: MdnsCommand,
+    },
+    /// Display server status
+    ServerStatus,
+}
+
+#[derive(Parser, Debug)]
+pub enum MdnsCommand {
+    /// Check mdns status
+    Check,
+    /// List mdns services available
+    Services,
 }

adb_cli/src/commands/local.rs

@@ -1,4 +1,5 @@
 use clap::Parser;
+use std::path::PathBuf;
 
 use crate::models::RebootTypeCommand;
 
@@ -16,6 +17,15 @@ pub enum LocalCommand {
     Stat { path: String },
     /// Spawn an interactive shell or run a list of commands on the device
     Shell { commands: Vec<String> },
+    /// Run an activity on device specified by the intent
+    Run {
+        /// 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
+        #[clap(short = 'a', long = "activity")]
+        activity: String,
+    },
     /// Reboot the device
     Reboot {
         #[clap(subcommand)]
@@ -28,4 +38,9 @@ pub enum LocalCommand {
         /// Path to output file (created if not exists)
         path: Option<String>,
     },
+    /// Install an APK on device
+    Install {
+        /// Path to APK file. Extension must be ".apk"
+        path: PathBuf,
+    },
 }

adb_cli/src/commands/mod.rs

@@ -1,9 +1,11 @@
 mod emu;
 mod host;
 mod local;
+mod tcp;
 mod usb;
 
 pub use emu::EmuCommand;
-pub use host::HostCommand;
+pub use host::{HostCommand, MdnsCommand};
 pub use local::LocalCommand;
+pub use tcp::{TcpCommand, TcpCommands};
 pub use usb::{UsbCommand, UsbCommands};

adb_cli/src/commands/tcp.rs

@@ -0,0 +1,44 @@
+use std::net::SocketAddr;
+use std::path::PathBuf;
+
+use clap::Parser;
+
+use crate::models::RebootTypeCommand;
+
+#[derive(Parser, Debug)]
+pub struct TcpCommand {
+    pub address: SocketAddr,
+    #[clap(subcommand)]
+    pub commands: TcpCommands,
+}
+
+#[derive(Parser, Debug)]
+pub enum TcpCommands {
+    /// Spawn an interactive shell or run a list of commands on the device
+    Shell { commands: Vec<String> },
+    /// Pull a file from device
+    Pull { source: String, destination: String },
+    /// Push a file on device
+    Push { filename: String, path: String },
+    /// Stat a file on device
+    Stat { path: String },
+    /// Run an activity on device specified by the intent
+    Run {
+        /// 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
+        #[clap(short = 'a', long = "activity")]
+        activity: String,
+    },
+    /// Reboot the device
+    Reboot {
+        #[clap(subcommand)]
+        reboot_type: RebootTypeCommand,
+    },
+    /// Install an APK on device
+    Install {
+        /// Path to APK file. Extension must be ".apk"
+        path: PathBuf,
+    },
+}

adb_cli/src/commands/usb.rs

@@ -13,10 +13,10 @@ fn parse_hex_id(id: &str) -> Result<u16, ParseIntError> {
 pub struct UsbCommand {
     /// Hexadecimal vendor id of this USB device
     #[clap(short = 'v', long = "vendor-id", value_parser=parse_hex_id, value_name="VID")]
-    pub vendor_id: u16,
+    pub vendor_id: Option<u16>,
     /// Hexadecimal product id of this USB device
     #[clap(short = 'p', long = "product-id", value_parser=parse_hex_id, value_name="PID")]
-    pub product_id: u16,
+    pub product_id: Option<u16>,
     /// Path to a custom private key to use for authentication
     #[clap(short = 'k', long = "private-key")]
     pub path_to_private_key: Option<PathBuf>,
@@ -34,9 +34,23 @@ pub enum UsbCommands {
     Push { filename: String, path: String },
     /// Stat a file on device
     Stat { path: String },
+    /// Run an activity on device specified by the intent
+    Run {
+        /// 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
+        #[clap(short = 'a', long = "activity")]
+        activity: String,
+    },
     /// Reboot the device
     Reboot {
         #[clap(subcommand)]
         reboot_type: RebootTypeCommand,
     },
+    /// Install an APK on device
+    Install {
+        /// Path to APK file. Extension must be ".apk"
+        path: PathBuf,
+    },
 }

adb_cli/src/main.rs

@@ -6,24 +6,42 @@ mod adb_termios;
 mod commands;
 mod models;
 
-use adb_client::{ADBDeviceExt, ADBEmulatorDevice, ADBServer, ADBUSBDevice, DeviceShort};
+use adb_client::{
+    ADBDeviceExt, ADBEmulatorDevice, ADBServer, ADBTcpDevice, ADBUSBDevice, DeviceShort,
+    MDNSBackend, MDNSDiscoveryService,
+};
 use anyhow::{anyhow, Result};
 use clap::Parser;
-use commands::{EmuCommand, HostCommand, LocalCommand, UsbCommands};
+use commands::{EmuCommand, HostCommand, LocalCommand, MdnsCommand, TcpCommands, UsbCommands};
 use models::{Command, Opts};
 use std::fs::File;
 use std::io::Write;
 use std::path::Path;
 
 fn main() -> Result<()> {
-    let opt = Opts::parse();
+    let opts = Opts::parse();
+
+    // RUST_LOG variable has more priority then "--debug" flag
+    if std::env::var("RUST_LOG").is_err() {
+        let level = match opts.debug {
+            true => "trace",
+            false => "info",
+        };
+
+        std::env::set_var("RUST_LOG", level);
+    }
+
+    // Setting default log level as "info" if not set
+    if std::env::var("RUST_LOG").is_err() {
+        std::env::set_var("RUST_LOG", "info");
+    }
     env_logger::init();
 
-    match opt.command {
+    match opts.command {
         Command::Local(local) => {
-            let mut adb_server = ADBServer::new(opt.address);
+            let mut adb_server = ADBServer::new(opts.address);
 
-            let mut device = match opt.serial {
+            let mut device = match opts.serial {
                 Some(serial) => adb_server.get_device_by_name(&serial)?,
                 None => adb_server.get_device()?,
             };
@@ -65,6 +83,10 @@ fn main() -> Result<()> {
                         device.shell_command(commands, std::io::stdout())?;
                     }
                 }
+                LocalCommand::Run { package, activity } => {
+                    let output = device.run_activity(&package, &activity)?;
+                    std::io::stdout().write_all(&output)?;
+                }
                 LocalCommand::HostFeatures => {
                     let features = device
                         .host_features()?
@@ -91,10 +113,14 @@ fn main() -> Result<()> {
                     };
                     device.get_logs(writer)?;
                 }
+                LocalCommand::Install { path } => {
+                    log::info!("Starting installation of APK {}...", path.display());
+                    device.install(path)?;
+                }
             }
         }
         Command::Host(host) => {
-            let mut adb_server = ADBServer::new(opt.address);
+            let mut adb_server = ADBServer::new(opts.address);
 
             match host {
                 HostCommand::Version => {
@@ -138,10 +164,35 @@ fn main() -> Result<()> {
                     adb_server.disconnect_device(address)?;
                     log::info!("Disconnected {address}");
                 }
+                HostCommand::Mdns { subcommand } => match subcommand {
+                    MdnsCommand::Check => {
+                        let check = adb_server.mdns_check()?;
+                        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::OpenScreen => {
+                                log::info!("mdns daemon version [Openscreen discovery 0.0.0]")
+                            }
+                        }
+                    }
+                    MdnsCommand::Services => {
+                        log::info!("List of discovered mdns services");
+                        for service in adb_server.mdns_services()? {
+                            log::info!("{}", service);
+                        }
+                    }
+                },
+                HostCommand::ServerStatus => {
+                    log::info!("{}", adb_server.server_status()?);
+                }
             }
         }
         Command::Emu(emu) => {
-            let mut emulator = match opt.serial {
+            let mut emulator = match opts.serial {
                 Some(serial) => ADBEmulatorDevice::new(serial, None)?,
                 None => return Err(anyhow!("Serial must be set to use emulators !")),
             };
@@ -158,11 +209,20 @@ fn main() -> Result<()> {
             }
         }
         Command::Usb(usb) => {
-            let mut device = match usb.path_to_private_key {
+            let mut device = match (usb.vendor_id, usb.product_id) {
-                Some(pk) => {
+                (Some(vid), Some(pid)) => match usb.path_to_private_key {
-                    ADBUSBDevice::new_with_custom_private_key(usb.vendor_id, usb.product_id, pk)?
+                    Some(pk) => ADBUSBDevice::new_with_custom_private_key(vid, pid, pk)?,
+                    None => ADBUSBDevice::new(vid, pid)?,
+                },
+
+                (None, None) => match usb.path_to_private_key {
+                    Some(pk) => ADBUSBDevice::autodetect_with_custom_private_key(pk)?,
+                    None => ADBUSBDevice::autodetect()?,
+                },
+
+                _ => {
+                    anyhow::bail!("please either supply values for both the --vendor-id and --product-id flags or none.");
                 }
-                None => ADBUSBDevice::new(usb.vendor_id, usb.product_id)?,
             };
 
             match usb.commands {
@@ -206,8 +266,87 @@ fn main() -> Result<()> {
                     device.push(&mut input, &path)?;
                     log::info!("Uploaded {filename} to {path}");
                 }
+                UsbCommands::Run { package, activity } => {
+                    let output = device.run_activity(&package, &activity)?;
+                    std::io::stdout().write_all(&output)?;
+                }
+                UsbCommands::Install { path } => {
+                    log::info!("Starting installation of APK {}...", path.display());
+                    device.install(path)?;
+                }
             }
         }
+        Command::Tcp(tcp) => {
+            let mut device = ADBTcpDevice::new(tcp.address)?;
+
+            match tcp.commands {
+                TcpCommands::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 = adb_termios::ADBTermios::new(std::io::stdin())?;
+                            adb_termios.set_adb_termios()?;
+                            device.shell(std::io::stdin(), std::io::stdout())?;
+                        }
+
+                        #[cfg(not(any(target_os = "linux", target_os = "macos")))]
+                        {
+                            device.shell(std::io::stdin(), std::io::stdout())?;
+                        }
+                    } else {
+                        device.shell_command(commands, std::io::stdout())?;
+                    }
+                }
+                TcpCommands::Pull {
+                    source,
+                    destination,
+                } => {
+                    let mut output = File::create(Path::new(&destination))?;
+                    device.pull(&source, &mut output)?;
+                    log::info!("Downloaded {source} as {destination}");
+                }
+                TcpCommands::Stat { path } => {
+                    let stat_response = device.stat(&path)?;
+                    println!("{}", stat_response);
+                }
+                TcpCommands::Reboot { reboot_type } => {
+                    log::info!("Reboots device in mode {:?}", reboot_type);
+                    device.reboot(reboot_type.into())?
+                }
+                TcpCommands::Push { filename, path } => {
+                    let mut input = File::open(Path::new(&filename))?;
+                    device.push(&mut input, &path)?;
+                    log::info!("Uploaded {filename} to {path}");
+                }
+                TcpCommands::Run { package, activity } => {
+                    let output = device.run_activity(&package, &activity)?;
+                    std::io::stdout().write_all(&output)?;
+                }
+                TcpCommands::Install { path } => {
+                    log::info!("Starting installation of APK {}...", path.display());
+                    device.install(path)?;
+                }
+            }
+        }
+        Command::MdnsDiscovery => {
+            let mut service = MDNSDiscoveryService::new()?;
+
+            let (tx, rx) = std::sync::mpsc::channel();
+            service.start(tx)?;
+
+            log::info!("Starting mdns discovery...");
+            while let Ok(device) = rx.recv() {
+                log::info!(
+                    "Found device {} with addresses {:?}",
+                    device.fullname,
+                    device.addresses
+                )
+            }
+
+            service.shutdown()?;
+        }
     }
 
     Ok(())

adb_cli/src/models/opts.rs

@@ -2,11 +2,13 @@ use std::net::SocketAddrV4;
 
 use clap::Parser;
 
-use crate::commands::{EmuCommand, HostCommand, LocalCommand, UsbCommand};
+use crate::commands::{EmuCommand, HostCommand, LocalCommand, TcpCommand, UsbCommand};
 
 #[derive(Parser, Debug)]
 #[clap(about, version, author)]
 pub struct Opts {
+    #[clap(long = "debug")]
+    pub debug: bool,
     #[clap(short = 'a', long = "address", default_value = "127.0.0.1:5037")]
     pub address: SocketAddrV4,
     /// Serial id of a specific device. Every request will be sent to this device.
@@ -27,4 +29,8 @@ pub enum Command {
     Emu(EmuCommand),
     /// Device commands via USB, no server needed
     Usb(UsbCommand),
+    /// Device commands via TCP, no server needed
+    Tcp(TcpCommand),
+    /// Discover devices over MDNS without using adb-server
+    MdnsDiscovery,
 }

adb_client/Cargo.toml

@@ -1,4 +1,5 @@
 [package]
+authors.workspace = true
 description = "Rust ADB (Android Debug Bridge) client library"
 edition.workspace = true
 keywords.workspace = true
@@ -9,19 +10,35 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
-base64 = "0.22.1"
+base64 = { version = "0.22.1" }
-bincode = "1.3.3"
+bincode = { version = "1.3.3" }
 byteorder = { version = "1.5.0" }
 chrono = { version = "0.4.38" }
 homedir = { version = "0.3.4" }
-image = { version = "0.25.4" }
+image = { version = "0.25.5" }
 lazy_static = { version = "1.5.0" }
 log = { version = "0.4.22" }
-num-bigint = { version = "0.6", package = "num-bigint-dig" }
+mdns-sd = { version = "0.12.0" }
-rand = { version = "0.7.0" }
+num-bigint = { version = "0.8.4", package = "num-bigint-dig" }
+num-traits = { version = "0.2.19" }
+quick-protobuf = { version = "0.8.1" }
+rand = { version = "0.8.5" }
+rcgen = { version = "0.13.1" }
 regex = { version = "1.11.0", features = ["perf", "std", "unicode"] }
-rsa = { version = "0.3.0" }
+rsa = { version = "0.9.7" }
 rusb = { version = "0.9.4", features = ["vendored"] }
+rustls = { version = "0.23.18" }
+rustls-pki-types = "1.10.0"
 serde = { version = "1.0.210", features = ["derive"] }
-serde_repr = "0.1.19"
+serde_repr = { version = "0.1.19" }
-thiserror = { version = "1.0.64" }
+sha1 = { version = "0.10.6", features = ["oid"] }
+thiserror = { version = "2.0.1" }
+
+[dev-dependencies]
+anyhow = { version = "1.0.93" }
+criterion = { version = "0.5.1" } # Used for benchmarks
+
+[[bench]]
+harness = false
+name = "benchmark_adb_push"
+path = "../benches/benchmark_adb_push.rs"

adb_client/README.md

@@ -31,9 +31,9 @@ let mut server = ADBServer::new(SocketAddrV4::new(server_ip, server_port));
 server.devices();
 ```
 
-### Using ADB server as proxy
+### Using ADB server as bridge
 
-#### [TCP] Launch a command on device
+#### Launch a command on device
 
 ```rust no_run
 use adb_client::{ADBServer, ADBDeviceExt};
@@ -43,7 +43,7 @@ let mut device = server.get_device().expect("cannot get device");
 device.shell_command(["df", "-h"],std::io::stdout());
 ```
 
-#### [TCP] Push a file to the device
+#### Push a file to the device
 
 ```rust no_run
 use adb_client::ADBServer;
@@ -57,9 +57,9 @@ let mut input = File::open(Path::new("/tmp/f")).expect("Cannot open file");
 device.push(&mut input, "/data/local/tmp");
 ```
 
-### Interacting directly with device
+### Interact directly with end devices
 
-#### [USB] Launch a command on device
+#### (USB) Launch a command on device
 
 ```rust no_run
 use adb_client::{ADBUSBDevice, ADBDeviceExt};
@@ -70,7 +70,7 @@ let mut device = ADBUSBDevice::new(vendor_id, product_id).expect("cannot find de
 device.shell_command(["df", "-h"],std::io::stdout());
 ```
 
-#### [USB] Push a file to the device
+#### (USB) Push a file to the device
 
 ```rust no_run
 use adb_client::{ADBUSBDevice, ADBDeviceExt};
@@ -83,3 +83,15 @@ let mut device = ADBUSBDevice::new(vendor_id, product_id).expect("cannot find de
 let mut input = File::open(Path::new("/tmp/f")).expect("Cannot open file");
 device.push(&mut input, "/data/local/tmp");
 ```
+
+### (TCP) Get a shell from device
+
+```rust no_run
+use std::net::{SocketAddr, IpAddr, Ipv4Addr};
+use adb_client::{ADBTcpDevice, ADBDeviceExt};
+
+let device_ip = IpAddr::V4(Ipv4Addr::new(192, 168, 0, 10));
+let device_port = 43210;
+let mut device = ADBTcpDevice::new(SocketAddr::new(device_ip, device_port)).expect("cannot find device");
+device.shell(std::io::stdin(), std::io::stdout());
+```

adb_client/src/adb_device_ext.rs

@@ -1,11 +1,12 @@
 use std::io::{Read, Write};
+use std::path::Path;
 
 use crate::models::AdbStatResponse;
 use crate::{RebootType, Result};
 
-/// Trait representing all features available on both [`ADBServerDevice`] and [`ADBUSBDevice`]
+/// Trait representing all features available on both [`crate::ADBServerDevice`] and [`crate::ADBUSBDevice`]
 pub trait ADBDeviceExt {
-    /// Runs 'command' in a shell on the device, and write its output and error streams into [`output`].
+    /// Runs command in a shell on the device, and write its output and error streams into output.
     fn shell_command<S: ToString, W: Write>(
         &mut self,
         command: impl IntoIterator<Item = S>,
@@ -13,19 +14,33 @@ pub trait ADBDeviceExt {
     ) -> Result<()>;
 
     /// Starts an interactive shell session on the device.
-    /// Input data is read from [reader] and write to [writer].
+    /// Input data is read from reader and write to writer.
-    /// [W] has a 'static bound as it is internally used in a thread.
+    /// W has a 'static bound as it is internally used in a thread.
     fn shell<R: Read, W: Write + Send + 'static>(&mut self, reader: R, writer: W) -> Result<()>;
 
     /// Display the stat information for a remote file
     fn stat(&mut self, remote_path: &str) -> Result<AdbStatResponse>;
 
-    /// Pull the remote file pointed to by [source] and write its contents into [`output`]
+    /// Pull the remote file pointed to by `source` and write its contents into `output`
     fn pull<A: AsRef<str>, W: Write>(&mut self, source: A, output: W) -> Result<()>;
 
-    /// Push [stream] to [path] on the device.
+    /// Push `stream` to `path` on the device.
     fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()>;
 
-    /// Reboots the device using given reboot type
+    /// Reboot the device using given reboot type
     fn reboot(&mut self, reboot_type: RebootType) -> Result<()>;
+
+    /// Run `activity` from `package` on device. Return the command output.
+    fn run_activity(&mut self, package: &str, activity: &str) -> Result<Vec<u8>> {
+        let mut output = Vec::new();
+        self.shell_command(
+            ["am", "start", &format!("{package}/{package}.{activity}")],
+            &mut output,
+        )?;
+
+        Ok(output)
+    }
+
+    /// Install an APK pointed to by `apk_path` on device.
+    fn install<P: AsRef<Path>>(&mut self, apk_path: P) -> Result<()>;
 }

adb_client/src/device/adb_message_device.rs

@@ -0,0 +1,236 @@
+use byteorder::{LittleEndian, ReadBytesExt};
+use rand::Rng;
+use std::io::{Cursor, Read, Seek};
+
+use crate::{constants::BUFFER_SIZE, ADBMessageTransport, AdbStatResponse, Result, RustADBError};
+
+use super::{models::MessageSubcommand, ADBTransportMessage, MessageCommand};
+
+/// 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,
+}
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    /// Instantiate a new [`ADBMessageTransport`]
+    pub fn new(transport: T) -> Self {
+        Self { transport }
+    }
+
+    pub(crate) fn get_transport(&mut self) -> &T {
+        &self.transport
+    }
+
+    pub(crate) fn get_transport_mut(&mut self) -> &mut T {
+        &mut self.transport
+    }
+
+    /// Receive a message and acknowledge it by replying with an `OKAY` command
+    pub(crate) fn recv_and_reply_okay(
+        &mut self,
+        local_id: u32,
+        remote_id: u32,
+    ) -> Result<ADBTransportMessage> {
+        let message = self.transport.read_message()?;
+        self.transport.write_message(ADBTransportMessage::new(
+            MessageCommand::Okay,
+            local_id,
+            remote_id,
+            "".into(),
+        ))?;
+        Ok(message)
+    }
+
+    /// Expect a message with an `OKAY` command after sending a message.
+    pub(crate) fn send_and_expect_okay(
+        &mut self,
+        message: ADBTransportMessage,
+    ) -> Result<ADBTransportMessage> {
+        self.transport.write_message(message)?;
+        let message = self.transport.read_message()?;
+        let received_command = message.header().command();
+        if received_command != MessageCommand::Okay {
+            return Err(RustADBError::ADBRequestFailed(format!(
+                "expected command OKAY after message, got {}",
+                received_command
+            )));
+        }
+        Ok(message)
+    }
+
+    pub(crate) fn recv_file<W: std::io::Write>(
+        &mut self,
+        local_id: u32,
+        remote_id: u32,
+        mut output: W,
+    ) -> std::result::Result<(), RustADBError> {
+        let mut len: Option<u64> = None;
+        loop {
+            let payload = self
+                .recv_and_reply_okay(local_id, remote_id)?
+                .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);
+                    }
+                    Some(length) => {
+                        let remaining_bytes = payload.len() as u64 - rdr.position();
+                        if length < remaining_bytes {
+                            std::io::copy(&mut rdr.by_ref().take(length), &mut output)?;
+                        } else {
+                            std::io::copy(&mut rdr.take(remaining_bytes), &mut output)?;
+                            len.replace(length - remaining_bytes);
+                            // this payload is now exhausted
+                            break;
+                        }
+                    }
+                }
+            }
+            if Cursor::new(&payload[(payload.len() - 8)..(payload.len() - 4)])
+                .read_u32::<LittleEndian>()?
+                == MessageSubcommand::Done as u32
+            {
+                break;
+            }
+        }
+        Ok(())
+    }
+
+    pub(crate) fn push_file<R: std::io::Read>(
+        &mut self,
+        local_id: u32,
+        remote_id: u32,
+        mut reader: R,
+    ) -> std::result::Result<(), RustADBError> {
+        let mut buffer = [0; BUFFER_SIZE];
+        let amount_read = reader.read(&mut buffer)?;
+        let subcommand_data = MessageSubcommand::Data.with_arg(amount_read as u32);
+
+        let mut serialized_message =
+            bincode::serialize(&subcommand_data).map_err(|_e| RustADBError::ConversionError)?;
+        serialized_message.append(&mut buffer[..amount_read].to_vec());
+
+        let message = ADBTransportMessage::new(
+            MessageCommand::Write,
+            local_id,
+            remote_id,
+            serialized_message,
+        );
+
+        self.send_and_expect_okay(message)?;
+
+        loop {
+            let mut buffer = [0; BUFFER_SIZE];
+
+            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 message = ADBTransportMessage::new(
+                        MessageCommand::Write,
+                        local_id,
+                        remote_id,
+                        serialized_message,
+                    );
+
+                    self.send_and_expect_okay(message)?;
+
+                    // Command should end with a Write => Okay
+                    let received = self.transport.read_message()?;
+                    match received.header().command() {
+                        MessageCommand::Write => return Ok(()),
+                        c => {
+                            return Err(RustADBError::ADBRequestFailed(format!(
+                                "Wrong command received {}",
+                                c
+                            )))
+                        }
+                    }
+                }
+                Ok(size) => {
+                    let subcommand_data = MessageSubcommand::Data.with_arg(size as u32);
+
+                    let mut serialized_message = bincode::serialize(&subcommand_data)
+                        .map_err(|_e| RustADBError::ConversionError)?;
+                    serialized_message.append(&mut buffer[..size].to_vec());
+
+                    let message = ADBTransportMessage::new(
+                        MessageCommand::Write,
+                        local_id,
+                        remote_id,
+                        serialized_message,
+                    );
+
+                    self.send_and_expect_okay(message)?;
+                }
+                Err(e) => {
+                    return Err(RustADBError::IOError(e));
+                }
+            }
+        }
+    }
+
+    pub(crate) fn begin_synchronization(&mut self) -> Result<(u32, u32)> {
+        let sync_directive = "sync:\0";
+
+        let mut rng = rand::thread_rng();
+        let message = ADBTransportMessage::new(
+            MessageCommand::Open,
+            rng.gen(), /* Our 'local-id' */
+            0,
+            sync_directive.into(),
+        );
+        let message = self.send_and_expect_okay(message)?;
+        let local_id = message.header().arg1();
+        let remote_id = message.header().arg0();
+        Ok((local_id, remote_id))
+    }
+
+    pub(crate) fn stat_with_explicit_ids(
+        &mut self,
+        remote_path: &str,
+        local_id: u32,
+        remote_id: u32,
+    ) -> Result<AdbStatResponse> {
+        let stat_buffer = MessageSubcommand::Stat.with_arg(remote_path.len() as u32);
+        let message = ADBTransportMessage::new(
+            MessageCommand::Write,
+            local_id,
+            remote_id,
+            bincode::serialize(&stat_buffer).map_err(|_e| RustADBError::ConversionError)?,
+        );
+        self.send_and_expect_okay(message)?;
+        self.send_and_expect_okay(ADBTransportMessage::new(
+            MessageCommand::Write,
+            local_id,
+            remote_id,
+            remote_path.into(),
+        ))?;
+        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)
+    }
+
+    pub(crate) fn end_transaction(&mut self, local_id: u32, remote_id: u32) -> Result<()> {
+        let quit_buffer = MessageSubcommand::Quit.with_arg(0u32);
+        self.send_and_expect_okay(ADBTransportMessage::new(
+            MessageCommand::Write,
+            local_id,
+            remote_id,
+            bincode::serialize(&quit_buffer).map_err(|_e| RustADBError::ConversionError)?,
+        ))?;
+        let _discard_close = self.transport.read_message()?;
+        Ok(())
+    }
+}

adb_client/src/device/adb_message_device_commands.rs

@@ -0,0 +1,38 @@
+use crate::{models::AdbStatResponse, ADBDeviceExt, ADBMessageTransport, RebootType, Result};
+use std::io::{Read, Write};
+
+use super::ADBMessageDevice;
+
+impl<T: ADBMessageTransport> ADBDeviceExt for ADBMessageDevice<T> {
+    fn shell_command<S: ToString, W: Write>(
+        &mut self,
+        command: impl IntoIterator<Item = S>,
+        output: W,
+    ) -> Result<()> {
+        self.shell_command(command, output)
+    }
+
+    fn shell<R: Read, W: Write + Send + 'static>(&mut self, reader: R, writer: W) -> Result<()> {
+        self.shell(reader, writer)
+    }
+
+    fn stat(&mut self, remote_path: &str) -> Result<AdbStatResponse> {
+        self.stat(remote_path)
+    }
+
+    fn pull<A: AsRef<str>, W: Write>(&mut self, source: A, output: W) -> Result<()> {
+        self.pull(source, output)
+    }
+
+    fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
+        self.push(stream, path)
+    }
+
+    fn reboot(&mut self, reboot_type: RebootType) -> Result<()> {
+        self.reboot(reboot_type)
+    }
+
+    fn install<P: AsRef<std::path::Path>>(&mut self, apk_path: P) -> Result<()> {
+        self.install(apk_path)
+    }
+}

adb_client/src/device/adb_tcp_device.rs

@@ -0,0 +1,112 @@
+use std::net::SocketAddr;
+use std::path::Path;
+
+use super::adb_message_device::ADBMessageDevice;
+use super::models::MessageCommand;
+use super::ADBTransportMessage;
+use crate::{ADBDeviceExt, ADBMessageTransport, ADBTransport, Result, RustADBError, TcpTransport};
+
+/// Represent a device reached and available over USB.
+#[derive(Debug)]
+pub struct ADBTcpDevice {
+    inner: ADBMessageDevice<TcpTransport>,
+}
+
+impl ADBTcpDevice {
+    /// Instantiate a new [`ADBTcpDevice`]
+    pub fn new(address: SocketAddr) -> Result<Self> {
+        let mut device = Self {
+            inner: ADBMessageDevice::new(TcpTransport::new(address)?),
+        };
+
+        device.connect()?;
+
+        Ok(device)
+    }
+
+    /// Send initial connect
+    pub fn connect(&mut self) -> Result<()> {
+        self.get_transport_mut().connect()?;
+
+        let message = ADBTransportMessage::new(
+            MessageCommand::Cnxn,
+            0x01000000,
+            1048576,
+            format!("host::{}\0", env!("CARGO_PKG_NAME"))
+                .as_bytes()
+                .to_vec(),
+        );
+
+        self.get_transport_mut().write_message(message)?;
+
+        let message = self.get_transport_mut().read_message()?;
+
+        // At this point, we should have received a STLS message
+        if message.header().command() != MessageCommand::Stls {
+            return Err(RustADBError::ADBRequestFailed(format!(
+                "Wrong command received {}",
+                message.header().command()
+            )));
+        };
+
+        let message = ADBTransportMessage::new(MessageCommand::Stls, 1, 0, vec![]);
+
+        self.get_transport_mut().write_message(message)?;
+
+        // Upgrade TCP connection to TLS
+        self.get_transport_mut().upgrade_connection()?;
+
+        log::debug!("Connection successfully upgraded from TCP to TLS");
+
+        Ok(())
+    }
+
+    fn get_transport_mut(&mut self) -> &mut TcpTransport {
+        self.inner.get_transport_mut()
+    }
+}
+
+impl ADBDeviceExt for ADBTcpDevice {
+    fn shell_command<S: ToString, W: std::io::Write>(
+        &mut self,
+        command: impl IntoIterator<Item = S>,
+        output: W,
+    ) -> Result<()> {
+        self.inner.shell_command(command, output)
+    }
+
+    fn shell<R: std::io::Read, W: std::io::Write + Send + 'static>(
+        &mut self,
+        reader: R,
+        writer: W,
+    ) -> Result<()> {
+        self.inner.shell(reader, writer)
+    }
+
+    fn stat(&mut self, remote_path: &str) -> Result<crate::AdbStatResponse> {
+        self.inner.stat(remote_path)
+    }
+
+    fn pull<A: AsRef<str>, W: std::io::Write>(&mut self, source: A, output: W) -> Result<()> {
+        self.inner.pull(source, output)
+    }
+
+    fn push<R: std::io::Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
+        self.inner.push(stream, path)
+    }
+
+    fn reboot(&mut self, reboot_type: crate::RebootType) -> Result<()> {
+        self.inner.reboot(reboot_type)
+    }
+
+    fn install<P: AsRef<Path>>(&mut self, apk_path: P) -> Result<()> {
+        self.inner.install(apk_path)
+    }
+}
+
+impl Drop for ADBTcpDevice {
+    fn drop(&mut self) {
+        // Best effort here
+        let _ = self.get_transport_mut().disconnect();
+    }
+}

adb_client/src/device/adb_transport_message.rs

@@ -1,31 +1,32 @@
 use serde::{Deserialize, Serialize};
 
-use super::usb_commands::USBCommand;
 use crate::RustADBError;
 
+use super::models::MessageCommand;
+
 pub const AUTH_TOKEN: u32 = 1;
 pub const AUTH_SIGNATURE: u32 = 2;
 pub const AUTH_RSAPUBLICKEY: u32 = 3;
 
 #[derive(Debug)]
-pub struct ADBUsbMessage {
+pub struct ADBTransportMessage {
-    header: ADBUsbMessageHeader,
+    header: ADBTransportMessageHeader,
     payload: Vec<u8>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 #[repr(C)]
-pub struct ADBUsbMessageHeader {
+pub struct ADBTransportMessageHeader {
-    command: USBCommand, /* command identifier constant      */
+    command: MessageCommand, /* command identifier constant      */
-    arg0: u32,           /* first argument                   */
+    arg0: u32,               /* first argument                   */
-    arg1: u32,           /* second argument                  */
+    arg1: u32,               /* second argument                  */
-    data_length: u32,    /* length of payload (0 is allowed) */
+    data_length: u32,        /* length of payload (0 is allowed) */
-    data_crc32: u32,     /* crc32 of data payload            */
+    data_crc32: u32,         /* crc32 of data payload            */
-    magic: u32,          /* command ^ 0xffffffff             */
+    magic: u32,              /* command ^ 0xffffffff             */
 }
 
-impl ADBUsbMessageHeader {
+impl ADBTransportMessageHeader {
-    pub fn new(command: USBCommand, arg0: u32, arg1: u32, data: &[u8]) -> Self {
+    pub fn new(command: MessageCommand, arg0: u32, arg1: u32, data: &[u8]) -> Self {
         Self {
             command,
             arg0,
@@ -36,7 +37,7 @@ impl ADBUsbMessageHeader {
         }
     }
 
-    pub fn command(&self) -> USBCommand {
+    pub fn command(&self) -> MessageCommand {
         self.command
     }
 
@@ -60,7 +61,7 @@ impl ADBUsbMessageHeader {
         data.iter().map(|&x| x as u32).sum()
     }
 
-    fn compute_magic(command: USBCommand) -> u32 {
+    fn compute_magic(command: MessageCommand) -> u32 {
         let command_u32 = command as u32;
         command_u32 ^ 0xFFFFFFFF
     }
@@ -70,24 +71,24 @@ impl ADBUsbMessageHeader {
     }
 }
 
-impl ADBUsbMessage {
+impl ADBTransportMessage {
-    pub fn new(command: USBCommand, arg0: u32, arg1: u32, data: Vec<u8>) -> Self {
+    pub fn new(command: MessageCommand, arg0: u32, arg1: u32, data: Vec<u8>) -> Self {
         Self {
-            header: ADBUsbMessageHeader::new(command, arg0, arg1, &data),
+            header: ADBTransportMessageHeader::new(command, arg0, arg1, &data),
             payload: data,
         }
     }
 
-    pub fn from_header_and_payload(header: ADBUsbMessageHeader, payload: Vec<u8>) -> Self {
+    pub fn from_header_and_payload(header: ADBTransportMessageHeader, payload: Vec<u8>) -> Self {
         Self { header, payload }
     }
 
     pub fn check_message_integrity(&self) -> bool {
-        ADBUsbMessageHeader::compute_magic(self.header.command) == self.header.magic
+        ADBTransportMessageHeader::compute_magic(self.header.command) == self.header.magic
-            && ADBUsbMessageHeader::compute_crc32(&self.payload) == self.header.data_crc32
+            && ADBTransportMessageHeader::compute_crc32(&self.payload) == self.header.data_crc32
     }
 
-    pub fn header(&self) -> &ADBUsbMessageHeader {
+    pub fn header(&self) -> &ADBTransportMessageHeader {
         &self.header
     }
 
@@ -100,7 +101,7 @@ impl ADBUsbMessage {
     }
 }
 
-impl TryFrom<[u8; 24]> for ADBUsbMessageHeader {
+impl TryFrom<[u8; 24]> for ADBTransportMessageHeader {
     type Error = RustADBError;
 
     fn try_from(value: [u8; 24]) -> Result<Self, Self::Error> {

adb_client/src/device/adb_usb_device.rs

@@ -0,0 +1,294 @@
+use rusb::Device;
+use rusb::DeviceDescriptor;
+use rusb::UsbContext;
+use std::fs::read_to_string;
+use std::path::Path;
+use std::path::PathBuf;
+use std::time::Duration;
+
+use super::adb_message_device::ADBMessageDevice;
+use super::models::MessageCommand;
+use super::{ADBRsaKey, ADBTransportMessage};
+use crate::device::adb_transport_message::{AUTH_RSAPUBLICKEY, AUTH_SIGNATURE, AUTH_TOKEN};
+use crate::ADBDeviceExt;
+use crate::ADBMessageTransport;
+use crate::ADBTransport;
+use crate::{Result, RustADBError, USBTransport};
+
+pub fn read_adb_private_key<P: AsRef<Path>>(private_key_path: P) -> Result<Option<ADBRsaKey>> {
+    Ok(read_to_string(private_key_path.as_ref()).map(|pk| {
+        match ADBRsaKey::new_from_pkcs8(&pk) {
+            Ok(pk) => Some(pk),
+            Err(e) => {
+                log::error!("Error while create RSA private key: {e}");
+                None
+            }
+        }
+    })?)
+}
+
+/// Search for adb devices with known interface class and subclass values
+fn search_adb_devices() -> Result<Option<(u16, u16)>> {
+    let mut found_devices = vec![];
+    for device in rusb::devices()?.iter() {
+        let Ok(des) = device.device_descriptor() else {
+            continue;
+        };
+        if is_adb_device(&device, &des) {
+            log::debug!(
+                "Autodetect device {:04x}:{:04x}",
+                des.vendor_id(),
+                des.product_id()
+            );
+            found_devices.push((des.vendor_id(), des.product_id()));
+        }
+    }
+
+    match (found_devices.first(), found_devices.get(1)) {
+        (None, _) => Ok(None),
+        (Some(identifiers), None) => Ok(Some(*identifiers)),
+        (Some((vid1, pid1)), Some((vid2, pid2))) => Err(RustADBError::DeviceNotFound(format!(
+            "Found two Android devices {:04x}:{:04x} and {:04x}:{:04x}",
+            vid1, pid1, vid2, pid2
+        ))),
+    }
+}
+
+fn is_adb_device<T: UsbContext>(device: &Device<T>, des: &DeviceDescriptor) -> bool {
+    const ADB_CLASS: u8 = 0xff;
+
+    const ADB_SUBCLASS: u8 = 0x42;
+    const ADB_PROTOCOL: u8 = 0x1;
+
+    // Some devices require choosing the file transfer mode
+    // for usb debugging to take effect.
+    const BULK_CLASS: u8 = 0xdc;
+    const BULK_ADB_SUBCLASS: u8 = 2;
+
+    for n in 0..des.num_configurations() {
+        let Ok(config_des) = device.config_descriptor(n) else {
+            continue;
+        };
+        for interface in config_des.interfaces() {
+            for interface_des in interface.descriptors() {
+                let proto = interface_des.protocol_code();
+                let class = interface_des.class_code();
+                let subcl = interface_des.sub_class_code();
+                if proto == ADB_PROTOCOL
+                    && ((class == ADB_CLASS && subcl == ADB_SUBCLASS)
+                        || (class == BULK_CLASS && subcl == BULK_ADB_SUBCLASS))
+                {
+                    return true;
+                }
+            }
+        }
+    }
+    false
+}
+
+pub fn get_default_adb_key_path() -> Result<PathBuf> {
+    homedir::my_home()
+        .ok()
+        .flatten()
+        .map(|home| home.join(".android").join("adbkey"))
+        .ok_or(RustADBError::NoHomeDirectory)
+}
+
+/// Represent a device reached and available over USB.
+#[derive(Debug)]
+pub struct ADBUSBDevice {
+    private_key: ADBRsaKey,
+    inner: ADBMessageDevice<USBTransport>,
+}
+
+impl ADBUSBDevice {
+    /// Instantiate a new [`ADBUSBDevice`]
+    pub fn new(vendor_id: u16, product_id: u16) -> Result<Self> {
+        Self::new_with_custom_private_key(vendor_id, product_id, get_default_adb_key_path()?)
+    }
+
+    /// Instantiate a new [`ADBUSBDevice`] using a custom private key path
+    pub fn new_with_custom_private_key(
+        vendor_id: u16,
+        product_id: u16,
+        private_key_path: PathBuf,
+    ) -> Result<Self> {
+        Self::new_from_transport_inner(USBTransport::new(vendor_id, product_id)?, private_key_path)
+    }
+
+    /// Instantiate a new [`ADBUSBDevice`] from a [`USBTransport`] and an optional private key path.
+    pub fn new_from_transport(
+        transport: USBTransport,
+        private_key_path: Option<PathBuf>,
+    ) -> Result<Self> {
+        let private_key_path = match private_key_path {
+            Some(private_key_path) => private_key_path,
+            None => get_default_adb_key_path()?,
+        };
+
+        Self::new_from_transport_inner(transport, private_key_path)
+    }
+
+    fn new_from_transport_inner(
+        transport: USBTransport,
+        private_key_path: PathBuf,
+    ) -> Result<Self> {
+        let private_key = match read_adb_private_key(private_key_path)? {
+            Some(pk) => pk,
+            None => ADBRsaKey::new_random()?,
+        };
+
+        let mut s = Self {
+            private_key,
+            inner: ADBMessageDevice::new(transport),
+        };
+
+        s.connect()?;
+
+        Ok(s)
+    }
+
+    /// autodetect connected ADB devices and establish a connection with the first device found
+    pub fn autodetect() -> Result<Self> {
+        Self::autodetect_with_custom_private_key(get_default_adb_key_path()?)
+    }
+
+    /// autodetect connected ADB devices and establish a connection with the first device found using a custom private key path
+    pub fn autodetect_with_custom_private_key(private_key_path: PathBuf) -> Result<Self> {
+        match search_adb_devices()? {
+            Some((vendor_id, product_id)) => {
+                ADBUSBDevice::new_with_custom_private_key(vendor_id, product_id, private_key_path)
+            }
+            _ => Err(RustADBError::DeviceNotFound(
+                "cannot find USB devices matching the signature of an ADB device".into(),
+            )),
+        }
+    }
+
+    /// Send initial connect
+    pub fn connect(&mut self) -> Result<()> {
+        self.get_transport_mut().connect()?;
+
+        let message = ADBTransportMessage::new(
+            MessageCommand::Cnxn,
+            0x01000000,
+            1048576,
+            format!("host::{}\0", env!("CARGO_PKG_NAME"))
+                .as_bytes()
+                .to_vec(),
+        );
+
+        self.get_transport_mut().write_message(message)?;
+
+        let message = self.get_transport_mut().read_message()?;
+
+        // At this point, we should have received either:
+        // - an AUTH message with arg0 == 1
+        // - a CNXN message
+        let auth_message = match message.header().command() {
+            MessageCommand::Auth if message.header().arg0() == AUTH_TOKEN => message,
+            MessageCommand::Auth if message.header().arg0() != AUTH_TOKEN => {
+                return Err(RustADBError::ADBRequestFailed(
+                    "Received AUTH message with type != 1".into(),
+                ))
+            }
+            c => {
+                return Err(RustADBError::ADBRequestFailed(format!(
+                    "Wrong command received {}",
+                    c
+                )))
+            }
+        };
+
+        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))?;
+
+        match response.header().command() {
+            MessageCommand::Cnxn => log::info!(
+                "Authentication OK, device info {}",
+                String::from_utf8(response.into_payload())?
+            ),
+            _ => {
+                return Err(RustADBError::ADBRequestFailed(format!(
+                    "wrong response {}",
+                    response.header().command()
+                )))
+            }
+        }
+
+        Ok(())
+    }
+
+    fn get_transport_mut(&mut self) -> &mut USBTransport {
+        self.inner.get_transport_mut()
+    }
+}
+
+impl ADBDeviceExt for ADBUSBDevice {
+    fn shell_command<S: ToString, W: std::io::Write>(
+        &mut self,
+        command: impl IntoIterator<Item = S>,
+        output: W,
+    ) -> Result<()> {
+        self.inner.shell_command(command, output)
+    }
+
+    fn shell<R: std::io::Read, W: std::io::Write + Send + 'static>(
+        &mut self,
+        reader: R,
+        writer: W,
+    ) -> Result<()> {
+        self.inner.shell(reader, writer)
+    }
+
+    fn stat(&mut self, remote_path: &str) -> Result<crate::AdbStatResponse> {
+        self.inner.stat(remote_path)
+    }
+
+    fn pull<A: AsRef<str>, W: std::io::Write>(&mut self, source: A, output: W) -> Result<()> {
+        self.inner.pull(source, output)
+    }
+
+    fn push<R: std::io::Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
+        self.inner.push(stream, path)
+    }
+
+    fn reboot(&mut self, reboot_type: crate::RebootType) -> Result<()> {
+        self.inner.reboot(reboot_type)
+    }
+
+    fn install<P: AsRef<Path>>(&mut self, apk_path: P) -> Result<()> {
+        self.inner.install(apk_path)
+    }
+}
+
+impl Drop for ADBUSBDevice {
+    fn drop(&mut self) {
+        // Best effort here
+        let _ = self.get_transport_mut().disconnect();
+    }
+}

adb_client/src/device/commands/install.rs

@@ -0,0 +1,59 @@
+use std::fs::File;
+
+use rand::Rng;
+
+use crate::{
+    device::{
+        adb_message_device::ADBMessageDevice, ADBTransportMessage, MessageCommand, MessageWriter,
+    },
+    utils::check_extension_is_apk,
+    ADBMessageTransport, Result,
+};
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    pub(crate) fn install<P: AsRef<std::path::Path>>(&mut self, apk_path: P) -> Result<()> {
+        let mut apk_file = File::open(&apk_path)?;
+
+        check_extension_is_apk(&apk_path)?;
+
+        let file_size = apk_file.metadata()?.len();
+
+        let mut rng = rand::thread_rng();
+
+        let local_id = rng.gen();
+
+        let message = ADBTransportMessage::new(
+            MessageCommand::Open,
+            local_id,
+            0,
+            format!("exec:cmd package 'install' -S {}\0", file_size)
+                .as_bytes()
+                .to_vec(),
+        );
+        self.get_transport_mut().write_message(message)?;
+
+        let response = self.get_transport_mut().read_message()?;
+        let remote_id = response.header().arg0();
+
+        let transport = self.get_transport().clone();
+
+        let mut writer = MessageWriter::new(transport, local_id, remote_id);
+
+        std::io::copy(&mut apk_file, &mut writer)?;
+
+        let final_status = self.get_transport_mut().read_message()?;
+
+        match final_status.into_payload().as_slice() {
+            b"Success\n" => {
+                log::info!(
+                    "APK file {} successfully installed",
+                    apk_path.as_ref().display()
+                );
+                Ok(())
+            }
+            d => Err(crate::RustADBError::ADBRequestFailed(String::from_utf8(
+                d.to_vec(),
+            )?)),
+        }
+    }
+}

adb_client/src/device/commands/mod.rs

@@ -0,0 +1,6 @@
+mod install;
+mod pull;
+mod push;
+mod reboot;
+mod shell;
+mod stat;

adb_client/src/device/commands/pull.rs

@@ -0,0 +1,49 @@
+use std::io::Write;
+
+use crate::{
+    device::{
+        adb_message_device::ADBMessageDevice, models::MessageSubcommand, ADBTransportMessage,
+        MessageCommand,
+    },
+    ADBMessageTransport, Result, RustADBError,
+};
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    pub(crate) fn pull<A: AsRef<str>, W: Write>(&mut self, source: A, output: W) -> Result<()> {
+        let (local_id, remote_id) = self.begin_synchronization()?;
+        let source = source.as_ref();
+
+        let adb_stat_response = self.stat_with_explicit_ids(source, local_id, remote_id)?;
+
+        if adb_stat_response.file_perm == 0 {
+            return Err(RustADBError::UnknownResponseType(
+                "mode is 0: source file does not exist".to_string(),
+            ));
+        }
+
+        self.get_transport_mut().write_message_with_timeout(
+            ADBTransportMessage::new(MessageCommand::Okay, local_id, remote_id, "".into()),
+            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)?;
+        self.send_and_expect_okay(ADBTransportMessage::new(
+            MessageCommand::Write,
+            local_id,
+            remote_id,
+            recv_buffer,
+        ))?;
+        self.send_and_expect_okay(ADBTransportMessage::new(
+            MessageCommand::Write,
+            local_id,
+            remote_id,
+            source.into(),
+        ))?;
+
+        self.recv_file(local_id, remote_id, output)?;
+        self.end_transaction(local_id, remote_id)?;
+        Ok(())
+    }
+}

adb_client/src/device/commands/push.rs

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

adb_client/src/device/commands/reboot.rs

@@ -0,0 +1,28 @@
+use rand::Rng;
+
+use crate::{
+    device::{adb_message_device::ADBMessageDevice, ADBTransportMessage, MessageCommand},
+    ADBMessageTransport, RebootType, Result, RustADBError,
+};
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    pub(crate) fn reboot(&mut self, reboot_type: RebootType) -> Result<()> {
+        let mut rng = rand::thread_rng();
+
+        let message = ADBTransportMessage::new(
+            MessageCommand::Open,
+            rng.gen(), // Our 'local-id'
+            0,
+            format!("reboot:{}\0", reboot_type).as_bytes().to_vec(),
+        );
+        self.get_transport_mut().write_message(message)?;
+
+        let message = self.get_transport_mut().read_message()?;
+
+        if message.header().command() != MessageCommand::Okay {
+            return Err(RustADBError::ADBShellNotSupported);
+        }
+
+        Ok(())
+    }
+}

adb_client/src/device/commands/shell.rs

@@ -0,0 +1,112 @@
+use rand::Rng;
+use std::io::{Read, Write};
+
+use crate::device::ShellMessageWriter;
+use crate::Result;
+use crate::{
+    device::{ADBMessageDevice, ADBTransportMessage, MessageCommand},
+    ADBMessageTransport, RustADBError,
+};
+
+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<S: ToString, W: Write>(
+        &mut self,
+        command: impl IntoIterator<Item = S>,
+        mut output: W,
+    ) -> Result<()> {
+        let message = ADBTransportMessage::new(
+            MessageCommand::Open,
+            1,
+            0,
+            format!(
+                "shell:{}\0",
+                command
+                    .into_iter()
+                    .map(|v| v.to_string())
+                    .collect::<Vec<_>>()
+                    .join(" "),
+            )
+            .as_bytes()
+            .to_vec(),
+        );
+        self.get_transport_mut().write_message(message)?;
+
+        let response = self.get_transport_mut().read_message()?;
+        if response.header().command() != MessageCommand::Okay {
+            return Err(RustADBError::ADBRequestFailed(format!(
+                "wrong command {}",
+                response.header().command()
+            )));
+        }
+
+        loop {
+            let response = self.get_transport_mut().read_message()?;
+            if response.header().command() != MessageCommand::Write {
+                break;
+            }
+
+            output.write_all(&response.into_payload())?;
+        }
+
+        Ok(())
+    }
+
+    /// Starts an interactive shell session on the device.
+    /// Input data is read from [reader] and write to [writer].
+    /// [W] has a 'static bound as it is internally used in a thread.
+    pub(crate) fn shell<R: Read, W: Write + Send + 'static>(
+        &mut self,
+        mut reader: R,
+        mut writer: W,
+    ) -> Result<()> {
+        let sync_directive = "shell:\0";
+
+        let mut rng = rand::thread_rng();
+        let message = ADBTransportMessage::new(
+            MessageCommand::Open,
+            rng.gen(), /* Our 'local-id' */
+            0,
+            sync_directive.into(),
+        );
+        let message = self.send_and_expect_okay(message)?;
+        let local_id = message.header().arg1();
+        let remote_id = message.header().arg0();
+
+        let mut transport = self.get_transport().clone();
+
+        // 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, vec![]);
+                transport.write_message(response)?;
+
+                match message.header().command() {
+                    MessageCommand::Write => {}
+                    MessageCommand::Okay => continue,
+                    _ => return Err(RustADBError::ADBShellNotSupported),
+                }
+
+                writer.write_all(&message.into_payload())?;
+                writer.flush()?;
+            }
+        });
+
+        let transport = self.get_transport().clone();
+        let mut shell_writer = ShellMessageWriter::new(transport, local_id, 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) {
+            match e.kind() {
+                std::io::ErrorKind::BrokenPipe => return Ok(()),
+                _ => return Err(RustADBError::IOError(e)),
+            }
+        }
+
+        Ok(())
+    }
+}

adb_client/src/device/commands/stat.rs

@@ -0,0 +1,12 @@
+use crate::{
+    device::adb_message_device::ADBMessageDevice, ADBMessageTransport, AdbStatResponse, Result,
+};
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    pub(crate) fn stat(&mut self, remote_path: &str) -> Result<AdbStatResponse> {
+        let (local_id, remote_id) = self.begin_synchronization()?;
+        let adb_stat_response = self.stat_with_explicit_ids(remote_path, local_id, remote_id)?;
+        self.end_transaction(local_id, remote_id)?;
+        Ok(adb_stat_response)
+    }
+}

adb_client/src/device/message_writer.rs

@@ -0,0 +1,53 @@
+use std::io::{ErrorKind, Write};
+
+use crate::ADBMessageTransport;
+
+use super::{ADBTransportMessage, MessageCommand};
+
+/// [`Write`] trait implementation to hide underlying ADB protocol write logic.
+///
+/// Read received responses to check that message has been correctly received.
+pub struct MessageWriter<T: ADBMessageTransport> {
+    transport: T,
+    local_id: u32,
+    remote_id: u32,
+}
+
+impl<T: ADBMessageTransport> MessageWriter<T> {
+    pub fn new(transport: T, local_id: u32, remote_id: u32) -> Self {
+        Self {
+            transport,
+            local_id,
+            remote_id,
+        }
+    }
+}
+
+impl<T: ADBMessageTransport> Write for MessageWriter<T> {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        let message = ADBTransportMessage::new(
+            MessageCommand::Write,
+            self.local_id,
+            self.remote_id,
+            buf.to_vec(),
+        );
+        self.transport
+            .write_message(message)
+            .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))?;
+
+        match self.transport.read_message() {
+            Ok(response) => match response.header().command() {
+                MessageCommand::Okay => Ok(buf.len()),
+                c => Err(std::io::Error::new(
+                    ErrorKind::Other,
+                    format!("wrong response received: {c}"),
+                )),
+            },
+            Err(e) => Err(std::io::Error::new(ErrorKind::Other, e)),
+        }
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        Ok(())
+    }
+}

adb_client/src/device/mod.rs

@@ -0,0 +1,17 @@
+mod adb_message_device;
+mod adb_message_device_commands;
+mod adb_tcp_device;
+mod adb_transport_message;
+mod adb_usb_device;
+mod commands;
+mod message_writer;
+mod models;
+mod shell_message_writer;
+
+use adb_message_device::ADBMessageDevice;
+pub use adb_tcp_device::ADBTcpDevice;
+pub use adb_transport_message::{ADBTransportMessage, ADBTransportMessageHeader};
+pub use adb_usb_device::{get_default_adb_key_path, ADBUSBDevice};
+pub use message_writer::MessageWriter;
+pub use models::{ADBRsaKey, MessageCommand, MessageSubcommand};
+pub use shell_message_writer::ShellMessageWriter;

adb_client/src/device/models/adb_rsa_key.rs

@@ -0,0 +1,175 @@
+use crate::{Result, RustADBError};
+use base64::{engine::general_purpose::STANDARD, Engine};
+use num_bigint::{BigUint, ModInverse};
+use num_traits::cast::ToPrimitive;
+use num_traits::FromPrimitive;
+use rand::rngs::OsRng;
+use rsa::pkcs8::DecodePrivateKey;
+use rsa::traits::PublicKeyParts;
+use rsa::{Pkcs1v15Sign, RsaPrivateKey};
+
+const ADB_PRIVATE_KEY_SIZE: usize = 2048;
+const ANDROID_PUBKEY_MODULUS_SIZE_WORDS: u32 = 64;
+
+#[repr(C)]
+#[derive(Debug, Default)]
+/// Internal ADB representation of a public key
+struct ADBRsaInternalPublicKey {
+    pub modulus_size_words: u32,
+    pub n0inv: u32,
+    pub modulus: BigUint,
+    pub rr: Vec<u8>,
+    pub exponent: u32,
+}
+
+impl ADBRsaInternalPublicKey {
+    pub fn new(exponent: &BigUint, modulus: &BigUint) -> Result<Self> {
+        Ok(Self {
+            modulus_size_words: ANDROID_PUBKEY_MODULUS_SIZE_WORDS,
+            exponent: exponent.to_u32().ok_or(RustADBError::ConversionError)?,
+            modulus: modulus.clone(),
+            ..Default::default()
+        })
+    }
+
+    pub fn into_bytes(mut self) -> Vec<u8> {
+        let mut bytes: Vec<u8> = Vec::new();
+        bytes.append(&mut self.modulus_size_words.to_le_bytes().to_vec());
+        bytes.append(&mut self.n0inv.to_le_bytes().to_vec());
+        bytes.append(&mut self.modulus.to_bytes_le());
+        bytes.append(&mut self.rr);
+        bytes.append(&mut self.exponent.to_le_bytes().to_vec());
+
+        bytes
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct ADBRsaKey {
+    private_key: RsaPrivateKey,
+}
+
+impl ADBRsaKey {
+    pub fn new_random() -> Result<Self> {
+        Ok(Self {
+            private_key: RsaPrivateKey::new(&mut OsRng, ADB_PRIVATE_KEY_SIZE)?,
+        })
+    }
+
+    pub fn new_from_pkcs8(pkcs8_content: &str) -> Result<Self> {
+        Ok(ADBRsaKey {
+            private_key: RsaPrivateKey::from_pkcs8_pem(pkcs8_content)?,
+        })
+    }
+
+    pub fn android_pubkey_encode(&self) -> Result<String> {
+        // Helped from project: https://github.com/hajifkd/webadb
+        // Source code: https://android.googlesource.com/platform/system/core/+/refs/heads/main/libcrypto_utils/android_pubkey.cpp
+        // Useful function `android_pubkey_encode()`
+        let mut adb_rsa_pubkey =
+            ADBRsaInternalPublicKey::new(self.private_key.e(), self.private_key.n())?;
+
+        // r32 = 2 ^ 32
+        let r32 = BigUint::from_u64(1 << 32).ok_or(RustADBError::ConversionError)?;
+
+        // r = 2 ^ rsa_size = 2 ^ 2048
+        let r = set_bit(ADB_PRIVATE_KEY_SIZE)?;
+
+        // rr = r ^ 2 mod N
+        let rr = r.modpow(&BigUint::from(2u32), &adb_rsa_pubkey.modulus);
+        adb_rsa_pubkey.rr = rr.to_bytes_le();
+
+        // rem = N[0]
+        let rem = &adb_rsa_pubkey.modulus % &r32;
+
+        // n0inv = -1 / rem mod r32
+        let n0inv = rem
+            .mod_inverse(&r32)
+            .and_then(|v| v.to_biguint())
+            .ok_or(RustADBError::ConversionError)?;
+
+        // BN_sub(n0inv, r32, n0inv)
+        adb_rsa_pubkey.n0inv = (r32 - n0inv)
+            .to_u32()
+            .ok_or(RustADBError::ConversionError)?;
+
+        Ok(self.encode_public_key(adb_rsa_pubkey.into_bytes()))
+    }
+
+    fn encode_public_key(&self, pub_key: Vec<u8>) -> String {
+        let mut encoded = STANDARD.encode(pub_key);
+        encoded.push(' ');
+        encoded.push_str(&format!("adb_client@{}", env!("CARGO_PKG_VERSION")));
+
+        encoded
+    }
+
+    pub fn sign(&self, msg: impl AsRef<[u8]>) -> Result<Vec<u8>> {
+        Ok(self
+            .private_key
+            .sign(Pkcs1v15Sign::new::<sha1::Sha1>(), msg.as_ref())?)
+    }
+}
+
+fn set_bit(n: usize) -> Result<BigUint> {
+    BigUint::parse_bytes(
+        &{
+            let mut bits = vec![b'1'];
+            bits.append(&mut vec![b'0'; n]);
+            bits
+        }[..],
+        2,
+    )
+    .ok_or(RustADBError::ConversionError)
+}
+
+#[test]
+fn test_pubkey_gen() {
+    const DEFAULT_PRIV_KEY: &'static str = r"-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC4Dyn85cxDJnjM
+uYXQl/w469MDKdlGdviLfmFMWeYLVfL2Mz1AVyvKqscrtlhbbgMQ/M+3lDvEdHS0
+14RIGAwWRtrlTTmhLvM2/IO+eSKSYeCrCVc4KLG3E3WRryUXbs2ynA29xjTJVw+Z
+xYxDyn/tAYPEyMm4v+HIJHcOtRzxtO2vjMJ2vBT/ywYxjhncXbFSO09q2E4XrHli
+SIPyO82hZgCkpzTZRp+nyA17TYuV9++mvUr9lWH9RbC+o8EF3yitlBsE2uXr97EV
+i2Qy8CE7FIxsihXlukppwKRuz+1rJrvmZPTn49ZS+sIS99WE9GoCpsyQvTpvehrM
+SIDRsVZPAgMBAAECggEAWNXAzzXeS36zCSR1yILCknqHotw86Pyc4z7BGUe+dzQp
+itiaNIaeNTgN3zQoGyDSzA0o+BLMcfo/JdVrHBy3IL1cAxYtvXTaoGxp7bGrlPk2
+pXZhqVJCy/jRYtokzdWF5DHbk/+pFJA3kGE/XKzM54g2n/DFI61A/QdUiz2w1ZtI
+vc5cM08EM8B/TSI3SeWB8zkh5SlIuLsFO2J2+tCak6PdFfKOVIrFv9dKJYLxx+59
++edZamw2EvNlnl/sewgUk0gaZvQKVf4ivHyM+KSHuV4RFfiLvGuVcyA6XhSjztsG
+EA++jDHP5ib/Izes7UK09v9y7kow+z6vUtnDDQOvgQKBgQD8WWAn7FQt9aziCw19
+gZynzHG1bXI7uuEVSneuA3UwJImmDu8W+Qb9YL9Dc2nV0M5pGGdXKi2jzq8gPar6
+GPAmy7TOlov6Nm0pbMXTAfuovG+gIXxelp3US3FvyRupi0/7UQRRwvetFYbDFwJX
+ydF5uEtZdGSHAjPeU5FLq6tBwQKBgQC6uN0JwwZn+eaxguyKOXvp0KykhFI0HI1A
+MBDZ1uuKt6OW5+r9NeQtTLctGlNKVQ8wz+Wr0C/nLGIIv4lySS9WFyc5/FnFhDdy
+LsEi6whcca4vq3jsMOukvQGFnERsou4LqBEI1Es7jjeeEq+/8WnNTi6Y1flZ6UAp
+YAOeFI98DwKBgQDvyfHgHeajwZalOQF5qGb24AOQ9c4dyefGNnvhA/IgbCfMftZc
+iwhETuGQM6R3A7KQFRtlrXOu+2BYD6Ffg8D37IwD3vRmL7+tJGoapwC/B0g+7nLi
+4tZY+9Nv+LbrdbDry8GB+/UkKJdk3IFicCk4M5KOD1bTH5mwAtLHB/p1QQKBgDHi
+k8M45GxA+p4wMUvYgb987bLiWyfq/N3KOaZJYhJkb4MwoLpXfIeRuFqHbvsr8GwF
+DwIxE6s6U1KtAWaUIN5qPyOhxMYdRcbusNDIZCp2gKfhsuO/SiVwDYkJr8oqWVip
+5SsrtJHLtBY6PdQVBkRAf/h7KiwYQfkL2suQCKmHAoGBAJAkYImBYPHuRcnSXikn
+xGDK/moPvzs0CjdPlRcEN+Myy/G0FUrOaC0FcpNoJOdQSYz3F6URA4nX+zj6Ie7G
+CNkECiepaGyquQaffwR1CAi8dH6biJjlTQWQPFcCLA0hvernWo3eaSfiL7fHyym+
+ile69MHFENUePSpuRSiF3Z02
+-----END PRIVATE KEY-----";
+    let priv_key =
+        ADBRsaKey::new_from_pkcs8(DEFAULT_PRIV_KEY).expect("cannot create rsa key from data");
+    let pub_key = priv_key
+        .android_pubkey_encode()
+        .expect("cannot encode public key");
+    let pub_key_adb = "\
+QAAAAFH/pU9PVrHRgEjMGnpvOr2QzKYCavSE1fcSwvpS1uPn9GTmuyZr7c9up\
+MBpSrrlFYpsjBQ7IfAyZIsVsffr5doEG5StKN8FwaO+sEX9YZX9Sr2m7/eVi0\
+17Dcinn0bZNKekAGahzTvyg0hieawXTthqTztSsV3cGY4xBsv/FLx2woyv7bT\
+xHLUOdyTI4b+4ycjEgwHtf8pDjMWZD1fJNMa9DZyyzW4XJa+RdRO3sSg4Vwmr\
+4GGSInm+g/w28y6hOU3l2kYWDBhIhNe0dHTEO5S3z/wQA25bWLYrx6rKK1dAP\
+TP28lUL5llMYX6L+HZG2SkD0+s4/JfQhbnMeCZDzOX8KQ+4ThLy/gDTqCSTjj\
+ic8BykdUIqYPwAjBMgQwLOLY5WNJMpjGlFINRcCGhvFFZ73sJTLerECuV/Oae\
+nFRcORwnGIRgMrYXj4tjmxJC7sq3cfNX96YIcSCDE9SZFdlKXVK8Jc4YMLGF3\
+MI8k1KoTby34uaIyxPJvwM1WR4Rdj60fwMyikFXNaOR2fPteZ3UMBA7CMrOEm\
+9iYjntyEppA4hQXIO1TWTzkA/Kfl1i67k5NuLIQdhPFEc5ox5IYVHusauPQ7d\
+Awu6BlgK37TUn0JdK0Z6Z4RaEIaNiEI0d5CoP6zQKV2QQnlscYpdsaUW5t9/F\
+LioVXPwrz0tx35JyIUZPPYwEAAQA= ";
+    assert_eq!(&pub_key[..pub_key_adb.len()], pub_key_adb);
+}

adb_client/src/device/models/message_commands.rs

@@ -4,7 +4,7 @@ use std::fmt::Display;
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize_repr, Deserialize_repr)]
 #[repr(u32)]
-pub enum USBCommand {
+pub enum MessageCommand {
     /// Connect to a device
     Cnxn = 0x4e584e43,
     /// Close connection to a device
@@ -18,12 +18,13 @@ pub enum USBCommand {
     /// Server understood the message
     Okay = 0x59414b4f,
     // Sync 0x434e5953
-    // Stls 0x534C5453
+    /// Start a connection using TLS
+    Stls = 0x534C5453,
 }
 
 #[derive(Debug, Eq, PartialEq, Copy, Clone, Serialize_repr, Deserialize_repr)]
 #[repr(u32)]
-pub enum USBSubcommand {
+pub enum MessageSubcommand {
     Stat = 0x54415453,
     Send = 0x444E4553,
     Recv = 0x56434552,
@@ -36,11 +37,11 @@ pub enum USBSubcommand {
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct SubcommandWithArg {
-    subcommand: USBSubcommand,
+    subcommand: MessageSubcommand,
     arg: u32,
 }
 
-impl USBSubcommand {
+impl MessageSubcommand {
     pub fn with_arg(self, arg: u32) -> SubcommandWithArg {
         SubcommandWithArg {
             subcommand: self,
@@ -49,15 +50,16 @@ impl USBSubcommand {
     }
 }
 
-impl Display for USBCommand {
+impl Display for MessageCommand {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            USBCommand::Cnxn => write!(f, "CNXN"),
+            MessageCommand::Cnxn => write!(f, "CNXN"),
-            USBCommand::Clse => write!(f, "CLSE"),
+            MessageCommand::Clse => write!(f, "CLSE"),
-            USBCommand::Auth => write!(f, "AUTH"),
+            MessageCommand::Auth => write!(f, "AUTH"),
-            USBCommand::Open => write!(f, "OPEN"),
+            MessageCommand::Open => write!(f, "OPEN"),
-            USBCommand::Write => write!(f, "WRTE"),
+            MessageCommand::Write => write!(f, "WRTE"),
-            USBCommand::Okay => write!(f, "OKAY"),
+            MessageCommand::Okay => write!(f, "OKAY"),
+            MessageCommand::Stls => write!(f, "STLS"),
         }
     }
 }

adb_client/src/device/models/mod.rs

@@ -0,0 +1,5 @@
+mod adb_rsa_key;
+mod message_commands;
+
+pub use adb_rsa_key::ADBRsaKey;
+pub use message_commands::{MessageCommand, MessageSubcommand};

adb_client/src/device/shell_message_writer.rs

@@ -1,18 +1,18 @@
 use std::io::Write;
 
-use crate::USBTransport;
+use crate::ADBMessageTransport;
 
-use super::{ADBUsbMessage, USBCommand};
+use super::{models::MessageCommand, ADBTransportMessage};
 
-/// Wraps a `Writer` to hide underlying ADB protocol write logic.
+/// [`Write`] trait implementation to hide underlying ADB protocol write logic for shell commands.
-pub struct USBShellWriter {
+pub struct ShellMessageWriter<T: ADBMessageTransport> {
-    transport: USBTransport,
+    transport: T,
     local_id: u32,
     remote_id: u32,
 }
 
-impl USBShellWriter {
+impl<T: ADBMessageTransport> ShellMessageWriter<T> {
-    pub fn new(transport: USBTransport, local_id: u32, remote_id: u32) -> Self {
+    pub fn new(transport: T, local_id: u32, remote_id: u32) -> Self {
         Self {
             transport,
             local_id,
@@ -21,10 +21,10 @@ impl USBShellWriter {
     }
 }
 
-impl Write for USBShellWriter {
+impl<T: ADBMessageTransport> Write for ShellMessageWriter<T> {
     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-        let message = ADBUsbMessage::new(
+        let message = ADBTransportMessage::new(
-            USBCommand::Write,
+            MessageCommand::Write,
             self.local_id,
             self.remote_id,
             buf.to_vec(),

adb_client/src/emulator_device/adb_emulator_device.rs

@@ -1,15 +1,14 @@
-use std::net::{Ipv4Addr, SocketAddrV4};
+use std::{
+    net::{Ipv4Addr, SocketAddrV4},
+    sync::LazyLock,
+};
 
-use crate::{ADBTransport, Result, RustADBError, TCPEmulatorTransport};
+use crate::{ADBServerDevice, ADBTransport, Result, RustADBError, TCPEmulatorTransport};
-use lazy_static::lazy_static;
 use regex::Regex;
 
-use super::ADBServerDevice;
+static EMULATOR_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-
+    Regex::new("^emulator-(?P<port>\\d+)$").expect("wrong syntax for emulator regex")
-lazy_static! {
+});
-    pub static ref EMULATOR_REGEX: Regex =
-        Regex::new("^emulator-(?P<port>\\d+)$").expect("wrong syntax for emulator regex");
-}
 
 /// Represents an emulator connected to the ADB server.
 #[derive(Debug)]

adb_client/src/emulator_device/mod.rs

@@ -0,0 +1,3 @@
+mod adb_emulator_device;
+mod commands;
+pub use adb_emulator_device::ADBEmulatorDevice;

adb_client/src/error.rs

@@ -87,4 +87,37 @@ pub enum RustADBError {
     /// Cannot convert given data from slice
     #[error(transparent)]
     TryFromSliceError(#[from] std::array::TryFromSliceError),
+    /// Given path does not represent an APK
+    #[error("wrong file extension: {0}")]
+    WrongFileExtension(String),
+    /// An error occurred with PKCS8 data
+    #[error("error with pkcs8: {0}")]
+    RsaPkcs8Error(#[from] rsa::pkcs8::Error),
+    /// Error during certificate generation
+    #[error(transparent)]
+    CertificateGenerationError(#[from] rcgen::Error),
+    /// TLS Error
+    #[error(transparent)]
+    TLSError(#[from] rustls::Error),
+    /// PEM certificate error
+    #[error(transparent)]
+    PemCertError(#[from] rustls_pki_types::pem::Error),
+    /// Error while locking mutex
+    #[error("error while locking data")]
+    PoisonError,
+    /// Cannot upgrade connection from TCP to TLS
+    #[error("upgrade error: {0}")]
+    UpgradeError(String),
+    /// An error occurred while getting mdns devices
+    #[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>),
+}
+
+impl<T> From<std::sync::PoisonError<T>> for RustADBError {
+    fn from(_err: std::sync::PoisonError<T>) -> Self {
+        Self::PoisonError
+    }
 }

adb_client/src/lib.rs

@@ -6,17 +6,24 @@
 
 mod adb_device_ext;
 mod constants;
-mod emulator;
+mod device;
+mod emulator_device;
 mod error;
+mod mdns;
 mod models;
 mod server;
+mod server_device;
 mod transports;
-mod usb;
 mod utils;
 
 pub use adb_device_ext::ADBDeviceExt;
+pub use device::{ADBTcpDevice, ADBUSBDevice};
+pub use emulator_device::ADBEmulatorDevice;
 pub use error::{Result, RustADBError};
-pub use models::{AdbVersion, DeviceLong, DeviceShort, DeviceState, RebootType};
+pub use mdns::*;
+pub use models::{
+    AdbStatResponse, AdbVersion, DeviceLong, DeviceShort, DeviceState, MDNSBackend, RebootType,
+};
 pub use server::*;
+pub use server_device::ADBServerDevice;
 pub use transports::*;
-pub use usb::ADBUSBDevice;

adb_client/src/mdns/mdns_device.rs

@@ -0,0 +1,19 @@
+use std::{collections::HashSet, net::IpAddr};
+
+/// Represent a device found from mdns search
+#[derive(Debug)]
+pub struct MDNSDevice {
+    /// Full device address when resolved
+    pub fullname: String,
+    /// Device IP addresses
+    pub addresses: HashSet<IpAddr>,
+}
+
+impl From<mdns_sd::ServiceInfo> for MDNSDevice {
+    fn from(value: mdns_sd::ServiceInfo) -> Self {
+        Self {
+            fullname: value.get_fullname().to_string(),
+            addresses: value.get_addresses().to_owned(),
+        }
+    }
+}

adb_client/src/mdns/mdns_discovery.rs

@@ -0,0 +1,73 @@
+use mdns_sd::{ServiceDaemon, ServiceEvent};
+use std::{sync::mpsc::Sender, thread::JoinHandle};
+
+use crate::{MDNSDevice, Result, RustADBError};
+
+const ADB_SERVICE_NAME: &str = "_adb-tls-connect._tcp.local.";
+
+/// Structure holding responsibility over mdns discovery
+pub struct MDNSDiscoveryService {
+    daemon: ServiceDaemon,
+    thread_handle: Option<JoinHandle<Result<()>>>,
+}
+
+impl std::fmt::Debug for MDNSDiscoveryService {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("MDNSDiscoveryService")
+            .field("daemon", &self.daemon.get_metrics())
+            .field("handle", &self.thread_handle)
+            .finish()
+    }
+}
+
+impl MDNSDiscoveryService {
+    /// Instantiate a new discovery service to find devices over mdns
+    pub fn new() -> Result<Self> {
+        Ok(MDNSDiscoveryService {
+            daemon: ServiceDaemon::new()?,
+            thread_handle: None,
+        })
+    }
+
+    /// Start discovery by spawning a new thread responsible of getting events.
+    pub fn start(&mut self, sender: Sender<MDNSDevice>) -> Result<()> {
+        let receiver = self.daemon.browse(ADB_SERVICE_NAME)?;
+
+        let handle: JoinHandle<Result<()>> = std::thread::spawn(move || loop {
+            while let Ok(event) = receiver.recv() {
+                match event {
+                    ServiceEvent::SearchStarted(_)
+                    | ServiceEvent::ServiceRemoved(_, _)
+                    | 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());
+                        }
+                    }
+                }
+            }
+        });
+
+        self.thread_handle = Some(handle);
+
+        Ok(())
+    }
+
+    /// Shutdown discovery engines.
+    pub fn shutdown(&mut self) -> Result<()> {
+        match self.daemon.shutdown() {
+            Ok(_) => Ok(()),
+            Err(e) => match e {
+                mdns_sd::Error::Again => {
+                    self.daemon.shutdown()?;
+                    Ok(())
+                }
+                e => Err(RustADBError::MDNSError(e)),
+            },
+        }
+    }
+}

adb_client/src/mdns/mod.rs

@@ -0,0 +1,5 @@
+mod mdns_device;
+mod mdns_discovery;
+
+pub use mdns_device::MDNSDevice;
+pub use mdns_discovery::MDNSDiscoveryService;

adb_client/src/models/adb_server_command.rs

@@ -16,12 +16,24 @@ pub(crate) enum AdbServerCommand {
     Pair(SocketAddrV4, String),
     TransportAny,
     TransportSerial(String),
+    MDNSCheck,
+    MDNSServices,
+    ServerStatus,
+    ReconnectOffline,
+    Install(u64),
     // Local commands
     ShellCommand(String),
     Shell,
     FrameBuffer,
     Sync,
     Reboot(RebootType),
+    Forward(String, String),
+    ForwardRemoveAll,
+    Reverse(String, String),
+    ReverseRemoveAll,
+    Reconnect,
+    TcpIp(u16),
+    Usb,
 }
 
 impl Display for AdbServerCommand {
@@ -53,6 +65,24 @@ impl Display for AdbServerCommand {
                 write!(f, "host:pair:{code}:{addr}")
             }
             AdbServerCommand::FrameBuffer => write!(f, "framebuffer:"),
+            AdbServerCommand::Forward(remote, local) => {
+                write!(f, "host:forward:{local};{remote}")
+            }
+            AdbServerCommand::ForwardRemoveAll => write!(f, "host:killforward-all"),
+            AdbServerCommand::Reverse(remote, local) => {
+                write!(f, "reverse:forward:{remote};{local}")
+            }
+            AdbServerCommand::ReverseRemoveAll => write!(f, "reverse:killforward-all"),
+            AdbServerCommand::MDNSCheck => write!(f, "host:mdns:check"),
+            AdbServerCommand::MDNSServices => write!(f, "host:mdns:services"),
+            AdbServerCommand::ServerStatus => write!(f, "host:server-status"),
+            AdbServerCommand::Reconnect => write!(f, "reconnect"),
+            AdbServerCommand::ReconnectOffline => write!(f, "host:reconnect-offline"),
+            AdbServerCommand::TcpIp(port) => {
+                write!(f, "tcpip:{port}")
+            }
+            AdbServerCommand::Usb => write!(f, "usb:"),
+            AdbServerCommand::Install(size) => write!(f, "exec:cmd package 'install' -S {size}"),
         }
     }
 }

adb_client/src/models/adb_stat_response.rs

@@ -8,10 +8,14 @@ use std::{
 use byteorder::LittleEndian;
 use serde::{Deserialize, Serialize};
 
+/// Represents a `stat` response
 #[derive(Debug, Deserialize, Serialize)]
 pub struct AdbStatResponse {
+    /// File permissions
     pub file_perm: u32,
+    /// File size, in bytes
     pub file_size: u32,
+    /// File modification time
     pub mod_time: u32,
 }
 

adb_client/src/models/device_long.rs

@@ -1,16 +1,15 @@
-use lazy_static::lazy_static;
 use std::str::FromStr;
+use std::sync::LazyLock;
 use std::{fmt::Display, str};
 
 use crate::{DeviceState, RustADBError};
 use regex::bytes::Regex;
 
-lazy_static! {
+static DEVICES_LONG_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-    static ref DEVICES_LONG_REGEX: Regex = Regex::new("^(?P<identifier>\\S+)\\s+(?P<state>\\w+) ((usb:(?P<usb1>.*)|(?P<usb2>\\d-\\d)) )?(product:(?P<product>\\w+) model:(?P<model>\\w+) device:(?P<device>\\w+) )?transport_id:(?P<transport_id>\\d+)$").expect("cannot build devices long regex");
+    Regex::new("^(?P<identifier>\\S+)\\s+(?P<state>\\w+) ((usb:(?P<usb1>.*)|(?P<usb2>\\d-\\d)) )?(product:(?P<product>\\w+) model:(?P<model>\\w+) device:(?P<device>\\w+) )?transport_id:(?P<transport_id>\\d+)$").expect("cannot build devices long regex")
+});
 
-}
+/// Represents a new device with more informations.
-
-/// Represents a new device with more informations helded.
 #[derive(Debug)]
 pub struct DeviceLong {
     /// Unique device identifier.

adb_client/src/models/device_short.rs

@@ -1,13 +1,10 @@
-use lazy_static::lazy_static;
 use regex::bytes::Regex;
-use std::{fmt::Display, str::FromStr};
+use std::{fmt::Display, str::FromStr, sync::LazyLock};
 
 use crate::{DeviceState, RustADBError};
 
-lazy_static! {
+static DEVICES_REGEX: LazyLock<Regex> =
-    static ref DEVICES_REGEX: Regex =
+    LazyLock::new(|| Regex::new("^(\\S+)\t(\\w+)\n?$").expect("Cannot build devices regex"));
-        Regex::new("^(\\S+)\t(\\w+)\n?$").expect("Cannot build devices regex");
-}
 
 /// Represents a device connected to the ADB server.
 #[derive(Debug, Clone)]

adb_client/src/models/device_state.rs

@@ -15,6 +15,22 @@ pub enum DeviceState {
     Authorizing,
     /// The device is unauthorized.
     Unauthorized,
+    /// Haven't received a response from the device yet.
+    Connecting,
+    /// Insufficient permissions to communicate with the device.
+    NoPerm,
+    /// USB device detached from the adb server (known but not opened/claimed).
+    Detached,
+    /// Device running fastboot OS (fastboot) or userspace fastboot (fastbootd).
+    Bootloader,
+    /// What a device sees from its end of a Transport (adb host).
+    Host,
+    /// Device with bootloader loaded but no ROM OS loaded (adbd).
+    Recovery,
+    /// Device running Android OS Sideload mode (minadbd sideload mode).
+    Sideload,
+    /// Device running Android OS Rescue mode (minadbd rescue mode).
+    Rescue,
 }
 
 impl Display for DeviceState {
@@ -25,6 +41,14 @@ impl Display for DeviceState {
             DeviceState::NoDevice => write!(f, "no device"),
             DeviceState::Authorizing => write!(f, "authorizing"),
             DeviceState::Unauthorized => write!(f, "unauthorized"),
+            DeviceState::Connecting => write!(f, "connecting"),
+            DeviceState::NoPerm => write!(f, "noperm"),
+            DeviceState::Detached => write!(f, "detached"),
+            DeviceState::Bootloader => write!(f, "bootloader"),
+            DeviceState::Host => write!(f, "host"),
+            DeviceState::Recovery => write!(f, "recovery"),
+            DeviceState::Sideload => write!(f, "sideload"),
+            DeviceState::Rescue => write!(f, "rescue"),
         }
     }
 }
@@ -40,6 +64,14 @@ impl FromStr for DeviceState {
             "no device" => Ok(Self::NoDevice),
             "authorizing" => Ok(Self::Authorizing),
             "unauthorized" => Ok(Self::Unauthorized),
+            "connecting" => Ok(Self::Connecting),
+            "noperm" => Ok(Self::NoPerm),
+            "detached" => Ok(Self::Detached),
+            "bootloader" => Ok(Self::Bootloader),
+            "host" => Ok(Self::Host),
+            "recovery" => Ok(Self::Recovery),
+            "sideload" => Ok(Self::Sideload),
+            "rescue" => Ok(Self::Rescue),
             _ => Err(RustADBError::UnknownDeviceState(lowercased)),
         }
     }

adb_client/src/models/mdns_services.rs

@@ -0,0 +1,64 @@
+use regex::bytes::Regex;
+use std::net::SocketAddrV4;
+use std::sync::LazyLock;
+use std::{fmt::Display, str::FromStr};
+
+use crate::RustADBError;
+
+static MDNS_SERVICES_REGEX: LazyLock<Regex> = LazyLock::new(|| {
+    Regex::new("^(\\S+)\t(\\S+)\t([\\d\\.]+:\\d+)\n?$").expect("Cannot build mdns services regex")
+});
+
+/// Represents MDNS Services
+#[derive(Debug, Clone)]
+pub struct MDNSServices {
+    /// Service name
+    pub service_name: String,
+    /// Reg type
+    pub reg_type: String,
+    /// IP addr with port
+    pub socket_v4: SocketAddrV4,
+}
+
+impl Display for MDNSServices {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}\t{}\t{}",
+            self.service_name, self.reg_type, self.socket_v4
+        )
+    }
+}
+
+impl TryFrom<&[u8]> for MDNSServices {
+    type Error = RustADBError;
+
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        let groups = MDNS_SERVICES_REGEX
+            .captures(value)
+            .ok_or(RustADBError::RegexParsingError)?;
+        Ok(MDNSServices {
+            service_name: String::from_utf8(
+                groups
+                    .get(1)
+                    .ok_or(RustADBError::RegexParsingError)?
+                    .as_bytes()
+                    .to_vec(),
+            )?,
+            reg_type: String::from_utf8(
+                groups
+                    .get(2)
+                    .ok_or(RustADBError::RegexParsingError)?
+                    .as_bytes()
+                    .to_vec(),
+            )?,
+            socket_v4: SocketAddrV4::from_str(&String::from_utf8(
+                groups
+                    .get(3)
+                    .ok_or(RustADBError::RegexParsingError)?
+                    .as_bytes()
+                    .to_vec(),
+            )?)?,
+        })
+    }
+}

adb_client/src/models/mod.rs

@@ -7,7 +7,9 @@ mod device_long;
 mod device_short;
 mod device_state;
 mod host_features;
+mod mdns_services;
 mod reboot_type;
+mod server_status;
 mod sync_command;
 
 pub(crate) use adb_emulator_command::ADBEmulatorCommand;
@@ -19,5 +21,8 @@ pub use device_long::DeviceLong;
 pub use device_short::DeviceShort;
 pub use device_state::DeviceState;
 pub use host_features::HostFeatures;
+pub use mdns_services::MDNSServices;
 pub use reboot_type::RebootType;
+pub use server_status::MDNSBackend;
+pub use server_status::ServerStatus;
 pub use sync_command::SyncCommand;

adb_client/src/models/server_status.rs

@@ -0,0 +1,158 @@
+use quick_protobuf::{BytesReader, MessageRead};
+
+use std::fmt::Display;
+
+use crate::RustADBError;
+
+#[derive(Debug, PartialEq, Default, Eq, Clone, Copy)]
+pub enum UsbBackend {
+    #[default]
+    Unknown = 0,
+    Native = 1,
+    LibUSB = 2,
+}
+
+impl From<i32> for UsbBackend {
+    fn from(i: i32) -> Self {
+        match i {
+            0 => UsbBackend::Unknown,
+            1 => UsbBackend::Native,
+            2 => UsbBackend::LibUSB,
+            _ => Self::default(),
+        }
+    }
+}
+
+impl<'a> From<&'a str> for UsbBackend {
+    fn from(s: &'a str) -> Self {
+        match s {
+            "UNKNOWN_USB" => UsbBackend::Unknown,
+            "NATIVE" => UsbBackend::Native,
+            "LIBUSB" => UsbBackend::LibUSB,
+            _ => Self::default(),
+        }
+    }
+}
+
+impl Display for UsbBackend {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            UsbBackend::Unknown => write!(f, "UNKNOWN_USB"),
+            UsbBackend::Native => write!(f, "NATIVE"),
+            UsbBackend::LibUSB => write!(f, "LIBUSB"),
+        }
+    }
+}
+
+/// MDNS Backend Status
+#[derive(Debug, Clone, PartialEq, Default)]
+pub enum MDNSBackend {
+    #[default]
+    /// Unknown
+    Unknown = 0,
+    /// Bonjour
+    Bonjour = 1,
+    /// OpenScreen
+    OpenScreen = 2,
+}
+
+impl From<i32> for MDNSBackend {
+    fn from(i: i32) -> Self {
+        match i {
+            0 => MDNSBackend::Unknown,
+            1 => MDNSBackend::Bonjour,
+            2 => MDNSBackend::OpenScreen,
+            _ => Self::default(),
+        }
+    }
+}
+
+impl<'a> From<&'a str> for MDNSBackend {
+    fn from(s: &'a str) -> Self {
+        match s {
+            "UNKNOWN_MDNS" => MDNSBackend::Unknown,
+            "BONJOUR" => MDNSBackend::Bonjour,
+            "OPENSCREEN" => MDNSBackend::OpenScreen,
+            _ => Self::default(),
+        }
+    }
+}
+
+impl Display for MDNSBackend {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            MDNSBackend::Unknown => write!(f, "UNKNOWN_MDNS"),
+            MDNSBackend::Bonjour => write!(f, "BONJOUR"),
+            MDNSBackend::OpenScreen => write!(f, "OPENSCREEN"),
+        }
+    }
+}
+
+/// Structure representing current server status
+#[derive(Debug, Clone, Default, PartialEq)]
+pub struct ServerStatus {
+    pub usb_backend: UsbBackend,
+    pub usb_backend_forced: bool,
+    pub mdns_backend: MDNSBackend,
+    pub mdns_backend_forced: bool,
+    pub version: String,
+    pub build: String,
+    pub executable_absolute_path: String,
+    pub log_absolute_path: String,
+    pub os: String,
+}
+
+impl<'a> MessageRead<'a> for ServerStatus {
+    fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> quick_protobuf::Result<Self> {
+        let mut msg = Self::default();
+        while !r.is_eof() {
+            match r.next_tag(bytes) {
+                Ok(8) => msg.usb_backend = r.read_enum(bytes)?,
+                Ok(16) => msg.usb_backend_forced = r.read_bool(bytes)?,
+                Ok(24) => msg.mdns_backend = r.read_enum(bytes)?,
+                Ok(32) => msg.mdns_backend_forced = r.read_bool(bytes)?,
+                Ok(42) => msg.version = r.read_string(bytes)?.to_string(),
+                Ok(50) => msg.build = r.read_string(bytes)?.to_string(),
+                Ok(58) => msg.executable_absolute_path = r.read_string(bytes)?.to_string(),
+                Ok(66) => msg.log_absolute_path = r.read_string(bytes)?.to_string(),
+                Ok(74) => msg.os = r.read_string(bytes)?.to_string(),
+                Ok(t) => {
+                    r.read_unknown(bytes, t)?;
+                }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(msg)
+    }
+}
+
+impl Display for ServerStatus {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "usb_backend: {}", self.usb_backend)?;
+        if self.usb_backend_forced {
+            writeln!(f, "usb_backend_forced: {}", self.usb_backend_forced)?;
+        }
+        writeln!(f, "mdns_backend: {}", self.mdns_backend)?;
+        if self.mdns_backend_forced {
+            writeln!(f, "mdns_backend_forced: {}", self.mdns_backend_forced)?;
+        }
+        writeln!(f, "version: \"{}\"", self.version)?;
+        writeln!(f, "build: \"{}\"", self.build)?;
+        writeln!(
+            f,
+            "executable_absolute_path: \"{}\"",
+            self.executable_absolute_path
+        )?;
+        writeln!(f, "log_absolute_path: \"{}\"", self.log_absolute_path)?;
+        writeln!(f, "os: \"{}\"", self.os)
+    }
+}
+
+impl TryFrom<Vec<u8>> for ServerStatus {
+    type Error = RustADBError;
+
+    fn try_from(value: Vec<u8>) -> Result<Self, Self::Error> {
+        let mut reader = BytesReader::from_bytes(&value);
+        ServerStatus::from_reader(&mut reader, &value).map_err(|_| RustADBError::ConversionError)
+    }
+}

adb_client/src/server/adb_server.rs

@@ -2,6 +2,7 @@ use crate::ADBTransport;
 use crate::Result;
 use crate::RustADBError;
 use crate::TCPServerTransport;
+use std::collections::HashMap;
 use std::net::SocketAddrV4;
 use std::process::Command;
 
@@ -12,6 +13,8 @@ pub struct ADBServer {
     pub(crate) transport: Option<TCPServerTransport>,
     /// Address to connect to
     pub(crate) socket_addr: Option<SocketAddrV4>,
+    /// adb-server start envs
+    pub(crate) envs: HashMap<String, String>,
 }
 
 impl ADBServer {
@@ -20,6 +23,7 @@ impl ADBServer {
         Self {
             transport: None,
             socket_addr: Some(address),
+            envs: HashMap::new(),
         }
     }
 
@@ -49,7 +53,13 @@ impl ADBServer {
 
         if is_local_ip {
             // ADB Server is local, we start it if not already running
-            let child = Command::new("adb").arg("start-server").spawn();
+            let mut command = Command::new("adb");
+            command.arg("start-server");
+            for (env_k, env_v) in self.envs.iter() {
+                command.env(env_k, env_v);
+            }
+
+            let child = command.spawn();
             match child {
                 Ok(mut child) => {
                     if let Err(e) = child.wait() {

adb_client/src/server/commands/mdns.rs

@@ -0,0 +1,62 @@
+use std::io::BufRead;
+
+use crate::{
+    models::{AdbServerCommand, MDNSBackend, MDNSServices},
+    ADBServer, Result,
+};
+
+const OPENSCREEN_MDNS_BACKEND: &str = "ADB_MDNS_OPENSCREEN";
+
+impl ADBServer {
+    /// Check if mdns discovery is available
+    pub fn mdns_check(&mut self) -> Result<bool> {
+        let response = self
+            .connect()?
+            .proxy_connection(AdbServerCommand::MDNSCheck, true)?;
+
+        match String::from_utf8(response) {
+            Ok(s) if s.starts_with("mdns daemon version") => Ok(true),
+            Ok(_) => Ok(false),
+            Err(e) => Err(e.into()),
+        }
+    }
+
+    /// List all discovered mdns services
+    pub fn mdns_services(&mut self) -> Result<Vec<MDNSServices>> {
+        let services = self
+            .connect()?
+            .proxy_connection(AdbServerCommand::MDNSServices, true)?;
+
+        let mut vec_services: Vec<MDNSServices> = vec![];
+        for service in services.lines() {
+            match service {
+                Ok(service) => {
+                    vec_services.push(MDNSServices::try_from(service.as_bytes())?);
+                }
+                Err(e) => log::error!("{}", e),
+            }
+        }
+
+        Ok(vec_services)
+    }
+
+    /// Check if specified backend mdns service is used, otherwise restart adb server with envs
+    pub fn mdns_force_backend(&mut self, backend: MDNSBackend) -> Result<()> {
+        let server_status = self.server_status()?;
+        if server_status.mdns_backend != backend {
+            self.kill()?;
+            self.envs.insert(
+                OPENSCREEN_MDNS_BACKEND.to_string(),
+                (if backend == MDNSBackend::OpenScreen {
+                    "1"
+                } else {
+                    "0"
+                })
+                .to_string(),
+            );
+            self.connect()?;
+        }
+
+        Ok(())
+    }
+}

adb_client/src/server/commands/mod.rs

@@ -2,5 +2,8 @@ mod connect;
 mod devices;
 mod disconnect;
 mod kill;
+mod mdns;
 mod pair;
+mod reconnect;
+mod server_status;
 mod version;

adb_client/src/server/commands/reconnect.rs

@@ -0,0 +1,10 @@
+use crate::{models::AdbServerCommand, ADBServer, Result};
+
+impl ADBServer {
+    /// Reconnect the device
+    pub fn reconnect_offline(&mut self) -> Result<()> {
+        self.connect()?
+            .proxy_connection(AdbServerCommand::ReconnectOffline, false)
+            .map(|_| ())
+    }
+}

adb_client/src/server/commands/server_status.rs

@@ -0,0 +1,15 @@
+use crate::{
+    models::{AdbServerCommand, ServerStatus},
+    ADBServer, Result,
+};
+
+impl ADBServer {
+    /// Check ADB server status
+    pub fn server_status(&mut self) -> Result<ServerStatus> {
+        let status = self
+            .connect()?
+            .proxy_connection(AdbServerCommand::ServerStatus, true)?;
+
+        ServerStatus::try_from(status)
+    }
+}

adb_client/src/server/mod.rs

@@ -1,10 +1,4 @@
-mod adb_emulator_device;
 mod adb_server;
-mod adb_server_device;
+mod commands;
-mod adb_server_device_commands;
-mod device_commands;
-mod server_commands;
 
-pub use adb_emulator_device::ADBEmulatorDevice;
 pub use adb_server::ADBServer;
-pub use adb_server_device::ADBServerDevice;

adb_client/src/server_device/adb_server_device_commands.rs

@@ -1,11 +1,16 @@
-use std::io::{Read, Write};
+use std::{
+    io::{Read, Write},
+    path::Path,
+};
 
 use crate::{
     constants::BUFFER_SIZE,
     models::{AdbServerCommand, AdbStatResponse, HostFeatures},
-    ADBDeviceExt, ADBServerDevice, Result, RustADBError,
+    ADBDeviceExt, Result, RustADBError,
 };
 
+use super::ADBServerDevice;
+
 impl ADBDeviceExt for ADBServerDevice {
     fn shell_command<S: ToString, W: Write>(
         &mut self,
@@ -121,4 +126,8 @@ impl ADBDeviceExt for ADBServerDevice {
     fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
         self.push(stream, path)
     }
+
+    fn install<P: AsRef<Path>>(&mut self, apk_path: P) -> Result<()> {
+        self.install(apk_path)
+    }
 }

adb_client/src/server_device/commands/forward.rs

@@ -0,0 +1,25 @@
+use crate::{models::AdbServerCommand, ADBServerDevice, Result};
+
+impl ADBServerDevice {
+    /// Forward socket connection
+    pub fn forward(&mut self, remote: String, local: String) -> Result<()> {
+        let serial = self.identifier.clone();
+        self.connect()?
+            .send_adb_request(AdbServerCommand::TransportSerial(serial.clone()))?;
+
+        self.get_transport_mut()
+            .proxy_connection(AdbServerCommand::Forward(remote, local), false)
+            .map(|_| ())
+    }
+
+    /// Remove all previously applied forward rules
+    pub fn forward_remove_all(&mut self) -> Result<()> {
+        let serial = self.identifier.clone();
+        self.connect()?
+            .send_adb_request(AdbServerCommand::TransportSerial(serial.clone()))?;
+
+        self.get_transport_mut()
+            .proxy_connection(AdbServerCommand::ForwardRemoveAll, false)
+            .map(|_| ())
+    }
+}

adb_client/src/server_device/commands/framebuffer.rs

@@ -1,7 +1,12 @@
-use std::{io::Read, iter::Map, path::Path, slice::ChunksExact};
+use std::{
+    io::{Read, Seek, Write},
+    iter::Map,
+    path::Path,
+    slice::ChunksExact,
+};
 
 use byteorder::{LittleEndian, ReadBytesExt};
-use image::{ImageBuffer, Rgba};
+use image::{ImageBuffer, ImageFormat, Rgba};
 
 use crate::{models::AdbServerCommand, utils, ADBServerDevice, Result, RustADBError};
 
@@ -98,13 +103,21 @@ impl TryFrom<[u8; std::mem::size_of::<Self>()]> for FrameBufferInfoV2 {
 }
 
 impl ADBServerDevice {
-    /// Dump framebuffer of this device
+    /// Dump framebuffer of this device into given ['path']
-    /// Big help from source code (https://android.googlesource.com/platform/system/adb/+/refs/heads/main/framebuffer_service.cpp)
+    /// Big help from source code (<https://android.googlesource.com/platform/system/adb/+/refs/heads/main/framebuffer_service.cpp>)
     pub fn framebuffer<P: AsRef<Path>>(&mut self, path: P) -> Result<()> {
         let img = self.framebuffer_inner()?;
         Ok(img.save(path.as_ref())?)
     }
 
+    /// Dump framebuffer of this device and return corresponding bytes.
+    ///
+    /// Output data format is currently only `PNG`.
+    pub fn framebuffer_bytes<W: Write + Seek>(&mut self, mut writer: W) -> Result<()> {
+        let img = self.framebuffer_inner()?;
+        Ok(img.write_to(&mut writer, ImageFormat::Png)?)
+    }
+
     /// Inner method requesting framebuffer from Android device
     fn framebuffer_inner(&mut self) -> Result<ImageBuffer<Rgba<u8>, Vec<u8>>> {
         let serial: String = self.identifier.clone();

adb_client/src/server_device/commands/install.rs

@@ -0,0 +1,43 @@
+use std::{fs::File, io::Read, path::Path};
+
+use crate::{
+    models::AdbServerCommand, server_device::ADBServerDevice, utils::check_extension_is_apk, Result,
+};
+
+impl ADBServerDevice {
+    /// Install an APK on device
+    pub fn install<P: AsRef<Path>>(&mut self, apk_path: P) -> Result<()> {
+        let mut apk_file = File::open(&apk_path)?;
+
+        check_extension_is_apk(&apk_path)?;
+
+        let file_size = apk_file.metadata()?.len();
+
+        let serial: String = self.identifier.clone();
+        self.connect()?
+            .send_adb_request(AdbServerCommand::TransportSerial(serial))?;
+
+        self.get_transport_mut()
+            .send_adb_request(AdbServerCommand::Install(file_size))?;
+
+        let mut raw_connection = self.get_transport_mut().get_raw_connection()?;
+
+        std::io::copy(&mut apk_file, &mut raw_connection)?;
+
+        let mut data = [0; 1024];
+        let read_amount = self.get_transport().get_raw_connection()?.read(&mut data)?;
+
+        match &data[0..read_amount] {
+            b"Success\n" => {
+                log::info!(
+                    "APK file {} successfully installed",
+                    apk_path.as_ref().display()
+                );
+                Ok(())
+            }
+            d => Err(crate::RustADBError::ADBRequestFailed(String::from_utf8(
+                d.to_vec(),
+            )?)),
+        }
+    }
+}

adb_client/src/server_device/commands/list.rs

@@ -9,7 +9,7 @@ use std::{
 };
 
 impl ADBServerDevice {
-    /// Lists files in [path] on the device.
+    /// Lists files in path on the device.
     pub fn list<A: AsRef<str>>(&mut self, path: A) -> Result<()> {
         let serial = self.identifier.clone();
         self.connect()?

adb_client/src/server_device/commands/mod.rs

@@ -1,9 +1,15 @@
+mod forward;
 mod framebuffer;
 mod host_features;
+mod install;
 mod list;
 mod logcat;
 mod reboot;
+mod reconnect;
 mod recv;
+mod reverse;
 mod send;
 mod stat;
+mod tcpip;
 mod transport;
+mod usb;

adb_client/src/server_device/commands/reconnect.rs

@@ -0,0 +1,14 @@
+use crate::{models::AdbServerCommand, ADBServerDevice, Result};
+
+impl ADBServerDevice {
+    /// Reconnect device
+    pub fn reconnect(&mut self) -> Result<()> {
+        let serial = self.identifier.clone();
+        self.connect()?
+            .send_adb_request(AdbServerCommand::TransportSerial(serial))?;
+
+        self.get_transport_mut()
+            .proxy_connection(AdbServerCommand::Reconnect, false)
+            .map(|_| ())
+    }
+}

adb_client/src/server_device/commands/recv.rs

@@ -32,7 +32,7 @@ impl<R: Read> Read for ADBRecvCommandReader<R> {
             match &header[..] {
                 b"DATA" => {
                     let length = self.inner.read_u32::<LittleEndian>()? as usize;
-                    let effective_read = self.inner.read(buf)?;
+                    let effective_read = self.inner.read(&mut buf[0..length])?;
                     self.remaining_data_bytes_to_read = length - effective_read;
 
                     Ok(effective_read)
@@ -69,7 +69,7 @@ impl<R: Read> Read for ADBRecvCommandReader<R> {
 }
 
 impl ADBServerDevice {
-    /// Receives [path] to [stream] from the device.
+    /// Receives path to stream from the device.
     pub fn pull<A: AsRef<str>>(&mut self, path: A, stream: &mut dyn Write) -> Result<()> {
         let serial = self.identifier.clone();
         self.connect()?

adb_client/src/server_device/commands/reverse.rs

@@ -0,0 +1,25 @@
+use crate::{models::AdbServerCommand, ADBServerDevice, Result};
+
+impl ADBServerDevice {
+    /// Reverse socket connection
+    pub fn reverse(&mut self, remote: String, local: String) -> Result<()> {
+        let serial = self.identifier.clone();
+        self.connect()?
+            .send_adb_request(AdbServerCommand::TransportSerial(serial))?;
+
+        self.get_transport_mut()
+            .proxy_connection(AdbServerCommand::Reverse(remote, local), false)
+            .map(|_| ())
+    }
+
+    /// Remove all reverse rules
+    pub fn reverse_remove_all(&mut self) -> Result<()> {
+        let serial = self.identifier.clone();
+        self.connect()?
+            .send_adb_request(AdbServerCommand::TransportSerial(serial.clone()))?;
+
+        self.get_transport_mut()
+            .proxy_connection(AdbServerCommand::ReverseRemoveAll, false)
+            .map(|_| ())
+    }
+}

adb_client/src/server_device/commands/send.rs

@@ -42,7 +42,7 @@ impl<W: Write> Write for ADBSendCommandWriter<W> {
 }
 
 impl ADBServerDevice {
-    /// Send [stream] to [path] on the device.
+    /// Send stream to path on the device.
     pub fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
         log::info!("Sending data to {}", path.as_ref());
         let serial = self.identifier.clone();

adb_client/src/server_device/commands/stat.rs

@@ -41,7 +41,7 @@ impl ADBServerDevice {
         }
     }
 
-    /// Stat file given as [path] on the device.
+    /// Stat file given as path on the device.
     pub fn stat<A: AsRef<str>>(&mut self, path: A) -> Result<AdbStatResponse> {
         let serial = self.identifier.clone();
         self.connect()?

adb_client/src/server_device/commands/tcpip.rs

@@ -0,0 +1,14 @@
+use crate::{models::AdbServerCommand, ADBServerDevice, Result};
+
+impl ADBServerDevice {
+    /// Set adb daemon to tcp/ip mode
+    pub fn tcpip(&mut self, port: u16) -> Result<()> {
+        let serial = self.identifier.clone();
+        self.connect()?
+            .send_adb_request(AdbServerCommand::TransportSerial(serial))?;
+
+        self.get_transport_mut()
+            .proxy_connection(AdbServerCommand::TcpIp(port), false)
+            .map(|_| ())
+    }
+}

adb_client/src/server_device/commands/usb.rs

@@ -0,0 +1,14 @@
+use crate::{models::AdbServerCommand, ADBServerDevice, Result};
+
+impl ADBServerDevice {
+    /// Set adb daemon to usb mode
+    pub fn usb(&mut self) -> Result<()> {
+        let serial = self.identifier.clone();
+        self.connect()?
+            .send_adb_request(AdbServerCommand::TransportSerial(serial))?;
+
+        self.get_transport_mut()
+            .proxy_connection(AdbServerCommand::Usb, false)
+            .map(|_| ())
+    }
+}

adb_client/src/server_device/mod.rs

@@ -0,0 +1,5 @@
+mod adb_server_device;
+mod adb_server_device_commands;
+mod commands;
+
+pub use adb_server_device::ADBServerDevice;

adb_client/src/transports/mod.rs

@@ -1,8 +1,11 @@
 mod tcp_emulator_transport;
 mod tcp_server_transport;
-mod transport_trait;
+mod tcp_transport;
+mod traits;
 mod usb_transport;
+
 pub use tcp_emulator_transport::TCPEmulatorTransport;
 pub use tcp_server_transport::TCPServerTransport;
-pub use transport_trait::ADBTransport;
+pub use tcp_transport::TcpTransport;
+pub use traits::{ADBMessageTransport, ADBTransport};
 pub use usb_transport::USBTransport;

adb_client/src/transports/tcp_transport.rs

@@ -0,0 +1,344 @@
+use rcgen::{CertificateParams, KeyPair, PKCS_RSA_SHA256};
+use rustls::{
+    client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier},
+    pki_types::{pem::PemObject, CertificateDer, PrivatePkcs8KeyDer},
+    ClientConfig, ClientConnection, KeyLogFile, SignatureScheme, StreamOwned,
+};
+
+use super::{ADBMessageTransport, ADBTransport};
+use crate::{
+    device::{
+        get_default_adb_key_path, ADBTransportMessage, ADBTransportMessageHeader, MessageCommand,
+    },
+    Result, RustADBError,
+};
+use std::{
+    fs::read_to_string,
+    io::{Read, Write},
+    net::{Shutdown, SocketAddr, TcpStream},
+    ops::{Deref, DerefMut},
+    path::PathBuf,
+    sync::{Arc, Mutex},
+    time::Duration,
+};
+
+#[derive(Debug)]
+enum CurrentConnection {
+    Tcp(TcpStream),
+    Tls(Box<StreamOwned<ClientConnection, TcpStream>>),
+}
+
+impl CurrentConnection {
+    fn set_read_timeout(&self, read_timeout: Duration) -> Result<()> {
+        match self {
+            CurrentConnection::Tcp(tcp_stream) => {
+                Ok(tcp_stream.set_read_timeout(Some(read_timeout))?)
+            }
+            CurrentConnection::Tls(stream_owned) => {
+                Ok(stream_owned.sock.set_read_timeout(Some(read_timeout))?)
+            }
+        }
+    }
+
+    fn set_write_timeout(&self, write_timeout: Duration) -> Result<()> {
+        match self {
+            CurrentConnection::Tcp(tcp_stream) => {
+                Ok(tcp_stream.set_write_timeout(Some(write_timeout))?)
+            }
+            CurrentConnection::Tls(stream_owned) => {
+                Ok(stream_owned.sock.set_write_timeout(Some(write_timeout))?)
+            }
+        }
+    }
+}
+
+impl Read for CurrentConnection {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        match self {
+            CurrentConnection::Tcp(tcp_stream) => tcp_stream.read(buf),
+            CurrentConnection::Tls(tls_conn) => tls_conn.read(buf),
+        }
+    }
+}
+
+impl Write for CurrentConnection {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        match self {
+            CurrentConnection::Tcp(tcp_stream) => tcp_stream.write(buf),
+            CurrentConnection::Tls(tls_conn) => tls_conn.write(buf),
+        }
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        match self {
+            CurrentConnection::Tcp(tcp_stream) => tcp_stream.flush(),
+            CurrentConnection::Tls(tls_conn) => tls_conn.flush(),
+        }
+    }
+}
+
+/// Transport running on USB
+#[derive(Clone, Debug)]
+pub struct TcpTransport {
+    address: SocketAddr,
+    current_connection: Option<Arc<Mutex<CurrentConnection>>>,
+    private_key_path: PathBuf,
+}
+
+fn certificate_from_pk(key_pair: &KeyPair) -> Result<Vec<CertificateDer<'static>>> {
+    let certificate_params = CertificateParams::default();
+    let certificate = certificate_params.self_signed(key_pair)?;
+    Ok(vec![certificate.der().to_owned()])
+}
+
+impl TcpTransport {
+    /// Instantiate a new [`TcpTransport`]
+    pub fn new(address: SocketAddr) -> Result<Self> {
+        Self::new_with_custom_private_key(address, get_default_adb_key_path()?)
+    }
+
+    /// Instantiate a new [`TcpTransport`] using a given private key
+    pub fn new_with_custom_private_key(
+        address: SocketAddr,
+        private_key_path: PathBuf,
+    ) -> Result<Self> {
+        Ok(Self {
+            address,
+            current_connection: None,
+            private_key_path,
+        })
+    }
+
+    fn get_current_connection(&mut self) -> Result<Arc<Mutex<CurrentConnection>>> {
+        self.current_connection
+            .as_ref()
+            .ok_or(RustADBError::IOError(std::io::Error::new(
+                std::io::ErrorKind::NotConnected,
+                "not connected",
+            )))
+            .cloned()
+    }
+
+    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 mut current_conn_locked = current_connection.lock()?;
+            match current_conn_locked.deref() {
+                CurrentConnection::Tcp(tcp_stream) => {
+                    // TODO: Check if we cannot be more precise
+
+                    let pk_content = read_to_string(&self.private_key_path)?;
+
+                    let key_pair =
+                        KeyPair::from_pkcs8_pem_and_sign_algo(&pk_content, &PKCS_RSA_SHA256)?;
+
+                    let certificate = certificate_from_pk(&key_pair)?;
+                    let private_key = PrivatePkcs8KeyDer::from_pem_file(&self.private_key_path)?;
+
+                    let mut client_config = ClientConfig::builder()
+                        .dangerous()
+                        .with_custom_certificate_verifier(Arc::new(NoCertificateVerification {}))
+                        .with_client_auth_cert(certificate, private_key.into())?;
+
+                    client_config.key_log = Arc::new(KeyLogFile::new());
+
+                    let rc_config = Arc::new(client_config);
+                    let example_com = self.address.ip().into();
+                    let conn = ClientConnection::new(rc_config, example_com)?;
+                    let owned = tcp_stream.try_clone()?;
+                    let client = StreamOwned::new(conn, owned);
+
+                    // Update current connection state to now use TLS protocol
+                    *current_conn_locked = CurrentConnection::Tls(Box::new(client));
+                }
+                CurrentConnection::Tls(_) => {
+                    return Err(RustADBError::UpgradeError(
+                        "cannot upgrade a TLS connection...".into(),
+                    ))
+                }
+            }
+        }
+
+        let message = self.read_message()?;
+        match message.header().command() {
+            MessageCommand::Cnxn => {
+                let device_infos = String::from_utf8(message.into_payload())?;
+                log::debug!("received device info: {device_infos}");
+                Ok(())
+            }
+            c => Err(RustADBError::ADBRequestFailed(format!(
+                "Wrong command received {}",
+                c
+            ))),
+        }
+    }
+}
+
+impl ADBTransport for TcpTransport {
+    fn connect(&mut self) -> Result<()> {
+        let stream = TcpStream::connect(self.address)?;
+        self.current_connection = Some(Arc::new(Mutex::new(CurrentConnection::Tcp(stream))));
+        Ok(())
+    }
+
+    fn disconnect(&mut self) -> Result<()> {
+        log::debug!("disconnecting...");
+        if let Some(current_connection) = &self.current_connection {
+            let mut lock = current_connection.lock()?;
+            match lock.deref_mut() {
+                CurrentConnection::Tcp(tcp_stream) => {
+                    let _ = tcp_stream.shutdown(Shutdown::Both);
+                }
+                CurrentConnection::Tls(tls_conn) => {
+                    tls_conn.conn.send_close_notify();
+                    let _ = tls_conn.sock.shutdown(Shutdown::Both);
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
+
+impl ADBMessageTransport for TcpTransport {
+    fn read_message_with_timeout(
+        &mut self,
+        read_timeout: std::time::Duration,
+    ) -> Result<crate::device::ADBTransportMessage> {
+        let raw_connection_lock = self.get_current_connection()?;
+        let mut raw_connection = raw_connection_lock.lock()?;
+
+        raw_connection.set_read_timeout(read_timeout)?;
+
+        let mut data = [0; 24];
+        let mut total_read = 0;
+        loop {
+            total_read += raw_connection.read(&mut data[total_read..])?;
+            if total_read == data.len() {
+                break;
+            }
+        }
+
+        let header = ADBTransportMessageHeader::try_from(data)?;
+
+        if header.data_length() != 0 {
+            let mut msg_data = vec![0_u8; header.data_length() as usize];
+            let mut total_read = 0;
+            loop {
+                total_read += raw_connection.read(&mut msg_data[total_read..])?;
+                if total_read == msg_data.capacity() {
+                    break;
+                }
+            }
+
+            let message = ADBTransportMessage::from_header_and_payload(header, msg_data);
+
+            // Check message integrity
+            if !message.check_message_integrity() {
+                return Err(RustADBError::InvalidIntegrity(
+                    ADBTransportMessageHeader::compute_crc32(message.payload()),
+                    message.header().data_crc32(),
+                ));
+            }
+
+            return Ok(message);
+        }
+
+        Ok(ADBTransportMessage::from_header_and_payload(header, vec![]))
+    }
+
+    fn write_message_with_timeout(
+        &mut self,
+        message: ADBTransportMessage,
+        write_timeout: Duration,
+    ) -> Result<()> {
+        let message_bytes = message.header().as_bytes()?;
+        let raw_connection_lock = self.get_current_connection()?;
+        let mut raw_connection = raw_connection_lock.lock()?;
+
+        raw_connection.set_write_timeout(write_timeout)?;
+
+        let mut total_written = 0;
+        loop {
+            total_written += raw_connection.write(&message_bytes[total_written..])?;
+            if total_written == message_bytes.len() {
+                raw_connection.flush()?;
+                break;
+            }
+        }
+
+        let payload = message.into_payload();
+        if !payload.is_empty() {
+            let mut total_written = 0;
+            loop {
+                total_written += raw_connection.write(&payload[total_written..])?;
+                if total_written == payload.len() {
+                    raw_connection.flush()?;
+                    break;
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+struct NoCertificateVerification;
+
+impl ServerCertVerifier for NoCertificateVerification {
+    fn verify_server_cert(
+        &self,
+        _end_entity: &rustls::pki_types::CertificateDer<'_>,
+        _intermediates: &[rustls::pki_types::CertificateDer<'_>],
+        _server_name: &rustls::pki_types::ServerName<'_>,
+        _ocsp_response: &[u8],
+        _now: rustls::pki_types::UnixTime,
+    ) -> std::result::Result<rustls::client::danger::ServerCertVerified, rustls::Error> {
+        Ok(ServerCertVerified::assertion())
+    }
+
+    fn verify_tls12_signature(
+        &self,
+        _message: &[u8],
+        _cert: &rustls::pki_types::CertificateDer<'_>,
+        _dss: &rustls::DigitallySignedStruct,
+    ) -> std::result::Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
+        Ok(HandshakeSignatureValid::assertion())
+    }
+
+    fn verify_tls13_signature(
+        &self,
+        _message: &[u8],
+        _cert: &rustls::pki_types::CertificateDer<'_>,
+        _dss: &rustls::DigitallySignedStruct,
+    ) -> std::result::Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
+        Ok(HandshakeSignatureValid::assertion())
+    }
+
+    fn supported_verify_schemes(&self) -> Vec<rustls::SignatureScheme> {
+        vec![
+            SignatureScheme::RSA_PKCS1_SHA1,
+            SignatureScheme::ECDSA_SHA1_Legacy,
+            SignatureScheme::RSA_PKCS1_SHA256,
+            SignatureScheme::ECDSA_NISTP256_SHA256,
+            SignatureScheme::RSA_PKCS1_SHA384,
+            SignatureScheme::ECDSA_NISTP384_SHA384,
+            SignatureScheme::RSA_PKCS1_SHA512,
+            SignatureScheme::ECDSA_NISTP521_SHA512,
+            SignatureScheme::RSA_PSS_SHA256,
+            SignatureScheme::RSA_PSS_SHA384,
+            SignatureScheme::RSA_PSS_SHA512,
+            SignatureScheme::ED25519,
+            SignatureScheme::ED448,
+        ]
+    }
+}

adb_client/src/transports/traits/adb_message_transport.rs

@@ -0,0 +1,30 @@
+use std::time::Duration;
+
+use super::ADBTransport;
+use crate::{device::ADBTransportMessage, Result};
+
+const DEFAULT_READ_TIMEOUT: Duration = Duration::from_secs(u64::MAX);
+const DEFAULT_WRITE_TIMEOUT: Duration = Duration::from_secs(2);
+
+/// Trait representing a transport able to read and write messages.
+pub trait ADBMessageTransport: ADBTransport + Clone + Send + 'static {
+    /// Read a message using given timeout on the underlying transport
+    fn read_message_with_timeout(&mut self, read_timeout: Duration) -> Result<ADBTransportMessage>;
+
+    /// Read data to underlying connection, using default timeout
+    fn read_message(&mut self) -> Result<ADBTransportMessage> {
+        self.read_message_with_timeout(DEFAULT_READ_TIMEOUT)
+    }
+
+    /// Write a message using given timeout on the underlying transport
+    fn write_message_with_timeout(
+        &mut self,
+        message: ADBTransportMessage,
+        write_timeout: Duration,
+    ) -> Result<()>;
+
+    /// Write data to underlying connection, using default timeout
+    fn write_message(&mut self, message: ADBTransportMessage) -> Result<()> {
+        self.write_message_with_timeout(message, DEFAULT_WRITE_TIMEOUT)
+    }
+}

adb_client/src/transports/traits/adb_transport.rs

@@ -0,0 +1,10 @@
+use crate::Result;
+
+/// Trait representing a transport usable by ADB protocol.
+pub trait ADBTransport {
+    /// Initializes the connection to this transport.
+    fn connect(&mut self) -> Result<()>;
+
+    /// Shuts down the connection to this transport.
+    fn disconnect(&mut self) -> Result<()>;
+}

adb_client/src/transports/traits/mod.rs

@@ -0,0 +1,5 @@
+mod adb_message_transport;
+mod adb_transport;
+
+pub use adb_message_transport::ADBMessageTransport;
+pub use adb_transport::ADBTransport;

adb_client/src/transports/transport_trait.rs

@@ -1,10 +0,0 @@
-use crate::Result;
-
-/// Trait representing a transport
-pub trait ADBTransport {
-    /// Initializes the connection
-    fn connect(&mut self) -> Result<()>;
-
-    /// Shuts down the connection
-    fn disconnect(&mut self) -> Result<()>;
-}

adb_client/src/transports/usb_transport.rs

@@ -1,12 +1,13 @@
 use std::{sync::Arc, time::Duration};
 
 use rusb::{
-    constants::LIBUSB_CLASS_VENDOR_SPEC, DeviceHandle, Direction, GlobalContext, TransferType,
+    constants::LIBUSB_CLASS_VENDOR_SPEC, Device, DeviceHandle, Direction, GlobalContext,
+    TransferType,
 };
 
-use super::ADBTransport;
+use super::{ADBMessageTransport, ADBTransport};
 use crate::{
-    usb::{ADBUsbMessage, ADBUsbMessageHeader, USBCommand},
+    device::{ADBTransportMessage, ADBTransportMessageHeader, MessageCommand},
     Result, RustADBError,
 };
 
@@ -16,24 +17,38 @@ struct Endpoint {
     address: u8,
 }
 
-const MAX_READ_TIMEOUT: Duration = Duration::from_secs(u64::MAX);
-const DEFAULT_WRITE_TIMEOUT: Duration = Duration::from_secs(2);
-
 /// Transport running on USB
 #[derive(Debug, Clone)]
 pub struct USBTransport {
-    vendor_id: u16,
+    device: Device<GlobalContext>,
-    product_id: u16,
     handle: Option<Arc<DeviceHandle<GlobalContext>>>,
 }
 
 impl USBTransport {
-    /// Instantiate a new [USBTransport]
+    /// Instantiate a new [`USBTransport`].
-    pub fn new(vendor_id: u16, product_id: u16) -> Self {
+    /// 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));
+                }
+            }
+        }
+
+        Err(RustADBError::DeviceNotFound(format!(
+            "cannot find USB device with vendor_id={} and product_id={}",
+            vendor_id, product_id
+        )))
+    }
+
+    /// Instantiate a new [`USBTransport`] from a [`rusb::Device`].
+    ///
+    /// Devices can be enumerated using [`rusb::devices()`] and then filtered out to get desired device.
+    pub fn new_from_device(rusb_device: rusb::Device<GlobalContext>) -> Self {
         Self {
+            device: rusb_device,
             handle: None,
-            vendor_id,
-            product_id,
         }
     }
 
@@ -52,105 +67,6 @@ impl USBTransport {
         Ok(())
     }
 
-    /// Write data to underlying connection, with default timeout
-    pub(crate) fn write_message(&mut self, message: ADBUsbMessage) -> Result<()> {
-        self.write_message_with_timeout(message, DEFAULT_WRITE_TIMEOUT)
-    }
-
-    /// Write data to underlying connection
-    pub(crate) fn write_message_with_timeout(
-        &mut self,
-        message: ADBUsbMessage,
-        timeout: Duration,
-    ) -> Result<()> {
-        let endpoint = self.find_writable_endpoint()?;
-        let handle = self.get_raw_connection()?;
-
-        if let Ok(true) = handle.kernel_driver_active(endpoint.iface) {
-            handle.detach_kernel_driver(endpoint.iface)?;
-        }
-
-        Self::configure_endpoint(&handle, &endpoint)?;
-
-        let message_bytes = message.header().as_bytes()?;
-        let mut total_written = 0;
-        loop {
-            total_written +=
-                handle.write_bulk(endpoint.address, &message_bytes[total_written..], timeout)?;
-            if total_written == message_bytes.len() {
-                break;
-            }
-        }
-
-        let payload = message.into_payload();
-        let mut total_written = 0;
-        loop {
-            total_written +=
-                handle.write_bulk(endpoint.address, &payload[total_written..], timeout)?;
-            if total_written == payload.len() {
-                break;
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Blocking method to read data from underlying connection.
-    pub(crate) fn read_message(&mut self) -> Result<ADBUsbMessage> {
-        self.read_message_with_timeout(MAX_READ_TIMEOUT)
-    }
-
-    /// Read data from underlying connection with given timeout.
-    pub(crate) fn read_message_with_timeout(&mut self, timeout: Duration) -> Result<ADBUsbMessage> {
-        let endpoint = self.find_readable_endpoint()?;
-        let handle = self.get_raw_connection()?;
-
-        if let Ok(true) = handle.kernel_driver_active(endpoint.iface) {
-            handle.detach_kernel_driver(endpoint.iface)?;
-        }
-
-        Self::configure_endpoint(&handle, &endpoint)?;
-
-        let mut data = [0; 24];
-        let mut total_read = 0;
-        loop {
-            total_read += handle.read_bulk(endpoint.address, &mut data[total_read..], timeout)?;
-            if total_read == data.len() {
-                break;
-            }
-        }
-
-        let header = ADBUsbMessageHeader::try_from(data)?;
-
-        log::trace!("received header {header:?}");
-
-        if header.data_length() != 0 {
-            let mut msg_data = vec![0_u8; header.data_length() as usize];
-            let mut total_read = 0;
-            loop {
-                total_read +=
-                    handle.read_bulk(endpoint.address, &mut msg_data[total_read..], timeout)?;
-                if total_read == msg_data.capacity() {
-                    break;
-                }
-            }
-
-            let message = ADBUsbMessage::from_header_and_payload(header, msg_data);
-
-            // Check message integrity
-            if !message.check_message_integrity() {
-                return Err(RustADBError::InvalidIntegrity(
-                    ADBUsbMessageHeader::compute_crc32(message.payload()),
-                    message.header().data_crc32(),
-                ));
-            }
-
-            return Ok(message);
-        }
-
-        Ok(ADBUsbMessage::from_header_and_payload(header, vec![]))
-    }
-
     fn find_readable_endpoint(&self) -> Result<Endpoint> {
         let handle = self.get_raw_connection()?;
         for n in 0..handle.device().device_descriptor()?.num_configurations() {
@@ -214,26 +130,103 @@ impl USBTransport {
 
 impl ADBTransport for USBTransport {
     fn connect(&mut self) -> crate::Result<()> {
-        for d in rusb::devices()?.iter() {
+        self.handle = Some(Arc::new(self.device.open()?));
-            if let Ok(descriptor) = d.device_descriptor() {
+        Ok(())
-                if descriptor.vendor_id() == self.vendor_id
+    }
-                    && descriptor.product_id() == self.product_id
-                {
-                    self.handle = Some(Arc::new(d.open()?));
 
-                    return Ok(());
+    fn disconnect(&mut self) -> crate::Result<()> {
+        let message = ADBTransportMessage::new(MessageCommand::Clse, 0, 0, "".into());
+        self.write_message(message)
+    }
+}
+
+impl ADBMessageTransport for USBTransport {
+    fn write_message_with_timeout(
+        &mut self,
+        message: ADBTransportMessage,
+        timeout: Duration,
+    ) -> Result<()> {
+        let endpoint = self.find_writable_endpoint()?;
+        let handle = self.get_raw_connection()?;
+
+        if let Ok(true) = handle.kernel_driver_active(endpoint.iface) {
+            handle.detach_kernel_driver(endpoint.iface)?;
+        }
+
+        Self::configure_endpoint(&handle, &endpoint)?;
+
+        let message_bytes = message.header().as_bytes()?;
+        let mut total_written = 0;
+        loop {
+            total_written +=
+                handle.write_bulk(endpoint.address, &message_bytes[total_written..], timeout)?;
+            if total_written == message_bytes.len() {
+                break;
+            }
+        }
+
+        let payload = message.into_payload();
+        if !payload.is_empty() {
+            let mut total_written = 0;
+            loop {
+                total_written +=
+                    handle.write_bulk(endpoint.address, &payload[total_written..], timeout)?;
+                if total_written == payload.len() {
+                    break;
                 }
             }
         }
 
-        Err(RustADBError::DeviceNotFound(format!(
+        Ok(())
-            "Cannot find device with vendor id {} and product id {}",
-            self.vendor_id, self.product_id
-        )))
     }
 
-    fn disconnect(&mut self) -> crate::Result<()> {
+    fn read_message_with_timeout(&mut self, timeout: Duration) -> Result<ADBTransportMessage> {
-        let message = ADBUsbMessage::new(USBCommand::Clse, 0, 0, "".into());
+        let endpoint = self.find_readable_endpoint()?;
-        self.write_message(message)
+        let handle = self.get_raw_connection()?;
+
+        if let Ok(true) = handle.kernel_driver_active(endpoint.iface) {
+            handle.detach_kernel_driver(endpoint.iface)?;
+        }
+
+        Self::configure_endpoint(&handle, &endpoint)?;
+
+        let mut data = [0; 24];
+        let mut total_read = 0;
+        loop {
+            total_read += handle.read_bulk(endpoint.address, &mut data[total_read..], timeout)?;
+            if total_read == data.len() {
+                break;
+            }
+        }
+
+        let header = ADBTransportMessageHeader::try_from(data)?;
+
+        log::trace!("received header {header:?}");
+
+        if header.data_length() != 0 {
+            let mut msg_data = vec![0_u8; header.data_length() as usize];
+            let mut total_read = 0;
+            loop {
+                total_read +=
+                    handle.read_bulk(endpoint.address, &mut msg_data[total_read..], timeout)?;
+                if total_read == msg_data.capacity() {
+                    break;
+                }
+            }
+
+            let message = ADBTransportMessage::from_header_and_payload(header, msg_data);
+
+            // Check message integrity
+            if !message.check_message_integrity() {
+                return Err(RustADBError::InvalidIntegrity(
+                    ADBTransportMessageHeader::compute_crc32(message.payload()),
+                    message.header().data_crc32(),
+                ));
+            }
+
+            return Ok(message);
+        }
+
+        Ok(ADBTransportMessage::from_header_and_payload(header, vec![]))
     }
 }

adb_client/src/usb/adb_rsa_key.rs

@@ -1,154 +0,0 @@
-use crate::{Result, RustADBError};
-use base64::{engine::general_purpose::STANDARD, Engine};
-use byteorder::{LittleEndian, WriteBytesExt};
-use num_bigint::traits::ModInverse;
-use num_bigint::BigUint;
-use rand::rngs::OsRng;
-use rsa::{Hash, PaddingScheme, PublicKeyParts, RSAPrivateKey};
-use std::convert::TryInto;
-
-// From project: https://github.com/hajifkd/webadb
-#[derive(Debug)]
-pub struct ADBRsaKey {
-    private_key: RSAPrivateKey,
-}
-
-impl ADBRsaKey {
-    pub fn random_with_size(size: usize) -> Result<Self> {
-        let mut rng = OsRng;
-        Ok(Self {
-            private_key: RSAPrivateKey::new(&mut rng, size)?,
-        })
-    }
-
-    pub fn from_pkcs8(pkcs8_content: &str) -> Result<Self> {
-        let der_encoded = pkcs8_content
-            .lines()
-            .filter(|line| !line.starts_with("-") && !line.is_empty())
-            .fold(String::new(), |mut data, line| {
-                data.push_str(line);
-                data
-            });
-        let der_bytes = STANDARD.decode(&der_encoded)?;
-        let private_key = RSAPrivateKey::from_pkcs8(&der_bytes)?;
-
-        Ok(ADBRsaKey { private_key })
-    }
-
-    pub fn encoded_public_key(&self) -> Result<String> {
-        // see https://android.googlesource.com/platform/system/core/+/android-4.4_r1/adb/adb_auth_host.c
-        // L63 RSA_to_RSAPublicKey
-        const RSANUMBYTES: u32 = 256;
-        const RSANUMWORDS: u32 = 64;
-        let user: String = format!("adb_client@{}", env!("CARGO_PKG_VERSION"));
-
-        let mut result = vec![];
-        result.write_u32::<LittleEndian>(RSANUMWORDS)?;
-        let r32 = set_bit(32)?;
-        let n = self.private_key.n();
-        let r = set_bit((32 * RSANUMWORDS) as _)?;
-        // Well, let rr = set_bit((64 * RSANUMWORDS) as _) % n is also fine, since r \sim n.
-        let rr = r.modpow(&BigUint::from(2u32), n);
-        let rem = n % &r32;
-        let n0inv = rem.mod_inverse(&r32);
-        if let Some(n0inv) = n0inv {
-            let n0inv = n0inv.to_biguint().ok_or(RustADBError::ConversionError)?;
-            let n0inv_p: u32 = 1 + !u32::from_le_bytes((&n0inv.to_bytes_le()[..4]).try_into()?);
-            result.write_u32::<LittleEndian>(n0inv_p)?;
-        } else {
-            return Err(RustADBError::ConversionError);
-        }
-
-        write_biguint(&mut result, n, RSANUMBYTES as _)?;
-        write_biguint(&mut result, &rr, RSANUMBYTES as _)?;
-        write_biguint(&mut result, self.private_key.e(), 4)?;
-
-        let mut encoded = STANDARD.encode(&result);
-        encoded.push(' ');
-        encoded.push_str(&user);
-        Ok(encoded)
-    }
-
-    pub fn sign(&self, msg: impl AsRef<[u8]>) -> Result<Vec<u8>> {
-        Ok(self.private_key.sign(
-            PaddingScheme::new_pkcs1v15_sign(Some(Hash::SHA1)),
-            msg.as_ref(),
-        )?)
-    }
-}
-
-fn write_biguint(writer: &mut Vec<u8>, data: &BigUint, n_bytes: usize) -> Result<()> {
-    for &v in data
-        .to_bytes_le()
-        .iter()
-        .chain(std::iter::repeat(&0))
-        .take(n_bytes)
-    {
-        writer.write_u8(v)?;
-    }
-
-    Ok(())
-}
-
-fn set_bit(n: usize) -> Result<BigUint> {
-    BigUint::parse_bytes(
-        &{
-            let mut bits = vec![b'1'];
-            bits.append(&mut vec![b'0'; n]);
-            bits
-        }[..],
-        2,
-    )
-    .ok_or(RustADBError::ConversionError)
-}
-
-#[test]
-fn test_pubkey_gen() {
-    const DEFAULT_PRIV_KEY: &'static str = r"-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC4Dyn85cxDJnjM
-uYXQl/w469MDKdlGdviLfmFMWeYLVfL2Mz1AVyvKqscrtlhbbgMQ/M+3lDvEdHS0
-14RIGAwWRtrlTTmhLvM2/IO+eSKSYeCrCVc4KLG3E3WRryUXbs2ynA29xjTJVw+Z
-xYxDyn/tAYPEyMm4v+HIJHcOtRzxtO2vjMJ2vBT/ywYxjhncXbFSO09q2E4XrHli
-SIPyO82hZgCkpzTZRp+nyA17TYuV9++mvUr9lWH9RbC+o8EF3yitlBsE2uXr97EV
-i2Qy8CE7FIxsihXlukppwKRuz+1rJrvmZPTn49ZS+sIS99WE9GoCpsyQvTpvehrM
-SIDRsVZPAgMBAAECggEAWNXAzzXeS36zCSR1yILCknqHotw86Pyc4z7BGUe+dzQp
-itiaNIaeNTgN3zQoGyDSzA0o+BLMcfo/JdVrHBy3IL1cAxYtvXTaoGxp7bGrlPk2
-pXZhqVJCy/jRYtokzdWF5DHbk/+pFJA3kGE/XKzM54g2n/DFI61A/QdUiz2w1ZtI
-vc5cM08EM8B/TSI3SeWB8zkh5SlIuLsFO2J2+tCak6PdFfKOVIrFv9dKJYLxx+59
-+edZamw2EvNlnl/sewgUk0gaZvQKVf4ivHyM+KSHuV4RFfiLvGuVcyA6XhSjztsG
-EA++jDHP5ib/Izes7UK09v9y7kow+z6vUtnDDQOvgQKBgQD8WWAn7FQt9aziCw19
-gZynzHG1bXI7uuEVSneuA3UwJImmDu8W+Qb9YL9Dc2nV0M5pGGdXKi2jzq8gPar6
-GPAmy7TOlov6Nm0pbMXTAfuovG+gIXxelp3US3FvyRupi0/7UQRRwvetFYbDFwJX
-ydF5uEtZdGSHAjPeU5FLq6tBwQKBgQC6uN0JwwZn+eaxguyKOXvp0KykhFI0HI1A
-MBDZ1uuKt6OW5+r9NeQtTLctGlNKVQ8wz+Wr0C/nLGIIv4lySS9WFyc5/FnFhDdy
-LsEi6whcca4vq3jsMOukvQGFnERsou4LqBEI1Es7jjeeEq+/8WnNTi6Y1flZ6UAp
-YAOeFI98DwKBgQDvyfHgHeajwZalOQF5qGb24AOQ9c4dyefGNnvhA/IgbCfMftZc
-iwhETuGQM6R3A7KQFRtlrXOu+2BYD6Ffg8D37IwD3vRmL7+tJGoapwC/B0g+7nLi
-4tZY+9Nv+LbrdbDry8GB+/UkKJdk3IFicCk4M5KOD1bTH5mwAtLHB/p1QQKBgDHi
-k8M45GxA+p4wMUvYgb987bLiWyfq/N3KOaZJYhJkb4MwoLpXfIeRuFqHbvsr8GwF
-DwIxE6s6U1KtAWaUIN5qPyOhxMYdRcbusNDIZCp2gKfhsuO/SiVwDYkJr8oqWVip
-5SsrtJHLtBY6PdQVBkRAf/h7KiwYQfkL2suQCKmHAoGBAJAkYImBYPHuRcnSXikn
-xGDK/moPvzs0CjdPlRcEN+Myy/G0FUrOaC0FcpNoJOdQSYz3F6URA4nX+zj6Ie7G
-CNkECiepaGyquQaffwR1CAi8dH6biJjlTQWQPFcCLA0hvernWo3eaSfiL7fHyym+
-ile69MHFENUePSpuRSiF3Z02
------END PRIVATE KEY-----";
-    let priv_key =
-        ADBRsaKey::from_pkcs8(DEFAULT_PRIV_KEY).expect("cannot create rsa key from data");
-    let pub_key = priv_key
-        .encoded_public_key()
-        .expect("cannot encode public key");
-    let pub_key_adb = "\
-QAAAAFH/pU9PVrHRgEjMGnpvOr2QzKYCavSE1fcSwvpS1uPn9GTmuyZr7c9up\
-MBpSrrlFYpsjBQ7IfAyZIsVsffr5doEG5StKN8FwaO+sEX9YZX9Sr2m7/eVi0\
-17Dcinn0bZNKekAGahzTvyg0hieawXTthqTztSsV3cGY4xBsv/FLx2woyv7bT\
-xHLUOdyTI4b+4ycjEgwHtf8pDjMWZD1fJNMa9DZyyzW4XJa+RdRO3sSg4Vwmr\
-4GGSInm+g/w28y6hOU3l2kYWDBhIhNe0dHTEO5S3z/wQA25bWLYrx6rKK1dAP\
-TP28lUL5llMYX6L+HZG2SkD0+s4/JfQhbnMeCZDzOX8KQ+4ThLy/gDTqCSTjj\
-ic8BykdUIqYPwAjBMgQwLOLY5WNJMpjGlFINRcCGhvFFZ73sJTLerECuV/Oae\
-nFRcORwnGIRgMrYXj4tjmxJC7sq3cfNX96YIcSCDE9SZFdlKXVK8Jc4YMLGF3\
-MI8k1KoTby34uaIyxPJvwM1WR4Rdj60fwMyikFXNaOR2fPteZ3UMBA7CMrOEm\
-9iYjntyEppA4hQXIO1TWTzkA/Kfl1i67k5NuLIQdhPFEc5ox5IYVHusauPQ7d\
-Awu6BlgK37TUn0JdK0Z6Z4RaEIaNiEI0d5CoP6zQKV2QQnlscYpdsaUW5t9/F\
-LioVXPwrz0tx35JyIUZPPYwEAAQA= ";
-    assert_eq!(&pub_key[..pub_key_adb.len()], pub_key_adb);
-}

adb_client/src/usb/adb_usb_device.rs

@@ -1,379 +0,0 @@
-use byteorder::ReadBytesExt;
-use rand::Rng;
-use std::fs::read_to_string;
-use std::io::Cursor;
-use std::io::Read;
-use std::io::Seek;
-use std::path::Path;
-use std::path::PathBuf;
-use std::time::Duration;
-
-use byteorder::LittleEndian;
-
-use super::{ADBRsaKey, ADBUsbMessage};
-use crate::constants::BUFFER_SIZE;
-use crate::models::AdbStatResponse;
-use crate::usb::adb_usb_message::{AUTH_RSAPUBLICKEY, AUTH_SIGNATURE, AUTH_TOKEN};
-use crate::{
-    usb::usb_commands::{USBCommand, USBSubcommand},
-    ADBTransport, Result, RustADBError, USBTransport,
-};
-
-/// Represent a device reached directly over USB
-#[derive(Debug)]
-pub struct ADBUSBDevice {
-    private_key: ADBRsaKey,
-    pub(crate) transport: USBTransport,
-}
-
-fn read_adb_private_key<P: AsRef<Path>>(private_key_path: P) -> Result<Option<ADBRsaKey>> {
-    read_to_string(private_key_path.as_ref())
-        .map_err(RustADBError::from)
-        .map(|pk| match ADBRsaKey::from_pkcs8(&pk) {
-            Ok(pk) => Some(pk),
-            Err(e) => {
-                log::error!("Error while create RSA private key: {e}");
-                None
-            }
-        })
-}
-
-impl ADBUSBDevice {
-    /// Instantiate a new [ADBUSBDevice]
-    pub fn new(vendor_id: u16, product_id: u16) -> Result<Self> {
-        let private_key_path = homedir::my_home()
-            .ok()
-            .flatten()
-            .map(|home| home.join(".android").join("adbkey"))
-            .ok_or(RustADBError::NoHomeDirectory)?;
-
-        let private_key = match read_adb_private_key(private_key_path)? {
-            Some(pk) => pk,
-            None => ADBRsaKey::random_with_size(2048)?,
-        };
-
-        let mut s = Self {
-            private_key,
-            transport: USBTransport::new(vendor_id, product_id),
-        };
-
-        s.connect()?;
-
-        Ok(s)
-    }
-
-    /// Instantiate a new [ADBUSBDevice] using a custom private key path
-    pub fn new_with_custom_private_key(
-        vendor_id: u16,
-        product_id: u16,
-        private_key_path: PathBuf,
-    ) -> Result<Self> {
-        let private_key = match read_adb_private_key(private_key_path)? {
-            Some(pk) => pk,
-            None => ADBRsaKey::random_with_size(2048)?,
-        };
-
-        let mut s = Self {
-            private_key,
-            transport: USBTransport::new(vendor_id, product_id),
-        };
-
-        s.connect()?;
-
-        Ok(s)
-    }
-
-    /// Send initial connect
-    pub fn connect(&mut self) -> Result<()> {
-        self.transport.connect()?;
-
-        let message = ADBUsbMessage::new(
-            USBCommand::Cnxn,
-            0x01000000,
-            1048576,
-            format!("host::{}\0", env!("CARGO_PKG_NAME"))
-                .as_bytes()
-                .to_vec(),
-        );
-
-        self.transport.write_message(message)?;
-
-        let message = self.transport.read_message()?;
-
-        // At this point, we should have received either:
-        // - an AUTH message with arg0 == 1
-        // - a CNXN message
-        let auth_message = match message.header().command() {
-            USBCommand::Auth if message.header().arg0() == AUTH_TOKEN => message,
-            USBCommand::Auth if message.header().arg0() != AUTH_TOKEN => {
-                return Err(RustADBError::ADBRequestFailed(
-                    "Received AUTH message with type != 1".into(),
-                ))
-            }
-            c => {
-                return Err(RustADBError::ADBRequestFailed(format!(
-                    "Wrong command received {}",
-                    c
-                )))
-            }
-        };
-
-        let sign = self.private_key.sign(auth_message.into_payload())?;
-
-        let message = ADBUsbMessage::new(USBCommand::Auth, AUTH_SIGNATURE, 0, sign);
-
-        self.transport.write_message(message)?;
-
-        let received_response = self.transport.read_message()?;
-
-        if received_response.header().command() == USBCommand::Cnxn {
-            log::info!(
-                "Authentication OK, device info {}",
-                String::from_utf8(received_response.into_payload())?
-            );
-            return Ok(());
-        }
-
-        let mut pubkey = self.private_key.encoded_public_key()?.into_bytes();
-        pubkey.push(b'\0');
-
-        let message = ADBUsbMessage::new(USBCommand::Auth, AUTH_RSAPUBLICKEY, 0, pubkey);
-
-        self.transport.write_message(message)?;
-
-        let response = self
-            .transport
-            .read_message_with_timeout(Duration::from_secs(10))?;
-
-        match response.header().command() {
-            USBCommand::Cnxn => log::info!(
-                "Authentication OK, device info {}",
-                String::from_utf8(response.into_payload())?
-            ),
-            _ => {
-                return Err(RustADBError::ADBRequestFailed(format!(
-                    "wrong response {}",
-                    response.header().command()
-                )))
-            }
-        }
-
-        Ok(())
-    }
-    /// Receive a message and acknowledge it by replying with an `OKAY` command
-    pub(crate) fn recv_and_reply_okay(
-        &mut self,
-        local_id: u32,
-        remote_id: u32,
-    ) -> Result<ADBUsbMessage> {
-        let message = self.transport.read_message()?;
-        self.transport.write_message(ADBUsbMessage::new(
-            USBCommand::Okay,
-            local_id,
-            remote_id,
-            "".into(),
-        ))?;
-        Ok(message)
-    }
-
-    /// Expect a message with an `OKAY` command after sending a message.
-    pub(crate) fn send_and_expect_okay(&mut self, message: ADBUsbMessage) -> Result<ADBUsbMessage> {
-        self.transport.write_message(message)?;
-        let message = self.transport.read_message()?;
-        let received_command = message.header().command();
-        if received_command != USBCommand::Okay {
-            return Err(RustADBError::ADBRequestFailed(format!(
-                "expected command OKAY after message, got {}",
-                received_command
-            )));
-        }
-        Ok(message)
-    }
-
-    pub(crate) fn recv_file<W: std::io::Write>(
-        &mut self,
-        local_id: u32,
-        remote_id: u32,
-        mut output: W,
-    ) -> std::result::Result<(), RustADBError> {
-        let mut len: Option<u64> = None;
-        loop {
-            let payload = self
-                .recv_and_reply_okay(local_id, remote_id)?
-                .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);
-                    }
-                    Some(length) => {
-                        log::debug!("len = {length}");
-                        let remaining_bytes = payload.len() as u64 - rdr.position();
-                        log::debug!(
-                            "payload length {} - reader_position {} = {remaining_bytes}",
-                            payload.len(),
-                            rdr.position()
-                        );
-                        if length < remaining_bytes {
-                            let read = std::io::copy(&mut rdr.by_ref().take(length), &mut output)?;
-                            log::debug!(
-                                "expected to read {length} bytes, actually read {read} bytes"
-                            );
-                        } else {
-                            let read = std::io::copy(&mut rdr.take(remaining_bytes), &mut output)?;
-                            len.replace(length - remaining_bytes);
-                            log::debug!("expected to read {remaining_bytes} bytes, actually read {read} bytes");
-                            // this payload is exhausted
-                            break;
-                        }
-                    }
-                }
-            }
-            if Cursor::new(&payload[(payload.len() - 8)..(payload.len() - 4)])
-                .read_u32::<LittleEndian>()?
-                == USBSubcommand::Done as u32
-            {
-                break;
-            }
-        }
-        Ok(())
-    }
-
-    pub(crate) fn push_file<R: std::io::Read>(
-        &mut self,
-        local_id: u32,
-        remote_id: u32,
-        mut reader: R,
-    ) -> std::result::Result<(), RustADBError> {
-        let mut buffer = [0; BUFFER_SIZE];
-        let amount_read = reader.read(&mut buffer)?;
-        let subcommand_data = USBSubcommand::Data.with_arg(amount_read as u32);
-
-        let mut serialized_message =
-            bincode::serialize(&subcommand_data).map_err(|_e| RustADBError::ConversionError)?;
-        serialized_message.append(&mut buffer[..amount_read].to_vec());
-
-        let message =
-            ADBUsbMessage::new(USBCommand::Write, local_id, remote_id, serialized_message);
-
-        self.send_and_expect_okay(message)?;
-
-        loop {
-            let mut buffer = [0; BUFFER_SIZE];
-
-            match reader.read(&mut buffer) {
-                Ok(0) => {
-                    // Currently file mtime is not forwarded
-                    let subcommand_data = USBSubcommand::Done.with_arg(0);
-
-                    let serialized_message = bincode::serialize(&subcommand_data)
-                        .map_err(|_e| RustADBError::ConversionError)?;
-
-                    let message = ADBUsbMessage::new(
-                        USBCommand::Write,
-                        local_id,
-                        remote_id,
-                        serialized_message,
-                    );
-
-                    self.send_and_expect_okay(message)?;
-
-                    // Command should end with a Write => Okay
-                    let received = self.transport.read_message()?;
-                    match received.header().command() {
-                        USBCommand::Write => return Ok(()),
-                        c => {
-                            return Err(RustADBError::ADBRequestFailed(format!(
-                                "Wrong command received {}",
-                                c
-                            )))
-                        }
-                    }
-                }
-                Ok(size) => {
-                    let subcommand_data = USBSubcommand::Data.with_arg(size as u32);
-
-                    let mut serialized_message = bincode::serialize(&subcommand_data)
-                        .map_err(|_e| RustADBError::ConversionError)?;
-                    serialized_message.append(&mut buffer[..size].to_vec());
-
-                    let message = ADBUsbMessage::new(
-                        USBCommand::Write,
-                        local_id,
-                        remote_id,
-                        serialized_message,
-                    );
-
-                    self.send_and_expect_okay(message)?;
-                }
-                Err(e) => {
-                    return Err(RustADBError::IOError(e));
-                }
-            }
-        }
-    }
-
-    pub(crate) fn begin_synchronization(&mut self) -> Result<(u32, u32)> {
-        let sync_directive = "sync:\0";
-
-        let mut rng = rand::thread_rng();
-        let message = ADBUsbMessage::new(
-            USBCommand::Open,
-            rng.gen(), /* Our 'local-id' */
-            0,
-            sync_directive.into(),
-        );
-        let message = self.send_and_expect_okay(message)?;
-        let local_id = message.header().arg1();
-        let remote_id = message.header().arg0();
-        Ok((local_id, remote_id))
-    }
-
-    pub(crate) fn stat_with_explicit_ids(
-        &mut self,
-        remote_path: &str,
-        local_id: u32,
-        remote_id: u32,
-    ) -> Result<AdbStatResponse> {
-        let stat_buffer = USBSubcommand::Stat.with_arg(remote_path.len() as u32);
-        let message = ADBUsbMessage::new(
-            USBCommand::Write,
-            local_id,
-            remote_id,
-            bincode::serialize(&stat_buffer).map_err(|_e| RustADBError::ConversionError)?,
-        );
-        self.send_and_expect_okay(message)?;
-        self.send_and_expect_okay(ADBUsbMessage::new(
-            USBCommand::Write,
-            local_id,
-            remote_id,
-            remote_path.into(),
-        ))?;
-        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)
-    }
-
-    pub(crate) fn end_transaction(&mut self, local_id: u32, remote_id: u32) -> Result<()> {
-        let quit_buffer = USBSubcommand::Quit.with_arg(0u32);
-        self.send_and_expect_okay(ADBUsbMessage::new(
-            USBCommand::Write,
-            local_id,
-            remote_id,
-            bincode::serialize(&quit_buffer).map_err(|_e| RustADBError::ConversionError)?,
-        ))?;
-        let _discard_close = self.transport.read_message()?;
-        Ok(())
-    }
-}
-
-impl Drop for ADBUSBDevice {
-    fn drop(&mut self) {
-        // Best effort here
-        let _ = self.transport.disconnect();
-    }
-}

adb_client/src/usb/adb_usb_device_commands.rs

@@ -1,197 +0,0 @@
-use crate::{
-    models::AdbStatResponse,
-    usb::{ADBUsbMessage, USBCommand, USBSubcommand},
-    ADBDeviceExt, ADBUSBDevice, RebootType, Result, RustADBError,
-};
-use rand::Rng;
-use std::io::{Read, Write};
-
-use super::USBShellWriter;
-
-impl ADBDeviceExt for ADBUSBDevice {
-    fn shell_command<S: ToString, W: Write>(
-        &mut self,
-        command: impl IntoIterator<Item = S>,
-        mut output: W,
-    ) -> Result<()> {
-        let message = ADBUsbMessage::new(
-            USBCommand::Open,
-            1,
-            0,
-            format!(
-                "shell:{}\0",
-                command
-                    .into_iter()
-                    .map(|v| v.to_string())
-                    .collect::<Vec<_>>()
-                    .join(" "),
-            )
-            .as_bytes()
-            .to_vec(),
-        );
-        self.transport.write_message(message)?;
-
-        let response = self.transport.read_message()?;
-        if response.header().command() != USBCommand::Okay {
-            return Err(RustADBError::ADBRequestFailed(format!(
-                "wrong command {}",
-                response.header().command()
-            )));
-        }
-
-        loop {
-            let response = self.transport.read_message()?;
-            if response.header().command() != USBCommand::Write {
-                break;
-            }
-
-            output.write_all(&response.into_payload())?;
-        }
-
-        Ok(())
-    }
-
-    fn shell<R: Read, W: Write + Send + 'static>(
-        &mut self,
-        mut reader: R,
-        mut writer: W,
-    ) -> Result<()> {
-        let sync_directive = "shell:\0";
-
-        let mut rng = rand::thread_rng();
-        let message = ADBUsbMessage::new(
-            USBCommand::Open,
-            rng.gen(), /* Our 'local-id' */
-            0,
-            sync_directive.into(),
-        );
-        let message = self.send_and_expect_okay(message)?;
-        let local_id = message.header().arg1();
-        let remote_id = message.header().arg0();
-
-        let mut transport = self.transport.clone();
-
-        // Reading thread, reads response from adbd
-        std::thread::spawn(move || -> Result<()> {
-            loop {
-                let message = transport.read_message()?;
-
-                // Acknowledge for more data
-                let response = ADBUsbMessage::new(USBCommand::Okay, local_id, remote_id, vec![]);
-                transport.write_message(response)?;
-
-                match message.header().command() {
-                    USBCommand::Write => {}
-                    USBCommand::Okay => continue,
-                    _ => return Err(RustADBError::ADBShellNotSupported),
-                }
-
-                writer.write_all(&message.into_payload())?;
-                writer.flush()?;
-            }
-        });
-
-        let mut shell_writer = USBShellWriter::new(self.transport.clone(), local_id, 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) {
-            match e.kind() {
-                std::io::ErrorKind::BrokenPipe => return Ok(()),
-                _ => return Err(RustADBError::IOError(e)),
-            }
-        }
-
-        Ok(())
-    }
-
-    fn stat(&mut self, remote_path: &str) -> Result<AdbStatResponse> {
-        let (local_id, remote_id) = self.begin_synchronization()?;
-        let adb_stat_response = self.stat_with_explicit_ids(remote_path, local_id, remote_id)?;
-        self.end_transaction(local_id, remote_id)?;
-        Ok(adb_stat_response)
-    }
-
-    fn pull<A: AsRef<str>, W: Write>(&mut self, source: A, output: W) -> Result<()> {
-        let (local_id, remote_id) = self.begin_synchronization()?;
-        let source = source.as_ref();
-
-        let adb_stat_response = self.stat_with_explicit_ids(source, local_id, remote_id)?;
-        self.transport.write_message(ADBUsbMessage::new(
-            USBCommand::Okay,
-            local_id,
-            remote_id,
-            "".into(),
-        ))?;
-
-        log::debug!("{:?}", adb_stat_response);
-        if adb_stat_response.file_perm == 0 {
-            return Err(RustADBError::UnknownResponseType(
-                "mode is 0: source file does not exist".to_string(),
-            ));
-        }
-
-        let recv_buffer = USBSubcommand::Recv.with_arg(source.len() as u32);
-        let recv_buffer =
-            bincode::serialize(&recv_buffer).map_err(|_e| RustADBError::ConversionError)?;
-        self.send_and_expect_okay(ADBUsbMessage::new(
-            USBCommand::Write,
-            local_id,
-            remote_id,
-            recv_buffer,
-        ))?;
-        self.send_and_expect_okay(ADBUsbMessage::new(
-            USBCommand::Write,
-            local_id,
-            remote_id,
-            source.into(),
-        ))?;
-
-        self.recv_file(local_id, remote_id, output)?;
-        self.end_transaction(local_id, remote_id)?;
-        Ok(())
-    }
-
-    fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
-        let (local_id, remote_id) = self.begin_synchronization()?;
-
-        let path_header = format!("{},0777", path.as_ref());
-
-        let send_buffer = USBSubcommand::Send.with_arg(path_header.len() as u32);
-        let mut send_buffer =
-            bincode::serialize(&send_buffer).map_err(|_e| RustADBError::ConversionError)?;
-        send_buffer.append(&mut path_header.as_bytes().to_vec());
-
-        self.send_and_expect_okay(ADBUsbMessage::new(
-            USBCommand::Write,
-            local_id,
-            remote_id,
-            send_buffer,
-        ))?;
-
-        self.push_file(local_id, remote_id, stream)?;
-
-        self.end_transaction(local_id, remote_id)?;
-
-        Ok(())
-    }
-
-    fn reboot(&mut self, reboot_type: RebootType) -> Result<()> {
-        let mut rng = rand::thread_rng();
-
-        let message = ADBUsbMessage::new(
-            USBCommand::Open,
-            rng.gen(), // Our 'local-id'
-            0,
-            format!("reboot:{}\0", reboot_type).as_bytes().to_vec(),
-        );
-        self.transport.write_message(message)?;
-
-        let message = self.transport.read_message()?;
-
-        if message.header().command() != USBCommand::Okay {
-            return Err(RustADBError::ADBShellNotSupported);
-        }
-
-        Ok(())
-    }
-}

adb_client/src/usb/mod.rs

@@ -1,12 +0,0 @@
-mod adb_rsa_key;
-mod adb_usb_device;
-mod adb_usb_device_commands;
-mod adb_usb_message;
-mod usb_commands;
-mod usb_shell;
-
-pub use adb_rsa_key::ADBRsaKey;
-pub use adb_usb_device::ADBUSBDevice;
-pub use adb_usb_message::{ADBUsbMessage, ADBUsbMessageHeader};
-pub use usb_commands::{USBCommand, USBSubcommand};
-pub use usb_shell::USBShellWriter;

adb_client/src/utils.rs

@@ -1,3 +1,5 @@
+use std::{ffi::OsStr, path::Path};
+
 use crate::{Result, RustADBError};
 
 pub fn u32_from_le(value: &[u8]) -> Result<u32> {
@@ -7,3 +9,16 @@ pub fn u32_from_le(value: &[u8]) -> Result<u32> {
             .map_err(|_| RustADBError::ConversionError)?,
     ))
 }
+
+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()
+            )));
+        }
+    }
+
+    Ok(())
+}

benches/benchmark_adb_push.rs

@@ -0,0 +1,135 @@
+use adb_client::{ADBDeviceExt, ADBServer, ADBUSBDevice};
+use anyhow::Result;
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+use rand::{thread_rng, Rng};
+use std::fs::File;
+use std::io::Write;
+use std::process::Command;
+use std::time::Duration;
+
+const LOCAL_TEST_FILE_PATH: &str = "test_file.bin";
+const REMOTE_TEST_FILE_PATH: &str = "/data/local/tmp/test_file.bin";
+
+/// Generate random test file with given size
+fn generate_test_file(size_in_bytes: usize) -> Result<()> {
+    let mut test_file = File::create(LOCAL_TEST_FILE_PATH)?;
+
+    let mut rng = thread_rng();
+
+    const BUFFER_SIZE: usize = 64 * 1024;
+    let mut buffer = [0u8; BUFFER_SIZE];
+    let mut remaining_bytes = size_in_bytes;
+
+    while remaining_bytes > 0 {
+        let bytes_to_write = remaining_bytes.min(BUFFER_SIZE);
+        rng.fill(&mut buffer[..bytes_to_write]);
+        test_file.write_all(&buffer[..bytes_to_write])?;
+        remaining_bytes -= bytes_to_write;
+    }
+
+    Ok(())
+}
+
+/// Use `adb_client` crate to push a file on device
+fn bench_adb_client_push() -> Result<()> {
+    let mut client = ADBServer::default();
+    let mut device = client.get_device()?;
+    let f = File::open(LOCAL_TEST_FILE_PATH)?;
+    Ok(device.push(f, REMOTE_TEST_FILE_PATH)?)
+}
+
+/// Use `adb_client` crate to push a file on device using an USB device.
+/// Only one android device must be connected when launching this benchmark as we're using `autodetect()` method.
+fn bench_adb_client_push_over_usb() -> Result<()> {
+    let mut device = ADBUSBDevice::autodetect()?;
+    let f = File::open(LOCAL_TEST_FILE_PATH)?;
+    Ok(device.push(f, REMOTE_TEST_FILE_PATH)?)
+}
+
+/// Use standard `adb` command ti push a file on device
+fn bench_adb_push_command() -> Result<()> {
+    let output = Command::new("adb")
+        .arg("push")
+        .arg(LOCAL_TEST_FILE_PATH)
+        .arg(REMOTE_TEST_FILE_PATH)
+        .output()?;
+
+    if !output.status.success() {
+        eprintln!("error while starting adb push command");
+    }
+    Ok(())
+}
+
+/// benchmarking `adb push INPUT DEST` and adb_client `ADBServerDevice.push(INPUT, DEST)`
+fn benchmark_adb_push(c: &mut Criterion) {
+    for (file_size, sample_size) in [
+        (10 * 1024 * 1024, 100),  // 10MB -> 100 iterations
+        (500 * 1024 * 1024, 50),  // 500MB -> 50 iterations
+        (1000 * 1024 * 1024, 20), // 1GB -> 20 iterations
+    ] {
+        eprintln!(
+            "Benchmarking file_size={} and sample_size={}",
+            file_size, sample_size
+        );
+
+        generate_test_file(file_size).expect("Cannot generate test file");
+
+        let mut group = c.benchmark_group("ADB Push Benchmark");
+        group.sample_size(sample_size);
+
+        group.bench_function(BenchmarkId::new("adb_client", "push"), |b| {
+            b.iter(|| {
+                bench_adb_client_push().expect("Error while benchmarking adb_client push");
+            });
+        });
+
+        group.bench_function(BenchmarkId::new("adb", "push"), |b| {
+            b.iter(|| {
+                bench_adb_push_command().expect("Error while benchmarking adb push command");
+            });
+        });
+
+        group.finish();
+    }
+}
+
+/// benchmarking `adb push INPUT DEST` and adb_client `ADBUSBDevice.push(INPUT, DEST)`
+fn benchmark_adb_push_over_usb(c: &mut Criterion) {
+    for (file_size, sample_size) in [
+        // (10 * 1024 * 1024, 100),  // 10MB -> 100 iterations
+        // (500 * 1024 * 1024, 50),  // 500MB -> 50 iterations
+        (1000 * 1024 * 1024, 20), // 1GB -> 20 iterations
+    ] {
+        eprintln!(
+            "Benchmarking file_size={} and sample_size={}",
+            file_size, sample_size
+        );
+
+        generate_test_file(file_size).expect("Cannot generate test file");
+
+        let mut group = c.benchmark_group("ADB Push Benchmark");
+        group.sample_size(sample_size);
+
+        group.bench_function(BenchmarkId::new("adb_client", "push"), |b| {
+            b.iter(|| {
+                bench_adb_client_push_over_usb()
+                    .expect("Error while benchmarking adb_client push over USB");
+            });
+        });
+
+        group.bench_function(BenchmarkId::new("adb", "push"), |b| {
+            b.iter(|| {
+                bench_adb_push_command().expect("Error while benchmarking adb push command");
+            });
+        });
+
+        group.finish();
+    }
+}
+
+criterion_group!(
+    name = benches;
+    config = Criterion::default().measurement_time(Duration::from_secs(1000));
+    targets = benchmark_adb_push, benchmark_adb_push_over_usb
+);
+criterion_main!(benches);