run rmqtt and agent successfully, add github action for agent

Author: timzaak

.github/workflows/ci.yml

@@ -0,0 +1,59 @@
+name: CI
+on:
+#  push:
+#    tags:
+#      - '*'
+  workflow_dispatch:
+jobs:
+  build_bin:
+    strategy:
+      max-parallel: 1
+      fail-fast: true
+      matrix:
+        settings:
+          - host: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            build: make release-linux
+          - host: macos-latest
+            target: aarch64-apple-darwin
+            build: make release-mac-aarch64
+          - host: macos-12
+            target: x86_64-apple-darwin
+            build: make release-mac-x86_64
+          # - host: macos-latest # This needs aarch64 OpenSSL, will wait github action support MacOS M1(https://github.com/github/roadmap/issues/528), then run this.
+          #   target: aarch64-apple-darwin
+          #   build: make release-mac-aarch64
+    runs-on: ${{ matrix.settings.host }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: ${{ matrix.settings.target }}
+          profile: minimal
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            client/target/
+          key: ${{ matrix.settings.host }}-${{ matrix.settings.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ matrix.settings.host }}-cargo-${{ matrix.settings.target }}
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
+      - name: Build
+        run: ${{ matrix.settings.build }}
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: mproxy-${{ matrix.settings.target }}
+          path: release/*
+          if-no-files-found: error

.gitignore

@@ -0,0 +1 @@
+.idea

Makefile

@@ -0,0 +1,33 @@
+.PHONY: release-mac-x86_64, release-mac-aarch64, release-linux, release-linux-aarch64
+
+name = mproxy
+rust_path = agent
+release-mac-x86_64:
+	mkdir -p release
+	cd $(rust_path) && cargo build --release  --target=x86_64-apple-darwin
+	strip $(rust_path)/target/x86_64-apple-darwin/release/$(name)
+	otool -L $(rust_path)/target/x86_64-apple-darwin/release/$(name)
+	cp $(rust_path)/target/x86_64-apple-darwin/release/mproxy ./release/
+
+# brew install wget
+release-mac-aarch64:
+	mkdir -p release
+	cd $(rust_path) && cargo build --release --target=aarch64-apple-darwin
+	strip $(rust_path)/target/aarch64-apple-darwin/release/$(name)
+	otool -L $(rust_path)/target/aarch64-apple-darwin/release/$(name)
+	cp $(rust_path)/target/aarch64-apple-darwin/release/$(name) ./release/
+
+release-linux-aarch64:
+	sudo apt-get install -y build-essential
+	mkdir release
+	cd $(rust_path) && cargo build --release --target=aarch64-unknown-linux-gnu
+	strip $(rust_path)/target/aarch64-unknown-linux-gnu/release/$(name)
+	cp $(rust_path)/target/aarch64-unknown-linux-gnu/release/$(name) ./release/
+
+
+release-linux:
+	sudo apt-get install -y build-essential
+	mkdir release
+	cd $(rust_path) && cargo build --release --target=x86_64-unknown-linux-gnu
+	strip $(rust_path)/target/x86_64-unknown-linux-gnu/release/$(name)
+	cp $(rust_path)/target/x86_64-unknown-linux-gnu/release/$(name) ./release

agent/Cargo.lock

@@ -13,10 +13,7 @@ rumqttc = { version = "0.24", features = ["use-rustls", "url"] }
 
 tokio-rustls = "0.26"
 clap = { version = "4.5", features = ["derive"] }
-auto-launch-extra = {version = "0.5", package = "auto-launch"}
-
-#cmd_lib = "1.9" # this only support macro
-shell-candy = "0.4"
+#auto-launch-extra = {version = "0.5", package = "auto-launch"}
 
 anyhow = "1"
 

agent/Cargo.toml

@@ -0,0 +1,2 @@
+server: 'mqtt://127.0.0.1:1883'
+client_id: test_client

agent/config.toml

@@ -55,4 +55,10 @@ mod test {
     pub fn get_default_config_path_test() {
         println!("{:?}", Config::get_default_config_path());
     }
+
+    #[test]
+    pub fn test_config_serial() {
+        let config = Config::new(Some("./config.yml".parse().unwrap())).unwrap();
+        println!("{:?}", config)
+    }
 }

agent/config.yml

@@ -17,8 +17,8 @@ pub struct Connection {
 
 impl Connection {
     pub async fn connect(config:Arc<Config>) -> anyhow::Result<(Self, EventLoop)>{
-
-      let mut options = MqttOptions::parse_url(&config.server).with_context(|| format!("parser mqtt url fail: {:?}", config.server))?;
+      let mqtt_url = format!("{}?client_id={}", &config.server, &config.client_id);
+      let mut options = MqttOptions::parse_url(&mqtt_url).with_context(|| format!("parser mqtt url fail: {:?}", &mqtt_url))?;
 
       match (&config.password, &config.username) {
           (Some(pass), Some(user)) => {
@@ -36,7 +36,7 @@ impl Connection {
       }, eventloop))
     }
     pub async fn publish_response(&self, topic:&String, message:ResponseMessage) -> Result<(), ClientError> {
-        self.client.publish(topic, QoS::ExactlyOnce, false, serde_json::to_vec(&message).unwrap())
+        self.client.publish(topic, QoS::ExactlyOnce, false, serde_json::to_vec(&message).unwrap()).await
     }
 
     pub async fn loop_event(mut event_loop: EventLoop, mut shutdown_rx:broadcast::Receiver<bool>, mqtt_tx: broadcast::Sender<(String, RequestMessage)>) {

agent/src/config.rs

@@ -1,12 +1,9 @@
 use std::io::{BufRead, BufReader};
 use serde::{Deserialize, Serialize};
-use shell_candy::{ShellTask, ShellTaskBehavior};
 use tokio::sync::broadcast;
-use tracing::{debug, info};
+use tracing::{info};
 use crate::connection::Connection;
 use std::process::Command;
-use std::sync::Arc;
-use crate::config::Config;
 
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -43,6 +40,7 @@ impl Handler {
     pub async fn run(&mut self, _shutdown_rx:broadcast::Receiver<bool>) {
 
         while let Ok((_, cmd)) = self.cmd_rx.recv().await {
+            info!("begin to handle cmd: {:?}",&cmd);
             match cmd {
                 RequestMessage::Cmd { command,request_id } => {
                     let mut seq:u32 = 1;
@@ -65,7 +63,6 @@ impl Handler {
                     }
                 }
             }
-            info!("begin to handle cmd: {:?}",cmd);
         }
     }
 }
@@ -77,7 +74,7 @@ mod test {
     use std::time::Duration;
 
     use super::RequestMessage;
-    use shell_candy::{ShellTaskLog, ShellTaskBehavior, ShellTask};
+
 
     #[test]
     fn test_serde() {
@@ -100,17 +97,5 @@ mod test {
         child.kill().unwrap()
 
     }
-    #[test]
-    pub fn parse2() {
-        let task = ShellTask::new(r#"ls"#).unwrap();
 
-        let z = task.run(|line|  {
-            match line {
-                ShellTaskLog::Stdout(message) | ShellTaskLog::Stderr(message) => eprintln!("{}", &message),
-            }
-            ShellTaskBehavior::<()>::Passthrough
-        });
-        println!("{z:?}");
-
-    }
 }