@iflyrpa/playwright 1.0.8 → 1.0.10

package/dist/index.cjs

@@ -1,23 +1,21 @@
 'use strict';
 
-const semver = require('semver');
 const path = require('node:path');
-const axios = require('axios');
-const fs = require('fs-extra');
-const electron = require('electron');
-const spawn = require('cross-spawn');
+const fs = require('node:fs');
+const https = require('node:https');
+const log = require('loglevel');
+const node_child_process = require('node:child_process');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
-const semver__default = /*#__PURE__*/_interopDefaultCompat(semver);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
-const axios__default = /*#__PURE__*/_interopDefaultCompat(axios);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
-const spawn__default = /*#__PURE__*/_interopDefaultCompat(spawn);
+const https__default = /*#__PURE__*/_interopDefaultCompat(https);
+const log__default = /*#__PURE__*/_interopDefaultCompat(log);
 
 const name = "@iflyrpa/playwright";
 const type = "module";
-const version$1 = "1.0.8";
+const version$1 = "1.0.10";
 const description = "";
 const main = "./dist/index.cjs";
 const module$1 = "./dist/index.mjs";
@@ -35,23 +33,14 @@ const files = [
 	"dist"
 ];
 const dependencies = {
-	axios: "^1.7.4",
-	"cross-spawn": "^7.0.3",
-	deepmerge: "^4.3.1",
-	"fs-extra": "^11.2.0",
-	playwright: "^1.46.1",
-	semver: "^7.6.3"
+	loglevel: "^1.9.2",
+	playwright: "^1.46.1"
 };
 const peerDependencies = {
 	electron: "*"
 };
 const devDependencies = {
-	"@types/cross-spawn": "^6.0.6",
-	"@types/fs-extra": "^11.0.4",
-	"@types/semver": "^7.5.8",
-	bumpp: "^9.5.2",
 	esno: "^4.7.0",
-	"ts-node": "^10.9.2",
 	typescript: "^5.5.2",
 	unbuild: "^2.0.0"
 };
@@ -73,25 +62,159 @@ const packageJson = {
 	devDependencies: devDependencies
 };
 
