@skrillex1224/playwright-toolkit 3.0.14 → 3.0.16

package/dist/index.js

@@ -16,6 +16,7 @@ __export(constants_exports, {
   Mode: () => Mode,
   PresetOfLiveViewKey: () => PresetOfLiveViewKey,
   Status: () => Status,
+  mode: () => mode,
   normalizeDevice: () => normalizeDevice,
   normalizeMode: () => normalizeMode
 });
@@ -41,6 +42,10 @@ var Mode = Object.freeze({
   Default: "default",
   Cloak: "cloak"
 });
+var mode = Object.freeze({
+  default: Mode.Default,
+  cloak: Mode.Cloak
+});
 var normalizeDevice = (value, fallback = Device.Desktop) => {
   const normalizedFallback = String(fallback || "").trim().toLowerCase() === Device.Mobile ? Device.Mobile : Device.Desktop;
   const raw = String(value || "").trim().toLowerCase();
@@ -69,7 +74,7 @@ var createActorInfo = (info) => {
   const normalizeShare2 = (value) => {
     const raw = value && typeof value === "object" ? value : {};
     const modeRaw = String(raw.mode || "dom").trim().toLowerCase();
-    const mode = ["dom", "response", "custom"].includes(modeRaw) ? modeRaw : "dom";
+    const mode2 = ["dom", "response", "custom"].includes(modeRaw) ? modeRaw : "dom";
     const prefix = String(raw.prefix || "").trim();
     const rawXurl = Array.isArray(raw.xurl) ? raw.xurl : [];
     const normalizeMatcherList = (input) => {
@@ -114,7 +119,7 @@ var createActorInfo = (info) => {
       xurl.push(...extraPaths);
     }
     return {
-      mode,
+      mode: mode2,
       prefix,
       xurl
     };
@@ -2494,16 +2499,16 @@ var ToolkitContext = {
   get mode() {
     return state.mode;
   },
-  setMode(mode = Mode.Default) {
-    state.mode = normalizeMode(mode, Mode.Default);
+  setMode(mode2 = Mode.Default) {
+    state.mode = normalizeMode(mode2, Mode.Default);
     return state.mode;
   }
 };
 var getToolkitMode = () => state.mode;
-var setToolkitMode = (mode = Mode.Default) => ToolkitContext.setMode(mode);
-var resolveModeStrategy = (strategies = {}, mode = getToolkitMode(), fallbackMode = Mode.Default) => {
+var setToolkitMode = (mode2 = Mode.Default) => ToolkitContext.setMode(mode2);
+var resolveModeStrategy = (strategies = {}, mode2 = getToolkitMode(), fallbackMode = Mode.Default) => {
   const normalizedStrategies = normalizeStrategies(strategies);
-  const normalizedMode = normalizeMode(mode, fallbackMode);
+  const normalizedMode = normalizeMode(mode2, fallbackMode);
   const strategy = normalizedStrategies[normalizedMode] ?? normalizedStrategies[fallbackMode] ?? Object.values(normalizedStrategies).find(Boolean) ?? null;
   return {
     mode: normalizedMode,
@@ -2530,10 +2535,10 @@ var methodDescriptor = (namespace, name, resolveTarget) => ({
   configurable: true,
   writable: true,
   value: (...args) => {
-    const { mode, strategy } = resolveTarget(args);
+    const { mode: mode2, strategy } = resolveTarget(args);
     const method = strategy?.[name];
     if (typeof method !== "function") {
-      throw new Error(`${namespace}.${name} is not available in ${mode} mode`);
+      throw new Error(`${namespace}.${name} is not available in ${mode2} mode`);
     }
     return method.apply(strategy, args);
   }
@@ -4779,6 +4784,7 @@ var Humanize2 = withModeReflect("Humanize", humanizeStrategies);
 import { execFileSync } from "node:child_process";
 import { FingerprintGenerator } from "fingerprint-generator";
 import { FingerprintInjector } from "fingerprint-injector";
+import { chromium as defaultChromiumLauncher } from "playwright";
 
 // src/proxy-bypass.js
 import picomatch from "picomatch";
@@ -5184,13 +5190,14 @@ var DefaultLaunch = {
       runtimeState = null
     } = normalizedOptions;
     const device = resolveRuntimeDevice(runtimeState);
+    const effectiveLauncher = launcher || defaultChromiumLauncher;
     const enableByPassLogger = Boolean(logOptions && logOptions.enable);
     const traffic = resolveLaunchTraffic({ proxyConfiguration, debugMode });
     const trafficHook = createLaunchTrafficHook({
       ...traffic,
       enabled: enableByPassLogger
     });
-    const replayContext = buildReplayableBrowserProfile(runtimeState, launcher);
+    const replayContext = buildReplayableBrowserProfile(runtimeState, effectiveLauncher);
     const replayBrowserPoolOptions = buildReplayBrowserPoolOptions(replayContext.browserProfileCore);
     const launchLocale = String(replayContext.browserProfileCore?.locale || DEFAULT_LOCALE).trim() || DEFAULT_LOCALE;
     const launchOptions = {
@@ -5220,11 +5227,9 @@ var DefaultLaunch = {
     };
     const launchContext = {
       useIncognitoPages: true,
-      launchOptions
+      launchOptions,
+      launcher: effectiveLauncher
     };
-    if (launcher) {
-      launchContext.launcher = launcher;
-    }
     const crawlerBaseOptions = {
       ...DEFAULT_CRAWLER_BASE_OPTIONS,
       headless: !runInHeadfulMode || isRunningOnApify,
@@ -6882,8 +6887,8 @@ var Mutation = {
     const selectorList = Array.isArray(selectors) ? selectors : [selectors];
     const onMutation = options.onMutation;
     const rawMode = String(options.mode || MUTATION_MONITOR_MODE.Added).toLowerCase();
-    const mode = [MUTATION_MONITOR_MODE.Added, MUTATION_MONITOR_MODE.Changed, MUTATION_MONITOR_MODE.All].includes(rawMode) ? rawMode : MUTATION_MONITOR_MODE.Added;
-    logger13.start("useMonitor", `\u76D1\u63A7 ${selectorList.length} \u4E2A\u9009\u62E9\u5668, mode=${mode}`);
+    const mode2 = [MUTATION_MONITOR_MODE.Added, MUTATION_MONITOR_MODE.Changed, MUTATION_MONITOR_MODE.All].includes(rawMode) ? rawMode : MUTATION_MONITOR_MODE.Added;
+    logger13.start("useMonitor", `\u76D1\u63A7 ${selectorList.length} \u4E2A\u9009\u62E9\u5668, mode=${mode2}`);
     const monitorKey = generateKey("pk_mon");
     const callbackName = generateKey("pk_mon_cb");
     const cleanerName = generateKey("pk_mon_clean");
@@ -6898,7 +6903,7 @@ var Mutation = {
       } catch (e) {
       }
     }
-    await page.evaluate(({ selectorList: selectorList2, monitorKey: monitorKey2, callbackName: callbackName2, cleanerName: cleanerName2, hasCallback, mode: mode2 }) => {
+    await page.evaluate(({ selectorList: selectorList2, monitorKey: monitorKey2, callbackName: callbackName2, cleanerName: cleanerName2, hasCallback, mode: mode3 }) => {
       const monitor = {
         observers: [],
         totalMutations: 0,
@@ -6942,7 +6947,7 @@ var Mutation = {
       const collectMutationNodes = (mutations) => {
         const mutationNodes = [];
         for (const mutation of mutations) {
-          if (mode2 === "added") {
+          if (mode3 === "added") {
             if (mutation.type !== "childList") continue;
             const added = Array.from(mutation.addedNodes || []);
             for (const node of added) {
@@ -6950,7 +6955,7 @@ var Mutation = {
             }
             continue;
           }
-          if (mode2 === "changed") {
+          if (mode3 === "changed") {
             if (mutation.type === "attributes" || mutation.type === "characterData") {
               mutationNodes.push(serializeNode(mutation.target, mutation.type));
             } else if (mutation.type === "childList") {
@@ -7010,8 +7015,8 @@ var Mutation = {
           observer.observe(element, {
             childList: true,
             subtree: true,
-            characterData: mode2 !== "added",
-            attributes: mode2 !== "added"
+            characterData: mode3 !== "added",
+            attributes: mode3 !== "added"
           });
           monitor.observers.push(observer);
         });
@@ -7025,7 +7030,7 @@ var Mutation = {
         delete window[cleanerName2];
         return total;
       };
-    }, { selectorList, monitorKey, callbackName, cleanerName, hasCallback: !!onMutation, mode });
+    }, { selectorList, monitorKey, callbackName, cleanerName, hasCallback: !!onMutation, mode: mode2 });
     logger13.success("useMonitor", "\u76D1\u63A7\u5668\u5DF2\u542F\u52A8");
     return {
       stop: async () => {
@@ -8420,7 +8425,7 @@ var buildWatermarkifyRenderHtml = ({ imageSrc, overlaySvg, width, height, imageH
     `;
 };
 var normalizeWatermarkifyRenderMode = (value) => {
-  return String(value || "default").trim().toLowerCase() === "cloak" ? "cloak" : "default";
+  return String(value || Mode.Default).trim().toLowerCase() === Mode.Cloak ? Mode.Cloak : Mode.Default;
 };
 var composeScreenshotBufferWithBrowser = async (page, buffer, overlaySvg, imageInfo = {}, options = {}) => {
   if (!page || typeof page.context !== "function") {
@@ -8447,7 +8452,7 @@ var composeScreenshotBufferWithBrowser = async (page, buffer, overlaySvg, imageI
     }).catch(() => {
     });
     const renderMode = normalizeWatermarkifyRenderMode(options.mode);
-    if (renderMode === "cloak") {
+    if (renderMode === Mode.Cloak) {
       const renderHtml = buildWatermarkifyRenderHtml({
         imageSrc: `data:${imageInfo.mimeType || "image/png"};base64,${buffer.toString("base64")}`,
         overlaySvg,
@@ -9643,9 +9648,9 @@ var normalizeXurl = (value) => {
 var normalizeShare = (share) => {
   const source = share && typeof share === "object" ? share : {};
   const modeRaw = String(source.mode || "dom").trim().toLowerCase();
-  const mode = ["dom", "response", "custom"].includes(modeRaw) ? modeRaw : "dom";
+  const mode2 = ["dom", "response", "custom"].includes(modeRaw) ? modeRaw : "dom";
   return {
-    mode,
+    mode: mode2,
     prefix: normalizePrefix(source.prefix),
     xurl: normalizeXurl(source.xurl)
   };
@@ -9706,13 +9711,13 @@ var parseJsonSafely = (text) => {
 var createDomShareMonitor = async (page, options = {}) => {
   const prefix = normalizePrefix(options.prefix);
   const selectors = options.selectors ?? "html";
-  const mode = options.mode ?? Mutation.Mode.All;
+  const mode2 = options.mode ?? Mutation.Mode.All;
   const onMatch = typeof options.onMatch === "function" ? options.onMatch : null;
   const onTelemetry = typeof options.onTelemetry === "function" ? options.onTelemetry : null;
   let matched = false;
-  logger16.info(`DOM \u76D1\u542C\u51C6\u5907\u6302\u8F7D: selectors=${toJsonInline(selectors, 120)}, mode=${mode}`);
+  logger16.info(`DOM \u76D1\u542C\u51C6\u5907\u6302\u8F7D: selectors=${toJsonInline(selectors, 120)}, mode=${mode2}`);
   const monitor = await Mutation.useMonitor(page, selectors, {
-    mode,
+    mode: mode2,
     onMutation: (context = {}) => {
       if (matched) return;
       const mutationCount = Number(context.mutationCount || 0);
@@ -10028,13 +10033,14 @@ var Share = {
    * @param {number} [options.maxBytes] 默认 5MiB，返回 base64 超过后会压缩
    * @param {'jpeg'|'jpg'} [options.type] 压缩输出格式，默认 jpeg
    * @param {boolean|Object} [options.compression] 传 false 可关闭压缩
-   * @param {'default'|'cloak'} [options.mode] 截图水印合成模式，默认 default
+   * @param {'default'|'cloak'} [options.mode] 截图水印合成模式，默认取当前 toolkit mode
    * @returns {Promise<string>} base64 image
    */
   async captureScreen(page, options = {}) {
     const restore = options.restore ?? false;
     const screenshotWatermarkify = resolveCaptureScreenWatermarkify(page, options.watermarkify);
     const compression = resolveImageCompression(options);
+    const screenshotMode = options.mode ?? getToolkitMode();
     const captureOptions = {
       restore,
       maxHeight: options.maxHeight,
@@ -10050,7 +10056,7 @@ var Share = {
         capturedAt
       });
       outputBuffer = await watermarkifyScreenshotBuffer(rawBuffer, watermarkifyMeta, page, {
-        mode: options.mode
+        mode: screenshotMode
       });
     }
     return await compressImageBufferToBase64(outputBuffer, compression);
@@ -10059,8 +10065,12 @@ var Share = {
 
 // entrys/node.js
 Logger.setLogger(crawleeLog);
-var usePlaywrightToolKit = (mode = "default") => {
-  setToolkitMode(mode);
+var ToolkitMode = Object.freeze({
+  default: Mode.Default,
+  cloak: Mode.Cloak
+});
+var usePlaywrightToolKit = (mode2 = Mode.Default) => {
+  setToolkitMode(mode2);
   const toolkit = {
     ApifyKit,
     AntiCheat,
@@ -10083,6 +10093,7 @@ var usePlaywrightToolKit = (mode = "default") => {
   };
   return toolkit;
 };
+usePlaywrightToolKit.Mode = ToolkitMode;
 export {
   usePlaywrightToolKit
 };