@pomelolabs/leads 0.1.5 → 0.2.1

package/client/bundle.js

@@ -122,7 +122,7 @@
   // package.json
   var package_default = {
     name: "@pomelolabs/leads",
-    version: "0.1.5",
+    version: "0.2.1",
     description: "\u67DA\u5BA2 Pomelo\uFF1A\u5185\u5BB9\u83B7\u5BA2\u5DE5\u4F5C\u53F0\uFF08DSH \u63D2\u4EF6\uFF09",
     license: "UNLICENSED",
     type: "module",
@@ -155,8 +155,7 @@
     ],
     scripts: {
       build: "esbuild client/src/index.jsx --bundle --format=iife --outfile=client/bundle.js --loader:.css=text --loader:.svg=text --jsx=transform --external:react --target=es2022 --log-level=warning",
-      dev: "npm run build -- --watch",
-      "browser:install": "node ./node_modules/puppeteer/lib/puppeteer/node/cli.js browsers install chrome"
+      dev: "npm run build -- --watch"
     },
     devDependencies: {
       "@phosphor-icons/core": "^2.1.1",
@@ -176,7 +175,8 @@
     },
     dependencies: {
       "playwright-core": "^1.64.1",
-      puppeteer: "^25.16.0"
+      "puppeteer-core": "^25.16.0",
+      "@puppeteer/browsers": "^3.2.6"
     },
     publishConfig: {
       access: "public",

package/host/browser.js

@@ -10,7 +10,7 @@
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import puppeteer from 'puppeteer';
+import puppeteer from 'puppeteer-core';
 
 const PLATFORM_URLS = {
   xhs: {
@@ -120,7 +120,7 @@ async function resolveBrowserExecutable() {
     return { executable: chromium, source: 'playwright-chromium' };
   }
   try {
-    const bundled = await puppeteer.executablePath();
+    const bundled = typeof puppeteer.executablePath === 'function' ? await puppeteer.executablePath() : '';
     if (bundled && await executableAt(bundled)) {
       return { executable: bundled, source: 'puppeteer' };
     }

package/host/index.js

@@ -9,6 +9,7 @@ import { promisify } from 'node:util';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
+import { Browser as BrowserType, detectBrowserPlatform, install as installBrowserBinary, resolveBuildId } from '@puppeteer/browsers';
 import { browserStatus, openLink, openLogin, searchPeerProfile, searchPublic } from './browser.js';
 
 const execFileAsync = promisify(execFile);
@@ -564,21 +565,23 @@ ${comparisonText}
   async function installBrowser() {
     const first = await browserStatus();
     if (first.installed) return first;
-    const pluginRoot = path.resolve(path.dirname(new URL(import.meta.url).pathname), '..');
-    await store.log('开始安装 Chromium（puppeteer）');
+    await store.log('开始安装 Chrome（@puppeteer/browsers，无 postinstall）');
     try {
-      await execFileAsync('npx', ['puppeteer', 'browsers', 'install', 'chrome'], {
-        cwd: pluginRoot,
-        timeout: 15 * 60 * 1000,
-        maxBuffer: 4 * 1024 * 1024,
-        env: process.env,
+      const platform = detectBrowserPlatform();
+      if (!platform) throw new Error('无法识别当前系统平台');
+      const buildId = await resolveBuildId(BrowserType.CHROME, platform, 'stable');
+      await installBrowserBinary({
+        browser: BrowserType.CHROME,
+        buildId,
+        cacheDir: path.join(os.homedir(), '.cache', 'puppeteer'),
+        platform,
       });
     } catch (error) {
-      await store.log(`Chromium 安装失败：${error?.message || error}`);
-      throw rpcError('BROWSER_INSTALL_FAILED', 'Chromium 安装失败，请在项目目录运行 npm run browser:install 后重试');
+      await store.log(`Chrome 安装失败：${error?.message || error}`);
+      throw rpcError('BROWSER_INSTALL_FAILED', '采集浏览器安装失败，请手动安装 Chrome 或 Edge 后重试');
     }
     const next = await browserStatus();
-    await store.log(`Chromium 安装完成：${next.executable || '未找到路径'}`);
+    await store.log(`Chrome 安装完成：${next.executable || '未找到路径'}`);
     return next;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pomelolabs/leads",
-  "version": "0.1.5",
+  "version": "0.2.1",
   "description": "柚客 Pomelo：内容获客工作台（DSH 插件）",
   "license": "UNLICENSED",
   "type": "module",
@@ -33,8 +33,7 @@
   ],
   "scripts": {
     "build": "esbuild client/src/index.jsx --bundle --format=iife --outfile=client/bundle.js --loader:.css=text --loader:.svg=text --jsx=transform --external:react --target=es2022 --log-level=warning",
-    "dev": "npm run build -- --watch",
-    "browser:install": "node ./node_modules/puppeteer/lib/puppeteer/node/cli.js browsers install chrome"
+    "dev": "npm run build -- --watch"
   },
   "devDependencies": {
     "@phosphor-icons/core": "^2.1.1",
@@ -54,7 +53,8 @@
   },
   "dependencies": {
     "playwright-core": "^1.64.1",
-    "puppeteer": "^25.16.0"
+    "puppeteer-core": "^25.16.0",
+    "@puppeteer/browsers": "^3.2.6"
   },
   "publishConfig": {
     "access": "public",