11// fallow-ignore-file code-duplication
22import { execSync , spawnSync } from "node:child_process" ;
3- import { existsSync , mkdirSync , readdirSync , rmSync , statSync , utimesSync } from "node:fs" ;
3+ import { randomUUID } from "node:crypto" ;
4+ import {
5+ existsSync ,
6+ mkdirSync ,
7+ readFileSync ,
8+ readdirSync ,
9+ rmSync ,
10+ statSync ,
11+ utimesSync ,
12+ writeFileSync ,
13+ } from "node:fs" ;
414import { basename } from "node:path" ;
515import { homedir } from "node:os" ;
616import { join } from "node:path" ;
717import { normalizeErrorMessage } from "../utils/errorMessage.js" ;
18+ import { runRenderSetupWorker } from "../utils/cancellableProcess.js" ;
819
920type PuppeteerBrowsers = typeof import ( "@puppeteer/browsers" ) ;
1021
@@ -57,6 +68,9 @@ const PUPPETEER_CACHE_DIR = join(homedir(), ".cache", "puppeteer", "chrome-headl
5768// doubles as a zero-dependency cross-process mutex — no lockfile library needed.
5869const INSTALL_LOCK_DIR = join ( CACHE_ROOT_DIR , ".chrome.install.lock" ) ;
5970const INSTALL_RECLAIM_LOCK_DIR = join ( CACHE_ROOT_DIR , ".chrome.install.reclaim.lock" ) ;
71+ const INSTALL_LOCK_OWNER_FILE = join ( INSTALL_LOCK_DIR , "owner" ) ;
72+ const INSTALL_LOCK_OWNER_ENV = "HYPERFRAMES_BROWSER_LOCK_OWNER" ;
73+ let ownedInstallLockToken : string | undefined ;
6074const INSTALL_LOCK_TIMINGS = {
6175 staleMs : 120_000 ,
6276 pollMs : 200 ,
@@ -134,6 +148,7 @@ function touchInstallLock(): void {
134148 }
135149}
136150
151+ // fallow-ignore-next-line complexity
137152export async function withInstallLock < T > (
138153 fn : ( ) => Promise < T > ,
139154 timings : InstallLockTimings = INSTALL_LOCK_TIMINGS ,
@@ -156,6 +171,14 @@ export async function withInstallLock<T>(
156171 continue ;
157172 }
158173 if ( tryAcquireDirLock ( INSTALL_LOCK_DIR ) ) {
174+ ownedInstallLockToken = process . env [ INSTALL_LOCK_OWNER_ENV ] ?? randomUUID ( ) ;
175+ try {
176+ writeFileSync ( INSTALL_LOCK_OWNER_FILE , ownedInstallLockToken ) ;
177+ } catch ( error ) {
178+ ownedInstallLockToken = undefined ;
179+ rmSync ( INSTALL_LOCK_DIR , { recursive : true , force : true } ) ;
180+ throw error ;
181+ }
159182 rmSync ( INSTALL_RECLAIM_LOCK_DIR , { recursive : true , force : true } ) ;
160183 break ;
161184 }
@@ -184,10 +207,25 @@ export async function withInstallLock<T>(
184207 return await fn ( ) ;
185208 } finally {
186209 clearInterval ( heartbeat ) ;
187- rmSync ( INSTALL_LOCK_DIR , { recursive : true , force : true } ) ;
210+ releaseOwnedBrowserInstallLock ( ) ;
188211 }
189212}
190213
214+ export function releaseOwnedBrowserInstallLock ( ) : void {
215+ if ( ! ownedInstallLockToken ) return ;
216+ releaseBrowserInstallLock ( ownedInstallLockToken ) ;
217+ }
218+
219+ function releaseBrowserInstallLock ( ownerToken : string ) : void {
220+ if ( ownedInstallLockToken === ownerToken ) ownedInstallLockToken = undefined ;
221+ try {
222+ if ( readFileSync ( INSTALL_LOCK_OWNER_FILE , "utf8" ) !== ownerToken ) return ;
223+ } catch {
224+ return ;
225+ }
226+ rmSync ( INSTALL_LOCK_DIR , { recursive : true , force : true } ) ;
227+ }
228+
191229export type BrowserSource = "env" | "cache" | "system" | "download" ;
192230
193231export interface BrowserResult {
@@ -211,6 +249,7 @@ export interface EnsureBrowserOptions {
211249 // eligible renders outright; HF#2060). `HYPERFRAMES_BROWSER_PATH` still
212250 // wins over this — an explicit override is still an explicit override.
213251 preferManagedChrome ?: boolean ;
252+ signal ?: AbortSignal ;
214253}
215254
216255interface CacheLookupResult {
@@ -614,6 +653,14 @@ async function ensureLinuxArmBrowser(options?: EnsureBrowserOptions): Promise<Br
614653 * (puppeteer-cache preference and system Chrome are both skipped).
615654 */
616655export async function ensureBrowser ( options ?: EnsureBrowserOptions ) : Promise < BrowserResult > {
656+ if ( options ?. signal ) return ensureBrowserInOwnedProcess ( options ) ;
657+ return ensureBrowserInCurrentProcess ( options ) ;
658+ }
659+
660+ // fallow-ignore-next-line complexity
661+ async function ensureBrowserInCurrentProcess (
662+ options ?: EnsureBrowserOptions ,
663+ ) : Promise < BrowserResult > {
617664 const fromEnv = findFromEnv ( ) ;
618665 if ( fromEnv ) return fromEnv ;
619666
@@ -665,6 +712,28 @@ export async function ensureBrowser(options?: EnsureBrowserOptions): Promise<Bro
665712 } ) ;
666713}
667714
715+ async function ensureBrowserInOwnedProcess ( options : EnsureBrowserOptions ) : Promise < BrowserResult > {
716+ const signal = options . signal ;
717+ signal ?. throwIfAborted ( ) ;
718+ const lockOwner = randomUUID ( ) ;
719+ try {
720+ return await runRenderSetupWorker < BrowserResult > (
721+ "browser" ,
722+ {
723+ force : options . force ,
724+ preferManagedChrome : options . preferManagedChrome ,
725+ } ,
726+ {
727+ signal,
728+ maxBufferBytes : 4 * 1024 * 1024 ,
729+ env : { [ INSTALL_LOCK_OWNER_ENV ] : lockOwner } ,
730+ } ,
731+ ) ;
732+ } finally {
733+ releaseBrowserInstallLock ( lockOwner ) ;
734+ }
735+ }
736+
668737/**
669738 * True when `err` is a corrupt/truncated-archive extraction failure, as opposed
670739 * to a network error or a genuine platform problem. A partially-downloaded or
0 commit comments