aboutsummaryrefslogtreecommitdiff
path: root/src/profile
diff options
context:
space:
mode:
Diffstat (limited to 'src/profile')
-rw-r--r--src/profile/bind.ts3
-rw-r--r--src/profile/launch.ts12
2 files changed, 12 insertions, 3 deletions
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;
+ }
+ },
});
};