chore: v2.1.7

* implemented uninstall command

.github/workflows/python-build.yml

@@ -7,6 +7,14 @@ on:
     types: [created]
 
 jobs:
+  gen-stubs:
+    name: "build-release"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build project
+      run: cargo run --bin stub_gen
+
   build-python-packages:
     runs-on: ubuntu-latest
 
@@ -14,10 +22,10 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Python build dependencies
-        run: pip install ".[build]"
+        run: pip install maturin==1.8.2
 
       - name: Build Python packages
-        run: maturin build --release --compatibility manylinux_2_25 --auditwheel=skip
+        run: maturin build --sdist --release -m pyadb_client/Cargo.toml
 
   publish-python-packages:
     runs-on: ubuntu-latest
@@ -28,10 +36,10 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Python build dependencies
-        run: pip install ".[build]"
+        run: pip install maturin==1.8.2
 
       - name: Publish Python packages
-        run: maturin publish --non-interactive --compatibility manylinux_2_25 --auditwheel=skip
+        run: maturin publish -m pyadb_client/Cargo.toml --non-interactive
         env:
           MATURIN_PYPI_TOKEN: ${{ secrets.MATURIN_PYPI_TOKEN }}
 

.gitignore

@@ -2,4 +2,5 @@ target
 /Cargo.lock
 /.vscode
 venv
-/.mypy_cache
+/.mypy_cache
+pyadb_client/pyadb_client.pyi

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.5"
+version = "2.1.7"
 
 # To build locally when working on a new release
 [patch.crates-io]

adb_cli/src/adb_termios.rs

@@ -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/main.rs

@@ -133,6 +133,10 @@ fn main() -> Result<()> {
             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

@@ -33,6 +33,11 @@ pub enum DeviceCommands {
         /// 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

adb_client/Cargo.toml

@@ -18,17 +18,17 @@ homedir = { version = "0.3.4" }
 image = { version = "0.25.5" }
 lazy_static = { version = "1.5.0" }
 log = { version = "0.4.22" }
-mdns-sd = { version = "0.13.1" }
+mdns-sd = { version = "0.13.2" }
 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" }
+rand = { version = "0.9.0" }
 rcgen = { version = "0.13.1" }
 regex = { version = "1.11.1", features = ["perf", "std", "unicode"] }
 rsa = { version = "0.9.7" }
 rusb = { version = "0.9.4", features = ["vendored"] }
-rustls = { version = "0.23.18" }
+rustls = { version = "0.23.22" }
-rustls-pki-types = "1.10.0"
+rustls-pki-types = "1.11.0"
 serde = { version = "1.0.216", features = ["derive"] }
 serde_repr = { version = "0.1.19" }
 sha1 = { version = "0.10.6", features = ["oid"] }

adb_client/src/adb_device_ext.rs

@@ -41,6 +41,9 @@ pub trait ADBDeviceExt {
     /// Install an APK pointed to by `apk_path` on device.
     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>>>;
 

adb_client/src/device/adb_message_device.rs

@@ -213,11 +213,11 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     }
 
     pub(crate) fn open_session(&mut self, data: &[u8]) -> Result<ADBTransportMessage> {
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
 
         let message = ADBTransportMessage::new(
             MessageCommand::Open,
-            rng.gen(), // Our 'local-id'
+            rng.random(), // Our 'local-id'
             0,
             data,
         );

adb_client/src/device/adb_message_device_commands.rs

@@ -35,6 +35,10 @@ impl<T: ADBMessageTransport> ADBDeviceExt for ADBMessageDevice<T> {
         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/device/adb_tcp_device.rs

@@ -96,6 +96,11 @@ impl ADBDeviceExt for ADBTcpDevice {
         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/device/adb_usb_device.rs

@@ -273,6 +273,11 @@ impl ADBDeviceExt for ADBUSBDevice {
         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/device/commands/install.rs

@@ -16,9 +16,9 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
 
         let file_size = apk_file.metadata()?.len();
 
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
 
-        let local_id = rng.gen();
+        let local_id = rng.random();
 
         self.open_session(format!("exec:cmd package 'install' -S {}\0", file_size).as_bytes())?;
 

adb_client/src/device/commands/mod.rs

@@ -5,3 +5,4 @@ mod push;
 mod reboot;
 mod shell;
 mod stat;
+mod uninstall;

adb_client/src/device/commands/uninstall.rs

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

adb_client/src/device/models/adb_rsa_key.rs

@@ -3,7 +3,6 @@ use base64::{engine::general_purpose::STANDARD, Engine};
 use num_bigint::{BigUint, ModInverse};
 use num_traits::cast::ToPrimitive;
 use num_traits::FromPrimitive;
-use rand::rngs::OsRng;
 use rsa::pkcs8::DecodePrivateKey;
 use rsa::traits::PublicKeyParts;
 use rsa::{Pkcs1v15Sign, RsaPrivateKey};
@@ -52,7 +51,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)?,
         })
     }
 

adb_client/src/models/adb_server_command.rs

@@ -20,6 +20,7 @@ pub(crate) enum AdbServerCommand {
     MDNSServices,
     ServerStatus,
     ReconnectOffline,
+    Uninstall(String),
     Install(u64),
     // Local commands
     ShellCommand(String),
@@ -83,6 +84,9 @@ 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}")
+            }
         }
     }
 }

