@mozilla/firefox-devtools-mcp 0.9.5 → 0.9.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mozilla/firefox-devtools-mcp",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "Model Context Protocol (MCP) server for Firefox DevTools automation",
   "author": "Mozilla",
   "license": "MIT OR Apache-2.0",
@@ -8,7 +8,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
-    "firefox-devtools-mcp": "./dist/index.js"
+    "firefox-devtools-mcp": "dist/index.js"
   },
   "scripts": {
     "dev": "tsx watch src/index.moz.ts",
@@ -71,7 +71,7 @@
     "@modelcontextprotocol/sdk": "1.29.0",
     "geckodriver": "6.0.2",
     "selenium-webdriver": "4.36.0",
-    "ws": "8.18.3",
+    "ws": "8.21.0",
     "yargs": "17.7.2"
   },
   "devDependencies": {
@@ -82,8 +82,8 @@
     "@types/yargs": "17.0.32",
     "@typescript-eslint/eslint-plugin": "8.58.0",
     "@typescript-eslint/parser": "8.58.0",
-    "@vitest/coverage-v8": "3.1.4",
-    "@vitest/ui": "3.1.4",
+    "@vitest/coverage-v8": "4.1.8",
+    "@vitest/ui": "4.1.8",
     "dotenv": "17.2.1",
     "eslint": "8.57.1",
     "eslint-config-prettier": "10.1.5",
@@ -93,7 +93,7 @@
     "tsup": "8.5.0",
     "tsx": "4.21.0",
     "typescript": "5.3.3",
-    "vitest": "3.1.4"
+    "vitest": "4.1.8"
   },
   "files": [
     "dist",

package/scripts/test-closed-window.js

@@ -0,0 +1,216 @@
+#!/usr/bin/env node
+/**
+ * Test: zombie geckodriver cleanup
+ *
+ * Scenario B (SIGKILL): Firefox is completely dead (user clicked [X]).
+ *   Recovery test: can close() clean up and reconnect after Firefox dies?
+ *
+ * Scenario C (SIGKILL, non-headless): Same as B with a visible browser window.
+ */
+import { FirefoxDevTools } from '../dist/index.js';
+import { execFileSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function parsePids(output) {
+  return output
+    .trim()
+    .split('\n')
+    .map(Number)
+    .filter((n) => !isNaN(n));
+}
+
+function pgrep(pattern) {
+  try {
+    return parsePids(execFileSync('pgrep', ['-f', pattern], { encoding: 'utf-8' }));
+  } catch {
+    return [];
+  }
+}
+
+function getProcState(pid) {
+  try {
+    const stat = readFileSync(`/proc/${pid}/stat`, 'utf-8');
+    return stat[stat.lastIndexOf(')') + 2];
+  } catch {
+    return null;
+  }
+}
+
+function isAlive(pid) {
+  const state = getProcState(pid);
+  return state !== null && state !== 'Z';
+}
+
+function killHard(pid) {
+  try {
+    process.kill(pid, 'SIGKILL');
+  } catch {}
+}
+
+function getDescendants(parentPid) {
+  const result = [];
+  const queue = [parentPid];
+  while (queue.length > 0) {
+    const pid = queue.shift();
+    try {
+      const children = parsePids(execFileSync('pgrep', ['-P', String(pid)], { encoding: 'utf-8' }));
+      result.push(...children);
+      queue.push(...children);
+    } catch {}
+  }
+  return result;
+}
+
+function waitForDeath(pid, timeoutMs) {
+  return new Promise((resolve) => {
+    const start = Date.now();
+    const check = () => {
+      if (!isAlive(pid)) resolve(true);
+      else if (Date.now() - start > timeoutMs) resolve(false);
+      else setTimeout(check, 100);
+    };
+    check();
+  });
+}
+
+function killAll(pids) {
+  for (const pid of pids) killHard(pid);
+}
+
+async function reconnect(geckosBefore, excludePids) {
+  const r = await launchFirefox(geckosBefore, excludePids);
+  await r.devTools.navigate('about:blank');
+  console.log('     Navigation works');
+  await r.devTools.close();
+  return r.geckoPid;
+}
+
+// Log unhandled rejections instead of swallowing them silently
+process.on('unhandledRejection', (reason) => {
+  console.error('[unhandled rejection]', reason);
+});
+
+// ---------------------------------------------------------------------------
+// Launch helper
+// ---------------------------------------------------------------------------
+
+async function launchFirefox(geckosBefore, excludePids = [], headless = true) {
+  const devTools = new FirefoxDevTools({
+    headless,
+    viewport: { width: 1280, height: 720 },
+  });
+  await devTools.connect();
+
+  const geckoPid = pgrep('geckodriver').find(
+    (p) => !geckosBefore.has(p) && !excludePids.includes(p)
+  );
+  if (!geckoPid) throw new Error('No geckodriver PID found after connect');
+
+  const firefoxPids = getDescendants(geckoPid);
+  if (firefoxPids.length === 0) {
+    killHard(geckoPid);
+    throw new Error('No Firefox PIDs found under geckodriver');
+  }
+
+  return { devTools, geckoPid, firefoxPids };
+}
+
+// ---------------------------------------------------------------------------
+// Test
+// ---------------------------------------------------------------------------
+
+async function main() {
+  console.log('--- Zombie geckodriver fix test ---\n');
+  const geckosBefore = new Set(pgrep('geckodriver'));
+  const usedPids = [];
+
+  console.log('Scenario B: Firefox killed (SIGKILL)');
+
+  console.log('  1. Launching Firefox...');
+  const b = await launchFirefox(geckosBefore, usedPids);
+  console.log(`     Geckodriver PID: ${b.geckoPid}, Firefox PIDs: ${b.firefoxPids.join(', ')}`);
+
+  console.log('  2. Killing Firefox...');
+  killAll(b.firefoxPids);
+  for (const pid of b.firefoxPids) {
+    if (!(await waitForDeath(pid, 5000))) {
+      console.error(`  [FATAL] Firefox PID ${pid} survived SIGKILL`);
+      killHard(b.geckoPid);
+      process.exit(1);
+    }
+  }
+  console.log('     Firefox is dead');
+
+  console.log(
+    `  3. ${isAlive(b.geckoPid) ? 'Zombie geckodriver detected' : 'Geckodriver died with Firefox (no zombie)'}`
+  );
+
+  console.log('  4. Running cleanup (close() handles timeout + force-kill)...');
+  await b.devTools.close();
+
+  console.log('  5. Verifying geckodriver is dead...');
+  if (!(await waitForDeath(b.geckoPid, 5000))) {
+    console.error('  [FAIL] Geckodriver still alive after cleanup');
+    killHard(b.geckoPid);
+    process.exit(1);
+  }
+  console.log('     Geckodriver is dead');
+
+  console.log('  6. Reconnecting...');
+  usedPids.push(b.geckoPid);
+  usedPids.push(await reconnect(geckosBefore, usedPids));
+  console.log('  Scenario B: PASS\n');
+
+  console.log('Scenario C: Firefox killed (SIGKILL) — non-headless');
+
+  console.log('  1. Launching Firefox (non-headless)...');
+  const c = await launchFirefox(geckosBefore, usedPids, false);
+  console.log(`     Geckodriver PID: ${c.geckoPid}, Firefox PIDs: ${c.firefoxPids.join(', ')}`);
+
+  console.log('  2. Killing Firefox...');
+  killAll(c.firefoxPids);
+  for (const pid of c.firefoxPids) {
+    if (!(await waitForDeath(pid, 5000))) {
+      console.error(`  [FATAL] Firefox PID ${pid} survived SIGKILL`);
+      killHard(c.geckoPid);
+      process.exit(1);
+    }
+  }
+  console.log('     Firefox is dead');
+
+  console.log(
+    `  3. ${isAlive(c.geckoPid) ? 'Zombie geckodriver detected' : 'Geckodriver died with Firefox (no zombie)'}`
+  );
+
+  console.log('  4. Running cleanup (close() handles timeout + force-kill)...');
+  await c.devTools.close();
+
+  console.log('  5. Verifying geckodriver is dead...');
+  if (!(await waitForDeath(c.geckoPid, 5000))) {
+    console.error('  [FAIL] Geckodriver still alive after cleanup');
+    killHard(c.geckoPid);
+    process.exit(1);
+  }
+  console.log('     Geckodriver is dead');
+
+  console.log('  6. Reconnecting...');
+  usedPids.push(c.geckoPid);
+  usedPids.push(await reconnect(geckosBefore, usedPids));
+  console.log('  Scenario C: PASS\n');
+
+  // Final cleanup
+  const leftover = pgrep('geckodriver').filter((p) => !geckosBefore.has(p));
+  for (const pid of leftover) {
+    killAll(getDescendants(pid));
+    killHard(pid);
+  }
+}
+
+main().catch((err) => {
+  console.error('Fatal error:', err);
+  process.exit(1);
+});