ci: add publish on crates.io

.github/workflows/rust-release.yml

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

Cargo.toml

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

LICENSE

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

adb_cli/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
+authors.workspace = true
 description = "Rust ADB (Android Debug Bridge) CLI"
 edition.workspace = true
 keywords.workspace = true
-license.workspace = true
+license-file.workspace = true
 name = "adb_cli"
 readme = "README.md"
 repository.workspace = true
@@ -17,3 +18,22 @@ log = { version = "0.4.22" }
 
 [target.'cfg(unix)'.dependencies]
 termios = { version = "0.3.3" }
+
+#####################################
+# Debian package build instructions #
+#####################################
+[package.metadata.deb]
+assets = [
+    { source = "target/release/adb_cli", dest = "usr/bin/", mode = "755" },
+]
+priority = "optional"
+section = "utility"
+
+##################################
+# RPM package build instructions #
+##################################
+[package.metadata.generate-rpm]
+assets = [
+    { source = "target/release/adb_cli", dest = "/usr/bin/adb_cli", mode = "755" },
+]
+license = "MIT"

adb_client/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
+authors.workspace = true
 description = "Rust ADB (Android Debug Bridge) client library"
 edition.workspace = true
 keywords.workspace = true
-license.workspace = true
+license-file.workspace = true
 name = "adb_client"
 readme = "README.md"
 repository.workspace = true

adb_client/src/models/adb_server_command.rs

@@ -22,6 +22,8 @@ pub(crate) enum AdbServerCommand {
     FrameBuffer,
     Sync,
     Reboot(RebootType),
+    Forward(String, String, String),
+    Reverse(String, String),
 }
 
 impl Display for AdbServerCommand {
@@ -53,6 +55,12 @@ impl Display for AdbServerCommand {
                 write!(f, "host:pair:{code}:{addr}")
             }
             AdbServerCommand::FrameBuffer => write!(f, "framebuffer:"),
+            AdbServerCommand::Forward(serial, remote, local) => {
+                write!(f, "host-serial:{serial}:forward:{local};{remote}")
+            }
+            AdbServerCommand::Reverse(remote, local) => {
+                write!(f, "reverse:forward:{remote};{local}")
+            }
         }
     }
 }

adb_client/src/server/device_commands/forward.rs

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

adb_client/src/server/device_commands/mod.rs

@@ -1,9 +1,11 @@
+mod forward;
 mod framebuffer;
 mod host_features;
 mod list;
 mod logcat;
 mod reboot;
 mod recv;
+mod reverse;
 mod send;
 mod stat;
 mod transport;

adb_client/src/server/device_commands/reverse.rs

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