plum-e2e 2.4.1 → 2.4.3

package/backend/app.js

@@ -47,4 +47,11 @@ if (process.env.PLUM_MODE !== 'node') {
 	app.use('/trigger', require('./routes/trigger.routes'));
 }
 
+// Global JSON error handler — Express's default sends HTML, which breaks JSON clients
+// eslint-disable-next-line no-unused-vars
+app.use((err, req, res, next) => {
+	console.error(err);
+	res.status(err.status || 500).json({ error: err.message || 'Internal server error' });
+});
+
 module.exports = app;

package/backend/middleware/jwtAuth.js

@@ -40,12 +40,24 @@ function jwtAuth(req, res, next) {
 	if (!auth || !auth.startsWith('Bearer ')) {
 		return res.status(401).json({ error: 'Unauthorized' });
 	}
+	let payload;
 	try {
-		req.user = verifyToken(auth.slice(7));
-		next();
+		payload = verifyToken(auth.slice(7));
 	} catch {
 		return res.status(401).json({ error: 'Invalid or expired token' });
 	}
+	// Confirm the user still exists — catches stale JWTs after a DB reset
+	prisma.user
+		.findUnique({ where: { id: payload.userId }, select: { id: true } })
+		.then((user) => {
+			if (!user) return res.status(401).json({ error: 'Session expired. Please log in again.' });
+			req.user = payload;
+			next();
+		})
+		.catch(() => {
+			req.user = payload;
+			next();
+		});
 }
 
 module.exports = { jwtAuth };

package/backend/scripts/manage-runners.mjs

@@ -57,10 +57,10 @@ function resolveNodeUrl(url) {
 		const u = new URL(url);
 		if (u.hostname === 'localhost' || u.hostname === '127.0.0.1') {
 			u.hostname = 'host.docker.internal';
-			return u.toString();
 		}
+		return u.toString().replace(/\/+$/, '');
 	} catch {}
-	return url;
+	return url.replace(/\/+$/, '');
 }
 
 async function fetchRunners() {

package/backend/services/reportService.js

@@ -297,10 +297,12 @@ const saveReport = async ({
 	browser,
 	runnerName,
 	runnerId,
-	testRunId
+	testRunId,
+	forceFail = false
 }) => {
 	const normTrigger = normaliseTrigger(triggerType);
-	const { features, status } = processCucumberJson(rawCucumberJson);
+	const { features, status: derivedStatus } = processCucumberJson(rawCucumberJson);
+	const status = forceFail ? 'FAIL' : derivedStatus;
 	const cronJobId = await resolveCronJobId(normTrigger);
 
 	const report = await prisma.report.create({
@@ -374,7 +376,8 @@ const saveCombinedReport = async ({
 		browser,
 		runnerName: runners.map((r) => r.name).join(', '),
 		runnerId: null,
-		testRunId: testRunId ?? null
+		testRunId: testRunId ?? null,
+		forceFail: reports.some((r) => r === null)
 	});
 };
 

package/backend/services/runnerService.js

@@ -25,8 +25,10 @@ const prisma = require('./prisma');
 
 const getAll = () => prisma.runner.findMany({ orderBy: { createdAt: 'asc' } });
 
+const normaliseUrl = (url) => (url ?? '').replace(/\/+$/, '');
+
 const create = ({ name, url, token, browser = 'chromium' }) =>
-	prisma.runner.create({ data: { name, url, token, browser } });
+	prisma.runner.create({ data: { name, url: normaliseUrl(url), token, browser } });
 
 async function remove(id) {
 	// Scrub the deleted runner from any cron job's runnerIds string before
@@ -45,7 +47,11 @@ async function remove(id) {
 	return prisma.runner.delete({ where: { id } });
 }
 
-const update = (id, data) => prisma.runner.update({ where: { id }, data });
+const update = (id, data) =>
+	prisma.runner.update({
+		where: { id },
+		data: { ...data, ...(data.url && { url: normaliseUrl(data.url) }) }
+	});
 
 const getById = (id) => prisma.runner.findUnique({ where: { id } });
 
@@ -61,7 +67,12 @@ async function probe({ url, token }) {
 			headers: { Authorization: `Bearer ${token}` },
 			signal: AbortSignal.timeout(5000)
 		});
-		return { ok: res.ok, latency: Date.now() - start };
+		if (!res.ok) return { ok: false, error: `HTTP ${res.status}` };
+		const body = await res.json();
+		if (!body.ok || body.mode !== 'node') {
+			return { ok: false, error: 'URL does not point to a Plum runner node' };
+		}
+		return { ok: true, latency: Date.now() - start };
 	} catch (e) {
 		return { ok: false, error: e.message };
 	}

package/bin/plum.js

@@ -318,9 +318,9 @@ async function serverStart() {
 		}
 	}
 
-	clack.log.info(pc.dim('Streaming logs (Ctrl+C to detach — server keeps running):'));
-	execSync('docker compose logs -f', { cwd: plumRoot, stdio: 'inherit' });
-	clack.outro(pc.dim('Detached from logs. Run "docker compose down" to stop.'));
+	clack.log.info(`UI:  ${pc.cyan(`http://localhost:${cfg.frontendPort}`)}`);
+	clack.log.info(`API: ${pc.cyan(`http://localhost:${cfg.backendPort}`)}`);
+	clack.outro(pc.green('Plum is running. Use "plum server stop" to shut down.'));
 }
 
 async function serverReconfig() {

package/frontend/src/lib/components/layout/RunnerPanel.svelte

@@ -714,14 +714,30 @@
 			{/if}
 
 			{#each cronJobs as name}
-				<div class="run-card cron-run" transition:fly={{ x: -4, duration: 160 }}>
+				<a
+					href="/scheduled-tests"
+					class="run-card cron-run"
+					transition:fly={{ x: -4, duration: 160 }}
+				>
 					<span class="run-card-dot pulse-pass"></span>
 					<div class="run-card-info">
 						<span class="run-card-label">{name}</span>
 						<span class="run-card-meta">Scheduled run</span>
 					</div>
 					<span class="run-card-badge cron-badge">Scheduled</span>
-				</div>
+					<svg
+						width="13"
+						height="13"
+						viewBox="0 0 24 24"
+						fill="none"
+						stroke="currentColor"
+						stroke-width="2"
+						stroke-linecap="round"
+						class="run-card-arrow"
+					>
+						<line x1="5" y1="12" x2="19" y2="12" /><polyline points="12 5 19 12 12 19" />
+					</svg>
+				</a>
 			{/each}
 
 			{#if !anyRunning}

package/package.json

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