diff options
| author | amankumarsingh77 <amankumarsingh7702@gmail.com> | 2026-07-26 00:33:44 +0530 |
|---|---|---|
| committer | amankumarsingh77 <amankumarsingh7702@gmail.com> | 2026-07-26 00:33:44 +0530 |
| commit | 693b5e86268421b5c6e3400d988efdcc25f2e34e (patch) | |
| tree | ce717c4e0b2d8af29b5b37a606cb1d27af2bc530 /src | |
| parent | ad7f511b319be5ca989ee86dc411f181dd23e41f (diff) | |
fix: kill leaked Chrome processes on profile seed failure
When a profile is pinned and ProcessSingleton fails to delegate, the
spawned Chrome process starts a full second browser instance. The
sentinel never appeared, but the spawned process was never killed
(detached + unref'd + reference discarded), accumulating zombie
browsers that consume RAM.
Three changes:
- Store child process ref and expose kill() on ProfileWindowHandle.
Call kill() when the sentinel doesn't appear within the timeout.
- Only clear profileContextId when the browser UUID changes (Chrome
mints a fresh UUID on every launch), avoiding unnecessary re-spawns.
- Don't clear profileContextId in setProfilePin when the pin hasn't
changed, preventing gratuitous re-spawns on session_start.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.ts | 17 | ||||
| -rw-r--r-- | src/profile/bind.ts | 3 | ||||
| -rw-r--r-- | src/profile/launch.ts | 12 |
3 files changed, 23 insertions, 9 deletions
diff --git a/src/client.ts b/src/client.ts index 1049212..4d8c3a8 100644 --- a/src/client.ts +++ b/src/client.ts @@ -170,11 +170,12 @@ export const createBrowserClient = (opts: BrowserClientOptions): BrowserClient = } const connected = await transport.connect(wsUrl, { timeoutMs: 10_000 }); if (!connected.success) return connected; - if (!remote) { - remote = { cdpUrl: wsUrl, browserId: wsUrl.split("/").pop() ?? "unknown" }; + + const newBrowserId: string = wsUrl.split("/").pop() ?? "unknown"; + if (!remote || remote.browserId !== newBrowserId) { + profileContextId = undefined; } - // A fresh browser run invalidates any context id resolved earlier. - profileContextId = undefined; + remote = { cdpUrl: wsUrl, browserId: newBrowserId }; const seeded = await seedIfPinned(); if (!seeded.success) { await transport.close(); @@ -397,9 +398,13 @@ export const createBrowserClient = (opts: BrowserClientOptions): BrowserClient = userDataDir: () => userDataDir, profilePin: () => profilePin, setProfilePin: (pin) => { + const changed = pin === null + ? profilePin !== null + : profilePin === null || profilePin.userDataDir !== pin.userDataDir || profilePin.profileDir !== pin.profileDir; profilePin = pin; - // The old profile's context no longer describes where tabs should go. - profileContextId = undefined; + if (changed) { + profileContextId = undefined; + } }, profileContextId: () => profileContextId, setProfileContextId: (contextId) => { diff --git a/src/profile/bind.ts b/src/profile/bind.ts index aeb59d3..10b38a3 100644 --- a/src/profile/bind.ts +++ b/src/profile/bind.ts @@ -93,7 +93,7 @@ export const seedProfileWindow = async ( return err(cdpError("discovery_failed", `${launched.error} — ${manualFallbackHint(pin)}`)); } - const { sentinelUrl, cleanup } = launched.data; + const { sentinelUrl, cleanup, kill } = launched.data; const deadline = Date.now() + SEED_DEADLINE_MS; let seed: PageTarget | undefined; while (Date.now() < deadline && !seed) { @@ -102,6 +102,7 @@ export const seedProfileWindow = async ( } if (!seed) { + kill(); await cleanup(); return err(cdpError( "timeout", diff --git a/src/profile/launch.ts b/src/profile/launch.ts index 4f8f65a..fd93d3d 100644 --- a/src/profile/launch.ts +++ b/src/profile/launch.ts @@ -15,7 +15,7 @@ * identification correct when the user opens tabs at the same moment. */ -import { spawn } from "node:child_process"; +import { spawn, type ChildProcess } from "node:child_process"; import { randomUUID } from "node:crypto"; import { rm, writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; @@ -42,6 +42,7 @@ export type ProfileWindowHandle = { readonly sentinelUrl: string; /** Remove the sentinel file. Safe to call more than once. */ readonly cleanup: () => Promise<void>; + readonly kill: () => void; }; const SENTINEL_HTML = (token: string): string => @@ -68,10 +69,11 @@ export const openProfileWindow = async ( if (req.explicitUserDataDir) args.push(`--user-data-dir=${req.explicitUserDataDir}`); args.push(`--profile-directory=${req.profileDir}`, "--new-window", sentinelUrl); + let child: ChildProcess | null = null; try { // No shell: arguments are passed as an array, so profile names and paths // containing spaces survive intact on every platform. - const child = spawn(req.exePath, args, { detached: true, stdio: "ignore" }); + child = spawn(req.exePath, args, { detached: true, stdio: "ignore" }); child.unref(); // The launcher process exits as soon as the running browser takes over the // command line; an error here means the binary itself could not be started. @@ -86,5 +88,11 @@ export const openProfileWindow = async ( cleanup: async () => { await rm(file, { force: true }).catch(() => {}); }, + kill: () => { + if (child) { + try { child.kill("SIGTERM"); } catch {} + child = null; + } + }, }); }; |
