Feat: Bundle Suwayomi JRE for Windows/Linux

.github/workflows/build-linux.yml

@@ -0,0 +1,177 @@
+name: Build Linux
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version to build (e.g. 0.4.0)"
+        required: true
+
+jobs:
+  frontend:
+    name: Build frontend
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: latest
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build
+        run: pnpm build
+
+      - name: Upload dist
+        uses: actions/upload-artifact@v4
+        with:
+          name: frontend-dist-linux
+          path: dist/
+          retention-days: 1
+
+  tauri:
+    name: Tauri (Linux x64)
+    needs: frontend
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download frontend dist
+        uses: actions/download-artifact@v4
+        with:
+          name: frontend-dist-linux
+          path: dist/
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libwebkit2gtk-4.1-dev \
+            libgtk-3-dev \
+            libayatana-appindicator3-dev \
+            librsvg2-dev \
+            patchelf
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: x86_64-unknown-linux-gnu
+
+      - name: Rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: src-tauri
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: latest
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: pnpm
+
+      - name: Install JS dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Download Suwayomi (Linux x64)
+        run: |
+          curl -fsSL \
+            "https://github.com/Suwayomi/Suwayomi-Server/releases/download/v2.1.1867/Suwayomi-Server-v2.1.1867-linux-x64.tar.gz" \
+            -o suwayomi-linux.tar.gz
+
+          echo "b2344bd73c4e26bede63cdb4b44b1b4168d8a8500b3b2b1a0219519a3ef708fe  suwayomi-linux.tar.gz" | sha256sum -c -
+
+          mkdir -p suwayomi-extracted
+          tar -xzf suwayomi-linux.tar.gz -C suwayomi-extracted --strip-components=1
+
+          echo "Extracted bundle contents (top-level):"
+          ls -la suwayomi-extracted/
+
+      - name: Stage Suwayomi bundle
+        run: |
+          mkdir -p src-tauri/binaries
+
+          JAVA=$(find suwayomi-extracted -path "*/jre/bin/java" | head -1)
+          JAR=$(find suwayomi-extracted -name "Suwayomi-Launcher.jar" | head -1)
+
+          if [ -z "$JAVA" ]; then
+            echo "ERROR: jre/bin/java not found. Bundle contents:"
+            find suwayomi-extracted -type f | head -50
+            exit 1
+          fi
+
+          if [ -z "$JAR" ]; then
+            echo "ERROR: Suwayomi-Launcher.jar not found. Bundle contents:"
+            find suwayomi-extracted -type f | head -50
+            exit 1
+          fi
+
+          echo "Found java: $JAVA"
+          echo "Found jar:  $JAR"
+
+          # Copy full bundle as resources so jar + jre tree are available
+          # at runtime via resource_dir/suwayomi-bundle/.
+          cp -r suwayomi-extracted src-tauri/binaries/suwayomi-bundle
+
+      - name: Validate staging
+        run: |
+          echo "--- Validating bundle java ---"
+          find src-tauri/binaries/suwayomi-bundle -path "*/jre/bin/java" \
+            | grep -q . \
+            || (echo "ERROR: jre/bin/java missing" && exit 1)
+
+          echo "--- Validating bundle jar ---"
+          find src-tauri/binaries/suwayomi-bundle -name "Suwayomi-Launcher.jar" \
+            | grep -q . \
+            || (echo "ERROR: Suwayomi-Launcher.jar missing" && exit 1)
+
+          echo "Staging OK"
+
+      - name: Patch tauri.conf.json for CI
+        run: |
+          # Suppress the frontend rebuild (dist/ already built by frontend job).
+          sed -i 's/"beforeBuildCommand": "pnpm build"/"beforeBuildCommand": ""/' src-tauri/tauri.conf.json
+
+          # Remove externalBin entirely for Linux — we use bundled resources,
+          # no sidecar registration needed.
+          # Inject the suwayomi-bundle resource glob.
+          python3 - << 'PYEOF'
+import json
+with open("src-tauri/tauri.conf.json") as f:
+    conf = json.load(f)
+conf["bundle"]["resources"] = ["binaries/suwayomi-bundle/**"]
+conf["bundle"]["externalBin"] = []
+with open("src-tauri/tauri.conf.json", "w") as f:
+    json.dump(conf, f, indent=2)
+print("tauri.conf.json patched — resources injected, externalBin cleared")
+PYEOF
+
+      - name: Build Tauri app (Linux x64)
+        uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: --target x86_64-unknown-linux-gnu
+
+      - name: Upload AppImage
+        uses: actions/upload-artifact@v4
+        with:
+          name: moku-linux-x64-appimage
+          path: src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage/*.AppImage
+          retention-days: 7
+
+      - name: Upload .deb
+        uses: actions/upload-artifact@v4
+        with:
+          name: moku-linux-x64-deb
+          path: src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb
+          retention-days: 7

.github/workflows/build-windows.yml

@@ -83,49 +83,85 @@ jobs:
 
           unzip -q suwayomi-windows.zip -d suwayomi-raw
 
-          TOP_DIRS=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type d)
-          TOP_FILES=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type f)
-          TOP_DIR_COUNT=$(echo "$TOP_DIRS" | grep -c . || true)
-
+      - name: Extract Suwayomi bundle
+        shell: bash
+        run: |
           mkdir -p suwayomi-extracted
-          if [ "$TOP_DIR_COUNT" -eq 1 ] && [ -z "$TOP_FILES" ]; then
-            mv "$TOP_DIRS"/* suwayomi-extracted/
+
+          # Handle both zip layouts: single top-level dir, or files at root
+          TOP_DIRS=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type d | wc -l)
+          TOP_FILES=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type f | wc -l)
+
+          if [ "$TOP_DIRS" -eq 1 ] && [ "$TOP_FILES" -eq 0 ]; then
+            INNER=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type d | head -1)
+            cp -r "$INNER"/. suwayomi-extracted/
           else
-            mv suwayomi-raw/* suwayomi-extracted/
+            cp -r suwayomi-raw/. suwayomi-extracted/
           fi
 
+          echo "Extracted bundle contents (top-level):"
+          ls -la suwayomi-extracted/
+
       - name: Stage Suwayomi bundle
         shell: bash
         run: |
           mkdir -p src-tauri/binaries
 
           JAVAW=$(find suwayomi-extracted -path "*/jre/bin/javaw.exe" | head -1)
