@iflyrpa/playwright 1.0.14 → 1.0.15-beta.1

package/dist/index.cjs

@@ -3,20 +3,27 @@
 const fs = require('node:fs');
 const path = require('node:path');
 const https = require('node:https');
+const childProcess = require('node:child_process');
+const os = require('node:os');
+const get = require('@electron/get');
+const extract = require('extract-zip');
 const log = require('loglevel');
-const npminstall = require('npminstall');
+const node = require('@sentry/node');
+const livePluginManager = require('live-plugin-manager');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const https__default = /*#__PURE__*/_interopDefaultCompat(https);
+const childProcess__default = /*#__PURE__*/_interopDefaultCompat(childProcess);
+const os__default = /*#__PURE__*/_interopDefaultCompat(os);
+const extract__default = /*#__PURE__*/_interopDefaultCompat(extract);
 const log__default = /*#__PURE__*/_interopDefaultCompat(log);
-const npminstall__default = /*#__PURE__*/_interopDefaultCompat(npminstall);
 
 const name = "@iflyrpa/playwright";
 const type = "module";
-const version$1 = "1.0.14";
+const version$1 = "1.0.15-beta.1";
 const main = "./dist/index.cjs";
 const module$1 = "./dist/index.mjs";
 const types = "./dist/index.d.ts";
