@bigbinary/neeto-playwright-reporter 1.3.13 → 1.3.15

package/index.d.ts

@@ -15,10 +15,10 @@ declare class MyReporter implements Reporter {
     retryAttemptStartedAt: Date;
     testResultCalls: Promise<unknown>[];
     totalTestCount: number;
-    reportedTestCount: number;
     tags: string[] | string;
     unreportedAttemptCount: number;
     hasRunStarted: boolean;
+    testAttemptIds: string[];
     constructor(options: ReporterOptionParams);
     onBegin: (config: FullConfig, rootSuite: Suite) => Promise<void>;
     onTestBegin: ({ id, title }: TestCase, { retry }: TestResult) => Promise<void>;

package/index.js

@@ -10,8 +10,8 @@ import require$$1$2 from 'tty';
 import require$$0$2 from 'os';
 import zlib from 'zlib';
 import EventEmitter from 'events';
-import childProcess from 'child_process';
 import crypto from 'crypto';
+import childProcess from 'child_process';
 
 function bind(fn, thisArg) {
   return function wrap() {
@@ -18487,34 +18487,52 @@ const MESSAGES = {
     },
 };
 
-const consoleLogFormatted = {
-    bold: (message) => console.log("\x1b[1m", message, "\x1b[0m"),
-    dim: (message) => console.log("\x1b[2m", message, "\x1b[0m"),
-    underline: (message) => console.log("\x1b[4m", message, "\x1b[0m"),
-    invertBackground: (message) => console.log("\x1b[7m", message, "\x1b[0m"),
-    hidden: (message) => console.log("\x1b[8m", message, "\x1b[0m"),
-    error: (message) => console.log("\u001b[31m", "\x1b[1m", message, "\x1b[0m", "\u001b[0m"),
-    warning: (message) => console.log("\u001b[33m", "\x1b[1m", message, "\x1b[0m", "\u001b[0m"),
-};
-const executeCommandLine = ({ command, messageOnError, shouldThrowError = false, logLevel = "warning", }) => {
-    try {
-        return childProcess.execSync(command).toString().trim();
-    }
-    catch (err) {
-        if (shouldThrowError) {
-            throw err;
-        }
-        else {
-            consoleLogFormatted[logLevel](messageOnError);
-        }
-    }
-};
-
 const createShardObject = ({ currentShard = 0, status = "running", duration = null, }) => ({
     [currentShard]: { status, duration },
 });
 const waitUntilTimeout = (timeout) => new Promise(resolve => setTimeout(resolve, timeout));
 
+const LOG_LEVEL_FORMATTERS = {
+    bold: "\x1b[1m",
+    dim: "\x1b[2m",
+    underline: "\x1b[4m",
+    invertBackground: "\x1b[7m",
+    hidden: "\x1b[8m",
+    error: "\u001b[31m\x1b[1m",
+    warning: "\u001b[33m\x1b[1m",
+};
+
+class ConsoleLogFormatted {
+    constructor() {
+        this.LOG_LEVELS = {
+            info: ["bold", "dim", "underline", "invertBackground", "hidden"],
+            get warning() {
+                return [...this.info, "warning"];
+            },
+            get error() {
+                return [...this.warning, "error"];
+            },
+        };
+        this.shouldPrintMessage = (type) => {
+            var _a;
+            const logLevel = ((_a = process.env.PLAYDASH_LOG_LEVEL) !== null && _a !== void 0 ? _a : "info");
+            const validMethods = this.LOG_LEVELS[logLevel] || [];
+            return validMethods.includes(type);
+        };
+        Object.entries(LOG_LEVEL_FORMATTERS).forEach(([logLevel, ansiFormatter]) => {
+            this.createMethod(logLevel, ansiFormatter);
+        });
+    }
+    createMethod(logLevel, ansiFormatter) {
+        this[logLevel] = (message) => {
+            if (this.shouldPrintMessage(logLevel)) {
+                console.log(`${ansiFormatter}${message}\x1b[0m\u001b[0m`);
+            }
+        };
+    }
+}
+var consoleLogFormatted = new ConsoleLogFormatted();
+
 const getFileData = (file, contentType, filename) => {
     const byte_size = file.byteLength;
     const checksum = crypto.createHash("md5").update(file).digest("base64");
@@ -18530,6 +18548,20 @@ const update = (ciBuildId, payload) => axios.put(`${API_BASE_URL}/reporter/runs/
 const heartbeat = (ciBuildId) => axios.get(`${API_BASE_URL}/reporter/runs/${ciBuildId}/heartbeat`);
 const runsApi = { create: create$1, update, heartbeat };
 
+const executeCommandLine = ({ command, messageOnError, shouldThrowError = false, logLevel = "warning", }) => {
+    try {
+        return childProcess.execSync(command).toString().trim();
+    }
+    catch (err) {
+        if (shouldThrowError) {
+            throw err;
+        }
+        else {
+            consoleLogFormatted[logLevel](messageOnError);
+        }
+    }
+};
+
 const getDescribePath = ({ titlePath, title, project, spec, }) => titlePath.filter((item, index) => index !== 0 && item !== title && item !== project && item !== spec);
 const getCurrentCommitSha = () => executeCommandLine({
     command: "git rev-parse HEAD",
@@ -18595,7 +18627,7 @@ class MyReporter {
             this.currentShard = shard === null || shard === void 0 ? void 0 : shard.current;
             let attempts;
             this.totalTestCount = rootSuite.allTests().length;
-            consoleLogFormatted.bold("Started reporting to neetoPlaydash 🎭");
+            consoleLogFormatted.bold("Started reporting to NeetoPlaydash 🎭");
             try {
                 const runDetails = {
                     commit_id: getCurrentCommitSha(),
@@ -18620,7 +18652,8 @@ class MyReporter {
             catch (error) {
                 const data = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
                 consoleLogFormatted.error((_b = data === null || data === void 0 ? void 0 : data.error) !== null && _b !== void 0 ? _b : error.message);
-                throw new Error(ERRORS.onBegin.failedToInitializeRun);
+                consoleLogFormatted.error(ERRORS.onBegin.failedToInitializeRun);
+                process.exit(1);
             }
             consoleLogFormatted.underline(MESSAGES.onBegin.testStarted);
             consoleLogFormatted.dim(MESSAGES.onBegin.ciBuildId(this.ciBuildId));
@@ -18634,15 +18667,15 @@ class MyReporter {
         };
         this.onTestBegin = async ({ id, title }, { retry }) => {
             var _a, _b;
+            this.retryAttemptStartedAt = new Date();
             this.unreportedAttemptCount++;
             consoleLogFormatted.invertBackground(MESSAGES.onTestBegin.startingTest(title));
             try {
-                this.retryAttemptStartedAt = new Date();
                 while (!((_b = (_a = this.attempts) === null || _a === void 0 ? void 0 : _a[id]) === null || _b === void 0 ? void 0 : _b["0"]))
                     await waitUntilTimeout(100); // Poll every 100 milliseconds
                 const attemptsPayload = {
                     status: "running",
-                    started_at: new Date().toString(),
+                    started_at: this.retryAttemptStartedAt.toString(),
                     shard: this.currentShard,
                 };
                 if (retry === 0) {
@@ -18657,6 +18690,7 @@ class MyReporter {
                             [String(retry)]: attempt_id,
                         },
                     };
+                    this.testAttemptIds.push(`${history_id}-${attempt_id}`);
                 }
             }
             catch (error) {
@@ -18698,7 +18732,8 @@ class MyReporter {
                         return uploadToS3(file, direct_upload);
                     }
                 }));
-                while (!this.attempts[id][retry])
+                while (!(this.attempts[id][retry] ||
+                    this.testAttemptIds.includes(`${id}-${this.attempts[id][retry]}`)))
                     await waitUntilTimeout(100);
                 this.testResultCalls.push(attemptsApi.update(this.ciBuildId, id, this.attempts[id][retry], testResult));
             }
@@ -18708,16 +18743,13 @@ class MyReporter {
             }
             finally {
                 this.unreportedAttemptCount--;
-                retry === 0 && this.reportedTestCount++;
                 consoleLogFormatted.invertBackground(MESSAGES.onTestEnd.reportedTest(title));
             }
         };
         this.onEnd = async ({ status, duration }) => {
             var _a, _b;
             try {
-                while (!(this.hasRunStarted &&
-                    this.totalTestCount === this.reportedTestCount &&
-                    this.unreportedAttemptCount === 0))
+                while (!(this.hasRunStarted && this.unreportedAttemptCount === 0))
                     await waitUntilTimeout(100);
                 await Promise.allSettled(this.testResultCalls);
                 await runsApi.update(this.ciBuildId, {
@@ -18730,8 +18762,8 @@ class MyReporter {
             }
             catch (error) {
                 const data = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
-                consoleLogFormatted.error((_b = data === null || data === void 0 ? void 0 : data.error) !== null && _b !== void 0 ? _b : error.message);
-                throw new Error(ERRORS.onEnd.failedToReportRunStatus);
+                consoleLogFormatted.error((_b = data.error) !== null && _b !== void 0 ? _b : error.message);
+                consoleLogFormatted.error(ERRORS.onEnd.failedToReportRunStatus);
             }
             finally {
                 consoleLogFormatted.invertBackground(MESSAGES.onEnd.runReported);
@@ -18744,9 +18776,9 @@ class MyReporter {
         this.retryAttemptStartedAt = new Date();
         this.testResultCalls = [];
         this.totalTestCount = 0;
-        this.reportedTestCount = 0;
         this.unreportedAttemptCount = 0;
         this.hasRunStarted = false;
+        this.testAttemptIds = [];
         process.on("unhandledRejection", error => {
             var _a, _b, _c;
             const data = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;