ac-electron + arena: xbox controller in webview, A/space respawn, ac-desktop CLI

+348

ac-electron/ac-desktop

··· 1 + #!/usr/bin/env bash 2 + # ac-desktop — Single command for the Aesthetic Computer Electron app. 3 + # 4 + # Usage: 5 + # ac-desktop dev [--prod] [--watch] [--shell] Run locally with hot tools 6 + # ac-desktop test Quick local launch (no build) 7 + # ac-desktop build [--mac|--win|--linux|--all] Build distributable artifacts 8 + # ac-desktop install [--force] [--version=X.Y.Z] Download + install latest published DMG 9 + # ac-desktop reinstall Build local + replace /Applications copy 10 + # ac-desktop release [patch|minor|major|X.Y.Z] Bump version + tag (no push) 11 + # ac-desktop publish Build, sign, notarize, upload to releases.aesthetic.computer 12 + # ac-desktop status Show local / installed / published versions side-by-side 13 + # ac-desktop monitor [--interval=SECS] Poll the release feed and announce new versions 14 + # ac-desktop logs Tail the running app's stderr 15 + # ac-desktop open Launch the installed app 16 + # ac-desktop kill Quit running instances 17 + # ac-desktop icons Regenerate tray + app icons 18 + # ac-desktop doctor Check signing creds, electron, dist, installed app 19 + # 20 + # Subcommands delegate to existing scripts (dev.fish, install.fish, release.fish, 21 + # build-all-platforms.fish, scripts/build-publish-host-mac.sh) so behavior stays 22 + # in one place. Run `ac-desktop` with no args (or `--help`) to see this list. 23 + 24 + set -e 25 + 26 + # Resolve symlinks so SCRIPT_DIR points at the real ac-electron/ even when 27 + # this script is invoked through ~/.local/bin/ac-desktop or similar. 28 + _self="$0" 29 + while [ -L "${_self}" ]; do 30 + _link="$(readlink "${_self}")" 31 + case "${_link}" in 32 + /*) _self="${_link}" ;; 33 + *) _self="$(cd "$(dirname "${_self}")" && pwd)/${_link}" ;; 34 + esac 35 + done 36 + SCRIPT_DIR="$(cd "$(dirname "${_self}")" && pwd)" 37 + APP_NAME="Aesthetic.Computer.app" 38 + INSTALLED_APP="/Applications/${APP_NAME}" 39 + RELEASES_URL="https://releases.aesthetic.computer/desktop" 40 + 41 + # Colors 42 + if [ -t 1 ]; then 43 + C="\033[0;36m"; G="\033[0;32m"; Y="\033[0;33m"; R="\033[0;31m"; M="\033[0;35m"; D="\033[2m"; N="\033[0m" 44 + else 45 + C=""; G=""; Y=""; R=""; M=""; D=""; N="" 46 + fi 47 + 48 + log() { printf "${C}[ac-desktop]${N} %s\n" "$*"; } 49 + ok() { printf "${G}✓${N} %s\n" "$*"; } 50 + warn() { printf "${Y}…${N} %s\n" "$*"; } 51 + err() { printf "${R}✗${N} %s\n" "$*" >&2; } 52 + hdr() { printf "\n${M}━━━ %s ━━━${N}\n" "$*"; } 53 + 54 + CMD="${1:-help}" 55 + shift || true 56 + 57 + # ------------------------------------------------------------ helpers 58 + 59 + usage() { 60 + sed -n 's/^# \{0,1\}//;3,/^$/p' "$0" | head -40 61 + } 62 + 63 + local_version() { 64 + node -p "require('${SCRIPT_DIR}/package.json').version" 2>/dev/null || echo "?" 65 + } 66 + 67 + installed_version() { 68 + if [ -f "${INSTALLED_APP}/Contents/Info.plist" ]; then 69 + defaults read "${INSTALLED_APP}/Contents/Info.plist" CFBundleShortVersionString 2>/dev/null || echo "?" 70 + else 71 + echo "(not installed)" 72 + fi 73 + } 74 + 75 + published_version() { 76 + curl -fsSL "${RELEASES_URL}/latest-mac.yml" 2>/dev/null \ 77 + | awk '/^version:/ {print $2; exit}' \ 78 + | tr -d '\r"' 79 + } 80 + 81 + require_mac() { 82 + if [ "$(uname)" != "Darwin" ]; then 83 + err "This subcommand requires macOS (host is $(uname))" 84 + exit 1 85 + fi 86 + } 87 + 88 + cd_repo() { cd "${SCRIPT_DIR}"; } 89 + 90 + # ------------------------------------------------------------ subcommands 91 + 92 + cmd_help() { usage; } 93 + 94 + cmd_dev() { 95 + cd_repo 96 + log "Delegating to dev.fish $*" 97 + exec fish ./dev.fish "$@" 98 + } 99 + 100 + cmd_test() { 101 + cd_repo 102 + require_mac 103 + log "Quick local launch (electron .)" 104 + exec npm start 105 + } 106 + 107 + cmd_build() { 108 + cd_repo 109 + local target="--mac" 110 + for arg in "$@"; do 111 + case "$arg" in 112 + --mac|--win|--linux|--all) target="$arg" ;; 113 + esac 114 + done 115 + case "$target" in 116 + --mac) 117 + require_mac 118 + log "Building macOS DMG (universal)…" 119 + npm run build:mac 120 + ;; 121 + --win) 122 + log "Building Windows installer…" 123 + npm run build:win 124 + ;; 125 + --linux) 126 + log "Building Linux packages…" 127 + npm run build:linux 128 + ;; 129 + --all) 130 + log "Cross-platform build (delegating to build-all-platforms.fish)…" 131 + exec fish ./build-all-platforms.fish 132 + ;; 133 + esac 134 + ok "Build complete — see ${SCRIPT_DIR}/dist/" 135 + ls -1 dist/ 2>/dev/null | head -10 || true 136 + } 137 + 138 + cmd_install() { 139 + require_mac 140 + cd_repo 141 + log "Delegating to install.fish $*" 142 + exec fish ./install.fish "$@" 143 + } 144 + 145 + cmd_reinstall() { 146 + require_mac 147 + cd_repo 148 + hdr "REINSTALL — build local + replace ${INSTALLED_APP}" 149 + 150 + log "Quitting any running instances…" 151 + osascript -e 'tell application "Aesthetic.Computer" to quit' >/dev/null 2>&1 || true 152 + pkill -f "Aesthetic.Computer" 2>/dev/null || true 153 + sleep 0.5 154 + 155 + # Local reinstall path: build the .app but skip notarization (which needs 156 + # Apple's notary service over the network) — we strip quarantine ourselves 157 + # below so Gatekeeper still opens it cleanly. Use `ac-desktop publish` for 158 + # the full signed+notarized release. 159 + log "Building macOS app (notarization skipped for local install)…" 160 + npx electron-builder --mac --universal -c.mac.notarize=false 161 + 162 + # Locate the built .app — universal target writes to dist/mac-universal/. 163 + local built_app 164 + for candidate in "dist/mac-universal/${APP_NAME}" "dist/mac/${APP_NAME}" "dist/mac-arm64/${APP_NAME}" "dist/mac-x64/${APP_NAME}"; do 165 + if [ -d "${SCRIPT_DIR}/${candidate}" ]; then 166 + built_app="${SCRIPT_DIR}/${candidate}" 167 + break 168 + fi 169 + done 170 + if [ -z "${built_app}" ]; then 171 + err "Could not find the built .app under dist/ — looked in mac-universal, mac, mac-arm64, mac-x64" 172 + ls -1 dist/ 2>/dev/null 173 + exit 1 174 + fi 175 + log "Built bundle: ${built_app}" 176 + 177 + if [ -d "${INSTALLED_APP}" ]; then 178 + log "Removing old installation…" 179 + rm -rf "${INSTALLED_APP}" 180 + fi 181 + 182 + log "Copying to /Applications…" 183 + cp -R "${built_app}" "${INSTALLED_APP}" 184 + xattr -dr com.apple.quarantine "${INSTALLED_APP}" 2>/dev/null || true 185 + 186 + ok "Reinstalled $(installed_version) → ${INSTALLED_APP}" 187 + log "Launching…" 188 + open "${INSTALLED_APP}" 189 + } 190 + 191 + cmd_release() { 192 + cd_repo 193 + log "Delegating to release.fish $*" 194 + exec fish ./release.fish "$@" 195 + } 196 + 197 + cmd_publish() { 198 + require_mac 199 + cd_repo 200 + hdr "PUBLISH — sign + notarize + upload to releases.aesthetic.computer" 201 + log "Local version: $(local_version)" 202 + log "Currently published: $(published_version || echo "?")" 203 + log "Running npm run publish:mac (electron-builder --publish always)…" 204 + npm run publish:mac 205 + ok "Publish kicked off — verify with: ac-desktop status" 206 + } 207 + 208 + cmd_status() { 209 + local lv iv pv 210 + lv=$(local_version) 211 + iv=$(installed_version) 212 + pv=$(published_version) 213 + [ -z "${pv}" ] && pv="(unreachable)" 214 + hdr "STATUS" 215 + printf " ${D}local source ${N}: %s\n" "${lv}" 216 + printf " ${D}installed app${N}: %s\n" "${iv}" 217 + printf " ${D}published ${N}: %s\n" "${pv}" 218 + echo "" 219 + if [ "${lv}" = "${iv}" ] && [ "${lv}" = "${pv}" ]; then 220 + ok "All three versions match" 221 + else 222 + if [ "${lv}" != "${pv}" ]; then 223 + warn "local source (${lv}) differs from published (${pv}) — run 'ac-desktop publish' to ship" 224 + fi 225 + if [ "${iv}" != "${pv}" ] && [ "${iv}" != "(not installed)" ]; then 226 + warn "installed (${iv}) differs from published (${pv}) — run 'ac-desktop install' to update" 227 + fi 228 + if [ "${iv}" = "(not installed)" ]; then 229 + warn "no app in /Applications — run 'ac-desktop install' (published) or 'ac-desktop reinstall' (local build)" 230 + fi 231 + fi 232 + } 233 + 234 + cmd_monitor() { 235 + local interval=30 236 + for arg in "$@"; do 237 + case "$arg" in 238 + --interval=*) interval="${arg#--interval=}" ;; 239 + esac 240 + done 241 + log "Polling ${RELEASES_URL}/latest-mac.yml every ${interval}s. Ctrl-C to stop." 242 + local last="" 243 + while true; do 244 + local cur 245 + cur=$(published_version || echo "") 246 + if [ -n "${cur}" ] && [ "${cur}" != "${last}" ]; then 247 + if [ -z "${last}" ]; then 248 + log "Current published version: ${G}${cur}${N}" 249 + else 250 + ok "New published version: ${last} → ${G}${cur}${N} 🎉" 251 + fi 252 + last="${cur}" 253 + fi 254 + sleep "${interval}" 255 + done 256 + } 257 + 258 + cmd_logs() { 259 + require_mac 260 + log "Tailing macOS unified log for Aesthetic.Computer (Ctrl-C to stop)" 261 + exec log stream --predicate 'process == "Aesthetic.Computer" OR process == "Aesthetic.Computer Helper"' --style compact 262 + } 263 + 264 + cmd_open() { 265 + require_mac 266 + if [ ! -d "${INSTALLED_APP}" ]; then 267 + err "Not installed. Try: ac-desktop install" 268 + exit 1 269 + fi 270 + log "Launching ${INSTALLED_APP}" 271 + open "${INSTALLED_APP}" 272 + } 273 + 274 + cmd_kill() { 275 + require_mac 276 + log "Quitting running instances…" 277 + osascript -e 'tell application "Aesthetic.Computer" to quit' >/dev/null 2>&1 || true 278 + pkill -f "Aesthetic.Computer" 2>/dev/null || true 279 + sleep 0.3 280 + if pgrep -f "Aesthetic.Computer" >/dev/null 2>&1; then 281 + warn "Still running — forcing" 282 + pkill -9 -f "Aesthetic.Computer" 2>/dev/null || true 283 + fi 284 + ok "All instances stopped" 285 + } 286 + 287 + cmd_icons() { 288 + cd_repo 289 + log "Regenerating icons…" 290 + npm run icons 291 + ok "Icons rebuilt under build/icons/" 292 + } 293 + 294 + cmd_doctor() { 295 + cd_repo 296 + hdr "DOCTOR" 297 + 298 + # Node + npm 299 + if command -v node >/dev/null; then ok "node $(node --version)"; else err "node missing"; fi 300 + if command -v npm >/dev/null; then ok "npm $(npm --version)"; else err "npm missing"; fi 301 + if command -v fish >/dev/null; then ok "fish $(fish --version | head -1)"; else warn "fish missing — dev.fish/install.fish/release.fish won't run"; fi 302 + 303 + # Local Electron install 304 + if [ -f "${SCRIPT_DIR}/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron" ] \ 305 + || [ -f "${SCRIPT_DIR}/node_modules/electron/dist/electron" ]; then 306 + ok "electron installed in node_modules" 307 + else 308 + warn "electron not in node_modules — run: cd ${SCRIPT_DIR} && npm install" 309 + fi 310 + 311 + # Vault (signing creds) 312 + local vault="${SCRIPT_DIR}/../aesthetic-computer-vault/ac-electron" 313 + if [ -d "${vault}" ]; then 314 + ok "vault present at ${vault}" 315 + [ -f "${vault}/.env" ] && ok "vault .env present" || warn "vault .env missing — signed builds may fail" 316 + else 317 + warn "vault dir missing (${vault}) — signed/published builds need it" 318 + fi 319 + 320 + # Versions 321 + cmd_status 322 + } 323 + 324 + # ------------------------------------------------------------ dispatch 325 + 326 + case "${CMD}" in 327 + help|-h|--help|"") cmd_help ;; 328 + dev) cmd_dev "$@" ;; 329 + test|run) cmd_test "$@" ;; 330 + build) cmd_build "$@" ;; 331 + install) cmd_install "$@" ;; 332 + reinstall|rebuild) cmd_reinstall "$@" ;; 333 + release|bump) cmd_release "$@" ;; 334 + publish|ship) cmd_publish "$@" ;; 335 + status|st) cmd_status "$@" ;; 336 + monitor|watch) cmd_monitor "$@" ;; 337 + logs|log) cmd_logs "$@" ;; 338 + open|launch) cmd_open "$@" ;; 339 + kill|stop|quit) cmd_kill "$@" ;; 340 + icons) cmd_icons "$@" ;; 341 + doctor|check) cmd_doctor "$@" ;; 342 + *) 343 + err "Unknown subcommand: ${CMD}" 344 + echo "" 345 + cmd_help 346 + exit 1 347 + ;; 348 + esac