-async function downloadImage(url, path2) {
-  const response = await axios__default({
-    url,
-    method: "GET",
-    responseType: "stream"
-    // 重要：设置响应类型为 'stream'
-  });
-  await fs__default.ensureFile(path2);
-  const writer = fs__default.createWriteStream(path2);
-  response.data.pipe(writer);
+async function downloadImage(url, savePath) {
+  await ensureFile(savePath);
   return new Promise((resolve, reject) => {
-    writer.on("finish", () => resolve(path2));
-    writer.on("error", reject);
+    https__default.get(url, (response) => {
+      if (response.statusCode === 200) {
+        const fileStream = fs__default.createWriteStream(savePath);
+        response.pipe(fileStream);
+        fileStream.on("finish", () => {
+          fileStream.close();
+          console.log("\u4E0B\u8F7D\u5B8C\u6210\uFF0C\u6587\u4EF6\u5DF2\u4FDD\u5B58\u81F3:", savePath);
+          resolve(savePath);
+        });
+      } else {
+        console.log("\u56FE\u7247\u4E0B\u8F7D\u5931\u8D25:", response.statusCode);
+        response.resume();
+        reject();
+      }
+    }).on("error", (error) => {
+      console.error("\u8BF7\u6C42\u56FE\u7247\u65F6\u53D1\u751F\u9519\u8BEF:", error.message);
+      reject();
+    });
   });
 }
 function getFilenameFromUrl(imageUrl) {
   const parsedUrl = new URL(imageUrl);
   return path__default.basename(parsedUrl.pathname);
 }
+function pathExists(path2) {
+  return new Promise((resolve) => {
+    fs__default.stat(path2, (err) => {
+      resolve(!err);
+    });
+  });
+}
+function ensureFile(filePath) {
+  return new Promise((resolve, reject) => {
+    const dirPath = path__default.dirname(filePath);
+    fs__default.stat(dirPath, (err, stats) => {
+      if (err) {
+        if (err.code === "ENOENT") {
+          fs__default.mkdir(dirPath, { recursive: true }, (err2) => {
+            if (err2) {
+              return reject(err2);
+            }
+            createFile();
+          });
+        } else {
+          return reject(err);
+        }
+      } else if (stats.isDirectory()) {
+        checkFile();
+      } else {
+        reject(new Error(`${dirPath} is not a directory`));
+      }
+    });
+    function checkFile() {
+      fs__default.stat(filePath, (err, stats) => {
+        if (err) {
+          if (err.code === "ENOENT") {
+            createFile();
+          } else {
+            reject(err);
+          }
+        } else if (stats.isFile()) {
+          resolve();
+        } else {
+          reject(new Error(`${filePath} is not a file`));
+        }
+      });
+    }
+    function createFile() {
+      fs__default.writeFile(filePath, "", (err) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });
+    }
+  });
+}
+function ensureFileSync(filePath) {
+  const dirPath = path__default.dirname(filePath);
+  try {
+    if (!fs__default.existsSync(dirPath)) {
+      fs__default.mkdirSync(dirPath, { recursive: true });
+    }
+  } catch (err) {
+    if (err instanceof Error) {
+      throw new Error(`Error creating directory: ${err.message}`);
+    }
+  }
+  try {
+    if (!fs__default.existsSync(filePath)) {
+      fs__default.writeFileSync(filePath, "");
+    }
+  } catch (err) {
+    if (err instanceof Error) {
+      throw new Error(`Error creating file: ${err.message}`);
+    }
+  }
+}
+function writeFile(filePath, data) {
+  return new Promise((resolve, reject) => {
+    fs__default.writeFile(filePath, data, (err) => {
+      if (err) {
+        console.error("Error writing file:", err);
+        reject();
+      } else {
+        console.log("File written successfully");
+        resolve();
+      }
+    });
+  });
+}
+function compareVersions(v1, v2) {
+  const parts1 = v1.split(".").map(Number);
+  const parts2 = v2.split(".").map(Number);
+  for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
+    const num1 = i < parts1.length ? parts1[i] : 0;
+    const num2 = i < parts2.length ? parts2[i] : 0;
+    if (num1 > num2)
+      return 1;
+    if (num1 < num2)
+      return -1;
+  }
+  return 0;
+}
+const semver = {
+  gt: (v1, v2) => compareVersions(v1, v2) === 1
+};
+function fetchJSON(url) {
+  return new Promise((resolve, reject) => {
+    https__default.get(url, (res) => {
+      let data = "";
+      res.on("data", (chunk) => {
+        data += chunk;
+      });
+      res.on("end", () => {
+        try {
+          const parsedData = JSON.parse(data);
+          resolve(parsedData);
+        } catch (e) {
+          if (e instanceof Error) {
+            reject(new Error(`Error parsing JSON: ${e.message}`));
+          }
+        }
+      });
+    }).on("error", (err) => {
+      reject(new Error(`Request failed: ${err.message}`));
+    });
+  });
+}
 
 const visibleRangeTexts = {
   public: "\u516C\u5F00",
@@ -215,6 +338,65 @@ 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) {
+    let errorMessage = error;
+    if (error instanceof Error) {
+      errorMessage = `${error.message}
+Error stack: ${error.stack}`;
+    }
+    log__default.error(prefix, errorMessage);
+  }
+  close() {
+    this.stream.end();
+  }
+};
+__publicField$2(_Logger, "instance", null);
+let Logger = _Logger;
+
 const template = `
 const { app } = require("electron");
 
@@ -224,22 +406,35 @@ app.on("window-all-closed", (e) => e.preventDefault());
 `;
 const generateFile = async (dir) => {
   const filePath = path__default.join(dir, "src", "main.js");
-  const pathExists = await fs__default.pathExists(filePath);
-  if (!pathExists) {
-    await fs__default.ensureFile(filePath);
-    await fs__default.writeFile(filePath, template);
+  const isPathExists = await pathExists(filePath);
+  if (!isPathExists) {
+    await ensureFile(filePath);
+    await writeFile(filePath, template);
   }
   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 logger = Logger.getInstance(cachePath);
+  try {
+    const executablePath = path__default.join(
+      cachePath,
+      "node_modules",
+      ".bin",
+      "electron"
+    );
+    const playwright = await playwrightPackage;
+    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);
+  }
 };
 
 var __defProp$1 = Object.defineProperty;
