@browsermation/test 0.0.63-beta.9 → 0.0.65

package/dist/reporter/reporter.d.ts

@@ -1,8 +1,10 @@
-import type { FullConfig, FullResult, Reporter, Suite, TestCase, TestError, TestResult } from '@playwright/test/reporter';
+import type { FullConfig, FullProject, FullResult, Reporter, Suite, TestCase, TestError, TestResult } from '@playwright/test/reporter';
 export default class BrowsermationReporter implements Reporter {
     browsermationURL: string;
     apiToken: string;
+    suiteRunId: string | null;
     log(message: string): void;
+    logEvent(message: string): void;
     constructor(options?: {
         reportingURL?: string;
         apiToken?: string;
@@ -11,7 +13,9 @@ export default class BrowsermationReporter implements Reporter {
     getCurrentRepo(): Promise<string>;
     getLatestCommitId(): Promise<string>;
     getLatestCommitMessage(): Promise<string>;
-    sendData(data: Record<string, any>): Promise<void>;
+    gitRemoteOriginUrl(): Promise<string>;
+    sendData(data: Record<string, any>): Promise<any>;
+    getProjectSuite(parent: Suite): FullProject | undefined;
     /**
      * onBegin() is called once with a root suite that contains all other suites and tests. Learn more about suites hierarchy.
      *

package/dist/reporter.js

@@ -35,8 +35,14 @@ var stripAnsi = (str) => str.replace(regex, "");
 var BrowsermationReporter = class {
   browsermationURL = "";
   apiToken = "";
+  suiteRunId = null;
   log(message) {
-    if (process.env.BM_REPORTER_LOGS) {
+    if (process.env.BM_REPORTER_DEBUG_LOGS) {
+      console.log(message);
+    }
+  }
+  logEvent(message) {
+    if (process.env.BM_REPORTER_ONLY_LOG_EVENTS) {
       console.log(message);
     }
   }
@@ -47,13 +53,19 @@ var BrowsermationReporter = class {
     this.log(
       "Using API Token: " + (this.apiToken ? this.apiToken.slice(0, 4) + "****" : "not set")
     );
-    if (!this.apiToken) {
+    if (!this.apiToken && !process.env.BM_REPORTER_ONLY_LOG_EVENTS) {
       console.warn(
         "Warning: No API token set for Browsermation Reporter. Set BM_API_TOKEN environment variable or pass apiToken in reporter options."
       );
     }
   }
   async getCurrentBranch() {
+    if (process.env.BM_REPORTER_DISABLE_GIT_INFO) {
+      this.log(
+        "BM_REPORTER_DISABLE_GIT_INFO is set to true. Skipping git info."
+      );
+      return;
+    }
     return new Promise((resolve) => {
       const { exec } = require("child_process");
       exec("git rev-parse --abbrev-ref HEAD", (error, stdout) => {
@@ -66,6 +78,12 @@ var BrowsermationReporter = class {
     });
   }
   async getCurrentRepo() {
+    if (process.env.BM_REPORTER_DISABLE_GIT_INFO) {
+      this.log(
+        "BM_REPORTER_DISABLE_GIT_INFO is set to true. Skipping git info."
+      );
+      return;
+    }
     return new Promise((resolve) => {
       const { exec } = require("child_process");
       exec(
@@ -81,6 +99,12 @@ var BrowsermationReporter = class {
     });
   }
   async getLatestCommitId() {
+    if (process.env.BM_REPORTER_DISABLE_GIT_INFO) {
+      this.log(
+        "BM_REPORTER_DISABLE_GIT_INFO is set to true. Skipping git info."
+      );
+      return;
+    }
     return new Promise((resolve) => {
       const { exec } = require("child_process");
       exec("git rev-parse HEAD", (error, stdout) => {
@@ -93,6 +117,12 @@ var BrowsermationReporter = class {
     });
   }
   async getLatestCommitMessage() {
+    if (process.env.BM_REPORTER_DISABLE_GIT_INFO) {
+      this.log(
+        "BM_REPORTER_DISABLE_GIT_INFO is set to true. Skipping git info."
+      );
+      return;
+    }
     return new Promise((resolve) => {
       const { exec } = require("child_process");
       exec("git log -1 --pretty=%B", (error, stdout) => {
@@ -104,7 +134,31 @@ var BrowsermationReporter = class {
       });
     });
   }
+  async gitRemoteOriginUrl() {
+    if (process.env.BM_REPORTER_DISABLE_GIT_INFO) {
+      this.log(
+        "BM_REPORTER_DISABLE_GIT_INFO is set to true. Skipping git info."
+      );
+      return;
+    }
+    return new Promise((resolve) => {
+      const { exec } = require("child_process");
+      exec("git remote get-url origin", (error, stdout) => {
+        if (error) {
+          resolve("unknown");
+        } else {
+          resolve(stdout.trim());
+        }
+      });
+    });
+  }
   async sendData(data) {
+    if (process.env.BM_REPORTER_ONLY_LOG_EVENTS) {
+      this.log(
+        "BM_REPORTER_ONLY_LOG_EVENTS is set to true. Skipping sending data to Browsermation."
+      );
+      return;
+    }
     if (!this.apiToken) {
       this.log("API token not set. Skipping sending data to Browsermation.");
       return;
@@ -125,10 +179,21 @@ var BrowsermationReporter = class {
           `Failed to send data to Browsermation. Status: ${response.status} - ${response.statusText}`
         );
       }
+      return await response.json();
     } catch (error) {
       console.error("Error sending data to Browsermation:", error);
     }
   }
+  getProjectSuite(parent) {
+    let currentSuite = parent;
+    while (currentSuite.parent) {
+      if (currentSuite.project()) {
+        break;
+      }
+      currentSuite = currentSuite.parent;
+    }
+    return currentSuite.project();
+  }
   /**
    * onBegin() is called once with a root suite that contains all other suites and tests. Learn more about suites hierarchy.
    *
@@ -140,31 +205,34 @@ var BrowsermationReporter = class {
   async onBegin(_config, suite) {
     const data = {
       type: "begin",
-      timestamp: Date.now(),
-      hostname: (0, import_node_os.hostname)(),
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       git_branch: await this.getCurrentBranch(),
       git_repo: await this.getCurrentRepo(),
       git_commit_id: await this.getLatestCommitId(),
       git_commit_message: await this.getLatestCommitMessage(),
+      git_remote_origin_url: await this.gitRemoteOriginUrl(),
       totalTests: suite.allTests().length,
-      cpus: (0, import_node_os.cpus)().length,
       playwright_version: _config.version,
       node_version: process.version
     };
-    this.log(`${JSON.stringify(data)}
+    this.logEvent(`${JSON.stringify(data)}
 `);
-    await this.sendData(data);
+    const response = await this.sendData(data);
+    if (response?.data?.suite_run_id) {
+      this.suiteRunId = response.data.suite_run_id;
+      this.log(`Received suite_run_id: ${this.suiteRunId}`);
+    }
   }
   async onEnd(result) {
     const data = {
       type: "end",
-      startTime: result.startTime,
-      duration: result.duration,
+      suite_run_id: this.suiteRunId,
+      start_time: result.startTime,
+      duration_in_ms: result.duration,
       status: result.status,
-      timestamp: Date.now(),
-      hostname: (0, import_node_os.hostname)()
+      timestamp: (/* @__PURE__ */ new Date()).toISOString()
     };
-    this.log(`${JSON.stringify(data)}
+    this.logEvent(`${JSON.stringify(data)}
 `);
     await this.sendData(data);
   }
@@ -173,50 +241,66 @@ var BrowsermationReporter = class {
       id: test.id,
       type: "test-start",
       title: test.title,
-      file: test.location.file,
-      timestamp: Date.now(),
+      file: test.location.file.replace(process.cwd(), ""),
+      hostname: (0, import_node_os.hostname)(),
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       free_memory: (0, import_node_os.freemem)(),
       total_memory: (0, import_node_os.totalmem)(),
-      project: test.parent.project.name
+      cpus: (0, import_node_os.cpus)().length,
+      cpu_architecture: process.arch,
+      retries: test.retries,
+      project_name: this.getProjectSuite(test.parent)?.name,
+      project_default_browser_type: this.getProjectSuite(test.parent)?.use.defaultBrowserType,
+      suite_title: test.parent.title
     };
-    this.log(`${JSON.stringify(data)}
-`);
     await this.sendData(data);
   }
   async onTestEnd(test, result) {
     const data = {
       id: test.id,
+      suite_run_id: this.suiteRunId,
       type: "test-end",
+      project: test.parent.project.name,
       title: test.title,
-      titlePath: test.titlePath,
+      title_path: test.titlePath,
+      result: result.status,
       status: result.status,
-      duration: result.duration,
+      duration_in_ms: result.duration,
       errors: stripAnsi(result.error?.message || ""),
-      timestamp: Date.now(),
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       free_memory: (0, import_node_os.freemem)(),
-      total_memory: (0, import_node_os.totalmem)()
+      total_memory: (0, import_node_os.totalmem)(),
+      cpu_architecture: process.arch,
+      cpus: (0, import_node_os.cpus)().length,
+      hostname: (0, import_node_os.hostname)(),
+      retries: test.retries,
+      retry_attempt: result.retry,
+      stderr: result.stderr.map((s) => stripAnsi(s.toString())).join("\n"),
+      stdout: result.stdout.map((s) => stripAnsi(s.toString())).join("\n")
     };
-    this.log(`${JSON.stringify(data)}
+    this.logEvent(`${JSON.stringify(data)}
 `);
     await this.sendData(data);
   }
   async onError(error) {
     const data = {
       type: "error",
+      suite_run_id: this.suiteRunId,
       message: error.message,
       stack: error.stack,
-      timestamp: Date.now()
+      timestamp: (/* @__PURE__ */ new Date()).toISOString()
     };
-    console.error(`${JSON.stringify(data)}
+    this.logEvent(`${JSON.stringify(data)}
 `);
     await this.sendData(data);
   }
   async onExit() {
     const data = {
       type: "exit",
-      timestamp: Date.now()
+      suite_run_id: this.suiteRunId,
+      timestamp: (/* @__PURE__ */ new Date()).toISOString()
     };
-    this.log(`${JSON.stringify(data)}
+    this.logEvent(`${JSON.stringify(data)}
 `);
     await this.sendData(data);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browsermation/test",
-  "version": "0.0.63-beta.9",
+  "version": "0.0.65",
   "description": "The testing platform for Playwright by Browsermation.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",