+44

ac-electron/flip-view.html

··· 954 954 webviewEl.src = url; 955 955 } 956 956 }); 957 + 958 + // 🎮 Gamepad bridge — host → guest. 959 + // Inside an Electron <webview>, navigator.getGamepads() in the guest 960 + // renderer often stays empty (the guest doesn't reliably receive the 961 + // user activation Chromium gates the API behind). Poll at the host, 962 + // which has activation as soon as the BrowserWindow is interacted 963 + // with, and forward a snapshot to the webview where webview-preload 964 + // surfaces it via a patched navigator.getGamepads. 965 + (function setupGamepadBridge() { 966 + let lastSig = ''; 967 + let logged = false; 968 + setInterval(() => { 969 + if (!webviewEl || !webviewReady) return; 970 + const pads = navigator.getGamepads ? navigator.getGamepads() : []; 971 + const snapshot = []; 972 + let any = false; 973 + for (let i = 0; i < pads.length; i++) { 974 + const g = pads[i]; 975 + if (!g) { snapshot.push(null); continue; } 976 + any = true; 977 + snapshot.push({ 978 + index: g.index, 979 + id: g.id, 980 + connected: g.connected, 981 + timestamp: g.timestamp, 982 + mapping: g.mapping, 983 + axes: Array.from(g.axes), 984 + buttons: Array.from(g.buttons).map((b) => ({ 985 + pressed: b.pressed, 986 + touched: b.touched, 987 + value: b.value, 988 + })), 989 + }); 990 + } 991 + const sig = JSON.stringify(snapshot); 992 + if (sig === lastSig) return; 993 + lastSig = sig; 994 + if (any && !logged) { 995 + console.log('[flip] gamepad bridge: forwarding host pad to webview', snapshot.find(Boolean)?.id); 996 + logged = true; 997 + } 998 + try { webviewEl.send('ac:gamepad-state', snapshot); } catch (_) {} 999 + }, 16); 1000 + })(); 957 1001 958 1002 // Also try did-create-window (Electron 22+) 959 1003 webviewEl.addEventListener('did-create-window', (e) => {

