From 60f56367dfc1e3c5095d034bed4fb4f572e32b55 Mon Sep 17 00:00:00 2001 From: Adam Malczewski Date: Wed, 27 May 2026 23:17:18 +0900 Subject: refactor(packaging): split into dispatch/dispatch-systemd/dispatch-s6, separate dispatch-electron, add bun-based frontend serve PKGBUILD is now a split package producing three .pkg.tar.zst files in one makepkg run: - dispatch base application files (/opt/dispatch), CLI wrappers (dispatch-api, dispatch-frontend), env configs (/etc/dispatch/dispatch-api.conf, /etc/dispatch/dispatch-frontend.conf) - dispatch-systemd systemd user units for dispatch-api + dispatch-frontend (conflicts with dispatch-s6) - dispatch-s6 s6-rc service pipelines (-srv + -log) for both services (conflicts with dispatch-systemd) The Electron desktop wrapper moved to its own self-contained PKGBUILD at packaging/electron/, producing dispatch-electron. It bundles its own copy of the frontend dist + electron entry points under /opt/dispatch-electron and does not depend on the base dispatch package, so users can install it standalone and point VITE_API_URL at any backend at build time. Files under packaging/ are now read directly from ${_projectdir}/packaging/ rather than via source=(); the two s6 service dirs share basenames (run, type) which would collide inside ${srcdir}. New frontend static server: packages/frontend/serve.ts uses Bun's built-in HTTP server (no extra runtime deps) with SPA fallback to index.html and path-traversal protection. PORT/HOST/DIST_DIR overridable via env. Exposed as 'bun run --cwd packages/frontend serve' and via /usr/bin/dispatch-frontend. Build scripts: - bin/build-pkg now prints the freshest built packages - bin/install-pkg installs dispatch + dispatch-systemd by default; accepts package names or --all; searches both packaging/ and packaging/electron/ - bin/build-pkg-electron new, builds the electron split - bin/build-pkg-windows replaces bin/windows-pkg; drops the hard-coded WSL copy step, just prints the win-unpacked path .gitignore extended to cover packaging/*.tar.zst and packaging/electron/{src,pkg,*.pkg.tar.zst,*.tar.zst}. --- bin/windows-pkg | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100755 bin/windows-pkg (limited to 'bin/windows-pkg') diff --git a/bin/windows-pkg b/bin/windows-pkg deleted file mode 100755 index 693168c..0000000 --- a/bin/windows-pkg +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -PROJECT_DIR="$(dirname "$SCRIPT_DIR")" -FRONTEND_DIR="$PROJECT_DIR/packages/frontend" -DEST="/mnt/c/Users/micro/OneDrive/Documents/Dispatch" - -# Install deps (includes electron + electron-builder as devDependencies) -cd "$PROJECT_DIR" -bun install - -# Build frontend and package for Windows (use production port) -cd "$FRONTEND_DIR" -VITE_API_URL="http://localhost:18390" bun run dist:win - -# Find the output directory -WIN_BUILD=$(ls -d "$FRONTEND_DIR/release/win-unpacked" 2>/dev/null || true) - -if [ -z "$WIN_BUILD" ]; then - echo "Build failed: no win-unpacked directory found in release/" >&2 - exit 1 -fi - -# Copy to Windows Documents -rm -rf "$DEST" -mkdir -p "$DEST" -cp -r "$WIN_BUILD"/. "$DEST"/ - -echo "Windows build copied to: C:\\Users\\micro\\OneDrive\\Documents\\Dispatch" -echo "Run Dispatch.exe from that folder." -- cgit v1.2.3