@iflyrpa/playwright 1.2.3 → 1.2.4

package/README.md

@@ -41,6 +41,8 @@ const automateTask = new RpaTask({
   cachePath, // 缓存目录
   debug: true, // debug 模式下可视化展示所有操作
   forceUpdate: false, // 是否使用远程最新版本
+  user: { id: "xx", email: "xx@xx.com" }, // 用户信息
+  enverionment: "development", // 环境变量（主要用于在日志中区分环境）
 });
 
 // 3. 执行脚本，支持的脚本如上
@@ -77,7 +79,3 @@ export const xiaohonshuPublishParams: ActionMethodParams['xiaohongshuPublish'] =
 
 automateTask.actions.xiaohongshuPublish(xiaohonshuPublishParams)
 ```
-
-**3. 云端日志**
-
-<https://sentry-new.iflyrpa.com/rpa/turbodesk-rpa>

package/dist/index.cjs

@@ -44,7 +44,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const actions_namespaceObject = require("@iflyrpa/actions");
 var package_namespaceObject = {
-    i8: "1.2.3"
+    i8: "1.2.4"
 };
 const external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
@@ -145,9 +145,44 @@ class ElectronInstall {
     }
 }
 const share_namespaceObject = require("@iflyrpa/share");
+const template = `
+const { app } = require("electron");
+
+app.whenReady().then(() => {});
+
+app.on("window-all-closed", (e) => e.preventDefault());
+`;
+const generateFile = async (dir)=>{
+    const filePath = external_node_path_default().join(dir, "main.js");
+    const isPathExists = await (0, share_namespaceObject.pathExists)(filePath);
+    if (!isPathExists) {
+        await (0, share_namespaceObject.ensureFile)(filePath);
+        await (0, share_namespaceObject.writeFile)(filePath, template);
+    }
+    return filePath;
+};
+const launchElectronApp = async (task, playwright, electronPath)=>{
+    const { logger, cachePath } = task;
+    try {
+        const mainPath = await generateFile(cachePath);
+        const electronApp = await playwright._electron.launch({
+            executablePath: electronPath,
+            args: [
+                mainPath
+            ],
+            cwd: cachePath
+        });
+        logger.info(`electron 启动成功：${electronPath} ${mainPath}`);
+        return electronApp;
+    } catch (error) {
+        logger.error("electron 启动失败：", error);
+        throw error;
+    }
+};
 const external_loglevel_namespaceObject = require("loglevel");
 var external_loglevel_default = /*#__PURE__*/ __webpack_require__.n(external_loglevel_namespaceObject);
 const node_namespaceObject = require("@sentry/node");
+var node_default = /*#__PURE__*/ __webpack_require__.n(node_namespaceObject);
 function sentry_define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -158,21 +193,35 @@ function sentry_define_property(obj, key, value) {
     else obj[key] = value;
     return obj;
 }
+const DEFAULT_SENTRY_DSN = "https://0ad25bf248b74b3d9950ff426c8e2240@bzrobottest.iflysec.com/6";
 class SentryInstance {
+    updateCoreVersion(version) {
+        this.coreVersion = version;
+    }
     captureException(error) {
-        var _this_sentry;
-        null === (_this_sentry = this.sentry) || void 0 === _this_sentry || _this_sentry.captureException(error);
+        node_default().withScope((scope)=>{
+            var _this_sentry;
+            scope.setTag("coreVersion", this.coreVersion);
+            null === (_this_sentry = this.sentry) || void 0 === _this_sentry || _this_sentry.captureException(error);
+        });
     }
-    constructor(dsn){
+    constructor(taskParams, coreVersion){
         sentry_define_property(this, "sentry", void 0);
-        if (!dsn) return;
-        this.sentry = new node_namespaceObject.NodeClient({
-            dsn,
-            defaultIntegrations: false
+        sentry_define_property(this, "coreVersion", void 0);
+        this.coreVersion = coreVersion;
+        this.sentry = node_default().initWithoutDefaultIntegrations({
+            dsn: DEFAULT_SENTRY_DSN,
+            environment: taskParams.enverionment || "development",
+            initialScope: {
+                user: taskParams.user,
+                tags: {
+                    platform: package_namespaceObject.i8,
+                    coreVersion
+                }
+            }
         });
     }
 }
-const sentry = new SentryInstance(process.env.RPA_SENTRY_DSN);
 function logger_define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -184,9 +233,8 @@ function logger_define_property(obj, key, value) {
     return obj;
 }
 class Logger {
-    static getInstance(cachePath) {
-        if (!Logger.instance) Logger.instance = new Logger(cachePath);
-        return Logger.instance;
+    updateCoreVersion(version) {
+        this.sentry.updateCoreVersion(version);
     }
     debug(...msg) {
         external_loglevel_default().debug(...msg);
@@ -202,15 +250,16 @@ class Logger {
         if (err instanceof Error) err.message = `${prefix}：${err.message}`;
         if ("object" == typeof err) error = `${prefix}：${JSON.stringify(err)}`;
         external_loglevel_default().error(error);
-        sentry.captureException(error);
+        this.sentry.captureException(error);
     }
     close() {
         this.stream.end();
     }
-    constructor(cachePath){
+    constructor(taskParams, coreVersion){
         logger_define_property(this, "stream", void 0);
-        if (Logger.instance) return Logger.instance;
-        const logFile = external_node_path_default().join(cachePath, "rpa.log");
+        logger_define_property(this, "sentry", void 0);
+        this.sentry = new SentryInstance(taskParams, coreVersion);
+        const logFile = external_node_path_default().join(taskParams.cachePath, "rpa.log");
         (0, share_namespaceObject.ensureFileSync)(logFile);
         this.stream = external_node_fs_default().createWriteStream(logFile, {
             flags: "a"
@@ -229,44 +278,8 @@ class Logger {
                 logToFile(methodName, formattedMessage);
             };
         external_loglevel_default().setLevel(external_loglevel_default().getLevel());
-        Logger.instance = this;
     }
 }
-logger_define_property(Logger, "instance", null);
-const template = `
-const { app } = require("electron");
-
-app.whenReady().then(() => {});
-
-app.on("window-all-closed", (e) => e.preventDefault());
-`;
-const generateFile = async (dir)=>{
-    const filePath = external_node_path_default().join(dir, "main.js");
-    const isPathExists = await (0, share_namespaceObject.pathExists)(filePath);
-    if (!isPathExists) {
-        await (0, share_namespaceObject.ensureFile)(filePath);
-        await (0, share_namespaceObject.writeFile)(filePath, template);
-    }
-    return filePath;
-};
-const launchElectronApp = async (cachePath, playwright, electronPath)=>{
-    const logger = Logger.getInstance(cachePath);
-    try {
-        const mainPath = await generateFile(cachePath);
-        const electronApp = await playwright._electron.launch({
-            executablePath: electronPath,
-            args: [
-                mainPath
-            ],
-            cwd: cachePath
-        });
-        logger.info(`electron 启动成功：${electronPath} ${mainPath}`);
-        return electronApp;
-    } catch (error) {
-        logger.error("electron 启动失败：", error);
-        throw error;
-    }
-};
 const pacote_namespaceObject = require("@iflyrpa/pacote");
 var pacote_default = /*#__PURE__*/ __webpack_require__.n(pacote_namespaceObject);
 function packageManager_define_property(obj, key, value) {
@@ -359,7 +372,7 @@ class Task {
                 this.playwrightPackage,
                 this.electronPackage
             ]);
-            this._electronApp = await launchElectronApp(this.cachePath, playwright, electronPath);
+            this._electronApp = await launchElectronApp(this, playwright, electronPath);
         }
         return this._electronApp;
     }
@@ -408,7 +421,10 @@ class Task {
         ]);
         return page;
     }
-    constructor({ cachePath, debug }){
+    updateLogVersion(version) {
+        this.logger.updateCoreVersion(version);
+    }
+    constructor(taskParam, coreVersion){
         task_define_property(this, "logger", void 0);
         task_define_property(this, "cachePath", void 0);
         task_define_property(this, "debug", void 0);
@@ -418,10 +434,10 @@ class Task {
         task_define_property(this, "electronPackage", void 0);
         task_define_property(this, "_electronApp", null);
         task_define_property(this, "isClosed", false);
-        this.cachePath = cachePath;
-        this.packagesDir = external_node_path_default().join(cachePath, "packages");
-        this.debug = debug || false;
-        this.logger = Logger.getInstance(cachePath);
+        this.cachePath = taskParam.cachePath;
+        this.packagesDir = external_node_path_default().join(taskParam.cachePath, "packages");
+        this.debug = taskParam.debug || false;
+        this.logger = new Logger(taskParam, coreVersion);
         this.packageManager = new PackageManager(this);
         this.playwrightPackage = this.installPlaywright();
         this.electronPackage = this.installElectron();
@@ -440,16 +456,16 @@ function src_define_property(obj, key, value) {
 class RpaTask extends Task {
     async update() {
         try {
-            const name = "@iflyrpa/actions";
-            const version = await this.packageManager.update(name);
-            const actionPackage = this.packageManager.require(`${name}@${version}`);
+            const version = await this.packageManager.update(this.actionName);
+            const actionPackage = this.packageManager.require(`${this.actionName}@${version}`);
+            this.updateLogVersion(version);
             (null == actionPackage ? void 0 : actionPackage.actions) && (this.actions = actionPackage.actions);
         } catch (error) {
             this.logger.error("更新依赖失败", error);
         }
     }
     constructor(params){
-        super(params), src_define_property(this, "actions", void 0);
+        super(params, actions_namespaceObject.version), src_define_property(this, "actions", void 0), src_define_property(this, "actionName", "@iflyrpa/actions");
         this.actions = new actions_namespaceObject.Action(this);
         params.forceUpdate && this.update();
     }

package/dist/index.d.ts

@@ -5,14 +5,15 @@ import type { ElectronApplication } from '@iflyrpa/share';
 import { LoggerImplement } from '@iflyrpa/share';
 import { Page } from 'playwright-core';
 import type { PageParams } from '@iflyrpa/share';
+import { User } from '@sentry/node';
 
 export { ActionMethodParams }
 
 declare class Logger implements LoggerImplement {
-    static instance: Logger | null;
     private stream;
-    constructor(cachePath: string);
-    static getInstance(cachePath: string): Logger;
+    private sentry;
+    constructor(taskParams: TaskParams, coreVersion: string);
+    updateCoreVersion(version: string): void;
     debug(...msg: any[]): void;
     info(...msg: any[]): void;
     warn(...msg: any[]): void;
@@ -32,6 +33,7 @@ declare class PackageManager {
 
 export declare class RpaTask extends Task {
     actions: Action;
+    private actionName;
     constructor(params: TaskParams);
     private update;
 }
@@ -49,7 +51,7 @@ declare class Task implements AutomateTask {
      * 应用是否已关闭
      */
     isClosed: boolean;
-    constructor({ cachePath, debug }: TaskParams);
+    constructor(taskParam: TaskParams, coreVersion: string);
     /**
      * 安装 playwright
      * @returns
@@ -80,12 +82,15 @@ declare class Task implements AutomateTask {
      */
     close(): Promise<void>;
     createPage(pageParams: PageParams): Promise<Page>;
+    updateLogVersion(version: string): void;
 }
 
 declare interface TaskParams {
     debug?: boolean;
     cachePath: string;
     forceUpdate?: boolean;
+    user?: User;
+    enverionment?: string;
 }
 
 export declare const version: string;

package/dist/index.js

@@ -10,7 +10,7 @@ import * as __WEBPACK_EXTERNAL_MODULE_loglevel__ from "loglevel";
 import * as __WEBPACK_EXTERNAL_MODULE__sentry_node_4658624b__ from "@sentry/node";
 import * as __WEBPACK_EXTERNAL_MODULE__iflyrpa_pacote_56da1cff__ from "@iflyrpa/pacote";
 var package_namespaceObject = {
-    i8: "1.2.3"
+    i8: "1.2.4"
 };
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -99,6 +99,40 @@ class ElectronInstall {
         this.electronPath = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(this.rootDir, this.platformPath);
     }
 }
+const template = `
+const { app } = require("electron");
+
+app.whenReady().then(() => {});
+
+app.on("window-all-closed", (e) => e.preventDefault());
+`;
+const generateFile = async (dir)=>{
+    const filePath = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(dir, "main.js");
+    const isPathExists = await (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.pathExists)(filePath);
+    if (!isPathExists) {
+        await (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.ensureFile)(filePath);
+        await (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.writeFile)(filePath, template);
+    }
+    return filePath;
+};
+const launchElectronApp = async (task, playwright, electronPath)=>{
+    const { logger, cachePath } = task;
+    try {
+        const mainPath = await generateFile(cachePath);
+        const electronApp = await playwright._electron.launch({
+            executablePath: electronPath,
+            args: [
+                mainPath
+            ],
+            cwd: cachePath
+        });
+        logger.info(`electron 启动成功：${electronPath} ${mainPath}`);
+        return electronApp;
+    } catch (error) {
+        logger.error("electron 启动失败：", error);
+        throw error;
+    }
+};
 function sentry_define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -109,21 +143,35 @@ function sentry_define_property(obj, key, value) {
     else obj[key] = value;
     return obj;
 }
+const DEFAULT_SENTRY_DSN = "https://0ad25bf248b74b3d9950ff426c8e2240@bzrobottest.iflysec.com/6";
 class SentryInstance {
+    updateCoreVersion(version) {
+        this.coreVersion = version;
+    }
     captureException(error) {
-        var _this_sentry;
-        null === (_this_sentry = this.sentry) || void 0 === _this_sentry || _this_sentry.captureException(error);
+        __WEBPACK_EXTERNAL_MODULE__sentry_node_4658624b__["default"].withScope((scope)=>{
+            var _this_sentry;
+            scope.setTag("coreVersion", this.coreVersion);
+            null === (_this_sentry = this.sentry) || void 0 === _this_sentry || _this_sentry.captureException(error);
+        });
     }
-    constructor(dsn){
+    constructor(taskParams, coreVersion){
         sentry_define_property(this, "sentry", void 0);
-        if (!dsn) return;
-        this.sentry = new __WEBPACK_EXTERNAL_MODULE__sentry_node_4658624b__.NodeClient({
-            dsn,
-            defaultIntegrations: false
+        sentry_define_property(this, "coreVersion", void 0);
+        this.coreVersion = coreVersion;
+        this.sentry = __WEBPACK_EXTERNAL_MODULE__sentry_node_4658624b__["default"].initWithoutDefaultIntegrations({
+            dsn: DEFAULT_SENTRY_DSN,
+            environment: taskParams.enverionment || "development",
+            initialScope: {
+                user: taskParams.user,
+                tags: {
+                    platform: package_namespaceObject.i8,
+                    coreVersion
+                }
+            }
         });
     }
 }
-const sentry = new SentryInstance(process.env.RPA_SENTRY_DSN);
 function logger_define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -135,9 +183,8 @@ function logger_define_property(obj, key, value) {
     return obj;
 }
 class Logger {
-    static getInstance(cachePath) {
-        if (!Logger.instance) Logger.instance = new Logger(cachePath);
-        return Logger.instance;
+    updateCoreVersion(version) {
+        this.sentry.updateCoreVersion(version);
     }
     debug(...msg) {
         __WEBPACK_EXTERNAL_MODULE_loglevel__["default"].debug(...msg);
@@ -153,15 +200,16 @@ class Logger {
         if (err instanceof Error) err.message = `${prefix}：${err.message}`;
         if ("object" == typeof err) error = `${prefix}：${JSON.stringify(err)}`;
         __WEBPACK_EXTERNAL_MODULE_loglevel__["default"].error(error);
-        sentry.captureException(error);
+        this.sentry.captureException(error);
     }
     close() {
         this.stream.end();
     }
-    constructor(cachePath){
+    constructor(taskParams, coreVersion){
         logger_define_property(this, "stream", void 0);
-        if (Logger.instance) return Logger.instance;
-        const logFile = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(cachePath, "rpa.log");
+        logger_define_property(this, "sentry", void 0);
+        this.sentry = new SentryInstance(taskParams, coreVersion);
+        const logFile = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(taskParams.cachePath, "rpa.log");
         (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.ensureFileSync)(logFile);
         this.stream = __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__["default"].createWriteStream(logFile, {
             flags: "a"
@@ -180,44 +228,8 @@ class Logger {
                 logToFile(methodName, formattedMessage);
             };
         __WEBPACK_EXTERNAL_MODULE_loglevel__["default"].setLevel(__WEBPACK_EXTERNAL_MODULE_loglevel__["default"].getLevel());
-        Logger.instance = this;
     }
 }
-logger_define_property(Logger, "instance", null);
-const template = `
-const { app } = require("electron");
-
-app.whenReady().then(() => {});
-
-app.on("window-all-closed", (e) => e.preventDefault());
-`;
-const generateFile = async (dir)=>{
-    const filePath = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(dir, "main.js");
-    const isPathExists = await (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.pathExists)(filePath);
-    if (!isPathExists) {
-        await (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.ensureFile)(filePath);
-        await (0, __WEBPACK_EXTERNAL_MODULE__iflyrpa_share_f7afdc8c__.writeFile)(filePath, template);
-    }
-    return filePath;
-};
-const launchElectronApp = async (cachePath, playwright, electronPath)=>{
-    const logger = Logger.getInstance(cachePath);
-    try {
-        const mainPath = await generateFile(cachePath);
-        const electronApp = await playwright._electron.launch({
-            executablePath: electronPath,
-            args: [
-                mainPath
-            ],
-            cwd: cachePath
-        });
-        logger.info(`electron 启动成功：${electronPath} ${mainPath}`);
-        return electronApp;
-    } catch (error) {
-        logger.error("electron 启动失败：", error);
-        throw error;
-    }
-};
 function packageManager_define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -308,7 +320,7 @@ class Task {
                 this.playwrightPackage,
                 this.electronPackage
             ]);
-            this._electronApp = await launchElectronApp(this.cachePath, playwright, electronPath);
+            this._electronApp = await launchElectronApp(this, playwright, electronPath);
         }
         return this._electronApp;
     }
@@ -357,7 +369,10 @@ class Task {
         ]);
         return page;
     }
-    constructor({ cachePath, debug }){
+    updateLogVersion(version) {
+        this.logger.updateCoreVersion(version);
+    }
+    constructor(taskParam, coreVersion){
         task_define_property(this, "logger", void 0);
         task_define_property(this, "cachePath", void 0);
         task_define_property(this, "debug", void 0);
@@ -367,10 +382,10 @@ class Task {
         task_define_property(this, "electronPackage", void 0);
         task_define_property(this, "_electronApp", null);
         task_define_property(this, "isClosed", false);
-        this.cachePath = cachePath;
-        this.packagesDir = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(cachePath, "packages");
-        this.debug = debug || false;
-        this.logger = Logger.getInstance(cachePath);
+        this.cachePath = taskParam.cachePath;
+        this.packagesDir = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].join(taskParam.cachePath, "packages");
+        this.debug = taskParam.debug || false;
+        this.logger = new Logger(taskParam, coreVersion);
         this.packageManager = new PackageManager(this);
         this.playwrightPackage = this.installPlaywright();
         this.electronPackage = this.installElectron();
@@ -389,16 +404,16 @@ function src_define_property(obj, key, value) {
 class RpaTask extends Task {
     async update() {
         try {
-            const name = "@iflyrpa/actions";
-            const version = await this.packageManager.update(name);
-            const actionPackage = this.packageManager.require(`${name}@${version}`);
+            const version = await this.packageManager.update(this.actionName);
+            const actionPackage = this.packageManager.require(`${this.actionName}@${version}`);
+            this.updateLogVersion(version);
             (null == actionPackage ? void 0 : actionPackage.actions) && (this.actions = actionPackage.actions);
         } catch (error) {
             this.logger.error("更新依赖失败", error);
         }
     }
     constructor(params){
-        super(params), src_define_property(this, "actions", void 0);
+        super(params, __WEBPACK_EXTERNAL_MODULE__iflyrpa_actions_bd801d6f__.version), src_define_property(this, "actions", void 0), src_define_property(this, "actionName", "@iflyrpa/actions");
         this.actions = new __WEBPACK_EXTERNAL_MODULE__iflyrpa_actions_bd801d6f__.Action(this);
         params.forceUpdate && this.update();
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@iflyrpa/playwright",
   "type": "module",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -24,11 +24,11 @@
   },
   "dependencies": {
     "@electron/get": "^2.0.0",
-    "@sentry/node": "^5.5.0",
+    "@sentry/node": "^9.2.0",
     "extract-zip": "^2.0.1",
     "loglevel": "^1.9.2",
     "@iflyrpa/pacote": "1.0.0",
-    "@iflyrpa/actions": "1.1.9",
+    "@iflyrpa/actions": "1.1.11",
     "@iflyrpa/share": "0.0.3"
   },
   "scripts": {