+67

ac-electron/webview-preload.js

··· 40 40 window.dispatchEvent(new CustomEvent('usb:flash-progress', { detail: data })); 41 41 }); 42 42 43 + // 🎮 Gamepad host → guest bridge. 44 + // Inside Electron <webview>, navigator.getGamepads() in the guest is often 45 + // empty because the guest renderer doesn't reliably receive the user 46 + // activation Chromium gates the Gamepad API behind. The host 47 + // (flip-view.html) polls navigator.getGamepads() — which works there once 48 + // the BrowserWindow has activation — and forwards a snapshot to us via 49 + // the 'ac:gamepad-state' IPC channel. We patch navigator.getGamepads here 50 + // so that lib/gamepad.mjs (which polls 8ms in the page's main world) sees 51 + // the controller via the host. We also synthesize gamepadconnected / 52 + // gamepaddisconnected events so listeners that wait for those see the pad. 53 + (function () { 54 + let hostPads = []; 55 + const seen = new Map(); // index → last connected timestamp 56 + 57 + ipcRenderer.on('ac:gamepad-state', (_e, snapshot) => { 58 + hostPads = (snapshot || []).map((p) => { 59 + if (!p) return null; 60 + // Reshape to look like a real Gamepad to consumers (incl. lib/gamepad.mjs). 61 + return { 62 + index: p.index, 63 + id: p.id, 64 + connected: p.connected, 65 + timestamp: p.timestamp, 66 + mapping: p.mapping || 'standard', 67 + axes: p.axes || [], 68 + buttons: (p.buttons || []).map((b) => ({ 69 + pressed: !!b.pressed, 70 + touched: !!b.touched, 71 + value: typeof b.value === 'number' ? b.value : (b.pressed ? 1 : 0), 72 + })), 73 + }; 74 + }); 75 + 76 + // Synthesize gamepadconnected on first sighting per index. 77 + for (const p of hostPads) { 78 + if (!p) continue; 79 + if (!seen.has(p.index)) { 80 + seen.set(p.index, true); 81 + try { 82 + // GamepadEvent constructor exists in modern Chromium. 83 + const evt = new GamepadEvent('gamepadconnected', { gamepad: p }); 84 + window.dispatchEvent(evt); 85 + } catch (_) { 86 + const evt = new Event('gamepadconnected'); 87 + try { evt.gamepad = p; } catch (_) {} 88 + window.dispatchEvent(evt); 89 + } 90 + console.log('[webview-preload] gamepad bridged from host:', p.id); 91 + } 92 + } 93 + }); 94 + 95 + // Patch navigator.getGamepads so the guest sees the host's pads when its 96 + // own getGamepads is empty. If the guest ever does see a real controller 97 + // (e.g. user clicks the webview and presses a button), we defer to that. 98 + const native = navigator.getGamepads 99 + ? navigator.getGamepads.bind(navigator) 100 + : () => []; 101 + navigator.getGamepads = function () { 102 + let nativePads; 103 + try { nativePads = native(); } catch (_) { nativePads = []; } 104 + const hasNative = nativePads && Array.from(nativePads).some((g) => g); 105 + if (hasNative) return nativePads; 106 + return hostPads; 107 + }; 108 + })(); 109 + 43 110 // Also listen for messages from the content and forward them 44 111 // This catches postMessage calls from bios.mjs 45 112 window.addEventListener('message', (e) => {

