plum-e2e 2.5.2 → 2.5.4

package/bin/plum.js

@@ -285,6 +285,22 @@ function applyServerConfig(cfg) {
 // 127.0.0.1 sidesteps the DNS/happy-eyeballs mismatch entirely.
 const READY_POLL_INTERVAL_MS = 2000;
 const READY_POLL_MAX_ATTEMPTS = 90; // ~3 minutes
+// Each poll attempt must itself be bounded — a single fetch() with no timeout
+// can hang on a stale/dead connection (e.g. right after a container restart)
+// and stall the whole loop indefinitely, regardless of the attempt budget
+// above. This is what caused the intermittent endless "Waiting for server to
+// be ready…" even when the server was already reachable elsewhere.
+const FETCH_ATTEMPT_TIMEOUT_MS = 3000;
+
+async function fetchWithTimeout(url, options = {}) {
+	const controller = new AbortController();
+	const timer = setTimeout(() => controller.abort(), FETCH_ATTEMPT_TIMEOUT_MS);
+	try {
+		return await fetch(url, { ...options, signal: controller.signal });
+	} finally {
+		clearTimeout(timer);
+	}
+}
 
 async function waitForServerReady(apiBase) {
 	const s = clack.spinner();
@@ -293,7 +309,7 @@ async function waitForServerReady(apiBase) {
 	for (let i = 0; i < READY_POLL_MAX_ATTEMPTS; i++) {
 		await new Promise((r) => setTimeout(r, READY_POLL_INTERVAL_MS));
 		try {
-			const res = await fetch(`${apiBase}/auth/needs-setup`);
+			const res = await fetchWithTimeout(`${apiBase}/auth/needs-setup`);
 			if (res.ok) {
 				ready = true;
 				break;
@@ -316,7 +332,7 @@ async function waitForServerReady(apiBase) {
 async function runFirstUserSetup(apiBase, uiUrl) {
 	let needsSetup = false;
 	try {
-		const res = await fetch(`${apiBase}/auth/needs-setup`);
+		const res = await fetchWithTimeout(`${apiBase}/auth/needs-setup`);
 		const data = await res.json();
 		needsSetup = data.needsSetup;
 	} catch {}
@@ -349,7 +365,7 @@ async function runFirstUserSetup(apiBase, uiUrl) {
 	}
 
 	try {
-		const res = await fetch(`${apiBase}/auth/setup`, {
+		const res = await fetchWithTimeout(`${apiBase}/auth/setup`, {
 			method: 'POST',
 			headers: { 'Content-Type': 'application/json' },
 			body: JSON.stringify({ name, email, password })

package/frontend/src/lib/api/auth.js

@@ -17,15 +17,31 @@
 
 import { API_BASE } from '$lib/constants';
 
+// A misconfigured or not-yet-routed API URL can accept a connection and never
+// respond, rather than refusing outright — a plain fetch() would then hang
+// forever with no error to catch. AUTH_TIMEOUT_MS bounds that so the UI always
+// resolves one way or another instead of leaving the page blank indefinitely.
+const AUTH_TIMEOUT_MS = 8000;
+
+async function fetchWithTimeout(url, options = {}) {
+	const controller = new AbortController();
+	const timer = setTimeout(() => controller.abort(), AUTH_TIMEOUT_MS);
+	try {
+		return await fetch(url, { ...options, signal: controller.signal });
+	} finally {
+		clearTimeout(timer);
+	}
+}
+
 export async function checkNeedsSetup() {
-	const res = await fetch(`${API_BASE}/auth/needs-setup`);
+	const res = await fetchWithTimeout(`${API_BASE}/auth/needs-setup`);
 	if (!res.ok) return false;
 	const data = await res.json();
 	return data.needsSetup;
 }
 
 export async function setup({ name, email, password }) {
-	const res = await fetch(`${API_BASE}/auth/setup`, {
+	const res = await fetchWithTimeout(`${API_BASE}/auth/setup`, {
 		method: 'POST',
 		headers: { 'Content-Type': 'application/json' },
 		body: JSON.stringify({ name, email, password })
@@ -36,7 +52,7 @@ export async function setup({ name, email, password }) {
 }
 
 export async function login({ email, password }) {
-	const res = await fetch(`${API_BASE}/auth/login`, {
+	const res = await fetchWithTimeout(`${API_BASE}/auth/login`, {
 		method: 'POST',
 		headers: { 'Content-Type': 'application/json' },
 		body: JSON.stringify({ email, password })
@@ -47,7 +63,7 @@ export async function login({ email, password }) {
 }
 
 export async function updateProfile({ token, name, email }) {
-	const res = await fetch(`${API_BASE}/auth/update-profile`, {
+	const res = await fetchWithTimeout(`${API_BASE}/auth/update-profile`, {
 		method: 'PUT',
 		headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
 		body: JSON.stringify({ name, email })
@@ -58,7 +74,7 @@ export async function updateProfile({ token, name, email }) {
 }
 
 export async function changePassword({ token, currentPassword, newPassword }) {
-	const res = await fetch(`${API_BASE}/auth/change-password`, {
+	const res = await fetchWithTimeout(`${API_BASE}/auth/change-password`, {
 		method: 'POST',
 		headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
 		body: JSON.stringify({ currentPassword, newPassword })

package/frontend/src/routes/+layout.svelte

@@ -45,9 +45,11 @@
 
 		try {
 			const needsSetup = await checkNeedsSetup();
-			goto(needsSetup ? '/setup' : '/login');
+			await goto(needsSetup ? '/setup' : '/login');
 		} catch {
-			goto('/login');
+			await goto('/login');
+		} finally {
+			ready = true;
 		}
 	});
 </script>
@@ -62,4 +64,18 @@
 		</PageShell>
 		<RunnerPanel />
 	{/if}
+{:else}
+	<div class="boot-loading">Loading…</div>
 {/if}
+
+<style>
+	.boot-loading {
+		min-height: 100vh;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background: var(--bg);
+		color: var(--text-muted);
+		font-size: 0.875rem;
+	}
+</style>

package/frontend/src/routes/+page.svelte

@@ -91,7 +91,9 @@
 	$: filtered = suites
 		.map((suite) => {
 			if (!q) return suite;
-			const suiteMatches = suite.suiteName.toLowerCase().includes(q);
+			const suiteMatches =
+				suite.suiteName.toLowerCase().includes(q) ||
+				suiteIds(suite).some((id) => id.toLowerCase().includes(q));
 			const matchedTests = suite.tests.filter(
 				(t) =>
 					t.testCase.toLowerCase().includes(q) ||

package/frontend/src/routes/login/+page.svelte

@@ -60,7 +60,9 @@
 <svelte:head><title>Sign in — Plum</title></svelte:head>
 
 <div class="page" data-theme={$theme}>
-	{#if !checking}
+	{#if checking}
+		<p class="checking">Checking server…</p>
+	{:else}
 		<div class="card">
 			<div class="brand">
 				<span class="brand-serif">Pl</span><span class="brand-sans">um</span>
@@ -116,6 +118,11 @@
 		padding: 1rem;
 	}
 
+	.checking {
+		color: var(--text-muted);
+		font-size: 0.875rem;
+	}
+
 	.card {
 		width: 100%;
 		max-width: 380px;

package/frontend/src/routes/setup/+page.svelte

@@ -65,7 +65,9 @@
 <svelte:head><title>Setup — Plum</title></svelte:head>
 
 <div class="page" data-theme={$theme}>
-	{#if !checking}
+	{#if checking}
+		<p class="checking">Checking server…</p>
+	{:else}
 		<div class="card">
 			<div class="brand">
 				<span class="brand-serif">Pl</span><span class="brand-sans">um</span>
@@ -136,6 +138,11 @@
 		padding: 1rem;
 	}
 
+	.checking {
+		color: var(--text-muted);
+		font-size: 0.875rem;
+	}
+
 	.card {
 		width: 100%;
 		max-width: 400px;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "plum-e2e",
-	"version": "2.5.2",
+	"version": "2.5.4",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/silverlunah/plum.git"