feat(wails): move the e2e harness and headless launch onto v3
make e2e is green on chromium: 92 passed. The harness is rebuilt on
what v3 actually offers, and three of the four things it replaced turn
out to be better than what they replaced.
The headless launch is v3's own server mode. scripts/dev-headless.sh
ran a `-tags dev` binary whose app_dev.go parsed -devserver/-assetdir
out of os.Args; that file went with v2, so the harness had no server at
all. `-tags dev,server` is a first-class mode and needs no display, so
Xvfb is gone from the script and from CI.
The bridge hooks two places, neither of them EventsOn. Inbound is
window._wails.dispatchWailsEvent, wrapped by pre-creating the object
the runtime keeps and putting an accessor on the one property.
Outbound is fetch: v3 routes every runtime call through one POST, so
the bridge sees binding calls and event emits from any module, needs no
walk of an object graph, and cannot miss a call made before it looked.
__yjEvents.call posts to that endpoint by method name, so it depends on
nothing in the app's bundle and works on a page with no init script.
That is what lets seed-sandbox.sh drop playwright-cli entirely — it
drove AddLibrary through a browser only because window.go was v2's one
way in — and with it a global npm install and a second Chromium in CI.
measure.mjs and one spec lose their window.go walks and read the
bridge's log instead; e2e/support/method-ids.mjs derives id -> name
from frontend/bindings/ (phase 6b option 1, so it cannot go stale
silently). Plain .mjs because measure.mjs runs under bare node and one
derivation beats two that can disagree.
Four bugs surfaced, and the migration is how.
The cross-service wiring never ran headless. It hung off
Common.ApplicationStarted, which server mode never emits —
setupCommonEvents is an explicit no-op there — so the queue had no
TrackLoader and playing a track changed the queue and then silently did
nothing. It is a service registered last now (backend/startup.go):
services start in registration order, which is the ordering the wiring
needs, in every mode.
Six specs called SetQueue with 3 of its 4 arguments. v2 accepted that
and filled the gap; v3 answers "expects 4 arguments, got 3".
requested-badge's cleanup read window.go and returned early on
`if (!svc)` — the silent cleanup its own comment was written to
prevent, one migration later. It posts to the runtime endpoint now,
which any page can do.
SearchIndex.Search trusted a startup latch, so rows a spec staged
afterwards were unsearchable and three specs passed only when an
earlier one happened to flip it. shelves.go fixed exactly this and left
hasCatalogRows behind; the search path now uses it as the fallback,
with the latch still the fast path.
Two spec edits are deletions of assertions about v2. harness.spec
checked Object.keys(window.go) and that a bad call *hung*; it now
checks the real runtime is loaded and that the backend rejects with a
TypeError naming the argument. album-actions asserted a tracklist
legend that dcc40b1 deleted on main — that spec has been failing since,
and what replaced it is covered in frontend/test/components.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UDCbcCZQepnpSQYJ6SxxZm
This commit is contained in:
+26
-27
@@ -36,7 +36,6 @@ MANIFEST="$REPO_ROOT/test_data/music_library_test.manifest.json"
|
||||
|
||||
NAME="default"
|
||||
PORT=34115
|
||||
SESSION="yj-seed"
|
||||
BUILD_ARGS=()
|
||||
# Replaced below once the manifest says how many tracks are coming: a
|
||||
# 50 000-track scan is minutes, and a fixed 180 s deadline would abort
|
||||
@@ -74,7 +73,7 @@ need() {
|
||||
exit 1
|
||||
}
|
||||
}
|
||||
need playwright-cli
|
||||
need curl
|
||||
need jq
|
||||
|
||||
if [ ! -f "$MANIFEST" ]; then
|
||||
@@ -89,7 +88,6 @@ SCAN_TIMEOUT=$((180 + WANT_TRACKS / 50))
|
||||
FIXTURE_HASH="$(jq -r .hash "$MANIFEST")"
|
||||
|
||||
cleanup() {
|
||||
playwright-cli -s="$SESSION" close >/dev/null 2>&1 || true
|
||||
./scripts/dev-stop.sh >/dev/null 2>&1 || true
|
||||
}
|
||||
trap cleanup EXIT
|
||||
@@ -108,24 +106,34 @@ YJ_CORE_INDEX_URL="http://127.0.0.1:1/none.tar.zst" \
|
||||
|
||||
YJ_HOME="$(cat "$RUN_DIR/app.home")"
|
||||
|
||||
playwright-cli -s="$SESSION" open "http://localhost:$PORT" >/dev/null
|
||||
|
||||
# Every binding call gets a timeout. A call with wrong argument types
|
||||
# makes the backend log 'error parsing arguments' and never fire the
|
||||
# callback, so the in-page promise never settles and a naive await
|
||||
# hangs forever.
|
||||
# A binding is called over the runtime's own HTTP endpoint, by method
|
||||
# name — the same request the bundle makes, minus the browser.
|
||||
#
|
||||
# This used to drive a real page through playwright-cli, because v2's
|
||||
# only way in was `window.go`. v3 answers the same call over HTTP, so a
|
||||
# browser (and a global npm install of the CLI, in CI) buys nothing
|
||||
# here: seeding needs the *app* to run and the *real* scanner to finish,
|
||||
# which it still does. It also fails properly now — v3 answers a bad
|
||||
# argument with a 422 and a TypeError naming it, where v2 logged
|
||||
# "error parsing arguments" and never fired the callback.
|
||||
call() {
|
||||
playwright-cli -s="$SESSION" eval "async () => {
|
||||
const timeout = new Promise((_, reject) =>
|
||||
setTimeout(() => reject(new Error('binding timeout')), 15000));
|
||||
return await Promise.race([(async () => { $1 })(), timeout]);
|
||||
}"
|
||||
local method="$1"
|
||||
local args="${2:-[]}"
|
||||
local body
|
||||
|
||||
body="$(jq -nc --arg m "yellowjacket/backend/$method" --argjson a "$args" \
|
||||
'{object: 0, method: 0, args: {"call-id": "seed", methodName: $m, args: $a}}')"
|
||||
|
||||
curl -sS --fail-with-body --max-time 30 \
|
||||
-X POST "http://localhost:$PORT/wails/runtime" \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d "$body"
|
||||
}
|
||||
|
||||
echo "seed-sandbox: registering library $LIBRARY_DIR"
|
||||
|
||||
if ! call "return await window.go.library.Library.AddLibrary(
|
||||
${LIBRARY_DIR@Q});" >/dev/null; then
|
||||
if ! call library.Library.AddLibrary \
|
||||
"$(jq -nc --arg d "$LIBRARY_DIR" '[$d]')" >/dev/null; then
|
||||
echo "seed-sandbox: AddLibrary failed; app log:" >&2
|
||||
tail -n 40 "$LOG_FILE" >&2
|
||||
exit 1
|
||||
@@ -137,19 +145,12 @@ fi
|
||||
# a fixture is not being ingested and the seed is wrong.
|
||||
echo "seed-sandbox: waiting for the scan to reach $WANT_TRACKS tracks"
|
||||
|
||||
# The result is tagged rather than scraped for bare digits:
|
||||
# playwright-cli echoes the evaluated source back, and that source
|
||||
# contains numbers of its own (the binding timeout, for one).
|
||||
deadline=$((SECONDS + SCAN_TIMEOUT))
|
||||
got=0
|
||||
|
||||
while [ "$SECONDS" -lt "$deadline" ]; do
|
||||
got="$(call "const libs =
|
||||
await window.go.library.Library.GetAllLibrariesWithTrackCounts();
|
||||
const total = (libs ?? []).reduce(
|
||||
(n, l) => n + (l.trackCount ?? 0), 0);
|
||||
return 'YJTRACKS' + '=' + total;" |
|
||||
grep -oE 'YJTRACKS=[0-9]+' | head -n 1 | cut -d= -f2)"
|
||||
got="$(call library.Library.GetAllLibrariesWithTrackCounts |
|
||||
jq '[(. // [])[].trackCount // 0] | add // 0')"
|
||||
got="${got:-0}"
|
||||
|
||||
[ "$got" = "$WANT_TRACKS" ] && break
|
||||
@@ -170,8 +171,6 @@ if [ "$got" != "$WANT_TRACKS" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
playwright-cli -s="$SESSION" close >/dev/null 2>&1 || true
|
||||
|
||||
# SIGTERM, so OnBeforeClose / OnShutdown persist window, player and
|
||||
# queue state. A seed built from a killed app is missing exactly the
|
||||
# state those hooks write.
|
||||
|
||||
Reference in New Issue
Block a user