@@ -255,8 +450,11 @@ 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 命令
@@ -264,7 +462,8 @@ class PackageManager {
     return new Promise((resolve) => {
       const args = [cmd].concat(modules).concat("--color=always").concat("--save");
       try {
-        const npm = spawn__default("npm", args, { cwd: where });
+        const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
+        const npm = node_child_process.spawn(npmCmd, args, { cwd: where });
         let output = "";
         npm.stdout?.on("data", (data) => {
           output += data;
@@ -284,6 +483,7 @@ class PackageManager {
           console.error(err);
         });
       } catch (error) {
+        this.logger.error(`npm ${args.join(" ")}: `, error);
         console.error(error);
       }
     });
@@ -292,21 +492,23 @@ class PackageManager {
   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"
       };
-      fs__default.ensureFileSync(packagePath);
+      ensureFileSync(packagePath);
       fs__default.writeFileSync(packagePath, JSON.stringify(pkg), "utf8");
     }
   }
   // 获取依赖信息
   async getPluginInfo(module) {
-    const res = await axios__default.get(
+    const res = await fetchJSON(
       `https://registry.npmjs.com/-/v1/search?text=${module}`
     );
-    const packages = res.data.objects;
+    const packages = res.objects;
     return packages.find((it) => it.package.name === module)?.package;
   }
   // 查询本地安装的依赖
@@ -315,6 +517,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;
     }
   }
@@ -325,27 +528,26 @@ class PackageManager {
   // 安装依赖
   install(module, version) {
     const moduleName = version ? `${module}@${version}` : module;
-    return this.execCommand("install", [moduleName]);
+    return this.execCommand("install", [moduleName, "--save"]);
   }
   // 更新依赖
   update(module) {
     return this.execCommand("update", [module]);
   }
   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)
-        throw new Error("\u4F9D\u8D56\u4FE1\u606F\u83B7\u53D6\u5931\u8D25");
-      const hasNewVersion = semver__default.gt(pkInfo.version, plugin.version);
+        return;
+      const hasNewVersion = semver.gt(pkInfo.version, plugin.version);
       if (hasNewVersion) {
         await this.install(name, pkInfo.version);
       }
     }
-    console.log("Package manager init done!");
+    this.logger.info(`${name} package manager init done!`);
   }
 }
 
