@empiricalrun/playwright-utils 0.36.0 → 0.37.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @empiricalrun/playwright-utils
 
+## 0.37.0
+
+### Minor Changes
+
+- 14a5406: feat: adopt dash proxy in email client
+- 11c0b24: refactor: uploader abstraction in playwright reporter
+
+### Patch Changes
+
+- Updated dependencies [3ee1aec]
+  - @empiricalrun/r2-uploader@0.8.0
+  - @empiricalrun/test-gen@0.78.6
+
 ## 0.36.0
 
 ### Minor Changes

package/dist/email.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../src/email.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,MAAM,KAAK,GAAG,cAAc,CAAC;AAEnC,KAAK,WAAW,GAAG;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAKF,KAAK,kBAAkB,GAAG;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,qBAAa,WAAW;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,SAAa;IACrB,OAAO,CAAC,MAAM,CAAkB;gBAEpB,IAAI,GAAE,kBAAuB;IA2BzC,UAAU,IAAI,MAAM;IAId,YAAY,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;CAGzD"}
+{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../src/email.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,MAAM,KAAK,GAAG,cAAc,CAAC;AAEnC,KAAK,WAAW,GAAG;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAKF,KAAK,kBAAkB,GAAG;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,qBAAa,WAAW;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,SAAa;IACrB,OAAO,CAAC,MAAM,CAAkB;gBAEpB,IAAI,GAAE,kBAAuB;IAwCzC,UAAU,IAAI,MAAM;IAId,YAAY,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;CAGzD"}

package/dist/email.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmailClient = void 0;
+const dashboard_1 = require("@empiricalrun/test-gen/dashboard");
 const mailosaur_client_1 = require("./mailosaur-client");
 const DEFAULT_TIMEOUT = 30_000;
 const SERVER_ID = "pnyrwq5o";
@@ -10,17 +11,30 @@ class EmailClient {
     serverId = SERVER_ID;
     client;
     constructor(opts = {}) {
-        const apiKey = process.env.MAILOSAUR_API_KEY;
-        if (!apiKey) {
-            throw new Error("'apiKey' must be set");
-        }
         const { timeout = DEFAULT_TIMEOUT, emailId: knownEmailId } = opts;
         this.timeout = timeout;
-        this.client = new mailosaur_client_1.MailosaurClient({
-            apiKey,
-            serverId: this.serverId,
-            timeout: this.timeout,
-        });
+        const empiricalApiKey = process.env.EMPIRICALRUN_API_KEY;
+        if (empiricalApiKey) {
+            const apiClient = new dashboard_1.DashboardAPIClient({
+                authType: "project-api-key",
+            });
+            this.client = new mailosaur_client_1.MailosaurClient({
+                apiClient,
+                serverId: this.serverId,
+                timeout: this.timeout,
+            });
+        }
+        else {
+            const apiKey = process.env.MAILOSAUR_API_KEY;
+            if (!apiKey) {
+                throw new Error("Either EMPIRICALRUN_API_KEY or MAILOSAUR_API_KEY must be set");
+            }
+            this.client = new mailosaur_client_1.MailosaurClient({
+                apiKey,
+                serverId: this.serverId,
+                timeout: this.timeout,
+            });
+        }
         const emailId = knownEmailId ||
             [...Array(7)].map(() => Math.random().toString(36)[2]).join("");
         if (emailId.includes("@")) {

package/dist/mailosaur-client.d.ts

@@ -1,3 +1,4 @@
+import type { IDashboardAPIClient } from "@empiricalrun/shared-types/api/base";
 type Link = {
     text?: string;
     href?: string;
@@ -10,15 +11,22 @@ export type MailosaurEmail = {
     codes: string[];
 };
 type MailosaurClientOptions = {
-    apiKey: string;
     serverId: string;
     timeout: number;
-};
+} & ({
+    apiKey: string;
+    apiClient?: never;
+} | {
+    apiKey?: never;
+    apiClient: IDashboardAPIClient;
+});
 export declare class MailosaurClient {
-    private apiKey;
+    private apiKey?;
+    private apiClient?;
     private serverId;
     private timeout;
     constructor(opts: MailosaurClientOptions);
+    private makeRequest;
     waitForEmail(address: string, filter?: {
         from?: string;
         subject?: string;
@@ -26,7 +34,6 @@ export declare class MailosaurClient {
     }): Promise<MailosaurEmail>;
     private searchWithPolling;
     private getMessageById;
-    private handleMailosaurError;
     private parseEmailResponse;
     private sleep;
 }

package/dist/mailosaur-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mailosaur-client.d.ts","sourceRoot":"","sources":["../src/mailosaur-client.ts"],"names":[],"mappings":"AAAA,KAAK,IAAI,GAAG;IACV,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AA6BF,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,OAAO,CAAS;gBAEZ,IAAI,EAAE,sBAAsB;IAMlC,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAC1D,OAAO,CAAC,cAAc,CAAC;YAqBZ,iBAAiB;YAyEjB,cAAc;YAuBd,oBAAoB;IAqBlC,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,KAAK;CAGd"}
+{"version":3,"file":"mailosaur-client.d.ts","sourceRoot":"","sources":["../src/mailosaur-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE/E,KAAK,IAAI,GAAG;IACV,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAkCF,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,CACA;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,KAAK,CAAA;CAAE,GACrC;IAAE,MAAM,CAAC,EAAE,KAAK,CAAC;IAAC,SAAS,EAAE,mBAAmB,CAAA;CAAE,CACrD,CAAC;AAEF,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,SAAS,CAAC,CAAsB;IACxC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,OAAO,CAAS;gBAEZ,IAAI,EAAE,sBAAsB;YAW1B,WAAW;IA0CnB,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAC1D,OAAO,CAAC,cAAc,CAAC;YAqBZ,iBAAiB;YA2EjB,cAAc;IA+B5B,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,KAAK;CAGd"}

package/dist/mailosaur-client.js

@@ -5,12 +5,47 @@ const MAILOSAUR_BASE_URL = "https://mailosaur.com/api";
 const DEFAULT_POLL_DELAY = 1000;
 class MailosaurClient {
     apiKey;
+    apiClient;
     serverId;
     timeout;
     constructor(opts) {
-        this.apiKey = opts.apiKey;
         this.serverId = opts.serverId;
         this.timeout = opts.timeout;
+        if ("apiClient" in opts && opts.apiClient) {
+            this.apiClient = opts.apiClient;
+        }
+        else {
+            this.apiKey = opts.apiKey;
+        }
+    }
+    async makeRequest(method, path, body) {
+        if (this.apiClient) {
+            const result = await this.apiClient.callMailosaurProxy({
+                method,
+                path,
+                body,
+            });
+            return {
+                data: result.data,
+                headers: result.headers || {},
+                status: 200,
+            };
+        }
+        const url = `${MAILOSAUR_BASE_URL}${path}`;
+        const response = await fetch(url, {
+            method,
+            headers: {
+                Authorization: `Basic ${Buffer.from(`${this.apiKey}:`).toString("base64")}`,
+                "Content-Type": "application/json",
+            },
+            body: body ? JSON.stringify(body) : undefined,
+        });
+        const responseHeaders = {};
+        response.headers.forEach((value, key) => {
+            responseHeaders[key] = value;
+        });
+        const data = await response.json().catch(() => null);
+        return { data, headers: responseHeaders, status: response.status };
     }
     async waitForEmail(address, filter) {
         const now = new Date();
@@ -36,31 +71,29 @@ class MailosaurClient {
                 itemsPerPage: "1",
                 receivedAfter: receivedAfter.toISOString(),
             });
-            const url = `${MAILOSAUR_BASE_URL}/messages/search?${searchParams.toString()}`;
-            let response;
+            const path = `/messages/search?${searchParams.toString()}`;
+            let result;
             try {
-                response = await fetch(url, {
-                    method: "POST",
-                    headers: {
-                        Authorization: `Basic ${Buffer.from(`${this.apiKey}:`).toString("base64")}`,
-                        "Content-Type": "application/json",
-                    },
-                    body: JSON.stringify(criteria),
-                });
+                result = await this.makeRequest("POST", path, criteria);
             }
             catch (err) {
                 console.error("Mailosaur network error during search:", err);
+                if (err instanceof Error && "status" in err && err.status === 401) {
+                    throw new Error("Email provider error: Authentication error");
+                }
                 throw new Error("Email provider error: Network request failed");
             }
-            if (!response.ok) {
-                await this.handleMailosaurError(response, "search");
+            if (result.status === 401) {
+                throw new Error("Email provider error: Authentication error");
             }
-            const body = (await response.json());
-            if (body.items && body.items.length > 0 && body.items[0]?.id) {
+            if (result.status >= 400) {
+                throw new Error(`Email provider error (search): HTTP ${result.status}`);
+            }
+            const body = result.data;
+            if (body?.items && body.items.length > 0 && body.items[0]?.id) {
                 return body.items[0].id;
             }
-            // Parse delay from response header, filtering out invalid values
-            const header = response.headers.get("x-ms-delay");
+            const header = result.headers["x-ms-delay"];
             let delay = DEFAULT_POLL_DELAY;
             if (header) {
                 const pattern = header
@@ -73,7 +106,6 @@ class MailosaurClient {
                 }
             }
             pollCount += 1;
-            // Check if we'll exceed timeout
             const elapsed = Date.now() - startTime;
             if (elapsed + delay > this.timeout) {
                 throw new Error(`Email not received at ${address} within ${this.timeout}ms`);
@@ -82,32 +114,25 @@ class MailosaurClient {
         }
     }
     async getMessageById(messageId) {
-        const url = `${MAILOSAUR_BASE_URL}/messages/${messageId}`;
-        let response;
+        const path = `/messages/${messageId}`;
+        let result;
         try {
-            response = await fetch(url, {
-                method: "GET",
-                headers: {
-                    Authorization: `Basic ${Buffer.from(`${this.apiKey}:`).toString("base64")}`,
-                },
-            });
+            result = await this.makeRequest("GET", path);
         }
         catch (err) {
             console.error("Mailosaur network error during getMessageById:", err);
+            if (err instanceof Error && "status" in err && err.status === 401) {
+                throw new Error("Email provider error: Authentication error");
+            }
             throw new Error("Email provider error: Network request failed");
         }
-        if (!response.ok) {
-            await this.handleMailosaurError(response, "getMessageById");
-        }
-        return (await response.json());
-    }
-    async handleMailosaurError(response, context) {
-        const errorBody = await response.text().catch(() => "");
-        console.error(`Mailosaur error in ${context}:`, errorBody || response.statusText);
-        if (response.status === 401) {
+        if (result.status === 401) {
             throw new Error("Email provider error: Authentication error");
         }
-        throw new Error(`Email provider error (${context}): HTTP ${response.status}${errorBody ? ` - ${errorBody}` : ""}`);
+        if (result.status >= 400) {
+            throw new Error(`Email provider error (getMessageById): HTTP ${result.status}`);
+        }
+        return result.data;
     }
     parseEmailResponse(email) {
         const codesAsString = email.html?.codes

package/dist/reporter/empirical-reporter.d.ts

@@ -1,21 +1,17 @@
 import type { FullResult, Reporter, TestCase, TestResult } from "@playwright/test/reporter";
 declare class EmpiricalReporter implements Reporter {
-    private _destinationDir;
-    private _uploadBucket;
     private _currentWorkingDir;
-    private _willUploadArtifacts;
     private _testResultSourceDir;
-    private _baseUrl;
-    private _urlPrefix;
     private _pendingTestCaseEvents;
     private _hasSharding;
     private _attachmentUrlMap;
     private _testRetryCounts;
-    private checkR2Creds;
+    private _uploader;
     constructor();
     private enqueTestAttachmentUploadTask;
     onTestEnd(test: TestCase, result: TestResult): void;
     onEnd(result: FullResult): Promise<void>;
+    private _logMissingFiles;
     private _patchBlobReport;
     private _uploadBlobReport;
 }

package/dist/reporter/empirical-reporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"empirical-reporter.d.ts","sourceRoot":"","sources":["../../src/reporter/empirical-reporter.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,UAAU,EACX,MAAM,2BAA2B,CAAC;AAkBnC,cAAM,iBAAkB,YAAW,QAAQ;IACzC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,aAAa,CAAyB;IAC9C,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,oBAAoB,CAAkB;IAC9C,OAAO,CAAC,oBAAoB,CAG1B;IACF,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,UAAU,CACwE;IAC1F,OAAO,CAAC,sBAAsB,CAAuB;IAErD,OAAO,CAAC,YAAY,CAAgD;IACpE,OAAO,CAAC,iBAAiB,CAAyC;IAClE,OAAO,CAAC,gBAAgB,CAAkC;IAE1D,OAAO,CAAC,YAAY;;IAyBpB,OAAO,CAAC,6BAA6B,CA4BnC;IAEF,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU;IAuFtC,KAAK,CAAC,MAAM,EAAE,UAAU;YA4HhB,gBAAgB;YAOhB,iBAAiB;CAWhC;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"empirical-reporter.d.ts","sourceRoot":"","sources":["../../src/reporter/empirical-reporter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,UAAU,EACX,MAAM,2BAA2B,CAAC;AAkBnC,cAAM,iBAAkB,YAAW,QAAQ;IACzC,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,oBAAoB,CAG1B;IACF,OAAO,CAAC,sBAAsB,CAAuB;IACrD,OAAO,CAAC,YAAY,CAAgD;IACpE,OAAO,CAAC,iBAAiB,CAAyC;IAClE,OAAO,CAAC,gBAAgB,CAAkC;IAC1D,OAAO,CAAC,SAAS,CAAyB;;IAM1C,OAAO,CAAC,6BAA6B,CAkCnC;IAEF,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU;IAoFtC,KAAK,CAAC,MAAM,EAAE,UAAU;IAuG9B,OAAO,CAAC,gBAAgB;YAoBV,gBAAgB;YAOhB,iBAAiB;CAMhC;AAED,eAAe,iBAAiB,CAAC"}

package/dist/reporter/empirical-reporter.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const r2_uploader_1 = require("@empiricalrun/r2-uploader");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const logger_1 = require("../logger");
@@ -11,61 +10,38 @@ const blob_utils_1 = require("./blob-utils");
 const uploader_1 = require("./uploader");
 const util_1 = require("./util");
 class EmpiricalReporter {
-    _destinationDir;
-    _uploadBucket = "test-report";
     _currentWorkingDir = process.cwd();
-    _willUploadArtifacts = false;
     _testResultSourceDir = path_1.default.join(this._currentWorkingDir, "test-results");
-    _baseUrl = `https://reports.empirical.run`;
-    _urlPrefix = `${this._baseUrl}/${process.env.PROJECT_NAME}/${process.env.TEST_RUN_GITHUB_ACTION_ID}`;
     _pendingTestCaseEvents = [];
     _hasSharding = process.env.HAS_SHARDING === "true";
     _attachmentUrlMap = new Map();
     _testRetryCounts = new Map();
-    checkR2Creds() {
-        if (!process.env.R2_ACCOUNT_ID ||
-            !process.env.R2_ACCESS_KEY_ID ||
-            !process.env.R2_SECRET_ACCESS_KEY) {
-            logger_1.logger.debug("R2 credentials not found, skipping artifact upload");
-            return false;
-        }
-        return true;
-    }
+    _uploader = null;
     constructor() {
-        if (!process.env.PROJECT_NAME || !process.env.TEST_RUN_GITHUB_ACTION_ID) {
-            logger_1.logger.debug("PROJECT_NAME and TEST_RUN_GITHUB_ACTION_ID must be set");
-            this._destinationDir = "";
-            return;
-        }
-        this._destinationDir = path_1.default.join(process.env.PROJECT_NAME, process.env.TEST_RUN_GITHUB_ACTION_ID);
-        this._willUploadArtifacts = this.checkR2Creds();
+        this._uploader = (0, uploader_1.createUploader)();
     }
     enqueTestAttachmentUploadTask = async (attachment) => {
+        if (!this._uploader)
+            return;
         if (!attachment.path) {
             logger_1.logger.warn(`[Empirical Reporter] Skipping attachment without path: ${attachment.name}`);
             return;
         }
         const exists = await (0, util_1.checkFileExistsAsync)(attachment.path);
-        if (exists) {
-            logger_1.logger.debug(`[Empirical Reporter] Processing attachment: File exists`);
-        }
-        else {
+        if (!exists) {
             logger_1.logger.error(`[Empirical Reporter] Attachment does not exist: ${attachment.path}`);
             return;
         }
-        const uploadTask = (0, uploader_1.createUploadTaskV2)({
-            sourceDir: this._testResultSourceDir,
-            fileList: [attachment.path],
-            destinationDir: path_1.default.join(this._destinationDir, "data"),
-            uploadBucket: this._uploadBucket,
-            baseUrl: this._baseUrl,
-        });
-        return (0, r2_uploader_1.sendTaskToQueue)(uploadTask);
+        const relativePath = path_1.default.relative(this._testResultSourceDir, attachment.path);
+        const destinationPath = `data/${relativePath}`;
+        const publicUrl = await this._uploader.uploadFile(attachment.path, destinationPath);
+        if (publicUrl) {
+            return { [attachment.path]: publicUrl };
+        }
     };
     onTestEnd(test, result) {
-        if (!this._willUploadArtifacts) {
+        if (!this._uploader)
             return;
-        }
         if (!process.env.TEST_RUN_GITHUB_ACTION_ID) {
             logger_1.logger.debug("[Empirical Reporter] TEST_RUN_GITHUB_ACTION_ID is not set");
             return;
@@ -126,18 +102,17 @@ class EmpiricalReporter {
                 }
             };
             this._pendingTestCaseEvents.push(testCaseRunEventTask());
-            return;
         }
         catch (error) {
             logger_1.logger.error(`[Empirical Reporter] Error in onTestEnd for ${test.title}:`, error);
         }
     }
     async onEnd(result) {
-        if (!this._willUploadArtifacts) {
+        if (!this._uploader)
             return;
-        }
         logger_1.logger.debug(`[Empirical Reporter] Test run completed with status: ${result.status}`);
-        const startTime = new Date().getTime();
+        logger_1.logger.debug(`[Empirical Reporter] State: cwd=${this._currentWorkingDir}, hasSharding=${this._hasSharding}`);
+        const startTime = Date.now();
         logger_1.logger.debug("[Empirical Reporter] Starting final report upload at: ", new Intl.DateTimeFormat("en-US", {
             hour: "2-digit",
             minute: "2-digit",
@@ -147,34 +122,23 @@ class EmpiricalReporter {
         const jsonExists = fs_1.default.existsSync(jsonFilePath);
         const htmlFilePath = path_1.default.join(this._currentWorkingDir, "playwright-report/index.html");
         const htmlExists = await (0, util_1.checkFileExistsAsync)(htmlFilePath);
+        if (!htmlExists || !jsonExists) {
+            this._logMissingFiles();
+        }
         if (htmlExists && jsonExists) {
             logger_1.logger.debug("[Empirical Reporter] Updating the HTML Zip");
             await (0, util_1.updateHtmlZipFileAttachmentPaths)(jsonFilePath, htmlFilePath, this._testResultSourceDir);
             logger_1.logger.debug("[Empirical Reporter] Uploading HTML file");
-            const uploadHtmlTask = (0, uploader_1.createUploadTaskV2)({
-                sourceDir: path_1.default.join(this._currentWorkingDir, "playwright-report"),
-                fileList: [htmlFilePath],
-                destinationDir: this._destinationDir,
-                uploadBucket: this._uploadBucket,
-                baseUrl: this._baseUrl,
-            });
-            void (0, r2_uploader_1.sendTaskToQueue)(uploadHtmlTask);
+            await this._uploader.uploadFile(htmlFilePath, "index.html");
         }
         else {
             logger_1.logger.error(`[Empirical Reporter] playwright-report/index.html does not exist at: ${htmlFilePath}`);
         }
         if (jsonExists) {
             logger_1.logger.debug("[Empirical Reporter] Updating the JSON file");
-            await (0, util_1.updateSummaryJsonAttachmentPaths)(jsonFilePath, this._testResultSourceDir, `${this._urlPrefix}/data`);
+            await (0, util_1.updateSummaryJsonAttachmentPaths)(jsonFilePath, this._testResultSourceDir, `${this._uploader.urlPrefix}/data`);
             logger_1.logger.debug("[Empirical Reporter] Uploading JSON file");
-            const uploadJsonTask = (0, uploader_1.createUploadTaskV2)({
-                sourceDir: this._currentWorkingDir,
-                fileList: [jsonFilePath],
-                destinationDir: this._destinationDir,
-                uploadBucket: this._uploadBucket,
-                baseUrl: this._baseUrl,
-            });
-            void (0, r2_uploader_1.sendTaskToQueue)(uploadJsonTask);
+            await this._uploader.uploadFile(jsonFilePath, "summary.json");
         }
         else {
             logger_1.logger.error(`[Empirical Reporter] summary.json does not exist at: ${jsonFilePath}`);
@@ -183,18 +147,12 @@ class EmpiricalReporter {
         const traceExists = await (0, util_1.checkFileExistsAsync)(traceFilePath);
         if (traceExists) {
             logger_1.logger.debug("[Empirical Reporter] Uploading Trace folder");
-            const uploadTraceTask = (0, uploader_1.createUploadTaskV2)({
-                sourceDir: traceFilePath,
-                destinationDir: path_1.default.join(this._destinationDir, "trace"),
-                uploadBucket: this._uploadBucket,
-                baseUrl: this._baseUrl,
-            });
-            void (0, r2_uploader_1.sendTaskToQueue)(uploadTraceTask);
+            await this._uploader.uploadDirectory(traceFilePath, "trace");
         }
         else {
             logger_1.logger.debug(`[Empirical Reporter] playwright-report/trace does not exist at: ${traceFilePath}`);
         }
-        await (0, r2_uploader_1.waitForTaskQueueToFinish)();
+        await this._uploader.waitForUploads();
         await Promise.allSettled(this._pendingTestCaseEvents);
         if (this._hasSharding) {
             const blobDir = path_1.default.join(this._currentWorkingDir, "blob-report");
@@ -207,15 +165,26 @@ class EmpiricalReporter {
             }
         }
         logger_1.logger.debug("[Empirical Reporter] All uploads finished");
-        const endTime = new Date().getTime();
-        logger_1.logger.debug("[Empirical Reporter] Finished final report upload at: ", new Intl.DateTimeFormat("en-US", {
-            hour: "2-digit",
-            minute: "2-digit",
-            second: "2-digit",
-        }).format(endTime));
-        const timeDiff = endTime - startTime;
+        const timeDiff = Date.now() - startTime;
         logger_1.logger.debug("[Empirical Reporter] Time taken to upload after tests ended: ", timeDiff, "ms");
     }
+    _logMissingFiles() {
+        try {
+            const cwdFiles = fs_1.default.readdirSync(this._currentWorkingDir);
+            logger_1.logger.debug(`[Empirical Reporter] Files in cwd: ${cwdFiles.join(", ")}`);
+            const reportDir = path_1.default.join(this._currentWorkingDir, "playwright-report");
+            if (fs_1.default.existsSync(reportDir)) {
+                const reportFiles = fs_1.default.readdirSync(reportDir);
+                logger_1.logger.debug(`[Empirical Reporter] Files in playwright-report: ${reportFiles.join(", ")}`);
+            }
+            else {
+                logger_1.logger.debug(`[Empirical Reporter] playwright-report directory does not exist`);
+            }
+        }
+        catch (e) {
+            logger_1.logger.debug(`[Empirical Reporter] Error listing files: ${e}`);
+        }
+    }
     async _patchBlobReport(blobDir) {
         const files = await fs_1.default.promises.readdir(blobDir);
         for (const fileName of files.filter((f) => f.endsWith(".zip"))) {
@@ -223,14 +192,10 @@ class EmpiricalReporter {
         }
     }
     async _uploadBlobReport(blobDir) {
-        const uploadTask = (0, uploader_1.createUploadTaskV2)({
-            sourceDir: blobDir,
-            destinationDir: path_1.default.join(this._destinationDir, "blobs"),
-            uploadBucket: this._uploadBucket,
-            baseUrl: this._baseUrl,
-        });
-        await (0, r2_uploader_1.sendTaskToQueue)(uploadTask);
-        await (0, r2_uploader_1.waitForTaskQueueToFinish)();
+        if (!this._uploader)
+            return;
+        await this._uploader.uploadDirectory(blobDir, "blobs");
+        await this._uploader.waitForUploads();
         logger_1.logger.debug("[Empirical Reporter] Blob report uploaded");
     }
 }

package/dist/reporter/uploader.d.ts

@@ -1,3 +1,22 @@
-import { createUploadTask } from "@empiricalrun/r2-uploader";
-export { createUploadTask as createUploadTaskV2 };
+export interface UploaderConfig {
+    projectName: string;
+    runId: string;
+    baseUrl?: string;
+    uploadBucket?: string;
+}
+export declare class Uploader {
+    private _baseUrl;
+    private _uploadBucket;
+    private _destinationDir;
+    constructor(config: UploaderConfig);
+    private static _hasR2Credentials;
+    get isEnabled(): boolean;
+    get baseUrl(): string;
+    get destinationDir(): string;
+    get urlPrefix(): string;
+    uploadFile(filePath: string, destinationPath: string): Promise<string | null>;
+    uploadDirectory(sourceDir: string, destinationPrefix: string): Promise<void>;
+    waitForUploads(): Promise<void>;
+}
+export declare function createUploader(): Uploader | null;
 //# sourceMappingURL=uploader.d.ts.map

package/dist/reporter/uploader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../src/reporter/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,EAAE,gBAAgB,IAAI,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../src/reporter/uploader.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,eAAe,CAAS;gBAEpB,MAAM,EAAE,cAAc;IAUlC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAQhC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAEK,UAAU,CACd,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAiCnB,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC;IAqBV,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAGtC;AAED,wBAAgB,cAAc,IAAI,QAAQ,GAAG,IAAI,CAiBhD"}

package/dist/reporter/uploader.js

@@ -1,5 +1,97 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createUploadTaskV2 = void 0;
+exports.Uploader = void 0;
+exports.createUploader = createUploader;
 const r2_uploader_1 = require("@empiricalrun/r2-uploader");
-Object.defineProperty(exports, "createUploadTaskV2", { enumerable: true, get: function () { return r2_uploader_1.createUploadTask; } });
+const path_1 = __importDefault(require("path"));
+const logger_1 = require("../logger");
+class Uploader {
+    _baseUrl;
+    _uploadBucket;
+    _destinationDir;
+    constructor(config) {
+        this._baseUrl = config.baseUrl || "https://reports.empirical.run";
+        this._uploadBucket = config.uploadBucket || "test-report";
+        this._destinationDir = `${config.projectName}/${config.runId}`;
+        logger_1.logger.debug(`[Uploader] Initialized with destination: ${this._destinationDir}`);
+    }
+    static _hasR2Credentials() {
+        return !!(process.env.R2_ACCOUNT_ID &&
+            process.env.R2_ACCESS_KEY_ID &&
+            process.env.R2_SECRET_ACCESS_KEY);
+    }
+    get isEnabled() {
+        return Uploader._hasR2Credentials();
+    }
+    get baseUrl() {
+        return this._baseUrl;
+    }
+    get destinationDir() {
+        return this._destinationDir;
+    }
+    get urlPrefix() {
+        return `${this._baseUrl}/${this._destinationDir}`;
+    }
+    async uploadFile(filePath, destinationPath) {
+        if (!this.isEnabled) {
+            logger_1.logger.debug("[Uploader] R2 credentials not found, skipping upload");
+            return null;
+        }
+        try {
+            const fullDestinationPath = path_1.default.join(this._destinationDir, destinationPath);
+            const sourceDir = path_1.default.dirname(filePath);
+            const uploadTask = (0, r2_uploader_1.createUploadTask)({
+                sourceDir,
+                fileList: [filePath],
+                destinationDir: path_1.default.dirname(fullDestinationPath),
+                uploadBucket: this._uploadBucket,
+                baseUrl: this._baseUrl,
+            });
+            const result = await (0, r2_uploader_1.sendTaskToQueue)(uploadTask);
+            if (result) {
+                const url = Object.values(result)[0];
+                return url || null;
+            }
+            return null;
+        }
+        catch (err) {
+            logger_1.logger.error(`[Uploader] Error uploading file:`, err);
+            return null;
+        }
+    }
+    async uploadDirectory(sourceDir, destinationPrefix) {
+        if (!this.isEnabled) {
+            logger_1.logger.debug("[Uploader] R2 credentials not found, skipping upload");
+            return;
+        }
+        const fullDestinationDir = path_1.default.join(this._destinationDir, destinationPrefix);
+        const uploadTask = (0, r2_uploader_1.createUploadTask)({
+            sourceDir,
+            destinationDir: fullDestinationDir,
+            uploadBucket: this._uploadBucket,
+            baseUrl: this._baseUrl,
+        });
+        await (0, r2_uploader_1.sendTaskToQueue)(uploadTask);
+    }
+    async waitForUploads() {
+        await (0, r2_uploader_1.waitForTaskQueueToFinish)();
+    }
+}
+exports.Uploader = Uploader;
+function createUploader() {
+    if (!process.env.PROJECT_NAME || !process.env.TEST_RUN_GITHUB_ACTION_ID) {
+        logger_1.logger.debug("[Uploader] PROJECT_NAME and TEST_RUN_GITHUB_ACTION_ID must be set");
+        return null;
+    }
+    if (!Uploader["_hasR2Credentials"]()) {
+        logger_1.logger.debug("[Uploader] R2 credentials not found");
+        return null;
+    }
+    return new Uploader({
+        projectName: process.env.PROJECT_NAME,
+        runId: process.env.TEST_RUN_GITHUB_ACTION_ID,
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.36.0",
+  "version": "0.37.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -43,8 +43,8 @@
     "puppeteer-extra-plugin-recaptcha": "^3.6.8",
     "rimraf": "^6.0.1",
     "@empiricalrun/llm": "^0.25.1",
-    "@empiricalrun/r2-uploader": "^0.7.0",
-    "@empiricalrun/test-gen": "^0.78.5"
+    "@empiricalrun/r2-uploader": "^0.8.0",
+    "@empiricalrun/test-gen": "^0.78.6"
   },
   "scripts": {
     "dev": "tsc --build --watch",