fix: ci

* feat: add fastboot reboot type

* feat: add fastboot command to cli

---------

Co-authored-by: LIAUD Corentin <corentinliaud26@gmail.com>

.github/workflows/python-build.yml

@@ -0,0 +1,38 @@
+name: Python - Build packages & Release
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  release:
+    types: [created]
+
+jobs:
+  build-python-packages:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build Python stubs
+        run: cargo run --bin stub_gen
+
+      - name: Install Python build dependencies
+        run: pip install maturin==1.8.2
+
+      - name: Build Python packages
+        run: maturin build --sdist --release -m pyadb_client/Cargo.toml
+
+      - name: Publish Python packages
+        if: github.event_name == 'release' && github.event.action == 'created'
+        run: maturin publish -m pyadb_client/Cargo.toml --non-interactive
+        env:
+          MATURIN_PYPI_TOKEN: ${{ secrets.MATURIN_PYPI_TOKEN }}
+
+      - name: "Publish GitHub artefacts"
+        if: github.event_name == 'release' && github.event.action == 'created'
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            target/wheels/pyadb_client*.whl
+            target/wheels/pyadb_client*.tar.gz

.github/workflows/rust-build.yml

@@ -1,15 +1,29 @@
 name: Rust - Build
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build-release:
+  build:
-    name: "build-release"
+    name: "Build on ${{ matrix.os }}"
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - name: Build project
+
-      run: cargo build --release --all-features
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Build project
+        run: cargo build --release --features rusb,mdns

.github/workflows/rust-quality.yml

@@ -1,6 +1,10 @@
 name: Rust - Quality
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 
 env:
   CARGO_TERM_COLOR: always
@@ -13,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: rustup component add clippy
       - name: Run clippy
-        run: cargo clippy --all-features
+        run: cargo clippy --features rusb,mdns
 
   fmt:
     name: "fmt"
@@ -29,7 +33,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run doc
-        run: cargo doc --all-features --no-deps
+        run: cargo doc --features rusb,mdns --no-deps
         env:
           RUSTDOCFLAGS: "-D warnings"
 
@@ -39,4 +43,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run tests
-        run: cargo test --verbose --all-features
+        run: cargo test --verbose --features rusb,mdns

.github/workflows/rust-release.yml

@@ -4,47 +4,106 @@ on:
   release:
     types: [created]
 
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
-  create-release:
+  release-linux:
+    name: Linux - Build and Publish
     runs-on: ubuntu-latest
 
     steps:
-      - name: "Checkout repository"
+      - uses: actions/checkout@v4
-        uses: actions/checkout@v4
 
-      - name: "Set up Rust"
+      - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
           override: true
 
-      - name: "Install dependencies"
+      - name: Install dependencies
         run: |
           sudo apt update
           sudo apt install -y rpm
           cargo install cargo-deb
           cargo install cargo-generate-rpm
 
-      - name: "build-release"
+      - name: Publish crates
-        run: cargo build --all-features --release
+        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 }}
 
-      - name: "Build DEB package"
+      - name: Build release
+        run: cargo build -p adb_cli --release
+
+      - name: Rename binary
+        run: mv target/release/adb_cli target/release/adb_cli-linux
+
+      - name: Build DEB package
         run: cargo deb -p adb_cli
 
-      - name: "Build RPM package"
+      - name: Build RPM package
         run: cargo generate-rpm -p adb_cli
 
