Split bin dir into separate daemon and check dirs

This lets us manage their increasingly disparate dependencies separately

.github/workflows/main.yml

@@ -48,7 +48,7 @@ jobs:
             echo installer_count=forced >> "$GITHUB_OUTPUT"
             echo rootshell_count=forced >> "$GITHUB_OUTPUT"
           else
-            echo "code_count=$(git diff --name-only $lcommit...HEAD | grep -e ^bin -e ^installer -e ^lib -e ^rootshell -e ^telcom-parser | wc -l)" >> "$GITHUB_OUTPUT"
+            echo "code_count=$(git diff --name-only $lcommit...HEAD | grep -e ^bin -e ^installer -e ^check -e ^lib -e ^rootshell -e ^telcom-parser | wc -l)" >> "$GITHUB_OUTPUT"
             echo "daemon_count=$(git diff --name-only $lcommit...HEAD | grep -e ^bin -e ^lib -e ^telcom-parser | wc -l)" >> "$GITHUB_OUTPUT"
             echo "web_count=$(git diff --name-only $lcommit...HEAD | grep -e ^bin/web | wc -l)" >> "$GITHUB_OUTPUT"
             echo "docs_count=$(git diff --name-only $lcommit...HEAD | grep -e ^book.toml -e ^doc | wc -l)" >> "$GITHUB_OUTPUT"
@@ -117,7 +117,7 @@ jobs:
       run: cargo fmt --all --check
     - name: Check
       run: |
-        pushd bin/web
+        pushd daemon/web
         npm install
         npm run build
         popd
@@ -254,7 +254,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - name: Build rayhunter-daemon (armv7)
         run: |
-          pushd bin/web
+          pushd daemon/web
           npm install
           npm run build
           popd
@@ -345,7 +345,7 @@ jobs:
         run: chmod +x installer-*/installer rayhunter-check-*/rayhunter-check rayhunter-daemon-*/rayhunter-daemon
       - name: Get Rayhunter version
         id: get_version
-        run: echo "VERSION=$(grep '^version' bin/Cargo.toml | head -n 1 | cut -d'"' -f2)" >> $GITHUB_ENV
+        run: echo "VERSION=$(grep '^version' daemon/Cargo.toml | head -n 1 | cut -d'"' -f2)" >> $GITHUB_ENV
       - name: Setup versioned release directory
         run: |
           platform="${{ matrix.platform }}"

.github/workflows/release.yml

@@ -16,8 +16,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Ensure all Cargo.toml files have the same version defined.
         run: |
-          defined_versions=$(find lib bin installer rootshell telcom-parser -name Cargo.toml -exec grep ^version {} \; | sort -u | wc -l)
-          find lib bin installer rootshell telcom-parser -name Cargo.toml -exec grep ^version {} \;
+          defined_versions=$(find lib check daemon installer rootshell telcom-parser -name Cargo.toml -exec grep ^version {} \; | sort -u | wc -l)
+          find lib check daemon installer rootshell telcom-parser -name Cargo.toml -exec grep ^version {} \;
           echo number of defined versions = $defined_versions
           if [ $defined_versions != "1" ]
           then

Cargo.lock

@@ -2364,6 +2364,18 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "rayhunter-check"
+version = "0.4.0"
+dependencies = [
+ "clap",
+ "futures",
+ "log",
+ "rayhunter",
+ "simple_logger",
+ "tokio",
+]
+
 [[package]]
 name = "rayhunter-daemon"
 version = "0.4.0"
@@ -2372,7 +2384,6 @@ dependencies = [
  "async_zip",
  "axum",
  "chrono",
- "clap",
  "env_logger 0.11.8",
  "futures",
  "futures-macro",
@@ -2383,7 +2394,6 @@ dependencies = [
  "rayhunter",
  "serde",
  "serde_json",
- "simple_logger",
  "tempfile",
  "thiserror 1.0.69",
  "tokio",

Cargo.toml

@@ -2,7 +2,8 @@
 
 members = [
     "lib",
-    "bin",
+    "daemon",
+    "check",
     "rootshell",
     "telcom-parser",
     "installer",

daemon/Cargo.toml

@@ -11,14 +11,6 @@ wingtech = ["rayhunter/wingtech"]
 
 default = ["orbic"]
 
-[[bin]]
-name = "rayhunter-daemon"
-path = "src/daemon.rs"
-
-[[bin]]
-name = "rayhunter-check"
-path = "src/check.rs"
-
 [dependencies]
 rayhunter = { path = "../lib" }
 toml = "0.8.8"
@@ -35,10 +27,8 @@ include_dir = "0.7.3"
 chrono = { version = "0.4.31", features = ["serde"] }
 tokio-stream = { version = "0.1.14", default-features = false }
 futures = { version = "0.3.30", default-features = false }
-clap = { version = "4.5.2", features = ["derive"] }
 serde_json = "1.0.114"
 image = { version =  "0.25.1", default-features = false, features = ["png", "gif"] }
 tempfile = "3.10.1"
-simple_logger = "5.0.0"
 async_zip = { version = "0.0.17", features = ["tokio"] }
 anyhow = "1.0.98"

make.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -e
-pushd bin/web
+pushd daemon/web
     npm run build
 popd
 cargo build --profile firmware --bin rayhunter-daemon --target="armv7-unknown-linux-musleabihf" #--features debug