@iflyrpa/playwright 1.0.9 → 1.0.11

package/dist/index.cjs

@@ -1,21 +1,22 @@
 'use strict';
 
-const path = require('node:path');
 const fs = require('node:fs');
+const path = require('node:path');
 const https = require('node:https');
-const electron = require('electron');
-const node_child_process = require('node:child_process');
+const log = require('loglevel');
+const npminstall = require('npminstall');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
-const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const https__default = /*#__PURE__*/_interopDefaultCompat(https);
+const log__default = /*#__PURE__*/_interopDefaultCompat(log);
+const npminstall__default = /*#__PURE__*/_interopDefaultCompat(npminstall);
 
 const name = "@iflyrpa/playwright";
 const type = "module";
-const version$1 = "1.0.9";
-const description = "";
+const version$1 = "1.0.11";
 const main = "./dist/index.cjs";
 const module$1 = "./dist/index.mjs";
 const types = "./dist/index.d.ts";
@@ -24,14 +25,14 @@ const scripts = {
 	dev: "unbuild --stub",
 	start: "esno src/index.ts"
 };
-const keywords = [
-];
 const author = "bijinfeng";
 const license = "ISC";
 const files = [
 	"dist"
 ];
 const dependencies = {
+	loglevel: "^1.9.2",
+	npminstall: "^7.12.0",
 	playwright: "^1.46.1"
 };
 const peerDependencies = {
@@ -46,12 +47,10 @@ const packageJson = {
 	name: name,
 	type: type,
 	version: version$1,
-	description: description,
 	main: main,
 	module: module$1,
 	types: types,
 	scripts: scripts,
-	keywords: keywords,
 	author: author,
 	license: license,
 	files: files,
@@ -219,7 +218,7 @@ const visibleRangeTexts = {
   private: "\u79C1\u5BC6"
 };
 const xiaohongshuPublishAction = async (props) => {
-  const { page, cachePath, params } = props;
+  const { page, tmpCachePath, params } = props;
   const selectAddress = async (selector, address) => {
     const instance = typeof selector === "string" ? page.locator(selector) : selector;
     await instance.click();
@@ -242,11 +241,13 @@ const xiaohongshuPublishAction = async (props) => {
   await page.locator("#content-area .menu-container .publish-video a").click().catch(() => {
     throw new Error("\u672A\u627E\u5230\u53D1\u5E03\u7B14\u8BB0\u6309\u94AE");
   });
-  await page.locator(".creator-container .header .title").filter({ hasText: /^上传图文$/ }).click();
+  await page.locator(".creator-container .header .title").filter({ hasText: /^上传图文$/ }).click().catch(() => {
+    throw new Error("\u672A\u627E\u5230\u4E0A\u4F20\u56FE\u6587\u6309\u94AE");
+  });
   const images = await Promise.all(
     params.banners.map((url) => {
       const fileName = getFilenameFromUrl(url);
-      return downloadImage(url, path__default.join(cachePath, "image-tmp", fileName));
+      return downloadImage(url, path__default.join(tmpCachePath, fileName));
     })
   );
   const fileChooserPromise = page.waitForEvent("filechooser");
@@ -336,6 +337,64 @@ const xiaohongshuPublishAction = async (props) => {
   return response;
 };
 
+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) => {
+  __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+const _Logger = class _Logger {
+  constructor(cachePath) {
+    __publicField$2(this, "stream");
+    if (_Logger.instance) {
+      return _Logger.instance;
+    }
+    const logFile = path__default.join(cachePath, "rpa.log");
+    this.stream = fs__default.createWriteStream(logFile, { flags: "a" });
+    log__default.setLevel("debug");
+    log__default.methodFactory = (methodName) => {
+      return (message) => {
+        this.stream.write(
+          `[${( new Date()).toISOString()}] ${methodName.toUpperCase()}: ${message}
+`
+        );
+      };
+    };
+    log__default.setLevel(log__default.getLevel());
+    _Logger.instance = this;
+  }
+  static getInstance(cachePath) {
+    if (!_Logger.instance) {
+      _Logger.instance = new _Logger(cachePath);
+    }
+    return _Logger.instance;
+  }
+  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  debug(...msg) {
+    log__default.debug(...msg);
+  }
+  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  info(...msg) {
+    log__default.info(...msg);
+  }
+  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  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}`);
+    }
+  }
+  close() {
+    this.stream.end();
+  }
+};
+__publicField$2(_Logger, "instance", null);
+let Logger = _Logger;
+
 const template = `
 const { app } = require("electron");
 
@@ -352,15 +411,28 @@ const generateFile = async (dir) => {
   }
   return filePath;
 };
-const createElectronApp = async (cachePath, playwrightPackage) => {
-  const playwright = await playwrightPackage;
-  const mainPath = await generateFile(cachePath);
-  const electronApp = await playwright._electron.launch({
-    executablePath: electron.app.getPath("exe"),
-    // 获取 Electron 可执行文件的路径
-    args: [mainPath]
-  });
-  return electronApp;
+const createElectronApp = async (cachePath, playwright) => {
+  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,
+      // 获取 Electron 可执行文件的路径
+      args: [mainPath],
+      cwd: cachePath
+    });
+    logger.info(`electron \u542F\u52A8\u6210\u529F\uFF1A${executablePath} ${mainPath}`);
+    return electronApp;
+  } catch (error) {
+    logger.error("electron \u542F\u52A8\u5931\u8D25\uFF1A", error);
+    throw error;
+  }
 };
 
 var __defProp$1 = Object.defineProperty;
@@ -369,6 +441,7 @@ var __publicField$1 = (obj, key, value) => {
   __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
+const NPM_REGISTRY = "https://registry.npmmirror.com/";
 class PackageManager {
   constructor(params) {
     __publicField$1(this, "cacheDir");
@@ -376,47 +449,23 @@ class PackageManager {
     __publicField$1(this, "forceUpdate");
     // 是否强制更新
     __publicField$1(this, "initPromise");
+    __publicField$1(this, "logger");
+    this.logger = Logger.getInstance(params.cacheDir);
     this.cacheDir = params.cacheDir;
     this.forceUpdate = params.forceUpdate || true;
+    this.initCacheProject();
     this.initPromise = this.init(params.packageName, params.packageVersion);
   }
-  // 在子线程执行 npm 命令
-  execCommand(cmd, modules, where = this.cacheDir) {
-    return new Promise((resolve) => {
-      const args = [cmd].concat(modules).concat("--color=always").concat("--save");
-      try {
-        const npm = node_child_process.spawn("npm", args, { cwd: where });
-        let output = "";
-        npm.stdout?.on("data", (data) => {
-          output += data;
-        }).pipe(process.stdout);
-        npm.stderr?.on("data", (data) => {
-          output += data;
-        }).pipe(process.stderr);
-        npm.on("close", (code) => {
-          if (!code) {
-            resolve({ code: 0, data: output });
-          } else {
-            resolve({ code, data: output });
-          }
-        });
-        npm.on("error", (err) => {
-          console.error("NPM is not installed");
-          console.error(err);
-        });
-      } catch (error) {
-        console.error(error);
-      }
-    });
-  }
   // 构建 package.json 文件，有了该文件后，依赖可以安装在该目录下，避免污染全局环境
   initCacheProject() {
     const packagePath = path__default.join(this.cacheDir, "package.json");
     if (!fs__default.existsSync(packagePath)) {
+      this.logger.info("package.json \u4E0D\u5B58\u5728\uFF0C\u6DFB\u52A0\u8BE5\u6587\u4EF6");
       const pkg = {
         name: "rpa-plugins",
         description: "rpa-plugins",
-        license: "MIT"
+        license: "MIT",
+        main: "./src/main.js"
       };
       ensureFileSync(packagePath);
       fs__default.writeFileSync(packagePath, JSON.stringify(pkg), "utf8");
@@ -436,6 +485,7 @@ 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;
     }
   }
@@ -445,28 +495,30 @@ class PackageManager {
   }
   // 安装依赖
   install(module, version) {
-    const moduleName = version ? `${module}@${version}` : module;
-    return this.execCommand("install", [moduleName]);
-  }
-  // 更新依赖
-  update(module) {
-    return this.execCommand("update", [module]);
+    return npminstall__default({
+      root: this.cacheDir,
+      pkgs: [{ name: module, version }],
+      registry: NPM_REGISTRY
+    });
   }
   async init(name, version) {
-    this.initCacheProject();
     const plugin = this.getPlugin(path__default.join(name, "package.json"));
-    if (!plugin) {
-      await this.install(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) {
-        await this.install(name, pkInfo.version);
+    try {
+      if (!plugin) {
+        await this.install(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) {
+          await this.install(name, pkInfo.version);
+        }
       }
+      this.logger.info(`${name} package manager init done!`);
+    } catch (error) {
+      this.logger.error(`${name} package manager init error`, error);
     }
-    console.log("Package manager init done!");
   }
 }
 
@@ -477,19 +529,20 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 const PLAYWRIGHT_VERSION = "1.46.1";
+const ELECTRON_VERSION = "22.3.27";
 class LocalAutomateTask {
-  constructor(params) {
+  constructor({ cachePath, debug }) {
+    __publicField(this, "logger");
     __publicField(this, "cachePath");
     __publicField(this, "debug");
-    __publicField(this, "appWhenReady");
     __publicField(this, "playwrightPackage");
-    this.cachePath = params.cachePath;
-    this.debug = params.debug || false;
+    __publicField(this, "electronPackage");
+    __publicField(this, "_electronApp", null);
+    this.cachePath = cachePath;
+    this.debug = debug || false;
+    this.logger = Logger.getInstance(cachePath);
     this.playwrightPackage = this.installPlaywright();
-    this.appWhenReady = createElectronApp(
-      params.cachePath,
-      this.playwrightPackage
-    );
+    this.electronPackage = this.installElectron();
   }
   /**
    * 安装 playwright
@@ -503,19 +556,67 @@ class LocalAutomateTask {
     });
     return playwrightPackageManager.getPluginAfterInit("playwright");
   }
+  /**
+   * 安装 electron
+   * @returns
+   */
+  installElectron() {
+    const playwrightPackageManager = new PackageManager({
+      packageName: "electron",
+      packageVersion: ELECTRON_VERSION,
+      cacheDir: this.cachePath
+    });
+    return playwrightPackageManager.getPluginAfterInit("electron");
+  }
+  /**
+   * 启动 Electron
+   * @returns
+   */
+  async getElectronApp() {
+    if (!this._electronApp) {
+      const [playwright] = await Promise.all([
+        this.playwrightPackage,
+        this.electronPackage
+      ]);
+      this._electronApp = await createElectronApp(this.cachePath, playwright);
+    }
+    return this._electronApp;
+  }
+  /**
+   * 临时文件目录
+   * @returns
+   */
+  getTmpPath() {
+    return path__default.join(this.cachePath, "tmp");
+  }
+  /**
+   * 清空临时文件
+   */
+  clearTmpPath() {
+    const tmpPath = this.getTmpPath();
+    return fs__default.rm(tmpPath, { recursive: true, force: true }, (err) => {
+      if (err) {
+        this.logger.error("\u5220\u9664\u4E34\u65F6\u6587\u4EF6\u5931\u8D25\uFF0C", err);
+      } else {
+        this.logger.info("\u5220\u9664\u4E34\u65F6\u6587\u4EF6\u6210\u529F");
+      }
+    });
+  }
   /**
    * 关闭 playwright 启动的 electron 客户端
    * @returns
    */
   async close() {
-    const electronApp = await this.appWhenReady;
+    this.logger.close();
+    this.clearTmpPath();
+    const electronApp = await this.getElectronApp();
     return electronApp.close();
   }
   /**
    * 小红书自动化发布
    */
   async xiaohongshuPublish(params) {
-    const electronApp = await this.appWhenReady;
+    const electronApp = await this.getElectronApp();
     const commonCookies = {
       path: "/",
       sameSite: "lax",
@@ -555,22 +656,29 @@ class LocalAutomateTask {
         { pageParams }
       )
     ]);
-    const res = await xiaohongshuPublishAction({
-      page,
-      params,
-      cachePath: this.cachePath,
-      debug: !!this.debug
-    });
-    return res;
+    try {
+      const res = await xiaohongshuPublishAction({
+        page,
+        params,
+        tmpCachePath: this.getTmpPath(),
+        debug: !!this.debug
+      });
+      return res;
+    } catch (error) {
+      this.logger.error("\u5C0F\u7EA2\u4E66\u53D1\u5E03\u5931\u8D25", error);
+      throw error;
+    }
   }
 }
 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);
   }
   return new LocalAutomateTask(params);

package/dist/index.d.cts

@@ -1,4 +1,3 @@
-import { ElectronApplication } from 'playwright';
 import { CookiesSetDetails } from 'electron';
 
 type CookieMap = CookiesSetDetails[];
@@ -44,16 +43,37 @@ interface TaskParams {
     cachePath: string;
 }
 declare class LocalAutomateTask implements TaskParams {
+    private logger;
     cachePath: string;
     debug: boolean;
-    appWhenReady: Promise<ElectronApplication>;
-    playwrightPackage: Promise<unknown>;
-    constructor(params: TaskParams);
+    private playwrightPackage;
+    private electronPackage;
+    private _electronApp;
+    constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright
      * @returns
      */
-    installPlaywright(): Promise<any>;
+    private installPlaywright;
+    /**
+     * 安装 electron
+     * @returns
+     */
+    private installElectron;
+    /**
+     * 启动 Electron
+     * @returns
+     */
+    private getElectronApp;
+    /**
+     * 临时文件目录
+     * @returns
+     */
+    private getTmpPath;
+    /**
+     * 清空临时文件
+     */
+    private clearTmpPath;
     /**
      * 关闭 playwright 启动的 electron 客户端
      * @returns

package/dist/index.d.mts

@@ -1,4 +1,3 @@
-import { ElectronApplication } from 'playwright';
 import { CookiesSetDetails } from 'electron';
 
 type CookieMap = CookiesSetDetails[];
@@ -44,16 +43,37 @@ interface TaskParams {
     cachePath: string;
 }
 declare class LocalAutomateTask implements TaskParams {
+    private logger;
     cachePath: string;
     debug: boolean;
-    appWhenReady: Promise<ElectronApplication>;
-    playwrightPackage: Promise<unknown>;
-    constructor(params: TaskParams);
+    private playwrightPackage;
+    private electronPackage;
+    private _electronApp;
+    constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright
      * @returns
      */
-    installPlaywright(): Promise<any>;
+    private installPlaywright;
+    /**
+     * 安装 electron
+     * @returns
+     */
+    private installElectron;
+    /**
+     * 启动 Electron
+     * @returns
+     */
+    private getElectronApp;
+    /**
+     * 临时文件目录
+     * @returns
+     */
+    private getTmpPath;
+    /**
+     * 清空临时文件
+     */
+    private clearTmpPath;
     /**
      * 关闭 playwright 启动的 electron 客户端
      * @returns

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import { ElectronApplication } from 'playwright';
 import { CookiesSetDetails } from 'electron';
 
 type CookieMap = CookiesSetDetails[];
@@ -44,16 +43,37 @@ interface TaskParams {
     cachePath: string;
 }
 declare class LocalAutomateTask implements TaskParams {
+    private logger;
     cachePath: string;
     debug: boolean;
-    appWhenReady: Promise<ElectronApplication>;
-    playwrightPackage: Promise<unknown>;
-    constructor(params: TaskParams);
+    private playwrightPackage;
+    private electronPackage;
+    private _electronApp;
+    constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright
      * @returns
      */
-    installPlaywright(): Promise<any>;
+    private installPlaywright;
+    /**
+     * 安装 electron
+     * @returns
+     */
+    private installElectron;
+    /**
+     * 启动 Electron
+     * @returns
+     */
+    private getElectronApp;
+    /**
+     * 临时文件目录
+     * @returns
+     */
+    private getTmpPath;
+    /**
+     * 清空临时文件
+     */
+    private clearTmpPath;
     /**
      * 关闭 playwright 启动的 electron 客户端
      * @returns

package/dist/index.mjs

@@ -1,13 +1,12 @@
-import path from 'node:path';
 import fs from 'node:fs';
+import path from 'node:path';
 import https from 'node:https';
-import { app } from 'electron';
-import { spawn } from 'node:child_process';
+import log from 'loglevel';
+import npminstall from 'npminstall';
 
 const name = "@iflyrpa/playwright";
 const type = "module";
-const version$1 = "1.0.9";
-const description = "";
+const version$1 = "1.0.11";
 const main = "./dist/index.cjs";
 const module = "./dist/index.mjs";
 const types = "./dist/index.d.ts";
@@ -16,14 +15,14 @@ const scripts = {
 	dev: "unbuild --stub",
 	start: "esno src/index.ts"
 };
-const keywords = [
-];
 const author = "bijinfeng";
 const license = "ISC";
 const files = [
 	"dist"
 ];
 const dependencies = {
+	loglevel: "^1.9.2",
+	npminstall: "^7.12.0",
 	playwright: "^1.46.1"
 };
 const peerDependencies = {
@@ -38,12 +37,10 @@ const packageJson = {
 	name: name,
 	type: type,
 	version: version$1,
-	description: description,
 	main: main,
 	module: module,
 	types: types,
 	scripts: scripts,
-	keywords: keywords,
 	author: author,
 	license: license,
 	files: files,
@@ -211,7 +208,7 @@ const visibleRangeTexts = {
   private: "\u79C1\u5BC6"
 };
 const xiaohongshuPublishAction = async (props) => {
-  const { page, cachePath, params } = props;
+  const { page, tmpCachePath, params } = props;
   const selectAddress = async (selector, address) => {
     const instance = typeof selector === "string" ? page.locator(selector) : selector;
     await instance.click();
@@ -234,11 +231,13 @@ const xiaohongshuPublishAction = async (props) => {
   await page.locator("#content-area .menu-container .publish-video a").click().catch(() => {
     throw new Error("\u672A\u627E\u5230\u53D1\u5E03\u7B14\u8BB0\u6309\u94AE");
   });
-  await page.locator(".creator-container .header .title").filter({ hasText: /^上传图文$/ }).click();
+  await page.locator(".creator-container .header .title").filter({ hasText: /^上传图文$/ }).click().catch(() => {
+    throw new Error("\u672A\u627E\u5230\u4E0A\u4F20\u56FE\u6587\u6309\u94AE");
+  });
   const images = await Promise.all(
     params.banners.map((url) => {
       const fileName = getFilenameFromUrl(url);
-      return downloadImage(url, path.join(cachePath, "image-tmp", fileName));
+      return downloadImage(url, path.join(tmpCachePath, fileName));
     })
   );
   const fileChooserPromise = page.waitForEvent("filechooser");
@@ -328,6 +327,64 @@ const xiaohongshuPublishAction = async (props) => {
   return response;
 };
 
+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) => {
+  __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+const _Logger = class _Logger {
+  constructor(cachePath) {
+    __publicField$2(this, "stream");
+    if (_Logger.instance) {
+      return _Logger.instance;
+    }
+    const logFile = path.join(cachePath, "rpa.log");
+    this.stream = fs.createWriteStream(logFile, { flags: "a" });
+    log.setLevel("debug");
+    log.methodFactory = (methodName) => {
+      return (message) => {
+        this.stream.write(
+          `[${( new Date()).toISOString()}] ${methodName.toUpperCase()}: ${message}
+`
+        );
+      };
+    };
+    log.setLevel(log.getLevel());
+    _Logger.instance = this;
+  }
+  static getInstance(cachePath) {
+    if (!_Logger.instance) {
+      _Logger.instance = new _Logger(cachePath);
+    }
+    return _Logger.instance;
+  }
+  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  debug(...msg) {
+    log.debug(...msg);
+  }
+  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  info(...msg) {
+    log.info(...msg);
+  }
+  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  warn(...msg) {
+    log.warn(...msg);
+  }
+  error(prefix, error) {
+    log.error(prefix);
+    if (error instanceof Error) {
+      log.error(`${error.message}
+Error stack: ${error.stack}`);
+    }
+  }
+  close() {
+    this.stream.end();
+  }
+};
+__publicField$2(_Logger, "instance", null);
+let Logger = _Logger;
+
 const template = `
 const { app } = require("electron");
 
@@ -344,15 +401,28 @@ const generateFile = async (dir) => {
   }
   return filePath;
 };
-const createElectronApp = async (cachePath, playwrightPackage) => {
-  const playwright = await playwrightPackage;
-  const mainPath = await generateFile(cachePath);
-  const electronApp = await playwright._electron.launch({
-    executablePath: app.getPath("exe"),
-    // 获取 Electron 可执行文件的路径
-    args: [mainPath]
-  });
-  return electronApp;
+const createElectronApp = async (cachePath, playwright) => {
+  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,
+      // 获取 Electron 可执行文件的路径
+      args: [mainPath],
+      cwd: cachePath
+    });
+    logger.info(`electron \u542F\u52A8\u6210\u529F\uFF1A${executablePath} ${mainPath}`);
+    return electronApp;
+  } catch (error) {
+    logger.error("electron \u542F\u52A8\u5931\u8D25\uFF1A", error);
+    throw error;
+  }
 };
 
 var __defProp$1 = Object.defineProperty;
@@ -361,6 +431,7 @@ var __publicField$1 = (obj, key, value) => {
   __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
+const NPM_REGISTRY = "https://registry.npmmirror.com/";
 class PackageManager {
   constructor(params) {
     __publicField$1(this, "cacheDir");
@@ -368,47 +439,23 @@ class PackageManager {
     __publicField$1(this, "forceUpdate");
     // 是否强制更新
     __publicField$1(this, "initPromise");
+    __publicField$1(this, "logger");
+    this.logger = Logger.getInstance(params.cacheDir);
     this.cacheDir = params.cacheDir;
     this.forceUpdate = params.forceUpdate || true;
+    this.initCacheProject();
     this.initPromise = this.init(params.packageName, params.packageVersion);
   }
-  // 在子线程执行 npm 命令
-  execCommand(cmd, modules, where = this.cacheDir) {
-    return new Promise((resolve) => {
-      const args = [cmd].concat(modules).concat("--color=always").concat("--save");
-      try {
-        const npm = spawn("npm", args, { cwd: where });
-        let output = "";
-        npm.stdout?.on("data", (data) => {
-          output += data;
-        }).pipe(process.stdout);
-        npm.stderr?.on("data", (data) => {
-          output += data;
-        }).pipe(process.stderr);
-        npm.on("close", (code) => {
-          if (!code) {
-            resolve({ code: 0, data: output });
-          } else {
-            resolve({ code, data: output });
-          }
-        });
-        npm.on("error", (err) => {
-          console.error("NPM is not installed");
-          console.error(err);
-        });
-      } catch (error) {
-        console.error(error);
-      }
-    });
-  }
   // 构建 package.json 文件，有了该文件后，依赖可以安装在该目录下，避免污染全局环境
   initCacheProject() {
     const packagePath = path.join(this.cacheDir, "package.json");
     if (!fs.existsSync(packagePath)) {
+      this.logger.info("package.json \u4E0D\u5B58\u5728\uFF0C\u6DFB\u52A0\u8BE5\u6587\u4EF6");
       const pkg = {
         name: "rpa-plugins",
         description: "rpa-plugins",
-        license: "MIT"
+        license: "MIT",
+        main: "./src/main.js"
       };
       ensureFileSync(packagePath);
       fs.writeFileSync(packagePath, JSON.stringify(pkg), "utf8");
@@ -428,6 +475,7 @@ 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;
     }
   }
@@ -437,28 +485,30 @@ class PackageManager {
   }
   // 安装依赖
   install(module, version) {
-    const moduleName = version ? `${module}@${version}` : module;
-    return this.execCommand("install", [moduleName]);
-  }
-  // 更新依赖
-  update(module) {
-    return this.execCommand("update", [module]);
+    return npminstall({
+      root: this.cacheDir,
+      pkgs: [{ name: module, version }],
+      registry: NPM_REGISTRY
+    });
   }
   async init(name, version) {
-    this.initCacheProject();
     const plugin = this.getPlugin(path.join(name, "package.json"));
-    if (!plugin) {
-      await this.install(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) {
-        await this.install(name, pkInfo.version);
+    try {
+      if (!plugin) {
+        await this.install(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) {
+          await this.install(name, pkInfo.version);
+        }
       }
+      this.logger.info(`${name} package manager init done!`);
+    } catch (error) {
+      this.logger.error(`${name} package manager init error`, error);
     }
-    console.log("Package manager init done!");
   }
 }
 
@@ -469,19 +519,20 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 const PLAYWRIGHT_VERSION = "1.46.1";
+const ELECTRON_VERSION = "22.3.27";
 class LocalAutomateTask {
-  constructor(params) {
+  constructor({ cachePath, debug }) {
+    __publicField(this, "logger");
     __publicField(this, "cachePath");
     __publicField(this, "debug");
-    __publicField(this, "appWhenReady");
     __publicField(this, "playwrightPackage");
-    this.cachePath = params.cachePath;
-    this.debug = params.debug || false;
+    __publicField(this, "electronPackage");
+    __publicField(this, "_electronApp", null);
+    this.cachePath = cachePath;
+    this.debug = debug || false;
+    this.logger = Logger.getInstance(cachePath);
     this.playwrightPackage = this.installPlaywright();
-    this.appWhenReady = createElectronApp(
-      params.cachePath,
-      this.playwrightPackage
-    );
+    this.electronPackage = this.installElectron();
   }
   /**
    * 安装 playwright
@@ -495,19 +546,67 @@ class LocalAutomateTask {
     });
     return playwrightPackageManager.getPluginAfterInit("playwright");
   }
+  /**
+   * 安装 electron
+   * @returns
+   */
+  installElectron() {
+    const playwrightPackageManager = new PackageManager({
+      packageName: "electron",
+      packageVersion: ELECTRON_VERSION,
+      cacheDir: this.cachePath
+    });
+    return playwrightPackageManager.getPluginAfterInit("electron");
+  }
+  /**
+   * 启动 Electron
+   * @returns
+   */
+  async getElectronApp() {
+    if (!this._electronApp) {
+      const [playwright] = await Promise.all([
+        this.playwrightPackage,
+        this.electronPackage
+      ]);
+      this._electronApp = await createElectronApp(this.cachePath, playwright);
+    }
+    return this._electronApp;
+  }
+  /**
+   * 临时文件目录
+   * @returns
+   */
+  getTmpPath() {
+    return path.join(this.cachePath, "tmp");
+  }
+  /**
+   * 清空临时文件
+   */
+  clearTmpPath() {
+    const tmpPath = this.getTmpPath();
+    return fs.rm(tmpPath, { recursive: true, force: true }, (err) => {
+      if (err) {
+        this.logger.error("\u5220\u9664\u4E34\u65F6\u6587\u4EF6\u5931\u8D25\uFF0C", err);
+      } else {
+        this.logger.info("\u5220\u9664\u4E34\u65F6\u6587\u4EF6\u6210\u529F");
+      }
+    });
+  }
   /**
    * 关闭 playwright 启动的 electron 客户端
    * @returns
    */
   async close() {
-    const electronApp = await this.appWhenReady;
+    this.logger.close();
+    this.clearTmpPath();
+    const electronApp = await this.getElectronApp();
     return electronApp.close();
   }
   /**
    * 小红书自动化发布
    */
   async xiaohongshuPublish(params) {
-    const electronApp = await this.appWhenReady;
+    const electronApp = await this.getElectronApp();
     const commonCookies = {
       path: "/",
       sameSite: "lax",
@@ -547,22 +646,29 @@ class LocalAutomateTask {
         { pageParams }
       )
     ]);
-    const res = await xiaohongshuPublishAction({
-      page,
-      params,
-      cachePath: this.cachePath,
-      debug: !!this.debug
-    });
-    return res;
+    try {
+      const res = await xiaohongshuPublishAction({
+        page,
+        params,
+        tmpCachePath: this.getTmpPath(),
+        debug: !!this.debug
+      });
+      return res;
+    } catch (error) {
+      this.logger.error("\u5C0F\u7EA2\u4E66\u53D1\u5E03\u5931\u8D25", error);
+      throw error;
+    }
   }
 }
 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);
   }
   return new LocalAutomateTask(params);

package/package.json

@@ -1,8 +1,7 @@
 {
 	"name": "@iflyrpa/playwright",
 	"type": "module",
-	"version": "1.0.9",
-	"description": "",
+	"version": "1.0.11",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",
@@ -11,11 +10,12 @@
 		"dev": "unbuild --stub",
 		"start": "esno src/index.ts"
 	},
-	"keywords": [],
 	"author": "bijinfeng",
 	"license": "ISC",
 	"files": ["dist"],
 	"dependencies": {
+		"loglevel": "^1.9.2",
+		"npminstall": "^7.12.0",
 		"playwright": "^1.46.1"
 	},
 	"peerDependencies": {