Test: Disable adb auth

.cargo/audit.toml

@@ -1,11 +0,0 @@
-[advisories]
-ignore = [
-    # RSA Marvin Attack in `rsa`, dragged in through rustcrypto (dev builds)
-    # and adb_client (USB signing only, unrelated to marvin attack which
-    # targets decryption).
-    "RUSTSEC-2023-0071",
-    # paste crate being unmaintained is not important. it's not dealing with
-    # user-input. we could get rid of this warning by disabling the image
-    # dependency in adb-client.
-    "RUSTSEC-2024-0436",
-]

.cargo/config.toml

@@ -1,11 +1,3 @@
-[alias]
-# Build the daemon with "firmware" profile and "ring" TLS backend.
-# Requires a cross-compiler (see github actions workflows) and is very slow to build.
-build-daemon-firmware = "build -p rayhunter-daemon --bin rayhunter-daemon --target armv7-unknown-linux-musleabihf --profile firmware --no-default-features --features ring-tls"
-# Build the daemon with "firmware-devel" profile and "rustcrypto" backend.
-# Works with just the Rust toolchain, and is medium-slow to build. Binaries are slightly larger.
-build-daemon-firmware-devel = "build -p rayhunter-daemon --bin rayhunter-daemon --target armv7-unknown-linux-musleabihf --profile firmware-devel"
-
 [target.aarch64-apple-darwin]
 linker = "rust-lld"
 rustflags = ["-C", "target-feature=+crt-static"]

.github/ISSUE_TEMPLATE/bug.yaml

@@ -2,12 +2,6 @@ name: Bug Report
 description: File a bug report.
 labels: ["bug"]
 body:
