Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: compute registryDirectory every time

Browse source
This commit is contained in:
Max Schmitt 2024-12-02 13:05:14 -08:00
parent b5bd543cc6
commit 7b1e71c1bd
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/playwright-core/src/server/launchApp.ts
View file

@ -78,7 +78,7 @@ async function installAppIcon(page: Page) {
export async function syncLocalStorageWithSettings(page: Page, appName: string) { export async function syncLocalStorageWithSettings(page: Page, appName: string) {
if (isUnderTest()) if (isUnderTest())
return; return;
const settingsFile = path.join(registryDirectory, '.settings', `${appName}.json`); const settingsFile = path.join(registryDirectory(), '.settings', `${appName}.json`);
await page.exposeBinding('_saveSerializedSettings', false, (_, settings) => { await page.exposeBinding('_saveSerializedSettings', false, (_, settings) => {
fs.mkdirSync(path.dirname(settingsFile), { recursive: true }); fs.mkdirSync(path.dirname(settingsFile), { recursive: true });
fs.writeFileSync(settingsFile, settings); fs.writeFileSync(settingsFile, settings);

20
packages/playwright-core/src/server/registry/index.ts
View file

@ -324,7 +324,7 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
} as DownloadPaths, } as DownloadPaths,
}; };
export const registryDirectory = (() => { export function registryDirectory() {
let result: string; let result: string;
const envDefined = getFromENV('PLAYWRIGHT_BROWSERS_PATH'); const envDefined = getFromENV('PLAYWRIGHT_BROWSERS_PATH');
@ -354,7 +354,7 @@ export const registryDirectory = (() => {
result = path.resolve(getFromENV('INIT_CWD') || process.cwd(), result); result = path.resolve(getFromENV('INIT_CWD') || process.cwd(), result);
} }
return result; return result;
})(); }
function isBrowserDirectory(browserDirectory: string): boolean { function isBrowserDirectory(browserDirectory: string): boolean {
const baseName = path.basename(browserDirectory); const baseName = path.basename(browserDirectory);
@ -403,7 +403,7 @@ function readDescriptors(browsersJSON: BrowsersJSON): BrowsersJSONDescriptor[] {
// are prefixes of others, e.g. 'webkit' is a prefix of `webkit-technology-preview`. // are prefixes of others, e.g. 'webkit' is a prefix of `webkit-technology-preview`.
// To avoid older registries erroneously removing 'webkit-technology-preview', we have to // To avoid older registries erroneously removing 'webkit-technology-preview', we have to
// ensure that browser folders to never include dashes inside. // ensure that browser folders to never include dashes inside.
dir: path.join(registryDirectory, browserDirectoryPrefix.replace(/-/g, '_') + '-' + revision), dir: path.join(registryDirectory(), browserDirectoryPrefix.replace(/-/g, '_') + '-' + revision),
}; };
return descriptor; return descriptor;
}); });
@ -913,13 +913,13 @@ export class Registry {
async install(executablesToInstall: Executable[], forceReinstall: boolean) { async install(executablesToInstall: Executable[], forceReinstall: boolean) {
const executables = this._dedupe(executablesToInstall); const executables = this._dedupe(executablesToInstall);
await fs.promises.mkdir(registryDirectory, { recursive: true }); await fs.promises.mkdir(registryDirectory(), { recursive: true });
const lockfilePath = path.join(registryDirectory, '__dirlock'); const lockfilePath = path.join(registryDirectory(), '__dirlock');
const linksDir = path.join(registryDirectory, '.links'); const linksDir = path.join(registryDirectory(), '.links');
let releaseLock; let releaseLock;
try { try {
releaseLock = await lockfile.lock(registryDirectory, { releaseLock = await lockfile.lock(registryDirectory(), {
retries: { retries: {
// Retry 20 times during 10 minutes with // Retry 20 times during 10 minutes with
// exponential back-off. // exponential back-off.
@ -991,7 +991,7 @@ export class Registry {
} }
async uninstall(all: boolean): Promise<{ numberOfBrowsersLeft: number }> { async uninstall(all: boolean): Promise<{ numberOfBrowsersLeft: number }> {
const linksDir = path.join(registryDirectory, '.links'); const linksDir = path.join(registryDirectory(), '.links');
if (all) { if (all) {
const links = await fs.promises.readdir(linksDir).catch(() => []); const links = await fs.promises.readdir(linksDir).catch(() => []);
for (const link of links) for (const link of links)
@ -1003,7 +1003,7 @@ export class Registry {
// Remove stale browsers. // Remove stale browsers.
await this._validateInstallationCache(linksDir); await this._validateInstallationCache(linksDir);
return { return {
numberOfBrowsersLeft: (await fs.promises.readdir(registryDirectory).catch(() => [])).filter(browserDirectory => isBrowserDirectory(browserDirectory)).length numberOfBrowsersLeft: (await fs.promises.readdir(registryDirectory()).catch(() => [])).filter(browserDirectory => isBrowserDirectory(browserDirectory)).length
}; };
} }
@ -1177,7 +1177,7 @@ export class Registry {
// 2. Delete all unused browsers. // 2. Delete all unused browsers.
if (!getAsBooleanFromENV('PLAYWRIGHT_SKIP_BROWSER_GC')) { if (!getAsBooleanFromENV('PLAYWRIGHT_SKIP_BROWSER_GC')) {
let downloadedBrowsers = (await fs.promises.readdir(registryDirectory)).map(file => path.join(registryDirectory, file)); let downloadedBrowsers = (await fs.promises.readdir(registryDirectory())).map(file => path.join(registryDirectory(), file));
downloadedBrowsers = downloadedBrowsers.filter(file => isBrowserDirectory(file)); downloadedBrowsers = downloadedBrowsers.filter(file => isBrowserDirectory(file));
const directories = new Set<string>(downloadedBrowsers); const directories = new Set<string>(downloadedBrowsers);
for (const browserDirectory of usedBrowserPaths) for (const browserDirectory of usedBrowserPaths)