plum-e2e 2.6.4 → 2.6.6

package/backend/lib/runnerProcess.js

@@ -250,6 +250,40 @@ function stopNode(id, fallbackPort = null) {
 	return signalled;
 }
 
+/**
+ * Frees a TCP port by killing whatever process is bound to it, so Start can't
+ * fail with EADDRINUSE against a stale/orphaned process this manager lost
+ * track of (e.g. one that ignored SIGTERM from a previous stop, or was never
+ * in the registry to begin with). SIGTERM first, escalating to SIGKILL if the
+ * process is still alive after a short grace period.
+ *
+ * Returns true if a process was found (and signalled), false if the port was
+ * already free.
+ */
+async function killPort(port) {
+	let pid = findPidOnPort(port);
+	if (!pid) return false;
+
+	try {
+		process.kill(pid, 'SIGTERM');
+	} catch {}
+
+	const deadline = Date.now() + 2000;
+	while (Date.now() < deadline && isAlive(pid)) {
+		await new Promise((resolve) => setTimeout(resolve, 150));
+	}
+
+	pid = findPidOnPort(port);
+	if (pid && isAlive(pid)) {
+		try {
+			process.kill(pid, 'SIGKILL');
+		} catch {}
+		await new Promise((resolve) => setTimeout(resolve, 200));
+	}
+
+	return true;
+}
+
 module.exports = {
 	BACKEND_DIR,
 	LOGS_DIR,
@@ -260,6 +294,7 @@ module.exports = {
 	isLocalUrl,
 	parsePort,
 	findPidOnPort,
+	killPort,
 	pruneDead,
 	statusOf,
 	prepareEnv,

package/backend/logs/runner-cmrkk6fcl0000qj012kve79f4.log

@@ -0,0 +1,18 @@
+/*
+This file is part of Plum.
+
+Plum is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Plum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Plum. If not, see https://www.gnu.org/licenses/.
+*/
+📂 Loading tests from: /Users/silverlunah/Projects/plum/backend/tests
+Backend running on port 3999 (node/runner mode)

package/backend/scripts/manage-runners.mjs

@@ -40,7 +40,8 @@ const {
 	prepareEnv,
 	startNode,
 	stopNode,
-	findPidOnPort
+	findPidOnPort,
+	killPort
 } = runnerProcess;
 const { generateToken, registerWithPrimary, detectLanIp } = nodeRegister;
 
@@ -139,9 +140,8 @@ async function describeRunners() {
 function statusBadge(r) {
 	const dot = r.online ? pc.green('●') : pc.dim('○');
 	let detail;
-	if (!r.local) detail = pc.dim('remote');
-	else if (r.managed) detail = pc.green('running');
-	else if (r.online) detail = pc.yellow('running (unmanaged)');
+	if (r.managed) detail = pc.green('running');
+	else if (r.online) detail = pc.yellow(r.local ? 'running (unmanaged)' : 'running (remote)');
 	else detail = pc.dim('stopped');
 	return `${dot} ${detail}`;
 }
@@ -184,10 +184,15 @@ async function runAction(r) {
 			{ value: 'restart', label: pc.yellow('Restart') },
 			{ value: 'ping', label: 'Ping' }
 		);
-	} else if (r.local) {
-		options.push({ value: 'start', label: pc.green('Start') }, { value: 'ping', label: 'Ping' });
 	} else {
-		options.push({ value: 'ping', label: 'Ping' });
+		// Offline and nothing is listening to control remotely — offer Start
+		// unconditionally rather than gating on address-based "is this local"
+		// detection. That heuristic breaks the moment this machine's address
+		// differs from what was registered (DHCP renewal, VPN, multiple NICs),
+		// permanently trapping an offline runner with no way back. Starting
+		// here is always safe to attempt: it spawns a managed process this menu
+		// can immediately Stop again if the address guess was wrong.
+		options.push({ value: 'start', label: pc.green('Start') }, { value: 'ping', label: 'Ping' });
 	}
 
 	options.push(
@@ -202,12 +207,18 @@ async function runAction(r) {
 	const port = parsePort(r.url);
 
 	if (action === 'start') {
+		const s = clack.spinner();
+		s.start(`Freeing port ${port}...`);
+		const killed = await killPort(Number(port));
+		s.stop(killed ? pc.dim(`Freed port ${port}`) : pc.dim(`Port ${port} was already free`));
+
 		prepareNodeEnv();
 		const entry = startNode({ id: r.id, port, token: r.token });
 		clack.log.success(pc.green(`Started "${r.name}" on port ${port} (pid ${entry.pid})`));
 	} else if (action === 'stop') {
 		if (r.managed) {
 			const ok = stopNode(r.id);
+			await killPort(Number(port));
 			clack.log.success(
 				ok ? pc.green(`Stopped "${r.name}"`) : pc.dim(`"${r.name}" was not running`)
 			);
@@ -219,6 +230,11 @@ async function runAction(r) {
 				s.stop(pc.green(`Stopped "${r.name}"`));
 			} catch (e) {
 				s.stop(pc.red(`Could not stop "${r.name}": ${e.message}`));
+			} finally {
+				// Belt-and-suspenders: if this runner happens to be local (or
+				// the network shutdown call above silently failed), make sure
+				// nothing is left bound to its port.
+				await killPort(Number(port));
 			}
 		}
 	} else if (action === 'restart') {
@@ -226,7 +242,7 @@ async function runAction(r) {
 			const s = clack.spinner();
 			s.start(`Restarting "${r.name}"...`);
 			stopNode(r.id);
-			await new Promise((resolve) => setTimeout(resolve, 600));
+			await killPort(Number(port));
 			const entry = startNode({ id: r.id, port, token: r.token });
 			s.stop(pc.green(`Restarted "${r.name}" (pid ${entry.pid})`));
 		} else {

package/package.json

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