Migrate to tauri 2.0

.github/workflows/build.yaml

@@ -1,54 +1,162 @@
-name: "build"
+name: build
 
-# This will trigger the action on each push to the `release` branch.
 on:
   push:
     branches:
       - "*"
+  pull_request:
+
+env:
+  LITHO_REPO: https://github.com/girish946/litho.git
+  LITHO_BRANCH: windows-implementation
 
 jobs:
-  publish-tauri:
+  build-tauri-linux:
     permissions:
       contents: write
-    strategy:
-      fail-fast: false
-      matrix:
-        # platform: [macos-latest, ubuntu-20.04, windows-latest]
-        platform: [ubuntu-20.04]
-
-    runs-on: ${{ matrix.platform }}
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
+      # liblitho is a path dependency at ../../litho (sibling of this repo).
+      - name: Checkout litho
+        run: git clone --depth 1 --branch "${{ env.LITHO_BRANCH }}" "${{ env.LITHO_REPO }}" ../litho
+
+      - name: install dependencies (ubuntu only)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+
       - name: setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: lts/*
 
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
 
-      - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-20.04'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            ./src-tauri -> target
+            ../litho -> target
 
       - name: install frontend dependencies
-        run: yarn install # change this to npm or pnpm depending on which one you use
+        run: npm install
+
+      - name: vendor frontend assets
+        run: npm run vendor-assets
+
+      - name: generate app icons
+        run: npm run generate-icons
 
+      # Omit tagName and releaseId to build only (no GitHub release upload).
       - uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        #with:
-        # tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version
-        # releaseName: "App v__VERSION__"
-        # releaseBody: "See the assets to download this version and install."
-        # releaseDraft: true
-        # prerelease: false
+        with:
+          tauriScript: bash scripts/tauri-build.sh
+
       - uses: actions/upload-artifact@v4
         with:
-          name: builds
+          name: linux-builds
           path: |
             src-tauri/target/release/bundle/deb/*.deb
             src-tauri/target/release/bundle/appimage/*.AppImage
+            src-tauri/target/release/bundle/rpm/*.rpm
+
+  build-tauri-windows:
+    permissions:
+      contents: write
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Checkout litho
+        shell: bash
+        run: git clone --depth 1 --branch "${{ env.LITHO_BRANCH }}" "${{ env.LITHO_REPO }}" ../litho
+
+      # windows-latest ships OpenSSL at C:\Program Files\OpenSSL (see actions/runner-images Install-OpenSSL.ps1).
+      # openssl-sys needs OPENSSL_* pointing at the MSVC import libs (lib\VC\x64\MD\), not lib\ alone.
+      - name: Configure pre-installed OpenSSL for openssl-sys
+        shell: pwsh
+        run: |
+          $opensslDir = 'C:\Program Files\OpenSSL'
+          if (-not (Test-Path $opensslDir)) {
+            Write-Error "Pre-installed OpenSSL not found at $opensslDir"
+            exit 1
+          }
+
+          $libMatch = Get-ChildItem -Path $opensslDir -Recurse -Filter 'libcrypto.lib' -ErrorAction SilentlyContinue | Select-Object -First 1
+          if (-not $libMatch) {
+            Write-Error "libcrypto.lib not found under $opensslDir"
+            exit 1
+          }
+          $libDir = $libMatch.DirectoryName
+
+          $includeDir = Join-Path $opensslDir 'include'
+          if (-not (Test-Path $includeDir)) {
+            Write-Error "OpenSSL include dir not found at $includeDir"
+            exit 1
+          }
+
+          Write-Host "OPENSSL_DIR=$opensslDir"
+          Write-Host "OPENSSL_LIB_DIR=$libDir"
+          Write-Host "OPENSSL_INCLUDE_DIR=$includeDir"
+          Add-Content -Path $env:GITHUB_ENV -Value "OPENSSL_DIR=$opensslDir"
+          Add-Content -Path $env:GITHUB_ENV -Value "OPENSSL_LIB_DIR=$libDir"
+          Add-Content -Path $env:GITHUB_ENV -Value "OPENSSL_INCLUDE_DIR=$includeDir"
+
+      # windows-latest ships vcpkg at C:\vcpkg (VCPKG_INSTALLATION_ROOT). rust-lzma needs VCPKG_ROOT
+      # and the liblzma port installed (find_package does not auto-install).
+      - name: Configure pre-installed vcpkg for rust-lzma
+        shell: pwsh
+        run: |
+          $vcpkgRoot = 'C:\vcpkg'
+          $vcpkgExe = Join-Path $vcpkgRoot 'vcpkg.exe'
+          if (-not (Test-Path $vcpkgExe)) {
+            Write-Error "Pre-installed vcpkg not found at $vcpkgExe"
+            exit 1
+          }
+          Write-Host "Installing static liblzma via $vcpkgExe ..."
+          & $vcpkgExe install liblzma:x64-windows-static-md
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+          Add-Content -Path $env:GITHUB_ENV -Value "VCPKG_ROOT=$vcpkgRoot"
+
+      - name: setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+
+      - name: install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            ./src-tauri -> target
+            ../litho -> target
+
+      - name: install frontend dependencies
+        run: npm install
+
+      - name: vendor frontend assets
+        run: npm run vendor-assets
+
+      - name: generate app icons
+        run: npm run generate-icons
+
+      - uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tauriScript: powershell -ExecutionPolicy Bypass -File scripts/tauri-build.ps1
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: windows-builds
+          path: |
+            src-tauri/target/release/bundle/msi/*.msi
+            src-tauri/target/release/bundle/nsis/*.exe

.gitignore

@@ -22,3 +22,9 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+# frontend framework files and fonts
+src/vendor/*
+
+# sidecar files
+src-tauri/binaries/*

README.md

@@ -1,28 +1,188 @@
 # Lithographer
 
-GUI for [litho](https://github.com/girish946/litho) written in Rust using [tauri](https://tauri.studio/).
-
+GUI for [litho](https://github.com/girish946/litho) — flash disk images and clone block devices with a native desktop app built on [Tauri 2](https://tauri.app/).
 
 <p align="center">
-<img src="src/assets/logo.png"></img>
+<img src="src/assets/lithographer-banner-dark.jpg" alt="Lithographer logo">
 </p>
 
+Lithographer stays **unprivileged**. Device enumeration and validation run in-process via `liblitho`; privileged flash/clone work is delegated to a bundled **`litho` sidecar** that speaks a line-oriented GUI protocol on stdout.
+
+## Features
+
+- **Flash** and **clone** with real block I/O (sidecar built with `real-io`)
+- **Device picker** — removable devices listed first; fixed-disk extra confirmation in litho
+- **Native file dialog** — open image for flash, save path for clone (`rfd`)
+- **Optimal I/O block size** — computed from target device capacity (not a fixed 4 KiB)
+- **Optional SHA-256 verify** — checkbox for flash operations (off by default)
+- **Cooperative cancel** — cancel flag file works across `pkexec` / UAC elevation boundaries
+- **Privilege diagnostics** — live badge (root / polkit / UAC / unprivileged) from startup checks
+- **Light / dark themes** with persisted preference
+- **Linux:** AppImage, `.deb`, `.rpm` bundles; Wayland compatibility hook for Hyprland and similar compositors
+- **Windows:** MSI/NSIS installers; UAC handoff relaunches the app elevated so litho stdout pipes correctly
+
+## Architecture
+
+```
+Lithographer (user session)
+  ├─ liblitho in-process  → device list, validation, optimal block size
+  └─ litho sidecar        → pkexec / direct (Linux) or piped child (Windows)
+        └─ litho -o gui flash|clone … --cancel-file <path> [--verify]
+```
+
+**Linux elevation:** `pkexec litho …` by default. On AppImage, `litho` is copied to `$TMPDIR/lithographer-litho-<pid>` first because `pkexec` cannot execute binaries inside the FUSE mount. The staged copy is removed when the app exits.
+
+**Windows elevation:** Lithographer relaunches itself via UAC (`--auto-run …`) so `litho.exe` runs as a hidden piped child inside the elevated GUI process (elevating litho directly would break stdout capture).
+
+**Cancel across elevation:** stdin and parent signals do not reliably reach a `pkexec` child. Lithographer creates `~/.cache/litho/cancel-<pid>-<ts>.flag`, passes `--cancel-file` to litho, and writes `cancel` into the file on user cancel. Litho polls the file every ~50 ms.
+
+## Requirements
+
+### Linux
+
+- [Tauri 2 prerequisites](https://tauri.app/start/prerequisites/) (`webkit2gtk-4.1`, etc.)
+- `pkexec` (polkit) for unprivileged flash/clone
+- On **Fedora GNOME**: polkit auth is built into `gnome-shell` (the retired `polkit-gnome-authentication-agent-1` package is not required)
+
+### Windows
+
+- [Tauri 2 prerequisites](https://tauri.app/start/prerequisites/) (WebView2, Visual Studio Build Tools)
+- OpenSSL (CI uses the runner pre-install at `C:\Program Files\OpenSSL`)
+- Administrator approval via UAC for flash/clone
+
+## Repository layout
+
+Clone **lithographer** and its sibling dependency **litho** (required for `liblitho` and the bundled sidecar):
+
+```bash
+git clone https://github.com/girish946/lithographer.git
+git clone --branch windows-implementation https://github.com/girish946/litho.git
+```
+
+The repos must sit side by side (`…/litho` next to `…/lithographer`). GitHub Actions checks out `litho` from the `windows-implementation` branch the same way.
+
 ## Build
 
-### Prerequisites
+```bash
+cd lithographer
+npm install
+npm run tauri:build
+```
 
-As of now lithographer only supports building for Linux. You need to have the [Prerequisites for tauri](https://tauri.app/v1/guides/getting-started/prerequisites/) installed on the system.
+### npm scripts
 
+| Script | Description |
+|--------|-------------|
+| `npm run tauri:dev` | Prepare sidecar + `tauri dev` |
+| `npm run tauri:build` | Prepare sidecar + `tauri build` + post-build AppImage Wayland patch |
+| `npm run prepare-sidecar` | Build `litho` with `real-io` into `src-tauri/binaries/` |
+| `npm run vendor-assets` | Bundle frontend fonts/CSS locally (offline-friendly) |
+| `npm run generate-icons` | Regenerate app icons from source artwork |
+
+The sidecar build (`src-tauri/scripts/prepare-litho-sidecar.sh`) runs:
 
 ```bash
-$ git clone https://github.com/girish946/lithographer.git
-$ cd lithographer
-$ cargo tauri build -b appimage
+cargo build --release --no-default-features --features real-io --bin litho
 ```
 
+### Build outputs
+
+| Platform | Artifacts |
+|----------|-----------|
+| Linux | `src-tauri/target/release/bundle/appimage/lithographer_*_amd64.AppImage` |
+| Linux | `src-tauri/target/release/bundle/deb/*.deb`, `rpm/*.rpm` |
+| Windows | `src-tauri/target/release/bundle/msi/*.msi`, `nsis/*.exe` |
+
 ## Usage
+
+### Linux
+
 ```bash
-$ ./src-tauri/target/release/bundle/appimage/lithographer_0.0.1_amd64.AppImage
+./src-tauri/target/release/bundle/appimage/lithographer_0.1.0_amd64.AppImage
 ```
 
-<img src="src/assets/lithographer-window.png"></img>
+The AppImage includes a post-build Wayland compatibility hook (`src-tauri/scripts/patch-appimage-wayland.sh` injects `src-tauri/appimage/apprun-wayland-compat.sh`). On some setups the `.deb` package is more reliable because it uses system WebKitGTK.
+
+### Windows
+
+Run the MSI/NSIS installer output, or during development:
+
+```bash
+npm run tauri:dev
+```
+
+### Privilege elevation options (Linux)
+
+| Method | Auth UI | When to use |
+|--------|---------|-------------|
+| **`pkexec` (default)** | GNOME Shell / polkit dialog (password, fingerprint) | Normal Fedora/Ubuntu GNOME sessions |
+| **`LITHOGRAPHER_ELEVATION=sudo`** | Graphical `sudo` askpass (`SUDO_ASKPASS`, `ksshaskpass`, `zenity`, …) | Polkit misbehaving |
+| **`LITHOGRAPHER_ELEVATION=run0`** | Polkit via systemd | Fedora 41+ with `run0` on PATH |
+| **Run app elevated** | One prompt at startup | `sudo ./lithographer*.AppImage` — litho spawns directly, no per-operation `pkexec` |
+
+```bash
+# Polkit path (default)
+./lithographer_0.1.0_amd64.AppImage
+
+# sudo askpass fallback
+LITHOGRAPHER_ELEVATION=sudo ./lithographer_0.1.0_amd64.AppImage
+
+# Whole session elevated
+sudo ./lithographer_0.1.0_amd64.AppImage
+```
+
+### Privilege elevation (Windows)
+
+When you start flash/clone without Administrator rights, Lithographer prompts for UAC and relaunches with `--auto-run` so progress streams in the elevated window. The original unprivileged window exits after handoff.
+
+## Development
+
+```bash
+# One-time: build litho sidecar
+npm run prepare-sidecar
+
+# Dev loop (hot reload)
+npm run tauri:dev
+```
+
+After changing litho CLI protocol or cancel behaviour, rebuild the sidecar before testing Lithographer:
+
+```bash
+npm run prepare-sidecar
+```
+
+### Startup diagnostics
+
+The privilege badge and `get_startup_diagnostics` Tauri command report:
+
+- elevated vs unprivileged state
+- elevation backend (`pkexec`, `sudo -A`, `run0`, `uac`)
+- polkit agent or `gnome-shell (built-in polkit)` on Fedora GNOME
+- preview of the litho spawn command
+
+## CI
+
+GitHub Actions (`.github/workflows/build.yaml`):
+
+- **ubuntu-22.04** — AppImage, `.deb`, `.rpm`
+- **windows-latest** — MSI and NSIS (OpenSSL + vcpkg `liblzma` for the litho sidecar)
+
+Both jobs clone `litho` from the `windows-implementation` branch.
+
+## Screenshots
+
+<img src="src/assets/lithographer-window.png" alt="Lithographer main window">
+
+## Safety
+
+- Always double-check the target device. Flashing the wrong disk destroys data.
+- Prefer removable USB drives for flash targets.
+- Device validation (system disk, mounts, partition paths) runs in litho before any write.
+
+## Related
+
+- [litho](https://github.com/girish946/litho) — CLI, library, and `litho-tui`
+
+## License
+
+See `src-tauri/Cargo.toml`.