@skrillex1224/playwright-toolkit 2.1.285 → 2.1.287

package/dist/internals/proxy-meter.js

@@ -32,6 +32,25 @@ const state = {
     : null,
 };
 
+const formatFatalError = (error) => {
+  if (error instanceof Error) {
+    return error.stack || error.message || String(error);
+  }
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return String(error);
+  }
+};
+
+const exitAfterFatal = (kind, error) => {
+  try {
+    console.error(`[proxy-meter] fatal ${kind}: ${formatFatalError(error)}`);
+  } catch {}
+  flushSnapshot();
+  process.exit(1);
+};
+
 const getHostBucket = (host) => {
   if (!host) return null;
   if (!state.hosts[host]) {
@@ -60,6 +79,21 @@ const safeError = (error) => {
   return message.length > 240 ? message.slice(0, 240) : message;
 };
 
+const sendBadGateway = (res, error = null) => {
+  if (!res || res.destroyed || res.writableEnded) return;
+
+  try {
+    if (!res.headersSent) {
+      res.writeHead(502);
+      res.end('Bad Gateway');
+      return;
+    }
+
+    // Headers are already committed; the only truthful error signal left is closing the stream.
+    res.destroy(error instanceof Error ? error : undefined);
+  } catch {}
+};
+
 const statusLabel = (statusCode, error) => {
   const code = Number(statusCode) || 0;
   if (error || code <= 0) return 'ERR';
@@ -349,8 +383,7 @@ const forwardHttp = (req, res) => {
 
   if (!target) {
     tracker.close({ statusCode: 0, error: 'invalid_target_url' });
-    res.writeHead(502);
-    res.end('Bad Gateway');
+    sendBadGateway(res);
     return;
   }
 
@@ -381,7 +414,19 @@ const forwardHttp = (req, res) => {
   let responseStatus = 0;
   const proxyReq = http.request(requestOptions, (proxyRes) => {
     responseStatus = Number(proxyRes.statusCode) || 0;
-    res.writeHead(responseStatus || 502, proxyRes.headers);
+    if (res.destroyed || res.writableEnded) {
+      tracker.close({ statusCode: responseStatus || 499, error: 'client_response_closed' });
+      proxyRes.resume();
+      return;
+    }
+    try {
+      res.writeHead(responseStatus || 502, proxyRes.headers);
+    } catch (error) {
+      tracker.close({ statusCode: responseStatus, error: safeError(error) });
+      proxyRes.resume();
+      sendBadGateway(res, error);
+      return;
+    }
     proxyRes.on('data', (chunk) => {
       const size = chunk?.length || 0;
       addTraffic(hostname, 'in', size);
@@ -412,8 +457,7 @@ const forwardHttp = (req, res) => {
 
   proxyReq.on('error', (error) => {
     tracker.close({ statusCode: responseStatus, error: safeError(error) });
-    res.writeHead(502);
-    res.end('Bad Gateway');
+    sendBadGateway(res, error);
   });
 };
 
@@ -545,5 +589,7 @@ const shutdown = () => {
   process.exit(0);
 };
 
+process.on('uncaughtException', (error) => exitAfterFatal('uncaughtException', error));
+process.on('unhandledRejection', (error) => exitAfterFatal('unhandledRejection', error));
 process.on('SIGINT', shutdown);
 process.on('SIGTERM', shutdown);

package/index.d.ts

@@ -18,23 +18,14 @@ export interface StatusType {
     Failed: 'FAILED';
 }
 
-export interface ModeType {
-    Default: 'default';
-    CloakBrowser: 'cloakbrowser';
-}
-
-export type ToolkitMode = 'default' | 'cloakbrowser';
-
 export interface ConstantsModule {
     Code: CodeType;
     Status: StatusType;
-    Mode: ModeType;
     PresetOfLiveViewKey: string;
     Device: {
         Desktop: 'desktop';
         Mobile: 'mobile';
     };
-    normalizeMode(value?: unknown, fallback?: ToolkitMode): ToolkitMode;
     normalizeDevice(value?: unknown, fallback?: RuntimeDevice): RuntimeDevice;
     ActorInfo: Record<string, ActorInfoItem>;
 }
@@ -42,7 +33,7 @@ export interface ConstantsModule {
 export type RuntimeDevice = 'desktop' | 'mobile';
 
 export interface ActorShareInfo {
-    mode: 'dom' | 'response' | 'custom';
+    mode: 'dom' | 'response';
     prefix: string;
     xurl: Array<string | string[]>;
 }
@@ -426,6 +417,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;
@@ -437,6 +432,7 @@ export interface GetPlaywrightCrawlerOptionsInput {
     isRunningOnApify?: boolean;
     launcher?: any;
     runtimeState?: RuntimeEnvState | null;
+    hooks?: LaunchHooks;
     preNavigationHooks?: CrawlerNavigationHook[];
     postNavigationHooks?: CrawlerNavigationHook[];
 }
@@ -450,47 +446,6 @@ export interface LaunchModule {
     getPlaywrightCrawlerOptions(options?: GetPlaywrightCrawlerOptionsInput): PlaywrightCrawlerOptions;
 }
 
-export interface CloakBrowserResolvedProxy {
-    server: string;
-    username?: string;
-    password?: string;
-    bypass?: string;
-}
-
-export interface CreateCloakBrowserCrawlerRuntimeInput {
-    proxyConfiguration?: ProxyConfiguration;
-    runInHeadfulMode?: boolean;
-    isRunningOnApify?: boolean;
-    launcher?: any;
-    cloakOptions?: Record<string, any>;
-    humanizeOptions?: boolean | Record<string, any>;
-    crawlerBaseOptions?: Partial<CrawlerBaseOptions>;
-    browserPoolOptions?: Record<string, any>;
-    launchContext?: Record<string, any>;
-    preNavigationHooks?: CrawlerNavigationHook[];
-    postNavigationHooks?: CrawlerNavigationHook[];
-    recommendedGotoOptions?: Record<string, any>;
-}
-
-export interface CloakBrowserCrawlerRuntime {
-    headless: boolean;
-    launchOptions: LaunchOptions;
-    fingerprintArg: string;
-    crawlerOptions: PlaywrightCrawlerOptions;
-    closeActiveBrowsers(): Promise<void>;
-    forceTerminateActiveProcesses(): Promise<void>;
-    cleanup(): Promise<void>;
-}
-
-export interface CloakLaunchModule extends Omit<LaunchModule, 'getPlaywrightCrawlerOptions'> {
-    getPlaywrightCrawlerOptions(options?: GetPlaywrightCrawlerOptionsInput | CreateCloakBrowserCrawlerRuntimeInput): Promise<PlaywrightCrawlerOptions>;
-    resolveProxyConfiguration(proxyConfiguration?: ProxyConfiguration): string | CloakBrowserResolvedProxy | null;
-    extractFingerprintArg(launchOptions?: LaunchOptions): string;
-    createStableGotoHook(recommendedGotoOptions?: Record<string, any>): CrawlerNavigationHook;
-    buildLaunchOptions(options?: Record<string, any>): Promise<LaunchOptions>;
-    createPlaywrightCrawlerRuntime(options?: CreateCloakBrowserCrawlerRuntimeInput): Promise<CloakBrowserCrawlerRuntime>;
-}
-
 // =============================================================================
 // LiveView
 // =============================================================================
@@ -704,8 +659,6 @@ export interface ShareScreenCaptureOptions {
     restore?: boolean;
     /** 最大截图高度 (默认: 8000px) */
     maxHeight?: number;
-    /** 截图水印合成模式；`cloakbrowser` 时走兼容分支。 */
-    mode?: 'default' | 'cloakbrowser';
     /** 返回 base64 字符串的最大字节数，默认 5MiB。 */
     maxBytes?: number;
     /** maxBytes 的别名。 */
@@ -892,10 +845,6 @@ export interface PlaywrightToolKit {
     };
 }
 
-export interface CloakPlaywrightToolKit extends PlaywrightToolKit {
-    Launch: CloakLaunchModule;
-}
-
 /** Browser/Extension version of the toolkit */
 export interface BrowserPlaywrightToolKit {
     Logger: LoggerModule;
@@ -910,5 +859,3 @@ export interface BrowserPlaywrightToolKit {
 }
 
 export declare function usePlaywrightToolKit(): PlaywrightToolKit;
-export declare function usePlaywrightToolKit(mode: 'default'): PlaywrightToolKit;
-export declare function usePlaywrightToolKit(mode: 'cloakbrowser'): CloakPlaywrightToolKit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skrillex1224/playwright-toolkit",
-  "version": "2.1.285",
+  "version": "2.1.287",
   "description": "一个在 Apify/Crawlee Actor 中启用实时截图视图的实用工具库。",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -59,16 +59,10 @@
   },
   "peerDependencies": {
     "apify": "*",
-    "cloakbrowser": "*",
     "crawlee": "*",
     "ghost-cursor-playwright": "*",
     "playwright": "*"
   },
-  "peerDependenciesMeta": {
-    "cloakbrowser": {
-      "optional": true
-    }
-  },
   "devDependencies": {
     "esbuild": "^0.24.2"
   }