-  - type: checkboxes
-    attributes:
-      label: Prerequisites
-      options:
-        - label: I have read [CONTRIBUTING.md](https://github.com/EFForg/rayhunter/blob/main/CONTRIBUTING.md)
-          required: true
   - type: textarea
     attributes:
       label: Bug Report Details

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
-  - name: Questions and community
-    url: https://efforg.github.io/rayhunter/support-feedback-community.html
-    about: If you're having trouble using Rayhunter and aren't sure you've found a bug or request for a new feature, please first try asking for help on GitHub discussions or Mattermost
+  - name: Rayhunter Mattermost
+    url: https://opensource.eff.org/signup_user_complete/?id=6iqur37ucfrctfswrs14iscobw&md=link&sbr=su
+    about: If you're having trouble using Rayhunter and aren't sure you've found a bug or request for a new feature, please first try asking for help here. There is a much larger community there of people familiar with the project who will be able to more quickly answer your questions.
   - name: Rayhunter Security Policy
     url: https://github.com/EFForg/rayhunter/security/advisories/new
     about: Please report security vulnerabilities here.

.github/ISSUE_TEMPLATE/feature.yaml

@@ -2,12 +2,6 @@ name: Feature Request
 description: Suggest a new feature or improvement to Rayhunter
 labels: ["enhancement"]
 body:
-  - type: checkboxes
-    attributes:
-      label: Prerequisites
-      options:
-        - label: I have read [CONTRIBUTING.md](https://github.com/EFForg/rayhunter/blob/main/CONTRIBUTING.md)
-          required: true
   - type: textarea
     id: problem
     attributes:

.github/ISSUE_TEMPLATE/installer-bug.yaml

@@ -2,12 +2,6 @@ name: Installer Issue
 description: File an bug related to an installer issue.
 labels: ["bug", "installer"]
 body:
-  - type: checkboxes
-    attributes:
-      label: Prerequisites
-      options:
-        - label: I have read [CONTRIBUTING.md](https://github.com/EFForg/rayhunter/blob/main/CONTRIBUTING.md)
-          required: true
   - type: input
     attributes:
       label: Rayhunter Version

.github/pull_request_template.md

@@ -4,4 +4,3 @@
 - [ ] Added or updated any documentation as needed to support the changes in this PR.
 - [ ] Code has been linted and run through `cargo fmt`
 - [ ] If any new functionality has been added, unit tests were also added
-- [ ] [./CONTRIBUTING.md](../CONTRIBUTING.md) has been read

.github/workflows/main.yml

@@ -25,20 +25,18 @@ jobs:
       web_changed: ${{ steps.files_changed.outputs.web_count }}
       docs_changed: ${{ steps.files_changed.outputs.docs_count }}
       installer_changed: ${{ steps.files_changed.outputs.installer_count }}
-      installer_gui_changed: ${{ steps.files_changed.outputs.installer_gui_count }}
       rootshell_changed: ${{ steps.files_changed.outputs.rootshell_count }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          persist-credentials: false
       - name: detect file changes
         id: files_changed
         run: |
           lcommit=${{ github.event.pull_request.base.sha || 'origin/main' }}
 
           # If we are on main, or if these workflow files are being changed, run everything
-          if [ ${GITHUB_REF} = 'refs/heads/main' ] || git diff --name-only $lcommit..HEAD | grep -qe ^.github/workflows/ -e ^.cargo
+          if [ ${{ github.ref }} = 'refs/heads/main' ] || git diff --name-only $lcommit..HEAD | grep -qe ^.github/workflows/ -e ^.cargo
           then
             echo "building everything"
             echo code_count=forced >> "$GITHUB_OUTPUT"
@@ -46,15 +44,13 @@ jobs:
             echo web_count=forced >> "$GITHUB_OUTPUT"
             echo docs_count=forced >> "$GITHUB_OUTPUT"
             echo installer_count=forced >> "$GITHUB_OUTPUT"
-            echo installer_gui_count=forced >> "$GITHUB_OUTPUT"
             echo rootshell_count=forced >> "$GITHUB_OUTPUT"
           else
             echo "code_count=$(git diff --name-only $lcommit...HEAD | grep -e ^daemon -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 ^daemon -e ^lib -e ^telcom-parser | wc -l)" >> "$GITHUB_OUTPUT"
             echo "web_count=$(git diff --name-only $lcommit...HEAD | grep -e ^daemon/web | wc -l)" >> "$GITHUB_OUTPUT"
             echo "docs_count=$(git diff --name-only $lcommit...HEAD | grep -e ^book.toml -e ^doc | wc -l)" >> "$GITHUB_OUTPUT"
-            echo "installer_count=$(git diff --name-only $lcommit...HEAD | grep -e ^installer/ | wc -l)" >> "$GITHUB_OUTPUT"
-            echo "installer_gui_count=$(git diff --name-only $lcommit...HEAD | grep -e ^installer-gui | wc -l)" >> "$GITHUB_OUTPUT"
+            echo "installer_count=$(git diff --name-only $lcommit...HEAD | grep -e ^installer | wc -l)" >> "$GITHUB_OUTPUT"
             echo "rootshell_count=$(git diff --name-only $lcommit...HEAD | grep -e ^rootshell | wc -l)" >> "$GITHUB_OUTPUT"
           fi
 
@@ -67,8 +63,6 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - name: Install mdBook
         run: |
           cargo install mdbook --no-default-features --features search --vers "^0.4" --locked
@@ -86,8 +80,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - name: Install mdBook
         run: |
           cargo install mdbook --no-default-features --features search --vers "^0.4" --locked
@@ -112,11 +104,7 @@ jobs:
       contents: read
     steps:
     - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
     - uses: dtolnay/rust-toolchain@stable
-      with:
-        components: rustfmt, clippy
     - uses: Swatinem/rust-cache@v2
     - name: Check formatting
       run: cargo fmt --all --check
@@ -134,35 +122,7 @@ jobs:
       run: |
         NO_FIRMWARE_BIN=true cargo clippy --verbose
 
-  installer_gui_check:
-    # we test the GUI installer separately to:
-    # 1) mimic the default behavior of cargo commands for rayhunter devs where
-    #    installer-gui isn't one of the default workspace packages
-    # 2) avoid slowing down development on changes unrelated to the GUI installer
-    needs: files_changed
-    if: needs.files_changed.outputs.installer_gui_changed != '0'
-    # we run this on macos simply because no additional OS packages need to be
-    # installed
-    runs-on: macos-latest
-    permissions:
-      contents: read
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-    - uses: dtolnay/rust-toolchain@stable
-      with:
-        components: clippy
-    - uses: Swatinem/rust-cache@v2
-    # we don't need to run cargo fmt here because both cargo fmt and cargo
-    # fmt --all runs on all workspace packages so this is handled by
-    # check_and_test above
-    - name: Check
-      run: NO_FIRMWARE_BIN=true cargo check --package installer-gui --verbose
-    - name: Run clippy
-      run: NO_FIRMWARE_BIN=true cargo clippy --package installer-gui --verbose
-
-  test_daemon_frontend:
+  test_web_frontend:
     needs: files_changed
     if: needs.files_changed.outputs.web_changed != '0'
     runs-on: ubuntu-latest
@@ -173,30 +133,11 @@ jobs:
         working-directory: daemon/web
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - run: npm install
       - run: npm run lint
       - run: npm run check
       - run: npm run test
 
-  test_installer_frontend:
-    needs: files_changed
-    if: needs.files_changed.outputs.installer_gui_changed != '0'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    defaults:
-      run:
-        working-directory: installer-gui
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - run: npm install
-      - run: npm run lint
-      - run: npm run check
-
   windows_installer_check_and_test:
     needs: files_changed
     if: needs.files_changed.outputs.installer_changed != '0'
@@ -205,8 +146,6 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: Swatinem/rust-cache@v2
       - name: cargo check
         shell: bash
@@ -251,8 +190,6 @@ jobs:
     runs-on: ${{ matrix.platform.os }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.platform.target }}
@@ -266,7 +203,7 @@ jobs:
           if-no-files-found: error
 
   build_rootshell:
-    if: needs.files_changed.outputs.rootshell_changed != '0' || needs.files_changed.outputs.installer_changed != '0'
+    if: needs.files_changed.outputs.rootshell_changed != '0'
     needs:
       - check_and_test
       - files_changed
@@ -275,14 +212,12 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: dtolnay/rust-toolchain@stable
         with:
           targets: armv7-unknown-linux-musleabihf
       - uses: Swatinem/rust-cache@v2
       - name: Build rootshell (armv7)
-        run: cargo build -p rootshell --bin rootshell --target armv7-unknown-linux-musleabihf --profile=firmware
+        run: cargo build --bin rootshell --target armv7-unknown-linux-musleabihf --profile=firmware
       - uses: actions/upload-artifact@v4
         with:
           name: rootshell
@@ -290,10 +225,7 @@ jobs:
           if-no-files-found: error
 
   build_rayhunter:
-    # build_rust_installer needs this step. so when installer_changed, we need
-    # to build this step too. if we skip this step because only the installer
-    # changed, the build_rust_installer step will be skipped too.
-    if: needs.files_changed.outputs.daemon_changed != '0' || needs.files_changed.outputs.installer_changed != '0'
+    if: needs.files_changed.outputs.daemon_changed != '0'
     needs:
       - check_and_test
       - files_changed
@@ -303,14 +235,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: dtolnay/rust-toolchain@stable
         with:
           targets: armv7-unknown-linux-musleabihf
       - uses: Swatinem/rust-cache@v2
-      - name: Install ARM cross-compilation toolchain
-        run: sudo apt-get update && sudo apt-get install -y gcc-arm-linux-gnueabihf
       - name: Build rayhunter-daemon (armv7)
         run: |
           pushd daemon/web
@@ -325,7 +253,7 @@ jobs:
           # what the feature selection in rayhunter-daemon is.
           #
           # https://github.com/rust-lang/cargo/issues/4463
-          CC_armv7_unknown_linux_musleabihf=arm-linux-gnueabihf-gcc cargo build-daemon-firmware
+          cargo build -p rayhunter-daemon --bin rayhunter-daemon --target armv7-unknown-linux-musleabihf --profile=firmware
       - uses: actions/upload-artifact@v4
         with:
           name: rayhunter-daemon
@@ -366,8 +294,6 @@ jobs:
     runs-on: ${{ matrix.platform.os }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions/download-artifact@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
@@ -380,145 +306,6 @@ jobs:
           path: target/${{ matrix.platform.target }}/release/installer${{ matrix.platform.os == 'windows-latest' && '.exe' || '' }}
           if-no-files-found: error
 
-  build_installer_gui_linux:
-    if: needs.files_changed.outputs.installer_gui_changed != '0'
-    permissions:
-      contents: read
-      packages: write
-    needs:
-      - build_rayhunter
-      - build_rootshell
-      - files_changed
-      - installer_gui_check
-      - test_installer_frontend
-    strategy:
-      matrix:
-        platform:
-          # we want to use the oldest supported version of ubuntu here to
-          # maximize compatibility with older versions of glibc
-          - name: linux-x64
-            os: ubuntu-22.04
-            target: x86_64-unknown-linux-gnu
-          - name: linux-aarch64
-            os: ubuntu-22.04-arm
-            target: aarch64-unknown-linux-gnu
-    runs-on: ${{ matrix.platform.os }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: actions/download-artifact@v4
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.platform.target }}
-      - uses: Swatinem/rust-cache@v2
-      - name: Install tauri dependencies
-        run: sudo apt-get update && sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev xdg-utils
-      - name: Build GUI installer
-        shell: bash
-        run: |
-          cd installer-gui
-          npm install
-          npm run tauri build -- --target ${{ matrix.platform.target }}
-      - uses: actions/upload-artifact@v4
-        with:
-          name: gui-installer-${{ matrix.platform.name }}-appimage
-          path: target/${{ matrix.platform.target }}/release/bundle/appimage/*.AppImage
-          if-no-files-found: error
-      - uses: actions/upload-artifact@v4
-        with:
-          name: gui-installer-${{ matrix.platform.name }}-deb
-          path: target/${{ matrix.platform.target }}/release/bundle/deb/*.deb
-          if-no-files-found: error
-      - uses: actions/upload-artifact@v4
-        with:
-          name: gui-installer-${{ matrix.platform.name }}-rpm
-          path: target/${{ matrix.platform.target }}/release/bundle/rpm/*.rpm
-          if-no-files-found: error
-
-  build_installer_gui_macos:
-    if: needs.files_changed.outputs.installer_gui_changed != '0'
-    permissions:
-      contents: read
-      packages: write
-    needs:
-      - build_rayhunter
-      - build_rootshell
-      - files_changed
-      - installer_gui_check
-      - test_installer_frontend
-    strategy:
-      matrix:
-        platform:
-          - name: macos-arm
-            target: aarch64-apple-darwin
-          - name: macos-intel
-            target: x86_64-apple-darwin
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: actions/download-artifact@v4
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.platform.target }}
-      - uses: Swatinem/rust-cache@v2
-      - name: Build GUI installer
-        shell: bash
-        run: |
-          cd installer-gui
-          npm install
-          npm run tauri build -- --target ${{ matrix.platform.target }}
-          cd ..
-          mv "target/${{ matrix.platform.target }}/release/bundle/macos/"*.app .
-          zip -r "rayhunter-installer-${{ matrix.platform.name }}.app.zip" ./*.app
-      - uses: actions/upload-artifact@v4
-        with:
-          name: gui-installer-${{ matrix.platform.name }}-app
-          path: ./*.app.zip
-          if-no-files-found: error
-
-  build_installer_gui_windows:
-    if: needs.files_changed.outputs.installer_gui_changed != '0'
-    permissions:
-      contents: read
-      packages: write
-    needs:
-      - build_rayhunter
-      - build_rootshell
-      - files_changed
-      - installer_gui_check
-      - test_installer_frontend
-    env:
-      TARGET: x86_64-pc-windows-msvc
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: actions/download-artifact@v4
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ env.TARGET }}
-      - uses: Swatinem/rust-cache@v2
-      - name: Build GUI installer
-        shell: bash
-        run: |
-          cd installer-gui
-          npm install
-          npm run tauri build -- --target ${{ env.TARGET }}
-      - uses: actions/upload-artifact@v4
-        with:
-          name: gui-installer-msi
-          path: target/${{ env.TARGET }}/release/bundle/msi/*.msi
-          if-no-files-found: error
-      - uses: actions/upload-artifact@v4
-        with:
-          name: gui-installer-exe
-          path: target/${{ env.TARGET }}/release/bundle/nsis/*.exe
-          if-no-files-found: error
-
   build_release_zip:
     permissions:
       contents: read
@@ -540,8 +327,6 @@ jobs:
           - windows-x86_64
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions/download-artifact@v4
       - name: Fix executable permissions on binaries
         run: chmod +x installer-*/installer rayhunter-check-*/rayhunter-check rayhunter-daemon/rayhunter-daemon
@@ -551,7 +336,7 @@ jobs:
       - name: Setup versioned release directory
         run: |
           platform="${{ matrix.platform }}"
-          dest="rayhunter-v${VERSION}-${{ matrix.platform }}"
+          dest="rayhunter-v${{ env.VERSION }}-${{ matrix.platform }}"
           mkdir "$dest"
           # Handle installer with proper extension for Windows
           if [ "$platform" = "windows-x86_64" ]; then
@@ -559,7 +344,7 @@ jobs:
           else
             mv installer-$platform/installer "$dest"/installer
           fi
-          cp -r rayhunter-check-* rayhunter-daemon dist/scripts "$dest"/
+          cp -r rayhunter-check-* rayhunter-daemon rootshell/rootshell dist/* installer/install.ps1 "$dest"/
           zip -r "$dest.zip" "$dest"
           sha256sum "$dest.zip" > "$dest.zip.sha256"
 

.github/workflows/release.yml

@@ -14,12 +14,10 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - name: Ensure all Cargo.toml files have the same version defined.
         run: |
-          defined_versions=$(find lib check daemon installer installer-gui rootshell telcom-parser -name Cargo.toml -exec grep ^version {} \; | sort -u | wc -l)
-          find lib check daemon installer installer-gui 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
@@ -43,8 +41,6 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions/download-artifact@v4
       - name: Create release
         run: |

CONTRIBUTING.md

@@ -1,75 +0,0 @@
-# How to contribute to Rayhunter
-
-## Filing issues and starting discussions
-
-Our issue tracker is [on GitHub](https://github.com/EFForg/rayhunter/issues).
-
-- If your rayhunter has found an IMSI-catcher, we strongly encourage you to
-  [send us that information
-  privately.](https://efforg.github.io/rayhunter/faq.html#help-rayhunters-line-is-redorangeyellowdotteddashed-what-should-i-do) via Signal.
-
-- Issues should be actionable. If you don't have a
-  specific feature request or bug report, consider [creating a
-  discussion](https://github.com/EFForg/rayhunter/discussions) or [joining our Mattermost](https://efforg.github.io/rayhunter/support-feedback-community.html) instead.
-
-  Example of a good bug report:
-
-  - "Installer broken on TP-Link M7350 v3.0"
-  - "Display does not update to green after finding"
-  - "The documentation is wrong" (though we encourage you to file a pull request directly)
-
-  Example of a good feature request:
-
-  - "Use LED on device XYZ for showing recording status"
-
-  Example of something that belongs into discussion:
-
-  - "In region XYZ, do I need an activated SIM?"
-  - "Where to buy this device in region XYZ?"
-  - "Can this device be supported?" While this is a valid feature
-    request, we just get this request too often, and without some exploratory
-    work done upfront it's often unclear initially if that device can be
-    supported at all.
-
-- The issue templates are mostly there to give you a clue what kind of
-  information is needed from you, and whether your request belongs into the issue
-  tracker. Fill them out to be on the safe side, but they are not mandatory.
-
-## Contributing patches
-
-To edit documentation or fix a bug, make a pull request. If you're about to
-write a substantial amount of code or implement a new feature, we strongly
-encourage you to talk to us before implementing it or check if any issues have
-been opened for it already. Otherwise there is a chance we will reject your
-contribution after you have spent time on it.
-
-On the other hand, for small documentation fixes you can file a PR without
-filing an issue.
-
-Otherwise:
-
-- Refer to [installing from
-  source](https://efforg.github.io/rayhunter/installing-from-source.html) for
-  how to build Rayhunter from the git repository.
-
-- Ensure that `cargo fmt` and `cargo clippy` have been run.
-
-- If you add new features, please do your best to both write tests for and also
-  manually test them. Our test coverage isn't great, but as new features are
-  added we are trying to prevent it from becoming worse.
-
-If you have any questions [feel free to open a discussion or chat with us on Mattermost.](https://efforg.github.io/rayhunter/support-feedback-community.html)
-
-## Making releases
-
-This one is for maintainers of Rayhunter.
-
-1. Make a PR changing the versions in `Cargo.toml` and other files.
-   This could be automated better but right now it's manual. You can do this easily with sed:
-   `sed -i "" -E 's/x.x.x/y.y.y/g' */Cargo.toml`
-
-2. Merge PR and make a tag.
-
-3. [Run release workflow.](https://github.com/EFForg/rayhunter/actions/workflows/release.yml)
-
-4. Write changelog, edit it into the release, announce on mattermost.

Cargo.toml

@@ -7,17 +7,5 @@ members = [
     "rootshell",
     "telcom-parser",
     "installer",
-    "installer-gui/src-tauri",
-]
-# at least for now, let's keep installer-gui out of the list of default
-# packages. installer-gui is still experimental and requires many new packages
-# both from cargo and the underlying operating system
-default-members = [
-    "lib",
-    "daemon",
-    "check",
-    "rootshell",
-    "telcom-parser",
-    "installer",
 ]
 resolver = "2"

README.md

@@ -3,7 +3,7 @@
 
 ![Rayhunter Logo - An Orca taking a bite out of a cellular signal bar](https://www.eff.org/files/styles/media_browser_preview/public/banner_library/rayhunter-banner.png)
 
-Rayhunter is a project for detecting IMSI catchers, also known as cell-site simulators or stingrays. It was first designed to run on a cheap mobile hotspot called the Orbic RC400L, but thanks to community efforts, it can [support some other devices as well](https://efforg.github.io/rayhunter/supported-devices.html).
+Rayhunter is a project for detecting IMSI catchers, also known as cell-site simulators or stingrays. It was first designed to run on a cheap mobile hotspot called the Orbic RC400L, but thanks to community efforts can [support some other devices as well](https://efforg.github.io/rayhunter/supported-devices.html).
 It's also designed to be as easy to install and use as possible, regardless of your level of technical skills, and to minimize false positives. 
 
 →  Check out the [installation guide](https://efforg.github.io/rayhunter/installation.html) to get started.

check/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rayhunter-check"
-version = "0.9.0"
+version = "0.6.1"
 edition = "2024"
 
 [dependencies]

check/src/main.rs

@@ -16,19 +16,19 @@ use walkdir::WalkDir;
 #[derive(Parser, Debug)]
 #[command(version, about)]
 struct Args {
-    #[arg(short = 'p', long, help = "A file or directory of packet captures")]
+    #[arg(short = 'p', long)]
     path: PathBuf,
 
-    #[arg(short = 'P', long, help = "Convert qmdl files to pcap before analysis")]
+    #[arg(short = 'P', long)]
     pcapify: bool,
 
-    #[arg(long, help = "Show why some packets were skipped during analysis")]
+    #[arg(long)]
     show_skipped: bool,
 
-    #[arg(short, long, help = "Only print warnings/errors to stdout")]
+    #[arg(short, long)]
     quiet: bool,
 
-    #[arg(short, long, help = "Show debug messages")]
+    #[arg(short, long)]
     debug: bool,
 }
 

daemon/Cargo.toml

@@ -1,14 +1,9 @@
 [package]
 name = "rayhunter-daemon"
-version = "0.9.0"
+version = "0.6.1"
 edition = "2024"
 rust-version = "1.88.0"
 
-[features]
-default = ["rustcrypto-tls"]
-rustcrypto-tls = ["reqwest/rustls-tls-webpki-roots-no-provider", "dep:rustls-rustcrypto"]
-ring-tls = ["reqwest/rustls-tls-webpki-roots"]
-
 [dependencies]
 rayhunter = { path = "../lib" }
 toml = "0.8.8"
@@ -30,6 +25,8 @@ image = { version =  "0.25.1", default-features = false, features = ["png", "gif
 tempfile = "3.10.1"
 async_zip = { version = "0.0.17", features = ["tokio"] }
 anyhow = "1.0.98"
-reqwest = { version = "0.12.20", default-features = false }
-rustls-rustcrypto = { version = "0.0.2-alpha", optional = true }
+reqwest = { version = "0.12.20", default-features = false, features = [
+    "rustls-tls-webpki-roots-no-provider",
+] }
+rustls-rustcrypto = "0.0.2-alpha"
 async-trait = "0.1.88"

daemon/src/battery/mod.rs

@@ -1,23 +1,14 @@
-use std::{path::Path, time::Duration};
+use std::path::Path;
 
-use log::{error, info};
 use rayhunter::Device;
 use serde::Serialize;
-use tokio::select;
-use tokio_util::{sync::CancellationToken, task::TaskTracker};
 
-use crate::{
-    error::RayhunterError,
-    notifications::{Notification, NotificationType},
-};
+use crate::error::RayhunterError;
 
 pub mod orbic;
 pub mod tmobile;
-pub mod tplink;
 pub mod wingtech;
 
-const LOW_BATTERY_LEVEL: u8 = 10;
-
 #[derive(Clone, Copy, PartialEq, Debug, Serialize)]
 pub struct BatteryState {
     level: u8,
@@ -51,63 +42,6 @@ pub async fn get_battery_status(device: &Device) -> Result<BatteryState, Rayhunt
         Device::Orbic => orbic::get_battery_state().await?,
         Device::Wingtech => wingtech::get_battery_state().await?,
         Device::Tmobile => tmobile::get_battery_state().await?,
-        Device::Tplink => tplink::get_battery_state().await?,
         _ => return Err(RayhunterError::FunctionNotSupportedForDeviceError),
     })
 }
-
-pub fn run_battery_notification_worker(
-    task_tracker: &TaskTracker,
-    device: Device,
-    notification_channel: tokio::sync::mpsc::Sender<Notification>,
-    shutdown_token: CancellationToken,
-) {
-    task_tracker.spawn(async move {
-        // Don't send a notification initially if the device starts at a low battery level.
-        let mut triggered = match get_battery_status(&device).await {
-            Err(RayhunterError::FunctionNotSupportedForDeviceError) => {
-                info!("Battery level function not supported for device");
-                false
-            }
-            Err(e) => {
-                error!("Failed to get battery status: {e}");
-                true
-            }
-            Ok(status) => status.level <= LOW_BATTERY_LEVEL,
-        };
-
-        loop {
-            select! {
-                _ = shutdown_token.cancelled() => break,
-                _ = tokio::time::sleep(Duration::from_secs(15)) => {}
-            }
-
-            let status = match get_battery_status(&device).await {
-                Err(e) => {
-                    error!("Failed to get battery status: {e}");
-                    continue;
-                }
-                Ok(status) => status,
-            };
-
-            // To avoid flapping, if the notification has already been triggered
-            // wait until the device has been plugged in and the battery level
-            // is high enough to re-enable notifications.
-            if triggered && status.is_plugged_in && status.level > LOW_BATTERY_LEVEL {
-                triggered = false;
-                continue;
-            }
-            if !triggered && !status.is_plugged_in && status.level <= LOW_BATTERY_LEVEL {
-                notification_channel
-                    .send(Notification::new(
-                        NotificationType::LowBattery,
-                        "Rayhunter's battery is low".to_string(),
-                        None,
-                    ))
-                    .await
-                    .expect("Failed to send to notification channel");
-                triggered = true;
-            }
-        }
-    });
-}

daemon/src/battery/tplink.rs

@@ -1,39 +0,0 @@
-use crate::{battery::BatteryState, error::RayhunterError};
-
-pub async fn get_battery_state() -> Result<BatteryState, RayhunterError> {
-    let uci_battery = tokio::process::Command::new("uci")
-        .arg("get")
-        .arg("battery.battery_mgr.power_level")
-        .output()
-        .await?;
-
-    let uci_plugged_in = tokio::process::Command::new("uci")
-        .arg("get")
-        .arg("battery.battery_mgr.is_charging")
-        .output()
-        .await?;
-
-    if !uci_battery.status.success() {
-        return Err(RayhunterError::BatteryLevelParseError);
-    }
-
-    if !uci_plugged_in.status.success() {
-        return Err(RayhunterError::BatteryPluggedInStatusParseError);
-    }
-
-    let uci_battery = String::from_utf8_lossy(&uci_battery.stdout)
-        .trim_end()
-        .parse()
-        .map_err(|_| RayhunterError::BatteryLevelParseError)?;
-
-    let uci_plugged_in = match String::from_utf8_lossy(&uci_plugged_in.stdout).trim_end() {
-        "0" => Ok(false),
-        "1" => Ok(true),
-        _ => Err(RayhunterError::BatteryPluggedInStatusParseError),
-    }?;
-
-    Ok(BatteryState {
-        level: uci_battery,
-        is_plugged_in: uci_plugged_in,
-    })
-}

daemon/src/config.rs

@@ -5,7 +5,6 @@ use rayhunter::Device;
 use rayhunter::analysis::analyzer::AnalyzerConfig;
 
 use crate::error::RayhunterError;
-use crate::notifications::NotificationType;
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 #[serde(default)]
@@ -18,7 +17,6 @@ pub struct Config {
     pub colorblind_mode: bool,
     pub key_input_mode: u8,
     pub ntfy_url: Option<String>,
-    pub enabled_notifications: Vec<NotificationType>,
     pub analyzers: AnalyzerConfig,
 }
 
@@ -34,7 +32,6 @@ impl Default for Config {
             key_input_mode: 0,
             analyzers: AnalyzerConfig::default(),
             ntfy_url: None,
-            enabled_notifications: vec![NotificationType::Warning, NotificationType::LowBattery],
         }
     }
 }

daemon/src/diag.rs

@@ -24,7 +24,7 @@ use rayhunter::qmdl::QmdlWriter;
 
 use crate::analysis::{AnalysisCtrlMessage, AnalysisWriter};
 use crate::display;
-use crate::notifications::{Notification, NotificationType};
+use crate::notifications::Notification;
 use crate::qmdl_store::{RecordingStore, RecordingStoreError};
 use crate::server::ServerState;
 
@@ -207,7 +207,7 @@ impl DiagTask {
                 info!("a heuristic triggered on this run!");
                 self.notification_channel
                     .send(Notification::new(
-                        NotificationType::Warning,
+                        "heuristic-warning".to_string(),
                         format!("Rayhunter has detected a {:?} severity event", max_type),
                         Some(Duration::from_secs(60 * 5)),
                     ))

daemon/src/display/generic_framebuffer.rs

@@ -9,7 +9,9 @@ use rayhunter::analysis::analyzer::EventType;
 
 use log::{error, info};
 use tokio::sync::mpsc::Receiver;
-use tokio_util::{sync::CancellationToken, task::TaskTracker};
+use tokio::sync::oneshot;
+use tokio::sync::oneshot::error::TryRecvError;
+use tokio_util::task::TaskTracker;
 
 use include_dir::{Dir, include_dir};
 
@@ -171,14 +173,13 @@ pub fn update_ui(
     task_tracker: &TaskTracker,
     config: &config::Config,
     mut fb: impl GenericFramebuffer,
-    shutdown_token: CancellationToken,
+    mut ui_shutdown_rx: oneshot::Receiver<()>,
     mut ui_update_rx: Receiver<DisplayState>,
 ) {
     static IMAGE_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/images/");
     let display_level = config.ui_level;
     if display_level == 0 {
         info!("Invisible mode, not spawning UI.");
-        return;
     }
 
     let colorblind_mode = config.colorblind_mode;
@@ -203,9 +204,13 @@ pub fn update_ui(
             );
         }
         loop {
-            if shutdown_token.is_cancelled() {
-                info!("received UI shutdown");
-                break;
+            match ui_shutdown_rx.try_recv() {
+                Ok(_) => {
+                    info!("received UI shutdown");
+                    break;
+                }
+                Err(TryRecvError::Empty) => {}
+                Err(e) => panic!("error receiving shutdown message: {e}"),
             }
             match ui_update_rx.try_recv() {
                 Ok(state) => {

daemon/src/display/headless.rs

@@ -1,6 +1,6 @@
 use log::info;
 use tokio::sync::mpsc::Receiver;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;
 
 use crate::config;
@@ -9,7 +9,7 @@ use crate::display::DisplayState;
 pub fn update_ui(
     _task_tracker: &TaskTracker,
     _config: &config::Config,
-    _shutdown_token: CancellationToken,
+    _ui_shutdown_rx: oneshot::Receiver<()>,
     _ui_update_rx: Receiver<DisplayState>,
 ) {
     info!("Headless mode, not spawning UI.");

daemon/src/display/orbic.rs

@@ -4,7 +4,7 @@ use crate::display::generic_framebuffer::{self, Dimensions, GenericFramebuffer};
 use async_trait::async_trait;
 
 use tokio::sync::mpsc::Receiver;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;
 
 const FB_PATH: &str = "/dev/fb0";
@@ -38,14 +38,14 @@ impl GenericFramebuffer for Framebuffer {
 pub fn update_ui(
     task_tracker: &TaskTracker,
     config: &config::Config,
-    shutdown_token: CancellationToken,
+    ui_shutdown_rx: oneshot::Receiver<()>,
     ui_update_rx: Receiver<DisplayState>,
 ) {
     generic_framebuffer::update_ui(
         task_tracker,
         config,
         Framebuffer,
-        shutdown_token,
+        ui_shutdown_rx,
         ui_update_rx,
     )
 }

daemon/src/display/tmobile.rs

@@ -4,7 +4,7 @@
 /// DisplayState::WarningDetected { .. } => Signal LED slowly blinks red.
 use log::{error, info};
 use tokio::sync::mpsc;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;
 
 use std::time::Duration;
@@ -27,7 +27,7 @@ async fn stop_blinking(path: String) {
 pub fn update_ui(
     task_tracker: &TaskTracker,
     config: &config::Config,
-    shutdown_token: CancellationToken,
+    mut ui_shutdown_rx: oneshot::Receiver<()>,
     mut ui_update_rx: mpsc::Receiver<DisplayState>,
 ) {
     let mut invisible: bool = false;
@@ -40,9 +40,13 @@ pub fn update_ui(
         let mut last_state = DisplayState::Paused;
 
         loop {
-            if shutdown_token.is_cancelled() {
-                info!("received UI shutdown");
-                break;
+            match ui_shutdown_rx.try_recv() {
+                Ok(_) => {
+                    info!("received UI shutdown");
+                    break;
+                }
+                Err(oneshot::error::TryRecvError::Empty) => {}
+                Err(e) => panic!("error receiving shutdown message: {e}"),
             }
             match ui_update_rx.try_recv() {
                 Ok(new_state) => state = new_state,

daemon/src/display/tplink.rs

@@ -1,6 +1,6 @@
 use log::info;
 use tokio::sync::mpsc::Receiver;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;
 
 use crate::config;
@@ -11,7 +11,7 @@ use std::fs;
 pub fn update_ui(
     task_tracker: &TaskTracker,
     config: &config::Config,
-    shutdown_token: CancellationToken,
+    ui_shutdown_rx: oneshot::Receiver<()>,
     ui_update_rx: Receiver<DisplayState>,
 ) {
     let display_level = config.ui_level;
@@ -23,9 +23,9 @@ pub fn update_ui(
     // The alternative would be to make the entire initialization async
     if fs::exists(tplink_onebit::OLED_PATH).unwrap_or_default() {
         info!("detected one-bit display");
-        tplink_onebit::update_ui(task_tracker, config, shutdown_token, ui_update_rx)
+        tplink_onebit::update_ui(task_tracker, config, ui_shutdown_rx, ui_update_rx)
     } else {
         info!("fallback to framebuffer");
-        tplink_framebuffer::update_ui(task_tracker, config, shutdown_token, ui_update_rx)
+        tplink_framebuffer::update_ui(task_tracker, config, ui_shutdown_rx, ui_update_rx)
     }
 }

daemon/src/display/tplink_framebuffer.rs

@@ -2,13 +2,13 @@ use async_trait::async_trait;
 use std::os::fd::AsRawFd;
 use tokio::fs::OpenOptions;
 use tokio::io::AsyncWriteExt;
-use tokio_util::sync::CancellationToken;
 
 use crate::config;
 use crate::display::DisplayState;
 use crate::display::generic_framebuffer::{self, Dimensions, GenericFramebuffer};
 
 use tokio::sync::mpsc::Receiver;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;
 
 const FB_PATH: &str = "/dev/fb0";
@@ -80,14 +80,14 @@ impl GenericFramebuffer for Framebuffer {
 pub fn update_ui(
     task_tracker: &TaskTracker,
     config: &config::Config,
-    shutdown_token: CancellationToken,
+    ui_shutdown_rx: oneshot::Receiver<()>,
     ui_update_rx: Receiver<DisplayState>,
 ) {
     generic_framebuffer::update_ui(
         task_tracker,
         config,
         Framebuffer,
-        shutdown_token,
+        ui_shutdown_rx,
         ui_update_rx,
     )
 }

daemon/src/display/tplink_onebit.rs

@@ -6,7 +6,8 @@ use crate::display::DisplayState;
 
 use log::{error, info};
 use tokio::sync::mpsc::Receiver;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
+use tokio::sync::oneshot::error::TryRecvError;
 use tokio_util::task::TaskTracker;
 
 use std::time::Duration;
@@ -111,7 +112,7 @@ const STATUS_WARNING: &[u8] = pixelart! {
 pub fn update_ui(
     task_tracker: &TaskTracker,
     config: &config::Config,
-    shutdown_token: CancellationToken,
+    mut ui_shutdown_rx: oneshot::Receiver<()>,
     mut ui_update_rx: Receiver<DisplayState>,
 ) {
     let display_level = config.ui_level;
@@ -123,9 +124,13 @@ pub fn update_ui(
         let mut pixels = STATUS_SMILING;
 
         loop {
-            if shutdown_token.is_cancelled() {
-                info!("received UI shutdown");
-                break;
+            match ui_shutdown_rx.try_recv() {
+                Ok(_) => {
+                    info!("received UI shutdown");
+                    break;
+                }
+                Err(TryRecvError::Empty) => {}
+                Err(e) => panic!("error receiving shutdown message: {e}"),
             }
 
             match ui_update_rx.try_recv() {

daemon/src/display/uz801.rs

@@ -4,7 +4,7 @@
 /// DisplayState::WarningDetected => Signal LED is solid red.
 use log::{error, info};
 use tokio::sync::mpsc;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;
 
 use std::time::Duration;
@@ -27,7 +27,7 @@ async fn led_off(path: String) {
 pub fn update_ui(
     task_tracker: &TaskTracker,
     config: &config::Config,
-    shutdown_token: CancellationToken,
+    mut ui_shutdown_rx: oneshot::Receiver<()>,
     mut ui_update_rx: mpsc::Receiver<DisplayState>,
 ) {
     let mut invisible: bool = false;
@@ -41,9 +41,13 @@ pub fn update_ui(
         let mut last_update = std::time::Instant::now();
 
         loop {
-            if shutdown_token.is_cancelled() {
-                info!("received UI shutdown");
-                break;
+            match ui_shutdown_rx.try_recv() {
+                Ok(_) => {
+                    info!("received UI shutdown");
+                    break;
+                }
+                Err(oneshot::error::TryRecvError::Empty) => {}
+                Err(e) => panic!("error receiving shutdown message: {e}"),
             }
             match ui_update_rx.try_recv() {
                 Ok(new_state) => state = new_state,

daemon/src/display/wingtech.rs

@@ -10,7 +10,7 @@ use crate::display::generic_framebuffer::{self, Dimensions, GenericFramebuffer};
 use async_trait::async_trait;
 
 use tokio::sync::mpsc::Receiver;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;
 
 const FB_PATH: &str = "/dev/fb0";
@@ -43,14 +43,14 @@ impl GenericFramebuffer for Framebuffer {
 pub fn update_ui(
     task_tracker: &TaskTracker,
     config: &config::Config,
-    shutdown_token: CancellationToken,
+    ui_shutdown_rx: oneshot::Receiver<()>,
     ui_update_rx: Receiver<DisplayState>,
 ) {
     generic_framebuffer::update_ui(
         task_tracker,
         config,
         Framebuffer,
-        shutdown_token,
+        ui_shutdown_rx,
         ui_update_rx,
     )
 }

daemon/src/key_input.rs

@@ -3,7 +3,7 @@ use std::time::{Duration, Instant};
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 use tokio::sync::mpsc::Sender;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;
 
 use crate::config;
@@ -21,7 +21,7 @@ pub fn run_key_input_thread(
     task_tracker: &TaskTracker,
     config: &config::Config,
     diag_tx: Sender<DiagDeviceCtrlMessage>,
-    cancellation_token: CancellationToken,
+    mut ui_shutdown_rx: oneshot::Receiver<()>,
 ) {
     if config.key_input_mode == 0 {
         return;
@@ -43,7 +43,7 @@ pub fn run_key_input_thread(
 
         loop {
             tokio::select! {
-               _ = cancellation_token.cancelled() => {
+                _ = &mut ui_shutdown_rx => {
                     info!("received key input shutdown");
                     return;
                 }

daemon/src/main.rs

@@ -13,8 +13,8 @@ mod stats;
 
 use std::net::SocketAddr;
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 
-use crate::battery::run_battery_notification_worker;
 use crate::config::{parse_args, parse_config};
 use crate::diag::run_diag_read_thread;
 use crate::error::RayhunterError;
@@ -43,10 +43,9 @@ use rayhunter::diag_device::DiagDevice;
 use stats::get_log;
 use tokio::net::TcpListener;
 use tokio::select;
-use tokio::sync::RwLock;
 use tokio::sync::mpsc::{self, Sender};
+use tokio::sync::{RwLock, oneshot};
 use tokio::task::JoinHandle;
-use tokio_util::sync::CancellationToken;
 use tokio_util::task::TaskTracker;
 
 type AppRouter = Router<Arc<ServerState>>;
@@ -79,7 +78,7 @@ fn get_router() -> AppRouter {
 async fn run_server(
     task_tracker: &TaskTracker,
     state: Arc<ServerState>,
-    shutdown_token: CancellationToken,
+    server_shutdown_rx: oneshot::Receiver<()>,
 ) -> JoinHandle<()> {
     info!("spinning up server");
     let addr = SocketAddr::from(([0, 0, 0, 0], state.config.port));
@@ -89,12 +88,17 @@ async fn run_server(
     task_tracker.spawn(async move {
         info!("The orca is hunting for stingrays...");
         axum::serve(listener, app)
-            .with_graceful_shutdown(shutdown_token.cancelled_owned())
+            .with_graceful_shutdown(server_shutdown_signal(server_shutdown_rx))
             .await
             .unwrap();
     })
 }
 
+async fn server_shutdown_signal(server_shutdown_rx: oneshot::Receiver<()>) {
+    server_shutdown_rx.await.unwrap();
+    info!("Server received shutdown signal, exiting...");
+}
+
 // Loads a RecordingStore if one exists, and if not, only create one if we're
 // not in debug mode. If we fail to parse the manifest AND we're not in debug
 // mode, try to recover the manifest from the existing QMDL files
@@ -126,10 +130,15 @@ async fn init_qmdl_store(config: &config::Config) -> Result<RecordingStore, Rayh
 // Start a thread that'll track when user hits ctrl+c. When that happens,
 // trigger various cleanup tasks, including sending signals to other threads to
 // shutdown
+#[allow(clippy::too_many_arguments)]
 fn run_shutdown_thread(
     task_tracker: &TaskTracker,
     diag_device_sender: Sender<DiagDeviceCtrlMessage>,
-    shutdown_token: CancellationToken,
+    daemon_restart_rx: oneshot::Receiver<()>,
+    should_restart_flag: Arc<AtomicBool>,
+    server_shutdown_tx: oneshot::Sender<()>,
+    maybe_ui_shutdown_tx: Option<oneshot::Sender<()>>,
+    maybe_key_input_shutdown_tx: Option<oneshot::Sender<()>>,
     qmdl_store_lock: Arc<RwLock<RecordingStore>>,
     analysis_tx: Sender<AnalysisCtrlMessage>,
 ) -> JoinHandle<Result<(), RayhunterError>> {
@@ -141,9 +150,17 @@ fn run_shutdown_thread(
                 if let Err(err) = res {
                     error!("Unable to listen for shutdown signal: {err}");
                 }
+
+                should_restart_flag.store(false, Ordering::Relaxed);
             }
-            _ = shutdown_token.cancelled() => {}
-        }
+            res = daemon_restart_rx => {
+                if let Err(err) = res {
+                    error!("Unable to listen for shutdown signal: {err}");
+                }
+
+                should_restart_flag.store(true, Ordering::Relaxed);
+            }
+        };
 
         let mut qmdl_store = qmdl_store_lock.write().await;
         if qmdl_store.current_entry.is_some() {
@@ -152,7 +169,15 @@ fn run_shutdown_thread(
             info!("Done!");
         }
 
-        shutdown_token.cancel();
+        server_shutdown_tx
+            .send(())
+            .expect("couldn't send server shutdown signal");
+        if let Some(ui_shutdown_tx) = maybe_ui_shutdown_tx {
+            let _ = ui_shutdown_tx.send(());
+        }
+        if let Some(key_input_shutdown_tx) = maybe_key_input_shutdown_tx {
+            let _ = key_input_shutdown_tx.send(());
+        }
         diag_device_sender
             .send(DiagDeviceCtrlMessage::Exit)
             .await
@@ -169,12 +194,9 @@ fn run_shutdown_thread(
 async fn main() -> Result<(), RayhunterError> {
     env_logger::init();
 
-    #[cfg(feature = "rustcrypto-tls")]
-    {
-        rustls_rustcrypto::provider()
-            .install_default()
-            .expect("Couldn't install rustcrypto provider");
-    }
+    rustls_rustcrypto::provider()
+        .install_default()
+        .expect("Couldn't install rustcrypto provider");
 
     let args = parse_args();
 
@@ -201,12 +223,14 @@ async fn run_with_config(
     let (diag_tx, diag_rx) = mpsc::channel::<DiagDeviceCtrlMessage>(1);
     let (ui_update_tx, ui_update_rx) = mpsc::channel::<display::DisplayState>(1);
     let (analysis_tx, analysis_rx) = mpsc::channel::<AnalysisCtrlMessage>(5);
-    let restart_token = CancellationToken::new();
-    let shutdown_token = restart_token.child_token();
+    let mut maybe_ui_shutdown_tx = None;
+    let mut maybe_key_input_shutdown_tx = None;
 
     let notification_service = NotificationService::new(config.ntfy_url.clone());
 
     if !config.debug_mode {
+        let (ui_shutdown_tx, ui_shutdown_rx) = oneshot::channel();
+        maybe_ui_shutdown_tx = Some(ui_shutdown_tx);
         info!("Using configuration for device: {0:?}", config.device);
         let mut dev = DiagDevice::new(&config.device)
             .await
@@ -237,17 +261,21 @@ async fn run_with_config(
             Device::Pinephone => display::headless::update_ui,
             Device::Uz801 => display::uz801::update_ui,
         };
-        update_ui(&task_tracker, &config, shutdown_token.clone(), ui_update_rx);
+        update_ui(&task_tracker, &config, ui_shutdown_rx, ui_update_rx);
 
         info!("Starting Key Input service");
+        let (key_input_shutdown_tx, key_input_shutdown_rx) = oneshot::channel();
+        maybe_key_input_shutdown_tx = Some(key_input_shutdown_tx);
         key_input::run_key_input_thread(
             &task_tracker,
             &config,
             diag_tx.clone(),
-            shutdown_token.clone(),
+            key_input_shutdown_rx,
         );
     }
 
+    let (daemon_restart_tx, daemon_restart_rx) = oneshot::channel::<()>();
+    let (server_shutdown_tx, server_shutdown_rx) = oneshot::channel::<()>();
     let analysis_status_lock = Arc::new(RwLock::new(analysis_status));
     run_analysis_thread(
         &task_tracker,
@@ -256,28 +284,20 @@ async fn run_with_config(
         analysis_status_lock.clone(),
         config.analyzers.clone(),
     );
+    let should_restart_flag = Arc::new(AtomicBool::new(false));
 
     run_shutdown_thread(
         &task_tracker,
         diag_tx.clone(),
-        shutdown_token.clone(),
+        daemon_restart_rx,
+        should_restart_flag.clone(),
+        server_shutdown_tx,
+        maybe_ui_shutdown_tx,
+        maybe_key_input_shutdown_tx,
         qmdl_store_lock.clone(),
         analysis_tx.clone(),
     );
-
-    run_battery_notification_worker(
-        &task_tracker,
-        config.device.clone(),
-        notification_service.new_handler(),
-        shutdown_token.clone(),
-    );
-
-    run_notification_worker(
-        &task_tracker,
-        notification_service,
-        config.enabled_notifications.clone(),
-    );
-
+    run_notification_worker(&task_tracker, notification_service);
     let state = Arc::new(ServerState {
         config_path: args.config_path.clone(),
         config,
@@ -285,16 +305,16 @@ async fn run_with_config(
         diag_device_ctrl_sender: diag_tx,
         analysis_status_lock,
         analysis_sender: analysis_tx,
-        daemon_restart_token: restart_token.clone(),
+        daemon_restart_tx: Arc::new(RwLock::new(Some(daemon_restart_tx))),
         ui_update_sender: Some(ui_update_tx),
     });
-    run_server(&task_tracker, state, shutdown_token.clone()).await;
+    run_server(&task_tracker, state, server_shutdown_rx).await;
 
     task_tracker.close();
     task_tracker.wait().await;
 
     info!("see you space cowboy...");
-    Ok(restart_token.is_cancelled())
+    Ok(should_restart_flag.load(Ordering::Relaxed))
 }
 
 #[cfg(test)]

daemon/src/notifications.rs

@@ -5,30 +5,19 @@ use std::{
 };
 
 use log::error;
-use serde::{Deserialize, Serialize};
 use tokio::sync::mpsc::{self, error::TryRecvError};
 use tokio_util::task::TaskTracker;
 
-#[derive(Hash, Eq, PartialEq, Debug, Clone, Serialize, Deserialize)]
-pub enum NotificationType {
-    Warning,
-    LowBattery,
-}
-
 pub struct Notification {
-    notification_type: NotificationType,
+    message_type: String,
     message: String,
     debounce: Option<Duration>,
 }
 
 impl Notification {
-    pub fn new(
-        notification_type: NotificationType,
-        message: String,
-        debounce: Option<Duration>,
-    ) -> Self {
+    pub fn new(message_type: String, message: String, debounce: Option<Duration>) -> Self {
         Notification {
-            notification_type,
+            message_type,
             message,
             debounce,
         }
@@ -63,7 +52,6 @@ impl NotificationService {
 pub fn run_notification_worker(
     task_tracker: &TaskTracker,
     mut notification_service: NotificationService,
-    enabled_notifications: Vec<NotificationType>,
 ) {
     task_tracker.spawn(async move {
         if let Some(url) = notification_service.url
@@ -77,12 +65,8 @@ pub fn run_notification_worker(
                 loop {
                     match notification_service.rx.try_recv() {
                         Ok(notification) => {
-                            if !enabled_notifications.contains(&notification.notification_type) {
-                                continue;
-                            }
-
                             let status = notification_statuses
-                                .entry(notification.notification_type)
+                                .entry(notification.message_type)
                                 .or_insert_with(|| NotificationStatus {
                                     message: "".to_string(),
                                     needs_sending: true,

daemon/src/server.rs

@@ -13,11 +13,10 @@ use log::{error, warn};
 use std::sync::Arc;
 use tokio::fs::write;
 use tokio::io::{AsyncReadExt, copy, duplex};
-use tokio::sync::RwLock;
 use tokio::sync::mpsc::Sender;
+use tokio::sync::{RwLock, oneshot};
 use tokio_util::compat::FuturesAsyncWriteCompatExt;
 use tokio_util::io::ReaderStream;
-use tokio_util::sync::CancellationToken;
 
 use crate::DiagDeviceCtrlMessage;
 use crate::analysis::{AnalysisCtrlMessage, AnalysisStatus};
@@ -33,7 +32,7 @@ pub struct ServerState {
     pub diag_device_ctrl_sender: Sender<DiagDeviceCtrlMessage>,
     pub analysis_status_lock: Arc<RwLock<AnalysisStatus>>,
     pub analysis_sender: Sender<AnalysisCtrlMessage>,
-    pub daemon_restart_token: CancellationToken,
+    pub daemon_restart_tx: Arc<RwLock<Option<oneshot::Sender<()>>>>,
     pub ui_update_sender: Option<Sender<DisplayState>>,
 }
 
@@ -74,6 +73,11 @@ pub async fn serve_static(
     let path = path.trim_start_matches('/');
 
     match path {
+        "rayhunter_icon.png" => (
+            [(header::CONTENT_TYPE, HeaderValue::from_static("image/png"))],
+            include_bytes!("../web/build/rayhunter_icon.png"),
+        )
+            .into_response(),
         "rayhunter_orca_only.png" => (
             [(header::CONTENT_TYPE, HeaderValue::from_static("image/png"))],
             include_bytes!("../web/build/rayhunter_orca_only.png"),
@@ -129,11 +133,24 @@ pub async fn set_config(
     })?;
 
     // Trigger daemon restart after writing config
-    state.daemon_restart_token.cancel();
-    Ok((
-        StatusCode::ACCEPTED,
-        "wrote config and triggered restart".to_string(),
-    ))
+    let mut restart_tx = state.daemon_restart_tx.write().await;
+    if let Some(sender) = restart_tx.take() {
+        sender.send(()).map_err(|_| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                "couldn't send restart signal".to_string(),
+            )
+        })?;
+        Ok((
+            StatusCode::ACCEPTED,
+            "wrote config and triggered restart".to_string(),
+        ))
+    } else {
+        Ok((
+            StatusCode::ACCEPTED,
+            "wrote config but restart already triggered".to_string(),
+        ))
+    }
 }
 
 pub async fn get_zip(
@@ -314,7 +331,7 @@ mod tests {
             diag_device_ctrl_sender: tx,
             analysis_status_lock: Arc::new(RwLock::new(analysis_status)),
             analysis_sender: analysis_tx,
-            daemon_restart_token: CancellationToken::new(),
+            daemon_restart_tx: Arc::new(RwLock::new(None)),
             ui_update_sender: None,
         })
     }

daemon/web/.gitignore

@@ -19,3 +19,6 @@ Thumbs.db
 # Vite
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
+
+package-lock.json
+yarn.lock

daemon/web/package.json

@@ -18,9 +18,8 @@
         "@sveltejs/adapter-auto": "^3.0.0",
         "@sveltejs/adapter-static": "^3.0.5",
         "@sveltejs/kit": "^2.13.0",
-        "@sveltejs/vite-plugin-svelte": "^6.2.1",
+        "@sveltejs/vite-plugin-svelte": "^4.0.0",
         "@types/eslint": "^9.6.0",
-        "@types/node": "^24.7.0",
         "autoprefixer": "^10.4.20",
         "eslint": "^9.7.0",
         "eslint-config-prettier": "^9.1.0",
@@ -33,7 +32,7 @@
         "tailwindcss": "^3.4.9",
         "typescript": "^5.0.0",
         "typescript-eslint": "^8.0.0",
-        "vite": "^7.1.11",
-        "vitest": "^3.2.4"
+        "vite": "^5.0.3",
+        "vitest": "^2.0.4"
     }
 }

daemon/web/src/lib/components/AnalysisTable.svelte

@@ -33,7 +33,7 @@
     {#if report.statistics.num_warnings === 0 && report.statistics.num_informational_logs === 0}
         <p>Nothing to show!</p>
     {:else}
-        <div class="overflow-x-auto">
+        <div class="overflow-x-scroll">
             <table class="table-auto text-left">
                 <thead class="p-2">
                     <tr class="bg-gray-300">
@@ -77,10 +77,10 @@
     <div>
         <p class="text-lg underline">Unparsed Messages</p>
         <p>
-            These are due to a limitation or bug in Rayhunter's parser, and aren't usually a
+            These are due to a limitation or bug in Rayhunter's parser, and aren't ususally a
             problem.
         </p>
-        <div class="overflow-x-auto">
+        <div class="overflow-x-scroll">
             <table class="table-auto text-left">
                 <thead class="p-2">
                     <tr class="bg-gray-300">

daemon/web/src/lib/components/ConfigForm.svelte

@@ -111,6 +111,18 @@
                     </select>
                 </div>
 
+                <div>
+                    <label for="ntfy_url" class="block text-sm font-medium text-gray-700 mb-1">
+                        ntfy URL for Sending Notifications
+                    </label>
+                    <input
+                        id="ntfy_url"
+                        type="url"
+                        bind:value={config.ntfy_url}
+                        class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-rayhunter-blue"
+                    />
+                </div>
+
                 <div class="space-y-3">
                     <div class="flex items-center">
                         <input
@@ -125,56 +137,6 @@
                     </div>
                 </div>
 
-                <div class="border-t pt-4 mt-6 space-y-3">
-                    <h3 class="text-lg font-semibold text-gray-800 mb-4">Notification Settings</h3>
-                    <div>
-                        <label for="ntfy_url" class="block text-sm font-medium text-gray-700 mb-1">
-                            ntfy URL for Sending Notifications (if unset you will not receive
-                            notifications)
-                        </label>
-                        <input
-                            id="ntfy_url"
-                            type="url"
-                            bind:value={config.ntfy_url}
-                            class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-rayhunter-blue"
-                        />
-                    </div>
-
-                    <div class="space-y-2">
-                        <div class="block text-sm font-medium text-gray-700 mb-1">
-                            Enabled Notification Types
-                        </div>
-                        <div class="flex items-center">
-                            <input
-                                type="checkbox"
-                                id="enable_warning_notifications"
-                                value="Warning"
-                                bind:group={config.enabled_notifications}
-                            />
-                            <label
-                                for="enable_warning_notifications"
-                                class="ml-2 block text-sm text-gray-700"
-                            >
-                                Warnings
-                            </label>
-                        </div>
-                        <div class="flex items-center">
-                            <input
-                                type="checkbox"
-                                id="enable_lowbattery_notifications"
-                                value="LowBattery"
-                                bind:group={config.enabled_notifications}
-                            />
-                            <label
-                                for="enable_lowbattery_notifications"
-                                class="ml-2 block text-sm text-gray-700"
-                            >
-                                Low Battery
-                            </label>
-                        </div>
-                    </div>
-                </div>
-
                 <div class="border-t pt-4 mt-6">
                     <h3 class="text-lg font-semibold text-gray-800 mb-4">
                         Analyzer Heuristic Settings
@@ -266,7 +228,7 @@
                                 class="h-4 w-4 text-rayhunter-blue focus:ring-rayhunter-blue border-gray-300 rounded"
                             />
                             <label for="test_analyzer" class="ml-2 block text-sm text-gray-700">
-                                Test Heuristic (noisy!)
+                                Test Heuristic (noisey!)
                             </label>
                         </div>
                     </div>

daemon/web/src/lib/components/ManifestCard.svelte

@@ -44,7 +44,7 @@
 </script>
 
 <div
-    class="{status_row_color} {status_border_color} drop-shadow p-4 flex flex-col gap-2 border rounded-md flex-1 overflow-x-auto overflow-y-hidden"
+    class="{status_row_color} {status_border_color} drop-shadow p-4 flex flex-col gap-2 border rounded-md flex-1 overflow-x-scroll overflow-y-hidden"
 >
     {#if current}
         <div class="flex flex-row justify-between gap-2">
@@ -81,7 +81,7 @@
                 'N/A'}</span
         >
     </div>
-    <div class="flex flex-row justify-between lg:justify-end gap-1 mt-2 overflow-x-auto">
+    <div class="flex flex-row justify-between lg:justify-end gap-1 mt-2 overflow-x-scroll">
         <DownloadLink url={entry.get_pcap_url()} text="pcap" full_button />
         <DownloadLink url={entry.get_qmdl_url()} text="qmdl" full_button />
         <DownloadLink url={entry.get_zip_url()} text="zip" full_button />

daemon/web/src/lib/components/ManifestTable.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
     import { ManifestEntry } from '$lib/manifest.svelte';
     import { AnalysisManager } from '$lib/analysisManager.svelte';
-    import { screenIsLgUp } from '$lib/stores/breakpoint';
     import TableRow from './ManifestTableRow.svelte';
     import Card from './ManifestCard.svelte';
     interface Props {
@@ -13,30 +12,27 @@
 </script>
 
 <!--For larger screens we use a table-->
-{#if $screenIsLgUp}
-    <table class="table-auto text-left table">
-        <thead>
-            <tr class="bg-gray-100 drop-shadow">
-                <th class="p-2" scope="col">ID</th>
-                <th class="p-2" scope="col">Started</th>
-                <th class="p-2" scope="col">Last Message</th>
-                <th class="p-2" scope="col">Size</th>
-                <th class="p-2" scope="col">Download</th>
-                <th class="p-2" scope="col">Analysis</th>
-                <th class="p-2" scope="col"></th>
-            </tr>
-        </thead>
-        <tbody>
-            {#each entries as entry, i}
-                <TableRow {entry} current={false} {i} {manager} />
-            {/each}
-        </tbody>
-    </table>
-{:else}
-    <!--For smaller screens we use cards-->
-    <div class="flex flex-col gap-4">
-        {#each entries as entry}
-            <Card {entry} current={false} {server_is_recording} {manager} />
+<table class="hidden table-auto text-left lg:table">
+    <thead>
+        <tr class="bg-gray-100 drop-shadow">
+            <th class="p-2" scope="col">ID</th>
+            <th class="p-2" scope="col">Started</th>
+            <th class="p-2" scope="col">Last Message</th>
+            <th class="p-2" scope="col">Size</th>
+            <th class="p-2" scope="col">Download</th>
+            <th class="p-2" scope="col">Analysis</th>
+            <th class="p-2" scope="col"></th>
+        </tr>
+    </thead>
+    <tbody>
+        {#each entries as entry, i}
+            <TableRow {entry} current={false} {i} {manager} />
         {/each}
-    </div>
-{/if}
+    </tbody>
+</table>
+<!--For smaller screens we use cards-->
+<div class="lg:hidden flex flex-col gap-4">
+    {#each entries as entry}
+        <Card {entry} current={false} {server_is_recording} {manager} />
+    {/each}
+</div>

daemon/web/src/lib/stores/breakpoint.ts

@@ -1,29 +0,0 @@
-// stores/breakpoint.ts
-import { readable, type Readable } from 'svelte/store';
-import { breakpoints } from '../../theme';
-
-type Breakpoint = keyof typeof breakpoints;
-
-// Store that tracks if a specific breakpoint matches
-export function createBreakpointStore(breakpoint: Breakpoint): Readable<boolean> {
-    return readable<boolean>(false, (set) => {
-        const width = breakpoints[breakpoint];
-        const mediaQuery = window.matchMedia(`(min-width: ${width})`);
-
-        // Set initial value
-        set(mediaQuery.matches);
-
-        // Update on change
-        const handler = (e: MediaQueryListEvent) => set(e.matches);
-        mediaQuery.addEventListener('change', handler);
-
-        // Cleanup
-        return () => mediaQuery.removeEventListener('change', handler);
-    });
-}
-
-// Create stores for each breakpoint
-export const screenIsSmUp: Readable<boolean> = createBreakpointStore('sm');
-export const screenIsMdUp: Readable<boolean> = createBreakpointStore('md');
-export const screenIsLgUp: Readable<boolean> = createBreakpointStore('lg');
-export const screenIsXlUp: Readable<boolean> = createBreakpointStore('xl');

daemon/web/src/lib/utils.svelte.ts

@@ -12,17 +12,11 @@ export interface AnalyzerConfig {
     test_analyzer: boolean;
 }
 
-export enum enabled_notifications {
-    Warning = 'Warning',
-    LowBattery = 'LowBattery',
-}
-
 export interface Config {
     ui_level: number;
     colorblind_mode: boolean;
     key_input_mode: number;
     ntfy_url: string;
-    enabled_notifications: enabled_notifications[];
     analyzers: AnalyzerConfig;
 }
 

daemon/web/src/routes/+page.svelte

@@ -14,7 +14,6 @@
 
     let manager: AnalysisManager = new AnalysisManager();
     let loaded = $state(false);
-    let filter_threshold: boolean = $state(false);
     let entries: ManifestEntry[] = $state([]);
     let current_entry: ManifestEntry | undefined = $state(undefined);
     let system_stats: SystemStats | undefined = $state(undefined);
@@ -31,10 +30,7 @@
                 await manager.update();
                 let new_manifest = await get_manifest();
                 await new_manifest.set_analysis_status(manager);
-                entries = filter_threshold
-                    ? new_manifest.entries.filter((e) => e.get_num_warnings())
-                    : new_manifest.entries;
-
+                entries = new_manifest.entries;
                 current_entry = new_manifest.current_entry;
 
                 system_stats = await get_system_stats();
@@ -230,23 +226,7 @@
             <SystemStatsTable stats={system_stats!} />
         </div>
         <div class="flex flex-col gap-2">
-            <div class="flex flex-row gap-2">
-                <div class="text-xl flex-1">History</div>
-                <div class="flex flex-row items-center gap-2 px-3">
-                    <label
-                        for="filter_threshold"
-                        class="block text-md font-medium text-gray-700 mb-1"
-                    >
-                        Filter for Warnings
-                    </label>
-                    <input
-                        type="checkbox"
-                        id="filter_threshold"
-                        bind:checked={filter_threshold}
-                        class="px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-rayhunter-blue"
-                    />
-                </div>
-            </div>
+            <span class="text-xl">History</span>
             <ManifestTable {entries} server_is_recording={!!current_entry} {manager} />
         </div>
         <DeleteAllButton />

daemon/web/src/theme.ts

@@ -1,11 +0,0 @@
-/** These are the default Tailwind CSS breakpoints.
- * We're defining them here so they can be referenced
- * programmatically in other parts of the application.
- */
-export const breakpoints = {
-    sm: '640px',
-    md: '768px',
-    lg: '1024px',
-    xl: '1280px',
-    '2xl': '1536px',
-} as const;

daemon/web/tailwind.config.ts

@@ -1,5 +1,4 @@
 import type { Config } from 'tailwindcss';
-import { breakpoints } from './src/theme';
 
 export default {
     content: ['./src/**/*.{html,js,svelte,ts}'],
@@ -11,7 +10,6 @@ export default {
                 'rayhunter-dark-blue': '#3f3da0',
                 'rayhunter-green': '#94ea18',
             },
-            screens: breakpoints,
         },
     },
 

dist/config.toml.in

@@ -23,9 +23,7 @@ ui_level = 1
 key_input_mode = 0
 
 # If set, attempts to send a notification to the url when a new warning is triggered
-ntfy_url = ""
-# What notification types to enable. Does nothing if the above ntfy_url is not set.
-enabled_notifications = ["Warning", "LowBattery"]
+# ntfy_url =
 
 # Analyzer Configuration
 # Enable/disable specific IMSI catcher detection heuristics
@@ -37,4 +35,4 @@ lte_sib6_and_7_downgrade = true
 null_cipher = true
 nas_null_cipher = true
 incomplete_sib = true
-test_analyzer = false
+test_analyzer = false

doc/SUMMARY.md

@@ -3,6 +3,7 @@
 [Introduction](./introduction.md)
 - [Installation](./installation.md)
   - [Installing from the latest release](./installing-from-release.md)
+    - [Installing from the latest release (Windows)](./installing-from-release-windows.md)
   - [Installing from source](./installing-from-source.md)
   - [Updating Rayhunter](./updating-rayhunter.md)
 - [Configuration](./configuration.md)

doc/analyzing-a-capture.md

@@ -1,3 +1,3 @@
 # How we analyze a capture
 
-Teams of highly trained squirrels. Video coming soon!
+Teams of highly trained squirrles. Video coming soon!

doc/configuration.md

@@ -7,17 +7,14 @@ Rayhunter can be configured through web user interface or by editing `/data/rayh
 Through web UI you can set:
 - **Device UI Level**, which defines what Rayhunter shows on device's built-in screen. *Device UI Level* could be:
   - *Invisible mode*: Rayhunter does not show anything on the built-in screen
-  - *Subtle mode (colored line)*: Rayhunter shows green line if there are no warnings, red line if there are warnings (warnings could be checked through web UI) and white line if Rayhunter is not recording.
-  - *Demo mode (orca gif)*, which shows image of orcas *and* colored line.
+  - *Subtle mode (colored line)*: Rayhunter shows green line if there are no warnings, red line if there are warnings (warnings could be checked through web UI) and white line if Rayhunter is not recording
+  - *Demo mode (orca gif)*, which shows image of orca fish *and* colored line
   - *EFF logo*, which shows EFF logo and *and* colored line.
-- **Device Input Mode**, which defines behavior of built-in power button of the device. *Device Input Mode* could be:
-  - *Disable button control*: built-in power button of the device is not used by Rayhunter.
-  - *Double-tap power button to start/stop recording*: double clicking on a built-in power button of the device stops and immediately restarts the recording. This could be useful if Rayhunter's heuristics is triggered and you get the red line, and you want to "reset" the past warnings. Normally you can do that through web UI, but sometimes it is easier to double tap on power button.
+- **Device Input Mode**, which defines behaviour of built-in power button of the device. *Device Input Mode* could be:
+  - *Disable button control*: built-in power button of the device is not used by Rayhunter;
+  - *Double-tap power button to start/stop recording*: double clicking on a built-in power button of the device stops and immediatelly restarts the recording. This could be useful if Rayhunter's heuristichs is triggered and you get the red line, and you want to "reset" the past warnings. Normally you can do that through web UI, but sometimes it is easier to double tap on power button.
+- **ntfy URL for Sending Notifications**, which allows setting a [ntfy](https://ntfy.sh/) URL to which notifications of new detections will be sent. The topic should be unique to your device, e.g., `https://ntfy.sh/rayhunter_notifications_ba9di7ie` or `https://myserver.example.com/rayhunter_notifications_ba9di7ie`. The ntfy Android and iOS apps can then be used to receive notifications. More information can be found in the [ntfy docs](https://docs.ntfy.sh/).
 - **Colorblind Mode** enables color blind mode (blue line is shown instead of green line, red line remains red). Please note that this does not cover all types of color blindness, but switching green to blue should be about enough to differentiate the color change for most types of color blindness.
-- **ntfy URL**, which allows setting a [ntfy](https://ntfy.sh/) URL to which notifications of new detections will be sent. The topic should be unique to your device, e.g., `https://ntfy.sh/rayhunter_notifications_ba9di7ie` or `https://myserver.example.com/rayhunter_notifications_ba9di7ie`. The ntfy Android and iOS apps can then be used to receive notifications. More information can be found in the [ntfy docs](https://docs.ntfy.sh/).
-- **Enabled Notification Types** allows enabling or disabling the following types of notifications:
-  - *Warnings*, which will alert when a heuristic is triggered. Alerts will be sent at most once every five minutes.
-  - *Low Battery*, which will alert when the device's battery is low. Notifications may not be supported for all devices—you can check if your device is supported by looking at whether the battery level indicator is functioning on the System Information section of the Rayhunter UI.
-- With **Analyzer Heuristic Settings** you can switch on or off built-in [Rayhunter heuristics](heuristics.md). Some heuristics are experimental or can trigger a lot of false positive warnings in some networks (our tests have shown that some heuristics have different behavior in US or European networks). In that case you can decide whether you would like to have the heuristics that trigger a lot of false positives on or off. Please note that we are constantly improving and adding new heuristics, so a new release may reduce false positives in existing heuristics as well.
+- With **Analyzer Heuristic Settings** you can switch on or off built-in [Rayhunter heuristics](heuristics.md). Some heuristics are experimental or can trigger a lot of false positive warnings in some networks (our tests have shown that some heuristics have different behaviour in US or European networks). In that case you can decide whether you would like to have the heuristics that trigger a lot of false positives on or off. Please note that we are constantly improving and adding new heuristics, so new release may reduce false positives in existing heuristics as well.
 
-If you prefer editing `config.toml` file, you need to obtain a shell on your [Orbic](./orbic.md#obtaining-a-shell) or [TP-Link](./tplink-m7350.md#obtaining-a-shell) device and edit the file manually. You can view the [default configuration file on GitHub](https://github.com/EFForg/rayhunter/blob/main/dist/config.toml.in).
+If you prefer editing `config.toml` file, you need to obtain a shell on your [Orbic](./orbic.md#obtaining-a-shell) or [TP-Link](./tplink-m7350.md#obtaining-a-shell) device and edit the file manually. You can view the [default configuration file on a GitHub](https://github.com/EFForg/rayhunter/blob/main/dist/config.toml.in).

doc/faq.md

@@ -5,7 +5,7 @@
 **It Depends**. Operation of Rayhunter does require the insertion of a SIM card into the device, but that sim card does not have to be actively registered with a service plan. If you want to use the device as a hotspot in addition to a research device, or get [notifications](./configuration.md), an active plan would of course be necessary.
 
 ### How can I test that my device is working?
-You can enable the `Test Heuristic` under `Analyzer Heuristic Settings` in the config section on your web dashboard. This will cause an alert to trigger every time your device sees a cell tower, you might need to reboot your device or move around a bit to get this one to trigger, but it will be very noisy once it does. People have also tested it by building IMSI catchers at home, but we don't recommend that, since it violates FCC regulations and will probably upset your neighbors.
+You can enable the `Test Heuristic` under `Analyzer Heuristic Settings` in the config section on your web dashboard. This will cause an alert to trigger every time your device sees a cell tower, you might need to reboot your device or move around a bit to get this one to trigger, but it will be very noisey once it does. People have also tested it by building IMSI catchers at home, but we don't reccomend that, since it violates FCC regulations and will probably upset your neighbors.
 
 <a name="red"></a>
 

doc/heuristics.md

@@ -6,7 +6,7 @@ Rayhunter includes several analyzers to detect potential IMSI catcher activity.
 
 ### IMSI Requested (v3)
 
-This analyzer tests whether the eNodeB sends an IMSI or IMEI Identity Request NAS message under suspicious .
+This analyser tests whether the eNodeB sends an IMSI or IMEI Identity Request NAS message under suspicous .
 
 Mobile networks primarily request IMSI or IMEI from a mobile device during initial network attachment or when the network cannot identify the mobile device by its temporary identification (TMSI - *Temporary Mobile Subscriber Identity* or GUTI - *Globally Unique Temporary Identifier* in 4G/5G terminology).
 
@@ -21,9 +21,9 @@ What we consider suspicious is the following chain of events:
 * Phone connects to a new tower. 
 * Tower asks for phones identity (IMEI or IMSI.)
 * Authentication does *NOT* happen. 
-* Tower requests phone to disconnect. 
+* Tower requests phoen to disconnect. 
 
-Looking for this chain of events is much less prone to false positives than naively looking for any time the IMSI/IMEI is sent. We do still sometimes get false positives when users are in an airplane that is coming in for a landing however. This is likely due to having been disconnected for a while and then being over towers that are not able to route to your home network, but we are still researching.
+Looking for this chain of events is much less prone to false positives than naively looking for any time the IMSI/IMEI is sent. We do still sometimes get false positives when users are in an airplane that is coming in for a landing however. This is likely do to having been disconnected for a while and then being over towers that are not able to route to your home network, but we are still researching.
 
 This is the attack used by commercial IMSI catchers used by law enforcement. 
 
@@ -36,43 +36,43 @@ This heuristic will also issue a notification every time your identity is sent t
 
 ### Connection Release/Redirected Carrier 2G Downgrade
 
-This analyzer tests if a base station releases your device's connection and redirects your device to a 2G base station. This heuristic is useful, because some IMSI catchers may operate in a such way that they downgrade connection to 2G where they can intercept the communication (by performing man-in-the-middle attack).
+This analyser tests if a base station releases your device's connection and redirects your device to a 2G base station. This heuristic is useful, because some IMSI catchers may operate in a such way that they downgrade connection to 2G where they can intercept the communication (by performing man-in-the-middle attack).
 
 
 ### LTE SIB6/7 Downgrade
 
-This analyzer tests if LTE base station is broadcasting a SIB type 6 and 7 messages which include 2G/3G frequencies with higher priorities.
+This analyser tests if LTE base station is broadcasting a SIB type 6 and 7 messages which include 2G/3G frequencies with higher priorities.
 
 SIB (*System Information Block*) Type 6 and 7 are specific types of broadcast messages sent by the base station (eNodeB in 4G networks) to mobile devices. They contain essential radio-related configuration parameters to help mobile device perform cell reselection.
 
 This attack exploits the fact that SIB broadcast messages are not encrypted or authenticated. This allows them to pretend to be a legitimate cell by broadcasting fake system information in order to force mobile devices to downgrade from more secure 4G (LTE) to less secure 2G (GSM) network and then steal IMSI and/or perform man-in-the-middle attack. That is why this is also called a downgrade attack.
 
-SIB6 is used for cell reselection to CDMA2000 systems which are not supported by many modern mobile phones, and SIB7 Provides the mobile device with information to perform cell reselection to GSM/EDGE networks. Therefore SIB6 messages are quite rare, while malformed SIB7 messages are much more frequent in practice. 
+SIB6 is used for cell reselecion to CDMA2000 systems which are not supported by many modern mobile phones, and SIB7 Provides the mobile device with information to perform cell reselection to GSM/EDGE networks. Therefore SIB6 messages are quite rare, while malformed SIB7 messages are much more frequent in practice. 
 
-This heuristic is the most useful in the United States or other countries where there are no more operating 2G base stations. See [Wikipedia page on past 2G networks](https://en.wikipedia.org/wiki/2G#Past_2G_networks) for information about your country. In countries where 2G is still in service (such as most of EU), this heuristic may trigger false positives. In that case you should consider disabling it. However this heuristic has been vastly improved to reduce false positive warnings and new tests in European networks show that false positives are vastly reduced.
+This heuristic is the most useful in the United States or other countries where there are no more operating 2G base stations. See [Wikipedia page on past 2G networks](https://en.wikipedia.org/wiki/2G#Past_2G_networks) for information about your country. In countries where 2G is still in service (such as most of EU), this heuristics may trigger false positives. In that case you should consider disabling it. However this heuristics has been vastly improved to reduce false positive warnings and new tests in European networks show that false positives are vastly reduced.
 
 ### Null Cipher
 
-This analyzer tests whether the cell suggests using a null cipher (EEA0) in the RRC layer. That means that encryption between your mobile device and base station is turned off.
+This analyser tests whether the cell suggests using a null cipher (EEA0) in the RRC layer. That means that encryption between your mobile device and base station is turned off.
 
 Normally this should never happen, because null cipher is used almost exclusively for testing and debugging in labs or in controlled environments. Sometimes null cipher is used if encryption negotiation fails or isn’t supported (however in most networks this should not be the case). Also, some regulations allow unencrypted communications in **specific** emergency cases.
 
-The general rule is that null cipher should never be used in commercial deployments, except in very controlled conditions (e.g., test labs) or in a very specific regulatory-approved use cases.
+The general rule is, that null cipher should never be used in commercial deployments, except in very controlled conditions (e.g., test labs) or in a very specific regulatory-approved use cases.
 
 On the other hand, IMSI catchers often use null cipher to avoid setting up secure contexts (because they lack valid keys) and/or to trick mobile device into using unencrypted links (which makes eavesdropping easier).
 
 ### NAS Null Cipher
 
-This analyzer tests whether the security mode command at the NAS layer suggests using a null cipher (EEA0). This would usually only happen after a mobile device has successfully authenticated with the MME (*Mobility Management Entity* - core network component that handles signaling and control) but still it shouldn't happen at all. This could be indicative of an attack though using SS7 (*Signaling System 7* - a set of telecommunication protocols used to set up and manage calls and other services) to get key material from the HLR (*Home Location Register* - a database in mobile telecommunications networks that stores subscriber information) of the mobile phone for a successful authentication.
+This analyser tests whether the security mode command at the NAS layer suggests using a null cipher (EEA0). This would usually only happen after a mobile device has successfully authenticated with the MME (*Mobility Management Entity* - core network component that handles signaling and control) but still it shouldn't happen at all. This could be indicative of an attack though using SS7 (*Signaling System 7* - a set of telecommunication protocols used to set up and manage calls and other services) to get key material from the HLR (*Home Location Register* - a database in mobile telecommunications networks that stores subscriber information) of the mobile phone for a successful authentication.
 
 It could also indicate an IMSI catcher which is connected to the mobile network MME and HLR through cooperation between government and telecom provider. Or it could be a false positive if the telecom provider is intending to use null ciphers (if encryption is illegal in some country, or they have some misconfiguration of the network), however this should be very rare case.
 
 ### Incomplete SIB
 
-This analyzer tests whether the SIB1 message contains a complete SIB chain (SIB3, SIB5, etc.). A legitimate SIB1 message should contain timing information for at least 2 additional SIBs (SIB3, 4, and 5 being the most common) but a fake base station will often not bother to send additional SIBs beyond 1 and 2 (i. e. some IMSI catchers send just SIB1 and *one additional* SIB).
+This analyser tests whether the SIB1 message contains a complete SIB chain (SIB3, SIB5, etc.). A legitimate SIB1 message should contain timing information for at least 2 additional SIBs (SIB3, 4, and 5 being the most common) but a fake base station will often not bother to send additional SIBs beyond 1 and 2 (i. e. some IMSI catchers send just SIB1 and *one additional* SIB).
 
 On its own this might just be a misconfigured base station (though we have only seen it in the wild under suspicious circumstances) but combined with other heuristics such as **IMSI Requested** detection it should be considered as a strong indicator of malicious activity.
 
 ### Test Analyzer
 
-This analyzer is great for testing if your Rayhunter installation works. It will alert every time a new tower is seen (specifically every time a tower broadcasts a SIB1 message.) It is designed to be very noisy so we do not recommend leaving it on but if this alerts it means your Rayhunter device is working! 
+This analyzer is great for testing if your Rayhunter installation works. It will alert every time a new tower is seen (specifically every time a tower broadcasts a SIB1 message.) It is designed to be very noisey so we do not reccomend leaving it on but if this alerts it means your Rayhunter device is working! 

doc/installation.md

@@ -3,8 +3,5 @@
 So, you've got one of the [supported devices](./supported-devices.md), and are ready to start catching IMSI catchers. You have two options for installing Rayhunter:
 
 * [installing from a release (recommended)](./installing-from-release.md)
+  * [installing from a release on Windows](./installing-from-release-windows.md)
 * [installing from source](./installing-from-source.md)
-
-Already have Rayhunter installed but looking to update?
-
-* [Updating Rayhunter](./updating-rayhunter.md)

doc/installing-from-release-windows.md

@@ -0,0 +1,39 @@
+# Installing from the latest release (Windows)
+
+Windows support in Rayhunter's installer is a work-in-progress. Depending on the device, the installation instructions differ.
+
+## TP-Link
+
+1. Insert a FAT-formatted SD card. This will be used to store all recordings.
+2. Connect the device via WiFi or USB Tethering -- you should be able to view the TP-Link admin page on <http://192.168.0.1>.
+3. Download the latest release (must be at least 0.3.0) for windows-x86_64, and unpack the zipfile.
+4. Open PowerShell or CMD in that extracted folder, the installer: `./installer tplink`
+5. Follow the instructions on the screen, if there are any.
+
+## Orbic
+
+<div class=warning><strong>
+
+[The Windows USB installer is known to be buggy](https://github.com/EFForg/rayhunter/issues/366). We strongly reccomend using the [Network-based installer](./orbic.md#the-network-installer).
+
+</strong></div>
+
+1. Connect the device to your computer using the provided USB cable.
+1. Install the [Zadig WinUSB driver installer](https://zadig.akeo.ie/).
+1. Open Zadig, click options->show all devices 
+
+    ![Zadig](./zadig2.png)
+
+1. Select 'RNDIS (Interface 0)'
+
+    ![Zadig](./zadig.png)
+
+1. Click 'install driver' and wait for it to finish. 
+2. Download the latest `rayhunter-vX.X.X-windows-x86_64.zip` from the [Rayhunter releases page](https://github.com/EFForg/rayhunter/releases). The version you download will have numbers instead of X
+3. Unzip `rayhunter-vX.X.X-windows-x86_64` .
+1. Open a powershell terminal by pressing Win+R and typing `powershell` and hitting enter. 
+5. Type `cd ~\Downloads\rayhunter-v<x.x.x>-windows-x86_64` (**Replace <x.x.x> with the Rayhunter version you just unzipped**) and hit enter.
+5. Run the install script: `.\installer.exe orbic` and hit enter.
+    - The device will restart multiple times over the next few minutes.
+    - You will know it is done when you see terminal output that says `checking for rayhunter server...success!`
+6. Rayhunter should now be running! You can verify this by following the instructions below to [view the web UI](./using-rayhunter.md#the-web-ui). You should also see a green line flash along the top of top the display on the device.

doc/installing-from-release.md

@@ -2,7 +2,7 @@
 
 Make sure you've got one of Rayhunter's [supported devices](./supported-devices.md). These instructions have only been tested on macOS and Ubuntu 24.04. If they fail, you will need to [install Rayhunter from source](./installing-from-source.md).
 
-1. **For the TP-Link only,** insert a FAT-formatted SD card. This will be used to store all recordings.
+1. For the TP-Link only, insert a FAT-formatted SD card. This will be used to store all recordings.
 2. Download the latest `rayhunter-vX.X.X-PLATFORM.zip` from the [Rayhunter releases page](https://github.com/EFForg/rayhunter/releases) for your platform:
     - for Linux on x64 architecture: `linux-x64`
     - for Linux on ARM64 architecture: `linux-aarch64`
@@ -18,55 +18,32 @@ Make sure you've got one of Rayhunter's [supported devices](./supported-devices.
     cd ~/Downloads/rayhunter-vX.X.X-PLATFORM
     ```
 
-   On Windows you can decompress using the file browser, then navigate to the
-   folder that contains `installer.exe`, **hold Shift**, Right-Click inside the
-   folder, then click "Open in PowerShell".
+4. Turn on your device by holding the power button on the front.
 
-4. **Connect to your device.**
+   * For the Orbic, connect the device using a USB-C cable.
+     * Or connect to the network if using the network based installer, this is especially reccomended on Windows.
+   * For TP-Link, connect to its network using either WiFi or USB Tethering.
 
-   First turn on your device by holding the power button on the front.
+5. Run the installer:
 
-   Then connect to the device using either WiFi or USB tethering.
+    ```bash
+    # On MacOS, you must first remove the quarantine bit
+    xattr -d com.apple.quarantine installer
+    ```
+    Then run the installer:
+    ```bash
+    ./installer orbic
+    # or: ./installer [orbic-network|tplink|tmobile|uz801|pinephone|wingtech]
+    ```
 
-   You know you are in the right network when you can access
-   <http://192.168.1.1> (Orbic) or <http://192.168.0.1> (TP-Link) and see the
-   hardware's own admin menu.
+    The device will restart multiple times over the next few minutes.
 
-5. **On MacOS only**, you have to run `xattr -d
-   com.apple.quarantine installer` to allow execution of
-   the binary.
+    You will know it is done when you see terminal output that says `Testing Rayhunter... done`
 
-6. **Run the installer.**
-
-   ```bash
-   # For Orbic:
-   ./installer orbic --admin-password 'mypassword'
-   # Or install over USB if you want ADB and a root shell (not recommended for most users)
-   ./installer orbic-usb
-
-   # For TP-Link:
-   ./installer tplink
-   ```
-
-   * On Verizon Orbic, the password is the WiFi password.
-   * On Kajeet/Smartspot devices, the default password is `$m@rt$p0tc0nf!g`
-   * On Moxee-brand devices, check under the battery for the password.
-   * You can reset the password by pressing the button under the back case until the unit restarts.
-
-   TP-Link does not require an `--admin-password` parameter.
-
-   For other devices, check `./installer --help` or the
-   respective page in the sidebar under "Supported
-   Devices."
-
-7. The installer will eventually tell you it's done, and the device will reboot.
-
-8. Rayhunter should now be running! You can verify this by [viewing Rayhunter's web UI](./using-rayhunter.md). You should also see a green line flash along the top of top the display on the device.
+6. Rayhunter should now be running! You can verify this by [viewing Rayhunter's web UI](./using-rayhunter.md). You should also see a green line flash along the top of top the display on the device.
 
 ## Troubleshooting
 
-* If you are having trouble installing Rayhunter and you're connecting to your device over USB, try using a different USB cable to connect the device to your computer. If you are using a USB hub, try using a different one or directly connecting the device to a USB port on your computer. A faulty USB connection can cause the Rayhunter installer to fail.
-
 * You can test your device by enabling the test heuristic. This will be very noisy and fire an alert every time you see a new tower. Be sure to turn it off when you are done testing.  
 
 * On MacOS if you encounter an error that says "No Orbic device found," it may because you have the "Allow accessories to connect" security setting set to "Ask for approval." You may need to temporarily change it to "Always" for the script to run. Make sure to change it back to a more secure setting when you're done.

doc/installing-from-source.md

@@ -36,29 +36,21 @@ rustup target add x86_64-pc-windows-gnu
 Now you can root your device and install Rayhunter by running:
 
 ```sh
-# Build the daemon binary for local development (rustcrypto TLS backend, fast compilation)
-# WARNING: The rustcrypto library, though not known to be insecure, is less well
-# tested than its counterpart and could potentially have severe issues in
-# its cryptographic implementation. We therefore recommend using ring-tls in
-# production builds (see below)
-cargo build-daemon-firmware-devel
+# Profile can be changed to 'firmware-devel' when building for development.
+# Build time will decrease at the expense of binary size.
+cargo build --bin rayhunter-daemon --target armv7-unknown-linux-musleabihf --profile firmware
 
-# To build it exactly like in CI (more mature ring TLS backend, slower compilation)
-# CC_armv7_unknown_linux_musleabihf=arm-linux-gnueabihf-gcc cargo build-daemon-firmware
-
-# Build rootshell
-cargo build -p rootshell --bin rootshell --target armv7-unknown-linux-musleabihf --profile firmware
+cargo build --bin rootshell --target armv7-unknown-linux-musleabihf --profile firmware
 
 # Replace 'orbic' with your device type if different.
-# A list of possible values can be found with 'cargo run --bin installer help'.
-# Use FILE_RAYHUNTER_DAEMON to specify the daemon binary path when using development builds:
-FILE_RAYHUNTER_DAEMON=$PWD/target/armv7-unknown-linux-musleabihf/firmware-devel/rayhunter-daemon cargo run -p installer --bin installer orbic
+# A list possible values can be found with 'cargo run --bin installer help'.
+cargo run --bin installer orbic
 ```
 
 ### If you're on Windows or can't run the install scripts
 
 * Root your device on Windows using the instructions here: <https://xdaforums.com/t/resetting-verizon-orbic-speed-rc400l-firmware-flash-kajeet.4334899/#post-87855183>
-* Build the web UI using `cd daemon/web && npm install && npm run build`
+* Build the web UI using `cd bin/web && npm install && npm run build`
 * Push the scripts in `scripts/` to `/etc/init.d` on device and make a directory called `/data/rayhunter` using `adb shell` (and sshell for your root shell if you followed the steps above)
 * You also need to copy `config.toml.in` to `/data/rayhunter/config.toml`. Uncomment the `device` line and set the value to your device type if necessary.
 * Then run `./make.sh`, which will build the binary, push it over adb, and restart the device. Once it's restarted, Rayhunter should be running!

doc/moxee.md

@@ -30,13 +30,14 @@ According to [FCC ID 2APQU-K779HSDL](https://fcc.report/FCC-ID/2APQU-K779HSDL),
 Connect to the hotspot's network using WiFi or USB tethering and run:
 
 ```sh
-./installer orbic --admin-password 'mypassword'
+./installer orbic-network
 ```
 
-The password (in place of `mypassword`) is under the battery.
+The installation will ask you to log into the admin UI using a custom URL. The
+password for that is under the battery.
 
 ## Obtaining a shell
 
 ```sh
-./installer util orbic-shell
+./installer util orbic-start-telnet
 ```

doc/orbic.md

@@ -21,27 +21,27 @@ or on [eBay](https://www.ebay.com/sch/i.html?_nkw=orbic+rc400l).
 | Wifi 5Ghz | a/ac/ax |
 | Wifi 6 | 🮱 |
 
-## Two kinds of installers
+## The Network Installer
 
-The orbic's installation routine underwent many different changes:
+Since Rayhunter 0.6.0 there is an alternative, experimental installation
+procedure at `./installer orbic-network` that is supposed to eventually replace
+`./installer orbic`. It does not require any USB driver installation and works
+identically on Windows, Mac and Linux. From our testing it works much more
+reliably on Windows than `./installer orbic` does.
 
-1. The ADB-based shellscript prior to version 0.3.0
-2. The Rust-based, ADB-based installer since version 0.3.0
-3. Then, starting with 0.6.0, an alternative installer `./installer
-   orbic-network` that is supposed to work more reliably, can run over the
-   Orbic's WiFi connection and without the need to manually install USB drivers
-   on Windows.
-4. Starting with 0.8.0, `orbic-network` has been renamed to `orbic`, and the
-   old `./installer orbic` is now called `./installer orbic-usb`.
-   
-It's possible that many tutorials out there still refer to some of the old
-installation routines.
+The drawback is that the device's admin password is required. 
+
+1. Connect to the Orbic's network via WiFi or USB tethering
+2. Run `./installer orbic-network`
+3. The installer will ask you to log into the admin UI on `localhost:4000`. The password for that is the same as the WiFi password.
+4. As soon as you're logged in, the installer will continue and reboot the device.
+
+*note*: On Kajeet devices the default admin password is `$m@rt$p0tc0nf!g`, on most other orbic devices the default admin password is the same as the wifi password. If the password has been changed you can reset it by pressing the button under the back case until the unit restarts. 
 
 ## Obtaining a shell
 
-After running the installer, there will not be a rootshell and ADB will not be
-enabled. Instead you can use `./installer util orbic-shell`.
+After running through the installation procedure, you can obtain a root shell
+by running `adb shell` or `./installer util shell`. Then, inside of that shell
+you can run `/bin/rootshell` to obtain "fakeroot."
 
-If you are using an installer prior to 0.7.0 or `orbic-usb` explicitly, you can
-obtain a root shell by running `adb shell` or `./installer util shell`. Then,
-inside of that shell you can run `/bin/rootshell` to obtain "fakeroot."
+If you are using the network installer, there will not be a rootshell and ADB will not be enabled by the installer. Instead you can use `./installer util orbic-start-telnet` and connect to the hotspot using `nc 192.168.1.1 23`. On Windows you might not have `nc` and will have to use WSL for that.

doc/reanalyzing.md

@@ -16,7 +16,7 @@ using the `rayhunter-check` CLI tool. That tool contains the same heuristics as
 Rayhunter and will also work on traffic data captured with other tools, such as
 QCSuper.
 
-Since 0.6.1, `rayhunter-check` is included in the release zipfile.
+Since, 0.6.1, `rayhunter-check` is included in the release zipfile.
 
 You can build `rayhunter-check` from source with the following command:
 `cargo build --bin rayhunter-check` 
@@ -42,4 +42,4 @@ Options:
 
 `rayhunter-check -p ~/Downloads #Check all files in downloads`
 
-`rayhunter-check -d -p ~/Downloads/myfile.qmdl #run in debug mode`
+`rayhunter-check -d -p ~/Downloads/myfile.qmdl #run in debug mode`

doc/tmobile-tmohs1.md

@@ -37,7 +37,7 @@ According to FCC ID 2APXW-TMOHS1 Test Report No. I20Z61602-WMD02 ([part 1](https
 |   71 | 600 MHz (USDD)   |
 
 ## Installing
-Connect to the TMOHS1's network over WiFi or USB tethering.
+Connect to the TMOHS1's network over wifi or usb tethering.
 
 The device will not accept web requests until after the default password is changed.
 If you have not previously logged in, log in using the default password printed under the battery and change the admin password.

doc/tplink-m7350.md

@@ -4,16 +4,6 @@ Supported in Rayhunter since version 0.3.0.
 
 The TP-Link M7350 supports many more frequency bands than Orbic and therefore works in Europe and also in some Asian and African countries.
 
-## Supported Bands
-
-| Technology | Bands |
-| ---------- | ----- |
-| 4G LTE | B1/B3/B7/B8/B20 (2100/1800/2600/900/800 MHz) |
-| 3G | B1/B8 (2100/900 MHz) |
-| 2G | 850/900/1800/1900 MHz |
-
-*Source: [TP-Link Official Product Page](https://www.tp-link.com/baltic/service-provider/lte-3g/m7350/)*
-
 ## Hardware versions
 
 The TP-Link comes in many different *hardware versions*. Support for installation varies:
@@ -33,8 +23,8 @@ When filing bug reports, particularly with the installer, please always specify
 You can get your TP-Link M7350 from:
 
 * First check for used offers on local sites, sometimes it's much cheaper there.
-* [Geizhals price comparison](https://geizhals.eu/?fs=tp-link+m7350).
-* [Ebay](https://www.ebay.com/sch/i.html?_nkw=tp-link+m7350&_sacat=0&_from=R40&_trksid=p4432023.m570.l1313).
+* [Geizhals price comparison](https://geizhals.eu/?fs=tp-link+m7350)
+* [Ebay](https://www.ebay.com/sch/i.html?_nkw=tp-link+m7350&_sacat=0&_from=R40&_trksid=p4432023.m570.l1313)
 
 ## Installation & Usage
 
@@ -42,10 +32,11 @@ Follow the [release installation guide](./installing-from-release.md). Substitut
 
 ## Obtaining a shell
 
-You can obtain a root shell with the following command:
+Unlike on Orbic, the installer will not enable ADB. Instead, you can obtain a root shell with the following command:
 
 ```sh
-./installer util tplink-shell
+./installer util tplink-start-telnet
+telnet 192.168.0.1
 ```
 
 ## Display states
@@ -61,7 +52,7 @@ If your device has a one-bit (black-and-white) display, Rayhunter will instead s
 ## Power-saving mode/sleep
 
 By default the device will go to sleep after N minutes of no devices being connected. In that mode it will also turn off connections to cell phone towers.
-In order for Rayhunter to record continuously, you have to turn off this sleep mode in TP-Link's admin panel (go to **Advanced** - **Power Saving**) or keep e.g. your phone connected on the TP-Link's WiFi.
+In order for Rayhunter to record continuously, you have to turn off this sleep mode in TP-Link's admin panel (go to **Advanced** - **Power Saving**) or keep e.g. your phone connectd on the TP-Link's WiFi.
 
 ## Port triggers
 
@@ -69,7 +60,7 @@ On hardware revisions starting with v4.0, the installer will modify settings to
 add two port triggers. You can look at `Settings > NAT Settings > Port
 Triggers` in TP-Link's admin UI to see them.
 
-1. One port trigger "rayhunter-root" to launch the telnet shell. This is only needed for installation, and can be removed after upgrade. You can reinstall it using `./installer util tplink-shell`.
+1. One port trigger "rayhunter-root" to launch the telnet shell. This is only needed for installation, and can be removed after upgrade. You can reinstall it using `./installer util tplink-start-telnet`.
 2. One port trigger "rayhunter-daemon" to auto-start Rayhunter on boot. If you remove this, Rayhunter will have to be started manually from shell.
 
 ## Other links

doc/uninstalling.md

@@ -1,25 +1,23 @@
 # Uninstalling
 
-There is no automated uninstallation routine, so this page documents the routine for some devices.
-
 ## Orbic
 
-Run `./installer util orbic-shell --admin-password mypassword`. Refer to the
-installation instructions for how to find out the admin password.
+To uninstall Rayhunter, power on your Orbic device and connect to it via USB. Then, start a rootshell on it by running `adb shell`, followed by `rootshell`.
 
-Inside, run:
+Once in a rootshell, run:
 
 ```shell
-echo 3 > /usrdata/mode.cfg  # only relevant if you previously installed via ADB installer
-rm -rf /data/rayhunter /etc/init.d/rayhunter_daemon /bin/rootshell
+echo 3 > /usrdata/mode.cfg
+rm -rf /data/rayhunter /etc/init.d/rayhunter-daemon /bin/rootshell.sh
 reboot
 ```
 
-Your device is now Rayhunter-free, and should no longer be rooted.
+Your device is now Rayhunter-free, and should no longer be in a rooted ADB-enabled mode.
 
 ## TPLink
 
-1. Run `./installer util tplink-shell` to obtain rootshell on the device.
+1. Run `./installer util tplink-start-telnet`
+2. Telnet into the device `telnet 192.168.0.1`
 3. `rm /data/rayhunter /etc/init.d/rayhunter_daemon`
 4. `update-rc.d rayhunter_daemon remove`
 5. (hardware revision v4.0+ only) In `Settings > NAT Settings > Port Triggers` in TP-Link's admin UI, remove any leftover port triggers.
@@ -38,4 +36,4 @@ busybox vi /system/bin/initmifiservice.sh
 ```
 Then type 999G (shift+g), then type dd. Then press the colon key (:) and type wq. Finally, press Enter.
 4. Lastly, run `setprop persist.sys.usb.config rndis`.
-5. Type `reboot` to reboot the device.
+5. Type `reboot` to reboot the device.

doc/using-rayhunter.md

@@ -14,7 +14,7 @@ You can access this UI in one of two ways:
   network and visit <http://192.168.1.1:8080> (orbic)
   or <http://192.168.0.1:8080> (tplink).
 
-  Click past your browser warning you about the connection not being secure; Rayhunter doesn't have HTTPS yet.
+  Click past your browser warning you about the connection not being secure, Rayhunter doesn't have HTTPS yet.
 
   On the **Orbic**, you can find the WiFi network password by going to the Orbic's menu > 2.4 GHz WIFI Info > Enter > find the 8-character password next to the lock 🔒 icon.
   On the **TP-Link**, you can find the WiFi network password by going to the TP-Link's menu > Advanced > Wireless > Basic Settings.
@@ -28,4 +28,4 @@ You can access this UI in one of two ways:
 
 ## Key shortcuts
 
-As of Rayhunter version 0.3.3, you can start a new recording by double-tapping the power button. Any current recording will be stopped and a new recording will be started, resetting the red line as well. This feature is disabled by default since Rayhunter version 0.4.0 and needs to be enabled through [configuration](./configuration.md).
+As of Rayhunter verion 0.3.3, you can start a new recording by double-tapping the power button. Any current recording will be stopped and a new recording will be started, resetting the red line as well. This feature is disabled by default since Rayhunter version 0.4.0 and needs to be enabled through [configuration](./configuration.md).

doc/uz801.md

@@ -28,7 +28,7 @@ The most frequent bands found on these devices are LTE bands 1/3/5/8/20. In the
 
 ## Installing
 
-With the device fully booted (i.e. beaming a WiFi network, blue LED, etc.) and plugged into the computer that is performing the installation, run:
+With the device fully booted (i.e. beaming a wifi network, blue LED, etc.) and plugged into the computer that is performing the installation, run:
 
 ```sh
 ./installer uz801

doc/wingtech-ct2mhs01.md

@@ -29,7 +29,7 @@ Wingtechs are abundant on ebay and can also be found on Amazon:
 - <https://www.amazon.com/AT-Turbo-Hotspot-256-Black/dp/B09YWLXVWT>
 
 ## Installing
-Connect to the Wingtech's network over WiFi or USB tethering, then run the installer:
+Connect to the Wingtech's network over wifi or usb tethering, then run the installer:
 
 ```sh
 ./installer wingtech --admin-password 12345678  # replace with your own password
@@ -101,4 +101,4 @@ Caused by:
     3: Network is unreachable (os error 101)
 ```
 
-Make sure your computer is connected to the hotspot's WiFi network.
+Make sure your computer is connected to the hotspot's wifi network.

installer-gui/.gitignore

@@ -1,11 +0,0 @@
-.DS_Store
-node_modules
-/build
-/.svelte-kit
-/package
-.env
-.env.*
-!.env.example
-vite.config.js.timestamp-*
-vite.config.ts.timestamp-*
-/src-tauri/binaries

installer-gui/.prettierignore

@@ -1 +0,0 @@
-package-lock.json

installer-gui/.prettierrc

@@ -1,15 +0,0 @@
-{
-    "singleQuote": true,
-    "tabWidth": 4,
-    "trailingComma": "es5",
-    "printWidth": 100,
-    "plugins": ["prettier-plugin-svelte"],
-    "overrides": [
-        {
-            "files": "*.svelte",
-            "options": {
-                "parser": "svelte"
-            }
-        }
-    ]
-}

installer-gui/README.md

@@ -1,34 +0,0 @@
-# Rayhunter GUI Installer
-
-This directory contains experimental work on a Rayhunter GUI installer based on [Tauri](https://tauri.app/).
-
-## Dependencies
-
-Before building the GUI installer, you'll first need to install its dependencies.
-
-### Tauri Dependencies
-
-You'll need to install [Tauri's dependencies](https://tauri.app/start/prerequisites/). In addition to Rust, you'll need [Node.js/npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm). If you're on Linux, also be sure to install the necessary [system dependencies](https://tauri.app/start/prerequisites/#linux) from your package manager.
-
-### Rayhunter CLI Installer
-
-The GUI installer pulls in the CLI installer as a library. Like with the CLI installer, the firmware binary needs to be present and can be overridden with the same envvars. See `../installer/build.rs` for options.
-
-For example, to build the firmware in development mode and then provide the path explicitly:
-
-```bash
-cargo build-daemon-firmware-devel
-
-(cd installer-gui && FILE_RAYHUNTER_DAEMON=$PWD/../target/armv7-unknown-linux-musleabihf/firmware-devel/rayhunter-daemon npm run tauri android build)
-```
-
-## Building
-
-After preparing dependencies, the GUI installer can be built by:
-
-1. Running `npm install` in this directory.
-2. Running `npm run tauri dev`.
-
-This will build the GUI installer in development mode. While this command is running, any changes to either the frontend or backend code will cause the installer to be reloaded or rebuilt.
-
-You can also run `npm run tauri build` to create the final GUI installer artifacts for your OS as is done in CI.

installer-gui/eslint.config.js

@@ -1,42 +0,0 @@
-import prettier from 'eslint-config-prettier';
-import js from '@eslint/js';
-import svelte from 'eslint-plugin-svelte';
-import globals from 'globals';
-import ts from 'typescript-eslint';
-
-export default ts.config(
-    {
-        ignores: ['build/', '.svelte-kit/**', 'dist/'],
-    },
-    js.configs.recommended,
-    ...ts.configs.recommended,
-    ...svelte.configs['flat/recommended'],
-    prettier,
-    ...svelte.configs['flat/prettier'],
-    {
-        languageOptions: {
-            globals: {
-                ...globals.browser,
-                ...globals.node,
-            },
-        },
-    },
-    {
-        files: ['**/*.svelte'],
-
-        languageOptions: {
-            parserOptions: {
-                parser: ts.parser,
-            },
-        },
-    },
-    {
-        rules: {
-            '@typescript-eslint/no-unused-vars': [
-                'error',
-                { argsIgnorePattern: '^_', varsIgnorePattern: '^_' },
-            ],
-            '@typescript-eslint/no-explicit-any': 'off',
-        },
-    }
-);

installer-gui/package.json

@@ -1,41 +0,0 @@
-{
-    "name": "installer-gui",
-    "version": "0.1.0",
-    "description": "",
-    "type": "module",
-    "scripts": {
-        "dev": "vite dev",
-        "build": "vite build",
-        "preview": "vite preview",
-        "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
-        "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-        "format": "prettier --write .",
-        "lint": "prettier --check . && eslint .",
-        "fix": "eslint --fix .",
-        "tauri": "tauri"
-    },
-    "dependencies": {
-        "@tailwindcss/vite": "^4.1.16",
-        "@tauri-apps/api": "^2",
-        "@tauri-apps/plugin-opener": "^2",
-        "tailwindcss": "^4.1.16"
-    },
-    "devDependencies": {
-        "@eslint/js": "^9.38.0",
-        "@sveltejs/adapter-static": "^3.0.6",
-        "@sveltejs/kit": "^2.9.0",
-        "@sveltejs/vite-plugin-svelte": "^5.0.0",
-        "@tauri-apps/cli": "^2",
-        "eslint": "^9.38.0",
-        "eslint-config-prettier": "^10.1.8",
-        "eslint-plugin-svelte": "^3.13.0",
-        "globals": "^16.4.0",
-        "prettier": "^3.6.2",
-        "prettier-plugin-svelte": "^3.4.0",
-        "svelte": "^5.0.0",
-        "svelte-check": "^4.0.0",
-        "typescript": "~5.6.2",
-        "typescript-eslint": "^8.46.2",
-        "vite": "^6.0.3"
-    }
-}

installer-gui/src-tauri/.gitignore

@@ -1,3 +0,0 @@
-# Generated by Tauri
-# will have schema files for capabilities auto-completion
-/gen/schemas

installer-gui/src-tauri/Cargo.toml

@@ -1,24 +0,0 @@
-[package]
-name = "installer-gui"
-version = "0.9.0"
-edition = "2024"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-# The `_lib` suffix may seem redundant but it is necessary
-# to make the lib name unique and wouldn't conflict with the bin name.
-# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
-name = "installer_gui_lib"
-crate-type = ["staticlib", "cdylib", "rlib"]
-
-[build-dependencies]
-tauri-build = { version = "2", features = [] }
-
-[dependencies]
-tauri = { version = "2", features = [] }
-tauri-plugin-opener = "2"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-anyhow = "1.0.100"
-installer = { path = "../../installer" }

installer-gui/src-tauri/build.rs

@@ -1,3 +0,0 @@
-fn main() {
-    tauri_build::build()
-}

installer-gui/src-tauri/capabilities/default.json

@@ -1,7 +0,0 @@
-{
-    "$schema": "../gen/schemas/desktop-schema.json",
-    "identifier": "default",
-    "description": "Capability for the main window",
-    "windows": ["main"],
-    "permissions": ["core:default", "opener:default"]
-}

installer-gui/src-tauri/src/lib.rs

@@ -1,34 +0,0 @@
-use tauri::Emitter;
-
-async fn run_installer(app_handle: tauri::AppHandle, args: String) -> anyhow::Result<()> {
-    tauri::async_runtime::spawn_blocking(move || {
-        installer::run_with_callback(
-            // TODO: we should split using something similar to shlex in python
-            args.split_whitespace(),
-            Some(Box::new(move |output| {
-                app_handle
-                    .emit("installer-output", output)
-                    .expect("Error sending Rayhunter CLI installer output to GUI frontend");
-            })),
-        )
-    })
-    .await?
-}
-
-#[tauri::command]
-async fn install_rayhunter(app_handle: tauri::AppHandle, args: String) -> Result<(), String> {
-    // the return value of tauri commands needs to be serializable by serde which we accomplish
-    // here by converting anyhow::Error to a string
-    run_installer(app_handle, args)
-        .await
-        .map_err(|error| format!("{error:?}"))
-}
-
-#[cfg_attr(mobile, tauri::mobile_entry_point)]
-pub fn run() {
-    tauri::Builder::default()
-        .plugin(tauri_plugin_opener::init())
-        .invoke_handler(tauri::generate_handler![install_rayhunter])
-        .run(tauri::generate_context!())
-        .expect("error while running tauri application");
-}

installer-gui/src-tauri/src/main.rs

@@ -1,6 +0,0 @@
-// Prevents additional console window on Windows in release, DO NOT REMOVE!!
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
-
-fn main() {
-    installer_gui_lib::run()
-}

installer-gui/src-tauri/tauri.conf.json

@@ -1,34 +0,0 @@
-{
-    "$schema": "https://schema.tauri.app/config/2",
-    "productName": "Rayhunter Installer",
-    "identifier": "com.rayhunter-installer.app",
-    "build": {
-        "beforeDevCommand": "npm run dev",
-        "devUrl": "http://localhost:1420",
-        "beforeBuildCommand": "npm run build",
-        "frontendDist": "../build"
-    },
-    "app": {
-        "windows": [
-            {
-                "title": "Rayhunter Installer",
-                "width": 800,
-                "height": 600
-            }
-        ],
-        "security": {
-            "csp": null
-        }
-    },
-    "bundle": {
-        "active": true,
-        "targets": ["app", "appimage", "deb", "msi", "nsis", "rpm"],
-        "icon": [
-            "icons/32x32.png",
-            "icons/128x128.png",
-            "icons/128x128@2x.png",
-            "icons/icon.icns",
-            "icons/icon.ico"
-        ]
-    }
-}