@skrillex1224/playwright-toolkit 3.0.18 → 3.0.21

package/index.d.ts

@@ -432,6 +432,10 @@ export interface CrawlerNavigationHook {
     (crawlingContext: any, gotoOptions: Record<string, any>): Promise<void> | void;
 }
 
+export interface LaunchHooks {
+    modifyPageOptions?: (pageOptions: Record<string, any>, context: { pageId: string; browserController: any }) => Promise<void> | void;
+}
+
 export interface GetPlaywrightCrawlerOptionsInput {
     customArgs?: string[];
     proxyConfiguration?: ProxyConfiguration;
@@ -443,6 +447,7 @@ export interface GetPlaywrightCrawlerOptionsInput {
     isRunningOnApify?: boolean;
     launcher?: any;
     runtimeState?: RuntimeEnvState | null;
+    hooks?: LaunchHooks;
     preNavigationHooks?: CrawlerNavigationHook[];
     postNavigationHooks?: CrawlerNavigationHook[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skrillex1224/playwright-toolkit",
-  "version": "3.0.18",
+  "version": "3.0.21",
   "description": "一个在 Apify/Crawlee Actor 中启用实时截图视图的实用工具库。",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -22,14 +22,12 @@
   },
   "scripts": {
     "build": "node build.js",
-    "postinstall": "node ./scripts/postinstall.js",
     "release": "npm run build && npm version patch && npm publish --registry https://registry.npmjs.org --access public --userconfig ../.npmrc",
     "prepublishOnly": "npm run build",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "files": [
     "dist/",
-    "scripts/",
     "browser.d.ts",
     "index.d.ts",
     "README.md"
@@ -61,16 +59,10 @@
   },
   "peerDependencies": {
     "apify": "*",
-    "cloakbrowser": "*",
     "crawlee": "*",
     "ghost-cursor-playwright": "*",
     "playwright": "*"
   },
-  "peerDependenciesMeta": {
-    "cloakbrowser": {
-      "optional": true
-    }
-  },
   "devDependencies": {
     "esbuild": "^0.24.2"
   }

package/scripts/postinstall.js

@@ -1,203 +0,0 @@
-#!/usr/bin/env node
-
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-
-const SCRIPT_DIR = path.dirname(fileURLToPath(import.meta.url));
-const PACKAGE_ROOT = path.resolve(SCRIPT_DIR, '..');
-const PREFIX = '[playwright-toolkit:postinstall]';
-const SKIP_ENV = 'PLAYWRIGHT_TOOLKIT_SKIP_CLOAK_POSTINSTALL';
-
-const log = (message) => console.log(`${PREFIX} ${message}`);
-const warn = (message) => console.warn(`${PREFIX} ${message}`);
-
-const isTruthy = (value) => /^(1|true|yes|on)$/i.test(String(value || '').trim());
-
-const readTrimmedFile = (filePath) => {
-    try {
-        return fs.readFileSync(filePath, 'utf8').trim();
-    } catch {
-        return '';
-    }
-};
-
-const isBinaryReady = (binaryPath) => {
-    if (!binaryPath || !fs.existsSync(binaryPath)) {
-        return false;
-    }
-
-    if (process.platform === 'win32') {
-        return true;
-    }
-
-    try {
-        fs.accessSync(binaryPath, fs.constants.X_OK);
-        return true;
-    } catch {
-        return false;
-    }
-};
-
-function* walkParentDirs(startDir) {
-    let currentDir = path.resolve(startDir);
-    while (true) {
-        yield currentDir;
-
-        const parentDir = path.dirname(currentDir);
-        if (parentDir === currentDir) {
-            return;
-        }
-
-        currentDir = parentDir;
-    }
-}
-
-const findPackageRoot = (startDir, packageName) => {
-    for (const currentDir of walkParentDirs(startDir)) {
-        const packageJsonPath = path.join(currentDir, 'package.json');
-        if (!fs.existsSync(packageJsonPath)) {
-            continue;
-        }
-
-        try {
-            const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-            if (packageJson?.name === packageName) {
-                return currentDir;
-            }
-        } catch {
-            // Ignore invalid JSON and keep walking.
-        }
-    }
-
-    return null;
-};
-
-const findInstalledCloakRoot = async () => {
-    try {
-        const resolvedEntryUrl = await import.meta.resolve('cloakbrowser');
-        const resolvedEntryPath = fileURLToPath(resolvedEntryUrl);
-        const packageRoot = findPackageRoot(path.dirname(resolvedEntryPath), 'cloakbrowser');
-        if (packageRoot) {
-            return packageRoot;
-        }
-    } catch {
-        // Fall back to filesystem lookup.
-    }
-
-    const searchRoots = [
-        process.env.INIT_CWD,
-        process.cwd(),
-        process.env.npm_config_local_prefix,
-        PACKAGE_ROOT,
-        SCRIPT_DIR,
-    ].filter(Boolean);
-
-    for (const searchRoot of new Set(searchRoots)) {
-        for (const currentDir of walkParentDirs(searchRoot)) {
-            const packageJsonPath = path.join(currentDir, 'node_modules', 'cloakbrowser', 'package.json');
-            if (fs.existsSync(packageJsonPath)) {
-                return path.dirname(packageJsonPath);
-            }
-        }
-    }
-
-    return null;
-};
-
-const clearStaleVersionMarkers = ({ cacheDir, expectedVersion, platformTag }) => {
-    let clearedMarkers = 0;
-
-    for (const markerName of [`latest_version_${platformTag}`, 'latest_version']) {
-        const markerPath = path.join(cacheDir, markerName);
-        const markerVersion = readTrimmedFile(markerPath);
-
-        if (!markerVersion || markerVersion === expectedVersion) {
-            continue;
-        }
-
-        fs.rmSync(markerPath, { force: true });
-        clearedMarkers += 1;
-        log(`Removed stale ${markerName}=${markerVersion} to keep cloakbrowser pinned to ${expectedVersion}.`);
-    }
-
-    return clearedMarkers;
-};
-
-const main = async () => {
-    if (isTruthy(process.env[SKIP_ENV])) {
-        log(`Skipped because ${SKIP_ENV} is set.`);
-        return;
-    }
-
-    const cloakRoot = await findInstalledCloakRoot();
-    if (!cloakRoot) {
-        log('cloakbrowser is not installed; skipping binary preinstall.');
-        return;
-    }
-
-    const [cloakModule, cloakConfig] = await Promise.all([
-        import(pathToFileURL(path.join(cloakRoot, 'dist', 'index.js')).href),
-        import(pathToFileURL(path.join(cloakRoot, 'dist', 'config.js')).href),
-    ]);
-
-    const localBinaryOverride = cloakConfig.getLocalBinaryOverride?.();
-    if (localBinaryOverride) {
-        if (!fs.existsSync(localBinaryOverride)) {
-            throw new Error(`CLOAKBROWSER_BINARY_PATH points to a missing file: ${localBinaryOverride}`);
-        }
-
-        log(`Using CLOAKBROWSER_BINARY_PATH=${localBinaryOverride}; skipping managed binary install.`);
-        return;
-    }
-
-    try {
-        cloakConfig.checkPlatformAvailable?.();
-    } catch (error) {
-        warn(`${error?.message || String(error)} Skipping managed binary install.`);
-        return;
-    }
-
-    const expectedVersion = cloakConfig.getChromiumVersion();
-    const platformTag = cloakConfig.getPlatformTag();
-    const cacheDir = cloakConfig.getCacheDir();
-    const expectedBinaryPath = cloakConfig.getBinaryPath(expectedVersion);
-
-    process.env.CLOAKBROWSER_AUTO_UPDATE = 'false';
-
-    const clearedMarkers = clearStaleVersionMarkers({
-        cacheDir,
-        expectedVersion,
-        platformTag,
-    });
-
-    if (isBinaryReady(expectedBinaryPath)) {
-        const suffix = clearedMarkers > 0 ? ' Cleared stale version markers.' : '';
-        log(`cloakbrowser ${expectedVersion} already available at ${expectedBinaryPath}.${suffix}`);
-        return;
-    }
-
-    log(`Installing cloakbrowser ${expectedVersion} for ${platformTag}...`);
-    const resolvedBinaryPath = await cloakModule.ensureBinary();
-
-    if (!isBinaryReady(expectedBinaryPath)) {
-        throw new Error(
-            `Expected cloakbrowser binary at ${expectedBinaryPath}, but it is still missing after ensureBinary() returned ${resolvedBinaryPath}.`,
-        );
-    }
-
-    if (path.resolve(resolvedBinaryPath) !== path.resolve(expectedBinaryPath)) {
-        warn(
-            `ensureBinary() returned ${resolvedBinaryPath}, expected ${expectedBinaryPath}. `
-            + 'The package-pinned binary is installed and stale version markers were cleared.',
-        );
-    }
-
-    log(`cloakbrowser ${expectedVersion} ready at ${expectedBinaryPath}.`);
-};
-
-main().catch((error) => {
-    const message = error?.stack || error?.message || String(error);
-    console.error(`${PREFIX} ${message}`);
-    process.exit(1);
-});