@karinjs/plugin-puppeteer 1.0.21 → 1.1.2

package/dist/{chunk-TPFKFKF4.js → chunk-PIY2AHNK.js}

@@ -6,7 +6,7 @@ import { basePath } from 'node-karin/root';
 // package.json
 var package_default = {
   name: "@karinjs/plugin-puppeteer",
-  version: "1.0.21",
+  version: "1.1.2",
   description: "karin\u7684 puppeteer\u622A\u56FE\u3001\u6E32\u67D3\u63D2\u4EF6",
   keywords: [
     "karin",
@@ -22,24 +22,21 @@ var package_default = {
   main: "dist/index.js",
   types: "dist/index.d.ts",
   files: [
-    "dist",
-    "!LICENSE",
-    "!README.md"
+    "dist"
   ],
   scripts: {
     build: "tsc && tsup",
-    dev: "tsx src/index.ts",
+    dev: "tsx src/app.ts",
     "dev:test": "node dist/index.js",
     pub: "pnpm publish --access public",
     rm: `node -e "require('fs').rmSync('dist', { recursive: true, force: true })"`,
     sync: 'curl -X PUT "https://registry-direct.npmmirror.com/-/package/@karinjs/plugin-puppeteer/syncs"'
   },
   dependencies: {
-    "@karinjs/puppeteer": "workspace:*"
+    "@snapka/puppeteer": "0.1.5"
   },
   devDependencies: {
-    "@karinjs/puppeteer-types": "workspace:*",
-    "node-karin": "^1.7.12"
+    "node-karin": "^1.13.0"
   },
   karin: {
     main: "src/index.ts",
@@ -48,49 +45,29 @@ var package_default = {
     "ts-web": "src/web.config.ts",
     files: [
       "config"
-    ],
-    env: [
-      {
-        key: "PUPPETEER_CACHE_DIR",
-        value: "",
-        comment: "Puppeteer\u7F13\u5B58\u7684\u9ED8\u8BA4\u6839\u76EE\u5F55"
-      },
-      {
-        key: "PUPPETEER_CACHE_VERSION",
-        value: "",
-        comment: "\u8BB0\u5F55puppeteer\u4E0B\u8F7D\u8FC7\u7684\u6D4F\u89C8\u5668\u4FE1\u606F"
-      },
-      {
-        key: "PUPPETEER_CHROME_HEADLESS_SHELL_VERSION",
-        value: "",
-        comment: "Puppeteer\u4E0B\u8F7D\u6D4F\u89C8\u5668\u7684\u7248\u672C"
-      },
-      {
-        key: "PUPPETEER_EXECUTABLE_PATH",
-        value: "",
-        comment: "Puppeteer\u53EF\u6267\u884C\u6587\u4EF6\u8DEF\u5F84 \u914D\u7F6E\u540E\u5C06\u4F7F\u7528\u6B64\u8DEF\u5F84\u7684\u6D4F\u89C8\u5668"
-      },
-      {
-        key: "PUPPETEER_CHROME_HEADLESS_SHELL_DOWNLOAD_BASE_URL",
-        value: "",
-        comment: "Puppeteer\u6D4F\u89C8\u5668host\u5730\u5740"
-      }
     ]
   },
   timestamp: "2025-10-01T00:47:22.222Z"
 };
 var HMR_KEY = "karin-plugin-puppeteer-hmr";
 var defaultConfig = {
-  downloadBrowser: "chrome",
   protocol: "cdp",
-  headless: true,
+  headless: "shell",
   debug: false,
-  maxPages: 10,
-  idleTime: 500,
-  hmr: false,
-  executablePath: "",
-  pipe: false,
-  userDataDir: "",
+  findBrowser: true,
+  slowMo: 0,
+  maxOpenPages: 10,
+  pageMode: "reuse",
+  pageIdleTimeout: 6e4,
+  defaultViewport: {
+    width: 800,
+    height: 600
+  },
+  download: {
+    enable: true,
+    browser: "chrome-headless-shell",
+    version: "latest"
+  },
   args: [
     "--window-size=800,600",
     // 设置窗口大小

package/dist/index.d.ts

@@ -1 +1 @@
-export * from '@karinjs/puppeteer';
+export * from '@snapka/puppeteer';

package/dist/index.js

@@ -1,7 +1,7 @@
-import { getConfig, HMR_KEY, pluginVersion, pluginName } from './chunk-TPFKFKF4.js';
+import { getConfig, HMR_KEY, pluginVersion, pluginName } from './chunk-PIY2AHNK.js';
 import path from 'node:path';
-import { launch } from '@karinjs/puppeteer';
-export * from '@karinjs/puppeteer';
+import { snapka } from '@snapka/puppeteer';
+export * from '@snapka/puppeteer';
 import { karin, registerRender, renderTpl, logger } from 'node-karin';
 
 var formatBytes = (bytes) => {
@@ -13,7 +13,7 @@ var formatBytes = (bytes) => {
 };
 var getScreenshotByteSize = (payload, encoding) => {
   try {
-    if (payload == null) return void 0;
+    if (payload == null) return null;
     const enc = (encoding || "").toLowerCase();
     if (Array.isArray(payload)) {
       let total = 0;
@@ -37,35 +37,32 @@ var getScreenshotByteSize = (payload, encoding) => {
     if (anyPayload.buffer instanceof ArrayBuffer) return anyPayload.buffer.byteLength;
     if (typeof anyPayload.byteLength === "number") return anyPayload.byteLength;
     if (typeof anyPayload.length === "number") return anyPayload.length;
-    return void 0;
+    return null;
   } catch {
-    return void 0;
+    return null;
   }
 };
 var main = async () => {
   const config = getConfig();
-  const browser = await launch(config);
-  karin.on(HMR_KEY, (cfg) => browser.hmrConfig(cfg));
+  const browser = await snapka.launch(config);
+  karin.on(HMR_KEY, async () => {
+    await browser.restart();
+  });
   const name = "@karinjs/plugin-puppeteer";
   registerRender(name, async (options) => {
     options.encoding = "base64";
     const data = renderTpl(options);
     data.encoding = options.encoding;
     const time = Date.now();
-    const result = await browser.screenshot(data);
+    const { run } = await browser.screenshot(data);
+    const result = await run();
     const fileName = typeof data?.file === "string" ? path.basename(data.file) : "unknown";
-    if (!result.status) {
-      logger.info(
-        `[${name}][${fileName}] \u622A\u56FE\u5931\u8D25 \u8017\u65F6: ${logger.green(Date.now() - time + "")} ms`
-      );
-      throw new Error(result.data.message || "\u622A\u56FE\u5931\u8D25", { cause: result.data });
-    }
-    const sizeBytes = getScreenshotByteSize(result.data, options.encoding);
-    const sizeStr = sizeBytes != null ? `\u5927\u5C0F: ${logger.green(formatBytes(sizeBytes))} ` : "";
+    const sizeBytes = getScreenshotByteSize(result, options.encoding);
+    const sizeStr = typeof sizeBytes === "number" ? `\u5927\u5C0F: ${logger.green(formatBytes(sizeBytes))} ` : "";
     logger.info(
       `[${name}][${fileName}] \u622A\u56FE\u5B8C\u6210 ${sizeStr}\u8017\u65F6: ${logger.green(Date.now() - time + "")} ms`
     );
-    return result.data;
+    return result;
   });
   logger.info(`${logger.violet(`[\u63D2\u4EF6:${pluginVersion}]`)} ${logger.green(pluginName)} \u521D\u59CB\u5316\u5B8C\u6210~`);
 };

package/dist/web.config.d.ts

@@ -1,10 +1,10 @@
-import { LaunchOptions } from '@karinjs/puppeteer';
+import { PuppeteerLaunchOptions } from '@snapka/puppeteer';
 import { GetConfigResponse, ComponentConfig } from 'node-karin';
 
 declare const webConfig: {
     info: GetConfigResponse['info'];
     components: () => ComponentConfig[];
-    save: (config: LaunchOptions) => {
+    save: (config: PuppeteerLaunchOptions) => {
         success: boolean;
         message: string;
     };

package/dist/web.config.js

@@ -1,4 +1,4 @@
-import { package_default, saveConfig, getConfig } from './chunk-TPFKFKF4.js';
+import { package_default, saveConfig, getConfig } from './chunk-PIY2AHNK.js';
 import { components } from 'node-karin';
 
 var webConfig = {
@@ -25,22 +25,54 @@ var webConfig = {
   components: () => {
     const config = getConfig();
     return [
+      components.switch.create("downloadEnable", {
+        label: "\u542F\u7528\u6D4F\u89C8\u5668\u4E0B\u8F7D",
+        description: "\u662F\u5426\u542F\u7528\u6D4F\u89C8\u5668\u81EA\u52A8\u4E0B\u8F7D\u529F\u80FD",
+        defaultSelected: config.download?.enable !== false,
+        color: "success"
+      }),
       components.radio.group("downloadBrowser", {
         label: "\u4E0B\u8F7D\u7684\u6D4F\u89C8\u5668",
         orientation: "horizontal",
-        description: "\u6CA1\u6709\u6D4F\u89C8\u5668\u65F6\uFF0C\u4E0B\u8F7D\u7684\u6D4F\u89C8\u5668\u7248\u672C\uFF0Clinux\u63A8\u8350 chrome-headless-shell",
-        defaultValue: config.downloadBrowser,
+        description: "\u6CA1\u6709\u6D4F\u89C8\u5668\u65F6\uFF0C\u4E0B\u8F7D\u7684\u6D4F\u89C8\u5668\u7C7B\u578B\uFF0Clinux\u63A8\u8350 chrome-headless-shell",
+        defaultValue: config.download?.browser || "chrome",
         radio: [
           components.radio.create("chrome", {
             label: "chrome",
             value: "chrome"
           }),
+          components.radio.create("chromium", {
+            label: "chromium",
+            value: "chromium"
+          }),
           components.radio.create("chrome-headless-shell", {
             label: "chrome-headless-shell",
             value: "chrome-headless-shell"
           })
         ]
       }),
+      components.input.string("downloadVersion", {
+        label: "\u4E0B\u8F7D\u6D4F\u89C8\u5668\u7248\u672C",
+        description: "\u652F\u6301\uFF1Alatest\u3001stable\u3001beta\u3001dev\u3001canary \u6216\u7279\u5B9A\u7248\u672C\u53F7",
+        defaultValue: config.download?.version || "stable",
+        isRequired: false,
+        className: "inline-block p-2"
+      }),
+      components.input.string("downloadDir", {
+        label: "\u4E0B\u8F7D\u76EE\u5F55",
+        description: "\u6D4F\u89C8\u5668\u4E0B\u8F7D\u4FDD\u5B58\u76EE\u5F55\uFF0C\u4E3A\u7A7A\u5219\u4F7F\u7528\u9ED8\u8BA4\u8DEF\u5F84",
+        defaultValue: config.download?.dir || "",
+        isRequired: false,
+        className: "inline-block p-2"
+      }),
+      components.input.string("downloadBaseUrl", {
+        label: "\u81EA\u5B9A\u4E49\u4E0B\u8F7D\u6E90",
+        description: "\u81EA\u5B9A\u4E49\u4E0B\u8F7D\u6E90URL\uFF0C\u4E0D\u5EFA\u8BAE\u8BBE\u7F6E",
+        defaultValue: config.download?.baseUrl || "",
+        isRequired: false,
+        className: "inline-block p-2"
+      }),
+      components.divider.create("divider0"),
       components.radio.group("protocol", {
         label: "protocol",
         orientation: "horizontal",
@@ -62,23 +94,24 @@ var webConfig = {
       components.divider.create("divider1"),
       components.radio.group("headless", {
         label: "\u65E0\u5934\u6A21\u5F0F",
-        description: "\u662F\u5426\u65E0\u5934\u6A21\u5F0F\uFF0C\u65E0\u5934\u6A21\u5F0F\u4E0B\uFF0C\u6D4F\u89C8\u5668\u5C06\u540E\u53F0\u8FD0\u884C\uFF0C\u4E0D\u4F1A\u6253\u5F00\u6D4F\u89C8\u5668\u7A97\u53E3",
-        defaultValue: String(config.headless),
+        orientation: "horizontal",
+        description: "\u65E0\u5934\u6A21\u5F0F\u914D\u7F6E\uFF0C\u6700\u65B0\u7248chrome\u652F\u6301\u6240\u6709\u9009\u9879",
+        defaultValue: config.headless || "new",
         radio: [
-          components.radio.create("headless:true", {
-            label: "true",
-            value: "true",
-            description: "\u6253\u5F00\u65E0\u5934\u6A21\u5F0F"
-          }),
-          components.radio.create("headless:false", {
-            label: "false",
-            value: "false",
-            description: "\u5173\u95ED\u65E0\u5934\u6A21\u5F0F"
+          components.radio.create("new", {
+            label: "new",
+            value: "new",
+            description: "\u4F7F\u7528\u65B0\u7684\u65E0\u5934\u6A21\u5F0F\uFF08\u63A8\u8350\uFF09"
           }),
           components.radio.create("shell", {
             label: "shell",
             value: "shell",
-            description: "\u4F7F\u7528chrome-headless-shell"
+            description: "\u4F7F\u7528\u4F20\u7EDF\u65E0\u5934\u6A21\u5F0F\uFF08\u4EC5chrome-headless-shell\uFF09"
+          }),
+          components.radio.create("false", {
+            label: "false",
+            value: "false",
+            description: "\u4EE5\u6709\u5934\u6A21\u5F0F\u542F\u52A8\u6D4F\u89C8\u5668"
           })
         ]
       }),
@@ -89,11 +122,11 @@ var webConfig = {
         defaultSelected: config.debug,
         color: "success"
       }),
-      // hmr
-      components.switch.create("hmr", {
-        label: "\u70ED\u66F4\u65B0",
-        description: "\u662F\u5426\u5F00\u542F\u70ED\u66F4\u65B0\uFF0C\u5F00\u542F\u540E\uFF0C\u524D\u7AEF\u70B9\u51FB\u4FDD\u5B58\u540E\u4F1A\u5F3A\u5236\u5173\u95ED\u6240\u6709\u6B63\u5728\u8FDB\u884C\u7684\u622A\u56FE\u4EFB\u52A1\u5E76\u91CD\u8F7D\u914D\u7F6E",
-        defaultSelected: config.hmr,
+      // findBrowser
+      components.switch.create("findBrowser", {
+        label: "\u81EA\u52A8\u67E5\u627E\u6D4F\u89C8\u5668",
+        description: "\u542F\u7528\u540E\u4F1A\u4F7F\u7528 @snapka/browser-finder \u67E5\u627E\u7CFB\u7EDF\u6D4F\u89C8\u5668\u3001puppeteer\u3001playwright\u4E0B\u8F7D\u7684\u6D4F\u89C8\u5668",
+        defaultSelected: config.findBrowser !== false,
         color: "success"
       }),
       // pipe
@@ -104,11 +137,25 @@ var webConfig = {
         color: "success"
       }),
       components.divider.create("divider2"),
-      // maxPages
-      components.input.number("maxPages", {
+      // slowMo
+      components.input.number("slowMo", {
+        label: "\u6162\u52A8\u4F5C\u5EF6\u8FDF",
+        description: "\u64CD\u4F5C\u6162\u52A8\u4F5C\u5EF6\u8FDF\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C\u7528\u4E8E\u8C03\u8BD5",
+        defaultValue: (config.slowMo || 0) + "",
+        className: "inline-block p-2",
+        rules: [
+          {
+            min: 0,
+            max: 1e4,
+            error: "\u6162\u52A8\u4F5C\u5EF6\u8FDF\u5FC5\u987B\u57280-10000\u4E4B\u95F4"
+          }
+        ]
+      }),
+      // maxOpenPages
+      components.input.number("maxOpenPages", {
         label: "\u6700\u5927\u6807\u7B7E\u9875",
         description: "\u6700\u591A\u540C\u65F6\u6253\u5F00\u7684\u6807\u7B7E\u9875\u6570\u91CF\uFF0C\u8D85\u51FA\u540E\u5C06\u4F1A\u81EA\u52A8\u6392\u961F",
-        defaultValue: config.maxPages + "",
+        defaultValue: (config.maxOpenPages || 10) + "",
         className: "inline-block p-2",
         rules: [
           {
@@ -118,17 +165,36 @@ var webConfig = {
           }
         ]
       }),
-      // idleTime
-      components.input.number("idleTime", {
-        label: "\u7F51\u7EDC\u8BF7\u6C42\u7A7A\u95F2\u65F6\u95F4",
-        description: "\u7F51\u7EDC\u8BF7\u6C42\u7A7A\u95F2\u65F6\u95F4\uFF0C\u5355\u4F4D\u4E3A\u6BEB\u79D2",
-        defaultValue: config.idleTime + "",
+      // pageMode
+      components.radio.group("pageMode", {
+        label: "\u9875\u9762\u6A21\u5F0F",
+        orientation: "horizontal",
+        description: "\u9875\u9762\u7BA1\u7406\u6A21\u5F0F\uFF1A\u590D\u7528\u6A21\u5F0F\u6027\u80FD\u66F4\u597D\uFF0C\u4E00\u6B21\u6027\u6A21\u5F0F\u9694\u79BB\u6027\u66F4\u5F3A",
+        defaultValue: config.pageMode || "reuse",
+        radio: [
+          components.radio.create("reuse", {
+            label: "reuse",
+            value: "reuse",
+            description: "\u590D\u7528\u6A21\u5F0F\uFF08\u63A8\u8350\uFF09"
+          }),
+          components.radio.create("disposable", {
+            label: "disposable",
+            value: "disposable",
+            description: "\u4E00\u6B21\u6027\u6A21\u5F0F"
+          })
+        ]
+      }),
+      // pageIdleTimeout
+      components.input.number("pageIdleTimeout", {
+        label: "\u9875\u9762\u7A7A\u95F2\u8D85\u65F6",
+        description: "\u9875\u9762\u5728\u6C60\u4E2D\u7A7A\u95F2\u8D85\u8FC7\u6B64\u65F6\u95F4\u540E\u4F1A\u88AB\u81EA\u52A8\u9500\u6BC1\uFF08\u6BEB\u79D2\uFF09\uFF0C\u8BBE\u7F6E\u4E3A0\u8868\u793A\u6C38\u4E0D\u8D85\u65F6",
+        defaultValue: (config.pageIdleTimeout || 6e4) + "",
         className: "inline-block p-2",
         rules: [
           {
-            min: 1,
-            max: 999999,
-            error: "\u7F51\u7EDC\u8BF7\u6C42\u7A7A\u95F2\u65F6\u95F4\u5FC5\u987B\u57281-999999\u4E4B\u95F4"
+            min: 0,
+            max: 999999999,
+            error: "\u9875\u9762\u7A7A\u95F2\u8D85\u65F6\u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E0"
           }
         ]
       }),
@@ -148,6 +214,34 @@ var webConfig = {
         isRequired: false,
         className: "inline-block p-2"
       }),
+      // defaultViewport width
+      components.input.number("viewportWidth", {
+        label: "\u9ED8\u8BA4\u89C6\u7A97\u5BBD\u5EA6",
+        description: "\u9ED8\u8BA4\u89C6\u7A97\u5BBD\u5EA6\uFF08\u50CF\u7D20\uFF09",
+        defaultValue: (config.defaultViewport?.width || 800) + "",
+        className: "inline-block p-2",
+        rules: [
+          {
+            min: 1,
+            max: 1e4,
+            error: "\u89C6\u7A97\u5BBD\u5EA6\u5FC5\u987B\u57281-10000\u4E4B\u95F4"
+          }
+        ]
+      }),
+      // defaultViewport height
+      components.input.number("viewportHeight", {
+        label: "\u9ED8\u8BA4\u89C6\u7A97\u9AD8\u5EA6",
+        description: "\u9ED8\u8BA4\u89C6\u7A97\u9AD8\u5EA6\uFF08\u50CF\u7D20\uFF09",
+        defaultValue: (config.defaultViewport?.height || 600) + "",
+        className: "inline-block p-2",
+        rules: [
+          {
+            min: 1,
+            max: 1e4,
+            error: "\u89C6\u7A97\u9AD8\u5EA6\u5FC5\u987B\u57281-10000\u4E4B\u95F4"
+          }
+        ]
+      }),
       // 分隔线
       components.divider.create("divider4"),
       // args
@@ -163,10 +257,42 @@ var webConfig = {
   },
   /** 前端点击保存之后调用的方法 */
   save: (config) => {
+    if (!config.download) {
+      config.download = {};
+    }
+    if (config.downloadEnable !== void 0) {
+      config.download.enable = config.downloadEnable;
+      delete config.downloadEnable;
+    }
+    if (config.downloadBrowser) {
+      config.download.browser = config.downloadBrowser;
+      delete config.downloadBrowser;
+    }
+    if (config.downloadVersion) {
+      config.download.version = config.downloadVersion;
+      delete config.downloadVersion;
+    }
+    if (config.downloadDir) {
+      config.download.dir = config.downloadDir;
+      delete config.downloadDir;
+    }
+    if (config.downloadBaseUrl) {
+      config.download.baseUrl = config.downloadBaseUrl;
+      delete config.downloadBaseUrl;
+    }
+    if (config.viewportWidth !== void 0 || config.viewportHeight !== void 0) {
+      config.defaultViewport = {
+        width: Number(config.viewportWidth || 800),
+        height: Number(config.viewportHeight || 600)
+      };
+      delete config.viewportWidth;
+      delete config.viewportHeight;
+    }
     config = {
       ...config,
-      maxPages: Number(config.maxPages),
-      idleTime: Number(config.idleTime)
+      maxOpenPages: Number(config.maxOpenPages),
+      pageIdleTimeout: Number(config.pageIdleTimeout),
+      slowMo: Number(config.slowMo || 0)
     };
     saveConfig(config);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karinjs/plugin-puppeteer",
-  "version": "1.0.21",
+  "version": "1.1.2",
   "description": "karin的 puppeteer截图、渲染插件",
   "keywords": [
     "karin",
@@ -16,16 +16,13 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "dist",
-    "!LICENSE",
-    "!README.md"
+    "dist"
   ],
   "dependencies": {
-    "@karinjs/puppeteer": "2.2.4"
+    "@snapka/puppeteer": "0.1.5"
   },
   "devDependencies": {
-    "node-karin": "^1.7.12",
-    "@karinjs/puppeteer-types": "0.0.6"
+    "node-karin": "^1.13.0"
   },
   "karin": {
     "main": "src/index.ts",
@@ -34,39 +31,12 @@
     "ts-web": "src/web.config.ts",
     "files": [
       "config"
-    ],
-    "env": [
-      {
-        "key": "PUPPETEER_CACHE_DIR",
-        "value": "",
-        "comment": "Puppeteer缓存的默认根目录"
-      },
-      {
-        "key": "PUPPETEER_CACHE_VERSION",
-        "value": "",
-        "comment": "记录puppeteer下载过的浏览器信息"
-      },
-      {
-        "key": "PUPPETEER_CHROME_HEADLESS_SHELL_VERSION",
-        "value": "",
-        "comment": "Puppeteer下载浏览器的版本"
-      },
-      {
-        "key": "PUPPETEER_EXECUTABLE_PATH",
-        "value": "",
-        "comment": "Puppeteer可执行文件路径 配置后将使用此路径的浏览器"
-      },
-      {
-        "key": "PUPPETEER_CHROME_HEADLESS_SHELL_DOWNLOAD_BASE_URL",
-        "value": "",
-        "comment": "Puppeteer浏览器host地址"
-      }
     ]
   },
   "timestamp": "2025-10-01T00:47:22.222Z",
   "scripts": {
     "build": "tsc && tsup",
-    "dev": "tsx src/index.ts",
+    "dev": "tsx src/app.ts",
     "dev:test": "node dist/index.js",
     "pub": "pnpm publish --access public",
     "rm": "node -e \"require('fs').rmSync('dist', { recursive: true, force: true })\"",