@iflyrpa/playwright 1.2.24 → 1.2.26

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.23"
+    i8: "1.2.25"
 };
 const external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
@@ -124,10 +124,11 @@ class ElectronInstall {
             await external_extract_zip_default()(zipPath, {
                 dir: this.rootDir
             });
-            this.task.logger.info(`electron@${this.version} 下载成功`);
+            this.task.logger.info("electron download success");
             return this.electronPath;
         } catch (error) {
             this.task.logger.error(`electron@${this.version} 下载失败`, error);
+            this.task.logger.info("electron download fail");
             throw error;
         }
     }
@@ -172,10 +173,11 @@ const launchElectronApp = async (task, playwright, electronPath)=>{
             ],
             cwd: cachePath
         });
-        logger.info(`electron 启动成功：${electronPath} ${mainPath}`);
+        logger.info("electron launch success");
         return electronApp;
     } catch (error) {
         logger.error("electron 启动失败：", error);
+        logger.info("electron launch fail");
         throw error;
     }
 };
@@ -200,14 +202,27 @@ class SentryInstance {
     updateUser(user) {
         this.user = user;
     }
-    captureException(error) {
+    setScope(callback, extras) {
         (0, node_namespaceObject.withScope)((scope)=>{
-            var _this_sentry;
+            scope.setTransactionName("rpa");
             if (this.coreVersion) scope.setTag("coreVersion", this.coreVersion);
             if (this.user) scope.setUser(this.user);
-            null === (_this_sentry = this.sentry) || void 0 === _this_sentry || _this_sentry.captureException(error);
+            if (extras) scope.setExtras(extras);
+            callback(scope);
         });
     }
+    captureException(error, extras) {
+        this.setScope(()=>{
+            var _this_sentry;
+            return null === (_this_sentry = this.sentry) || void 0 === _this_sentry ? void 0 : _this_sentry.captureException(error);
+        }, extras);
+    }
+    captureMessage(message, level, extras) {
+        this.setScope(()=>{
+            var _this_sentry;
+            return null === (_this_sentry = this.sentry) || void 0 === _this_sentry ? void 0 : _this_sentry.captureMessage(message, level);
+        }, extras);
+    }
     constructor(taskParams){
         sentry_define_property(this, "sentry", void 0);
         sentry_define_property(this, "coreVersion", void 0);
@@ -216,6 +231,7 @@ class SentryInstance {
         this.sentry = (0, node_namespaceObject.initWithoutDefaultIntegrations)({
             dsn: DEFAULT_SENTRY_DSN,
             environment: taskParams.enverionment || "development",
+            tracesSampleRate: 1.0,
             initialScope: {
                 user: taskParams.user,
                 tags: {
@@ -236,18 +252,21 @@ function logger_define_property(obj, key, value) {
     return obj;
 }
 class Logger extends SentryInstance {
-    debug(...msg) {
-        external_loglevel_default().debug(...msg);
+    debug(msg, extras) {
+        external_loglevel_default().debug(msg);
+        this.captureMessage(msg, "debug", extras);
     }
-    info(...msg) {
-        external_loglevel_default().info(...msg);
+    info(msg, extras) {
+        external_loglevel_default().info(msg);
+        this.captureMessage(msg, "info", extras);
     }
-    warn(...msg) {
-        external_loglevel_default().warn(...msg);
+    warn(msg, extras) {
+        external_loglevel_default().warn(msg);
+        this.captureMessage(msg, "warning", extras);
     }
     error(prefix, error) {
         if (error instanceof Error) error.message = `${prefix}: ${error.message}`;
-        else if (error && 'object' == typeof error) {
+        else if (error && "object" == typeof error) {
             const errorStr = JSON.stringify(error, null, 2);
             error = new Error(`${prefix}: ${errorStr}`);
         } else error = new Error(`${prefix}: ${error}`);

package/dist/index.d.ts

@@ -5,6 +5,7 @@ import { LoggerImplement } from '@iflyrpa/share';
 import { Page } from 'playwright-core';
 import type { PageParams } from '@iflyrpa/share';
 import * as RpaAction from '@iflyrpa/actions';
+import { SeverityLevel } from '@sentry/node';
 import { User } from '@sentry/node';
 
 export { ActionMethodParams }
@@ -12,9 +13,9 @@ export { ActionMethodParams }
 declare class Logger extends SentryInstance implements LoggerImplement {
     private stream;
     constructor(taskParams: TaskParams);
-    debug(...msg: any[]): void;
-    info(...msg: any[]): void;
-    warn(...msg: any[]): void;
+    debug(msg: string, extras?: Record<string, unknown>): void;
+    info(msg: string, extras?: Record<string, unknown>): void;
+    warn(msg: string, extras?: Record<string, unknown>): void;
     error(prefix: string, error?: Error | unknown): void;
     close(): void;
 }
@@ -44,7 +45,9 @@ declare class SentryInstance {
     constructor(taskParams: TaskParams);
     updateCoreVersion(version: string): void;
     updateUser(user: User): void;
-    captureException(error: unknown): void;
+    private setScope;
+    captureException(error: unknown, extras?: Record<string, unknown>): void;
+    captureMessage(message: string, level?: SeverityLevel, extras?: Record<string, unknown>): void;
 }
 
 declare class Task implements AutomateTask {

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.23"
+    i8: "1.2.25"
 };
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -79,10 +79,11 @@ class ElectronInstall {
             await (0, __WEBPACK_EXTERNAL_MODULE_extract_zip_c4acec5a__["default"])(zipPath, {
                 dir: this.rootDir
             });
-            this.task.logger.info(`electron@${this.version} 下载成功`);
+            this.task.logger.info("electron download success");
             return this.electronPath;
         } catch (error) {
             this.task.logger.error(`electron@${this.version} 下载失败`, error);
+            this.task.logger.info("electron download fail");
             throw error;
         }
     }
@@ -126,10 +127,11 @@ const launchElectronApp = async (task, playwright, electronPath)=>{
             ],
             cwd: cachePath
         });
-        logger.info(`electron 启动成功：${electronPath} ${mainPath}`);
+        logger.info("electron launch success");
         return electronApp;
     } catch (error) {
         logger.error("electron 启动失败：", error);
+        logger.info("electron launch fail");
         throw error;
     }
 };
@@ -151,14 +153,27 @@ class SentryInstance {
     updateUser(user) {
         this.user = user;
     }
-    captureException(error) {
+    setScope(callback, extras) {
         (0, __WEBPACK_EXTERNAL_MODULE__sentry_node_4658624b__.withScope)((scope)=>{
-            var _this_sentry;
+            scope.setTransactionName("rpa");
             if (this.coreVersion) scope.setTag("coreVersion", this.coreVersion);
             if (this.user) scope.setUser(this.user);
-            null === (_this_sentry = this.sentry) || void 0 === _this_sentry || _this_sentry.captureException(error);
+            if (extras) scope.setExtras(extras);
+            callback(scope);
         });
     }
+    captureException(error, extras) {
+        this.setScope(()=>{
+            var _this_sentry;
+            return null === (_this_sentry = this.sentry) || void 0 === _this_sentry ? void 0 : _this_sentry.captureException(error);
+        }, extras);
+    }
+    captureMessage(message, level, extras) {
+        this.setScope(()=>{
+            var _this_sentry;
+            return null === (_this_sentry = this.sentry) || void 0 === _this_sentry ? void 0 : _this_sentry.captureMessage(message, level);
+        }, extras);
+    }
     constructor(taskParams){
         sentry_define_property(this, "sentry", void 0);
         sentry_define_property(this, "coreVersion", void 0);
@@ -167,6 +182,7 @@ class SentryInstance {
         this.sentry = (0, __WEBPACK_EXTERNAL_MODULE__sentry_node_4658624b__.initWithoutDefaultIntegrations)({
             dsn: DEFAULT_SENTRY_DSN,
             environment: taskParams.enverionment || "development",
+            tracesSampleRate: 1.0,
             initialScope: {
                 user: taskParams.user,
                 tags: {
@@ -187,18 +203,21 @@ function logger_define_property(obj, key, value) {
     return obj;
 }
 class Logger extends SentryInstance {
-    debug(...msg) {
-        __WEBPACK_EXTERNAL_MODULE_loglevel__["default"].debug(...msg);
+    debug(msg, extras) {
+        __WEBPACK_EXTERNAL_MODULE_loglevel__["default"].debug(msg);
+        this.captureMessage(msg, "debug", extras);
     }
-    info(...msg) {
-        __WEBPACK_EXTERNAL_MODULE_loglevel__["default"].info(...msg);
+    info(msg, extras) {
+        __WEBPACK_EXTERNAL_MODULE_loglevel__["default"].info(msg);
+        this.captureMessage(msg, "info", extras);
     }
-    warn(...msg) {
-        __WEBPACK_EXTERNAL_MODULE_loglevel__["default"].warn(...msg);
+    warn(msg, extras) {
+        __WEBPACK_EXTERNAL_MODULE_loglevel__["default"].warn(msg);
+        this.captureMessage(msg, "warning", extras);
     }
     error(prefix, error) {
         if (error instanceof Error) error.message = `${prefix}: ${error.message}`;
-        else if (error && 'object' == typeof error) {
+        else if (error && "object" == typeof error) {
             const errorStr = JSON.stringify(error, null, 2);
             error = new Error(`${prefix}: ${errorStr}`);
         } else error = new Error(`${prefix}: ${error}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@iflyrpa/playwright",
   "type": "module",
-  "version": "1.2.24",
+  "version": "1.2.26",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -24,11 +24,11 @@
   },
   "dependencies": {
     "@electron/get": "^2.0.0",
-    "@sentry/node": "^9.2.0",
+    "@sentry/node": "^9.11.0",
     "extract-zip": "^2.0.1",
     "loglevel": "^1.9.2",
     "@iflyrpa/pacote": "1.0.0",
-    "@iflyrpa/actions": "1.1.28",
+    "@iflyrpa/actions": "1.1.30",
     "@iflyrpa/share": "0.0.6"
   },
   "scripts": {