adb_client/src/server_device/adb_server_device_commands.rs

@@ -115,6 +115,10 @@ impl ADBDeviceExt for ADBServerDevice {
         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/server_device/commands/mod.rs

@@ -12,4 +12,5 @@ mod send;
 mod stat;
 mod tcpip;
 mod transport;
+mod uninstall;
 mod usb;

adb_client/src/server_device/commands/uninstall.rs

@@ -0,0 +1,28 @@
+use std::io::Read;
+
+use crate::{models::AdbServerCommand, server_device::ADBServerDevice, Result};
+
+impl ADBServerDevice {
+    /// Uninstall a package from device
+    pub fn uninstall(&mut self, package_name: &str) -> Result<()> {
+        let serial: String = self.identifier.clone();
+        self.connect()?
+            .send_adb_request(AdbServerCommand::TransportSerial(serial))?;
+
+        self.transport
+            .send_adb_request(AdbServerCommand::Uninstall(package_name.to_string()))?;
+
+        let mut data = [0; 1024];
+        let read_amount = self.transport.get_raw_connection()?.read(&mut data)?;
+
+        match &data[0..read_amount] {
+            b"Success\n" => {
+                log::info!("Package {} successfully uninstalled", package_name);
+                Ok(())
+            }
+            d => Err(crate::RustADBError::ADBRequestFailed(String::from_utf8(
+                d.to_vec(),
+            )?)),
+        }
+    }
+}

benches/benchmark_adb_push.rs

@@ -1,7 +1,7 @@
 use adb_client::ADBServer;
 use anyhow::Result;
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
-use rand::{thread_rng, Rng};
+use rand::{rng, Rng};
 use std::fs::File;
 use std::io::Write;
 use std::process::Command;
@@ -14,7 +14,7 @@ const REMOTE_TEST_FILE_PATH: &str = "/data/local/tmp/test_file.bin";
 fn generate_test_file(size_in_bytes: usize) -> Result<()> {
     let mut test_file = File::create(LOCAL_TEST_FILE_PATH)?;
 
-    let mut rng = thread_rng();
+    let mut rng = rng();
 
     const BUFFER_SIZE: usize = 64 * 1024;
     let mut buffer = [0u8; BUFFER_SIZE];

pyadb_client/Cargo.toml

@@ -1,20 +1,30 @@
 [package]
-name = "pyadb_client"
-description = "Python wrapper for adb_client library"
 authors.workspace = true
+description = "Python wrapper for adb_client library"
 edition.workspace = true
 homepage.workspace = true
 keywords.workspace = true
 license.workspace = true
+name = "pyadb_client"
+readme = "README.md"
 repository.workspace = true
 version.workspace = true
-readme = "README.md"
 
 [lib]
+crate-type = ["cdylib", "rlib"]
 name = "pyadb_client"
-crate-type = ["cdylib"]
+
+[[bin]]
+doc = false
+name = "stub_gen"
 
 [dependencies]
-anyhow = { version = "1.0.94" }
+adb_client = { path = "../adb_client" }
-adb_client = { version = "2.0.6" }
+anyhow = { version = "1.0.95" }
-pyo3 = { version = "0.23.4", features = ["extension-module", "anyhow", "abi3-py37"] }
+pyo3 = { version = "0.23.4", features = [
+    "abi3-py37",
+    "anyhow",
+    "extension-module",
+] }
+pyo3-stub-gen = "0.7.0"
+pyo3-stub-gen-derive = "0.7.0"

pyadb_client/README.md

@@ -13,9 +13,9 @@ pip install pyadb_client
 ### Use ADB server
 
 ```python
-from pyadb_client import pyadb_client
+from pyadb_client import PyADBServer
 
-server = pyadb_client.PyADBServer("127.0.0.1:5037")
+server = PyADBServer("127.0.0.1:5037")
 for i, device in enumerate(server.devices()):
     print(i, device.identifier, device.state)
 
@@ -27,7 +27,7 @@ print(device, device.identifier)
 ### Push a file on device
 
 ```python
-from pyadb_client import pyadb_client
+from pyadb_client import PyADBUSBDevice
 
 usb_device = PyADBUSBDevice.autodetect()
 usb_device.push("file.txt", "/data/local/tmp/file.txt")
@@ -42,11 +42,14 @@ python3 -m venv .venv
 source .venv/bin/activate
 
 # Install needed build dependencies
-pip install ".[build]"
+pip install maturin
 
 # Build development package
 maturin develop
 
+# Build stub file (.pyi)
+cargo run --bin stub_gen
+
 # Build release Python package
-maturin build --release
+maturin build --release -m pyadb_client/Cargo.toml
 ```

pyadb_client/pyproject.toml

@@ -8,9 +8,5 @@ dynamic = ["authors", "keywords", "version"]
 name = "pyadb_client"
 requires-python = ">= 3.7"
 
-[project.optional-dependencies]
-build = ["maturin", "patchelf"]
-
 [tool.maturin]
-include = [{ path = "adb_client/**/*", format = "sdist" }]
+features = ["pyo3/extension-module"]
-manifest-path = "pyadb_client/Cargo.toml"

pyadb_client/src/adb_server.rs

@@ -3,28 +3,36 @@ use std::net::SocketAddrV4;
 use adb_client::ADBServer;
 use anyhow::Result;
 use pyo3::{pyclass, pymethods, PyResult};
+use pyo3_stub_gen_derive::{gen_stub_pyclass, gen_stub_pymethods};
 
 use crate::{PyADBServerDevice, PyDeviceShort};
 
+#[gen_stub_pyclass]
 #[pyclass]
+/// Represent an instance of an ADB Server
 pub struct PyADBServer(ADBServer);
 
+#[gen_stub_pymethods]
 #[pymethods]
 impl PyADBServer {
     #[new]
+    /// Instantiate a new PyADBServer instance
     pub fn new(address: String) -> PyResult<Self> {
         let address = address.parse::<SocketAddrV4>()?;
         Ok(ADBServer::new(address).into())
     }
 
+    /// List available devices
     pub fn devices(&mut self) -> Result<Vec<PyDeviceShort>> {
         Ok(self.0.devices()?.into_iter().map(|v| v.into()).collect())
     }
 
+    /// Get a device, assuming that only one is currently connected
     pub fn get_device(&mut self) -> Result<PyADBServerDevice> {
         Ok(self.0.get_device()?.into())
     }
 
+    /// Get a device by its name, as shown in `.devices()` output
     pub fn get_device_by_name(&mut self, name: String) -> Result<PyADBServerDevice> {
         Ok(self.0.get_device_by_name(&name)?.into())
     }

pyadb_client/src/adb_server_device.rs

@@ -1,18 +1,24 @@
 use adb_client::{ADBDeviceExt, ADBServerDevice};
 use anyhow::Result;
 use pyo3::{pyclass, pymethods};
+use pyo3_stub_gen_derive::{gen_stub_pyclass, gen_stub_pymethods};
 use std::{fs::File, path::PathBuf};
 
+#[gen_stub_pyclass]
 #[pyclass]
+/// Represent a device connected to the ADB server
 pub struct PyADBServerDevice(pub ADBServerDevice);
 
+#[gen_stub_pymethods]
 #[pymethods]
 impl PyADBServerDevice {
     #[getter]
+    /// Device identifier
     pub fn identifier(&self) -> String {
         self.0.identifier.clone()
     }
 
+    /// Run shell commands on device and return the output (stdout + stderr merged)
     pub fn shell_command(&mut self, commands: Vec<String>) -> Result<Vec<u8>> {
         let mut output = Vec::new();
         let commands: Vec<&str> = commands.iter().map(|x| &**x).collect();
@@ -20,15 +26,27 @@ impl PyADBServerDevice {
         Ok(output)
     }
 
+    /// Push a local file from input to dest
     pub fn push(&mut self, input: PathBuf, dest: PathBuf) -> Result<()> {
         let mut reader = File::open(input)?;
         Ok(self.0.push(&mut reader, dest.to_string_lossy())?)
     }
 
+    /// Pull a file from device located at input, and drop it to dest
     pub fn pull(&mut self, input: PathBuf, dest: PathBuf) -> Result<()> {
         let mut writer = File::create(dest)?;
         Ok(self.0.pull(&input.to_string_lossy(), &mut writer)?)
     }
+
+    /// Install a package installed on the device
+    pub fn install(&mut self, apk_path: PathBuf) -> Result<()> {
+        Ok(self.0.install(&apk_path)?)
+    }
+
+    /// Uninstall a package installed on the device
+    pub fn uninstall(&mut self, package: &str) -> Result<()> {
+        Ok(self.0.uninstall(package)?)
+    }
 }
 
 impl From<ADBServerDevice> for PyADBServerDevice {

pyadb_client/src/adb_usb_device.rs

@@ -3,17 +3,24 @@ use std::{fs::File, path::PathBuf};
 use adb_client::{ADBDeviceExt, ADBUSBDevice};
 use anyhow::Result;
 use pyo3::{pyclass, pymethods};
+use pyo3_stub_gen_derive::{gen_stub_pyclass, gen_stub_pymethods};
 
+#[gen_stub_pyclass]
 #[pyclass]
+/// Represent a device directly reachable over USB.
 pub struct PyADBUSBDevice(ADBUSBDevice);
 
+#[gen_stub_pymethods]
 #[pymethods]
 impl PyADBUSBDevice {
     #[staticmethod]
+    /// Autodetect a device reachable over USB.
+    /// This method raises an error if multiple devices or none are connected.
     pub fn autodetect() -> Result<Self> {
         Ok(ADBUSBDevice::autodetect()?.into())
     }
 
+    /// Run shell commands on device and return the output (stdout + stderr merged)
     pub fn shell_command(&mut self, commands: Vec<String>) -> Result<Vec<u8>> {
         let mut output = Vec::new();
         let commands: Vec<&str> = commands.iter().map(|x| &**x).collect();
@@ -21,15 +28,27 @@ impl PyADBUSBDevice {
         Ok(output)
     }
 
+    /// Push a local file from input to dest
     pub fn push(&mut self, input: PathBuf, dest: PathBuf) -> Result<()> {
         let mut reader = File::open(input)?;
         Ok(self.0.push(&mut reader, &dest.to_string_lossy())?)
     }
 
+    /// Pull a file from device located at input, and drop it to dest
     pub fn pull(&mut self, input: PathBuf, dest: PathBuf) -> Result<()> {
         let mut writer = File::create(dest)?;
         Ok(self.0.pull(&input.to_string_lossy(), &mut writer)?)
     }
+
+    /// Install a package installed on the device
+    pub fn install(&mut self, apk_path: PathBuf) -> Result<()> {
+        Ok(self.0.install(&apk_path)?)
+    }
+
+    /// Uninstall a package installed on the device
+    pub fn uninstall(&mut self, package: &str) -> Result<()> {
+        Ok(self.0.uninstall(package)?)
+    }
 }
 
 impl From<ADBUSBDevice> for PyADBUSBDevice {

pyadb_client/src/bin/stub_gen.rs

@@ -0,0 +1,5 @@
+use pyo3_stub_gen::Result;
+
+fn main() -> Result<()> {
+    pyadb_client::stub_info()?.generate()
+}

pyadb_client/src/lib.rs

@@ -1,3 +1,6 @@
+#![forbid(missing_docs)]
+#![doc = include_str!("../README.md")]
+
 mod adb_server;
 mod adb_server_device;
 mod adb_usb_device;
@@ -8,6 +11,7 @@ pub use adb_usb_device::*;
 pub use models::*;
 
 use pyo3::prelude::*;
+use pyo3_stub_gen::StubInfo;
 
 #[pymodule]
 fn pyadb_client(m: &Bound<'_, PyModule>) -> PyResult<()> {
@@ -18,3 +22,9 @@ fn pyadb_client(m: &Bound<'_, PyModule>) -> PyResult<()> {
 
     Ok(())
 }
+
+/// Get stub informations for this package.
+pub fn stub_info() -> anyhow::Result<StubInfo> {
+    // Need to be run from workspace root directory
+    StubInfo::from_pyproject_toml(format!("{}/pyproject.toml", env!("CARGO_MANIFEST_DIR")))
+}

pyadb_client/src/models/devices.rs

@@ -1,19 +1,25 @@
 use adb_client::DeviceShort;
 use pyo3::{pyclass, pymethods};
+use pyo3_stub_gen_derive::{gen_stub_pyclass, gen_stub_pymethods};
 
 // Check https://docs.rs/rigetti-pyo3/latest/rigetti_pyo3 to automatically build this code
 
+#[gen_stub_pyclass]
 #[pyclass]
+/// Represent a device output as shown when running `adb devices`
 pub struct PyDeviceShort(DeviceShort);
 
+#[gen_stub_pymethods]
 #[pymethods]
 impl PyDeviceShort {
     #[getter]
+    /// Device identifier
     pub fn identifier(&self) -> String {
         self.0.identifier.clone()
     }
 
     #[getter]
+    /// Device state
     pub fn state(&self) -> String {
         self.0.state.to_string()
     }