@@ -31,14 +38,20 @@ const files = [
 	"dist"
 ];
 const dependencies = {
-	loglevel: "^1.9.2",
-	npminstall: "^7.12.0"
+	"@electron/get": "^2.0.0",
+	"@sentry/node": "^5.5.0",
+	"extract-zip": "^2.0.1",
+	"live-plugin-manager": "^1.0.0",
+	loglevel: "^1.9.2"
+};
+const peerDependencies = {
+	playwright: "^1.46.1"
 };
 const devDependencies = {
 	esno: "^4.7.0",
+	playwright: "^1.46.1",
 	typescript: "^5.5.2",
-	unbuild: "^2.0.0",
-	playwright: "^1.46.1"
+	unbuild: "^2.0.0"
 };
 const packageJson = {
 	name: name,
@@ -52,6 +65,7 @@ const packageJson = {
 	license: license,
 	files: files,
 	dependencies: dependencies,
+	peerDependencies: peerDependencies,
 	devDependencies: devDependencies
 };
 
@@ -253,7 +267,7 @@ const xiaohongshuPublishAction = async (props) => {
   await page.getByRole("textbox").click();
   const fileChooser = await fileChooserPromise;
   await fileChooser.setFiles(images);
-  const titleInstance = page.locator(".titleInput input");
+  const titleInstance = page.locator(".input.titleInput input");
   await titleInstance.click();
   await titleInstance.fill(params.title);
   const descInstance = page.locator("#post-textarea");
@@ -336,6 +350,117 @@ const xiaohongshuPublishAction = async (props) => {
   return response;
 };
 
+var __defProp$4 = Object.defineProperty;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$4 = (obj, key, value) => {
+  __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+const ELECTRON_MIRROR = "http://npmmirror.com/mirrors/electron/";
+class ElectronInstall {
+  constructor(rootDir, version, logger) {
+    this.rootDir = rootDir;
+    this.version = version;
+    this.logger = logger;
+    __publicField$4(this, "electronPath");
+    __publicField$4(this, "platformPath");
+    this.platformPath = this.getPlatformPath();
+    this.electronPath = path__default.join(rootDir, this.platformPath);
+  }
+  isInstalled() {
+    try {
+      if (fs__default.readFileSync(path__default.join(this.rootDir, "version"), "utf-8").replace(/^v/, "") !== this.version) {
+        return false;
+      }
+    } catch (ignored) {
+      return false;
+    }
+    const electronPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path__default.join(this.rootDir, this.platformPath);
+    return fs__default.existsSync(electronPath);
+  }
+  getPlatformPath() {
+    const platform = process.env.npm_config_platform || os__default.platform();
+    switch (platform) {
+      case "mas":
+      case "darwin":
+        return "Electron.app/Contents/MacOS/Electron";
+      case "freebsd":
+      case "openbsd":
+      case "linux":
+        return "electron";
+      case "win32":
+        return "electron.exe";
+      default:
+        throw new Error(
+          `Electron builds are not available on platform: ${platform}`
+        );
+    }
+  }
+  async install() {
+    const installed = this.isInstalled();
+    this.logger.info(`electron@${this.version} \u662F\u5426\u5DF2\u5B89\u88C5\uFF1A${installed}`);
+    if (installed)
+      return this.electronPath;
+    const platform = process.env.npm_config_platform || process.platform;
+    let arch = process.env.npm_config_arch || process.arch;
+    if (platform === "darwin" && process.platform === "darwin" && arch === "x64" && process.env.npm_config_arch === void 0) {
+      try {
+        const output = childProcess__default.execSync(
+          "sysctl -in sysctl.proc_translated"
+        );
+        if (output.toString().trim() === "1") {
+          arch = "arm64";
+        }
+      } catch {
+      }
+    }
+    try {
+      this.logger.info(`electron@${this.version} \u5F00\u59CB\u4E0B\u8F7D\u8D44\u6E90`);
+      const zipPath = await get.downloadArtifact({
+        version: this.version,
+        artifactName: "electron",
+        force: process.env.force_no_cache === "true",
+        cacheRoot: process.env.electron_config_cache,
+        checksums: void 0,
+        mirrorOptions: { mirror: ELECTRON_MIRROR },
+        // 使用国内镜像下载
+        platform,
+        arch
+      });
+      this.logger.info(`electron@${this.version} \u5F00\u59CB\u89E3\u538B\u8D44\u6E90`);
+      process.noAsar = true;
+      await extract__default(zipPath, { dir: this.rootDir });
+      this.logger.info(`electron@${this.version} \u4E0B\u8F7D\u6210\u529F`);
+      return this.electronPath;
+    } catch (error) {
+      this.logger.error(`electron@${this.version} \u4E0B\u8F7D\u5931\u8D25`, error);
+      throw error;
+    }
+  }
+}
+
+var __defProp$3 = Object.defineProperty;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$3 = (obj, key, value) => {
+  __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class SentryInstance {
+  constructor(dsn) {
+    __publicField$3(this, "sentry");
+    if (!dsn)
+      return;
+    this.sentry = new node.NodeClient({
+      dsn,
+      defaultIntegrations: false
+    });
+  }
+  captureException(error) {
+    this.sentry?.captureException(error);
+  }
+}
+const sentry = new SentryInstance(process.env.RPA_SENTRY_DSN);
+
 var __defProp$2 = Object.defineProperty;
 var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$2 = (obj, key, value) => {
@@ -354,7 +479,7 @@ const _Logger = class _Logger {
     log__default.methodFactory = (methodName) => {
       return (message) => {
         this.stream.write(
-          `[${( new Date()).toISOString()}] ${methodName.toUpperCase()}: ${message}
+          `[${( new Date()).toLocaleString()}] ${methodName.toUpperCase()}: ${message}
 `
         );
       };
@@ -380,12 +505,14 @@ const _Logger = class _Logger {
   warn(...msg) {
     log__default.warn(...msg);
   }
-  error(prefix, error) {
-    log__default.error(prefix);
-    if (error instanceof Error) {
-      log__default.error(`${error.message}
-Error stack: ${error.stack}`);
+  // error 级别的日志上报 sentry
+  error(prefix, err) {
+    const error = err || prefix;
+    if (err instanceof Error) {
+      err.message = `${prefix}\uFF1A${err.message}`;
     }
+    log__default.error(error);
+    sentry.captureException(error);
   }
   close() {
     this.stream.end();
@@ -410,23 +537,17 @@ const generateFile = async (dir) => {
   }
   return filePath;
 };
-const createElectronApp = async (cachePath, playwright) => {
+const launchElectronApp = async (cachePath, playwright, electronPath) => {
   const logger = Logger.getInstance(cachePath);
   try {
-    const executablePath = path__default.join(
-      cachePath,
-      "node_modules",
-      ".bin",
-      "electron"
-    );
     const mainPath = await generateFile(cachePath);
     const electronApp = await playwright._electron.launch({
-      executablePath,
+      executablePath: electronPath,
       // 获取 Electron 可执行文件的路径
       args: [mainPath],
       cwd: cachePath
     });
-    logger.info(`electron \u542F\u52A8\u6210\u529F\uFF1A${executablePath} ${mainPath}`);
+    logger.info(`electron \u542F\u52A8\u6210\u529F\uFF1A${electronPath} ${mainPath}`);
     return electronApp;
   } catch (error) {
     logger.error("electron \u542F\u52A8\u5931\u8D25\uFF1A", error);
@@ -441,8 +562,13 @@ var __publicField$1 = (obj, key, value) => {
   return value;
 };
 const NPM_REGISTRY = "https://registry.npmmirror.com/";
-class PackageManager {
+class PackageManager extends livePluginManager.PluginManager {
   constructor(params) {
+    super({
+      cwd: params.cacheDir,
+      pluginsPath: path__default.join(params.cacheDir, "node_modules"),
+      npmRegistryUrl: NPM_REGISTRY
+    });
     __publicField$1(this, "cacheDir");
     // 依赖安装目录
     __publicField$1(this, "forceUpdate");
@@ -484,7 +610,6 @@ class PackageManager {
     try {
       return require(path__default.join(pluginDir, module));
     } catch (error) {
-      this.logger.warn(`${module}\u672C\u5730\u4F9D\u8D56\u4E0D\u5B58\u5728\uFF0C${pluginDir}`);
       return null;
     }
   }
@@ -493,27 +618,29 @@ class PackageManager {
     return this.getPlugin(module);
   }
   // 安装依赖
-  install(name, version) {
-    return npminstall__default({
-      root: this.cacheDir,
-      pkgs: [{ name, version }],
-      registry: NPM_REGISTRY
-    });
+  async installPackage(name, version) {
+    try {
+      this.logger.info(`${name} \u5F00\u59CB\u5B89\u88C5`);
+      await this.install(name, version);
+      this.logger.info(`${name} \u5B89\u88C5\u6210\u529F`);
+    } catch (error) {
+      this.logger.error(`${name} \u5B89\u88C5\u5931\u8D25`, error);
+    }
   }
   async init(name, version) {
     const plugin = this.getPlugin(path__default.join(name, "package.json"));
     this.logger.info(`${name} \u662F\u5426\u5DF2\u5B89\u88C5\uFF1A${!!plugin}`);
     try {
       if (!plugin) {
-        await this.install(name, version);
+        await this.installPackage(name, version);
       } else if (this.forceUpdate) {
         const pkInfo = await this.getPluginInfo(name);
         if (!pkInfo)
           return;
         const hasNewVersion = semver.gt(pkInfo.version, plugin.version);
         if (hasNewVersion) {
-          this.logger.info(`${name} \u68C0\u67E5\u5230\u65B0\u7248\u672C ${pkInfo.version}\uFF0C\u66F4\u65B0\u4F9D\u8D56`);
-          await this.install(name, pkInfo.version);
+          this.logger.info(`${name} \u68C0\u67E5\u5230\u65B0\u7248\u672C ${pkInfo.version}`);
+          await this.installPackage(name, pkInfo.version);
         }
       }
       this.logger.info(`${name} package manager init done!`);
@@ -530,6 +657,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 const PLAYWRIGHT_VERSION = "1.46.1";
+const PLAYWRIGHT_NAME = "playwright-core";
 const ELECTRON_VERSION = "22.3.27";
 class LocalAutomateTask {
   constructor({ cachePath, debug }) {
@@ -539,6 +667,10 @@ class LocalAutomateTask {
     __publicField(this, "playwrightPackage");
     __publicField(this, "electronPackage");
     __publicField(this, "_electronApp", null);
+    /**
+     * 应用是否已关闭
+     */
+    __publicField(this, "isClosed", false);
     this.cachePath = cachePath;
     this.debug = debug || false;
     this.logger = Logger.getInstance(cachePath);
@@ -551,37 +683,40 @@ class LocalAutomateTask {
    */
   installPlaywright() {
     const playwrightPackageManager = new PackageManager({
-      packageName: "playwright",
+      packageName: PLAYWRIGHT_NAME,
       packageVersion: PLAYWRIGHT_VERSION,
       cacheDir: this.cachePath,
       forceUpdate: false
     });
-    return playwrightPackageManager.getPluginAfterInit("playwright");
+    return playwrightPackageManager.getPluginAfterInit(PLAYWRIGHT_NAME);
   }
   /**
    * 安装 electron
    * @returns
    */
   installElectron() {
-    const playwrightPackageManager = new PackageManager({
-      packageName: "electron",
-      packageVersion: ELECTRON_VERSION,
-      cacheDir: this.cachePath,
-      forceUpdate: false
-    });
-    return playwrightPackageManager.getPluginAfterInit("electron");
+    const electronInstall = new ElectronInstall(
+      path__default.join(this.cachePath, "electron"),
+      ELECTRON_VERSION,
+      this.logger
+    );
+    return electronInstall.install();
   }
   /**
    * 启动 Electron
    * @returns
    */
-  async getElectronApp() {
+  async launchApp() {
     if (!this._electronApp) {
-      const [playwright] = await Promise.all([
+      const [playwright, electronPath] = await Promise.all([
         this.playwrightPackage,
         this.electronPackage
       ]);
-      this._electronApp = await createElectronApp(this.cachePath, playwright);
+      this._electronApp = await launchElectronApp(
+        this.cachePath,
+        playwright,
+        electronPath
+      );
     }
     return this._electronApp;
   }
@@ -610,16 +745,20 @@ class LocalAutomateTask {
    * @returns
    */
   async close() {
-    this.logger.close();
+    this.logger.info("\u5173\u95ED\u5E94\u7528");
     this.clearTmpPath();
-    const electronApp = await this.getElectronApp();
-    return electronApp.close();
+    this.logger.close();
+    await this._electronApp?.close();
+    this.isClosed = true;
+    this._electronApp = null;
   }
   /**
    * 小红书自动化发布
    */
   async xiaohongshuPublish(params) {
-    const electronApp = await this.getElectronApp();
+    this.logger.info("\u5F00\u59CB\u5C0F\u7EA2\u4E66\u53D1\u5E03");
+    const electronApp = await this.launchApp();
+    this.logger.info("\u5C0F\u7EA2\u4E66\u53D1\u5E03\u4E13\u7528\u5BA2\u6237\u7AEF\u5DF2\u542F\u52A8");
     const commonCookies = {
       path: "/",
       sameSite: "lax",
@@ -659,6 +798,7 @@ class LocalAutomateTask {
         { pageParams }
       )
     ]);
+    this.logger.info("\u5DF2\u6253\u5F00\u5C0F\u7EA2\u4E66\u53D1\u5E03\u9875\u9762");
     try {
       const res = await xiaohongshuPublishAction({
         page,
@@ -666,6 +806,7 @@ class LocalAutomateTask {
         tmpCachePath: this.getTmpPath(),
         debug: !!this.debug
       });
+      this.logger.info(`\u5C0F\u7EA2\u4E66\u53D1\u5E03\u6210\u529F\uFF1A${res}`);
       return res;
     } catch (error) {
       this.logger.error("\u5C0F\u7EA2\u4E66\u53D1\u5E03\u5931\u8D25", error);
@@ -675,14 +816,17 @@ class LocalAutomateTask {
 }
 const RpaTask = (params) => {
   const logger = Logger.getInstance(params.cachePath);
-  const packageManager = new PackageManager({
-    packageName: packageJson.name,
-    cacheDir: params.cachePath
-  });
-  const localPackge = packageManager.getPlugin(packageJson.name);
-  if (localPackge?.LocalAutomateTask && localPackge?.version && semver.gt(localPackge.version, packageJson.version)) {
-    logger.info(`\u4F7F\u7528\u8FDC\u7A0B\u7684\u65B0\u7248\u672C\uFF0C\u7248\u672C\u53F7\u4E3A\uFF1A${localPackge.version}`);
-    return new localPackge.LocalAutomateTask(params);
+  if (params.forceUpdate) {
+    logger.info("\u5C1D\u8BD5\u4F7F\u7528\u8FDC\u7A0B\u6700\u65B0\u7248\u672C");
+    const packageManager = new PackageManager({
+      packageName: packageJson.name,
+      cacheDir: params.cachePath
+    });
+    const localPackge = packageManager.getPlugin(packageJson.name);
+    if (localPackge?.LocalAutomateTask && localPackge?.version && semver.gt(localPackge.version, packageJson.version)) {
+      logger.info(`\u4F7F\u7528\u8FDC\u7A0B\u7684\u65B0\u7248\u672C\uFF0C\u7248\u672C\u53F7\u4E3A\uFF1A${localPackge.version}`);
+      return new localPackge.LocalAutomateTask(params);
+    }
   }
   return new LocalAutomateTask(params);
 };

package/dist/index.d.cts

@@ -1,3 +1,5 @@
+import { ElectronApplication } from 'playwright';
+
 interface CookiesSetDetails {
 	/**
 	 * The URL to associate the cookie with. The promise will be rejected if the URL is
@@ -84,6 +86,7 @@ interface XiaohonshuPublishParams
 interface TaskParams {
     debug?: boolean;
     cachePath: string;
+    forceUpdate?: boolean;
 }
 declare class LocalAutomateTask implements TaskParams {
     private logger;
@@ -92,6 +95,10 @@ declare class LocalAutomateTask implements TaskParams {
     private playwrightPackage;
     private electronPackage;
     private _electronApp;
+    /**
+     * 应用是否已关闭
+     */
+    isClosed: boolean;
     constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright
@@ -107,7 +114,7 @@ declare class LocalAutomateTask implements TaskParams {
      * 启动 Electron
      * @returns
      */
-    private getElectronApp;
+    launchApp(): Promise<ElectronApplication>;
     /**
      * 临时文件目录
      * @returns

package/dist/index.d.mts

@@ -1,3 +1,5 @@
+import { ElectronApplication } from 'playwright';
+
 interface CookiesSetDetails {
 	/**
 	 * The URL to associate the cookie with. The promise will be rejected if the URL is
@@ -84,6 +86,7 @@ interface XiaohonshuPublishParams
 interface TaskParams {
     debug?: boolean;
     cachePath: string;
+    forceUpdate?: boolean;
 }
 declare class LocalAutomateTask implements TaskParams {
     private logger;
@@ -92,6 +95,10 @@ declare class LocalAutomateTask implements TaskParams {
     private playwrightPackage;
     private electronPackage;
     private _electronApp;
+    /**
+     * 应用是否已关闭
+     */
+    isClosed: boolean;
     constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright
@@ -107,7 +114,7 @@ declare class LocalAutomateTask implements TaskParams {
      * 启动 Electron
      * @returns
      */
-    private getElectronApp;
+    launchApp(): Promise<ElectronApplication>;
     /**
      * 临时文件目录
      * @returns

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import { ElectronApplication } from 'playwright';
+
 interface CookiesSetDetails {
 	/**
 	 * The URL to associate the cookie with. The promise will be rejected if the URL is
@@ -84,6 +86,7 @@ interface XiaohonshuPublishParams
 interface TaskParams {
     debug?: boolean;
     cachePath: string;
+    forceUpdate?: boolean;
 }
 declare class LocalAutomateTask implements TaskParams {
     private logger;
@@ -92,6 +95,10 @@ declare class LocalAutomateTask implements TaskParams {
     private playwrightPackage;
     private electronPackage;
     private _electronApp;
+    /**
+     * 应用是否已关闭
+     */
+    isClosed: boolean;
     constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright
@@ -107,7 +114,7 @@ declare class LocalAutomateTask implements TaskParams {
      * 启动 Electron
      * @returns
      */
-    private getElectronApp;
+    launchApp(): Promise<ElectronApplication>;
     /**
      * 临时文件目录
      * @returns

package/dist/index.mjs

@@ -1,12 +1,17 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import https from 'node:https';
+import childProcess from 'node:child_process';
+import os from 'node:os';
+import { downloadArtifact } from '@electron/get';
+import extract from 'extract-zip';
 import log from 'loglevel';
-import npminstall from 'npminstall';
+import { NodeClient } from '@sentry/node';
+import { PluginManager } from 'live-plugin-manager';
 
 const name = "@iflyrpa/playwright";
 const type = "module";
-const version$1 = "1.0.14";
+const version$1 = "1.0.15-beta.1";
 const main = "./dist/index.cjs";
 const module = "./dist/index.mjs";
 const types = "./dist/index.d.ts";
@@ -21,14 +26,20 @@ const files = [
 	"dist"
 ];
 const dependencies = {
-	loglevel: "^1.9.2",
-	npminstall: "^7.12.0"
+	"@electron/get": "^2.0.0",
+	"@sentry/node": "^5.5.0",
+	"extract-zip": "^2.0.1",
+	"live-plugin-manager": "^1.0.0",
+	loglevel: "^1.9.2"
+};
+const peerDependencies = {
+	playwright: "^1.46.1"
 };
 const devDependencies = {
 	esno: "^4.7.0",
+	playwright: "^1.46.1",
 	typescript: "^5.5.2",
-	unbuild: "^2.0.0",
-	playwright: "^1.46.1"
+	unbuild: "^2.0.0"
 };
 const packageJson = {
 	name: name,
@@ -42,6 +53,7 @@ const packageJson = {
 	license: license,
 	files: files,
 	dependencies: dependencies,
+	peerDependencies: peerDependencies,
 	devDependencies: devDependencies
 };
 
@@ -243,7 +255,7 @@ const xiaohongshuPublishAction = async (props) => {
   await page.getByRole("textbox").click();
   const fileChooser = await fileChooserPromise;
   await fileChooser.setFiles(images);
-  const titleInstance = page.locator(".titleInput input");
+  const titleInstance = page.locator(".input.titleInput input");
   await titleInstance.click();
   await titleInstance.fill(params.title);
   const descInstance = page.locator("#post-textarea");
@@ -326,6 +338,117 @@ const xiaohongshuPublishAction = async (props) => {
   return response;
 };
 
+var __defProp$4 = Object.defineProperty;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$4 = (obj, key, value) => {
+  __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+const ELECTRON_MIRROR = "http://npmmirror.com/mirrors/electron/";
+class ElectronInstall {
+  constructor(rootDir, version, logger) {
+    this.rootDir = rootDir;
+    this.version = version;
+    this.logger = logger;
+    __publicField$4(this, "electronPath");
+    __publicField$4(this, "platformPath");
+    this.platformPath = this.getPlatformPath();
+    this.electronPath = path.join(rootDir, this.platformPath);
+  }
+  isInstalled() {
+    try {
+      if (fs.readFileSync(path.join(this.rootDir, "version"), "utf-8").replace(/^v/, "") !== this.version) {
+        return false;
+      }
+    } catch (ignored) {
+      return false;
+    }
+    const electronPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path.join(this.rootDir, this.platformPath);
+    return fs.existsSync(electronPath);
+  }
+  getPlatformPath() {
+    const platform = process.env.npm_config_platform || os.platform();
+    switch (platform) {
+      case "mas":
+      case "darwin":
+        return "Electron.app/Contents/MacOS/Electron";
+      case "freebsd":
+      case "openbsd":
+      case "linux":
+        return "electron";
+      case "win32":
+        return "electron.exe";
+      default:
+        throw new Error(
+          `Electron builds are not available on platform: ${platform}`
+        );
+    }
+  }
+  async install() {
+    const installed = this.isInstalled();
+    this.logger.info(`electron@${this.version} \u662F\u5426\u5DF2\u5B89\u88C5\uFF1A${installed}`);
+    if (installed)
+      return this.electronPath;
+    const platform = process.env.npm_config_platform || process.platform;
+    let arch = process.env.npm_config_arch || process.arch;
+    if (platform === "darwin" && process.platform === "darwin" && arch === "x64" && process.env.npm_config_arch === void 0) {
+      try {
+        const output = childProcess.execSync(
+          "sysctl -in sysctl.proc_translated"
+        );
+        if (output.toString().trim() === "1") {
+          arch = "arm64";
+        }
+      } catch {
+      }
+    }
+    try {
+      this.logger.info(`electron@${this.version} \u5F00\u59CB\u4E0B\u8F7D\u8D44\u6E90`);
+      const zipPath = await downloadArtifact({
+        version: this.version,
+        artifactName: "electron",
+        force: process.env.force_no_cache === "true",
+        cacheRoot: process.env.electron_config_cache,
+        checksums: void 0,
+        mirrorOptions: { mirror: ELECTRON_MIRROR },
+        // 使用国内镜像下载
+        platform,
+        arch
+      });
+      this.logger.info(`electron@${this.version} \u5F00\u59CB\u89E3\u538B\u8D44\u6E90`);
+      process.noAsar = true;
+      await extract(zipPath, { dir: this.rootDir });
+      this.logger.info(`electron@${this.version} \u4E0B\u8F7D\u6210\u529F`);
+      return this.electronPath;
+    } catch (error) {
+      this.logger.error(`electron@${this.version} \u4E0B\u8F7D\u5931\u8D25`, error);
+      throw error;
+    }
+  }
+}
+
+var __defProp$3 = Object.defineProperty;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$3 = (obj, key, value) => {
+  __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class SentryInstance {
+  constructor(dsn) {
+    __publicField$3(this, "sentry");
+    if (!dsn)
+      return;
+    this.sentry = new NodeClient({
+      dsn,
+      defaultIntegrations: false
+    });
+  }
+  captureException(error) {
+    this.sentry?.captureException(error);
+  }
+}
+const sentry = new SentryInstance(process.env.RPA_SENTRY_DSN);
+
 var __defProp$2 = Object.defineProperty;
 var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$2 = (obj, key, value) => {
@@ -344,7 +467,7 @@ const _Logger = class _Logger {
     log.methodFactory = (methodName) => {
       return (message) => {
         this.stream.write(
-          `[${( new Date()).toISOString()}] ${methodName.toUpperCase()}: ${message}
+          `[${( new Date()).toLocaleString()}] ${methodName.toUpperCase()}: ${message}
 `
         );
       };
@@ -370,12 +493,14 @@ const _Logger = class _Logger {
   warn(...msg) {
     log.warn(...msg);
   }
-  error(prefix, error) {
-    log.error(prefix);
-    if (error instanceof Error) {
-      log.error(`${error.message}
-Error stack: ${error.stack}`);
+  // error 级别的日志上报 sentry
+  error(prefix, err) {
+    const error = err || prefix;
+    if (err instanceof Error) {
+      err.message = `${prefix}\uFF1A${err.message}`;
     }
+    log.error(error);
+    sentry.captureException(error);
   }
   close() {
     this.stream.end();
@@ -400,23 +525,17 @@ const generateFile = async (dir) => {
   }
   return filePath;
 };
-const createElectronApp = async (cachePath, playwright) => {
+const launchElectronApp = async (cachePath, playwright, electronPath) => {
   const logger = Logger.getInstance(cachePath);
   try {
-    const executablePath = path.join(
-      cachePath,
-      "node_modules",
-      ".bin",
-      "electron"
-    );
     const mainPath = await generateFile(cachePath);
     const electronApp = await playwright._electron.launch({
-      executablePath,
+      executablePath: electronPath,
       // 获取 Electron 可执行文件的路径
       args: [mainPath],
       cwd: cachePath
     });
-    logger.info(`electron \u542F\u52A8\u6210\u529F\uFF1A${executablePath} ${mainPath}`);
+    logger.info(`electron \u542F\u52A8\u6210\u529F\uFF1A${electronPath} ${mainPath}`);
     return electronApp;
   } catch (error) {
     logger.error("electron \u542F\u52A8\u5931\u8D25\uFF1A", error);
@@ -431,8 +550,13 @@ var __publicField$1 = (obj, key, value) => {
   return value;
 };
 const NPM_REGISTRY = "https://registry.npmmirror.com/";
-class PackageManager {
+class PackageManager extends PluginManager {
   constructor(params) {
+    super({
+      cwd: params.cacheDir,
+      pluginsPath: path.join(params.cacheDir, "node_modules"),
+      npmRegistryUrl: NPM_REGISTRY
+    });
     __publicField$1(this, "cacheDir");
     // 依赖安装目录
     __publicField$1(this, "forceUpdate");
@@ -474,7 +598,6 @@ class PackageManager {
     try {
       return require(path.join(pluginDir, module));
     } catch (error) {
-      this.logger.warn(`${module}\u672C\u5730\u4F9D\u8D56\u4E0D\u5B58\u5728\uFF0C${pluginDir}`);
       return null;
     }
   }
@@ -483,27 +606,29 @@ class PackageManager {
     return this.getPlugin(module);
   }
   // 安装依赖
-  install(name, version) {
-    return npminstall({
-      root: this.cacheDir,
-      pkgs: [{ name, version }],
-      registry: NPM_REGISTRY
-    });
+  async installPackage(name, version) {
+    try {
+      this.logger.info(`${name} \u5F00\u59CB\u5B89\u88C5`);
+      await this.install(name, version);
+      this.logger.info(`${name} \u5B89\u88C5\u6210\u529F`);
+    } catch (error) {
+      this.logger.error(`${name} \u5B89\u88C5\u5931\u8D25`, error);
+    }
   }
   async init(name, version) {
     const plugin = this.getPlugin(path.join(name, "package.json"));
     this.logger.info(`${name} \u662F\u5426\u5DF2\u5B89\u88C5\uFF1A${!!plugin}`);
     try {
       if (!plugin) {
-        await this.install(name, version);
+        await this.installPackage(name, version);
       } else if (this.forceUpdate) {
         const pkInfo = await this.getPluginInfo(name);
         if (!pkInfo)
           return;
         const hasNewVersion = semver.gt(pkInfo.version, plugin.version);
         if (hasNewVersion) {
-          this.logger.info(`${name} \u68C0\u67E5\u5230\u65B0\u7248\u672C ${pkInfo.version}\uFF0C\u66F4\u65B0\u4F9D\u8D56`);
-          await this.install(name, pkInfo.version);
+          this.logger.info(`${name} \u68C0\u67E5\u5230\u65B0\u7248\u672C ${pkInfo.version}`);
+          await this.installPackage(name, pkInfo.version);
         }
       }
       this.logger.info(`${name} package manager init done!`);
@@ -520,6 +645,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 const PLAYWRIGHT_VERSION = "1.46.1";
+const PLAYWRIGHT_NAME = "playwright-core";
 const ELECTRON_VERSION = "22.3.27";
 class LocalAutomateTask {
   constructor({ cachePath, debug }) {
@@ -529,6 +655,10 @@ class LocalAutomateTask {
     __publicField(this, "playwrightPackage");
     __publicField(this, "electronPackage");
     __publicField(this, "_electronApp", null);
+    /**
+     * 应用是否已关闭
+     */
+    __publicField(this, "isClosed", false);
     this.cachePath = cachePath;
     this.debug = debug || false;
     this.logger = Logger.getInstance(cachePath);
@@ -541,37 +671,40 @@ class LocalAutomateTask {
    */
   installPlaywright() {
     const playwrightPackageManager = new PackageManager({
-      packageName: "playwright",
+      packageName: PLAYWRIGHT_NAME,
       packageVersion: PLAYWRIGHT_VERSION,
       cacheDir: this.cachePath,
       forceUpdate: false
     });
-    return playwrightPackageManager.getPluginAfterInit("playwright");
+    return playwrightPackageManager.getPluginAfterInit(PLAYWRIGHT_NAME);
   }
   /**
    * 安装 electron
    * @returns
    */
   installElectron() {
-    const playwrightPackageManager = new PackageManager({
-      packageName: "electron",
-      packageVersion: ELECTRON_VERSION,
-      cacheDir: this.cachePath,
-      forceUpdate: false
-    });
-    return playwrightPackageManager.getPluginAfterInit("electron");
+    const electronInstall = new ElectronInstall(
+      path.join(this.cachePath, "electron"),
+      ELECTRON_VERSION,
+      this.logger
+    );
+    return electronInstall.install();
   }
   /**
    * 启动 Electron
    * @returns
    */
-  async getElectronApp() {
+  async launchApp() {
     if (!this._electronApp) {
-      const [playwright] = await Promise.all([
+      const [playwright, electronPath] = await Promise.all([
         this.playwrightPackage,
         this.electronPackage
       ]);
-      this._electronApp = await createElectronApp(this.cachePath, playwright);
+      this._electronApp = await launchElectronApp(
+        this.cachePath,
+        playwright,
+        electronPath
+      );
     }
     return this._electronApp;
   }
@@ -600,16 +733,20 @@ class LocalAutomateTask {
    * @returns
    */
   async close() {
-    this.logger.close();
+    this.logger.info("\u5173\u95ED\u5E94\u7528");
     this.clearTmpPath();
-    const electronApp = await this.getElectronApp();
-    return electronApp.close();
+    this.logger.close();
+    await this._electronApp?.close();
+    this.isClosed = true;
+    this._electronApp = null;
   }
   /**
    * 小红书自动化发布
    */
   async xiaohongshuPublish(params) {
-    const electronApp = await this.getElectronApp();
+    this.logger.info("\u5F00\u59CB\u5C0F\u7EA2\u4E66\u53D1\u5E03");
+    const electronApp = await this.launchApp();
+    this.logger.info("\u5C0F\u7EA2\u4E66\u53D1\u5E03\u4E13\u7528\u5BA2\u6237\u7AEF\u5DF2\u542F\u52A8");
     const commonCookies = {
       path: "/",
       sameSite: "lax",
@@ -649,6 +786,7 @@ class LocalAutomateTask {
         { pageParams }
       )
     ]);
+    this.logger.info("\u5DF2\u6253\u5F00\u5C0F\u7EA2\u4E66\u53D1\u5E03\u9875\u9762");
     try {
       const res = await xiaohongshuPublishAction({
         page,
@@ -656,6 +794,7 @@ class LocalAutomateTask {
         tmpCachePath: this.getTmpPath(),
         debug: !!this.debug
       });
+      this.logger.info(`\u5C0F\u7EA2\u4E66\u53D1\u5E03\u6210\u529F\uFF1A${res}`);
       return res;
     } catch (error) {
       this.logger.error("\u5C0F\u7EA2\u4E66\u53D1\u5E03\u5931\u8D25", error);
@@ -665,14 +804,17 @@ class LocalAutomateTask {
 }
 const RpaTask = (params) => {
   const logger = Logger.getInstance(params.cachePath);
-  const packageManager = new PackageManager({
-    packageName: packageJson.name,
-    cacheDir: params.cachePath
-  });
-  const localPackge = packageManager.getPlugin(packageJson.name);
-  if (localPackge?.LocalAutomateTask && localPackge?.version && semver.gt(localPackge.version, packageJson.version)) {
-    logger.info(`\u4F7F\u7528\u8FDC\u7A0B\u7684\u65B0\u7248\u672C\uFF0C\u7248\u672C\u53F7\u4E3A\uFF1A${localPackge.version}`);
-    return new localPackge.LocalAutomateTask(params);
+  if (params.forceUpdate) {
+    logger.info("\u5C1D\u8BD5\u4F7F\u7528\u8FDC\u7A0B\u6700\u65B0\u7248\u672C");
+    const packageManager = new PackageManager({
+      packageName: packageJson.name,
+      cacheDir: params.cachePath
+    });
+    const localPackge = packageManager.getPlugin(packageJson.name);
+    if (localPackge?.LocalAutomateTask && localPackge?.version && semver.gt(localPackge.version, packageJson.version)) {
+      logger.info(`\u4F7F\u7528\u8FDC\u7A0B\u7684\u65B0\u7248\u672C\uFF0C\u7248\u672C\u53F7\u4E3A\uFF1A${localPackge.version}`);
+      return new localPackge.LocalAutomateTask(params);
+    }
   }
   return new LocalAutomateTask(params);
 };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@iflyrpa/playwright",
 	"type": "module",
-	"version": "1.0.14",
+	"version": "1.0.15-beta.1",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",
@@ -14,13 +14,19 @@
 	"license": "ISC",
 	"files": ["dist"],
 	"dependencies": {
-		"loglevel": "^1.9.2",
-		"npminstall": "^7.12.0"
+		"@electron/get": "^2.0.0",
+		"@sentry/node": "^5.5.0",
+		"extract-zip": "^2.0.1",
+		"live-plugin-manager": "^1.0.0",
+		"loglevel": "^1.9.2"
+	},
+	"peerDependencies": {
+		"playwright": "^1.46.1"
 	},
 	"devDependencies": {
 		"esno": "^4.7.0",
+		"playwright": "^1.46.1",
 		"typescript": "^5.5.2",
-		"unbuild": "^2.0.0",
-		"playwright": "^1.46.1"
+		"unbuild": "^2.0.0"
 	}
 }