feat: v2.0.0

Support devices over usb (#40 )
* feat: device interactions over USB (shell, push, pull, reboot for now) * feat: parse vid and pid from hex as seen in lsusb output (#32) * usb: Read RSA keypair from user home or generate them (#34) * feat read keypair from user home or generate ephemeral ones --------- Co-authored-by: LIAUD Corentin <corentin.liaud@orange.fr> Co-authored-by: Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com>
2024-10-25 18:13:11 +02:00 · 2024-10-25 18:09:41 +02:00 · 2024-10-24 12:21:29 +02:00 · 2024-10-11 15:43:51 +02:00 · 2024-10-11 15:33:00 +02:00 · 2024-10-10 16:41:16 +02:00
45 changed files with 1679 additions and 208 deletions
--- a/.github/workflows/rust-build.yml
+++ b/.github/workflows/rust-build.yml
@@ -0,0 +1,15 @@
+name: Rust - Build
+
+on: [push]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build-release:
+    name: "build-release"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build project
+      run: cargo build --release
--- a/.github/workflows/rust-quality.yml
+++ b/.github/workflows/rust-quality.yml
@@ -0,0 +1,32 @@
+name: Rust - Quality
+
+on: [push]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  clippy:
+    name: "clippy"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: rustup component add clippy
+      - name: Run clippy
+        run : cargo clippy
+
+  fmt:
+    name: "fmt"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run formatter
+        run : cargo fmt --all --check
+
+  tests:
+    name: "tests"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run tests
+        run: cargo test --verbose
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,11 +4,12 @@ resolver = "2"

 [workspace.package]
 edition = "2021"
+keywords = ["adb", "android", "tcp", "usb"]
 license = "MIT"
 repository = "https://github.com/cocool97/adb_client"
-version = "1.0.7"
+version = "2.0.0"

-# To build locally when working on a new version
+# To build locally when working on a new release
 [patch.crates-io]
 adb_client = { path = "./adb_client" }

@@ -17,4 +18,4 @@ codegen-units = 1
 debug-assertions = false
 lto = "thin"
 opt-level = 'z'
-strip = true
+strip = true
--- a/README.md
+++ b/README.md
@@ -1,31 +1,43 @@
-# Rust adb_client
+<p align="center" style="text-align: center">
+  <img src="assets/logo.png" width="33%">
+</p>

-[![Latest version](https://img.shields.io/crates/v/adb_client.svg)](https://crates.io/crates/adb_client)
-[![dependency status](https://deps.rs/repo/github/cocool97/adb_client/status.svg)](https://deps.rs/repo/github/cocool97/adb_client)
+<p align="center">
+    <p align="center">Android Debug Bridge (ADB) client implementation in pure Rust !</p>
+    <p align="center">
+        <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://deps.rs/repo/github/cocool97/adb_client">
+            <img alt="dependency status" src="https://deps.rs/repo/github/cocool97/adb_client/status.svg"/>
+        </a>
+    </p>
+</p>

-**A**ndroid **D**ebug **B**ridge (ADB) client implementation in pure Rust !
+Main features of this library:

-Main features :
-
- Full Rust, no need to use `adb *` shell commands
- Currently only support server TCP/IP protocol
+- Full Rust, don't use `adb *` shell commands to interact with devices
+- Supports:
+  - **TCP/IP** protocol, using ADB server as a proxy (standard behavior when using `adb` CLI)
+  - **USB** protocol, interacting directly with end devices
+- Implements hidden `adb` features, like `framebuffer`
 - Highly configurable
 - Easy to use !

 ## adb_client

-Rust library implementing ADB protocol and providing high-level abstraction over commands.
+Rust library implementing both ADB protocols and providing a high-level abstraction over many supported commands.

 Improved documentation [here](./adb_client/README.md).

 ## adb_cli

-Rust binary providing an improved version of `adb` CLI, using `adb_client` library. Can be used as an usage example of the library.
+Rust binary providing an improved version of official `adb` CLI, wrapping `adb_client` library. Can act as an usage example of the library.

 Improved documentation [here](./adb_cli/README.md).

-## Missing features
+## Related publications

- USB protocol (Work in progress)
+- [Diving into ADB protocol internals (1/2)](https://www.synacktiv.com/publications/diving-into-adb-protocol-internals-12)

-All pull requests are welcome !
+Some features may still be missing, all pull requests are welcome !
--- a/adb_cli/Cargo.toml
+++ b/adb_cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Rust ADB (Android Debug Bridge) CLI"
 edition.workspace = true
-keywords = ["adb", "android"]
+keywords.workspace = true
 license.workspace = true
 name = "adb_cli"
 readme = "README.md"
@@ -9,8 +9,11 @@ repository.workspace = true
 version.workspace = true

 [dependencies]
-adb_client = { version = "1.0.6" }
+adb_client = { version = "2.0.0" }
 anyhow = { version = "1.0.89" }
 clap = { version = "4.5.18", features = ["derive"] }
 env_logger = { version = "0.11.5" }
-log = "0.4.22"
+log = { version = "0.4.22" }
+
+[target.'cfg(unix)'.dependencies]
+termios = { version = "0.3.3" }
--- a/adb_cli/README.md
+++ b/adb_cli/README.md
@@ -15,6 +15,8 @@ cargo install adb_cli

 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
 Rust ADB (Android Debug Bridge) CLI
@@ -49,3 +51,26 @@ Options:
  -h, --help               Print help
  -V, --version            Print version
 ```
+
+- To interact directly with end devices
+
+```bash
+user@laptop ~/adb_client (main)> adb_cli usb --help
+Device commands via USB, no server needed
+
+Usage: adb_cli usb [OPTIONS] --vendor-id <VID> --product-id <PID> <COMMAND>
+
+Commands:
+  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
+  reboot  Reboot the device
+  help    Print this message or the help of the given subcommand(s)
+
+Options:
+  -v, --vendor-id <VID>                    Hexadecimal vendor id of this USB device
+  -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
+```
--- a/adb_client/src/adb_termios.rs
+++ b/adb_client/src/adb_termios.rs
@@ -1,3 +1,5 @@
+#![cfg(any(target_os = "linux", target_os = "macos"))]
+
 use std::os::unix::prelude::{AsRawFd, RawFd};

 use termios::{tcsetattr, Termios, TCSANOW, VMIN, VTIME};
@@ -33,6 +35,8 @@ impl ADBTermios {
 impl Drop for ADBTermios {
    fn drop(&mut self) {
        // Custom drop implementation, restores previous termios structure.
-        tcsetattr(self.fd, TCSANOW, &self.old_termios).unwrap();
+        if let Err(e) = tcsetattr(self.fd, TCSANOW, &self.old_termios) {
+            log::error!("Error while droping ADBTermios: {e}")
+        }
    }
 }
--- a/adb_cli/src/commands/local.rs
+++ b/adb_cli/src/commands/local.rs
@@ -15,11 +15,11 @@ pub enum LocalCommand {
    /// Stat a file specified on device
    Stat { path: String },
    /// Spawn an interactive shell or run a list of commands on the device
-    Shell { command: Vec<String> },
+    Shell { commands: Vec<String> },
    /// Reboot the device
    Reboot {
        #[clap(subcommand)]
-        sub_command: RebootTypeCommand,
+        reboot_type: RebootTypeCommand,
    },
    /// Dump framebuffer of device
    Framebuffer { path: String },
--- a/adb_cli/src/commands/mod.rs
+++ b/adb_cli/src/commands/mod.rs
@@ -1,7 +1,9 @@
 mod emu;
 mod host;
 mod local;
+mod usb;

 pub use emu::EmuCommand;
 pub use host::HostCommand;
 pub use local::LocalCommand;
+pub use usb::{UsbCommand, UsbCommands};
--- a/adb_cli/src/commands/usb.rs
+++ b/adb_cli/src/commands/usb.rs
@@ -0,0 +1,42 @@
+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: u16,
+    /// Hexadecimal product id of this USB device
+    #[clap(short = 'p', long = "product-id", value_parser=parse_hex_id, value_name="PID")]
+    pub product_id: u16,
+    /// 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 },
+    /// Reboot the device
+    Reboot {
+        #[clap(subcommand)]
+        reboot_type: RebootTypeCommand,
+    },
+}
--- a/adb_cli/src/main.rs
+++ b/adb_cli/src/main.rs
@@ -1,12 +1,15 @@
+#![doc = include_str!("../README.md")]
+
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+mod adb_termios;
+
 mod commands;
 mod models;

-use adb_client::{ADBEmulatorDevice, ADBServer, DeviceShort};
+use adb_client::{ADBDeviceExt, ADBEmulatorDevice, ADBServer, ADBUSBDevice, DeviceShort};
 use anyhow::{anyhow, Result};
 use clap::Parser;
-use commands::{EmuCommand, HostCommand, LocalCommand};
-use env_logger::Builder;
-use log::LevelFilter;
+use commands::{EmuCommand, HostCommand, LocalCommand, UsbCommands};
 use models::{Command, Opts};
 use std::fs::File;
 use std::io::Write;
@@ -14,15 +17,7 @@ use std::path::Path;

 fn main() -> Result<()> {
    let opt = Opts::parse();
-
-    let max_level = if opt.verbose {
-        LevelFilter::Trace
-    } else {
-        LevelFilter::Info
-    };
-    let mut builder = Builder::default();
-    builder.filter_level(max_level);
-    builder.init();
+    env_logger::init();

    match opt.command {
        Command::Local(local) => {
@@ -36,12 +31,12 @@ fn main() -> Result<()> {
            match local {
                LocalCommand::Pull { path, filename } => {
                    let mut output = File::create(Path::new(&filename))?;
-                    device.recv(&path, &mut output)?;
+                    device.pull(&path, &mut output)?;
                    log::info!("Downloaded {path} as {filename}");
                }
                LocalCommand::Push { filename, path } => {
                    let mut input = File::open(Path::new(&filename))?;
-                    device.send(&mut input, &path)?;
+                    device.push(&mut input, &path)?;
                    log::info!("Uploaded {filename} to {path}");
                }
                LocalCommand::List { path } => {
@@ -49,13 +44,25 @@ fn main() -> Result<()> {
                }
                LocalCommand::Stat { path } => {
                    let stat_response = device.stat(path)?;
-                    log::info!("{}", stat_response);
+                    println!("{}", stat_response);
                }
-                LocalCommand::Shell { command } => {
-                    if command.is_empty() {
-                        device.shell()?;
+                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(command, std::io::stdout())?;
+                        device.shell_command(commands, std::io::stdout())?;
                    }
                }
                LocalCommand::HostFeatures => {
@@ -67,9 +74,9 @@ fn main() -> Result<()> {
                        .ok_or(anyhow!("cannot list features"))?;
                    log::info!("Available host features: {features}");
                }
-                LocalCommand::Reboot { sub_command } => {
-                    log::info!("Reboots device");
-                    device.reboot(sub_command.into())?
+                LocalCommand::Reboot { reboot_type } => {
+                    log::info!("Reboots device in mode {:?}", reboot_type);
+                    device.reboot(reboot_type.into())?
                }
                LocalCommand::Framebuffer { path } => {
                    device.framebuffer(&path)?;
@@ -150,6 +157,57 @@ fn main() -> Result<()> {
                EmuCommand::Rotate => emulator.rotate()?,
            }
        }
+        Command::Usb(usb) => {
+            let mut device = match usb.path_to_private_key {
+                Some(pk) => {
+                    ADBUSBDevice::new_with_custom_private_key(usb.vendor_id, usb.product_id, pk)?
+                }
+                None => ADBUSBDevice::new(usb.vendor_id, usb.product_id)?,
+            };
+
+            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}");
+                }
+            }
+        }
    }

    Ok(())
--- a/adb_cli/src/models/opts.rs
+++ b/adb_cli/src/models/opts.rs
@@ -2,13 +2,11 @@ use std::net::SocketAddrV4;

 use clap::Parser;

-use crate::commands::{EmuCommand, HostCommand, LocalCommand};
+use crate::commands::{EmuCommand, HostCommand, LocalCommand, UsbCommand};

 #[derive(Parser, Debug)]
 #[clap(about, version, author)]
 pub struct Opts {
-    #[clap(short = 'v', long = "verbose")]
-    pub verbose: bool,
    #[clap(short = 'a', long = "address", default_value = "127.0.0.1:5037")]
    pub address: SocketAddrV4,
    /// Serial id of a specific device. Every request will be sent to this device.
@@ -24,6 +22,9 @@ pub enum Command {
    Local(LocalCommand),
    #[clap(flatten)]
    Host(HostCommand),
-    #[clap(flatten)]
+    /// Emulator specific commands
+    #[clap(subcommand)]
    Emu(EmuCommand),
+    /// Device commands via USB, no server needed
+    Usb(UsbCommand),
 }
--- a/adb_client/Cargo.toml
+++ b/adb_client/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Rust ADB (Android Debug Bridge) client library"
 edition.workspace = true
-keywords = ["adb", "android"]
+keywords.workspace = true
 license.workspace = true
 name = "adb_client"
 readme = "README.md"
@@ -9,13 +9,19 @@ repository.workspace = true
 version.workspace = true

 [dependencies]
+base64 = "0.22.1"
+bincode = "1.3.3"
 byteorder = { version = "1.5.0" }
 chrono = { version = "0.4.38" }
-homedir = "0.3.3"
-image = { version = "0.25.2" }
+homedir = { version = "0.3.4" }
+image = { version = "0.25.4" }
 lazy_static = { version = "1.5.0" }
-log = "0.4.22"
-mio = { version = "1.0.2", features = ["os-ext", "os-poll"] }
-regex = { version = "1.10.6", features = ["perf", "std", "unicode"] }
-termios = { version = "0.3.3" }
+log = { version = "0.4.22" }
+num-bigint = { version = "0.6", package = "num-bigint-dig" }
+rand = { version = "0.7.0" }
+regex = { version = "1.11.0", features = ["perf", "std", "unicode"] }
+rsa = { version = "0.3.0" }
+rusb = { version = "0.9.4", features = ["vendored"] }
+serde = { version = "1.0.210", features = ["derive"] }
+serde_repr = "0.1.19"
 thiserror = { version = "1.0.64" }
--- a/adb_client/README.md
+++ b/adb_client/README.md
@@ -17,16 +17,6 @@ adb_client = "*"

 ## Examples

-### Launch a command on device via ADB server
-
-```rust no_run
-use adb_client::ADBServer;
-
-let mut server = ADBServer::default();
-let mut device = server.get_device().expect("cannot get device");
-device.shell_command(["df", "-h"],std::io::stdout());
-```
-
 ### Get available ADB devices

 ```rust no_run
@@ -41,7 +31,19 @@ let mut server = ADBServer::new(SocketAddrV4::new(server_ip, server_port));
 server.devices();
 ```

-### Push a file to the device
+### Using ADB server as proxy
+
+#### [TCP] Launch a command on device
+
+```rust no_run
+use adb_client::{ADBServer, ADBDeviceExt};
+
+let mut server = ADBServer::default();
+let mut device = server.get_device().expect("cannot get device");
+device.shell_command(["df", "-h"],std::io::stdout());
+```
+
+#### [TCP] Push a file to the device

 ```rust no_run
 use adb_client::ADBServer;
@@ -51,6 +53,33 @@ 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")).unwrap();
-device.send(&mut input, "/data/local/tmp");
+let mut input = File::open(Path::new("/tmp/f")).expect("Cannot open file");
+device.push(&mut input, "/data/local/tmp");
+```
+
+### Interacting directly with device
+
+#### [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");
 ```
--- a/adb_client/src/adb_device_ext.rs
+++ b/adb_client/src/adb_device_ext.rs
@@ -0,0 +1,31 @@
+use std::io::{Read, Write};
+
+use crate::models::AdbStatResponse;
+use crate::{RebootType, Result};
+
+/// Trait representing all features available on both [`ADBServerDevice`] and [`ADBUSBDevice`]
+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>(
+        &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<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<()>;
+
+    /// Push [stream] to [path] on the device.
+    fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()>;
+
+    /// Reboots the device using given reboot type
+    fn reboot(&mut self, reboot_type: RebootType) -> Result<()>;
+}
--- a/adb_client/src/error.rs
+++ b/adb_client/src/error.rs
@@ -54,7 +54,37 @@ pub enum RustADBError {
    /// An error occurred when converting framebuffer content
    #[error("Cannot convert framebuffer into image")]
    FramebufferConversionError,
+    /// Unimplemented framebuffer image version
+    #[error("Unimplemented framebuffer image version: {0}")]
+    UnimplementedFramebufferImageVersion(u32),
    /// An error occurred while getting user's home directory
    #[error(transparent)]
    HomeError(#[from] homedir::GetHomeError),
+    /// Cannot get home directory
+    #[error("Cannot get home directory")]
+    NoHomeDirectory,
+    /// Generic USB error
+    #[error(transparent)]
+    UsbError(#[from] rusb::Error),
+    /// USB device not found
+    #[error("USB Device not found: {0} {1}")]
+    USBDeviceNotFound(u16, u16),
+    /// No descriptor found
+    #[error("No USB descriptor found")]
+    USBNoDescriptorFound,
+    /// Integrity of the received message cannot be validated
+    #[error("Invalid integrity. Expected CRC32 {0}, got {1}")]
+    InvalidIntegrity(u32, u32),
+    /// Error while decoding base64 data
+    #[error(transparent)]
+    Base64DecodeError(#[from] base64::DecodeError),
+    /// Error while encoding base64 data
+    #[error(transparent)]
+    Base64EncodeError(#[from] base64::EncodeSliceError),
+    /// An error occurred with RSA engine
+    #[error(transparent)]
+    RSAError(#[from] rsa::errors::Error),
+    /// Cannot convert given data from slice
+    #[error(transparent)]
+    TryFromSliceError(#[from] std::array::TryFromSliceError),
 }
--- a/adb_client/src/lib.rs
+++ b/adb_client/src/lib.rs
@@ -4,16 +4,19 @@
 #![forbid(missing_docs)]
 #![doc = include_str!("../README.md")]

-mod adb_termios;
+mod adb_device_ext;
 mod constants;
 mod emulator;
 mod error;
 mod models;
 mod server;
 mod transports;
+mod usb;
 mod utils;

+pub use adb_device_ext::ADBDeviceExt;
 pub use error::{Result, RustADBError};
 pub use models::{AdbVersion, DeviceLong, DeviceShort, DeviceState, RebootType};
 pub use server::*;
 pub use transports::*;
+pub use usb::ADBUSBDevice;
--- a/adb_client/src/models/adb_stat_response.rs
+++ b/adb_client/src/models/adb_stat_response.rs
@@ -0,0 +1,43 @@
+use byteorder::ByteOrder;
+use chrono::{DateTime, Utc};
+use std::{
+    fmt::Display,
+    time::{Duration, UNIX_EPOCH},
+};
+
+use byteorder::LittleEndian;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct AdbStatResponse {
+    pub file_perm: u32,
+    pub file_size: u32,
+    pub mod_time: u32,
+}
+
+impl From<[u8; 12]> for AdbStatResponse {
+    fn from(value: [u8; 12]) -> Self {
+        Self {
+            file_perm: LittleEndian::read_u32(&value[0..4]),
+            file_size: LittleEndian::read_u32(&value[4..8]),
+            mod_time: LittleEndian::read_u32(&value[8..]),
+        }
+    }
+}
+
+impl Display for AdbStatResponse {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let d = UNIX_EPOCH + Duration::from_secs(self.mod_time.into());
+        // Create DateTime from SystemTime
+        let datetime = DateTime::<Utc>::from(d);
+
+        writeln!(f, "File permissions: {}", self.file_perm)?;
+        writeln!(f, "File size: {} bytes", self.file_size)?;
+        write!(
+            f,
+            "Modification time: {}",
+            datetime.format("%Y-%m-%d %H:%M:%S.%f %Z")
+        )?;
+        Ok(())
+    }
+}
--- a/adb_client/src/models/device_long.rs
+++ b/adb_client/src/models/device_long.rs
@@ -68,14 +68,13 @@ impl TryFrom<Vec<u8>> for DeviceLong {
                    .as_bytes()
                    .to_vec(),
            )?)?,
-            usb: String::from_utf8(
-                groups
-                    .name("usb1")
-                    .or_else(|| groups.name("usb2"))
-                    .ok_or(RustADBError::RegexParsingError)?
-                    .as_bytes()
-                    .to_vec(),
-            )?,
+            usb: match groups.name("usb1") {
+                None => match groups.name("usb2") {
+                    None => "Unk".to_string(),
+                    Some(usb) => String::from_utf8(usb.as_bytes().to_vec())?,
+                },
+                Some(usb) => String::from_utf8(usb.as_bytes().to_vec())?,
+            },
            product: match groups.name("product") {
                None => "Unk".to_string(),
                Some(product) => String::from_utf8(product.as_bytes().to_vec())?,
--- a/adb_client/src/models/device_short.rs
+++ b/adb_client/src/models/device_short.rs
@@ -5,7 +5,8 @@ use std::{fmt::Display, str::FromStr};
 use crate::{DeviceState, RustADBError};

 lazy_static! {
-    static ref DEVICES_REGEX: Regex = Regex::new("^(\\S+)\t(\\w+)\n?$").unwrap();
+    static ref DEVICES_REGEX: Regex =
+        Regex::new("^(\\S+)\t(\\w+)\n?$").expect("Cannot build devices regex");
 }

 /// Represents a device connected to the ADB server.
@@ -28,7 +29,9 @@ impl TryFrom<Vec<u8>> for DeviceShort {

    fn try_from(value: Vec<u8>) -> Result<Self, Self::Error> {
        // Optional final '\n' is used to match TrackDevices inputs
-        let groups = DEVICES_REGEX.captures(&value).unwrap();
+        let groups = DEVICES_REGEX
+            .captures(&value)
+            .ok_or(RustADBError::RegexParsingError)?;
        Ok(DeviceShort {
            identifier: String::from_utf8(
                groups
--- a/adb_client/src/models/mod.rs
+++ b/adb_client/src/models/mod.rs
@@ -1,6 +1,7 @@
 mod adb_emulator_command;
 mod adb_request_status;
 mod adb_server_command;
+mod adb_stat_response;
 mod adb_version;
 mod device_long;
 mod device_short;
@@ -12,6 +13,7 @@ mod sync_command;
 pub(crate) use adb_emulator_command::ADBEmulatorCommand;
 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 use device_long::DeviceLong;
 pub use device_short::DeviceShort;
--- a/adb_client/src/server/adb_server_device_commands.rs
+++ b/adb_client/src/server/adb_server_device_commands.rs
@@ -1,33 +1,13 @@
-use std::{
-    io::{self, Read, Write},
-    sync::mpsc,
-    time::Duration,
-};
-
-use mio::{unix::SourceFd, Events, Interest, Poll, Token};
+use std::io::{Read, Write};

 use crate::{
-    adb_termios::ADBTermios,
-    models::{AdbServerCommand, HostFeatures},
-    ADBServerDevice, Result, RustADBError,
+    constants::BUFFER_SIZE,
+    models::{AdbServerCommand, AdbStatResponse, HostFeatures},
+    ADBDeviceExt, ADBServerDevice, Result, RustADBError,
 };

-const STDIN: Token = Token(0);
-const BUFFER_SIZE: usize = 512;
-const POLL_DURATION: Duration = Duration::from_millis(100);
-
-fn setup_poll_stdin() -> std::result::Result<Poll, io::Error> {
-    let poll = Poll::new()?;
-    let stdin_fd = 0;
-    poll.registry()
-        .register(&mut SourceFd(&stdin_fd), STDIN, Interest::READABLE)?;
-
-    Ok(poll)
-}
-
-impl ADBServerDevice {
-    /// Runs 'command' in a shell on the device, and write its output and error streams into [`output`].
-    pub fn shell_command<S: ToString, W: Write>(
+impl ADBDeviceExt for ADBServerDevice {
+    fn shell_command<S: ToString, W: Write>(
        &mut self,
        command: impl IntoIterator<Item = S>,
        mut output: W,
@@ -73,13 +53,15 @@ impl ADBServerDevice {
        }
    }

-    /// Starts an interactive shell session on the device. Redirects stdin/stdout/stderr as appropriate.
-    pub fn shell(&mut self) -> Result<()> {
-        let mut adb_termios = ADBTermios::new(std::io::stdin())?;
-        adb_termios.set_adb_termios()?;
-
-        // TODO: FORWARD CTRL+C !!
+    fn stat(&mut self, remote_path: &str) -> Result<AdbStatResponse> {
+        self.stat(remote_path)
+    }

+    fn shell<R: Read, W: Write + Send + 'static>(
+        &mut self,
+        mut reader: R,
+        mut writer: W,
+    ) -> Result<()> {
        let supported_features = self.host_features()?;
        if !supported_features.contains(&HostFeatures::ShellV2)
            && !supported_features.contains(&HostFeatures::Cmd)
@@ -93,26 +75,22 @@ impl ADBServerDevice {
        self.get_transport_mut()
            .send_adb_request(AdbServerCommand::Shell)?;

-        // let read_stream = Arc::new(self.tcp_stream);
        let mut read_stream = self.get_transport_mut().get_raw_connection()?.try_clone()?;

-        let (tx, rx) = mpsc::channel::<bool>();
-
        let mut write_stream = read_stream.try_clone()?;

-        // Reading thread
+        // Reading thread, reads response from adb-server
        std::thread::spawn(move || -> Result<()> {
            loop {
                let mut buffer = [0; BUFFER_SIZE];
                match read_stream.read(&mut buffer) {
                    Ok(0) => {
-                        let _ = tx.send(true);
                        read_stream.shutdown(std::net::Shutdown::Both)?;
                        return Ok(());
                    }
                    Ok(size) => {
-                        std::io::stdout().write_all(&buffer[..size])?;
-                        std::io::stdout().flush()?;
+                        writer.write_all(&buffer[..size])?;
+                        writer.flush()?;
                    }
                    Err(e) => {
                        return Err(RustADBError::IOError(e));
@@ -121,33 +99,26 @@ impl ADBServerDevice {
            }
        });

-        let mut buf = [0; BUFFER_SIZE];
-        let mut events = Events::with_capacity(1);
-
-        let mut poll = setup_poll_stdin()?;
-
-        // Polling either by checking that reading socket hasn't been closed, and if is there is something to read on stdin.
-        loop {
-            poll.poll(&mut events, Some(POLL_DURATION))?;
-            match rx.try_recv() {
-                Ok(_) | Err(mpsc::TryRecvError::Disconnected) => return Ok(()),
-                Err(mpsc::TryRecvError::Empty) => (),
-            }
-
-            for event in events.iter() {
-                match event.token() {
-                    STDIN => {
-                        let size = match std::io::stdin().read(&mut buf) {
-                            Ok(0) => return Ok(()),
-                            Ok(size) => size,
-                            Err(_) => return Ok(()),
-                        };
-
-                        write_stream.write_all(&buf[0..size])?;
-                    }
-                    _ => unreachable!(),
-                }
+        // Read from given reader (that could be stdin e.g), and write content to server socket
+        if let Err(e) = std::io::copy(&mut reader, &mut write_stream) {
+            match e.kind() {
+                std::io::ErrorKind::BrokenPipe => return Ok(()),
+                _ => return Err(RustADBError::IOError(e)),
            }
        }
+
+        Ok(())
+    }
+
+    fn pull<A: AsRef<str>, W: Write>(&mut self, source: A, mut output: W) -> Result<()> {
+        self.pull(source, &mut output)
+    }
+
+    fn reboot(&mut self, reboot_type: crate::RebootType) -> Result<()> {
+        self.reboot(reboot_type)
+    }
+
+    fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
+        self.push(stream, path)
    }
 }
--- a/adb_client/src/server/device_commands/framebuffer.rs
+++ b/adb_client/src/server/device_commands/framebuffer.rs
@@ -170,7 +170,7 @@ impl ADBServerDevice {
                        .ok_or_else(|| RustADBError::FramebufferConversionError)?,
                )
            }
-            v => unimplemented!("Version {} not implemented", v),
+            v => Err(RustADBError::UnimplementedFramebufferImageVersion(v)),
        }
    }
 }
--- a/adb_client/src/server/device_commands/logcat.rs
+++ b/adb_client/src/server/device_commands/logcat.rs
@@ -1,6 +1,6 @@
 use std::io::{self, Write};

-use crate::{ADBServerDevice, Result};
+use crate::{ADBDeviceExt, ADBServerDevice, Result};

 struct LogFilter<W: Write> {
    writer: W,
--- a/adb_client/src/server/device_commands/mod.rs
+++ b/adb_client/src/server/device_commands/mod.rs
@@ -5,6 +5,5 @@ mod logcat;
 mod reboot;
 mod recv;
 mod send;
-mod shell;
 mod stat;
 mod transport;
--- a/adb_client/src/server/device_commands/recv.rs
+++ b/adb_client/src/server/device_commands/recv.rs
@@ -70,7 +70,7 @@ impl<R: Read> Read for ADBRecvCommandReader<R> {

 impl ADBServerDevice {
    /// Receives [path] to [stream] from the device.
-    pub fn recv<A: AsRef<str>>(&mut self, path: A, stream: &mut dyn Write) -> Result<()> {
+    pub fn pull<A: AsRef<str>>(&mut self, path: A, stream: &mut dyn Write) -> Result<()> {
        let serial = self.identifier.clone();
        self.connect()?
            .send_adb_request(AdbServerCommand::TransportSerial(serial))?;
--- a/adb_client/src/server/device_commands/send.rs
+++ b/adb_client/src/server/device_commands/send.rs
@@ -43,7 +43,7 @@ impl<W: Write> Write for ADBSendCommandWriter<W> {

 impl ADBServerDevice {
    /// Send [stream] to [path] on the device.
-    pub fn send<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
+    pub fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
        log::info!("Sending data to {}", path.as_ref());
        let serial = self.identifier.clone();
        self.connect()?
--- a/adb_client/src/server/device_commands/stat.rs
+++ b/adb_client/src/server/device_commands/stat.rs
@@ -1,51 +1,12 @@
-use std::{
-    fmt::Display,
-    io::{Read, Write},
-    time::{Duration, UNIX_EPOCH},
-};
+use std::io::{Read, Write};

 use byteorder::{ByteOrder, LittleEndian};
-use chrono::{DateTime, Utc};

 use crate::{
-    models::{AdbServerCommand, SyncCommand},
+    models::{AdbServerCommand, AdbStatResponse, SyncCommand},
    ADBServerDevice, Result, RustADBError,
 };

-#[derive(Debug)]
-pub struct AdbStatResponse {
-    pub file_perm: u32,
-    pub file_size: u32,
-    pub mod_time: u32,
-}
-
-impl From<[u8; 12]> for AdbStatResponse {
-    fn from(value: [u8; 12]) -> Self {
-        Self {
-            file_perm: LittleEndian::read_u32(&value[0..4]),
-            file_size: LittleEndian::read_u32(&value[4..8]),
-            mod_time: LittleEndian::read_u32(&value[8..]),
-        }
-    }
-}
-
-impl Display for AdbStatResponse {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let d = UNIX_EPOCH + Duration::from_secs(self.mod_time.into());
-        // Create DateTime from SystemTime
-        let datetime = DateTime::<Utc>::from(d);
-
-        writeln!(f, "File permissions: {}", self.file_perm)?;
-        writeln!(f, "File size: {} bytes", self.file_size)?;
-        write!(
-            f,
-            "Modification time: {}",
-            datetime.format("%Y-%m-%d %H:%M:%S.%f %Z")
-        )?;
-        Ok(())
-    }
-}
-
 impl ADBServerDevice {
    fn handle_stat_command<S: AsRef<str>>(&mut self, path: S) -> Result<AdbStatResponse> {
        let mut len_buf = [0_u8; 4];
--- a/adb_client/src/server/mod.rs
+++ b/adb_client/src/server/mod.rs
@@ -1,6 +1,7 @@
 mod adb_emulator_device;
 mod adb_server;
 mod adb_server_device;
+mod adb_server_device_commands;
 mod device_commands;
 mod server_commands;

--- a/adb_client/src/server/server_commands/connect.rs
+++ b/adb_client/src/server/server_commands/connect.rs
@@ -8,9 +8,10 @@ impl ADBServer {
            .connect()?
            .proxy_connection(AdbServerCommand::Connect(address), true)?;

-        match String::from_utf8(response).unwrap() {
-            s if s.starts_with("connected to") => Ok(()),
-            s => Err(RustADBError::ADBRequestFailed(s)),
+        match String::from_utf8(response) {
+            Ok(s) if s.starts_with("connected to") => Ok(()),
+            Ok(s) => Err(RustADBError::ADBRequestFailed(s)),
+            Err(e) => Err(e.into()),
        }
    }
 }
--- a/adb_client/src/server/server_commands/devices.rs
+++ b/adb_client/src/server/server_commands/devices.rs
@@ -79,7 +79,6 @@ impl ADBServer {
    }

    /// Tracks new devices showing up.
-    // TODO: Change with Generator when feature stabilizes
    pub fn track_devices(&mut self, callback: impl Fn(DeviceShort) -> Result<()>) -> Result<()> {
        self.connect()?
            .send_adb_request(AdbServerCommand::TrackDevices)?;
--- a/adb_client/src/server/server_commands/disconnect.rs
+++ b/adb_client/src/server/server_commands/disconnect.rs
@@ -8,9 +8,10 @@ impl ADBServer {
            .connect()?
            .proxy_connection(AdbServerCommand::Disconnect(address), true)?;

-        match String::from_utf8(response).unwrap() {
-            s if s.starts_with("disconnected") => Ok(()),
-            s => Err(RustADBError::ADBRequestFailed(s)),
+        match String::from_utf8(response) {
+            Ok(s) if s.starts_with("disconnected") => Ok(()),
+            Ok(s) => Err(RustADBError::ADBRequestFailed(s)),
+            Err(e) => Err(e.into()),
        }
    }
 }
--- a/adb_client/src/server/server_commands/pair.rs
+++ b/adb_client/src/server/server_commands/pair.rs
@@ -9,9 +9,10 @@ impl ADBServer {
            .connect()?
            .proxy_connection(AdbServerCommand::Pair(address, code), true)?;

-        match String::from_utf8(response).unwrap() {
-            s if s.starts_with("Successfully paired to") => Ok(()),
-            s => Err(RustADBError::ADBRequestFailed(s)),
+        match String::from_utf8(response) {
+            Ok(s) if s.starts_with("Successfully paired to") => Ok(()),
+            Ok(s) => Err(RustADBError::ADBRequestFailed(s)),
+            Err(e) => Err(e.into()),
        }
    }
 }
--- a/adb_client/src/transports/mod.rs
+++ b/adb_client/src/transports/mod.rs
@@ -1,6 +1,8 @@
 mod tcp_emulator_transport;
 mod tcp_server_transport;
 mod transport_trait;
+mod usb_transport;
 pub use tcp_emulator_transport::TCPEmulatorTransport;
 pub use tcp_server_transport::TCPServerTransport;
 pub use transport_trait::ADBTransport;
+pub use usb_transport::USBTransport;
--- a/adb_client/src/transports/tcp_emulator_transport.rs
+++ b/adb_client/src/transports/tcp_emulator_transport.rs
@@ -38,7 +38,7 @@ impl TCPEmulatorTransport {
    pub fn get_authentication_token(&mut self) -> Result<String> {
        let home = match my_home()? {
            Some(home) => home,
-            None => todo!(),
+            None => return Err(RustADBError::NoHomeDirectory),
        };

        let mut f = File::open(home.join(".emulator_console_auth_token"))?;
--- a/adb_client/src/transports/usb_transport.rs
+++ b/adb_client/src/transports/usb_transport.rs
@@ -0,0 +1,239 @@
+use std::{sync::Arc, time::Duration};
+
+use rusb::{
+    constants::LIBUSB_CLASS_VENDOR_SPEC, DeviceHandle, Direction, GlobalContext, TransferType,
+};
+
+use super::ADBTransport;
+use crate::{
+    usb::{ADBUsbMessage, ADBUsbMessageHeader, USBCommand},
+    Result, RustADBError,
+};
+
+#[derive(Debug)]
+struct Endpoint {
+    iface: u8,
+    address: u8,
+}
+
+const MAX_READ_TIMEOUT: Duration = Duration::from_secs(u64::MAX);
+const DEFAULT_WRITE_TIMEOUT: Duration = Duration::from_secs(2);
+
+/// Transport running on USB
+#[derive(Debug, Clone)]
+pub struct USBTransport {
+    vendor_id: u16,
+    product_id: u16,
+    handle: Option<Arc<DeviceHandle<GlobalContext>>>,
+}
+
+impl USBTransport {
+    /// Instantiate a new [USBTransport]
+    pub fn new(vendor_id: u16, product_id: u16) -> Self {
+        Self {
+            handle: None,
+            vendor_id,
+            product_id,
+        }
+    }
+
+    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 configure_endpoint(handle: &DeviceHandle<GlobalContext>, endpoint: &Endpoint) -> Result<()> {
+        handle.claim_interface(endpoint.iface)?;
+        Ok(())
+    }
+
+    /// Write data to underlying connection, with default timeout
+    pub(crate) fn write_message(&mut self, message: ADBUsbMessage) -> Result<()> {
+        self.write_message_with_timeout(message, DEFAULT_WRITE_TIMEOUT)
+    }
+
+    /// Write data to underlying connection
+    pub(crate) fn write_message_with_timeout(
+        &mut self,
+        message: ADBUsbMessage,
+        timeout: Duration,
+    ) -> Result<()> {
+        let endpoint = self.find_writable_endpoint()?;
+        let handle = self.get_raw_connection()?;
+
+        if let Ok(true) = handle.kernel_driver_active(endpoint.iface) {
+            handle.detach_kernel_driver(endpoint.iface)?;
+        }
+
+        Self::configure_endpoint(&handle, &endpoint)?;
+
+        let message_bytes = message.header().as_bytes()?;
+        let mut total_written = 0;
+        loop {
+            total_written +=
+                handle.write_bulk(endpoint.address, &message_bytes[total_written..], timeout)?;
+            if total_written == message_bytes.len() {
+                break;
+            }
+        }
+
+        let payload = message.into_payload();
+        let mut total_written = 0;
+        loop {
+            total_written +=
+                handle.write_bulk(endpoint.address, &payload[total_written..], timeout)?;
+            if total_written == payload.len() {
+                break;
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Blocking method to read data from underlying connection.
+    pub(crate) fn read_message(&mut self) -> Result<ADBUsbMessage> {
+        self.read_message_with_timeout(MAX_READ_TIMEOUT)
+    }
+
+    /// Read data from underlying connection with given timeout.
+    pub(crate) fn read_message_with_timeout(&mut self, timeout: Duration) -> Result<ADBUsbMessage> {
+        let endpoint = self.find_readable_endpoint()?;
+        let handle = self.get_raw_connection()?;
+
+        if let Ok(true) = handle.kernel_driver_active(endpoint.iface) {
+            handle.detach_kernel_driver(endpoint.iface)?;
+        }
+
+        Self::configure_endpoint(&handle, &endpoint)?;
+
+        let mut data = [0; 24];
+        let mut total_read = 0;
+        loop {
+            total_read += handle.read_bulk(endpoint.address, &mut data[total_read..], timeout)?;
+            if total_read == data.len() {
+                break;
+            }
+        }
+
+        let header = ADBUsbMessageHeader::try_from(data)?;
+
+        log::trace!("received header {header:?}");
+
+        if header.data_length() != 0 {
+            let mut msg_data = vec![0_u8; header.data_length() as usize];
+            let mut total_read = 0;
+            loop {
+                total_read +=
+                    handle.read_bulk(endpoint.address, &mut msg_data[total_read..], timeout)?;
+                if total_read == msg_data.capacity() {
+                    break;
+                }
+            }
+
+            let message = ADBUsbMessage::from_header_and_payload(header, msg_data);
+
+            // Check message integrity
+            if !message.check_message_integrity() {
+                return Err(RustADBError::InvalidIntegrity(
+                    ADBUsbMessageHeader::compute_crc32(message.payload()),
+                    message.header().data_crc32(),
+                ));
+            }
+
+            return Ok(message);
+        }
+
+        Ok(ADBUsbMessage::from_header_and_payload(header, vec![]))
+    }
+
+    fn find_readable_endpoint(&self) -> Result<Endpoint> {
+        let handle = self.get_raw_connection()?;
+        for n in 0..handle.device().device_descriptor()?.num_configurations() {
+            let config_desc = match handle.device().config_descriptor(n) {
+                Ok(c) => c,
+                Err(_) => continue,
+            };
+
+            for interface in config_desc.interfaces() {
+                for interface_desc in interface.descriptors() {
+                    for endpoint_desc in interface_desc.endpoint_descriptors() {
+                        if endpoint_desc.direction() == Direction::In
+                            && endpoint_desc.transfer_type() == TransferType::Bulk
+                            && interface_desc.class_code() == LIBUSB_CLASS_VENDOR_SPEC
+                            && interface_desc.sub_class_code() == 0x42
+                            && interface_desc.protocol_code() == 0x01
+                        {
+                            return Ok(Endpoint {
+                                iface: interface_desc.interface_number(),
+                                address: endpoint_desc.address(),
+                            });
+                        }
+                    }
+                }
+            }
+        }
+
+        Err(RustADBError::USBNoDescriptorFound)
+    }
+
+    fn find_writable_endpoint(&self) -> Result<Endpoint> {
+        let handle = self.get_raw_connection()?;
+        for n in 0..handle.device().device_descriptor()?.num_configurations() {
+            let config_desc = match handle.device().config_descriptor(n) {
+                Ok(c) => c,
+                Err(_) => continue,
+            };
+
+            for interface in config_desc.interfaces() {
+                for interface_desc in interface.descriptors() {
+                    for endpoint_desc in interface_desc.endpoint_descriptors() {
+                        if endpoint_desc.direction() == Direction::Out
+                            && endpoint_desc.transfer_type() == TransferType::Bulk
+                            && interface_desc.class_code() == LIBUSB_CLASS_VENDOR_SPEC
+                            && interface_desc.sub_class_code() == 0x42
+                            && interface_desc.protocol_code() == 0x01
+                        {
+                            return Ok(Endpoint {
+                                iface: interface_desc.interface_number(),
+                                address: endpoint_desc.address(),
+                            });
+                        }
+                    }
+                }
+            }
+        }
+
+        Err(RustADBError::USBNoDescriptorFound)
+    }
+}
+
+impl ADBTransport for USBTransport {
+    fn connect(&mut self) -> crate::Result<()> {
+        for d in rusb::devices()?.iter() {
+            if let Ok(descriptor) = d.device_descriptor() {
+                if descriptor.vendor_id() == self.vendor_id
+                    && descriptor.product_id() == self.product_id
+                {
+                    self.handle = Some(Arc::new(d.open()?));
+
+                    return Ok(());
+                }
+            }
+        }
+
+        Err(RustADBError::DeviceNotFound(format!(
+            "Cannot find device with vendor id {} and product id {}",
+            self.vendor_id, self.product_id
+        )))
+    }
+
+    fn disconnect(&mut self) -> crate::Result<()> {
+        let message = ADBUsbMessage::new(USBCommand::Clse, 0, 0, "".into());
+        self.write_message(message)
+    }
+}
--- a/adb_client/src/usb/adb_rsa_key.rs
+++ b/adb_client/src/usb/adb_rsa_key.rs
@@ -0,0 +1,154 @@
+use crate::{Result, RustADBError};
+use base64::{engine::general_purpose::STANDARD, Engine};
+use byteorder::{LittleEndian, WriteBytesExt};
+use num_bigint::traits::ModInverse;
+use num_bigint::BigUint;
+use rand::rngs::OsRng;
+use rsa::{Hash, PaddingScheme, PublicKeyParts, RSAPrivateKey};
+use std::convert::TryInto;
+
+// From project: https://github.com/hajifkd/webadb
+#[derive(Debug)]
+pub struct ADBRsaKey {
+    private_key: RSAPrivateKey,
+}
+
+impl ADBRsaKey {
+    pub fn random_with_size(size: usize) -> Result<Self> {
+        let mut rng = OsRng;
+        Ok(Self {
+            private_key: RSAPrivateKey::new(&mut rng, size)?,
+        })
+    }
+
+    pub fn from_pkcs8(pkcs8_content: &str) -> Result<Self> {
+        let der_encoded = pkcs8_content
+            .lines()
+            .filter(|line| !line.starts_with("-") && !line.is_empty())
+            .fold(String::new(), |mut data, line| {
+                data.push_str(line);
+                data
+            });
+        let der_bytes = STANDARD.decode(&der_encoded)?;
+        let private_key = RSAPrivateKey::from_pkcs8(&der_bytes)?;
+
+        Ok(ADBRsaKey { private_key })
+    }
+
+    pub fn encoded_public_key(&self) -> Result<String> {
+        // see https://android.googlesource.com/platform/system/core/+/android-4.4_r1/adb/adb_auth_host.c
+        // L63 RSA_to_RSAPublicKey
+        const RSANUMBYTES: u32 = 256;
+        const RSANUMWORDS: u32 = 64;
+        let user: String = format!("adb_client@{}", env!("CARGO_PKG_VERSION"));
+
+        let mut result = vec![];
+        result.write_u32::<LittleEndian>(RSANUMWORDS)?;
+        let r32 = set_bit(32)?;
+        let n = self.private_key.n();
+        let r = set_bit((32 * RSANUMWORDS) as _)?;
+        // Well, let rr = set_bit((64 * RSANUMWORDS) as _) % n is also fine, since r \sim n.
+        let rr = r.modpow(&BigUint::from(2u32), n);
+        let rem = n % &r32;
+        let n0inv = rem.mod_inverse(&r32);
+        if let Some(n0inv) = n0inv {
+            let n0inv = n0inv.to_biguint().ok_or(RustADBError::ConversionError)?;
+            let n0inv_p: u32 = 1 + !u32::from_le_bytes((&n0inv.to_bytes_le()[..4]).try_into()?);
+            result.write_u32::<LittleEndian>(n0inv_p)?;
+        } else {
+            return Err(RustADBError::ConversionError);
+        }
+
+        write_biguint(&mut result, n, RSANUMBYTES as _)?;
+        write_biguint(&mut result, &rr, RSANUMBYTES as _)?;
+        write_biguint(&mut result, self.private_key.e(), 4)?;
+
+        let mut encoded = STANDARD.encode(&result);
+        encoded.push(' ');
+        encoded.push_str(&user);
+        Ok(encoded)
+    }
+
+    pub fn sign(&self, msg: impl AsRef<[u8]>) -> Result<Vec<u8>> {
+        Ok(self.private_key.sign(
+            PaddingScheme::new_pkcs1v15_sign(Some(Hash::SHA1)),
+            msg.as_ref(),
+        )?)
+    }
+}
+
+fn write_biguint(writer: &mut Vec<u8>, data: &BigUint, n_bytes: usize) -> Result<()> {
+    for &v in data
+        .to_bytes_le()
+        .iter()
+        .chain(std::iter::repeat(&0))
+        .take(n_bytes)
+    {
+        writer.write_u8(v)?;
+    }
+
+    Ok(())
+}
+
+fn set_bit(n: usize) -> Result<BigUint> {
+    BigUint::parse_bytes(
+        &{
+            let mut bits = vec![b'1'];
+            bits.append(&mut vec![b'0'; n]);
+            bits
+        }[..],
+        2,
+    )
+    .ok_or(RustADBError::ConversionError)
+}
+
+#[test]
+fn test_pubkey_gen() {
+    const DEFAULT_PRIV_KEY: &'static str = r"-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC4Dyn85cxDJnjM
+uYXQl/w469MDKdlGdviLfmFMWeYLVfL2Mz1AVyvKqscrtlhbbgMQ/M+3lDvEdHS0
+14RIGAwWRtrlTTmhLvM2/IO+eSKSYeCrCVc4KLG3E3WRryUXbs2ynA29xjTJVw+Z
+xYxDyn/tAYPEyMm4v+HIJHcOtRzxtO2vjMJ2vBT/ywYxjhncXbFSO09q2E4XrHli
+SIPyO82hZgCkpzTZRp+nyA17TYuV9++mvUr9lWH9RbC+o8EF3yitlBsE2uXr97EV
+i2Qy8CE7FIxsihXlukppwKRuz+1rJrvmZPTn49ZS+sIS99WE9GoCpsyQvTpvehrM
+SIDRsVZPAgMBAAECggEAWNXAzzXeS36zCSR1yILCknqHotw86Pyc4z7BGUe+dzQp
+itiaNIaeNTgN3zQoGyDSzA0o+BLMcfo/JdVrHBy3IL1cAxYtvXTaoGxp7bGrlPk2
+pXZhqVJCy/jRYtokzdWF5DHbk/+pFJA3kGE/XKzM54g2n/DFI61A/QdUiz2w1ZtI
+vc5cM08EM8B/TSI3SeWB8zkh5SlIuLsFO2J2+tCak6PdFfKOVIrFv9dKJYLxx+59
+edZamw2EvNlnl/sewgUk0gaZvQKVf4ivHyM+KSHuV4RFfiLvGuVcyA6XhSjztsG
+EA++jDHP5ib/Izes7UK09v9y7kow+z6vUtnDDQOvgQKBgQD8WWAn7FQt9aziCw19
+gZynzHG1bXI7uuEVSneuA3UwJImmDu8W+Qb9YL9Dc2nV0M5pGGdXKi2jzq8gPar6
+GPAmy7TOlov6Nm0pbMXTAfuovG+gIXxelp3US3FvyRupi0/7UQRRwvetFYbDFwJX
+ydF5uEtZdGSHAjPeU5FLq6tBwQKBgQC6uN0JwwZn+eaxguyKOXvp0KykhFI0HI1A
+MBDZ1uuKt6OW5+r9NeQtTLctGlNKVQ8wz+Wr0C/nLGIIv4lySS9WFyc5/FnFhDdy
+LsEi6whcca4vq3jsMOukvQGFnERsou4LqBEI1Es7jjeeEq+/8WnNTi6Y1flZ6UAp
+YAOeFI98DwKBgQDvyfHgHeajwZalOQF5qGb24AOQ9c4dyefGNnvhA/IgbCfMftZc
+iwhETuGQM6R3A7KQFRtlrXOu+2BYD6Ffg8D37IwD3vRmL7+tJGoapwC/B0g+7nLi
+4tZY+9Nv+LbrdbDry8GB+/UkKJdk3IFicCk4M5KOD1bTH5mwAtLHB/p1QQKBgDHi
+k8M45GxA+p4wMUvYgb987bLiWyfq/N3KOaZJYhJkb4MwoLpXfIeRuFqHbvsr8GwF
+DwIxE6s6U1KtAWaUIN5qPyOhxMYdRcbusNDIZCp2gKfhsuO/SiVwDYkJr8oqWVip
+5SsrtJHLtBY6PdQVBkRAf/h7KiwYQfkL2suQCKmHAoGBAJAkYImBYPHuRcnSXikn
+xGDK/moPvzs0CjdPlRcEN+Myy/G0FUrOaC0FcpNoJOdQSYz3F6URA4nX+zj6Ie7G
+CNkECiepaGyquQaffwR1CAi8dH6biJjlTQWQPFcCLA0hvernWo3eaSfiL7fHyym+
+ile69MHFENUePSpuRSiF3Z02
+-----END PRIVATE KEY-----";
+    let priv_key =
+        ADBRsaKey::from_pkcs8(DEFAULT_PRIV_KEY).expect("cannot create rsa key from data");
+    let pub_key = priv_key
+        .encoded_public_key()
+        .expect("cannot encode public key");
+    let pub_key_adb = "\
+QAAAAFH/pU9PVrHRgEjMGnpvOr2QzKYCavSE1fcSwvpS1uPn9GTmuyZr7c9up\
+MBpSrrlFYpsjBQ7IfAyZIsVsffr5doEG5StKN8FwaO+sEX9YZX9Sr2m7/eVi0\
+17Dcinn0bZNKekAGahzTvyg0hieawXTthqTztSsV3cGY4xBsv/FLx2woyv7bT\
+xHLUOdyTI4b+4ycjEgwHtf8pDjMWZD1fJNMa9DZyyzW4XJa+RdRO3sSg4Vwmr\
+4GGSInm+g/w28y6hOU3l2kYWDBhIhNe0dHTEO5S3z/wQA25bWLYrx6rKK1dAP\
+TP28lUL5llMYX6L+HZG2SkD0+s4/JfQhbnMeCZDzOX8KQ+4ThLy/gDTqCSTjj\
+ic8BykdUIqYPwAjBMgQwLOLY5WNJMpjGlFINRcCGhvFFZ73sJTLerECuV/Oae\
+nFRcORwnGIRgMrYXj4tjmxJC7sq3cfNX96YIcSCDE9SZFdlKXVK8Jc4YMLGF3\
+MI8k1KoTby34uaIyxPJvwM1WR4Rdj60fwMyikFXNaOR2fPteZ3UMBA7CMrOEm\
+9iYjntyEppA4hQXIO1TWTzkA/Kfl1i67k5NuLIQdhPFEc5ox5IYVHusauPQ7d\
+Awu6BlgK37TUn0JdK0Z6Z4RaEIaNiEI0d5CoP6zQKV2QQnlscYpdsaUW5t9/F\
+LioVXPwrz0tx35JyIUZPPYwEAAQA= ";
+    assert_eq!(&pub_key[..pub_key_adb.len()], pub_key_adb);
+}
--- a/adb_client/src/usb/adb_usb_device.rs
+++ b/adb_client/src/usb/adb_usb_device.rs
@@ -0,0 +1,379 @@
+use byteorder::ReadBytesExt;
+use rand::Rng;
+use std::fs::read_to_string;
+use std::io::Cursor;
+use std::io::Read;
+use std::io::Seek;
+use std::path::Path;
+use std::path::PathBuf;
+use std::time::Duration;
+
+use byteorder::LittleEndian;
+
+use super::{ADBRsaKey, ADBUsbMessage};
+use crate::constants::BUFFER_SIZE;
+use crate::models::AdbStatResponse;
+use crate::usb::adb_usb_message::{AUTH_RSAPUBLICKEY, AUTH_SIGNATURE, AUTH_TOKEN};
+use crate::{
+    usb::usb_commands::{USBCommand, USBSubcommand},
+    ADBTransport, Result, RustADBError, USBTransport,
+};
+
+/// Represent a device reached directly over USB
+#[derive(Debug)]
+pub struct ADBUSBDevice {
+    private_key: ADBRsaKey,
+    pub(crate) transport: USBTransport,
+}
+
+fn read_adb_private_key<P: AsRef<Path>>(private_key_path: P) -> Result<Option<ADBRsaKey>> {
+    read_to_string(private_key_path.as_ref())
+        .map_err(RustADBError::from)
+        .map(|pk| match ADBRsaKey::from_pkcs8(&pk) {
+            Ok(pk) => Some(pk),
+            Err(e) => {
+                log::error!("Error while create RSA private key: {e}");
+                None
+            }
+        })
+}
+
+impl ADBUSBDevice {
+    /// Instantiate a new [ADBUSBDevice]
+    pub fn new(vendor_id: u16, product_id: u16) -> Result<Self> {
+        let private_key_path = homedir::my_home()
+            .ok()
+            .flatten()
+            .map(|home| home.join(".android").join("adbkey"))
+            .ok_or(RustADBError::NoHomeDirectory)?;
+
+        let private_key = match read_adb_private_key(private_key_path)? {
+            Some(pk) => pk,
+            None => ADBRsaKey::random_with_size(2048)?,
+        };
+
+        let mut s = Self {
+            private_key,
+            transport: USBTransport::new(vendor_id, product_id),
+        };
+
+        s.connect()?;
+
+        Ok(s)
+    }
+
+    /// Instantiate a new [ADBUSBDevice] using a custom private key path
+    pub fn new_with_custom_private_key(
+        vendor_id: u16,
+        product_id: u16,
+        private_key_path: PathBuf,
+    ) -> Result<Self> {
+        let private_key = match read_adb_private_key(private_key_path)? {
+            Some(pk) => pk,
+            None => ADBRsaKey::random_with_size(2048)?,
+        };
+
+        let mut s = Self {
+            private_key,
+            transport: USBTransport::new(vendor_id, product_id),
+        };
+
+        s.connect()?;
+
+        Ok(s)
+    }
+
+    /// Send initial connect
+    pub fn connect(&mut self) -> Result<()> {
+        self.transport.connect()?;
+
+        let message = ADBUsbMessage::new(
+            USBCommand::Cnxn,
+            0x01000000,
+            1048576,
+            format!("host::{}\0", env!("CARGO_PKG_NAME"))
+                .as_bytes()
+                .to_vec(),
+        );
+
+        self.transport.write_message(message)?;
+
+        let message = self.transport.read_message()?;
+
+        // At this point, we should have received either:
+        // - an AUTH message with arg0 == 1
+        // - a CNXN message
+        let auth_message = match message.header().command() {
+            USBCommand::Auth if message.header().arg0() == AUTH_TOKEN => message,
+            USBCommand::Auth if message.header().arg0() != AUTH_TOKEN => {
+                return Err(RustADBError::ADBRequestFailed(
+                    "Received AUTH message with type != 1".into(),
+                ))
+            }
+            c => {
+                return Err(RustADBError::ADBRequestFailed(format!(
+                    "Wrong command received {}",
+                    c
+                )))
+            }
+        };
+
+        let sign = self.private_key.sign(auth_message.into_payload())?;
+
+        let message = ADBUsbMessage::new(USBCommand::Auth, AUTH_SIGNATURE, 0, sign);
+
+        self.transport.write_message(message)?;
+
+        let received_response = self.transport.read_message()?;
+
+        if received_response.header().command() == USBCommand::Cnxn {
+            log::info!(
+                "Authentication OK, device info {}",
+                String::from_utf8(received_response.into_payload())?
+            );
+            return Ok(());
+        }
+
+        let mut pubkey = self.private_key.encoded_public_key()?.into_bytes();
+        pubkey.push(b'\0');
+
+        let message = ADBUsbMessage::new(USBCommand::Auth, AUTH_RSAPUBLICKEY, 0, pubkey);
+
+        self.transport.write_message(message)?;
+
+        let response = self
+            .transport
+            .read_message_with_timeout(Duration::from_secs(10))?;
+
+        match response.header().command() {
+            USBCommand::Cnxn => log::info!(
+                "Authentication OK, device info {}",
+                String::from_utf8(response.into_payload())?
+            ),
+            _ => {
+                return Err(RustADBError::ADBRequestFailed(format!(
+                    "wrong response {}",
+                    response.header().command()
+                )))
+            }
+        }
+
+        Ok(())
+    }
+    /// Receive a message and acknowledge it by replying with an `OKAY` command
+    pub(crate) fn recv_and_reply_okay(
+        &mut self,
+        local_id: u32,
+        remote_id: u32,
+    ) -> Result<ADBUsbMessage> {
+        let message = self.transport.read_message()?;
+        self.transport.write_message(ADBUsbMessage::new(
+            USBCommand::Okay,
+            local_id,
+            remote_id,
+            "".into(),
+        ))?;
+        Ok(message)
+    }
+
+    /// Expect a message with an `OKAY` command after sending a message.
+    pub(crate) fn send_and_expect_okay(&mut self, message: ADBUsbMessage) -> Result<ADBUsbMessage> {
+        self.transport.write_message(message)?;
+        let message = self.transport.read_message()?;
+        let received_command = message.header().command();
+        if received_command != USBCommand::Okay {
+            return Err(RustADBError::ADBRequestFailed(format!(
+                "expected command OKAY after message, got {}",
+                received_command
+            )));
+        }
+        Ok(message)
+    }
+
+    pub(crate) fn recv_file<W: std::io::Write>(
+        &mut self,
+        local_id: u32,
+        remote_id: u32,
+        mut output: W,
+    ) -> std::result::Result<(), RustADBError> {
+        let mut len: Option<u64> = None;
+        loop {
+            let payload = self
+                .recv_and_reply_okay(local_id, remote_id)?
+                .into_payload();
+            let mut rdr = Cursor::new(&payload);
+            while rdr.position() != payload.len() as u64 {
+                match len.take() {
+                    Some(0) | None => {
+                        rdr.seek_relative(4)?;
+                        len.replace(rdr.read_u32::<LittleEndian>()? as u64);
+                    }
+                    Some(length) => {
+                        log::debug!("len = {length}");
+                        let remaining_bytes = payload.len() as u64 - rdr.position();
+                        log::debug!(
+                            "payload length {} - reader_position {} = {remaining_bytes}",
+                            payload.len(),
+                            rdr.position()
+                        );
+                        if length < remaining_bytes {
+                            let read = std::io::copy(&mut rdr.by_ref().take(length), &mut output)?;
+                            log::debug!(
+                                "expected to read {length} bytes, actually read {read} bytes"
+                            );
+                        } else {
+                            let read = std::io::copy(&mut rdr.take(remaining_bytes), &mut output)?;
+                            len.replace(length - remaining_bytes);
+                            log::debug!("expected to read {remaining_bytes} bytes, actually read {read} bytes");
+                            // this payload is exhausted
+                            break;
+                        }
+                    }
+                }
+            }
+            if Cursor::new(&payload[(payload.len() - 8)..(payload.len() - 4)])
+                .read_u32::<LittleEndian>()?
+                == USBSubcommand::Done as u32
+            {
+                break;
+            }
+        }
+        Ok(())
+    }
+
+    pub(crate) fn push_file<R: std::io::Read>(
+        &mut self,
+        local_id: u32,
+        remote_id: u32,
+        mut reader: R,
+    ) -> std::result::Result<(), RustADBError> {
+        let mut buffer = [0; BUFFER_SIZE];
+        let amount_read = reader.read(&mut buffer)?;
+        let subcommand_data = USBSubcommand::Data.with_arg(amount_read as u32);
+
+        let mut serialized_message =
+            bincode::serialize(&subcommand_data).map_err(|_e| RustADBError::ConversionError)?;
+        serialized_message.append(&mut buffer[..amount_read].to_vec());
+
+        let message =
+            ADBUsbMessage::new(USBCommand::Write, local_id, remote_id, serialized_message);
+
+        self.send_and_expect_okay(message)?;
+
+        loop {
+            let mut buffer = [0; BUFFER_SIZE];
+
+            match reader.read(&mut buffer) {
+                Ok(0) => {
+                    // Currently file mtime is not forwarded
+                    let subcommand_data = USBSubcommand::Done.with_arg(0);
+
+                    let serialized_message = bincode::serialize(&subcommand_data)
+                        .map_err(|_e| RustADBError::ConversionError)?;
+
+                    let message = ADBUsbMessage::new(
+                        USBCommand::Write,
+                        local_id,
+                        remote_id,
+                        serialized_message,
+                    );
+
+                    self.send_and_expect_okay(message)?;
+
+                    // Command should end with a Write => Okay
+                    let received = self.transport.read_message()?;
+                    match received.header().command() {
+                        USBCommand::Write => return Ok(()),
+                        c => {
+                            return Err(RustADBError::ADBRequestFailed(format!(
+                                "Wrong command received {}",
+                                c
+                            )))
+                        }
+                    }
+                }
+                Ok(size) => {
+                    let subcommand_data = USBSubcommand::Data.with_arg(size as u32);
+
+                    let mut serialized_message = bincode::serialize(&subcommand_data)
+                        .map_err(|_e| RustADBError::ConversionError)?;
+                    serialized_message.append(&mut buffer[..size].to_vec());
+
+                    let message = ADBUsbMessage::new(
+                        USBCommand::Write,
+                        local_id,
+                        remote_id,
+                        serialized_message,
+                    );
+
+                    self.send_and_expect_okay(message)?;
+                }
+                Err(e) => {
+                    return Err(RustADBError::IOError(e));
+                }
+            }
+        }
+    }
+
+    pub(crate) fn begin_synchronization(&mut self) -> Result<(u32, u32)> {
+        let sync_directive = "sync:\0";
+
+        let mut rng = rand::thread_rng();
+        let message = ADBUsbMessage::new(
+            USBCommand::Open,
+            rng.gen(), /* Our 'local-id' */
+            0,
+            sync_directive.into(),
+        );
+        let message = self.send_and_expect_okay(message)?;
+        let local_id = message.header().arg1();
+        let remote_id = message.header().arg0();
+        Ok((local_id, remote_id))
+    }
+
+    pub(crate) fn stat_with_explicit_ids(
+        &mut self,
+        remote_path: &str,
+        local_id: u32,
+        remote_id: u32,
+    ) -> Result<AdbStatResponse> {
+        let stat_buffer = USBSubcommand::Stat.with_arg(remote_path.len() as u32);
+        let message = ADBUsbMessage::new(
+            USBCommand::Write,
+            local_id,
+            remote_id,
+            bincode::serialize(&stat_buffer).map_err(|_e| RustADBError::ConversionError)?,
+        );
+        self.send_and_expect_okay(message)?;
+        self.send_and_expect_okay(ADBUsbMessage::new(
+            USBCommand::Write,
+            local_id,
+            remote_id,
+            remote_path.into(),
+        ))?;
+        let response = self.transport.read_message()?;
+        // Skip first 4 bytes as this is the literal "STAT".
+        // Interesting part starts right after
+        bincode::deserialize(&response.into_payload()[4..])
+            .map_err(|_e| RustADBError::ConversionError)
+    }
+
+    pub(crate) fn end_transaction(&mut self, local_id: u32, remote_id: u32) -> Result<()> {
+        let quit_buffer = USBSubcommand::Quit.with_arg(0u32);
+        self.send_and_expect_okay(ADBUsbMessage::new(
+            USBCommand::Write,
+            local_id,
+            remote_id,
+            bincode::serialize(&quit_buffer).map_err(|_e| RustADBError::ConversionError)?,
+        ))?;
+        let _discard_close = self.transport.read_message()?;
+        Ok(())
+    }
+}
+
+impl Drop for ADBUSBDevice {
+    fn drop(&mut self) {
+        // Best effort here
+        let _ = self.transport.disconnect();
+    }
+}
--- a/adb_client/src/usb/adb_usb_device_commands.rs
+++ b/adb_client/src/usb/adb_usb_device_commands.rs
@@ -0,0 +1,197 @@
+use crate::{
+    models::AdbStatResponse,
+    usb::{ADBUsbMessage, USBCommand, USBSubcommand},
+    ADBDeviceExt, ADBUSBDevice, RebootType, Result, RustADBError,
+};
+use rand::Rng;
+use std::io::{Read, Write};
+
+use super::USBShellWriter;
+
+impl ADBDeviceExt for ADBUSBDevice {
+    fn shell_command<S: ToString, W: Write>(
+        &mut self,
+        command: impl IntoIterator<Item = S>,
+        mut output: W,
+    ) -> Result<()> {
+        let message = ADBUsbMessage::new(
+            USBCommand::Open,
+            1,
+            0,
+            format!(
+                "shell:{}\0",
+                command
+                    .into_iter()
+                    .map(|v| v.to_string())
+                    .collect::<Vec<_>>()
+                    .join(" "),
+            )
+            .as_bytes()
+            .to_vec(),
+        );
+        self.transport.write_message(message)?;
+
+        let response = self.transport.read_message()?;
+        if response.header().command() != USBCommand::Okay {
+            return Err(RustADBError::ADBRequestFailed(format!(
+                "wrong command {}",
+                response.header().command()
+            )));
+        }
+
+        loop {
+            let response = self.transport.read_message()?;
+            if response.header().command() != USBCommand::Write {
+                break;
+            }
+
+            output.write_all(&response.into_payload())?;
+        }
+
+        Ok(())
+    }
+
+    fn shell<R: Read, W: Write + Send + 'static>(
+        &mut self,
+        mut reader: R,
+        mut writer: W,
+    ) -> Result<()> {
+        let sync_directive = "shell:\0";
+
+        let mut rng = rand::thread_rng();
+        let message = ADBUsbMessage::new(
+            USBCommand::Open,
+            rng.gen(), /* Our 'local-id' */
+            0,
+            sync_directive.into(),
+        );
+        let message = self.send_and_expect_okay(message)?;
+        let local_id = message.header().arg1();
+        let remote_id = message.header().arg0();
+
+        let mut transport = self.transport.clone();
+
+        // Reading thread, reads response from adbd
+        std::thread::spawn(move || -> Result<()> {
+            loop {
+                let message = transport.read_message()?;
+
+                // Acknowledge for more data
+                let response = ADBUsbMessage::new(USBCommand::Okay, local_id, remote_id, vec![]);
+                transport.write_message(response)?;
+
+                match message.header().command() {
+                    USBCommand::Write => {}
+                    USBCommand::Okay => continue,
+                    _ => return Err(RustADBError::ADBShellNotSupported),
+                }
+
+                writer.write_all(&message.into_payload())?;
+                writer.flush()?;
+            }
+        });
+
+        let mut shell_writer = USBShellWriter::new(self.transport.clone(), local_id, remote_id);
+
+        // Read from given reader (that could be stdin e.g), and write content to device adbd
+        if let Err(e) = std::io::copy(&mut reader, &mut shell_writer) {
+            match e.kind() {
+                std::io::ErrorKind::BrokenPipe => return Ok(()),
+                _ => return Err(RustADBError::IOError(e)),
+            }
+        }
+
+        Ok(())
+    }
+
+    fn stat(&mut self, remote_path: &str) -> Result<AdbStatResponse> {
+        let (local_id, remote_id) = self.begin_synchronization()?;
+        let adb_stat_response = self.stat_with_explicit_ids(remote_path, local_id, remote_id)?;
+        self.end_transaction(local_id, remote_id)?;
+        Ok(adb_stat_response)
+    }
+
+    fn pull<A: AsRef<str>, W: Write>(&mut self, source: A, output: W) -> Result<()> {
+        let (local_id, remote_id) = self.begin_synchronization()?;
+        let source = source.as_ref();
+
+        let adb_stat_response = self.stat_with_explicit_ids(source, local_id, remote_id)?;
+        self.transport.write_message(ADBUsbMessage::new(
+            USBCommand::Okay,
+            local_id,
+            remote_id,
+            "".into(),
+        ))?;
+
+        log::debug!("{:?}", adb_stat_response);
+        if adb_stat_response.file_perm == 0 {
+            return Err(RustADBError::UnknownResponseType(
+                "mode is 0: source file does not exist".to_string(),
+            ));
+        }
+
+        let recv_buffer = USBSubcommand::Recv.with_arg(source.len() as u32);
+        let recv_buffer =
+            bincode::serialize(&recv_buffer).map_err(|_e| RustADBError::ConversionError)?;
+        self.send_and_expect_okay(ADBUsbMessage::new(
+            USBCommand::Write,
+            local_id,
+            remote_id,
+            recv_buffer,
+        ))?;
+        self.send_and_expect_okay(ADBUsbMessage::new(
+            USBCommand::Write,
+            local_id,
+            remote_id,
+            source.into(),
+        ))?;
+
+        self.recv_file(local_id, remote_id, output)?;
+        self.end_transaction(local_id, remote_id)?;
+        Ok(())
+    }
+
+    fn push<R: Read, A: AsRef<str>>(&mut self, stream: R, path: A) -> Result<()> {
+        let (local_id, remote_id) = self.begin_synchronization()?;
+
+        let path_header = format!("{},0777", path.as_ref());
+
+        let send_buffer = USBSubcommand::Send.with_arg(path_header.len() as u32);
+        let mut send_buffer =
+            bincode::serialize(&send_buffer).map_err(|_e| RustADBError::ConversionError)?;
+        send_buffer.append(&mut path_header.as_bytes().to_vec());
+
+        self.send_and_expect_okay(ADBUsbMessage::new(
+            USBCommand::Write,
+            local_id,
+            remote_id,
+            send_buffer,
+        ))?;
+
+        self.push_file(local_id, remote_id, stream)?;
+
+        self.end_transaction(local_id, remote_id)?;
+
+        Ok(())
+    }
+
+    fn reboot(&mut self, reboot_type: RebootType) -> Result<()> {
+        let mut rng = rand::thread_rng();
+
+        let message = ADBUsbMessage::new(
+            USBCommand::Open,
+            rng.gen(), // Our 'local-id'
+            0,
+            format!("reboot:{}\0", reboot_type).as_bytes().to_vec(),
+        );
+        self.transport.write_message(message)?;
+
+        let message = self.transport.read_message()?;
+
+        if message.header().command() != USBCommand::Okay {
+            return Err(RustADBError::ADBShellNotSupported);
+        }
+
+        Ok(())
+    }
+}
--- a/adb_client/src/usb/adb_usb_message.rs
+++ b/adb_client/src/usb/adb_usb_message.rs
@@ -0,0 +1,109 @@
+use serde::{Deserialize, Serialize};
+
+use super::usb_commands::USBCommand;
+use crate::RustADBError;
+
+pub const AUTH_TOKEN: u32 = 1;
+pub const AUTH_SIGNATURE: u32 = 2;
+pub const AUTH_RSAPUBLICKEY: u32 = 3;
+
+#[derive(Debug)]
+pub struct ADBUsbMessage {
+    header: ADBUsbMessageHeader,
+    payload: Vec<u8>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[repr(C)]
+pub struct ADBUsbMessageHeader {
+    command: USBCommand, /* command identifier constant      */
+    arg0: u32,           /* first argument                   */
+    arg1: u32,           /* second argument                  */
+    data_length: u32,    /* length of payload (0 is allowed) */
+    data_crc32: u32,     /* crc32 of data payload            */
+    magic: u32,          /* command ^ 0xffffffff             */
+}
+
+impl ADBUsbMessageHeader {
+    pub fn new(command: USBCommand, arg0: u32, arg1: u32, data: &[u8]) -> Self {
+        Self {
+            command,
+            arg0,
+            arg1,
+            data_length: data.len() as u32,
+            data_crc32: Self::compute_crc32(data),
+            magic: Self::compute_magic(command),
+        }
+    }
+
+    pub fn command(&self) -> USBCommand {
+        self.command
+    }
+
+    pub fn arg0(&self) -> u32 {
+        self.arg0
+    }
+
+    pub fn arg1(&self) -> u32 {
+        self.arg1
+    }
+
+    pub fn data_length(&self) -> u32 {
+        self.data_length
+    }
+
+    pub fn data_crc32(&self) -> u32 {
+        self.data_crc32
+    }
+
+    pub(crate) fn compute_crc32(data: &[u8]) -> u32 {
+        data.iter().map(|&x| x as u32).sum()
+    }
+
+    fn compute_magic(command: USBCommand) -> u32 {
+        let command_u32 = command as u32;
+        command_u32 ^ 0xFFFFFFFF
+    }
+
+    pub fn as_bytes(&self) -> Result<Vec<u8>, RustADBError> {
+        bincode::serialize(&self).map_err(|_e| RustADBError::ConversionError)
+    }
+}
+
+impl ADBUsbMessage {
+    pub fn new(command: USBCommand, arg0: u32, arg1: u32, data: Vec<u8>) -> Self {
+        Self {
+            header: ADBUsbMessageHeader::new(command, arg0, arg1, &data),
+            payload: data,
+        }
+    }
+
+    pub fn from_header_and_payload(header: ADBUsbMessageHeader, payload: Vec<u8>) -> Self {
+        Self { header, payload }
+    }
+
+    pub fn check_message_integrity(&self) -> bool {
+        ADBUsbMessageHeader::compute_magic(self.header.command) == self.header.magic
+            && ADBUsbMessageHeader::compute_crc32(&self.payload) == self.header.data_crc32
+    }
+
+    pub fn header(&self) -> &ADBUsbMessageHeader {
+        &self.header
+    }
+
+    pub fn payload(&self) -> &Vec<u8> {
+        &self.payload
+    }
+
+    pub fn into_payload(self) -> Vec<u8> {
+        self.payload
+    }
+}
+
+impl TryFrom<[u8; 24]> for ADBUsbMessageHeader {
+    type Error = RustADBError;
+
+    fn try_from(value: [u8; 24]) -> Result<Self, Self::Error> {
+        bincode::deserialize(&value).map_err(|_e| RustADBError::ConversionError)
+    }
+}
--- a/adb_client/src/usb/mod.rs
+++ b/adb_client/src/usb/mod.rs
@@ -0,0 +1,12 @@
+mod adb_rsa_key;
+mod adb_usb_device;
+mod adb_usb_device_commands;
+mod adb_usb_message;
+mod usb_commands;
+mod usb_shell;
+
+pub use adb_rsa_key::ADBRsaKey;
+pub use adb_usb_device::ADBUSBDevice;
+pub use adb_usb_message::{ADBUsbMessage, ADBUsbMessageHeader};
+pub use usb_commands::{USBCommand, USBSubcommand};
+pub use usb_shell::USBShellWriter;
--- a/adb_client/src/usb/usb_commands.rs
+++ b/adb_client/src/usb/usb_commands.rs
@@ -0,0 +1,63 @@
+use serde::{Deserialize, Serialize};
+use serde_repr::{Deserialize_repr, Serialize_repr};
+use std::fmt::Display;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize_repr, Deserialize_repr)]
+#[repr(u32)]
+pub enum USBCommand {
+    /// Connect to a device
+    Cnxn = 0x4e584e43,
+    /// Close connection to a device
+    Clse = 0x45534c43,
+    /// Device ask for authentication
+    Auth = 0x48545541,
+    /// Open a data connection
+    Open = 0x4e45504f,
+    /// Write data to connection
+    Write = 0x45545257,
+    /// Server understood the message
+    Okay = 0x59414b4f,
+    // Sync 0x434e5953
+    // Stls 0x534C5453
+}
+
+#[derive(Debug, Eq, PartialEq, Copy, Clone, Serialize_repr, Deserialize_repr)]
+#[repr(u32)]
+pub enum USBSubcommand {
+    Stat = 0x54415453,
+    Send = 0x444E4553,
+    Recv = 0x56434552,
+    Quit = 0x54495551,
+    Fail = 0x4c494146,
+    Done = 0x454e4f44,
+    Data = 0x41544144,
+    List = 0x5453494c,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct SubcommandWithArg {
+    subcommand: USBSubcommand,
+    arg: u32,
+}
+
+impl USBSubcommand {
+    pub fn with_arg(self, arg: u32) -> SubcommandWithArg {
+        SubcommandWithArg {
+            subcommand: self,
+            arg,
+        }
+    }
+}
+
+impl Display for USBCommand {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            USBCommand::Cnxn => write!(f, "CNXN"),
+            USBCommand::Clse => write!(f, "CLSE"),
+            USBCommand::Auth => write!(f, "AUTH"),
+            USBCommand::Open => write!(f, "OPEN"),
+            USBCommand::Write => write!(f, "WRTE"),
+            USBCommand::Okay => write!(f, "OKAY"),
+        }
+    }
+}
--- a/adb_client/src/usb/usb_shell.rs
+++ b/adb_client/src/usb/usb_shell.rs
@@ -0,0 +1,41 @@
+use std::io::Write;
+
+use crate::USBTransport;
+
+use super::{ADBUsbMessage, USBCommand};
+
+/// Wraps a `Writer` to hide underlying ADB protocol write logic.
+pub struct USBShellWriter {
+    transport: USBTransport,
+    local_id: u32,
+    remote_id: u32,
+}
+
+impl USBShellWriter {
+    pub fn new(transport: USBTransport, local_id: u32, remote_id: u32) -> Self {
+        Self {
+            transport,
+            local_id,
+            remote_id,
+        }
+    }
+}
+
+impl Write for USBShellWriter {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        let message = ADBUsbMessage::new(
+            USBCommand::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))?;
+        Ok(buf.len())
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        Ok(())
+    }
+}
--- a/assets/logo.png
+++ b/assets/logo.png
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -17,27 +17,27 @@ mod tests {
    #[test]
    fn test_version() {
        let mut adb = new_client();
-        adb.version().unwrap();
+        adb.version().expect("cannot get adb version");
    }

    #[test]
-    fn test_shell() {
+    fn test_shell_commands() {
        let mut device = new_device();

-        device.shell_command(vec!["ls"]).unwrap();
-        device.shell_command(vec!["pwd"]).unwrap();
+        device.shell_command(["ls"]).expect("error while executing `ls` command");
+        device.shell_command(["pwd"]).expect("error while executing `pwd` command");
    }

    #[test]
    fn test_devices() {
        let mut adb = new_client();
-        adb.devices().unwrap();
+        adb.devices().expect("cannot list devices");
    }

    #[test]
    fn test_devices_long() {
        let mut adb = new_client();
-        adb.devices_long().unwrap();
+        adb.devices_long().expect("cannot list devices long");
    }

    #[test]
Author	SHA1	Message	Date
LIAUD Corentin	266265ca35	feat: v2.0.0	2024-10-25 18:13:11 +02:00
cocool97	479d2d9ade	Support devices over usb (#40 ) * feat: device interactions over USB (shell, push, pull, reboot for now) * feat: parse vid and pid from hex as seen in lsusb output (#32) * usb: Read RSA keypair from user home or generate them (#34) * feat read keypair from user home or generate ephemeral ones --------- Co-authored-by: LIAUD Corentin <corentin.liaud@orange.fr> Co-authored-by: Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com>	2024-10-25 18:09:41 +02:00
LIAUD Corentin	c53f5cc11b	feat: update workflow	2024-10-24 12:21:29 +02:00
Jinke	95fe89a12c	Fix RegexParsingError when parsing device list (#37 )	2024-10-11 15:43:51 +02:00
cocool97	e37b6d47cc	feat: add github actions (#39 )	2024-10-11 15:33:00 +02:00
cocool97	d2d9ede8ab	feat: add logo + rework README.md (#38 )	2024-10-10 16:41:16 +02:00
cocool97	ed884b0d27	feat: should make crate usable on Windows (#35 ) Co-authored-by: LIAUD Corentin <corentin.liaud@orange.fr>	2024-10-01 19:39:25 +02:00