@@ -357,18 +559,16 @@ var __publicField = (obj, key, value) => {
 };
 const PLAYWRIGHT_VERSION = "1.46.1";
 class LocalAutomateTask {
-  constructor(params) {
+  constructor({ cachePath, debug }) {
     __publicField(this, "cachePath");
     __publicField(this, "debug");
-    __publicField(this, "appWhenReady");
     __publicField(this, "playwrightPackage");
-    this.cachePath = params.cachePath;
-    this.debug = params.debug || false;
+    __publicField(this, "logger");
+    __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
-    );
   }
   /**
    * 安装 playwright
@@ -382,19 +582,33 @@ class LocalAutomateTask {
     });
     return playwrightPackageManager.getPluginAfterInit("playwright");
   }
+  /**
+   * 启动 Electron
+   * @returns
+   */
+  async getElectronApp() {
+    if (!this._electronApp) {
+      this._electronApp = await createElectronApp(
+        this.cachePath,
+        this.playwrightPackage
+      );
+    }
+    return this._electronApp;
+  }
   /**
    * 关闭 playwright 启动的 electron 客户端
    * @returns
    */
   async close() {
-    const electronApp = await this.appWhenReady;
+    this.logger.close();
+    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",
@@ -434,22 +648,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,
+        cachePath: this.cachePath,
+        debug: !!this.debug
+      });
+      return res;
+    } catch (error) {
+      this.logger.error("\u5C0F\u7EA2\u4E66\u53D1\u5E03\u5931\u8D25", error);
+      return 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__default.gt(localPackge.version, packageJson.version)) {
+  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,6 +1,17 @@
-import { ElectronApplication } from 'playwright';
 import { CookiesSetDetails } from 'electron';
 
+declare class Logger {
+    static instance: Logger | null;
+    private stream;
+    constructor(cachePath: string);
+    static getInstance(cachePath: string): Logger;
+    debug(...msg: any[]): void;
+    info(...msg: any[]): void;
+    warn(...msg: any[]): void;
+    error(prefix: string, error: unknown): void;
+    close(): void;
+}
+
 type CookieMap = CookiesSetDetails[];
 
 interface FictionalRendition {
@@ -46,14 +57,20 @@ interface TaskParams {
 declare class LocalAutomateTask implements TaskParams {
     cachePath: string;
     debug: boolean;
-    appWhenReady: Promise<ElectronApplication>;
     playwrightPackage: Promise<unknown>;
-    constructor(params: TaskParams);
+    logger: Logger;
+    private _electronApp;
+    constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright
      * @returns
      */
-    installPlaywright(): Promise<any>;
+    private installPlaywright;
+    /**
+     * 启动 Electron
+     * @returns
+     */
+    private getElectronApp;
     /**
      * 关闭 playwright 启动的 electron 客户端
      * @returns
@@ -62,7 +79,7 @@ declare class LocalAutomateTask implements TaskParams {
     /**
      * 小红书自动化发布
      */
-    xiaohongshuPublish(params: XiaohonshuPublishParams): Promise<string>;
+    xiaohongshuPublish(params: XiaohonshuPublishParams): Promise<unknown>;
 }
 declare const RpaTask: (params: TaskParams) => LocalAutomateTask;
 

package/dist/index.d.mts

@@ -1,6 +1,17 @@
-import { ElectronApplication } from 'playwright';
 import { CookiesSetDetails } from 'electron';
 
+declare class Logger {
+    static instance: Logger | null;
+    private stream;
+    constructor(cachePath: string);
+    static getInstance(cachePath: string): Logger;
+    debug(...msg: any[]): void;
+    info(...msg: any[]): void;
+    warn(...msg: any[]): void;
+    error(prefix: string, error: unknown): void;
+    close(): void;
+}
+
 type CookieMap = CookiesSetDetails[];
 
 interface FictionalRendition {
@@ -46,14 +57,20 @@ interface TaskParams {
 declare class LocalAutomateTask implements TaskParams {
     cachePath: string;
     debug: boolean;
-    appWhenReady: Promise<ElectronApplication>;
     playwrightPackage: Promise<unknown>;
-    constructor(params: TaskParams);
+    logger: Logger;
+    private _electronApp;
+    constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright
      * @returns
      */
-    installPlaywright(): Promise<any>;
+    private installPlaywright;
+    /**
+     * 启动 Electron
+     * @returns
+     */
+    private getElectronApp;
     /**
      * 关闭 playwright 启动的 electron 客户端
      * @returns
@@ -62,7 +79,7 @@ declare class LocalAutomateTask implements TaskParams {
     /**
      * 小红书自动化发布
      */
-    xiaohongshuPublish(params: XiaohonshuPublishParams): Promise<string>;
+    xiaohongshuPublish(params: XiaohonshuPublishParams): Promise<unknown>;
 }
 declare const RpaTask: (params: TaskParams) => LocalAutomateTask;
 

package/dist/index.d.ts

@@ -1,6 +1,17 @@
-import { ElectronApplication } from 'playwright';
 import { CookiesSetDetails } from 'electron';
 
+declare class Logger {
+    static instance: Logger | null;
+    private stream;
+    constructor(cachePath: string);
+    static getInstance(cachePath: string): Logger;
+    debug(...msg: any[]): void;
+    info(...msg: any[]): void;
+    warn(...msg: any[]): void;
+    error(prefix: string, error: unknown): void;
+    close(): void;
+}
+
 type CookieMap = CookiesSetDetails[];
 
 interface FictionalRendition {
@@ -46,14 +57,20 @@ interface TaskParams {
 declare class LocalAutomateTask implements TaskParams {
     cachePath: string;
     debug: boolean;
-    appWhenReady: Promise<ElectronApplication>;
     playwrightPackage: Promise<unknown>;
-    constructor(params: TaskParams);
+    logger: Logger;
+    private _electronApp;
+    constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright
      * @returns
      */
-    installPlaywright(): Promise<any>;
+    private installPlaywright;
+    /**
+     * 启动 Electron
+     * @returns
+     */
+    private getElectronApp;
     /**
      * 关闭 playwright 启动的 electron 客户端
      * @returns
@@ -62,7 +79,7 @@ declare class LocalAutomateTask implements TaskParams {
     /**
      * 小红书自动化发布
      */
-    xiaohongshuPublish(params: XiaohonshuPublishParams): Promise<string>;
+    xiaohongshuPublish(params: XiaohonshuPublishParams): Promise<unknown>;
 }
 declare const RpaTask: (params: TaskParams) => LocalAutomateTask;
 

package/dist/index.mjs

@@ -1,13 +1,12 @@
-import semver from 'semver';
 import path from 'node:path';
-import axios from 'axios';
-import fs from 'fs-extra';
-import { app } from 'electron';
-import spawn from 'cross-spawn';
+import fs from 'node:fs';
+import https from 'node:https';
+import log from 'loglevel';
+import { spawn } from 'node:child_process';
 
 const name = "@iflyrpa/playwright";
 const type = "module";
-const version$1 = "1.0.8";
+const version$1 = "1.0.10";
 const description = "";
 const main = "./dist/index.cjs";
 const module = "./dist/index.mjs";
@@ -25,23 +24,14 @@ const files = [
 	"dist"
 ];
 const dependencies = {
-	axios: "^1.7.4",
-	"cross-spawn": "^7.0.3",
-	deepmerge: "^4.3.1",
-	"fs-extra": "^11.2.0",
-	playwright: "^1.46.1",
-	semver: "^7.6.3"
+	loglevel: "^1.9.2",
+	playwright: "^1.46.1"
 };
 const peerDependencies = {
 	electron: "*"
 };
 const devDependencies = {
-	"@types/cross-spawn": "^6.0.6",
-	"@types/fs-extra": "^11.0.4",
-	"@types/semver": "^7.5.8",
-	bumpp: "^9.5.2",
 	esno: "^4.7.0",
-	"ts-node": "^10.9.2",
 	typescript: "^5.5.2",
 	unbuild: "^2.0.0"
 };
@@ -63,25 +53,159 @@ const packageJson = {
 	devDependencies: devDependencies
 };
 
-async function downloadImage(url, path2) {
-  const response = await axios({
-    url,
-    method: "GET",
-    responseType: "stream"
-    // 重要：设置响应类型为 'stream'
-  });
-  await fs.ensureFile(path2);
-  const writer = fs.createWriteStream(path2);
-  response.data.pipe(writer);
+async function downloadImage(url, savePath) {
+  await ensureFile(savePath);
   return new Promise((resolve, reject) => {
-    writer.on("finish", () => resolve(path2));
-    writer.on("error", reject);
+    https.get(url, (response) => {
+      if (response.statusCode === 200) {
+        const fileStream = fs.createWriteStream(savePath);
+        response.pipe(fileStream);
+        fileStream.on("finish", () => {
+          fileStream.close();
+          console.log("\u4E0B\u8F7D\u5B8C\u6210\uFF0C\u6587\u4EF6\u5DF2\u4FDD\u5B58\u81F3:", savePath);
+          resolve(savePath);
+        });
+      } else {
+        console.log("\u56FE\u7247\u4E0B\u8F7D\u5931\u8D25:", response.statusCode);
+        response.resume();
+        reject();
+      }
+    }).on("error", (error) => {
+      console.error("\u8BF7\u6C42\u56FE\u7247\u65F6\u53D1\u751F\u9519\u8BEF:", error.message);
+      reject();
+    });
   });
 }
 function getFilenameFromUrl(imageUrl) {
   const parsedUrl = new URL(imageUrl);
   return path.basename(parsedUrl.pathname);
 }
+function pathExists(path2) {
+  return new Promise((resolve) => {
+    fs.stat(path2, (err) => {
+      resolve(!err);
+    });
+  });
+}
+function ensureFile(filePath) {
+  return new Promise((resolve, reject) => {
+    const dirPath = path.dirname(filePath);
+    fs.stat(dirPath, (err, stats) => {
+      if (err) {
+        if (err.code === "ENOENT") {
+          fs.mkdir(dirPath, { recursive: true }, (err2) => {
+            if (err2) {
+              return reject(err2);
+            }
+            createFile();
+          });
+        } else {
+          return reject(err);
+        }
+      } else if (stats.isDirectory()) {
+        checkFile();
+      } else {
+        reject(new Error(`${dirPath} is not a directory`));
+      }
+    });
+    function checkFile() {
+      fs.stat(filePath, (err, stats) => {
+        if (err) {
+          if (err.code === "ENOENT") {
+            createFile();
+          } else {
+            reject(err);
+          }
+        } else if (stats.isFile()) {
+          resolve();
+        } else {
+          reject(new Error(`${filePath} is not a file`));
+        }
+      });
+    }
+    function createFile() {
+      fs.writeFile(filePath, "", (err) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });
+    }
+  });
+}
+function ensureFileSync(filePath) {
+  const dirPath = path.dirname(filePath);
+  try {
+    if (!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath, { recursive: true });
+    }
+  } catch (err) {
+    if (err instanceof Error) {
+      throw new Error(`Error creating directory: ${err.message}`);
+    }
+  }
+  try {
+    if (!fs.existsSync(filePath)) {
+      fs.writeFileSync(filePath, "");
+    }
+  } catch (err) {
+    if (err instanceof Error) {
+      throw new Error(`Error creating file: ${err.message}`);
+    }
+  }
+}
+function writeFile(filePath, data) {
+  return new Promise((resolve, reject) => {
+    fs.writeFile(filePath, data, (err) => {
+      if (err) {
+        console.error("Error writing file:", err);
+        reject();
+      } else {
+        console.log("File written successfully");
+        resolve();
+      }
+    });
+  });
+}
+function compareVersions(v1, v2) {
+  const parts1 = v1.split(".").map(Number);
+  const parts2 = v2.split(".").map(Number);
+  for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
+    const num1 = i < parts1.length ? parts1[i] : 0;
+    const num2 = i < parts2.length ? parts2[i] : 0;
+    if (num1 > num2)
+      return 1;
+    if (num1 < num2)
+      return -1;
+  }
+  return 0;
+}
+const semver = {
+  gt: (v1, v2) => compareVersions(v1, v2) === 1
+};
+function fetchJSON(url) {
+  return new Promise((resolve, reject) => {
+    https.get(url, (res) => {
+      let data = "";
+      res.on("data", (chunk) => {
+        data += chunk;
+      });
+      res.on("end", () => {
+        try {
+          const parsedData = JSON.parse(data);
+          resolve(parsedData);
+        } catch (e) {
+          if (e instanceof Error) {
+            reject(new Error(`Error parsing JSON: ${e.message}`));
+          }
+        }
+      });
+    }).on("error", (err) => {
+      reject(new Error(`Request failed: ${err.message}`));
+    });
+  });
+}
 
 const visibleRangeTexts = {
   public: "\u516C\u5F00",
@@ -205,6 +329,65 @@ 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) {
+    let errorMessage = error;
+    if (error instanceof Error) {
+      errorMessage = `${error.message}
+Error stack: ${error.stack}`;
+    }
+    log.error(prefix, errorMessage);
+  }
+  close() {
+    this.stream.end();
+  }
+};
+__publicField$2(_Logger, "instance", null);
+let Logger = _Logger;
+
 const template = `
 const { app } = require("electron");
 
@@ -214,22 +397,35 @@ app.on("window-all-closed", (e) => e.preventDefault());
 `;
 const generateFile = async (dir) => {
   const filePath = path.join(dir, "src", "main.js");
-  const pathExists = await fs.pathExists(filePath);
-  if (!pathExists) {
-    await fs.ensureFile(filePath);
-    await fs.writeFile(filePath, template);
+  const isPathExists = await pathExists(filePath);
+  if (!isPathExists) {
+    await ensureFile(filePath);
+    await writeFile(filePath, template);
   }
   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 logger = Logger.getInstance(cachePath);
+  try {
+    const executablePath = path.join(
+      cachePath,
+      "node_modules",
+      ".bin",
+      "electron"
+    );
+    const playwright = await playwrightPackage;
+    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);
+  }
 };
 
 var __defProp$1 = Object.defineProperty;
@@ -245,8 +441,11 @@ 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 命令
@@ -254,7 +453,8 @@ class PackageManager {
     return new Promise((resolve) => {
       const args = [cmd].concat(modules).concat("--color=always").concat("--save");
       try {
-        const npm = spawn("npm", args, { cwd: where });
+        const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
+        const npm = spawn(npmCmd, args, { cwd: where });
         let output = "";
         npm.stdout?.on("data", (data) => {
           output += data;
@@ -274,6 +474,7 @@ class PackageManager {
           console.error(err);
         });
       } catch (error) {
+        this.logger.error(`npm ${args.join(" ")}: `, error);
         console.error(error);
       }
     });
@@ -282,21 +483,23 @@ class PackageManager {
   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"
       };
-      fs.ensureFileSync(packagePath);
+      ensureFileSync(packagePath);
       fs.writeFileSync(packagePath, JSON.stringify(pkg), "utf8");
     }
   }
   // 获取依赖信息
   async getPluginInfo(module) {
-    const res = await axios.get(
+    const res = await fetchJSON(
       `https://registry.npmjs.com/-/v1/search?text=${module}`
     );
-    const packages = res.data.objects;
+    const packages = res.objects;
     return packages.find((it) => it.package.name === module)?.package;
   }
   // 查询本地安装的依赖
@@ -305,6 +508,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;
     }
   }
@@ -315,27 +519,26 @@ class PackageManager {
   // 安装依赖
   install(module, version) {
     const moduleName = version ? `${module}@${version}` : module;
-    return this.execCommand("install", [moduleName]);
+    return this.execCommand("install", [moduleName, "--save"]);
   }
   // 更新依赖
   update(module) {
     return this.execCommand("update", [module]);
   }
   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)
-        throw new Error("\u4F9D\u8D56\u4FE1\u606F\u83B7\u53D6\u5931\u8D25");
+        return;
       const hasNewVersion = semver.gt(pkInfo.version, plugin.version);
       if (hasNewVersion) {
         await this.install(name, pkInfo.version);
       }
     }
-    console.log("Package manager init done!");
+    this.logger.info(`${name} package manager init done!`);
   }
 }
 