+41 -16

system/public/aesthetic.computer/disks/arena.mjs

··· 605 605 let playerAlive = true; 606 606 let deathTickAge = 0; // how long we've been dead (sim ticks, for UI fade-in) 607 607 608 + // Shared respawn trigger — touch, gamepad A, gamepad Start, and Space all 609 + // route through this so the "TAP TO RESPAWN" prompt accepts every input. 610 + function tryRespawn(system) { 611 + if (playerAlive || deathTickAge <= 30) return false; 612 + playerAlive = true; 613 + deathTickAge = 0; 614 + walkedTiles.clear(); 615 + prevPlayerTile = null; 616 + system?.fps?.doll?.respawn?.(0, 0); 617 + return true; 618 + } 619 + 608 620 // 🎮 Gamepad / Xbox controller state. 609 621 // Populated lazily on the first gamepad event, then driven by act() each 610 622 // frame. Connection persists for the session — we don't get disconnect events ··· 2213 2225 } else if (bufferName !== name) { 2214 2226 console.log(`⚠️ No buffer found for ${name} (looking for ${bufferName})`); 2215 2227 } 2228 + 2229 + // 🎮 When a controller is live, hint the corresponding Xbox face 2230 + // button on jump (A — green) and crouch (B — red) so the player 2231 + // can map "tap this on screen" → "press this on the pad." 2232 + if (gamepadState.connected && (name === "jump" || name === "crouch")) { 2233 + const isA = name === "jump"; 2234 + const color = isA ? [60, 200, 80] : [220, 60, 60]; 2235 + const r = 6; 2236 + const gx = b.box.x + b.box.w - r - 3; 2237 + const gy = b.box.y + r + 3; 2238 + ink(color[0], color[1], color[2], 240).circle(gx, gy, r, true); 2239 + ink(0, 0, 0, 220).circle(gx, gy, r); 2240 + // MatrixChunky8 glyphs are ~4px wide × 7px tall. 2241 + ink(255, 255, 255, 255); 2242 + write(isA ? "A" : "B", { x: gx - 2, y: gy - 3 }, undefined, undefined, false, "MatrixChunky8"); 2243 + } 2216 2244 }); 2217 2245 } 2218 2246 } ··· 2254 2282 if (kind === "button") { 2255 2283 const pushed = action === "push"; 2256 2284 gamepadState.buttons[idx] = pushed; 2257 - if (idx === 0 && doll) doll.setMovement("jump", pushed); // A → jump 2285 + // A button: when dead, respawn; otherwise drive jump. 2286 + if (idx === 0) { 2287 + if (pushed && tryRespawn(system)) { 2288 + // Consumed by respawn — don't also queue a jump on the new life. 2289 + } else if (doll) { 2290 + doll.setMovement("jump", pushed); 2291 + } 2292 + } 2258 2293 if (idx === 1 && doll) doll.setMovement("crouch", pushed); // B → crouch 2259 2294 if (idx === 12 && pushed) { // D-pad up → zoom in 2260 2295 zoomLevel = Math.max(0, zoomLevel - 1); ··· 2264 2299 zoomLevel = Math.min(ZOOM_DISTANCES.length - 1, zoomLevel + 1); 2265 2300 applyZoom(doll); 2266 2301 } 2267 - if (idx === 9 && pushed && !playerAlive && deathTickAge > 30) { // Start → respawn 2268 - playerAlive = true; 2269 - deathTickAge = 0; 2270 - walkedTiles.clear(); 2271 - prevPlayerTile = null; 2272 - doll?.respawn?.(0, 0); 2273 - } 2302 + if (idx === 9 && pushed) tryRespawn(system); // Start → respawn 2274 2303 } else if (kind === "axis") { 2275 2304 gamepadState.axes[idx] = e.value; 2276 2305 if ((idx === 0 || idx === 1) && doll) { ··· 2407 2436 2408 2437 // While dead, any touch respawns; otherwise the first touch re-locks the pen. 2409 2438 if (e.is("touch")) { 2410 - if (!playerAlive && deathTickAge > 30) { 2411 - playerAlive = true; 2412 - deathTickAge = 0; 2413 - walkedTiles.clear(); 2414 - prevPlayerTile = null; 2415 - system?.fps?.doll?.respawn?.(0, 0); 2416 - return; 2417 - } 2439 + if (tryRespawn(system)) return; 2418 2440 // Don't re-lock on middle-click (1) or right-click (2) — reserved for camera control. 2419 2441 if (!penLocked && e.button !== 1 && e.button !== 2) penLock(); 2420 2442 } 2443 + 2444 + // Space (jump key) also respawns when dead — parallels gamepad A. 2445 + if (e.is("keyboard:down:space") && tryRespawn(system)) return; 2421 2446 } 2422 2447 2423 2448 // ⌨️ Helper: Reset all keyboard state to prevent stuck keys

Configure Feed

Configure Feed