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}. --- packaging/dispatch-frontend-wrapper.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 packaging/dispatch-frontend-wrapper.sh (limited to 'packaging/dispatch-frontend-wrapper.sh') diff --git a/packaging/dispatch-frontend-wrapper.sh b/packaging/dispatch-frontend-wrapper.sh new file mode 100755 index 0000000..06aa9b0 --- /dev/null +++ b/packaging/dispatch-frontend-wrapper.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# dispatch-frontend-wrapper.sh +# Wrapper script for running the Dispatch Frontend static-file server +# outside of systemd / s6. +# Install to /usr/bin/dispatch-frontend (chmod 755). +# +# Usage: +# dispatch-frontend # runs the server, inheriting the current environment +# dispatch-frontend --help # passes flags through to bun + +set -euo pipefail + +DISPATCH_CONF="/etc/dispatch/dispatch-frontend.conf" +DISPATCH_DIR="/opt/dispatch" +BUN="/usr/bin/bun" +ENTRY_POINT="packages/frontend/serve.ts" + +# Source the environment file if it exists +if [[ -f "$DISPATCH_CONF" ]]; then + set -o allexport + # shellcheck source=/etc/dispatch/dispatch-frontend.conf + source "$DISPATCH_CONF" + set +o allexport +fi + +# Change to the application directory +cd "$DISPATCH_DIR" + +# Hand off to bun — exec replaces this process so signals are forwarded correctly +exec "$BUN" "$ENTRY_POINT" "$@" -- cgit v1.2.3