+          JAR=$(find suwayomi-extracted -name "Suwayomi-Launcher.jar" | head -1)
 
           if [ -z "$JAVAW" ]; then
-            echo "ERROR: could not find jre/bin/javaw.exe — bundle contents:"
-            find suwayomi-extracted -type f | head -40
+            echo "ERROR: jre/bin/javaw.exe not found. Bundle contents:"
+            find suwayomi-extracted -type f | head -50
+            exit 1
+          fi
+
+          if [ -z "$JAR" ]; then
+            echo "ERROR: Suwayomi-Launcher.jar not found. Bundle contents:"
+            find suwayomi-extracted -type f | head -50
             exit 1
           fi
 
           echo "Found javaw: $JAVAW"
+          echo "Found jar:   $JAR"
 
-          # Copy full bundle so jar + jre tree are available at runtime.
-          # lib.rs looks for suwayomi-bundle/jre/bin/javaw.exe in the resource dir.
+          # Copy full bundle as resources — lib.rs invokes the bundled
+          # java directly via resource_dir/suwayomi-bundle/jre/bin/javaw.exe.
           cp -r suwayomi-extracted src-tauri/binaries/suwayomi-bundle
 
+      - name: Validate staging
+        shell: bash
+        run: |
+          echo "--- Validating bundle javaw ---"
+          find src-tauri/binaries/suwayomi-bundle -path "*/jre/bin/javaw.exe" \
+            | grep -q . \
+            || (echo "ERROR: jre/bin/javaw.exe missing" && exit 1)
+
+          echo "--- Validating bundle jar ---"
+          find src-tauri/binaries/suwayomi-bundle -name "Suwayomi-Launcher.jar" \
+            | grep -q . \
+            || (echo "ERROR: Suwayomi-Launcher.jar missing" && exit 1)
+
+          echo "Staging OK"
+
       - name: Patch tauri.conf.json for CI
         shell: bash
         run: |
+          # Suppress the frontend rebuild (dist/ already built by frontend job).
           sed -i 's/"beforeBuildCommand": "pnpm build"/"beforeBuildCommand": ""/' src-tauri/tauri.conf.json
-          # Inject the suwayomi-bundle resource so Tauri bundles it with the app.
-          # Done here (after staging) so the path exists when Tauri validates it.
+
+          # Remove externalBin entirely for Windows — we invoke the bundled
+          # javaw directly as a raw path, no sidecar registration needed.
+          # Inject the suwayomi-bundle resource glob.
           python3 - << 'PYEOF'
 import json
 with open("src-tauri/tauri.conf.json") as f:
     conf = json.load(f)
 conf["bundle"]["resources"] = ["binaries/suwayomi-bundle/**"]
+conf["bundle"]["externalBin"] = []
 with open("src-tauri/tauri.conf.json", "w") as f:
     json.dump(conf, f, indent=2)
+print("tauri.conf.json patched — resources injected, externalBin cleared")
 PYEOF
 
       - name: Build Tauri app (Windows x64)