-      - name: "Publish GitHub artefacts"
+      - name: Upload Linux artifacts
         uses: softprops/action-gh-release@v2
         with:
           files: |
             target/debian/*.deb
             target/generate-rpm/*.rpm
-            target/release/adb_cli
+            target/release/adb_cli-linux
 
-      - name: "Publish crates"
+  release-macos:
-        run: |
+    name: macOS - Build Binary
-          cargo publish -p adb_client --token ${CRATES_IO_TOKEN}
+    runs-on: macos-13
-          cargo publish -p adb_cli --token ${CRATES_IO_TOKEN}
+
-        env:
+    steps:
-          CRATES_IO_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}
+      - uses: actions/checkout@v4
+
+      - name: Set up Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+
+      - name: Build release
+        run: cargo build -p adb_cli --release
+
+      - name: Rename binary
+        run: mv target/release/adb_cli target/release/adb_cli-macos
+
+      - name: Upload macOS binary
+        uses: softprops/action-gh-release@v2
+        with:
+          files: target/release/adb_cli-macos
+
+  release-windows:
+    name: Windows - Build Binary
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Build release
+        run: cargo build -p adb_cli --release
+
+      - name: Rename binary
+        run: Rename-Item -Path target/release/adb_cli.exe -NewName adb_cli-windows.exe
+
+      - name: Upload Windows binary
+        uses: softprops/action-gh-release@v2
+        with:
+          files: target/release/adb_cli-windows.exe

.gitignore

@@ -1,3 +1,6 @@
 target
-Cargo.lock
+/Cargo.lock
-.vscode
+/.vscode
+venv
+/.mypy_cache
+pyadb_client/pyadb_client.pyi

Cargo.toml

@@ -1,15 +1,16 @@
 [workspace]
-members = ["adb_cli", "adb_client"]
+members = ["adb_cli", "adb_client", "examples/mdns", "pyadb_client"]
 resolver = "2"
 
 [workspace.package]
 authors = ["Corentin LIAUD"]
-edition = "2021"
+edition = "2024"
 homepage = "https://github.com/cocool97/adb_client"
 keywords = ["adb", "android", "tcp", "usb"]
 license = "MIT"
 repository = "https://github.com/cocool97/adb_client"
-version = "2.0.6"
+version = "2.1.18"
+rust-version = "1.85.1"
 
 # To build locally when working on a new release
 [patch.crates-io]

README.md

@@ -8,6 +8,9 @@
         <a href="https://crates.io/crates/adb_client">
             <img alt="crates.io" src="https://img.shields.io/crates/v/adb_client.svg"/>
         </a>
+        <a href="https://crates.io/crates/adb_client">
+            <img alt="msrv" src="https://img.shields.io/crates/msrv/adb_client"/>
+        </a>
         <a href="https://github.com/cocool97/adb_client/actions">
             <img alt="ci status" src="https://github.com/cocool97/adb_client/actions/workflows/rust-build.yml/badge.svg"/>
         </a>
@@ -30,6 +33,7 @@ Main features of this library:
     - Over **TCP/IP**
 - Implements hidden `adb` features, like `framebuffer`
 - Highly configurable
+- Provides wrappers to use directly from Python code
 - Easy to use !
 
 ## adb_client
@@ -41,12 +45,25 @@ Improved documentation available [here](./adb_client/README.md).
 ## adb_cli
 
 Rust binary providing an improved version of Google's official `adb` CLI, by using `adb_client` library.
-Provides an usage example of the library.
+Provides a "real-world" usage example of this library.
 
 Improved documentation available [here](./adb_cli/README.md).
 
+## examples
+
+Some examples are available in the `examples` directory:
+
+- `examples/mdns`: mDNS device discovery example
+
+## pyadb_client
+
+Python wrapper using `adb_client` library to export classes usable directly from a Python environment.
+
+Improved documentation available [here](./pyadb_client/README.md)
+
 ## Related publications
 
 - [Diving into ADB protocol internals (1/2)](https://www.synacktiv.com/publications/diving-into-adb-protocol-internals-12)
+- [Diving into ADB protocol internals (2/2)](https://www.synacktiv.com/publications/diving-into-adb-protocol-internals-22)
 
 Some features may still be missing, all pull requests are welcome !

adb_cli/Cargo.toml

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

adb_cli/README.md

@@ -2,6 +2,7 @@
 
 [![MIT licensed](https://img.shields.io/crates/l/adb_cli.svg)](./LICENSE-MIT)
 ![Crates.io Total Downloads](https://img.shields.io/crates/d/adb_cli)
+![MSRV](https://img.shields.io/crates/msrv/adb_cli)
 
 Rust binary providing an improved version of `adb` CLI.
 
@@ -10,7 +11,7 @@ Rust binary providing an improved version of `adb` CLI.
 This crate provides a lightweight binary based on the `adb_client` crate. You can install it by running the following command :
 
 ```shell
-cargo install adb_cli 
+cargo install adb_cli
 ```
 
 Usage is quite simple, and tends to look like `adb`:
@@ -18,38 +19,29 @@ Usage is quite simple, and tends to look like `adb`:
 - To use ADB server as a proxy:
 
 ```bash
-user@laptop ~/adb_client (main)> adb_cli --help
+user@laptop ~/adb_client (main)> adb_cli local --help
-Rust ADB (Android Debug Bridge) CLI
+Device related commands using server
 
-Usage: adb_cli [OPTIONS] <COMMAND>
+Usage: adb_cli local [OPTIONS] <COMMAND>
 
 Commands:
-  host-features  List available server features
-  push           Push a file on device
-  pull           Pull a file from device
-  list           List a directory on device
-  stat           Stat a file specified on device
   shell          Spawn an interactive shell or run a list of commands on the device
+  pull           Pull a file from device
+  push           Push a file on device
+  stat           Stat a file on device
+  run            Run an activity on device specified by the intent
   reboot         Reboot the device
+  install        Install an APK on device
   framebuffer    Dump framebuffer of device
+  host-features  List available server features
+  list           List a directory on device
   logcat         Get logs of device
-  version        Print current ADB version
-  kill           Ask ADB server to quit immediately
-  devices        List connected devices
-  track-devices  Track new devices showing up
-  pair           Pair device with a given code
-  connect        Connect device over WI-FI
-  disconnect     Disconnect device over WI-FI
-  sms            Send a SMS with given phone number and given content
-  rotate         Rotate device screen from 90°
   help           Print this message or the help of the given subcommand(s)
 
 Options:
-  -d, --debug              
   -a, --address <ADDRESS>  [default: 127.0.0.1:5037]
   -s, --serial <SERIAL>    Serial id of a specific device. Every request will be sent to this device
   -h, --help               Print help
-  -V, --version            Print version
 ```
 
 - To interact directly with end devices
@@ -73,4 +65,4 @@ Options:
   -p, --product-id <PID>                   Hexadecimal product id of this USB device
   -k, --private-key <PATH_TO_PRIVATE_KEY>  Path to a custom private key to use for authentication
   -h, --help                               Print help
-```
+```

adb_cli/src/adb_termios.rs

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

adb_cli/src/commands/emu.rs

@@ -1,12 +0,0 @@
-use clap::Parser;
-
-#[derive(Parser, Debug)]
-pub enum EmuCommand {
-    /// Send a SMS with given phone number and given content
-    Sms {
-        phone_number: String,
-        content: String,
-    },
-    /// Rotate device screen from 90°
-    Rotate,
-}

adb_cli/src/commands/local.rs

@@ -1,46 +0,0 @@
-use clap::Parser;
-use std::path::PathBuf;
-
-use crate::models::RebootTypeCommand;
-
-#[derive(Parser, Debug)]
-pub enum LocalCommand {
-    /// List available server features.
-    HostFeatures,
-    /// Push a file on device
-    Push { filename: String, path: String },
-    /// Pull a file from device
-    Pull { path: String, filename: String },
-    /// List a directory on device
-    List { path: String },
-    /// Stat a file specified on device
-    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)]
-        reboot_type: RebootTypeCommand,
-    },
-    /// Dump framebuffer of device
-    Framebuffer { path: String },
-    /// Get logs of device
-    Logcat {
-        /// 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,11 +0,0 @@
-mod emu;
-mod host;
-mod local;
-mod tcp;
-mod usb;
-
-pub use emu::EmuCommand;
-pub use host::{HostCommand, MdnsCommand};
-pub use local::LocalCommand;
-pub use tcp::{TcpCommand, TcpCommands};
-pub use usb::{UsbCommand, UsbCommands};

adb_cli/src/commands/usb.rs

@@ -1,56 +0,0 @@
-use std::num::ParseIntError;
-use std::path::PathBuf;
-
-use clap::Parser;
-
-use crate::models::RebootTypeCommand;
-
-fn parse_hex_id(id: &str) -> Result<u16, ParseIntError> {
-    u16::from_str_radix(id, 16)
-}
-
-#[derive(Parser, Debug)]
-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: 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: 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>,
-    #[clap(subcommand)]
-    pub commands: UsbCommands,
-}
-
-#[derive(Parser, Debug)]
-pub enum UsbCommands {
-    /// 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/handlers/emulator_commands.rs

@@ -0,0 +1,20 @@
+use adb_client::emulator::ADBEmulatorDevice;
+
+use crate::models::{EmuCommand, EmulatorCommand};
+
+pub fn handle_emulator_commands(emulator_command: EmulatorCommand) -> anyhow::Result<()> {
+    let mut emulator = ADBEmulatorDevice::new(emulator_command.serial, None)?;
+
+    match emulator_command.command {
+        EmuCommand::Sms {
+            phone_number,
+            content,
+        } => {
+            emulator.send_sms(&phone_number, &content)?;
+            log::info!("SMS sent to {phone_number}");
+        }
+        EmuCommand::Rotate => emulator.rotate()?,
+    }
+
+    Ok(())
+}

adb_cli/src/handlers/host_commands.rs

@@ -0,0 +1,88 @@
+use adb_client::{
+    Result,
+    server::{ADBServer, DeviceShort, MDNSBackend, WaitForDeviceState},
+};
+
+use crate::models::{HostCommand, MdnsCommand, ServerCommand};
+
+pub fn handle_host_commands(server_command: ServerCommand<HostCommand>) -> Result<()> {
+    let mut adb_server = ADBServer::new(server_command.address);
+
+    match server_command.command {
+        HostCommand::Version => {
+            let version = adb_server.version()?;
+            log::info!("Android Debug Bridge version {version}");
+            log::info!("Package version {}-rust", std::env!("CARGO_PKG_VERSION"));
+        }
+        HostCommand::Kill => {
+            adb_server.kill()?;
+        }
+        HostCommand::Devices { long } => {
+            if long {
+                log::info!("List of devices attached (extended)");
+                for device in adb_server.devices_long()? {
+                    log::info!("{device}");
+                }
+            } else {
+                log::info!("List of devices attached");
+                for device in adb_server.devices()? {
+                    log::info!("{device}");
+                }
+            }
+        }
+        HostCommand::TrackDevices => {
+            let callback = |device: DeviceShort| {
+                log::info!("{device}");
+                Ok(())
+            };
+            log::info!("Live list of devices attached");
+            adb_server.track_devices(callback)?;
+        }
+        HostCommand::Pair { address, code } => {
+            adb_server.pair(address, code)?;
+            log::info!("Paired device {address}");
+        }
+        HostCommand::Connect { address } => {
+            adb_server.connect_device(address)?;
+            log::info!("Connected to {address}");
+        }
+        HostCommand::Disconnect { address } => {
+            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 => {
+                        if check {
+                            log::info!("mdns daemon version [Bonjour]");
+                        } else {
+                            log::info!("ERROR: mdns daemon unavailable");
+                        }
+                    }
+                    MDNSBackend::OpenScreen => {
+                        log::info!("mdns daemon version [Openscreen discovery 0.0.0]");
+                    }
+                }
+            }
+            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()?);
+        }
+        HostCommand::WaitForDevice { transport } => {
+            log::info!("waiting for device to be connected...");
+            adb_server.wait_for_device(WaitForDeviceState::Device, transport)?;
+        }
+    }
+
+    Ok(())
+}

adb_cli/src/handlers/local_commands.rs

@@ -0,0 +1,35 @@
+use std::{fs::File, io::Write};
+
+use adb_client::server_device::ADBServerDevice;
+use anyhow::{Result, anyhow};
+
+use crate::models::LocalDeviceCommand;
+
+pub fn handle_local_commands(
+    mut device: ADBServerDevice,
+    local_device_commands: LocalDeviceCommand,
+) -> Result<()> {
+    match local_device_commands {
+        LocalDeviceCommand::HostFeatures => {
+            let features = device
+                .host_features()?
+                .iter()
+                .map(ToString::to_string)
+                .reduce(|a, b| format!("{a},{b}"))
+                .ok_or(anyhow!("cannot list features"))?;
+            log::info!("Available host features: {features}");
+
+            Ok(())
+        }
+        LocalDeviceCommand::List { path } => Ok(device.list(path)?),
+        LocalDeviceCommand::Logcat { path } => {
+            let writer: Box<dyn Write> = if let Some(path) = path {
+                let f = File::create(path)?;
+                Box::new(f)
+            } else {
+                Box::new(std::io::stdout())
+            };
+            Ok(device.get_logs(writer)?)
+        }
+    }
+}

adb_cli/src/handlers/mod.rs

@@ -0,0 +1,7 @@
+mod emulator_commands;
+mod host_commands;
+mod local_commands;
+
+pub use emulator_commands::handle_emulator_commands;
+pub use host_commands::handle_host_commands;
+pub use local_commands::handle_local_commands;

adb_cli/src/main.rs

@@ -3,334 +3,92 @@
 #[cfg(any(target_os = "linux", target_os = "macos"))]
 mod adb_termios;
 
-mod commands;
+mod handlers;
 mod models;
+mod utils;
 
-use adb_client::{
+use adb_client::ADBDeviceExt;
-    ADBDeviceExt, ADBEmulatorDevice, ADBServer, ADBTcpDevice, ADBUSBDevice, DeviceShort,
+use adb_client::mdns::MDNSDiscoveryService;
-    MDNSBackend, MDNSDiscoveryService,
+use adb_client::server::ADBServer;
-};
+use adb_client::server_device::ADBServerDevice;
-use anyhow::{anyhow, Result};
+use adb_client::tcp::ADBTcpDevice;
+use adb_client::usb::ADBRusbDevice;
+
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+use adb_termios::ADBTermios;
+
+use anyhow::Result;
 use clap::Parser;
-use commands::{EmuCommand, HostCommand, LocalCommand, MdnsCommand, TcpCommands, UsbCommands};
+use handlers::{handle_emulator_commands, handle_host_commands, handle_local_commands};
-use models::{Command, Opts};
+use models::{DeviceCommands, LocalCommand, MainCommand, Opts};
+use std::collections::HashMap;
 use std::fs::File;
 use std::io::Write;
 use std::path::Path;
+use utils::setup_logger;
 
 fn main() -> Result<()> {
+    // This depends on `clap`
     let opts = Opts::parse();
 
-    // RUST_LOG variable has more priority then "--debug" flag
+    // SAFETY:
-    if std::env::var("RUST_LOG").is_err() {
+    // We are assuming the entire process is single-threaded
-        let level = match opts.debug {
+    // at this point.
-            true => "trace",
+    // This seems true for the current version of `clap`,
-            false => "info",
+    // but there's no guarantee for future updates
-        };
+    unsafe { setup_logger(opts.debug) };
 
-        std::env::set_var("RUST_LOG", level);
+    // Directly handling methods / commands that aren't linked to [`ADBDeviceExt`] trait.
-    }
+    // Other methods just have to create a concrete [`ADBDeviceExt`] instance, and return it.
+    // This instance will then be used to execute desired command.
+    let (mut device, commands) = match opts.command {
+        MainCommand::Host(server_command) => return Ok(handle_host_commands(server_command)?),
+        MainCommand::Emu(emulator_command) => return handle_emulator_commands(emulator_command),
+        MainCommand::Local(server_command) => {
+            // Must start server to communicate with device, but only if this is a local one.
+            let server_address_ip = server_command.address.ip();
+            if server_address_ip.is_loopback() || server_address_ip.is_unspecified() {
+                ADBServer::start(&HashMap::default(), &None);
+            }
 
-    // Setting default log level as "info" if not set
+            let device = match server_command.serial {
-    if std::env::var("RUST_LOG").is_err() {
+                Some(serial) => ADBServerDevice::new(serial, Some(server_command.address)),
-        std::env::set_var("RUST_LOG", "info");
+                None => ADBServerDevice::autodetect(Some(server_command.address)),
-    }
-    env_logger::init();
-
-    match opts.command {
-        Command::Local(local) => {
-            let mut adb_server = ADBServer::new(opts.address);
-
-            let mut device = match opts.serial {
-                Some(serial) => adb_server.get_device_by_name(&serial)?,
-                None => adb_server.get_device()?,
             };
 
-            match local {
+            match server_command.command {
-                LocalCommand::Pull { path, filename } => {
+                LocalCommand::DeviceCommands(device_commands) => (device.boxed(), device_commands),
-                    let mut output = File::create(Path::new(&filename))?;
+                LocalCommand::LocalDeviceCommand(local_device_command) => {
-                    device.pull(&path, &mut output)?;
+                    return handle_local_commands(device, local_device_command);
-                    log::info!("Downloaded {path} as {filename}");
-                }
-                LocalCommand::Push { filename, path } => {
-                    let mut input = File::open(Path::new(&filename))?;
-                    device.push(&mut input, &path)?;
-                    log::info!("Uploaded {filename} to {path}");
-                }
-                LocalCommand::List { path } => {
-                    device.list(path)?;
-                }
-                LocalCommand::Stat { path } => {
-                    let stat_response = device.stat(path)?;
-                    println!("{}", stat_response);
-                }
-                LocalCommand::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())?;
-                    }
-                }
-                LocalCommand::Run { package, activity } => {
-                    let output = device.run_activity(&package, &activity)?;
-                    std::io::stdout().write_all(&output)?;
-                }
-                LocalCommand::HostFeatures => {
-                    let features = device
-                        .host_features()?
-                        .iter()
-                        .map(|v| v.to_string())
-                        .reduce(|a, b| format!("{a},{b}"))
-                        .ok_or(anyhow!("cannot list features"))?;
-                    log::info!("Available host features: {features}");
-                }
-                LocalCommand::Reboot { reboot_type } => {
-                    log::info!("Reboots device in mode {:?}", reboot_type);
-                    device.reboot(reboot_type.into())?
-                }
-                LocalCommand::Framebuffer { path } => {
-                    device.framebuffer(&path)?;
-                    log::info!("Framebuffer dropped: {path}");
-                }
-                LocalCommand::Logcat { path } => {
-                    let writer: Box<dyn Write> = if let Some(path) = path {
-                        let f = File::create(path)?;
-                        Box::new(f)
-                    } else {
-                        Box::new(std::io::stdout())
-                    };
-                    device.get_logs(writer)?;
-                }
-                LocalCommand::Install { path } => {
-                    log::info!("Starting installation of APK {}...", path.display());
-                    device.install(path)?;
                 }
             }
         }
-        Command::Host(host) => {
+        MainCommand::Usb(usb_command) => {
-            let mut adb_server = ADBServer::new(opts.address);
+            let device = match (usb_command.vendor_id, usb_command.product_id) {
-
+                (Some(vid), Some(pid)) => match usb_command.path_to_private_key {
-            match host {
+                    Some(pk) => ADBRusbDevice::new_with_custom_private_key(vid, pid, pk)?,
-                HostCommand::Version => {
+                    None => ADBRusbDevice::new(vid, pid)?,
-                    let version = adb_server.version()?;
-                    log::info!("Android Debug Bridge version {}", version);
-                    log::info!("Package version {}-rust", std::env!("CARGO_PKG_VERSION"));
-                }
-                HostCommand::Kill => {
-                    adb_server.kill()?;
-                }
-                HostCommand::Devices { long } => {
-                    if long {
-                        log::info!("List of devices attached (extended)");
-                        for device in adb_server.devices_long()? {
-                            log::info!("{}", device);
-                        }
-                    } else {
-                        log::info!("List of devices attached");
-                        for device in adb_server.devices()? {
-                            log::info!("{}", device);
-                        }
-                    }
-                }
-                HostCommand::TrackDevices => {
-                    let callback = |device: DeviceShort| {
-                        log::info!("{}", device);
-                        Ok(())
-                    };
-                    log::info!("Live list of devices attached");
-                    adb_server.track_devices(callback)?;
-                }
-                HostCommand::Pair { address, code } => {
-                    adb_server.pair(address, code)?;
-                    log::info!("Paired device {address}");
-                }
-                HostCommand::Connect { address } => {
-                    adb_server.connect_device(address)?;
-                    log::info!("Connected to {address}");
-                }
-                HostCommand::Disconnect { address } => {
-                    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 => {
+                (None, None) => match usb_command.path_to_private_key {
-                    log::info!("{}", adb_server.server_status()?);
+                    Some(pk) => ADBRusbDevice::autodetect_with_custom_private_key(pk)?,
-                }
+                    None => ADBRusbDevice::autodetect()?,
-            }
-        }
-        Command::Emu(emu) => {
-            let mut emulator = match opts.serial {
-                Some(serial) => ADBEmulatorDevice::new(serial, None)?,
-                None => return Err(anyhow!("Serial must be set to use emulators !")),
-            };
-
-            match emu {
-                EmuCommand::Sms {
-                    phone_number,
-                    content,
-                } => {
-                    emulator.send_sms(&phone_number, &content)?;
-                    log::info!("SMS sent to {phone_number}");
-                }
-                EmuCommand::Rotate => emulator.rotate()?,
-            }
-        }
-        Command::Usb(usb) => {
-            let mut device = match (usb.vendor_id, usb.product_id) {
-                (Some(vid), Some(pid)) => match usb.path_to_private_key {
-                    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.");
+                    anyhow::bail!(
+                        "please either supply values for both the --vendor-id and --product-id flags or none."
+                    );
                 }
             };
-
+            (device.boxed(), usb_command.commands)
-            match usb.commands {
-                UsbCommands::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())?;
-                    }
-                }
-                UsbCommands::Pull {
-                    source,
-                    destination,
-                } => {
-                    let mut output = File::create(Path::new(&destination))?;
-                    device.pull(&source, &mut output)?;
-                    log::info!("Downloaded {source} as {destination}");
-                }
-                UsbCommands::Stat { path } => {
-                    let stat_response = device.stat(&path)?;
-                    println!("{}", stat_response);
-                }
-                UsbCommands::Reboot { reboot_type } => {
-                    log::info!("Reboots device in mode {:?}", reboot_type);
-                    device.reboot(reboot_type.into())?
-                }
-                UsbCommands::Push { filename, path } => {
-                    let mut input = File::open(Path::new(&filename))?;
-                    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) => {
+        MainCommand::Tcp(tcp_command) => {
-            let mut device = ADBTcpDevice::new(tcp.address)?;
+            let device = match tcp_command.path_to_private_key {
-
+                Some(pk) => ADBTcpDevice::new_with_custom_private_key(tcp_command.address, pk)?,
-            match tcp.commands {
+                None => ADBTcpDevice::new(tcp_command.address)?,
-                TcpCommands::Shell { commands } => {
+            };
-                    if commands.is_empty() {
+            (device.boxed(), tcp_command.commands)
-                        // 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 => {
+        MainCommand::Mdns => {
             let mut service = MDNSDiscoveryService::new()?;
 
             let (tx, rx) = std::sync::mpsc::channel();
@@ -342,10 +100,70 @@ fn main() -> Result<()> {
                     "Found device {} with addresses {:?}",
                     device.fullname,
                     device.addresses
-                )
+                );
             }
 
-            service.shutdown()?;
+            return Ok(service.shutdown()?);
+        }
+    };
+
+    match commands {
+        DeviceCommands::Shell { commands } => {
+            if commands.is_empty() {
+                // Need to duplicate some code here as ADBTermios [Drop] implementation resets terminal state.
+                // Using a scope here would call drop() too early..
+                #[cfg(any(target_os = "linux", target_os = "macos"))]
+                {
+                    let mut adb_termios = ADBTermios::new(&std::io::stdin())?;
+                    adb_termios.set_adb_termios()?;
+                    device.shell(&mut std::io::stdin(), Box::new(std::io::stdout()))?;
+                }
+
+                #[cfg(not(any(target_os = "linux", target_os = "macos")))]
+                {
+                    device.shell(&mut std::io::stdin(), Box::new(std::io::stdout()))?;
+                }
+            } else {
+                let commands: Vec<&str> = commands.iter().map(String::as_str).collect();
+                device.shell_command(&commands, &mut std::io::stdout())?;
+            }
+        }
+        DeviceCommands::Pull {
+            source,
+            destination,
+        } => {
+            let mut output = File::create(Path::new(&destination))?;
+            device.pull(&source, &mut output)?;
+            log::info!("Downloaded {source} as {destination}");
+        }
+        DeviceCommands::Stat { path } => {
+            let stat_response = device.stat(&path)?;
+            println!("{stat_response}");
+        }
+        DeviceCommands::Reboot { reboot_type } => {
+            log::info!("Reboots device in mode {reboot_type:?}");
+            device.reboot(reboot_type.into())?;
+        }
+        DeviceCommands::Push { filename, path } => {
+            let mut input = File::open(Path::new(&filename))?;
+            device.push(&mut input, &path)?;
+            log::info!("Uploaded {filename} to {path}");
+        }
+        DeviceCommands::Run { package, activity } => {
+            let output = device.run_activity(&package, &activity)?;
+            std::io::stdout().write_all(&output)?;
+        }
+        DeviceCommands::Install { path } => {
+            log::info!("Starting installation of APK {}...", path.display());
+            device.install(&path)?;
+        }
+        DeviceCommands::Uninstall { package } => {
+            log::info!("Uninstalling the package {package}...");
+            device.uninstall(&package)?;
+        }
+        DeviceCommands::Framebuffer { path } => {
+            device.framebuffer(&path)?;
+            log::info!("Successfully dumped framebuffer at path {path}");
         }
     }
 

adb_cli/src/models/device.rs

@@ -1,19 +1,11 @@
-use std::net::SocketAddr;
 use std::path::PathBuf;
 
 use clap::Parser;
 
-use crate::models::RebootTypeCommand;
+use super::RebootTypeCommand;
 
 #[derive(Parser, Debug)]
-pub struct TcpCommand {
+pub enum DeviceCommands {
-    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
@@ -27,7 +19,7 @@ pub enum TcpCommands {
         /// The package whose activity is to be invoked
         #[clap(short = 'p', long = "package")]
         package: String,
-        /// The activity to be invoked itself, Usually it is MainActivity
+        /// The activity to be invoked itself, Usually it is `MainActivity`
         #[clap(short = 'a', long = "activity")]
         activity: String,
     },
@@ -41,4 +33,14 @@ pub enum TcpCommands {
         /// Path to APK file. Extension must be ".apk"
         path: PathBuf,
     },
+    /// Uninstall a package from the device
+    Uninstall {
+        /// Name of the package to uninstall
+        package: String,
+    },
+    /// Dump framebuffer of device
+    Framebuffer {
+        /// Framebuffer image destination path
+        path: String,
+    },
 }

adb_cli/src/models/emu.rs

@@ -0,0 +1,20 @@
+use clap::{Parser, Subcommand};
+
+#[derive(Debug, Parser)]
+pub struct EmulatorCommand {
+    #[clap(short = 's', long = "serial")]
+    pub serial: String,
+    #[clap(subcommand)]
+    pub command: EmuCommand,
+}
+
+#[derive(Debug, Subcommand)]
+pub enum EmuCommand {
+    /// Send a SMS with given phone number and given content
+    Sms {
+        phone_number: String,
+        content: String,
+    },
+    /// Rotate device screen from 90°
+    Rotate,
+}

adb_cli/src/models/host.rs

@@ -1,7 +1,14 @@
 use std::net::SocketAddrV4;
 
+use adb_client::{RustADBError, server::WaitForDeviceTransport};
 use clap::Parser;
 
+fn parse_wait_for_device_device_transport(
+    value: &str,
+) -> Result<WaitForDeviceTransport, RustADBError> {
+    WaitForDeviceTransport::try_from(value)
+}
+
 #[derive(Parser, Debug)]
 pub enum HostCommand {
     /// Print current ADB version.
@@ -28,6 +35,12 @@ pub enum HostCommand {
     },
     /// Display server status
     ServerStatus,
+    /// Wait for a device, on optionally given transport
+    WaitForDevice {
+        /// Transport on which wait for devices
+        #[clap(short = 't', long = "transport", value_parser = parse_wait_for_device_device_transport)]
+        transport: Option<WaitForDeviceTransport>,
+    },
 }
 
 #[derive(Parser, Debug)]

adb_cli/src/models/local.rs

@@ -0,0 +1,24 @@
+use clap::Parser;
+
+use super::DeviceCommands;
+
+#[derive(Parser, Debug)]
+pub enum LocalCommand {
+    #[clap(flatten)]
+    DeviceCommands(DeviceCommands),
+    #[clap(flatten)]
+    LocalDeviceCommand(LocalDeviceCommand),
+}
+
+#[derive(Parser, Debug)]
+pub enum LocalDeviceCommand {
+    /// List available server features.
+    HostFeatures,
+    /// List a directory on device
+    List { path: String },
+    /// Get logs of device
+    Logcat {
+        /// Path to output file (created if not exists)
+        path: Option<String>,
+    },
+}

adb_cli/src/models/mod.rs

@@ -1,5 +1,17 @@
+mod device;
+mod emu;
+mod host;
+mod local;
 mod opts;
 mod reboot_type;
+mod tcp;
+mod usb;
 
-pub use opts::{Command, Opts};
+pub use device::DeviceCommands;
+pub use emu::{EmuCommand, EmulatorCommand};
+pub use host::{HostCommand, MdnsCommand};
+pub use local::{LocalCommand, LocalDeviceCommand};
+pub use opts::{MainCommand, Opts, ServerCommand};
 pub use reboot_type::RebootTypeCommand;
+pub use tcp::TcpCommand;
+pub use usb::UsbCommand;

adb_cli/src/models/opts.rs

@@ -1,36 +1,41 @@
 use std::net::SocketAddrV4;
 
-use clap::Parser;
+use clap::{Parser, Subcommand};
 
-use crate::commands::{EmuCommand, HostCommand, LocalCommand, TcpCommand, UsbCommand};
+use super::{EmulatorCommand, HostCommand, LocalCommand, TcpCommand, UsbCommand};
 
-#[derive(Parser, Debug)]
+#[derive(Debug, Parser)]
 #[clap(about, version, author)]
 pub struct Opts {
     #[clap(long = "debug")]
     pub debug: bool,
+    #[clap(subcommand)]
+    pub command: MainCommand,
+}
+
+#[derive(Debug, Parser)]
+pub enum MainCommand {
+    /// Server related commands
+    Host(ServerCommand<HostCommand>),
+    /// Device related commands using server
+    Local(ServerCommand<LocalCommand>),
+    /// Emulator related commands
+    Emu(EmulatorCommand),
+    /// USB device related commands
+    Usb(UsbCommand),
+    /// TCP device related commands
+    Tcp(TcpCommand),
+    /// MDNS discovery related commands
+    Mdns,
+}
+
+#[derive(Debug, Parser)]
+pub struct ServerCommand<T: Subcommand> {
     #[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.
     #[clap(short = 's', long = "serial")]
     pub serial: Option<String>,
     #[clap(subcommand)]
-    pub command: Command,
+    pub command: T,
-}
-
-#[derive(Parser, Debug)]
-pub enum Command {
-    #[clap(flatten)]
-    Local(LocalCommand),
-    #[clap(flatten)]
-    Host(HostCommand),
-    /// Emulator specific commands
-    #[clap(subcommand)]
-    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_cli/src/models/reboot_type.rs

@@ -8,6 +8,7 @@ pub enum RebootTypeCommand {
     Recovery,
     Sideload,
     SideloadAutoReboot,
+    Fastboot,
 }
 
 impl From<RebootTypeCommand> for RebootType {
@@ -18,6 +19,7 @@ impl From<RebootTypeCommand> for RebootType {
             RebootTypeCommand::Recovery => RebootType::Recovery,
             RebootTypeCommand::Sideload => RebootType::Sideload,
             RebootTypeCommand::SideloadAutoReboot => RebootType::SideloadAutoReboot,
+            RebootTypeCommand::Fastboot => RebootType::Fastboot,
         }
     }
 }

adb_cli/src/models/tcp.rs

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

adb_cli/src/models/usb.rs

@@ -0,0 +1,25 @@
+use std::num::ParseIntError;
+use std::path::PathBuf;
+
+use clap::Parser;
+
+use super::DeviceCommands;
+
+fn parse_hex_id(id: &str) -> Result<u16, ParseIntError> {
+    u16::from_str_radix(id, 16)
+}
+
+#[derive(Parser, Debug)]
+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: 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: 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>,
+    #[clap(subcommand)]
+    pub commands: DeviceCommands,
+}

adb_cli/src/utils.rs

@@ -0,0 +1,14 @@
+/// # Safety
+///
+/// This conditionally mutates the process' environment.
+/// See [`std::env::set_var`] for more info.
+pub unsafe fn setup_logger(debug: bool) {
+    // RUST_LOG variable has more priority then "--debug" flag
+    if std::env::var("RUST_LOG").is_err() {
+        let level = if debug { "trace" } else { "info" };
+
+        unsafe { std::env::set_var("RUST_LOG", level) };
+    }
+
+    env_logger::init();
+}

adb_client/Cargo.toml

@@ -7,36 +7,63 @@ license.workspace = true
 name = "adb_client"
 readme = "README.md"
 repository.workspace = true
+rust-version.workspace = true
 version.workspace = true
 
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[features]
+default = []
+mdns = ["dep:mdns-sd"]
+rusb = ["dep:rsa", "dep:rusb"]
+webusb = ["dep:webusb-web", "dep:rsa"]
+
 [dependencies]
 base64 = { version = "0.22.1" }
-bincode = { version = "1.3.3" }
+bincode = { version = "2.0.1", features = ["serde"] }
 byteorder = { version = "1.5.0" }
-chrono = { version = "0.4.38" }
+chrono = { version = "0.4.42", default-features = false, features = ["std"] }
-homedir = { version = "0.3.4" }
+image = { version = "0.25.8", default-features = false }
-image = { version = "0.25.5" }
+log = { version = "0.4.28" }
-lazy_static = { version = "1.5.0" }
-log = { version = "0.4.22" }
-mdns-sd = { version = "0.12.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" }
+rcgen = { version = "0.13.2", default-features = false, features = [
-regex = { version = "1.11.0", features = ["perf", "std", "unicode"] }
+    "pem",
-rsa = { version = "0.9.7" }
+    "ring"
-rusb = { version = "0.9.4", features = ["vendored"] }
+] }
-rustls = { version = "0.23.18" }
+regex = { version = "1.12.2", features = ["perf", "std", "unicode"] }
-rustls-pki-types = "1.10.0"
+rustls = { version = "0.23.33", default-features = false, features = ["logging", "ring", "std", "tls12"] }
-serde = { version = "1.0.210", features = ["derive"] }
+rustls-pki-types = { version = "1.12.0", features = ["web"] }
-serde_repr = { version = "0.1.19" }
+serde = { version = "1.0.228", features = ["derive"] }
+serde_repr = { version = "0.1.20" }
 sha1 = { version = "0.10.6", features = ["oid"] }
-thiserror = { version = "2.0.1" }
+thiserror = { version = "2.0.17" }
+
+#########
+# MDNS dependencies
+mdns-sd = { version = "0.17.0", default-features = false, features = [
+    "logging",
+], optional = true }
+#########
+#########
+# USB-only dependencies
+rsa = { version = "0.9.7", optional = true }
+rusb = { version = "0.9.4", features = ["vendored"], optional = true }
+#########
+#########
+# webusb dependencies
+webusb-web = { version = "0.4.1", optional = true }
+getrandom = { version = "0.2.16", features = ["js"], optional = true }
+ring = { version = "0.17.14", features = ["wasm32_unknown_unknown_js"], optional = true }
+
 
 [dev-dependencies]
-anyhow = { version = "1.0.93" }
+anyhow = { version = "1.0.100" }
-criterion = { version = "0.5.1" } # Used for benchmarks
+criterion = { version = "0.7.0" } # Used for benchmarks
 
 [[bench]]
 harness = false

adb_client/README.md

@@ -2,7 +2,8 @@
 
 [![MIT licensed](https://img.shields.io/crates/l/adb_client.svg)](./LICENSE-MIT)
 [![Documentation](https://docs.rs/adb_client/badge.svg)](https://docs.rs/adb_client)
-![Crates.io Total Downloads](https://img.shields.io/crates/d/adb_client)
+[![Crates.io Total Downloads](https://img.shields.io/crates/d/adb_client)](https://crates.io/crates/adb_client)
+![MSRV](https://img.shields.io/crates/msrv/adb_client)
 
 Rust library implementing ADB protocol.
 
@@ -15,83 +16,36 @@ Add `adb_client` crate as a dependency by simply adding it to your `Cargo.toml`:
 adb_client = "*"
 ```
 
+## Crate features
+
+| Feature |                   Description                   | Default? |
+| :-----: | :---------------------------------------------: | :------: |
+| `mdns`  | Enables mDNS device discovery on local network. |    No    |
+| `rusb`  |     Enables interactions with USB devices.      |    No    |
+
+To deactivate some features you can use the `default-features = false` option in your `Cargo.toml` file and manually specify the features you want to activate:
+
+```toml
+[dependencies]
+adb_client = { version = "*" }
+```
+
 ## Examples
 
-### Get available ADB devices
+Usage examples can be found in the `examples/` directory of this repository.
 
-```rust no_run
+Some example are also provided in the various `README.md` files of modules.
-use adb_client::ADBServer;
-use std::net::{SocketAddrV4, Ipv4Addr};
 
-// A custom server address can be provided
+## Benchmarks
-let server_ip = Ipv4Addr::new(127, 0, 0, 1);
-let server_port = 5037;
 
-let mut server = ADBServer::new(SocketAddrV4::new(server_ip, server_port));
+Benchmarks run on `v2.0.6`, on a **Samsung S10 SM-G973F** device and an **Intel i7-1265U** CPU laptop
-server.devices();
-```
 
-### Using ADB server as bridge
+### `ADBServerDevice` push vs `adb push`
 
-#### Launch a command on device
+`ADBServerDevice` performs all operations by using adb server as a bridge.
 
-```rust no_run
+| File size | Sample size | `ADBServerDevice` |   `adb`   |               Difference               |
-use adb_client::{ADBServer, ADBDeviceExt};
+| :-------: | :---------: | :---------------: | :-------: | :------------------------------------: |
-
+|   10 MB   |     100     |     350,79 ms     | 356,30 ms | <div style="color:green">-1,57 %</div> |
-let mut server = ADBServer::default();
+|  500 MB   |     50      |      15,60 s      |  15,64 s  | <div style="color:green">-0,25 %</div> |
-let mut device = server.get_device().expect("cannot get device");
+|   1 GB    |     20      |      31,09 s      |  31,12 s  | <div style="color:green">-0,10 %</div> |
-device.shell_command(["df", "-h"],std::io::stdout());
-```
-
-#### Push a file to the device
-
-```rust no_run
-use adb_client::ADBServer;
-use std::net::Ipv4Addr;
-use std::fs::File;
-use std::path::Path;
-
-let mut server = ADBServer::default();
-let mut device = server.get_device().expect("cannot get device");
-let mut input = File::open(Path::new("/tmp/f")).expect("Cannot open file");
-device.push(&mut input, "/data/local/tmp");
-```
-
-### Interact directly with end devices
-
-#### (USB) Launch a command on device
-
-```rust no_run
-use adb_client::{ADBUSBDevice, ADBDeviceExt};
-
-let vendor_id = 0x04e8;
-let product_id = 0x6860;
-let mut device = ADBUSBDevice::new(vendor_id, product_id).expect("cannot find device");
-device.shell_command(["df", "-h"],std::io::stdout());
-```
-
-#### (USB) Push a file to the device
-
-```rust no_run
-use adb_client::{ADBUSBDevice, ADBDeviceExt};
-use std::fs::File;
-use std::path::Path;
-
-let vendor_id = 0x04e8;
-let product_id = 0x6860;
-let mut device = ADBUSBDevice::new(vendor_id, product_id).expect("cannot find device");
-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,31 +1,31 @@
-use std::io::{Read, Write};
+use std::io::{Cursor, Read, Write};
 use std::path::Path;
 
+use image::{ImageBuffer, ImageFormat, Rgba};
+
 use crate::models::AdbStatResponse;
 use crate::{RebootType, Result};
 
-/// Trait representing all features available on both [`crate::ADBServerDevice`] and [`crate::ADBUSBDevice`]
+/// Trait representing all features available on an ADB device, currently used by:
+/// - [`crate::server_device::ADBServerDevice`]
+/// - [`crate::usb::ADBRusbDevice`]
+/// - [`crate::tcp::ADBTcpDevice`]
 pub trait ADBDeviceExt {
     /// Runs command in a shell on the device, and write its output and error streams into output.
-    fn shell_command<S: ToString, W: Write>(
+    fn shell_command(&mut self, command: &[&str], output: &mut dyn Write) -> Result<()>;
-        &mut self,
-        command: impl IntoIterator<Item = S>,
-        output: W,
-    ) -> Result<()>;
 
     /// 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.
+    fn shell(&mut self, reader: &mut dyn Read, writer: Box<dyn Write + Send>) -> Result<()>;
-    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`
-    fn pull<A: AsRef<str>, W: Write>(&mut self, source: A, output: W) -> Result<()>;
+    fn pull(&mut self, source: &dyn AsRef<str>, output: &mut dyn Write) -> Result<()>;
 
     /// Push `stream` to `path` on the device.
-    fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()>;
+    fn push(&mut self, stream: &mut dyn Read, path: &dyn AsRef<str>) -> Result<()>;
 
     /// Reboot the device using given reboot type
     fn reboot(&mut self, reboot_type: RebootType) -> Result<()>;
@@ -34,7 +34,7 @@ pub trait ADBDeviceExt {
     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}")],
+            &["am", "start", &format!("{package}/{package}.{activity}")],
             &mut output,
         )?;
 
@@ -42,5 +42,38 @@ pub trait ADBDeviceExt {
     }
 
     /// Install an APK pointed to by `apk_path` on device.
-    fn install<P: AsRef<Path>>(&mut self, apk_path: P) -> Result<()>;
+    fn install(&mut self, apk_path: &dyn AsRef<Path>) -> Result<()>;
+
+    /// Uninstall the package `package` from device.
+    fn uninstall(&mut self, package: &str) -> Result<()>;
+
+    /// Inner method requesting framebuffer from an Android device
+    fn framebuffer_inner(&mut self) -> Result<ImageBuffer<Rgba<u8>, Vec<u8>>>;
+
+    /// Dump framebuffer of this device into given path
+    fn framebuffer(&mut self, path: &dyn AsRef<Path>) -> Result<()> {
+        // Big help from AOSP source code (<https://android.googlesource.com/platform/system/adb/+/refs/heads/main/framebuffer_service.cpp>)
+        let img = self.framebuffer_inner()?;
+        Ok(img.save(path.as_ref())?)
+    }
+
+    /// Dump framebuffer of this device and return corresponding bytes.
+    ///
+    /// Output data format is currently only `PNG`.
+    fn framebuffer_bytes(&mut self) -> Result<Vec<u8>> {
+        let img = self.framebuffer_inner()?;
+        let mut vec = Cursor::new(Vec::new());
+        img.write_to(&mut vec, ImageFormat::Png)?;
+
+        Ok(vec.into_inner())
+    }
+
+    /// Return a boxed instance representing this trait
+    fn boxed(self) -> Box<dyn ADBDeviceExt>
+    where
+        Self: Sized,
+        Self: 'static,
+    {
+        Box::new(self)
+    }
 }

adb_client/src/constants.rs

@@ -1 +0,0 @@
-pub const BUFFER_SIZE: usize = 65536;

adb_client/src/device/adb_message_device.rs

@@ -1,236 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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

@@ -1,112 +0,0 @@
-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_usb_device.rs

@@ -1,294 +0,0 @@
-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

@@ -1,59 +0,0 @@
-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/push.rs

@@ -1,35 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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/message_writer.rs

@@ -1,53 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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/mod.rs

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

adb_client/src/emulator/adb_emulator_device.rs

@@ -3,7 +3,10 @@ use std::{
     sync::LazyLock,
 };
 
-use crate::{ADBServerDevice, ADBTransport, Result, RustADBError, TCPEmulatorTransport};
+use crate::{
+    ADBTransport, Result, RustADBError, emulator::tcp_emulator_transport::TCPEmulatorTransport,
+    server_device::ADBServerDevice,
+};
 use regex::Regex;
 
 static EMULATOR_REGEX: LazyLock<Regex> = LazyLock::new(|| {
@@ -15,23 +18,22 @@ static EMULATOR_REGEX: LazyLock<Regex> = LazyLock::new(|| {
 pub struct ADBEmulatorDevice {
     /// Unique device identifier.
     pub identifier: String,
-    /// Internal [TCPEmulatorTransport]
+    /// Internal [`TCPEmulatorTransport`]
     transport: TCPEmulatorTransport,
 }
 
 impl ADBEmulatorDevice {
-    /// Instantiates a new [ADBEmulatorDevice]
+    /// Instantiates a new [`ADBEmulatorDevice`]
     pub fn new(identifier: String, ip_address: Option<Ipv4Addr>) -> Result<Self> {
         let ip_address = match ip_address {
             Some(ip_address) => ip_address,
-            None => Ipv4Addr::new(127, 0, 0, 1),
+            None => Ipv4Addr::LOCALHOST,
         };
 
         let groups = EMULATOR_REGEX
             .captures(&identifier)
             .ok_or(RustADBError::DeviceNotFound(format!(
-                "Device {} is likely not an emulator",
+                "Device {identifier} is likely not an emulator"
-                identifier
             )))?;
 
         let port = groups
@@ -65,10 +67,15 @@ impl TryFrom<ADBServerDevice> for ADBEmulatorDevice {
     type Error = RustADBError;
 
     fn try_from(value: ADBServerDevice) -> std::result::Result<Self, Self::Error> {
-        ADBEmulatorDevice::new(
+        match &value.identifier {
-            value.identifier.clone(),
+            Some(device_identifier) => ADBEmulatorDevice::new(
-            Some(*value.get_transport().get_socketaddr().ip()),
+                device_identifier.clone(),
-        )
+                Some(*value.transport.get_socketaddr().ip()),
+            ),
+            None => Err(RustADBError::DeviceNotFound(
+                "cannot connect to an emulator device without knowing its identifier".to_string(),
+            )),
+        }
     }
 }
 

adb_client/src/emulator/commands/rotate.rs

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

adb_client/src/emulator/commands/sms.rs

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

adb_client/src/emulator/mod.rs

@@ -1,3 +1,7 @@
 mod adb_emulator_device;
 mod commands;
+mod models;
+mod tcp_emulator_transport;
+
 pub use adb_emulator_device::ADBEmulatorDevice;
+use models::ADBEmulatorCommand;

adb_client/src/emulator/models/adb_emulator_command.rs

@@ -1,6 +1,6 @@
 use std::fmt::Display;
 
-pub(crate) enum ADBEmulatorCommand {
+pub enum ADBEmulatorCommand {
     Authenticate(String),
     Sms(String, String),
     Rotate,
@@ -24,8 +24,7 @@ impl ADBEmulatorCommand {
     pub(crate) fn skip_response_lines(&self) -> u8 {
         match self {
             ADBEmulatorCommand::Authenticate(_) => 1,
-            ADBEmulatorCommand::Sms(_, _) => 0,
+            ADBEmulatorCommand::Sms(_, _) | ADBEmulatorCommand::Rotate => 0,
-            ADBEmulatorCommand::Rotate => 0,
         }
     }
 }

adb_client/src/emulator/models/mod.rs

@@ -0,0 +1,2 @@
+mod adb_emulator_command;
+pub use adb_emulator_command::ADBEmulatorCommand;

adb_client/src/emulator/tcp_emulator_transport.rs

@@ -1,13 +1,12 @@
 use std::{
     fs::File,
-    io::{BufRead, BufReader, Read, Write},
+    io::{BufRead, BufReader, Error, ErrorKind, Read, Write},
     net::{SocketAddrV4, TcpStream},
 };
 
-use homedir::my_home;
+use crate::{
-
+    Result, RustADBError, adb_transport::ADBTransport, emulator::models::ADBEmulatorCommand,
-use super::ADBTransport;
+};
-use crate::{models::ADBEmulatorCommand, Result, RustADBError};
 
 /// Emulator transport running on top on TCP.
 #[derive(Debug)]
@@ -17,7 +16,7 @@ pub struct TCPEmulatorTransport {
 }
 
 impl TCPEmulatorTransport {
-    /// Instantiates a new instance of [TCPEmulatorTransport]
+    /// Instantiates a new instance of [`TCPEmulatorTransport`]
     pub fn new(socket_addr: SocketAddrV4) -> Self {
         Self {
             socket_addr,
@@ -28,17 +27,16 @@ impl TCPEmulatorTransport {
     pub(crate) fn get_raw_connection(&self) -> Result<&TcpStream> {
         self.tcp_stream
             .as_ref()
-            .ok_or(RustADBError::IOError(std::io::Error::new(
+            .ok_or(RustADBError::IOError(Error::new(
-                std::io::ErrorKind::NotConnected,
+                ErrorKind::NotConnected,
                 "not connected",
             )))
     }
 
-    /// Return authentication token stored in $HOME/.emulator_console_auth_token
+    /// Return authentication token stored in `$HOME/.emulator_console_auth_token`
     pub fn get_authentication_token(&mut self) -> Result<String> {
-        let home = match my_home()? {
+        let Some(home) = std::env::home_dir() else {
-            Some(home) => home,
+            return Err(RustADBError::NoHomeDirectory);
-            None => return Err(RustADBError::NoHomeDirectory),
         };
 
         let mut f = File::open(home.join(".emulator_console_auth_token"))?;
@@ -54,7 +52,7 @@ impl TCPEmulatorTransport {
         self.send_command(ADBEmulatorCommand::Authenticate(token))
     }
 
-    /// Send an [ADBEmulatorCommand] to this emulator
+    /// Send an [`ADBEmulatorCommand`] to this emulator
     pub(crate) fn send_command(&mut self, command: ADBEmulatorCommand) -> Result<()> {
         let mut connection = self.get_raw_connection()?;
 
@@ -80,10 +78,11 @@ impl TCPEmulatorTransport {
         let mut line = String::new();
         reader.read_line(&mut line)?;
 
-        match line.starts_with("OK") {
+        if line.starts_with("OK") {
-            true => Ok(()),
+            return Ok(());
-            false => Err(RustADBError::ADBRequestFailed(line)),
         }
+
+        Err(RustADBError::ADBRequestFailed(line))
     }
 }
 

adb_client/src/emulator_device/commands/rotate.rs

@@ -1,10 +0,0 @@
-use crate::{models::ADBEmulatorCommand, ADBEmulatorDevice, Result};
-
-impl ADBEmulatorDevice {
-    /// Send a SMS to this emulator with given content with given phone number
-    pub fn rotate(&mut self) -> Result<()> {
-        let transport = self.connect()?;
-        transport.send_command(ADBEmulatorCommand::Rotate)?;
-        Ok(())
-    }
-}

adb_client/src/error.rs

@@ -15,6 +15,9 @@ pub enum RustADBError {
     /// Indicates that ADB server responded an unknown response type.
     #[error("Unknown response type {0}")]
     UnknownResponseType(String),
+    /// Indicated that an unexpected command has been received
+    #[error("Wrong response command received: {0}. Expected {1}")]
+    WrongResponseReceived(String, String),
     /// Indicates that ADB server responses an unknown device state.
     #[error("Unknown device state {0}")]
     UnknownDeviceState(String),
@@ -39,6 +42,9 @@ pub enum RustADBError {
     /// Indicates that an error occurred when converting a value.
     #[error("Conversion error")]
     ConversionError,
+    /// Indicates an error with the integer conversion.
+    #[error(transparent)]
+    IntegerConversionError(#[from] std::num::TryFromIntError),
     /// Remote ADB server does not support shell feature.
     #[error("Remote ADB server does not support shell feature")]
     ADBShellNotSupported,
@@ -58,13 +64,15 @@ pub enum RustADBError {
     #[error("Unimplemented framebuffer image version: {0}")]
     UnimplementedFramebufferImageVersion(u32),
     /// An error occurred while getting user's home directory
-    #[error(transparent)]
+    #[error("Cannot get user home directory")]
-    HomeError(#[from] homedir::GetHomeError),
+    HomeError,
     /// Cannot get home directory
     #[error("Cannot get home directory")]
     NoHomeDirectory,
     /// Generic USB error
-    #[error(transparent)]
+    #[cfg(feature = "rusb")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "rusb")))]
+    #[error("USB Error: {0}")]
     UsbError(#[from] rusb::Error),
     /// USB device not found
     #[error("USB Device not found: {0} {1}")]
@@ -82,6 +90,8 @@ pub enum RustADBError {
     #[error(transparent)]
     Base64EncodeError(#[from] base64::EncodeSliceError),
     /// An error occurred with RSA engine
+    #[cfg(any(feature = "rusb", feature = "webusb"))]
+    #[cfg_attr(docsrs, doc(cfg(any(feature = "rusb", feature = "webusb"))))]
     #[error(transparent)]
     RSAError(#[from] rsa::errors::Error),
     /// Cannot convert given data from slice
@@ -91,6 +101,8 @@ pub enum RustADBError {
     #[error("wrong file extension: {0}")]
     WrongFileExtension(String),
     /// An error occurred with PKCS8 data
+    #[cfg(any(feature = "rusb", feature = "webusb"))]
+    #[cfg_attr(docsrs, doc(cfg(any(feature = "rusb", feature = "webusb"))))]
     #[error("error with pkcs8: {0}")]
     RsaPkcs8Error(#[from] rsa::pkcs8::Error),
     /// Error during certificate generation
@@ -109,11 +121,16 @@ pub enum RustADBError {
     #[error("upgrade error: {0}")]
     UpgradeError(String),
     /// An error occurred while getting mdns devices
+    #[cfg(feature = "mdns")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "mdns")))]
     #[error(transparent)]
     MDNSError(#[from] mdns_sd::Error),
     /// An error occurred while sending data to channel
-    #[error(transparent)]
+    #[error("error sending data to channel")]
-    SendError(#[from] std::sync::mpsc::SendError<crate::MDNSDevice>),
+    SendError,
+    /// An unknown transport has been provided
+    #[error("unknown transport: {0}")]
+    UnknownTransport(String),
 }
 
 impl<T> From<std::sync::PoisonError<T>> for RustADBError {

adb_client/src/lib.rs

@@ -3,27 +3,34 @@
 #![forbid(missing_debug_implementations)]
 #![forbid(missing_docs)]
 #![doc = include_str!("../README.md")]
+// Feature `doc_cfg` is currently only available on nightly.
+// It is activated when cfg `docsrs` is enabled.
+// Documentation can be build locally using:
+// `RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --no-deps --all-features`
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 mod adb_device_ext;
-mod constants;
+mod adb_transport;
-mod device;
+/// Emulator-related definitions
-mod emulator_device;
+pub mod emulator;
 mod error;
-mod mdns;
+mod message_devices;
 mod models;
-mod server;
+
-mod server_device;
+/// Server-related definitions
-mod transports;
+pub mod server;
+
+/// Device reachable by the server related definitions
+pub mod server_device;
 mod utils;
 
+/// MDNS-related definitions
+#[cfg(feature = "mdns")]
+#[cfg_attr(docsrs, doc(cfg(feature = "mdns")))]
+pub mod mdns;
+
 pub use adb_device_ext::ADBDeviceExt;
-pub use device::{ADBTcpDevice, ADBUSBDevice};
+use adb_transport::ADBTransport;
-pub use emulator_device::ADBEmulatorDevice;
 pub use error::{Result, RustADBError};
-pub use mdns::*;
+pub use message_devices::*;
-pub use models::{
+pub use models::{AdbStatResponse, HostFeatures, RebootType};
-    AdbStatResponse, AdbVersion, DeviceLong, DeviceShort, DeviceState, MDNSBackend, RebootType,
-};
-pub use server::*;
-pub use server_device::ADBServerDevice;
-pub use transports::*;

adb_client/src/mdns/mdns_device.rs

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

adb_client/src/mdns/mdns_discovery.rs

@@ -1,7 +1,7 @@
 use mdns_sd::{ServiceDaemon, ServiceEvent};
 use std::{sync::mpsc::Sender, thread::JoinHandle};
 
-use crate::{MDNSDevice, Result, RustADBError};
+use crate::{Result, RustADBError, mdns::MDNSDevice};
 
 const ADB_SERVICE_NAME: &str = "_adb-tls-connect._tcp.local.";
 
@@ -33,19 +33,23 @@ impl MDNSDiscoveryService {
     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 {
+        let handle: JoinHandle<Result<()>> = std::thread::spawn(move || {
-            while let Ok(event) = receiver.recv() {
+            loop {
-                match event {
+                while let Ok(event) = receiver.recv() {
-                    ServiceEvent::SearchStarted(_)
+                    match event {
-                    | ServiceEvent::ServiceRemoved(_, _)
+                        ServiceEvent::SearchStarted(_)
-                    | ServiceEvent::ServiceFound(_, _)
+                        | ServiceEvent::ServiceRemoved(_, _)
-                    | ServiceEvent::SearchStopped(_) => {
+                        | ServiceEvent::ServiceFound(_, _)
-                        // Ignoring these events. We are only interesting in found devices
+                        | ServiceEvent::SearchStopped(_) => {
-                        continue;
+                            // Ignoring these events. We are only interesting in found devices
-                    }
+                        }
-                    ServiceEvent::ServiceResolved(service_info) => {
+                        ServiceEvent::ServiceResolved(service_info) => {
-                        if let Err(e) = sender.send(MDNSDevice::from(service_info)) {
+                            return sender
-                            return Err(e.into());
+                                .send(MDNSDevice::from(service_info))
+                                .map_err(|_| RustADBError::SendError);
+                        }
+                        e => {
+                            log::warn!("received unknown event type {e:?}");
                         }
                     }
                 }

adb_client/src/message_devices/adb_message_device.rs

@@ -0,0 +1,318 @@
+use crate::message_devices::adb_message_transport::ADBMessageTransport;
+use crate::message_devices::adb_rsa_key::ADBRsaKey;
+use crate::message_devices::adb_transport_message::ADBTransportMessage;
+use crate::message_devices::message_commands::{MessageCommand, MessageSubcommand};
+use crate::message_devices::{AUTH_RSAPUBLICKEY, AUTH_SIGNATURE};
+use crate::{AUTH_TOKEN, AdbStatResponse, Result, RustADBError};
+use bincode::config::{Configuration, Fixint, LittleEndian, NoLimit};
+use byteorder::ReadBytesExt;
+use serde::Serialize;
+use serde::de::DeserializeOwned;
+use std::io::{Cursor, Read, Seek};
+use std::time::Duration;
+
+const BUFFER_SIZE: usize = 65535;
+
+const BINCODE_CONFIG: Configuration<LittleEndian, Fixint, NoLimit> = bincode::config::legacy();
+
+pub(crate) fn bincode_serialize_to_vec<E: Serialize>(val: E) -> Result<Vec<u8>> {
+    bincode::serde::encode_to_vec(val, BINCODE_CONFIG).map_err(|_e| RustADBError::ConversionError)
+}
+
+pub(crate) fn bincode_deserialize_from_slice<D: DeserializeOwned>(data: &[u8]) -> Result<D> {
+    let (response, _) = bincode::serde::decode_from_slice(data, BINCODE_CONFIG)
+        .map_err(|_e| RustADBError::ConversionError)?;
+
+    Ok(response)
+}
+
+/// Generic structure representing an ADB device reachable over an [`ADBMessageTransport`].
+/// Structure is totally agnostic over which transport is truly used.
+#[derive(Debug)]
+pub struct ADBMessageDevice<T: ADBMessageTransport> {
+    transport: T,
+    local_id: Option<u32>,
+    remote_id: Option<u32>,
+}
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    /// Instantiate a new [`ADBMessageTransport`]
+    pub fn new(transport: T) -> Self {
+        Self {
+            transport,
+            local_id: None,
+            remote_id: None,
+        }
+    }
+
+    pub(crate) fn get_transport(&mut self) -> &T {
+        &self.transport
+    }
+
+    pub(crate) fn get_transport_mut(&mut self) -> &mut T {
+        &mut self.transport
+    }
+
+    pub(crate) fn auth_handshake(
+        &mut self,
+        message: ADBTransportMessage,
+        private_key: &ADBRsaKey,
+    ) -> Result<()> {
+        match message.header().command() {
+            MessageCommand::Auth => {
+                log::debug!("Authentication required");
+            }
+            _ => return Ok(()),
+        }
+
+        // At this point, we should have received an AUTH message with arg0 == 1
+        let auth_message = match message.header().arg0() {
+            AUTH_TOKEN => message,
+            v => {
+                return Err(RustADBError::ADBRequestFailed(format!(
+                    "Received AUTH message with type != 1 ({v})"
+                )));
+            }
+        };
+
+        let sign = private_key.sign(auth_message.into_payload())?;
+
+        let message = ADBTransportMessage::new(MessageCommand::Auth, AUTH_SIGNATURE, 0, &sign);
+
+        self.get_transport_mut().write_message(message)?;
+
+        let received_response = self.get_transport_mut().read_message()?;
+
+        if received_response.header().command() == MessageCommand::Cnxn {
+            log::info!(
+                "Authentication OK, device info {}",
+                String::from_utf8(received_response.into_payload())?
+            );
+            return Ok(());
+        }
+
+        let mut pubkey = private_key.android_pubkey_encode()?.into_bytes();
+        pubkey.push(b'\0');
+
+        let message = ADBTransportMessage::new(MessageCommand::Auth, AUTH_RSAPUBLICKEY, 0, &pubkey);
+
+        self.get_transport_mut().write_message(message)?;
+
+        let response = self
+            .get_transport_mut()
+            .read_message_with_timeout(Duration::from_secs(10))
+            .and_then(|message| {
+                message.assert_command(MessageCommand::Cnxn)?;
+                Ok(message)
+            })?;
+
+        log::info!(
+            "Authentication OK, device info {}",
+            String::from_utf8(response.into_payload())?
+        );
+        Ok(())
+    }
+
+    /// Receive a message and acknowledge it by replying with an `OKAY` command
+    pub(crate) fn recv_and_reply_okay(&mut self) -> Result<ADBTransportMessage> {
+        let message = self.transport.read_message()?;
+        self.transport.write_message(ADBTransportMessage::new(
+            MessageCommand::Okay,
+            self.get_local_id()?,
+            self.get_remote_id()?,
+            &[],
+        ))?;
+        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)?;
+
+        self.transport.read_message().and_then(|message| {
+            message.assert_command(MessageCommand::Okay)?;
+            Ok(message)
+        })
+    }
+
+    pub(crate) fn recv_file<W: std::io::Write>(
+        &mut self,
+        mut output: W,
+    ) -> std::result::Result<(), RustADBError> {
+        let mut len: Option<u64> = None;
+        loop {
+            let payload = self.recv_and_reply_okay()?.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(u64::from(rdr.read_u32::<byteorder::LittleEndian>()?));
+                    }
+                    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::<byteorder::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 = vec![0; BUFFER_SIZE].into_boxed_slice();
+        let amount_read = reader.read(&mut buffer)?;
+        let subcommand_data = MessageSubcommand::Data.with_arg(u32::try_from(amount_read)?);
+
+        let mut serialized_message = bincode_serialize_to_vec(&subcommand_data)?;
+        serialized_message.append(&mut buffer[..amount_read].to_vec());
+
+        let message = ADBTransportMessage::new(
+            MessageCommand::Write,
+            local_id,
+            remote_id,
+            &serialized_message,
+        );
+
+        self.send_and_expect_okay(message)?;
+
+        loop {
+            let mut buffer = vec![0; BUFFER_SIZE].into_boxed_slice();
+
+            match reader.read(&mut buffer) {
+                Ok(0) => {
+                    // Currently file mtime is not forwarded
+                    let subcommand_data = MessageSubcommand::Done.with_arg(0);
+
+                    let serialized_message = bincode_serialize_to_vec(&subcommand_data)?;
+                    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(u32::try_from(size)?);
+
+                    let mut serialized_message = bincode_serialize_to_vec(&subcommand_data)?;
+                    serialized_message.append(&mut buffer[..size].to_vec());
+
+                    let message = ADBTransportMessage::new(
+                        MessageCommand::Write,
+                        local_id,
+                        remote_id,
+                        &serialized_message,
+                    );
+
+                    self.send_and_expect_okay(message)?;
+                }
+                Err(e) => {
+                    return Err(RustADBError::IOError(e));
+                }
+            }
+        }
+    }
+
+    pub(crate) fn begin_synchronization(&mut self) -> Result<()> {
+        self.open_session(b"sync:\0")?;
+        Ok(())
+    }
+
+    pub(crate) fn stat_with_explicit_ids(&mut self, remote_path: &str) -> Result<AdbStatResponse> {
+        let stat_buffer = MessageSubcommand::Stat.with_arg(u32::try_from(remote_path.len())?);
+        let message = ADBTransportMessage::new(
+            MessageCommand::Write,
+            self.get_local_id()?,
+            self.get_remote_id()?,
+            &bincode_serialize_to_vec(&stat_buffer)?,
+        );
+        self.send_and_expect_okay(message)?;
+        self.send_and_expect_okay(ADBTransportMessage::new(
+            MessageCommand::Write,
+            self.get_local_id()?,
+            self.get_remote_id()?,
+            remote_path.as_bytes(),
+        ))?;
+        let response = self.transport.read_message()?;
+        // Skip first 4 bytes as this is the literal "STAT".
+        // Interesting part starts right after
+
+        bincode_deserialize_from_slice(&response.into_payload()[4..])
+    }
+
+    pub(crate) fn end_transaction(&mut self) -> Result<()> {
+        let quit_buffer = MessageSubcommand::Quit.with_arg(0u32);
+        self.send_and_expect_okay(ADBTransportMessage::new(
+            MessageCommand::Write,
+            self.get_local_id()?,
+            self.get_remote_id()?,
+            &bincode_serialize_to_vec(&quit_buffer)?,
+        ))?;
+        let _discard_close = self.transport.read_message()?;
+        Ok(())
+    }
+
+    pub(crate) fn open_session(&mut self, data: &[u8]) -> Result<ADBTransportMessage> {
+        let message = ADBTransportMessage::new(
+            MessageCommand::Open,
+            rand::random::<u32>(), // Our 'local-id'
+            0,
+            data,
+        );
+        self.get_transport_mut().write_message(message)?;
+
+        let response = self.get_transport_mut().read_message()?;
+
+        self.local_id = Some(response.header().arg1());
+        self.remote_id = Some(response.header().arg0());
+
+        Ok(response)
+    }
+
+    pub(crate) fn get_local_id(&self) -> Result<u32> {
+        self.local_id.ok_or(RustADBError::ADBRequestFailed(
+            "connection not opened, no local_id".into(),
+        ))
+    }
+
+    pub(crate) fn get_remote_id(&self) -> Result<u32> {
+        self.remote_id.ok_or(RustADBError::ADBRequestFailed(
+            "connection not opened, no remote_id".into(),
+        ))
+    }
+}

adb_client/src/message_devices/adb_message_device_commands.rs

@@ -0,0 +1,49 @@
+use crate::{
+    ADBDeviceExt, RebootType, Result,
+    message_devices::{
+        adb_message_device::ADBMessageDevice, adb_message_transport::ADBMessageTransport,
+    },
+    models::AdbStatResponse,
+};
+use std::{
+    io::{Read, Write},
+    path::Path,
+};
+
+impl<T: ADBMessageTransport> ADBDeviceExt for ADBMessageDevice<T> {
+    fn shell_command(&mut self, command: &[&str], output: &mut dyn Write) -> Result<()> {
+        self.shell_command(command, output)
+    }
+
+    fn shell(&mut self, reader: &mut dyn Read, writer: Box<dyn Write + Send>) -> Result<()> {
+        self.shell(reader, writer)
+    }
+
+    fn stat(&mut self, remote_path: &str) -> Result<AdbStatResponse> {
+        self.stat(remote_path)
+    }
+
+    fn pull(&mut self, source: &dyn AsRef<str>, output: &mut dyn Write) -> Result<()> {
+        self.pull(source, output)
+    }
+
+    fn push(&mut self, stream: &mut dyn Read, path: &dyn AsRef<str>) -> Result<()> {
+        self.push(stream, path)
+    }
+
+    fn reboot(&mut self, reboot_type: RebootType) -> Result<()> {
+        self.reboot(reboot_type)
+    }
+
+    fn install(&mut self, apk_path: &dyn AsRef<Path>) -> Result<()> {
+        self.install(apk_path)
+    }
+
+    fn uninstall(&mut self, package: &str) -> Result<()> {
+        self.uninstall(package)
+    }
+
+    fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
+        self.framebuffer_inner()
+    }
+}

adb_client/src/message_devices/adb_message_transport.rs

@@ -1,7 +1,9 @@
 use std::time::Duration;
 
-use super::ADBTransport;
+use crate::{
-use crate::{device::ADBTransportMessage, Result};
+    Result, adb_transport::ADBTransport,
+    message_devices::adb_transport_message::ADBTransportMessage,
+};
 
 const DEFAULT_READ_TIMEOUT: Duration = Duration::from_secs(u64::MAX);
 const DEFAULT_WRITE_TIMEOUT: Duration = Duration::from_secs(2);

adb_client/src/message_devices/adb_rsa_key.rs

@@ -1,12 +1,12 @@
 use crate::{Result, RustADBError};
-use base64::{engine::general_purpose::STANDARD, Engine};
+use base64::{Engine, engine::general_purpose::STANDARD};
 use num_bigint::{BigUint, ModInverse};
-use num_traits::cast::ToPrimitive;
 use num_traits::FromPrimitive;
-use rand::rngs::OsRng;
+use num_traits::cast::ToPrimitive;
 use rsa::pkcs8::DecodePrivateKey;
 use rsa::traits::PublicKeyParts;
 use rsa::{Pkcs1v15Sign, RsaPrivateKey};
+use std::fmt::Write;
 
 const ADB_PRIVATE_KEY_SIZE: usize = 2048;
 const ANDROID_PUBKEY_MODULUS_SIZE_WORDS: u32 = 64;
@@ -52,7 +52,7 @@ pub struct ADBRsaKey {
 impl ADBRsaKey {
     pub fn new_random() -> Result<Self> {
         Ok(Self {
-            private_key: RsaPrivateKey::new(&mut OsRng, ADB_PRIVATE_KEY_SIZE)?,
+            private_key: RsaPrivateKey::new(&mut rsa::rand_core::OsRng, ADB_PRIVATE_KEY_SIZE)?,
         })
     }
 
@@ -93,15 +93,16 @@ impl ADBRsaKey {
             .to_u32()
             .ok_or(RustADBError::ConversionError)?;
 
-        Ok(self.encode_public_key(adb_rsa_pubkey.into_bytes()))
+        Self::encode_public_key(adb_rsa_pubkey.into_bytes())
     }
 
-    fn encode_public_key(&self, pub_key: Vec<u8>) -> String {
+    fn encode_public_key(pub_key: Vec<u8>) -> Result<String> {
         let mut encoded = STANDARD.encode(pub_key);
         encoded.push(' ');
-        encoded.push_str(&format!("adb_client@{}", env!("CARGO_PKG_VERSION")));
+        write!(encoded, "adb_client@{}", env!("CARGO_PKG_VERSION"))
+            .map_err(|_| RustADBError::ConversionError)?;
 
-        encoded
+        Ok(encoded)
     }
 
     pub fn sign(&self, msg: impl AsRef<[u8]>) -> Result<Vec<u8>> {

adb_client/src/message_devices/adb_transport_message.rs

@@ -1,12 +1,9 @@
 use serde::{Deserialize, Serialize};
 
-use crate::RustADBError;
+use crate::{
-
+    Result, RustADBError,
-use super::models::MessageCommand;
+    message_devices::{adb_message_device, message_commands::MessageCommand},
-
+};
-pub const AUTH_TOKEN: u32 = 1;
-pub const AUTH_SIGNATURE: u32 = 2;
-pub const AUTH_RSAPUBLICKEY: u32 = 3;
 
 #[derive(Debug)]
 pub struct ADBTransportMessage {
@@ -58,24 +55,24 @@ impl ADBTransportMessageHeader {
     }
 
     pub(crate) fn compute_crc32(data: &[u8]) -> u32 {
-        data.iter().map(|&x| x as u32).sum()
+        data.iter().map(|&x| u32::from(x)).sum()
     }
 
     fn compute_magic(command: MessageCommand) -> u32 {
         let command_u32 = command as u32;
-        command_u32 ^ 0xFFFFFFFF
+        command_u32 ^ 0xFFFF_FFFF
     }
 
-    pub fn as_bytes(&self) -> Result<Vec<u8>, RustADBError> {
+    pub fn as_bytes(&self) -> Result<Vec<u8>> {
-        bincode::serialize(&self).map_err(|_e| RustADBError::ConversionError)
+        adb_message_device::bincode_serialize_to_vec(self)
     }
 }
 
 impl ADBTransportMessage {
-    pub fn new(command: MessageCommand, arg0: u32, arg1: u32, data: Vec<u8>) -> Self {
+    pub fn new(command: MessageCommand, arg0: u32, arg1: u32, data: &[u8]) -> Self {
         Self {
-            header: ADBTransportMessageHeader::new(command, arg0, arg1, &data),
+            header: ADBTransportMessageHeader::new(command, arg0, arg1, data),
-            payload: data,
+            payload: data.to_vec(),
         }
     }
 
@@ -88,6 +85,18 @@ impl ADBTransportMessage {
             && ADBTransportMessageHeader::compute_crc32(&self.payload) == self.header.data_crc32
     }
 
+    pub fn assert_command(&self, expected_command: MessageCommand) -> Result<()> {
+        let our_command = self.header().command();
+        if expected_command == our_command {
+            return Ok(());
+        }
+
+        Err(RustADBError::WrongResponseReceived(
+            our_command.to_string(),
+            expected_command.to_string(),
+        ))
+    }
+
     pub fn header(&self) -> &ADBTransportMessageHeader {
         &self.header
     }
@@ -104,7 +113,7 @@ impl ADBTransportMessage {
 impl TryFrom<[u8; 24]> for ADBTransportMessageHeader {
     type Error = RustADBError;
 
-    fn try_from(value: [u8; 24]) -> Result<Self, Self::Error> {
+    fn try_from(value: [u8; 24]) -> Result<Self> {
-        bincode::deserialize(&value).map_err(|_e| RustADBError::ConversionError)
+        adb_message_device::bincode_deserialize_from_slice(&value)
     }
 }

adb_client/src/message_devices/commands/framebuffer.rs

@@ -0,0 +1,101 @@
+use std::io::{Cursor, Read};
+
+use byteorder::{LittleEndian, ReadBytesExt};
+use image::{ImageBuffer, Rgba};
+
+use crate::{
+    Result, RustADBError,
+    message_devices::{
+        adb_message_device::ADBMessageDevice, adb_message_transport::ADBMessageTransport,
+        message_commands::MessageCommand,
+    },
+    models::{FrameBufferInfoV1, FrameBufferInfoV2},
+};
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    pub(crate) fn framebuffer_inner(&mut self) -> Result<ImageBuffer<Rgba<u8>, Vec<u8>>> {
+        self.open_session(b"framebuffer:\0")?;
+
+        let response = self.recv_and_reply_okay()?;
+
+        let mut payload_cursor = Cursor::new(response.payload());
+
+        let version = payload_cursor.read_u32::<LittleEndian>()?;
+
+        let img = match version {
+            // RGBA_8888
+            1 => {
+                let mut buf = [0u8; std::mem::size_of::<FrameBufferInfoV1>()];
+
+                payload_cursor.read_exact(&mut buf)?;
+
+                let framebuffer_info: FrameBufferInfoV1 = buf.try_into()?;
+
+                let mut framebuffer_data = Vec::new();
+                payload_cursor.read_to_end(&mut framebuffer_data)?;
+
+                loop {
+                    if u32::try_from(framebuffer_data.len())? == framebuffer_info.size {
+                        break;
+                    }
+
+                    let response = self.recv_and_reply_okay()?;
+
+                    framebuffer_data.extend_from_slice(&response.into_payload());
+
+                    log::debug!(
+                        "received framebuffer data. new size {}",
+                        framebuffer_data.len()
+                    );
+                }
+
+                ImageBuffer::<Rgba<u8>, Vec<u8>>::from_vec(
+                    framebuffer_info.width,
+                    framebuffer_info.height,
+                    framebuffer_data,
+                )
+                .ok_or_else(|| RustADBError::FramebufferConversionError)?
+            }
+            // RGBX_8888
+            2 => {
+                let mut buf = [0u8; std::mem::size_of::<FrameBufferInfoV2>()];
+
+                payload_cursor.read_exact(&mut buf)?;
+
+                let framebuffer_info: FrameBufferInfoV2 = buf.try_into()?;
+
+                let mut framebuffer_data = Vec::new();
+                payload_cursor.read_to_end(&mut framebuffer_data)?;
+
+                loop {
+                    if u32::try_from(framebuffer_data.len())? == framebuffer_info.size {
+                        break;
+                    }
+
+                    let response = self.recv_and_reply_okay()?;
+
+                    framebuffer_data.extend_from_slice(&response.into_payload());
+
+                    log::debug!(
+                        "received framebuffer data. new size {}",
+                        framebuffer_data.len()
+                    );
+                }
+
+                ImageBuffer::<Rgba<u8>, Vec<u8>>::from_vec(
+                    framebuffer_info.width,
+                    framebuffer_info.height,
+                    framebuffer_data,
+                )
+                .ok_or_else(|| RustADBError::FramebufferConversionError)?
+            }
+            v => return Err(RustADBError::UnimplementedFramebufferImageVersion(v)),
+        };
+
+        self.get_transport_mut()
+            .read_message()
+            .and_then(|message| message.assert_command(MessageCommand::Clse))?;
+
+        Ok(img)
+    }
+}

adb_client/src/message_devices/commands/install.rs

@@ -0,0 +1,43 @@
+use std::{fs::File, path::Path};
+
+use crate::{
+    Result,
+    message_devices::{
+        adb_message_device::ADBMessageDevice, adb_message_transport::ADBMessageTransport,
+        commands::utils::MessageWriter,
+    },
+    utils::check_extension_is_apk,
+};
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    pub(crate) fn install(&mut self, apk_path: &dyn AsRef<Path>) -> Result<()> {
+        let mut apk_file = File::open(apk_path)?;
+
+        check_extension_is_apk(apk_path)?;
+
+        let file_size = apk_file.metadata()?.len();
+
+        self.open_session(format!("exec:cmd package 'install' -S {file_size}\0").as_bytes())?;
+
+        let transport = self.get_transport().clone();
+
+        let mut writer = MessageWriter::new(transport, self.get_local_id()?, self.get_remote_id()?);
+
+        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/message_devices/commands/mod.rs

@@ -1,6 +1,9 @@
+mod framebuffer;
 mod install;
 mod pull;
 mod push;
 mod reboot;
 mod shell;
 mod stat;
+mod uninstall;
+mod utils;

adb_client/src/message_devices/commands/pull.rs

@@ -1,19 +1,21 @@
 use std::io::Write;
 
 use crate::{
-    device::{
+    Result, RustADBError,
-        adb_message_device::ADBMessageDevice, models::MessageSubcommand, ADBTransportMessage,
+    message_devices::{
-        MessageCommand,
+        adb_message_device::{self, ADBMessageDevice},
+        adb_message_transport::ADBMessageTransport,
+        adb_transport_message::ADBTransportMessage,
+        message_commands::{MessageCommand, MessageSubcommand},
     },
-    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()?;
+        self.begin_synchronization()?;
         let source = source.as_ref();
 
-        let adb_stat_response = self.stat_with_explicit_ids(source, local_id, remote_id)?;
+        let adb_stat_response = self.stat_with_explicit_ids(source)?;
 
         if adb_stat_response.file_perm == 0 {
             return Err(RustADBError::UnknownResponseType(
@@ -21,29 +23,31 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
             ));
         }
 
+        let local_id = self.get_local_id()?;
+        let remote_id = self.get_remote_id()?;
+
         self.get_transport_mut().write_message_with_timeout(
-            ADBTransportMessage::new(MessageCommand::Okay, local_id, remote_id, "".into()),
+            ADBTransportMessage::new(MessageCommand::Okay, local_id, remote_id, &[]),
             std::time::Duration::from_secs(4),
         )?;
 
-        let recv_buffer = MessageSubcommand::Recv.with_arg(source.len() as u32);
+        let recv_buffer = MessageSubcommand::Recv.with_arg(u32::try_from(source.len())?);
-        let recv_buffer =
+        let recv_buffer = adb_message_device::bincode_serialize_to_vec(&recv_buffer)?;
-            bincode::serialize(&recv_buffer).map_err(|_e| RustADBError::ConversionError)?;
         self.send_and_expect_okay(ADBTransportMessage::new(
             MessageCommand::Write,
-            local_id,
+            self.get_local_id()?,
-            remote_id,
+            self.get_remote_id()?,
-            recv_buffer,
+            &recv_buffer,
         ))?;
         self.send_and_expect_okay(ADBTransportMessage::new(
             MessageCommand::Write,
-            local_id,
+            self.get_local_id()?,
-            remote_id,
+            self.get_remote_id()?,
-            source.into(),
+            source.as_bytes(),
         ))?;
 
-        self.recv_file(local_id, remote_id, output)?;
+        self.recv_file(output)?;
-        self.end_transaction(local_id, remote_id)?;
+        self.end_transaction()?;
         Ok(())
     }
 }

adb_client/src/message_devices/commands/push.rs

@@ -0,0 +1,36 @@
+use std::io::Read;
+
+use crate::{
+    Result,
+    message_devices::{
+        adb_message_device::{self, ADBMessageDevice},
+        adb_message_transport::ADBMessageTransport,
+        adb_transport_message::ADBTransportMessage,
+        message_commands::{MessageCommand, MessageSubcommand},
+    },
+};
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    pub(crate) fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
+        self.begin_synchronization()?;
+
+        let path_header = format!("{},0777", path.as_ref());
+
+        let send_buffer = MessageSubcommand::Send.with_arg(u32::try_from(path_header.len())?);
+        let mut send_buffer = adb_message_device::bincode_serialize_to_vec(&send_buffer)?;
+        send_buffer.append(&mut path_header.as_bytes().to_vec());
+
+        self.send_and_expect_okay(ADBTransportMessage::new(
+            MessageCommand::Write,
+            self.get_local_id()?,
+            self.get_remote_id()?,
+            &send_buffer,
+        ))?;
+
+        self.push_file(self.get_local_id()?, self.get_remote_id()?, stream)?;
+
+        self.end_transaction()?;
+
+        Ok(())
+    }
+}

adb_client/src/message_devices/commands/reboot.rs

@@ -0,0 +1,17 @@
+use crate::{
+    RebootType, Result,
+    message_devices::{
+        adb_message_device::ADBMessageDevice, adb_message_transport::ADBMessageTransport,
+        message_commands::MessageCommand,
+    },
+};
+
+impl<T: ADBMessageTransport> ADBMessageDevice<T> {
+    pub(crate) fn reboot(&mut self, reboot_type: RebootType) -> Result<()> {
+        self.open_session(format!("reboot:{reboot_type}\0").as_bytes())?;
+
+        self.get_transport_mut()
+            .read_message()
+            .and_then(|message| message.assert_command(MessageCommand::Okay))
+    }
+}

adb_client/src/message_devices/commands/shell.rs

@@ -1,38 +1,19 @@
-use rand::Rng;
+use std::io::{ErrorKind, Read, Write};
-use std::io::{Read, Write};
 
-use crate::device::ShellMessageWriter;
-use crate::Result;
 use crate::{
-    device::{ADBMessageDevice, ADBTransportMessage, MessageCommand},
+    Result, RustADBError,
-    ADBMessageTransport, RustADBError,
+    message_devices::{
+        adb_message_device::ADBMessageDevice, adb_message_transport::ADBMessageTransport,
+        adb_transport_message::ADBTransportMessage, commands::utils::ShellMessageWriter,
+        message_commands::MessageCommand,
+    },
 };
 
 impl<T: ADBMessageTransport> ADBMessageDevice<T> {
-    /// 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.
-    pub(crate) fn shell_command<S: ToString, W: Write>(
+    pub(crate) fn shell_command(&mut self, command: &[&str], output: &mut dyn Write) -> Result<()> {
-        &mut self,
+        let response = self.open_session(format!("shell:{}\0", command.join(" "),).as_bytes())?;
-        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 {}",
@@ -54,27 +35,18 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
 
     /// 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(
-    pub(crate) fn shell<R: Read, W: Write + Send + 'static>(
         &mut self,
-        mut reader: R,
+        mut reader: &mut dyn Read,
-        mut writer: W,
+        mut writer: Box<dyn Write + Send>,
     ) -> Result<()> {
-        let sync_directive = "shell:\0";
+        self.open_session(b"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();
 
+        let local_id = self.get_local_id()?;
+        let remote_id = self.get_remote_id()?;
+
         // Reading thread, reads response from adbd
         std::thread::spawn(move || -> Result<()> {
             loop {
@@ -82,17 +54,17 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
 
                 // Acknowledge for more data
                 let response =
-                    ADBTransportMessage::new(MessageCommand::Okay, local_id, remote_id, vec![]);
+                    ADBTransportMessage::new(MessageCommand::Okay, local_id, remote_id, &[]);
                 transport.write_message(response)?;
 
                 match message.header().command() {
-                    MessageCommand::Write => {}
+                    MessageCommand::Write => {
-                    MessageCommand::Okay => continue,
+                        writer.write_all(&message.into_payload())?;
+                        writer.flush()?;
+                    }
+                    MessageCommand::Okay => {}
                     _ => return Err(RustADBError::ADBShellNotSupported),
                 }
-
-                writer.write_all(&message.into_payload())?;
-                writer.flush()?;
             }
         });
 
@@ -102,7 +74,7 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
         // 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(()),
+                ErrorKind::BrokenPipe => return Ok(()),
                 _ => return Err(RustADBError::IOError(e)),
             }
         }

adb_client/src/message_devices/commands/stat.rs

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

adb_client/src/message_devices/commands/uninstall.rs

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

adb_client/src/message_devices/commands/utils/message_writer.rs

@@ -0,0 +1,49 @@
+use std::io::{Error, ErrorKind, Result, Write};
+
+use crate::message_devices::{
+    adb_message_transport::ADBMessageTransport, adb_transport_message::ADBTransportMessage,
+    message_commands::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]) -> Result<usize> {
+        let message =
+            ADBTransportMessage::new(MessageCommand::Write, self.local_id, self.remote_id, buf);
+        self.transport
+            .write_message(message)
+            .map_err(|e| Error::new(ErrorKind::InvalidData, e))?;
+
+        match self.transport.read_message() {
+            Ok(response) => {
+                response
+                    .assert_command(MessageCommand::Okay)
+                    .map_err(Error::other)?;
+                Ok(buf.len())
+            }
+            Err(e) => Err(Error::other(e)),
+        }
+    }
+
+    fn flush(&mut self) -> Result<()> {
+        Ok(())
+    }
+}

adb_client/src/message_devices/commands/utils/mod.rs

@@ -0,0 +1,4 @@
+mod message_writer;
+mod shell_message_writer;
+pub use message_writer::MessageWriter;
+pub use shell_message_writer::ShellMessageWriter;

adb_client/src/message_devices/commands/utils/shell_message_writer.rs

@@ -1,8 +1,9 @@
 use std::io::Write;
 
-use crate::ADBMessageTransport;
+use crate::message_devices::{
-
+    adb_message_transport::ADBMessageTransport, adb_transport_message::ADBTransportMessage,
-use super::{models::MessageCommand, ADBTransportMessage};
+    message_commands::MessageCommand,
+};
 
 /// [`Write`] trait implementation to hide underlying ADB protocol write logic for shell commands.
 pub struct ShellMessageWriter<T: ADBMessageTransport> {
@@ -23,12 +24,8 @@ impl<T: ADBMessageTransport> ShellMessageWriter<T> {
 
 impl<T: ADBMessageTransport> Write for ShellMessageWriter<T> {
     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-        let message = ADBTransportMessage::new(
+        let message =
-            MessageCommand::Write,
+            ADBTransportMessage::new(MessageCommand::Write, self.local_id, self.remote_id, buf);
-            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))?;

adb_client/src/message_devices/message_commands.rs

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

adb_client/src/message_devices/mod.rs

@@ -0,0 +1,17 @@
+/// USB-related definitions
+pub mod usb;
+
+/// Device reachable over TCP related definition
+pub mod tcp;
+
+pub(crate) const AUTH_TOKEN: u32 = 1;
+pub(crate) const AUTH_SIGNATURE: u32 = 2;
+pub(crate) const AUTH_RSAPUBLICKEY: u32 = 3;
+
+mod adb_message_device;
+mod adb_message_device_commands;
+mod adb_message_transport;
+mod adb_rsa_key;
+mod adb_transport_message;
+mod commands;
+mod message_commands;

adb_client/src/message_devices/tcp/README.md

@@ -0,0 +1,13 @@
+# Examples
+
+## Get a shell from device
+
+```rust no_run
+use std::net::{SocketAddr, IpAddr, Ipv4Addr};
+use adb_client::{tcp::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(&mut std::io::stdin(), Box::new(std::io::stdout()));
+```

adb_client/src/message_devices/tcp/adb_tcp_device.rs

@@ -0,0 +1,150 @@
+use std::io::Write;
+use std::path::{Path, PathBuf};
+use std::{io::Read, net::SocketAddr};
+
+use crate::message_devices::adb_message_device::ADBMessageDevice;
+use crate::message_devices::adb_message_transport::ADBMessageTransport;
+use crate::message_devices::adb_rsa_key::ADBRsaKey;
+use crate::message_devices::adb_transport_message::ADBTransportMessage;
+use crate::message_devices::message_commands::MessageCommand;
+use crate::tcp::tcp_transport::TcpTransport;
+use crate::usb::read_adb_private_key;
+use crate::utils::get_default_adb_key_path;
+use crate::{ADBDeviceExt, ADBTransport, Result};
+
+/// Represent a device reached and available over USB.
+#[derive(Debug)]
+pub struct ADBTcpDevice {
+    private_key: ADBRsaKey,
+    inner: ADBMessageDevice<TcpTransport>,
+}
+
+impl ADBTcpDevice {
+    /// Instantiate a new [`ADBTcpDevice`]
+    pub fn new(address: SocketAddr) -> Result<Self> {
+        Self::new_with_custom_private_key(address, get_default_adb_key_path()?)
+    }
+
+    /// Instantiate a new [`ADBTcpDevice`] using a custom private key path
+    pub fn new_with_custom_private_key(
+        address: SocketAddr,
+        private_key_path: PathBuf,
+    ) -> Result<Self> {
+        let private_key = if let Some(private_key) = read_adb_private_key(&private_key_path)? {
+            private_key
+        } else {
+            log::warn!(
+                "No private key found at path {}. Using a temporary random one.",
+                private_key_path.display()
+            );
+            ADBRsaKey::new_random()?
+        };
+
+        let mut device = Self {
+            private_key,
+            inner: ADBMessageDevice::new(TcpTransport::new(address)?),
+        };
+
+        device.connect()?;
+
+        Ok(device)
+    }
+
+    /// Send initial connect
+    pub fn connect(&mut self) -> Result<()> {
+        self.get_transport_mut().connect()?;
+
+        let message = ADBTransportMessage::new(
+            MessageCommand::Cnxn,
+            0x0100_0000,
+            1_048_576,
+            format!("host::{}\0", env!("CARGO_PKG_NAME")).as_bytes(),
+        );
+
+        self.get_transport_mut().write_message(message)?;
+
+        let message = self.get_transport_mut().read_message()?;
+
+        // Check if a client is requesting a secure connection and upgrade it if necessary
+        match message.header().command() {
+            MessageCommand::Stls => {
+                self.get_transport_mut()
+                    .write_message(ADBTransportMessage::new(MessageCommand::Stls, 1, 0, &[]))?;
+                self.get_transport_mut().upgrade_connection()?;
+                log::debug!("Connection successfully upgraded from TCP to TLS");
+                Ok(())
+            }
+            MessageCommand::Cnxn => {
+                log::debug!("Unencrypted connection established");
+                Ok(())
+            }
+            MessageCommand::Auth => {
+                log::debug!("Authentication required");
+                self.inner.auth_handshake(message, &self.private_key)
+            }
+            _ => Err(crate::RustADBError::WrongResponseReceived(
+                "Expected CNXN, STLS or AUTH command".to_string(),
+                message.header().command().to_string(),
+            )),
+        }
+    }
+
+    #[inline]
+    fn get_transport_mut(&mut self) -> &mut TcpTransport {
+        self.inner.get_transport_mut()
+    }
+}
+
+impl ADBDeviceExt for ADBTcpDevice {
+    #[inline]
+    fn shell_command(&mut self, command: &[&str], output: &mut dyn Write) -> Result<()> {
+        self.inner.shell_command(command, output)
+    }
+
+    #[inline]
+    fn shell(&mut self, reader: &mut dyn Read, writer: Box<dyn Write + Send>) -> Result<()> {
+        self.inner.shell(reader, writer)
+    }
+
+    #[inline]
+    fn stat(&mut self, remote_path: &str) -> Result<crate::AdbStatResponse> {
+        self.inner.stat(remote_path)
+    }
+
+    #[inline]
+    fn pull(&mut self, source: &dyn AsRef<str>, output: &mut dyn Write) -> Result<()> {
+        self.inner.pull(source, output)
+    }
+
+    #[inline]
+    fn push(&mut self, stream: &mut dyn Read, path: &dyn AsRef<str>) -> Result<()> {
+        self.inner.push(stream, path)
+    }
+
+    #[inline]
+    fn reboot(&mut self, reboot_type: crate::RebootType) -> Result<()> {
+        self.inner.reboot(reboot_type)
+    }
+
+    #[inline]
+    fn install(&mut self, apk_path: &dyn AsRef<Path>) -> Result<()> {
+        self.inner.install(apk_path)
+    }
+
+    #[inline]
+    fn uninstall(&mut self, package: &str) -> Result<()> {
+        self.inner.uninstall(package)
+    }
+
+    #[inline]
+    fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
+        self.inner.framebuffer_inner()
+    }
+}
+
+impl Drop for ADBTcpDevice {
+    fn drop(&mut self) {
+        // Best effort here
+        let _ = self.get_transport_mut().disconnect();
+    }
+}

adb_client/src/message_devices/tcp/mod.rs

@@ -0,0 +1,6 @@
+#![doc = include_str!("./README.md")]
+
+mod adb_tcp_device;
+mod tcp_transport;
+
+pub use adb_tcp_device::ADBTcpDevice;

adb_client/src/message_devices/tcp/tcp_transport.rs

@@ -1,22 +1,24 @@
 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,
+    client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier},
+    pki_types::{CertificateDer, PrivatePkcs8KeyDer, pem::PemObject},
 };
 
-use super::{ADBMessageTransport, ADBTransport};
 use crate::{
-    device::{
-        get_default_adb_key_path, ADBTransportMessage, ADBTransportMessageHeader, MessageCommand,
-    },
     Result, RustADBError,
+    adb_transport::ADBTransport,
+    message_devices::{
+        adb_message_transport::ADBMessageTransport,
+        adb_transport_message::{ADBTransportMessage, ADBTransportMessageHeader},
+        message_commands::MessageCommand,
+    },
+    utils::get_default_adb_key_path,
 };
 use std::{
     fs::read_to_string,
     io::{Read, Write},
     net::{Shutdown, SocketAddr, TcpStream},
-    ops::{Deref, DerefMut},
     path::PathBuf,
     sync::{Arc, Mutex},
     time::Duration,
@@ -77,7 +79,7 @@ impl Write for CurrentConnection {
     }
 }
 
-/// Transport running on USB
+/// Transport running on TCP
 #[derive(Clone, Debug)]
 pub struct TcpTransport {
     address: SocketAddr,
@@ -109,7 +111,7 @@ impl TcpTransport {
         })
     }
 
-    fn get_current_connection(&mut self) -> Result<Arc<Mutex<CurrentConnection>>> {
+    fn get_current_connection(&self) -> Result<Arc<Mutex<CurrentConnection>>> {
         self.current_connection
             .as_ref()
             .ok_or(RustADBError::IOError(std::io::Error::new(
@@ -120,18 +122,15 @@ impl TcpTransport {
     }
 
     pub(crate) fn upgrade_connection(&mut self) -> Result<()> {
-        let current_connection = match self.current_connection.clone() {
+        let Some(current_connection) = self.current_connection.clone() else {
-            Some(current_connection) => current_connection,
+            return Err(RustADBError::UpgradeError(
-            None => {
+                "cannot upgrade a non-existing connection...".into(),
-                return Err(RustADBError::UpgradeError(
+            ));
-                    "cannot upgrade a non-existing connection...".into(),
-                ))
-            }
         };
 
         {
             let mut current_conn_locked = current_connection.lock()?;
-            match current_conn_locked.deref() {
+            match &*current_conn_locked {
                 CurrentConnection::Tcp(tcp_stream) => {
                     // TODO: Check if we cannot be more precise
 
@@ -151,8 +150,8 @@ impl TcpTransport {
                     client_config.key_log = Arc::new(KeyLogFile::new());
 
                     let rc_config = Arc::new(client_config);
-                    let example_com = self.address.ip().into();
+                    let server_name = self.address.ip().into();
-                    let conn = ClientConnection::new(rc_config, example_com)?;
+                    let conn = ClientConnection::new(rc_config, server_name)?;
                     let owned = tcp_stream.try_clone()?;
                     let client = StreamOwned::new(conn, owned);
 
@@ -162,7 +161,7 @@ impl TcpTransport {
                 CurrentConnection::Tls(_) => {
                     return Err(RustADBError::UpgradeError(
                         "cannot upgrade a TLS connection...".into(),
-                    ))
+                    ));
                 }
             }
         }
@@ -175,8 +174,7 @@ impl TcpTransport {
                 Ok(())
             }
             c => Err(RustADBError::ADBRequestFailed(format!(
-                "Wrong command received {}",
+                "Wrong command received {c}"
-                c
             ))),
         }
     }
@@ -193,7 +191,7 @@ impl ADBTransport for TcpTransport {
         log::debug!("disconnecting...");
         if let Some(current_connection) = &self.current_connection {
             let mut lock = current_connection.lock()?;
-            match lock.deref_mut() {
+            match &mut *lock {
                 CurrentConnection::Tcp(tcp_stream) => {
                     let _ = tcp_stream.shutdown(Shutdown::Both);
                 }
@@ -212,7 +210,7 @@ impl ADBMessageTransport for TcpTransport {
     fn read_message_with_timeout(
         &mut self,
         read_timeout: std::time::Duration,
-    ) -> Result<crate::device::ADBTransportMessage> {
+    ) -> Result<ADBTransportMessage> {
         let raw_connection_lock = self.get_current_connection()?;
         let mut raw_connection = raw_connection_lock.lock()?;
 

adb_client/src/message_devices/usb/README.md

@@ -0,0 +1,26 @@
+# Examples
+
+## Launch a command on device
+
+```rust no_run
+use adb_client::{usb::ADBUSBDevice, ADBDeviceExt};
+
+let vendor_id = 0x04e8;
+let product_id = 0x6860;
+let mut device = ADBUSBDevice::new(vendor_id, product_id).expect("cannot find device");
+device.shell_command(&["df", "-h"], &mut std::io::stdout());
+```
+
+## Push a file to the device
+
+```rust no_run
+use adb_client::{usb::ADBUSBDevice, ADBDeviceExt};
+use std::fs::File;
+use std::path::Path;
+
+let vendor_id = 0x04e8;
+let product_id = 0x6860;
+let mut device = ADBUSBDevice::new(vendor_id, product_id).expect("cannot find device");
+let mut input = File::open("/tmp/file.txt").expect("Cannot open file");
+device.push(&mut input, &"/data/local/tmp");
+```

adb_client/src/message_devices/usb/adb_rusb_device.rs

@@ -0,0 +1,100 @@
+use std::{
+    io::{Read, Write},
+    path::{Path, PathBuf},
+};
+
+use crate::{
+    ADBDeviceExt, Result, RustADBError,
+    usb::{RusbTransport, adb_usb_device::ADBUSBDevice, search_adb_devices},
+    utils::get_default_adb_key_path,
+};
+
+/// Implement Android USB device reachable over wired USB
+#[derive(Debug)]
+pub struct ADBRusbDevice {
+    inner: ADBUSBDevice<RusbTransport>,
+}
+
+impl ADBRusbDevice {
+    /// Instantiate a new [`ADBRusbDevice`]
+    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 [`ADBRusbDevice`] 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 transport = RusbTransport::new(vendor_id, product_id)?;
+
+        Ok(Self {
+            inner: ADBUSBDevice::new_from_transport(transport, Some(private_key_path))?,
+        })
+    }
+
+    /// 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)) => {
+                ADBRusbDevice::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(),
+            )),
+        }
+    }
+}
+
+impl ADBDeviceExt for ADBRusbDevice {
+    #[inline]
+    fn shell_command(&mut self, command: &[&str], output: &mut dyn Write) -> Result<()> {
+        self.inner.shell_command(command, output)
+    }
+
+    #[inline]
+    fn shell<'a>(&mut self, reader: &mut dyn Read, writer: Box<dyn Write + Send>) -> Result<()> {
+        self.inner.shell(reader, writer)
+    }
+
+    #[inline]
+    fn stat(&mut self, remote_path: &str) -> Result<crate::AdbStatResponse> {
+        self.inner.stat(remote_path)
+    }
+
+    #[inline]
+    fn pull(&mut self, source: &dyn AsRef<str>, output: &mut dyn Write) -> Result<()> {
+        self.inner.pull(source, output)
+    }
+
+    #[inline]
+    fn push(&mut self, stream: &mut dyn Read, path: &dyn AsRef<str>) -> Result<()> {
+        self.inner.push(stream, path)
+    }
+
+    #[inline]
+    fn reboot(&mut self, reboot_type: crate::RebootType) -> Result<()> {
+        self.inner.reboot(reboot_type)
+    }
+
+    #[inline]
+    fn install(&mut self, apk_path: &dyn AsRef<Path>) -> Result<()> {
+        self.inner.install(apk_path)
+    }
+
+    #[inline]
+    fn uninstall(&mut self, package: &str) -> Result<()> {
+        self.inner.uninstall(package)
+    }
+
+    #[inline]
+    fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
+        self.inner.framebuffer_inner()
+    }
+}

adb_client/src/message_devices/usb/adb_usb_device.rs

@@ -0,0 +1,187 @@
+use std::io::Read;
+use std::io::Write;
+use std::path::{Path, PathBuf};
+use std::time::Duration;
+
+use crate::ADBDeviceExt;
+use crate::AUTH_TOKEN;
+use crate::Result;
+use crate::RustADBError;
+use crate::message_devices::AUTH_RSAPUBLICKEY;
+use crate::message_devices::AUTH_SIGNATURE;
+use crate::message_devices::adb_message_device::ADBMessageDevice;
+use crate::message_devices::adb_message_transport::ADBMessageTransport;
+use crate::message_devices::adb_rsa_key::ADBRsaKey;
+use crate::message_devices::adb_transport_message::ADBTransportMessage;
+use crate::message_devices::message_commands::MessageCommand;
+use crate::usb::read_adb_private_key;
+use crate::utils::get_default_adb_key_path;
+
+/// Private struct implementing Android USB device logic, depending on a `ADBMessageTransport`.
+#[derive(Debug)]
+pub(crate) struct ADBUSBDevice<T: ADBMessageTransport> {
+    private_key: ADBRsaKey,
+    inner: ADBMessageDevice<T>,
+}
+
+impl<T: ADBMessageTransport> ADBUSBDevice<T> {
+    /// Instantiate a new [`ADBUSBDevice`] from a [`RusbTransport`] and an optional private key path.
+    pub fn new_from_transport(transport: T, 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: T, private_key_path: &PathBuf) -> Result<Self> {
+        let private_key = if let Some(private_key) = read_adb_private_key(private_key_path)? {
+            private_key
+        } else {
+            log::warn!(
+                "No private key found at path {}. Using a temporary random one.",
+                private_key_path.display()
+            );
+            ADBRsaKey::new_random()?
+        };
+
+        let mut s = Self {
+            private_key,
+            inner: ADBMessageDevice::new(transport),
+        };
+
+        s.connect()?;
+
+        Ok(s)
+    }
+
+    /// Send initial connect
+    pub fn connect(&mut self) -> Result<()> {
+        self.get_transport_mut().connect()?;
+
+        let message = ADBTransportMessage::new(
+            MessageCommand::Cnxn,
+            0x0100_0000,
+            1_048_576,
+            format!("host::{}\0", env!("CARGO_PKG_NAME")).as_bytes(),
+        );
+
+        self.get_transport_mut().write_message(message)?;
+
+        let message = self.get_transport_mut().read_message()?;
+        // If the device returned CNXN instead of AUTH it does not require authentication,
+        // so we can skip the auth steps.
+        if message.header().command() == MessageCommand::Cnxn {
+            return Ok(());
+        }
+        message.assert_command(MessageCommand::Auth)?;
+
+        // At this point, we should have receive an AUTH message with arg0 == 1
+        let auth_message = match message.header().arg0() {
+            AUTH_TOKEN => message,
+            v => {
+                return Err(RustADBError::ADBRequestFailed(format!(
+                    "Received AUTH message with type != 1 ({v})"
+                )));
+            }
+        };
+
+        let sign = self.private_key.sign(auth_message.into_payload())?;
+
+        let message = ADBTransportMessage::new(MessageCommand::Auth, AUTH_SIGNATURE, 0, &sign);
+
+        self.get_transport_mut().write_message(message)?;
+
+        let received_response = self.get_transport_mut().read_message()?;
+
+        if received_response.header().command() == MessageCommand::Cnxn {
+            log::info!(
+                "Authentication OK, device info {}",
+                String::from_utf8(received_response.into_payload())?
+            );
+            return Ok(());
+        }
+
+        let mut pubkey = self.private_key.android_pubkey_encode()?.into_bytes();
+        pubkey.push(b'\0');
+
+        let message = ADBTransportMessage::new(MessageCommand::Auth, AUTH_RSAPUBLICKEY, 0, &pubkey);
+
+        self.get_transport_mut().write_message(message)?;
+
+        let response = self
+            .get_transport_mut()
+            .read_message_with_timeout(Duration::from_secs(10))
+            .and_then(|message| {
+                message.assert_command(MessageCommand::Cnxn)?;
+                Ok(message)
+            })?;
+
+        log::info!(
+            "Authentication OK, device info {}",
+            String::from_utf8(response.into_payload())?
+        );
+
+        Ok(())
+    }
+
+    #[inline]
+    pub(crate) fn get_transport_mut(&mut self) -> &mut T {
+        self.inner.get_transport_mut()
+    }
+}
+
+impl<T: ADBMessageTransport> ADBDeviceExt for ADBUSBDevice<T> {
+    #[inline]
+    fn shell_command(&mut self, command: &[&str], output: &mut dyn Write) -> Result<()> {
+        self.inner.shell_command(command, output)
+    }
+
+    #[inline]
+    fn shell<'a>(&mut self, reader: &mut dyn Read, writer: Box<dyn Write + Send>) -> Result<()> {
+        self.inner.shell(reader, writer)
+    }
+
+    #[inline]
+    fn stat(&mut self, remote_path: &str) -> Result<crate::AdbStatResponse> {
+        self.inner.stat(remote_path)
+    }
+
+    #[inline]
+    fn pull(&mut self, source: &dyn AsRef<str>, output: &mut dyn Write) -> Result<()> {
+        self.inner.pull(source, output)
+    }
+
+    #[inline]
+    fn push(&mut self, stream: &mut dyn Read, path: &dyn AsRef<str>) -> Result<()> {
+        self.inner.push(stream, path)
+    }
+
+    #[inline]
+    fn reboot(&mut self, reboot_type: crate::RebootType) -> Result<()> {
+        self.inner.reboot(reboot_type)
+    }
+
+    #[inline]
+    fn install(&mut self, apk_path: &dyn AsRef<Path>) -> Result<()> {
+        self.inner.install(apk_path)
+    }
+
+    #[inline]
+    fn uninstall(&mut self, package: &str) -> Result<()> {
+        self.inner.uninstall(package)
+    }
+
+    #[inline]
+    fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
+        self.inner.framebuffer_inner()
+    }
+}
+
+impl<T: ADBMessageTransport> Drop for ADBUSBDevice<T> {
+    fn drop(&mut self) {
+        // Best effort here
+        let _ = self.get_transport_mut().disconnect();
+    }
+}

adb_client/src/message_devices/usb/adb_webusb_device.rs

@@ -0,0 +1,69 @@
+use std::{
+    io::{Read, Write},
+    path::Path,
+};
+
+use crate::{
+    ADBDeviceExt, Result,
+    usb::{WebUsbTransport, adb_usb_device::ADBUSBDevice},
+};
+
+/// Implement Android USB device reachable over wired USB
+#[derive(Debug)]
+pub struct ADBWebUsbDevice {
+    inner: ADBUSBDevice<WebUsbTransport>,
+}
+
+impl ADBWebUsbDevice {
+    /// Instantiate a new [`ADBRusb`]
+    pub fn new(_vendor_id: u16, _product_id: u16) -> Result<Self> {
+        todo!()
+    }
+}
+
+impl ADBDeviceExt for ADBWebUsbDevice {
+    #[inline]
+    fn shell_command(&mut self, command: &[&str], output: &mut dyn Write) -> Result<()> {
+        self.inner.shell_command(command, output)
+    }
+
+    #[inline]
+    fn shell<'a>(&mut self, reader: &mut dyn Read, writer: Box<dyn Write + Send>) -> Result<()> {
+        self.inner.shell(reader, writer)
+    }
+
+    #[inline]
+    fn stat(&mut self, remote_path: &str) -> Result<crate::AdbStatResponse> {
+        self.inner.stat(remote_path)
+    }
+
+    #[inline]
+    fn pull(&mut self, source: &dyn AsRef<str>, output: &mut dyn Write) -> Result<()> {
+        self.inner.pull(source, output)
+    }
+
+    #[inline]
+    fn push(&mut self, stream: &mut dyn Read, path: &dyn AsRef<str>) -> Result<()> {
+        self.inner.push(stream, path)
+    }
+
+    #[inline]
+    fn reboot(&mut self, reboot_type: crate::RebootType) -> Result<()> {
+        self.inner.reboot(reboot_type)
+    }
+
+    #[inline]
+    fn install(&mut self, apk_path: &dyn AsRef<Path>) -> Result<()> {
+        self.inner.install(apk_path)
+    }
+
+    #[inline]
+    fn uninstall(&mut self, package: &str) -> Result<()> {
+        self.inner.uninstall(package)
+    }
+
+    #[inline]
+    fn framebuffer_inner(&mut self) -> Result<image::ImageBuffer<image::Rgba<u8>, Vec<u8>>> {
+        self.inner.framebuffer_inner()
+    }
+}

adb_client/src/message_devices/usb/backends/mod.rs

@@ -0,0 +1,7 @@
+#[cfg(feature = "rusb")]
+#[cfg_attr(docsrs, doc(cfg(feature = "rusb")))]
+pub mod rusb_transport;
+
+#[cfg(feature = "webusb")]
+#[cfg_attr(docsrs, doc(cfg(feature = "webusb")))]
+pub mod webusb_transport;

adb_client/src/message_devices/usb/backends/rusb_transport.rs

@@ -0,0 +1,266 @@
+use std::{sync::Arc, time::Duration};
+
+use rusb::{
+    Device, DeviceHandle, Direction, GlobalContext, TransferType,
+    constants::LIBUSB_CLASS_VENDOR_SPEC,
+};
+
+use crate::{
+    Result, RustADBError,
+    adb_transport::ADBTransport,
+    message_devices::{
+        adb_message_transport::ADBMessageTransport,
+        adb_transport_message::{ADBTransportMessage, ADBTransportMessageHeader},
+        message_commands::MessageCommand,
+    },
+    usb::constants::class_codes::ADB_SUBCLASS,
+};
+
+#[derive(Clone, Debug)]
+struct Endpoint {
+    iface: u8,
+    address: u8,
+    max_packet_size: usize,
+}
+
+/// Transport running on USB using `rusb` as a backend.
+#[derive(Debug, Clone)]
+pub struct RusbTransport {
+    device: Device<GlobalContext>,
+    handle: Option<Arc<DeviceHandle<GlobalContext>>>,
+    read_endpoint: Option<Endpoint>,
+    write_endpoint: Option<Endpoint>,
+}
+
+impl RusbTransport {
+    /// Instantiate a new [`RusbTransport`].
+    /// 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={vendor_id} and product_id={product_id}",
+        )))
+    }
+
+    /// Instantiate a new [`RusbTransport`] 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,
+            read_endpoint: None,
+            write_endpoint: None,
+        }
+    }
+
+    pub(crate) fn get_raw_connection(&self) -> Result<Arc<DeviceHandle<GlobalContext>>> {
+        self.handle
+            .as_ref()
+            .ok_or(RustADBError::IOError(std::io::Error::new(
+                std::io::ErrorKind::NotConnected,
+                "not connected",
+            )))
+            .cloned()
+    }
+
+    fn get_read_endpoint(&self) -> Result<Endpoint> {
+        self.read_endpoint
+            .as_ref()
+            .ok_or(RustADBError::IOError(std::io::Error::new(
+                std::io::ErrorKind::NotConnected,
+                "no read endpoint setup",
+            )))
+            .cloned()
+    }
+
+    fn get_write_endpoint(&self) -> Result<&Endpoint> {
+        self.write_endpoint
+            .as_ref()
+            .ok_or(RustADBError::IOError(std::io::Error::new(
+                std::io::ErrorKind::NotConnected,
+                "no write endpoint setup",
+            )))
+    }
+
+    fn configure_endpoint(handle: &DeviceHandle<GlobalContext>, endpoint: &Endpoint) -> Result<()> {
+        handle.claim_interface(endpoint.iface)?;
+        Ok(())
+    }
+
+    fn find_endpoints(handle: &DeviceHandle<GlobalContext>) -> Result<(Endpoint, Endpoint)> {
+        let mut read_endpoint: Option<Endpoint> = None;
+        let mut write_endpoint: Option<Endpoint> = None;
+
+        for n in 0..handle.device().device_descriptor()?.num_configurations() {
+            let Ok(config_desc) = handle.device().config_descriptor(n) else {
+                continue;
+            };
+
+            for interface in config_desc.interfaces() {
+                for interface_desc in interface.descriptors() {
+                    for endpoint_desc in interface_desc.endpoint_descriptors() {
+                        if endpoint_desc.transfer_type() == TransferType::Bulk
+                            && interface_desc.class_code() == LIBUSB_CLASS_VENDOR_SPEC
+                            && interface_desc.sub_class_code() == ADB_SUBCLASS
+                            && interface_desc.protocol_code() == 0x01
+                        {
+                            let endpoint = Endpoint {
+                                iface: interface_desc.interface_number(),
+                                address: endpoint_desc.address(),
+                                max_packet_size: endpoint_desc.max_packet_size() as usize,
+                            };
+                            match endpoint_desc.direction() {
+                                Direction::In => {
+                                    if let Some(write_endpoint) = write_endpoint {
+                                        return Ok((endpoint, write_endpoint));
+                                    }
+                                    read_endpoint = Some(endpoint);
+                                }
+                                Direction::Out => {
+                                    if let Some(read_endpoint) = read_endpoint {
+                                        return Ok((read_endpoint, endpoint));
+                                    }
+                                    write_endpoint = Some(endpoint);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Err(RustADBError::USBNoDescriptorFound)
+    }
+
+    fn write_bulk_data(&self, data: &[u8], timeout: Duration) -> Result<()> {
+        let endpoint = self.get_write_endpoint()?;
+        let handle = self.get_raw_connection()?;
+        let max_packet_size = endpoint.max_packet_size;
+
+        let mut offset = 0;
+        let data_len = data.len();
+        while offset < data_len {
+            let end = (offset + max_packet_size).min(data_len);
+            let write_amount = handle.write_bulk(endpoint.address, &data[offset..end], timeout)?;
+            offset += write_amount;
+
+            log::trace!("wrote chunk of size {write_amount} - {offset}/{data_len}",);
+        }
+
+        if offset % max_packet_size == 0 {
+            log::trace!("must send final zero-length packet");
+            handle.write_bulk(endpoint.address, &[], timeout)?;
+        }
+
+        Ok(())
+    }
+}
+
+impl ADBTransport for RusbTransport {
+    fn connect(&mut self) -> crate::Result<()> {
+        let device = self.device.open()?;
+
+        let (read_endpoint, write_endpoint) = Self::find_endpoints(&device)?;
+
+        Self::configure_endpoint(&device, &read_endpoint)?;
+        log::debug!("got read endpoint: {read_endpoint:?}");
+        self.read_endpoint = Some(read_endpoint);
+
+        Self::configure_endpoint(&device, &write_endpoint)?;
+        log::debug!("got write endpoint: {write_endpoint:?}");
+        self.write_endpoint = Some(write_endpoint);
+
+        self.handle = Some(Arc::new(device));
+
+        Ok(())
+    }
+
+    fn disconnect(&mut self) -> crate::Result<()> {
+        let message = ADBTransportMessage::new(MessageCommand::Clse, 0, 0, &[]);
+        if let Err(e) = self.write_message(message) {
+            log::error!("error while sending CLSE message: {e}");
+        }
+
+        if let Some(handle) = &self.handle {
+            let endpoint = self.read_endpoint.as_ref().or(self.write_endpoint.as_ref());
+            if let Some(endpoint) = &endpoint {
+                match handle.release_interface(endpoint.iface) {
+                    Ok(()) => log::debug!("succesfully released interface"),
+                    Err(e) => log::error!("error while release interface: {e}"),
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
+
+impl ADBMessageTransport for RusbTransport {
+    fn write_message_with_timeout(
+        &mut self,
+        message: ADBTransportMessage,
+        timeout: Duration,
+    ) -> Result<()> {
+        let message_bytes = message.header().as_bytes()?;
+        self.write_bulk_data(&message_bytes, timeout)?;
+
+        log::trace!("successfully write header: {} bytes", message_bytes.len());
+
+        let payload = message.into_payload();
+        if !payload.is_empty() {
+            self.write_bulk_data(&payload, timeout)?;
+            log::trace!("successfully write payload: {} bytes", payload.len());
+        }
+
+        Ok(())
+    }
+
+    fn read_message_with_timeout(&mut self, timeout: Duration) -> Result<ADBTransportMessage> {
+        let endpoint = self.get_read_endpoint()?;
+        let handle = self.get_raw_connection()?;
+        let max_packet_size = endpoint.max_packet_size;
+
+        let mut data = [0u8; 24];
+        let mut offset = 0;
+        while offset < data.len() {
+            let end = (offset + max_packet_size).min(data.len());
+            let chunk = &mut data[offset..end];
+            offset += handle.read_bulk(endpoint.address, chunk, timeout)?;
+        }
+
+        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 offset = 0;
+            while offset < msg_data.len() {
+                let end = (offset + max_packet_size).min(msg_data.len());
+                let chunk = &mut msg_data[offset..end];
+                offset += handle.read_bulk(endpoint.address, chunk, timeout)?;
+            }
+
+            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/message_devices/usb/backends/webusb_transport.rs

@@ -0,0 +1,48 @@
+use std::time::Duration;
+
+use crate::{
+    Result,
+    adb_transport::ADBTransport,
+    message_devices::{
+        adb_message_transport::ADBMessageTransport, adb_transport_message::ADBTransportMessage,
+    },
+};
+
+/// Transport running on USB using `webusb` as a backend.
+#[derive(Clone, Debug)]
+pub struct WebUsbTransport {}
+
+impl WebUsbTransport {
+    /// Instantiate a new [`WebUsbTransport`].
+    /// Only the first device with given vendor_id and product_id is returned.
+    pub fn new() -> Self {
+        WebUsbTransport {}
+    }
+}
+
+impl ADBTransport for WebUsbTransport {
+    fn connect(&mut self) -> crate::Result<()> {
+        todo!()
+    }
+
+    fn disconnect(&mut self) -> crate::Result<()> {
+        todo!()
+    }
+}
+
+impl ADBMessageTransport for WebUsbTransport {
+    fn read_message_with_timeout(
+        &mut self,
+        _read_timeout: Duration,
+    ) -> Result<ADBTransportMessage> {
+        todo!()
+    }
+
+    fn write_message_with_timeout(
+        &mut self,
+        message: ADBTransportMessage,
+        write_timeout: std::time::Duration,
+    ) -> Result<()> {
+        todo!()
+    }
+}

adb_client/src/message_devices/usb/mod.rs

@@ -0,0 +1,78 @@
+#![doc = include_str!("./README.md")]
+
+/// Common USB constants for Android Debug Bridge
+pub mod constants {
+    /// Standard Android vendor ID
+    pub const ANDROID_VENDOR_ID: u16 = 0x18d1;
+
+    /// Common ADB product IDs
+    pub mod product_ids {
+        /// ADB interface
+        pub const ADB: u16 = 0x4ee7;
+        /// ADB + MTP
+        pub const ADB_MTP: u16 = 0x4ee2;
+        /// ADB + RNDIS
+        pub const ADB_RNDIS: u16 = 0x4ee4;
+        /// Fastboot interface
+        pub const FASTBOOT: u16 = 0x4ee0;
+    }
+
+    /// USB class codes for ADB detection
+    pub mod class_codes {
+        /// ADB subclass code
+        pub const ADB_SUBCLASS: u8 = 0x42;
+        /// ADB protocol code
+        pub const ADB_PROTOCOL: u8 = 0x1;
+        /// Bulk transfer class
+        pub const BULK_CLASS: u8 = 0xdc;
+        /// Bulk ADB subclass
+        pub const BULK_ADB_SUBCLASS: u8 = 2;
+    }
+}
+
+// ###################################################
+// rusb specific modules
+#[cfg(feature = "rusb")]
+mod adb_rusb_device;
+
+// Device implementations
+#[cfg(feature = "rusb")]
+#[cfg_attr(docsrs, doc(cfg(feature = "rusb")))]
+pub use adb_rusb_device::ADBRusbDevice;
+
+// Transport implementations
+#[cfg(feature = "rusb")]
+#[cfg_attr(docsrs, doc(cfg(feature = "rusb")))]
+pub use backends::rusb_transport::RusbTransport;
+// ###################################################
+
+// ###################################################
+// webusb specific modules
+#[cfg(feature = "webusb")]
+mod adb_webusb_device;
+
+// Device implementations
+#[cfg(feature = "webusb")]
+#[cfg_attr(docsrs, doc(cfg(feature = "webusb")))]
+pub use adb_webusb_device::ADBWebUsbDevice;
+
+// Transport implementations
+#[cfg(feature = "webusb")]
+#[cfg_attr(docsrs, doc(cfg(feature = "webusb")))]
+pub use backends::webusb_transport::WebUsbTransport;
+// ###################################################
+
+mod backends;
+mod utils;
+
+#[cfg(any(feature = "rusb", feature = "webusb"))]
+mod adb_usb_device;
+
+// Utility functions
+#[cfg(any(feature = "rusb", feature = "webusb"))]
+#[cfg_attr(docsrs, doc(cfg(any(feature = "rusb", feature = "webusb"))))]
+pub use utils::read_adb_private_key;
+
+#[cfg(feature = "rusb")]
+#[cfg_attr(docsrs, doc(cfg(feature = "rusb")))]
+pub use utils::{is_adb_device, search_adb_devices};

adb_client/src/message_devices/usb/utils.rs

@@ -0,0 +1,98 @@
+//! USB utilities that are independent of specific transport implementations
+
+use crate::message_devices::adb_rsa_key::ADBRsaKey;
+use crate::{Result, RustADBError};
+use std::fs::read_to_string;
+use std::path::Path;
+
+#[cfg(feature = "rusb")]
+use rusb::{Device, DeviceDescriptor, UsbContext};
+
+#[cfg(feature = "rusb")]
+use rusb::constants::LIBUSB_CLASS_VENDOR_SPEC;
+
+use crate::usb::constants::class_codes::{
+    ADB_PROTOCOL, ADB_SUBCLASS, BULK_ADB_SUBCLASS, BULK_CLASS,
+};
+
+/// Read an ADB private key from a file path
+///
+/// Returns `Ok(None)` if the file doesn't exist, `Ok(Some(key))` if the key was successfully loaded,
+/// or an error if there was a problem reading the file.
+pub fn read_adb_private_key<P: AsRef<Path>>(private_key_path: P) -> Result<Option<ADBRsaKey>> {
+    // Try to read the private key file from given path
+    // If the file is not found, return None
+    // If there is another error while reading the file, return this error
+    // Else, return the private key content
+    let pk = match read_to_string(private_key_path.as_ref()) {
+        Ok(pk) => pk,
+        Err(e) if e.kind() == std::io::ErrorKind::NotFound => return Ok(None),
+        Err(e) => return Err(e.into()),
+    };
+
+    match ADBRsaKey::new_from_pkcs8(&pk) {
+        Ok(pk) => Ok(Some(pk)),
+        Err(e) => Err(e),
+    }
+}
+
+/// Search for ADB devices connected via USB
+///
+/// Returns the vendor_id and product_id of the first ADB device found,
+/// or `None` if no devices are found.
+#[cfg(feature = "rusb")]
+pub fn search_adb_devices() -> Result<Option<(u16, u16)>> {
+    let mut found_devices = vec![];
+    for device in rusb::devices()?.iter() {
+        let Ok(des) = device.device_descriptor() else {
+            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 {vid1:04x}:{pid1:04x} and {vid2:04x}:{pid2:04x}",
+        ))),
+    }
+}
+
+/// Check if a USB device is an ADB device
+///
+/// This function inspects the device descriptor and configuration to determine
+/// if it's an Android Debug Bridge device.
+#[cfg(feature = "rusb")]
+pub fn is_adb_device<T: UsbContext>(device: &Device<T>, des: &DeviceDescriptor) -> bool {
+    // Some devices require choosing the file transfer mode
+    // for usb debugging to take effect.
+    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 == LIBUSB_CLASS_VENDOR_SPEC && subcl == ADB_SUBCLASS)
+                        || (class == BULK_CLASS && subcl == BULK_ADB_SUBCLASS))
+                {
+                    return true;
+                }
+            }
+        }
+    }
+
+    false
+}

adb_client/src/models/framebuffer_info.rs

@@ -0,0 +1,97 @@
+use std::{iter::Map, slice::ChunksExact};
+
+use byteorder::{ByteOrder, LittleEndian};
+
+use crate::{Result, RustADBError};
+
+type U32ChunkIter<'a> = Map<ChunksExact<'a, u8>, fn(&[u8]) -> Result<u32>>;
+
+fn read_next(chunks: &mut U32ChunkIter) -> Result<u32> {
+    chunks
+        .next()
+        .ok_or(RustADBError::FramebufferConversionError)?
+}
+
+#[derive(Debug)]
+pub(crate) struct FrameBufferInfoV1 {
+    pub _bpp: u32,
+    pub size: u32,
+    pub width: u32,
+    pub height: u32,
+    pub _red_offset: u32,
+    pub _red_length: u32,
+    pub _blue_offset: u32,
+    pub _blue_length: u32,
+    pub _green_offset: u32,
+    pub _green_length: u32,
+    pub _alpha_offset: u32,
+    pub _alpha_length: u32,
+}
+
+impl TryFrom<[u8; std::mem::size_of::<Self>()]> for FrameBufferInfoV1 {
+    type Error = RustADBError;
+
+    fn try_from(
+        value: [u8; std::mem::size_of::<Self>()],
+    ) -> std::result::Result<Self, Self::Error> {
+        let mut chunks: U32ChunkIter = value.chunks_exact(4).map(|v| Ok(LittleEndian::read_u32(v)));
+
+        Ok(Self {
+            _bpp: read_next(&mut chunks)?,
+            size: read_next(&mut chunks)?,
+            width: read_next(&mut chunks)?,
+            height: read_next(&mut chunks)?,
+            _red_offset: read_next(&mut chunks)?,
+            _red_length: read_next(&mut chunks)?,
+            _blue_offset: read_next(&mut chunks)?,
+            _blue_length: read_next(&mut chunks)?,
+            _green_offset: read_next(&mut chunks)?,
+            _green_length: read_next(&mut chunks)?,
+            _alpha_offset: read_next(&mut chunks)?,
+            _alpha_length: read_next(&mut chunks)?,
+        })
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct FrameBufferInfoV2 {
+    pub _bpp: u32,
+    pub _color_space: u32,
+    pub size: u32,
+    pub width: u32,
+    pub height: u32,
+    pub _red_offset: u32,
+    pub _red_length: u32,
+    pub _blue_offset: u32,
+    pub _blue_length: u32,
+    pub _green_offset: u32,
+    pub _green_length: u32,
+    pub _alpha_offset: u32,
+    pub _alpha_length: u32,
+}
+
+impl TryFrom<[u8; std::mem::size_of::<Self>()]> for FrameBufferInfoV2 {
+    type Error = RustADBError;
+
+    fn try_from(
+        value: [u8; std::mem::size_of::<Self>()],
+    ) -> std::result::Result<Self, Self::Error> {
+        let mut chunks: U32ChunkIter = value.chunks_exact(4).map(|v| Ok(LittleEndian::read_u32(v)));
+
+        Ok(Self {
+            _bpp: read_next(&mut chunks)?,
+            _color_space: read_next(&mut chunks)?,
+            size: read_next(&mut chunks)?,
+            width: read_next(&mut chunks)?,
+            height: read_next(&mut chunks)?,
+            _red_offset: read_next(&mut chunks)?,
+            _red_length: read_next(&mut chunks)?,
+            _blue_offset: read_next(&mut chunks)?,
+            _blue_length: read_next(&mut chunks)?,
+            _green_offset: read_next(&mut chunks)?,
+            _green_length: read_next(&mut chunks)?,
+            _alpha_offset: read_next(&mut chunks)?,
+            _alpha_length: read_next(&mut chunks)?,
+        })
+    }
+}

adb_client/src/models/host_features.rs

@@ -1,8 +1,11 @@
 use std::fmt::Display;
 
+/// Available host features.
 #[derive(Debug, PartialEq)]
 pub enum HostFeatures {
+    /// Shell version 2.
     ShellV2,
+    /// Command.
     Cmd,
 }
 

adb_client/src/models/mod.rs

@@ -1,28 +1,13 @@
-mod adb_emulator_command;
 mod adb_request_status;
-mod adb_server_command;
 mod adb_stat_response;
-mod adb_version;
+mod framebuffer_info;
-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;
+pub(crate) use adb_request_status::AdbRequestStatus;
-pub use adb_request_status::AdbRequestStatus;
-pub(crate) use adb_server_command::AdbServerCommand;
 pub use adb_stat_response::AdbStatResponse;
-pub use adb_version::AdbVersion;
+pub(crate) use framebuffer_info::{FrameBufferInfoV1, FrameBufferInfoV2};
-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(crate) use sync_command::SyncCommand;
-pub use server_status::ServerStatus;
-pub use sync_command::SyncCommand;

adb_client/src/models/reboot_type.rs

@@ -13,6 +13,8 @@ pub enum RebootType {
     Sideload,
     /// Same as `Sideload` but reboots after sideloading
     SideloadAutoReboot,
+    /// Reboots to fastboot
+    Fastboot,
 }
 
 impl Display for RebootType {
@@ -23,6 +25,7 @@ impl Display for RebootType {
             RebootType::Recovery => write!(f, "recovery"),
             RebootType::Sideload => write!(f, "sideload"),
             RebootType::SideloadAutoReboot => write!(f, "sideload-auto-reboot"),
+            RebootType::Fastboot => write!(f, "fastboot"),
         }
     }
 }

adb_client/src/server/README.md

@@ -0,0 +1,15 @@
+# Examples
+
+## Get available ADB devices
+
+```rust no_run
+use adb_client::server::ADBServer;
+use std::net::{SocketAddrV4, Ipv4Addr};
+
+// A custom server address can be provided
+let server_ip = Ipv4Addr::new(127, 0, 0, 1);
+let server_port = 5037;
+
+let mut server = ADBServer::new(SocketAddrV4::new(server_ip, server_port));
+server.devices();
+```

adb_client/src/server/adb_server.rs

@@ -1,7 +1,7 @@
 use crate::ADBTransport;
 use crate::Result;
 use crate::RustADBError;
-use crate::TCPServerTransport;
+use crate::server::tcp_server_transport::TCPServerTransport;
 use std::collections::HashMap;
 use std::net::SocketAddrV4;
 use std::process::Command;
@@ -9,21 +9,62 @@ use std::process::Command;
 /// Represents an ADB Server
 #[derive(Debug, Default)]
 pub struct ADBServer {
-    /// Internal [TcpStream], lazily initialized
+    /// Internal [`TcpStream`], lazily initialized
     pub(crate) transport: Option<TCPServerTransport>,
     /// Address to connect to
     pub(crate) socket_addr: Option<SocketAddrV4>,
     /// adb-server start envs
     pub(crate) envs: HashMap<String, String>,
+    /// Path to adb binary
+    /// If not set, will use adb from PATH
+    pub(crate) adb_path: Option<String>,
 }
 
 impl ADBServer {
-    /// Instantiates a new [ADBServer]
+    /// Instantiates a new [`ADBServer`]
     pub fn new(address: SocketAddrV4) -> Self {
         Self {
             transport: None,
             socket_addr: Some(address),
             envs: HashMap::new(),
+            adb_path: None,
+        }
+    }
+
+    /// Instantiates a new [`ADBServer`] with a custom adb path
+    pub fn new_from_path(address: SocketAddrV4, adb_path: Option<String>) -> Self {
+        Self {
+            transport: None,
+            socket_addr: Some(address),
+            envs: HashMap::new(),
+            adb_path,
+        }
+    }
+
+    /// Start an instance of `adb-server`
+    pub fn start(envs: &HashMap<String, String>, adb_path: &Option<String>) {
+        // ADB Server is local, we start it if not already running
+        let mut command = Command::new(adb_path.as_deref().unwrap_or("adb"));
+        command.arg("start-server");
+        for (env_k, env_v) in envs {
+            command.env(env_k, env_v);
+        }
+
+        #[cfg(target_os = "windows")]
+        {
+            use std::os::windows::process::CommandExt;
+            // Do not show a prompt on Windows
+            command.creation_flags(0x08000000);
+        }
+
+        let child = command.spawn();
+        match child {
+            Ok(mut child) => {
+                if let Err(e) = child.wait() {
+                    log::error!("error while starting adb server: {e}");
+                }
+            }
+            Err(e) => log::error!("error while starting adb server: {e}"),
         }
     }
 
@@ -52,22 +93,7 @@ impl ADBServer {
         };
 
         if is_local_ip {
-            // ADB Server is local, we start it if not already running
+            Self::start(&self.envs, &self.adb_path);
-            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() {
-                        log::error!("error while starting adb server: {e}")
-                    }
-                }
-                Err(e) => log::error!("error while starting adb server: {e}"),
-            }
         }
 
         transport.connect()?;
@@ -79,7 +105,7 @@ impl ADBServer {
 
 impl Drop for ADBServer {
     fn drop(&mut self) {
-        if let Some(ref mut transport) = &mut self.transport {
+        if let Some(transport) = &mut self.transport {
             let _ = transport.disconnect();
         }
     }

adb_client/src/server/adb_server_command.rs

@@ -1,6 +1,10 @@
 use std::fmt::Display;
 
-use super::RebootType;
+use crate::{
+    RebootType,
+    server::{WaitForDeviceState, WaitForDeviceTransport},
+};
+
 use std::net::SocketAddrV4;
 
 pub(crate) enum AdbServerCommand {
@@ -20,7 +24,9 @@ pub(crate) enum AdbServerCommand {
     MDNSServices,
     ServerStatus,
     ReconnectOffline,
+    Uninstall(String),
     Install(u64),
+    WaitForDevice(WaitForDeviceState, WaitForDeviceTransport),
     // Local commands
     ShellCommand(String),
     Shell,
@@ -59,8 +65,8 @@ impl Display for AdbServerCommand {
             AdbServerCommand::Reboot(reboot_type) => {
                 write!(f, "reboot:{reboot_type}")
             }
-            AdbServerCommand::Connect(addr) => write!(f, "host:connect:{}", addr),
+            AdbServerCommand::Connect(addr) => write!(f, "host:connect:{addr}"),
-            AdbServerCommand::Disconnect(addr) => write!(f, "host:disconnect:{}", addr),
+            AdbServerCommand::Disconnect(addr) => write!(f, "host:disconnect:{addr}"),
             AdbServerCommand::Pair(addr, code) => {
                 write!(f, "host:pair:{code}:{addr}")
             }
@@ -83,6 +89,15 @@ impl Display for AdbServerCommand {
             }
             AdbServerCommand::Usb => write!(f, "usb:"),
             AdbServerCommand::Install(size) => write!(f, "exec:cmd package 'install' -S {size}"),
+            AdbServerCommand::Uninstall(package) => {
+                write!(f, "exec:cmd package 'uninstall' {package}")
+            }
+            AdbServerCommand::WaitForDevice(wait_for_device_state, wait_for_device_transport) => {
+                write!(
+                    f,
+                    "host:wait-for-{wait_for_device_transport}-{wait_for_device_state}"
+                )
+            }
         }
     }
 }

adb_client/src/server/commands/connect.rs

@@ -1,4 +1,7 @@
-use crate::{models::AdbServerCommand, ADBServer, Result, RustADBError};
+use crate::{
+    Result, RustADBError,
+    server::{ADBServer, AdbServerCommand},
+};
 use std::net::SocketAddrV4;
 
 impl ADBServer {

adb_client/src/server/commands/devices.rs

@@ -1,8 +1,10 @@
 use std::io::Read;
 
 use crate::{
-    models::{AdbServerCommand, DeviceShort},
+    Result, RustADBError,
-    ADBEmulatorDevice, ADBServer, ADBServerDevice, DeviceLong, Result, RustADBError,
+    emulator::ADBEmulatorDevice,
+    server::{ADBServer, AdbServerCommand, DeviceLong, DeviceShort},
+    server_device::ADBServerDevice,
 };
 
 impl ADBServer {
@@ -36,7 +38,7 @@ impl ADBServer {
                 break;
             }
 
-            vec_devices.push(DeviceLong::try_from(device.to_vec())?);
+            vec_devices.push(DeviceLong::try_from(device)?);
         }
 
         Ok(vec_devices)
@@ -69,12 +71,12 @@ impl ADBServer {
             .filter(|d| d.identifier.as_str() == name)
             .collect::<Vec<DeviceShort>>()
             .len();
-        if nb_devices != 1 {
+        if nb_devices == 1 {
+            Ok(ADBServerDevice::new(name.to_string(), self.socket_addr))
+        } else {
             Err(RustADBError::DeviceNotFound(format!(
                 "could not find device {name}"
             )))
-        } else {
-            Ok(ADBServerDevice::new(name.to_string(), self.socket_addr))
         }
     }
 
@@ -97,7 +99,12 @@ impl ADBServer {
                     .get_raw_connection()?
                     .read_exact(&mut body)?;
 
-                callback(DeviceShort::try_from(body)?)?;
+                for device in body.split(|x| x.eq(&b'\n')) {
+                    if device.is_empty() {
+                        break;
+                    }
+                    callback(DeviceShort::try_from(device.to_vec())?)?;
+                }
             }
         }
     }

adb_client/src/server/commands/disconnect.rs

@@ -1,4 +1,7 @@
-use crate::{models::AdbServerCommand, ADBServer, Result, RustADBError};
+use crate::{
+    Result, RustADBError,
+    server::{ADBServer, AdbServerCommand},
+};
 use std::net::SocketAddrV4;
 
 impl ADBServer {

adb_client/src/server/commands/kill.rs

@@ -1,4 +1,7 @@
-use crate::{models::AdbServerCommand, ADBServer, Result};
+use crate::{
+    Result,
+    server::{ADBServer, AdbServerCommand},
+};
 
 impl ADBServer {
     /// Asks the ADB server to quit immediately.