@iflyrpa/playwright 1.0.15-beta.0 → 1.0.15-beta.1

package/dist/index.cjs

@@ -8,6 +8,7 @@ const os = require('node:os');
 const get = require('@electron/get');
 const extract = require('extract-zip');
 const log = require('loglevel');
+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; }
@@ -22,7 +23,7 @@ const log__default = /*#__PURE__*/_interopDefaultCompat(log);
 
 const name = "@iflyrpa/playwright";
 const type = "module";
-const version$1 = "1.0.15-beta.0";
+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";
@@ -38,6 +39,7 @@ const files = [
 ];
 const dependencies = {
 	"@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"
@@ -265,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");
@@ -348,19 +350,20 @@ const xiaohongshuPublishAction = async (props) => {
   return response;
 };
 
-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);
+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$3(this, "electronPath");
-    __publicField$3(this, "platformPath");
+    __publicField$4(this, "electronPath");
+    __publicField$4(this, "platformPath");
     this.platformPath = this.getPlatformPath();
     this.electronPath = path__default.join(rootDir, this.platformPath);
   }
@@ -419,6 +422,8 @@ class ElectronInstall {
         force: process.env.force_no_cache === "true",
         cacheRoot: process.env.electron_config_cache,
         checksums: void 0,
+        mirrorOptions: { mirror: ELECTRON_MIRROR },
+        // 使用国内镜像下载
         platform,
         arch
       });
@@ -434,6 +439,28 @@ class ElectronInstall {
   }
 }
 
+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) => {
@@ -452,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}
 `
         );
       };
@@ -478,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();
@@ -638,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);
@@ -712,10 +745,12 @@ class LocalAutomateTask {
    * @returns
    */
   async close() {
-    this.logger.close();
+    this.logger.info("\u5173\u95ED\u5E94\u7528");
     this.clearTmpPath();
-    const electronApp = await this.launchApp();
-    return electronApp.close();
+    this.logger.close();
+    await this._electronApp?.close();
+    this.isClosed = true;
+    this._electronApp = null;
   }
   /**
    * 小红书自动化发布

package/dist/index.d.cts

@@ -95,6 +95,10 @@ declare class LocalAutomateTask implements TaskParams {
     private playwrightPackage;
     private electronPackage;
     private _electronApp;
+    /**
+     * 应用是否已关闭
+     */
+    isClosed: boolean;
     constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright

package/dist/index.d.mts

@@ -95,6 +95,10 @@ declare class LocalAutomateTask implements TaskParams {
     private playwrightPackage;
     private electronPackage;
     private _electronApp;
+    /**
+     * 应用是否已关闭
+     */
+    isClosed: boolean;
     constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright

package/dist/index.d.ts

@@ -95,6 +95,10 @@ declare class LocalAutomateTask implements TaskParams {
     private playwrightPackage;
     private electronPackage;
     private _electronApp;
+    /**
+     * 应用是否已关闭
+     */
+    isClosed: boolean;
     constructor({ cachePath, debug }: TaskParams);
     /**
      * 安装 playwright

package/dist/index.mjs

@@ -6,11 +6,12 @@ import os from 'node:os';
 import { downloadArtifact } from '@electron/get';
 import extract from 'extract-zip';
 import log from 'loglevel';
+import { NodeClient } from '@sentry/node';
 import { PluginManager } from 'live-plugin-manager';
 
 const name = "@iflyrpa/playwright";
 const type = "module";
-const version$1 = "1.0.15-beta.0";
+const version$1 = "1.0.15-beta.1";
 const main = "./dist/index.cjs";
 const module = "./dist/index.mjs";
 const types = "./dist/index.d.ts";
@@ -26,6 +27,7 @@ const files = [
 ];
 const dependencies = {
 	"@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"
@@ -253,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");
@@ -336,19 +338,20 @@ const xiaohongshuPublishAction = async (props) => {
   return response;
 };
 
-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);
+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$3(this, "electronPath");
-    __publicField$3(this, "platformPath");
+    __publicField$4(this, "electronPath");
+    __publicField$4(this, "platformPath");
     this.platformPath = this.getPlatformPath();
     this.electronPath = path.join(rootDir, this.platformPath);
   }
@@ -407,6 +410,8 @@ class ElectronInstall {
         force: process.env.force_no_cache === "true",
         cacheRoot: process.env.electron_config_cache,
         checksums: void 0,
+        mirrorOptions: { mirror: ELECTRON_MIRROR },
+        // 使用国内镜像下载
         platform,
         arch
       });
@@ -422,6 +427,28 @@ class ElectronInstall {
   }
 }
 
+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) => {
@@ -440,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}
 `
         );
       };
@@ -466,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();
@@ -626,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);
@@ -700,10 +733,12 @@ class LocalAutomateTask {
    * @returns
    */
   async close() {
-    this.logger.close();
+    this.logger.info("\u5173\u95ED\u5E94\u7528");
     this.clearTmpPath();
-    const electronApp = await this.launchApp();
-    return electronApp.close();
+    this.logger.close();
+    await this._electronApp?.close();
+    this.isClosed = true;
+    this._electronApp = null;
   }
   /**
    * 小红书自动化发布

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@iflyrpa/playwright",
 	"type": "module",
-	"version": "1.0.15-beta.0",
+	"version": "1.0.15-beta.1",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",
@@ -15,6 +15,7 @@
 	"files": ["dist"],
 	"dependencies": {
 		"@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"