@pomelolabs/leads 0.1.5 → 0.2.2

package/client/bundle.js

@@ -122,7 +122,7 @@
   // package.json
   var package_default = {
     name: "@pomelolabs/leads",
-    version: "0.1.5",
+    version: "0.2.2",
     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,8 @@
 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';
+import { Browser as BrowserType, detectBrowserPlatform, install as installBrowserBinary, resolveBuildId } from '@puppeteer/browsers';
 
 const PLATFORM_URLS = {
   xhs: {
@@ -106,6 +107,62 @@ async function findPlaywrightChromium() {
   return '';
 }
 
+async function findCachedChromium() {
+  const roots = [
+    path.join(homeDir(), 'pomelo', 'browser-cache', 'chrome'),
+    path.join(os.homedir(), '.cache', 'puppeteer', 'chrome'),
+  ];
+  for (const root of roots) {
+    let names = [];
+    try { names = await fs.readdir(root); } catch { continue; }
+    for (const name of names.sort().reverse()) {
+      const base = path.join(root, name);
+      const candidates = process.platform === 'darwin'
+        ? [
+            path.join(base, 'chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing'),
+            path.join(base, 'chrome-mac-x64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing'),
+            path.join(base, 'chrome-mac/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing'),
+          ]
+        : process.platform === 'win32'
+          ? [path.join(base, 'chrome-win64', 'chrome.exe'), path.join(base, 'chrome-win32', 'chrome.exe')]
+          : [path.join(base, 'chrome-linux64', 'chrome'), path.join(base, 'chrome-linux', 'chrome')];
+      for (const candidate of candidates) {
+        if (await executableAt(candidate)) return candidate;
+      }
+    }
+  }
+  return '';
+}
+
+let browserInstallPromise = null;
+export async function ensureBrowser(log = async () => {}) {
+  const existing = await resolveBrowserExecutable();
+  if (existing) return existing;
+  if (browserInstallPromise) return browserInstallPromise;
+  browserInstallPromise = (async () => {
+    const platform = detectBrowserPlatform();
+    if (!platform) throw new Error('无法识别当前系统平台');
+    await log('未找到采集浏览器，开始下载 Chromium（Chrome for Testing）');
+    const buildId = await resolveBuildId(BrowserType.CHROME, platform, 'stable');
+    const installed = await installBrowserBinary({
+      browser: BrowserType.CHROME,
+      buildId,
+      cacheDir: path.join(homeDir(), 'pomelo', 'browser-cache'),
+      platform,
+    });
+    const executable = installed?.executablePath || '';
+    if (!executable) throw new Error('浏览器下载完成，但没有找到可执行文件');
+    process.env.PUPPETEER_EXECUTABLE_PATH = executable;
+    await log(`Chromium 下载完成：${executable}`);
+    return { executable, source: 'downloaded' };
+  })();
+  try {
+    return await browserInstallPromise;
+  } finally {
+    browserInstallPromise = null;
+  }
+}
+
 async function resolveBrowserExecutable() {
   const explicit = process.env.PUPPETEER_EXECUTABLE_PATH || process.env.CHROME_PATH;
   if (explicit && await executableAt(explicit)) {
@@ -119,8 +176,12 @@ async function resolveBrowserExecutable() {
   if (chromium) {
     return { executable: chromium, source: 'playwright-chromium' };
   }
+  const cached = await findCachedChromium();
+  if (cached) {
+    return { executable: cached, source: 'downloaded' };
+  }
   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,7 +9,7 @@ import { promisify } from 'node:util';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import { browserStatus, openLink, openLogin, searchPeerProfile, searchPublic } from './browser.js';
+import { browserStatus, ensureBrowser, openLink, openLogin, searchPeerProfile, searchPublic } from './browser.js';
 
 const execFileAsync = promisify(execFile);
 
@@ -564,21 +564,14 @@ ${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）');
     try {
-      await execFileAsync('npx', ['puppeteer', 'browsers', 'install', 'chrome'], {
-        cwd: pluginRoot,
-        timeout: 15 * 60 * 1000,
-        maxBuffer: 4 * 1024 * 1024,
-        env: process.env,
-      });
+      await ensureBrowser((message) => store.log(message));
     } catch (error) {
-      await store.log(`Chromium 安装失败：${error?.message || error}`);
-      throw rpcError('BROWSER_INSTALL_FAILED', 'Chromium 安装失败，请在项目目录运行 npm run browser:install 后重试');
+      await store.log(`Chromium 下载失败：${error?.message || error}`);
+      throw rpcError('BROWSER_INSTALL_FAILED', '采集浏览器下载失败，请检查网络后重试');
     }
     const next = await browserStatus();
-    await store.log(`Chromium 安装完成：${next.executable || '未找到路径'}`);
+    await store.log(`Chromium 就绪：${next.executable || '未找到路径'}`);
     return next;
   }
 
@@ -1214,12 +1207,15 @@ ${state.profile.answers[key] || '（未填写）'}
       case 'browser.status':
         return browserStatus();
       case 'browser.login':
+        await installBrowser();
         return openLogin(payload?.platform || '小红书');
       case 'browser.install':
         return installBrowser();
       case 'browser.open':
+        await installBrowser();
         return openLink(payload?.url);
       case 'search.run': {
+        await installBrowser();
         const platform = payload?.platform === '抖音' ? '抖音' : '小红书';
         const keyword = cleanText(payload?.keyword, 80);
         if (!keyword) throw rpcError('EMPTY_KEYWORD', '请输入关键词');
@@ -1241,6 +1237,7 @@ ${state.profile.answers[key] || '（未填写）'}
       case 'peer.history':
         return store.snapshot().peerHistory || [];
       case 'peer.run': {
+        await installBrowser();
         const platform = payload?.platform === '抖音' ? '抖音' : '小红书';
         const account = cleanText(payload?.account, 120);
         if (!account) throw rpcError('EMPTY_ACCOUNT', '先粘贴同行账号或 ID');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pomelolabs/leads",
-  "version": "0.1.5",
+  "version": "0.2.2",
   "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",