@iflyrpa/playwright 1.2.6 → 1.2.8

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.6"
+    i8: "1.2.8"
 };
 const external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
@@ -182,7 +182,6 @@ const launchElectronApp = async (task, playwright, electronPath)=>{
 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,
@@ -198,25 +197,29 @@ class SentryInstance {
     updateCoreVersion(version) {
         this.coreVersion = version;
     }
+    updateUser(user) {
+        this.user = user;
+    }
     captureException(error) {
-        node_default().withScope((scope)=>{
+        (0, node_namespaceObject.withScope)((scope)=>{
             var _this_sentry;
-            scope.setTag("coreVersion", this.coreVersion);
+            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);
         });
     }
-    constructor(taskParams, coreVersion){
+    constructor(taskParams){
         sentry_define_property(this, "sentry", void 0);
         sentry_define_property(this, "coreVersion", void 0);
-        this.coreVersion = coreVersion;
-        this.sentry = node_default().initWithoutDefaultIntegrations({
+        sentry_define_property(this, "user", void 0);
+        this.user = taskParams.user;
+        this.sentry = (0, node_namespaceObject.initWithoutDefaultIntegrations)({
             dsn: DEFAULT_SENTRY_DSN,
             environment: taskParams.enverionment || "development",
             initialScope: {
                 user: taskParams.user,
                 tags: {
-                    platform: package_namespaceObject.i8,
-                    coreVersion
+                    platform: package_namespaceObject.i8
                 }
             }
         });
@@ -232,10 +235,7 @@ function logger_define_property(obj, key, value) {
     else obj[key] = value;
     return obj;
 }
-class Logger {
-    updateCoreVersion(version) {
-        this.sentry.updateCoreVersion(version);
-    }
+class Logger extends SentryInstance {
     debug(...msg) {
         external_loglevel_default().debug(...msg);
     }
@@ -249,15 +249,13 @@ class Logger {
         if (error instanceof Error) error.message = `${prefix}: ${error.message}`;
         else error = new Error(`${prefix}: ${error}`);
         external_loglevel_default().error(error);
-        this.sentry.captureException(error);
+        this.captureException(error);
     }
     close() {
         this.stream.end();
     }
-    constructor(taskParams, coreVersion){
-        logger_define_property(this, "stream", void 0);
-        logger_define_property(this, "sentry", void 0);
-        this.sentry = new SentryInstance(taskParams, coreVersion);
+    constructor(taskParams){
+        super(taskParams), logger_define_property(this, "stream", void 0);
         const logFile = external_node_path_default().join(taskParams.cachePath, "rpa.log");
         (0, share_namespaceObject.ensureFileSync)(logFile);
         this.stream = external_node_fs_default().createWriteStream(logFile, {
@@ -420,10 +418,13 @@ class Task {
         ]);
         return page;
     }
-    updateLogVersion(version) {
+    setActionVersion(version) {
         this.logger.updateCoreVersion(version);
     }
-    constructor(taskParam, coreVersion){
+    setUser(user) {
+        this.logger.updateUser(user);
+    }
+    constructor(taskParam){
         task_define_property(this, "logger", void 0);
         task_define_property(this, "cachePath", void 0);
         task_define_property(this, "debug", void 0);
@@ -436,7 +437,7 @@ class Task {
         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.logger = new Logger(taskParam);
         this.packageManager = new PackageManager(this);
         this.playwrightPackage = this.installPlaywright();
         this.electronPackage = this.installElectron();
@@ -461,14 +462,15 @@ class RpaTask extends Task {
             const version = await this.packageManager.update(this.actionName);
             const rpaPackage = this.packageManager.require(`${this.actionName}@${version}`);
             (null == rpaPackage ? void 0 : rpaPackage.Action) && this.registerActions(rpaPackage);
-            this.updateLogVersion(version);
+            this.setActionVersion(version);
         } catch (error) {
             this.logger.error("更新依赖失败", error);
         }
     }
     constructor(params){
-        super(params, actions_namespaceObject.version), src_define_property(this, "actions", void 0), src_define_property(this, "actionName", "@iflyrpa/actions");
+        super(params), src_define_property(this, "actions", void 0), src_define_property(this, "actionName", "@iflyrpa/actions");
         this.registerActions(actions_namespaceObject);
+        this.setActionVersion(actions_namespaceObject.version);
         params.forceUpdate && this.update();
     }
 }

package/dist/index.d.ts

@@ -9,11 +9,9 @@ import { User } from '@sentry/node';
 
 export { ActionMethodParams }
 
-declare class Logger implements LoggerImplement {
+declare class Logger extends SentryInstance implements LoggerImplement {
     private stream;
-    private sentry;
-    constructor(taskParams: TaskParams, coreVersion: string);
-    updateCoreVersion(version: string): void;
+    constructor(taskParams: TaskParams);
     debug(...msg: any[]): void;
     info(...msg: any[]): void;
     warn(...msg: any[]): void;
@@ -39,6 +37,16 @@ export declare class RpaTask extends Task {
     private update;
 }
 
+declare class SentryInstance {
+    private sentry;
+    private coreVersion?;
+    private user?;
+    constructor(taskParams: TaskParams);
+    updateCoreVersion(version: string): void;
+    updateUser(user: User): void;
+    captureException(error: unknown): void;
+}
+
 declare class Task implements AutomateTask {
     logger: Logger;
     cachePath: string;
@@ -52,7 +60,7 @@ declare class Task implements AutomateTask {
      * 应用是否已关闭
      */
     isClosed: boolean;
-    constructor(taskParam: TaskParams, coreVersion: string);
+    constructor(taskParam: TaskParams);
     /**
      * 安装 playwright
      * @returns
@@ -83,7 +91,8 @@ declare class Task implements AutomateTask {
      */
     close(): Promise<void>;
     createPage(pageParams: PageParams): Promise<Page>;
-    updateLogVersion(version: string): void;
+    protected setActionVersion(version: string): void;
+    setUser(user: User): void;
 }
 
 declare interface TaskParams {

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.6"
+    i8: "1.2.8"
 };
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -148,25 +148,29 @@ class SentryInstance {
     updateCoreVersion(version) {
         this.coreVersion = version;
     }
+    updateUser(user) {
+        this.user = user;
+    }
     captureException(error) {
-        __WEBPACK_EXTERNAL_MODULE__sentry_node_4658624b__["default"].withScope((scope)=>{
+        (0, __WEBPACK_EXTERNAL_MODULE__sentry_node_4658624b__.withScope)((scope)=>{
             var _this_sentry;
-            scope.setTag("coreVersion", this.coreVersion);
+            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);
         });
     }
-    constructor(taskParams, coreVersion){
+    constructor(taskParams){
         sentry_define_property(this, "sentry", void 0);
         sentry_define_property(this, "coreVersion", void 0);
-        this.coreVersion = coreVersion;
-        this.sentry = __WEBPACK_EXTERNAL_MODULE__sentry_node_4658624b__["default"].initWithoutDefaultIntegrations({
+        sentry_define_property(this, "user", void 0);
+        this.user = taskParams.user;
+        this.sentry = (0, __WEBPACK_EXTERNAL_MODULE__sentry_node_4658624b__.initWithoutDefaultIntegrations)({
             dsn: DEFAULT_SENTRY_DSN,
             environment: taskParams.enverionment || "development",
             initialScope: {
                 user: taskParams.user,
                 tags: {
-                    platform: package_namespaceObject.i8,
-                    coreVersion
+                    platform: package_namespaceObject.i8
                 }
             }
         });
@@ -182,10 +186,7 @@ function logger_define_property(obj, key, value) {
     else obj[key] = value;
     return obj;
 }
-class Logger {
-    updateCoreVersion(version) {
-        this.sentry.updateCoreVersion(version);
-    }
+class Logger extends SentryInstance {
     debug(...msg) {
         __WEBPACK_EXTERNAL_MODULE_loglevel__["default"].debug(...msg);
     }
@@ -199,15 +200,13 @@ class Logger {
         if (error instanceof Error) error.message = `${prefix}: ${error.message}`;
         else error = new Error(`${prefix}: ${error}`);
         __WEBPACK_EXTERNAL_MODULE_loglevel__["default"].error(error);
-        this.sentry.captureException(error);
+        this.captureException(error);
     }
     close() {
         this.stream.end();
     }
-    constructor(taskParams, coreVersion){
-        logger_define_property(this, "stream", void 0);
-        logger_define_property(this, "sentry", void 0);
-        this.sentry = new SentryInstance(taskParams, coreVersion);
+    constructor(taskParams){
+        super(taskParams), logger_define_property(this, "stream", void 0);
         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, {
@@ -368,10 +367,13 @@ class Task {
         ]);
         return page;
     }
-    updateLogVersion(version) {
+    setActionVersion(version) {
         this.logger.updateCoreVersion(version);
     }
-    constructor(taskParam, coreVersion){
+    setUser(user) {
+        this.logger.updateUser(user);
+    }
+    constructor(taskParam){
         task_define_property(this, "logger", void 0);
         task_define_property(this, "cachePath", void 0);
         task_define_property(this, "debug", void 0);
@@ -384,7 +386,7 @@ class Task {
         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.logger = new Logger(taskParam);
         this.packageManager = new PackageManager(this);
         this.playwrightPackage = this.installPlaywright();
         this.electronPackage = this.installElectron();
@@ -409,14 +411,15 @@ class RpaTask extends Task {
             const version = await this.packageManager.update(this.actionName);
             const rpaPackage = this.packageManager.require(`${this.actionName}@${version}`);
             (null == rpaPackage ? void 0 : rpaPackage.Action) && this.registerActions(rpaPackage);
-            this.updateLogVersion(version);
+            this.setActionVersion(version);
         } catch (error) {
             this.logger.error("更新依赖失败", error);
         }
     }
     constructor(params){
-        super(params, __WEBPACK_EXTERNAL_MODULE__iflyrpa_actions_bd801d6f__.version), src_define_property(this, "actions", void 0), src_define_property(this, "actionName", "@iflyrpa/actions");
+        super(params), src_define_property(this, "actions", void 0), src_define_property(this, "actionName", "@iflyrpa/actions");
         this.registerActions(__WEBPACK_EXTERNAL_MODULE__iflyrpa_actions_bd801d6f__);
+        this.setActionVersion(__WEBPACK_EXTERNAL_MODULE__iflyrpa_actions_bd801d6f__.version);
         params.forceUpdate && this.update();
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@iflyrpa/playwright",
   "type": "module",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -28,8 +28,8 @@
     "extract-zip": "^2.0.1",
     "loglevel": "^1.9.2",
     "@iflyrpa/pacote": "1.0.0",
-    "@iflyrpa/actions": "1.1.13",
-    "@iflyrpa/share": "0.0.3"
+    "@iflyrpa/share": "0.0.3",
+    "@iflyrpa/actions": "1.1.13"
   },
   "scripts": {
     "build": "rslib build",