Merge branch 'main' into usb-backends

Author: cocool97

.github/workflows/rust-build.yml

@@ -19,5 +19,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
       - name: Build project
         run: cargo build --release --all-features

.github/workflows/rust-release.yml

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

Cargo.toml

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

adb_cli/Cargo.toml

@@ -13,7 +13,7 @@ version.workspace = true
 [dependencies]
 adb_client = { version = "^2.1.17", features = ["mdns", "rusb"] }
 anyhow = { version = "1.0.100" }
-clap = { version = "4.5.49", features = ["derive"] }
+clap = { version = "4.5.51", features = ["derive"] }
 env_logger = { version = "0.11.8" }
 log = { version = "0.4.28" }
 

adb_cli/src/main.rs

@@ -82,7 +82,10 @@ fn main() -> Result<()> {
             (device.boxed(), usb_command.commands)
         }
         MainCommand::Tcp(tcp_command) => {
-            let device = ADBTcpDevice::new(tcp_command.address)?;
+            let device = match tcp_command.path_to_private_key {
+                Some(pk) => ADBTcpDevice::new_with_custom_private_key(tcp_command.address, pk)?,
+                None => ADBTcpDevice::new(tcp_command.address)?,
+            };
             (device.boxed(), tcp_command.commands)
         }
         MainCommand::Mdns => {

adb_cli/src/models/tcp.rs

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

adb_client/Cargo.toml

@@ -22,7 +22,7 @@ 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.42", default-features = false, features = ["std"] }
 image = { version = "0.25.8", default-features = false }
@@ -45,7 +45,7 @@ thiserror = { version = "2.0.17" }
 
 #########
 # MDNS dependencies
-mdns-sd = { version = "0.13.11", default-features = false, features = [
+mdns-sd = { version = "0.17.0", default-features = false, features = [
     "logging",
 ], optional = true }
 #########
@@ -57,13 +57,13 @@ 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"] }
-ring = { version = "0.17.14", features = ["wasm32_unknown_unknown_js"] }
+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.100" }
-criterion = { version = "0.6.0" } # Used for benchmarks
+criterion = { version = "0.7.0" } # Used for benchmarks
 
 [[bench]]
 harness = false

adb_client/src/error.rs

@@ -63,6 +63,9 @@ pub enum RustADBError {
     /// Unimplemented framebuffer image version
     #[error("Unimplemented framebuffer image version: {0}")]
     UnimplementedFramebufferImageVersion(u32),
+    /// An error occurred while getting user's home directory
+    #[error("Cannot get user home directory")]
+    HomeError,
     /// Cannot get home directory
     #[error("Cannot get home directory")]
     NoHomeDirectory,

adb_client/src/mdns/mdns_device.rs

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

adb_client/src/mdns/mdns_discovery.rs

@@ -48,6 +48,9 @@ impl MDNSDiscoveryService {
                                 .send(MDNSDevice::from(service_info))
                                 .map_err(|_| RustADBError::SendError);
                         }
+                        e => {
+                            log::warn!("received unknown event type {e:?}");
+                        }
                     }
                 }
             }