@@ -347,18 +550,16 @@ var __publicField = (obj, key, value) => {
 };
 const PLAYWRIGHT_VERSION = "1.46.1";
 class LocalAutomateTask {
-  constructor(params) {
+  constructor({ cachePath, debug }) {
     __publicField(this, "cachePath");
     __publicField(this, "debug");
-    __publicField(this, "appWhenReady");
     __publicField(this, "playwrightPackage");
-    this.cachePath = params.cachePath;
-    this.debug = params.debug || false;
+    __publicField(this, "logger");
+    __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
-    );
   }
   /**
    * 安装 playwright
@@ -372,19 +573,33 @@ class LocalAutomateTask {
     });
     return playwrightPackageManager.getPluginAfterInit("playwright");
   }
+  /**
+   * 启动 Electron
+   * @returns
+   */
+  async getElectronApp() {
+    if (!this._electronApp) {
+      this._electronApp = await createElectronApp(
+        this.cachePath,
+        this.playwrightPackage
+      );
+    }
+    return this._electronApp;
+  }
   /**
    * 关闭 playwright 启动的 electron 客户端
    * @returns
    */
   async close() {
-    const electronApp = await this.appWhenReady;
+    this.logger.close();
+    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",
@@ -424,22 +639,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,
+        cachePath: this.cachePath,
+        debug: !!this.debug
+      });
+      return res;
+    } catch (error) {
+      this.logger.error("\u5C0F\u7EA2\u4E66\u53D1\u5E03\u5931\u8D25", error);
+      return 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,7 +1,7 @@
 {
 	"name": "@iflyrpa/playwright",
 	"type": "module",
-	"version": "1.0.8",
+	"version": "1.0.10",
 	"description": "",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.mjs",
@@ -16,23 +16,14 @@
 	"license": "ISC",
 	"files": ["dist"],
 	"dependencies": {
-		"axios": "^1.7.4",
-		"cross-spawn": "^7.0.3",
-		"deepmerge": "^4.3.1",
-		"fs-extra": "^11.2.0",
-		"playwright": "^1.46.1",
-		"semver": "^7.6.3"
+		"loglevel": "^1.9.2",
+		"playwright": "^1.46.1"
 	},
 	"peerDependencies": {
 		"electron": "*"
 	},
 	"devDependencies": {
-		"@types/cross-spawn": "^6.0.6",
-		"@types/fs-extra": "^11.0.4",
-		"@types/semver": "^7.5.8",
-		"bumpp": "^9.5.2",
 		"esno": "^4.7.0",
-		"ts-node": "^10.9.2",
 		"typescript": "^5.5.2",
 		"unbuild": "^2.0.0"
 	}