plum-e2e 2.6.5 → 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/scripts/manage-runners.mjs

@@ -40,7 +40,8 @@ const {
 	prepareEnv,
 	startNode,
 	stopNode,
-	findPidOnPort
+	findPidOnPort,
+	killPort
 } = runnerProcess;
 const { generateToken, registerWithPrimary, detectLanIp } = nodeRegister;
 
@@ -206,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`)
 			);
@@ -223,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') {
@@ -230,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.5",
+	"version": "2.6.6",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/silverlunah/plum.git"