@ricsam/r5d-browser 0.0.53 → 0.0.55

package/dist/cjs/chrome-launcher.cjs

@@ -35,6 +35,7 @@ __export(chrome_launcher_exports, {
   defaultChromeProfilePath: () => defaultChromeProfilePath,
   launchStableChrome: () => launchStableChrome,
   resolveChromeExecutable: () => resolveChromeExecutable,
+  terminateOwnedProcess: () => terminateOwnedProcess,
   validateChromeProfilePath: () => validateChromeProfilePath,
   validateDebuggerWebSocketUrl: () => validateDebuggerWebSocketUrl,
   validateEndpointOwnership: () => validateEndpointOwnership
@@ -529,21 +530,29 @@ async function requestOwnedBrowserClose(webSocketDebuggerUrl, chromePid) {
     cdp.close();
   }
 }
-async function terminateOwnedProcess(params) {
+async function terminateOwnedProcess(params, timeouts = {
+  gracefulCloseMs: GRACEFUL_CLOSE_TIMEOUT_MS,
+  terminateMs: TERMINATE_TIMEOUT_MS
+}) {
   if (params.child.exitCode !== null || params.child.signalCode !== null) return;
   if (params.browser?.isConnected()) {
     void params.browser.newBrowserCDPSession().then(async (cdp) => {
       await cdp.send("Browser.close");
     }).catch(() => void 0);
-    if (await waitForExit(params.exited, GRACEFUL_CLOSE_TIMEOUT_MS)) return;
+    if (await waitForExit(params.exited, timeouts.gracefulCloseMs)) return;
   } else if (params.ownedWebSocketDebuggerUrl) {
     const closeRequested = await requestOwnedBrowserClose(params.ownedWebSocketDebuggerUrl, params.chromePid).catch(() => false);
-    if (closeRequested && await waitForExit(params.exited, GRACEFUL_CLOSE_TIMEOUT_MS)) return;
+    if (closeRequested && await waitForExit(params.exited, timeouts.gracefulCloseMs)) return;
   }
   if (params.child.exitCode === null && params.child.signalCode === null) params.child.kill("SIGTERM");
-  if (await waitForExit(params.exited, TERMINATE_TIMEOUT_MS)) return;
+  if (await waitForExit(params.exited, timeouts.terminateMs)) return;
   if (params.child.exitCode === null && params.child.signalCode === null) params.child.kill("SIGKILL");
-  await waitForExit(params.exited, TERMINATE_TIMEOUT_MS);
+  if (await waitForExit(params.exited, timeouts.terminateMs)) return;
+  const stderr = params.stderr?.().trim();
+  throw new Error(
+    `Google Chrome PID ${params.chromePid} did not exit within ${timeouts.terminateMs}ms after SIGKILL; the run lock was retained to protect its profile.${stderr ? ` Chrome stderr:
+${stderr}` : ""}`
+  );
 }
 function occupiedProfileError(profilePath) {
   const owner = singletonLockOwner(profilePath);
@@ -562,6 +571,7 @@ async function launchStableChrome(options) {
   const profilePath = validateChromeProfilePath(options.profilePath);
   const playwrightDownloadsPath = import_node_path.default.resolve(options.playwrightDownloadsPath);
   const lock = acquireChromeRunLock(options.lockPath ?? defaultChromeLockPath(), profilePath);
+  let releaseLockOnError = true;
   try {
     import_node_fs.default.mkdirSync(profilePath, { recursive: true, mode: 448 });
     import_node_fs.default.mkdirSync(playwrightDownloadsPath, { recursive: true, mode: 448 });
@@ -618,17 +628,20 @@ async function launchStableChrome(options) {
         let closePromise;
         const close = () => {
           closePromise ??= (async () => {
+            let processExited = false;
             try {
               await terminateOwnedProcess({
                 child,
                 exited: observed.exited,
                 chromePid,
                 ownedWebSocketDebuggerUrl,
-                browser
+                browser,
+                stderr: observed.stderr
               });
+              processExited = true;
               await browser.close().catch(() => void 0);
             } finally {
-              lock.release();
+              if (processExited) lock.release();
             }
           })();
           return closePromise;
@@ -650,7 +663,11 @@ async function launchStableChrome(options) {
           child,
           exited: observed.exited,
           chromePid,
-          ownedWebSocketDebuggerUrl
+          ownedWebSocketDebuggerUrl,
+          stderr: observed.stderr
+        }).catch((terminationError) => {
+          releaseLockOnError = false;
+          throw terminationError;
         });
         const occupied = occupiedProfileError(profilePath);
         if (occupied) throw occupied;
@@ -661,7 +678,7 @@ async function launchStableChrome(options) {
       `Could not launch Google Chrome after ${MAX_LAUNCH_ATTEMPTS} attempts: ${lastError instanceof Error ? lastError.message : String(lastError)}`
     );
   } catch (error) {
-    lock.release();
+    if (releaseLockOnError) lock.release();
     throw error;
   }
 }
@@ -674,6 +691,7 @@ async function launchStableChrome(options) {
   defaultChromeProfilePath,
   launchStableChrome,
   resolveChromeExecutable,
+  terminateOwnedProcess,
   validateChromeProfilePath,
   validateDebuggerWebSocketUrl,
   validateEndpointOwnership

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-browser",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "type": "commonjs"
 }

package/dist/mjs/chrome-launcher.mjs

@@ -487,21 +487,29 @@ async function requestOwnedBrowserClose(webSocketDebuggerUrl, chromePid) {
     cdp.close();
   }
 }
-async function terminateOwnedProcess(params) {
+async function terminateOwnedProcess(params, timeouts = {
+  gracefulCloseMs: GRACEFUL_CLOSE_TIMEOUT_MS,
+  terminateMs: TERMINATE_TIMEOUT_MS
+}) {
   if (params.child.exitCode !== null || params.child.signalCode !== null) return;
   if (params.browser?.isConnected()) {
     void params.browser.newBrowserCDPSession().then(async (cdp) => {
       await cdp.send("Browser.close");
     }).catch(() => void 0);
-    if (await waitForExit(params.exited, GRACEFUL_CLOSE_TIMEOUT_MS)) return;
+    if (await waitForExit(params.exited, timeouts.gracefulCloseMs)) return;
   } else if (params.ownedWebSocketDebuggerUrl) {
     const closeRequested = await requestOwnedBrowserClose(params.ownedWebSocketDebuggerUrl, params.chromePid).catch(() => false);
-    if (closeRequested && await waitForExit(params.exited, GRACEFUL_CLOSE_TIMEOUT_MS)) return;
+    if (closeRequested && await waitForExit(params.exited, timeouts.gracefulCloseMs)) return;
   }
   if (params.child.exitCode === null && params.child.signalCode === null) params.child.kill("SIGTERM");
-  if (await waitForExit(params.exited, TERMINATE_TIMEOUT_MS)) return;
+  if (await waitForExit(params.exited, timeouts.terminateMs)) return;
   if (params.child.exitCode === null && params.child.signalCode === null) params.child.kill("SIGKILL");
-  await waitForExit(params.exited, TERMINATE_TIMEOUT_MS);
+  if (await waitForExit(params.exited, timeouts.terminateMs)) return;
+  const stderr = params.stderr?.().trim();
+  throw new Error(
+    `Google Chrome PID ${params.chromePid} did not exit within ${timeouts.terminateMs}ms after SIGKILL; the run lock was retained to protect its profile.${stderr ? ` Chrome stderr:
+${stderr}` : ""}`
+  );
 }
 function occupiedProfileError(profilePath) {
   const owner = singletonLockOwner(profilePath);
@@ -520,6 +528,7 @@ async function launchStableChrome(options) {
   const profilePath = validateChromeProfilePath(options.profilePath);
   const playwrightDownloadsPath = path.resolve(options.playwrightDownloadsPath);
   const lock = acquireChromeRunLock(options.lockPath ?? defaultChromeLockPath(), profilePath);
+  let releaseLockOnError = true;
   try {
     fs.mkdirSync(profilePath, { recursive: true, mode: 448 });
     fs.mkdirSync(playwrightDownloadsPath, { recursive: true, mode: 448 });
@@ -576,17 +585,20 @@ async function launchStableChrome(options) {
         let closePromise;
         const close = () => {
           closePromise ??= (async () => {
+            let processExited = false;
             try {
               await terminateOwnedProcess({
                 child,
                 exited: observed.exited,
                 chromePid,
                 ownedWebSocketDebuggerUrl,
-                browser
+                browser,
+                stderr: observed.stderr
               });
+              processExited = true;
               await browser.close().catch(() => void 0);
             } finally {
-              lock.release();
+              if (processExited) lock.release();
             }
           })();
           return closePromise;
@@ -608,7 +620,11 @@ async function launchStableChrome(options) {
           child,
           exited: observed.exited,
           chromePid,
-          ownedWebSocketDebuggerUrl
+          ownedWebSocketDebuggerUrl,
+          stderr: observed.stderr
+        }).catch((terminationError) => {
+          releaseLockOnError = false;
+          throw terminationError;
         });
         const occupied = occupiedProfileError(profilePath);
         if (occupied) throw occupied;
@@ -619,7 +635,7 @@ async function launchStableChrome(options) {
       `Could not launch Google Chrome after ${MAX_LAUNCH_ATTEMPTS} attempts: ${lastError instanceof Error ? lastError.message : String(lastError)}`
     );
   } catch (error) {
-    lock.release();
+    if (releaseLockOnError) lock.release();
     throw error;
   }
 }
@@ -631,6 +647,7 @@ export {
   defaultChromeProfilePath,
   launchStableChrome,
   resolveChromeExecutable,
+  terminateOwnedProcess,
   validateChromeProfilePath,
   validateDebuggerWebSocketUrl,
   validateEndpointOwnership

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-browser",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "type": "module"
 }

package/dist/types/chrome-launcher.d.ts

@@ -1,3 +1,4 @@
+import { type ChildProcess } from "node:child_process";
 import { type Browser, type BrowserContext } from "playwright-core";
 export type ChromeExit = {
     code: number | null;
@@ -26,6 +27,10 @@ export type ChromeRunLock = {
     token: string;
     release(): void;
 };
+type ChromeTerminationTimeouts = {
+    gracefulCloseMs: number;
+    terminateMs: number;
+};
 export declare function defaultChromeProfilePath(homeDirectory?: string): string;
 export declare function defaultChromeLockPath(homeDirectory?: string): string;
 export declare function resolveChromeExecutable(options?: {
@@ -50,4 +55,14 @@ export declare function validateEndpointOwnership(params: {
     product: unknown;
     commandLine: unknown;
 }): string;
+/** @internal Exported only so the bounded shutdown failure can be unit-tested. */
+export declare function terminateOwnedProcess(params: {
+    child: ChildProcess;
+    exited: Promise<ChromeExit>;
+    chromePid: number;
+    ownedWebSocketDebuggerUrl?: string;
+    browser?: Browser;
+    stderr?: () => string;
+}, timeouts?: ChromeTerminationTimeouts): Promise<void>;
 export declare function launchStableChrome(options: LaunchStableChromeOptions): Promise<StableChromeSession>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-browser",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",