@empiricalrun/playwright-utils 0.18.15 → 0.18.16

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @empiricalrun/playwright-utils
 
+## 0.18.16
+
+### Patch Changes
+
+- 8952f35: fix: new task queue in custom reporter to wait on test case events
+
 ## 0.18.15
 
 ### Patch Changes

package/dist/reporter/custom.d.ts

@@ -39,12 +39,7 @@ declare class HtmlReporter implements ReporterV2 {
     private _open;
     private _port;
     private _host;
-    private uploadExecutionQueue;
-    private uploadWaitingQueue;
-    private uploadMaxQueueSize;
     private haveSeenAttachments;
-    private processQueue;
-    private waitForAllTasksToFinish;
     private _buildResult;
     private _topLevelErrors;
     constructor(options: HtmlReporterOptions);

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

@@ -1 +1 @@
-{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/reporter/custom.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EAMV,KAAK,EACL,QAAQ,IAAI,cAAc,EAC1B,SAAS,EACT,UAAU,IAAI,gBAAgB,EAE/B,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAML,UAAU,EAMX,MAAM,2BAA2B,CAAC;AAiBnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAsC/C,QAAA,MAAM,iBAAiB,UAAoC,CAAC;AAC5D,KAAK,oBAAoB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAM/D,KAAK,mBAAmB,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AA6BF,cAAM,YAAa,YAAW,UAAU;IACtC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,mBAAmB,CAAU;IACrC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,oBAAoB,CAAiC;IAC7D,OAAO,CAAC,kBAAkB,CAAyC;IACnE,OAAO,CAAC,kBAAkB,CAEpB;IACN,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,YAAY;YA4BN,uBAAuB;IAQrC,OAAO,CAAC,YAAY,CAEN;IACd,OAAO,CAAC,eAAe,CAAmB;gBAE9B,OAAO,EAAE,mBAAmB;IAIxC,aAAa;IAIb,QAAQ;IAER,QAAQ;IAER,WAAW;IAEX,SAAS;IAET,WAAW,CAAC,IAAI,EAAE,cAAc;IAIhC,OAAO,IAAI,IAAI;IAIf,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB;YA0D1C,qBAAqB;IAuDnC,WAAW,CAAC,MAAM,EAAE,UAAU;IAI9B,OAAO,CAAC,KAAK,EAAE,KAAK;IAYpB,eAAe,IAAI;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,oBAAoB,CAAC;QAC3B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;KAC1B;IAsBD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IASxD,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzB,KAAK,CAAC,MAAM,EAAE,UAAU;IA+IxB,MAAM;CA8Bb;AAwED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,GAAE,MAAoB,EAC1B,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM,iBAqBhB;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAsBhE;AAsiBD,eAAe,YAAY,CAAC"}
+{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/reporter/custom.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EAMV,KAAK,EACL,QAAQ,IAAI,cAAc,EAC1B,SAAS,EACT,UAAU,IAAI,gBAAgB,EAE/B,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAML,UAAU,EAMX,MAAM,2BAA2B,CAAC;AAkBnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAsC/C,QAAA,MAAM,iBAAiB,UAAoC,CAAC;AAC5D,KAAK,oBAAoB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAM/D,KAAK,mBAAmB,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AA+BF,cAAM,YAAa,YAAW,UAAU;IACtC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,mBAAmB,CAAU;IACrC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAKlC,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,YAAY,CAEN;IACd,OAAO,CAAC,eAAe,CAAmB;gBAE9B,OAAO,EAAE,mBAAmB;IAIxC,aAAa;IAIb,QAAQ;IAER,QAAQ;IAER,WAAW;IAEX,SAAS;IAET,WAAW,CAAC,IAAI,EAAE,cAAc;IAIhC,OAAO,IAAI,IAAI;IAIf,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB;YA4D1C,qBAAqB;IA6CnC,WAAW,CAAC,MAAM,EAAE,UAAU;IAI9B,OAAO,CAAC,KAAK,EAAE,KAAK;IAYpB,eAAe,IAAI;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,oBAAoB,CAAC;QAC3B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;KAC1B;IAsBD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IASxD,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzB,KAAK,CAAC,MAAM,EAAE,UAAU;IAkIxB,MAAM;CA8Bb;AAwED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,GAAE,MAAoB,EAC1B,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM,iBAqBhB;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAsBhE;AAsiBD,eAAe,YAAY,CAAC"}

package/dist/reporter/custom.js

@@ -34,6 +34,7 @@ const zipBundle_1 = require("playwright-core/lib/zipBundle");
 const stream_1 = require("stream");
 const logger_1 = require("../logger");
 const base_1 = require("./base");
+const queue_1 = require("./queue");
 const util_1 = require("./util");
 const htmlReportOptions = ["always", "never", "on-failure"];
 const isHtmlReportOption = (type) => {
@@ -62,6 +63,7 @@ function listFilesRecursively(dir) {
     }
     return files;
 }
+const R2_BUCKET_NAME = "test-report";
 class HtmlReporter {
     config;
     suite;
@@ -71,43 +73,10 @@ class HtmlReporter {
     _open;
     _port;
     _host;
-    uploadExecutionQueue = [];
-    uploadWaitingQueue = [];
-    uploadMaxQueueSize = process.env.UPLOAD_MAX_QUEUE_SIZE
-        ? parseInt(process.env.UPLOAD_MAX_QUEUE_SIZE)
-        : 2;
+    // Appwright persistent device tests generate attachments after onTestEnd
+    // We use the summary.json to re-process all attachments and this set ensures
+    // we don't upload the same attachment multiple times
     haveSeenAttachments = new Set();
-    processQueue() {
-        try {
-            while (this.uploadExecutionQueue.length <= this.uploadMaxQueueSize &&
-                this.uploadWaitingQueue.length > 0) {
-                const task = this.uploadWaitingQueue.shift();
-                if (task) {
-                    const promise = task()
-                        .catch((e) => {
-                        logger_1.logger.error("Error in processing task", e);
-                    })
-                        .finally(() => {
-                        // console.log("Finished upload execution from waiting queue"); // we already log in the upload function on successful upload
-                        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                        this.uploadExecutionQueue = this.uploadExecutionQueue.filter((p) => p !== promise);
-                        this.processQueue();
-                    });
-                    this.uploadExecutionQueue.push(promise);
-                }
-            }
-        }
-        catch (e) {
-            logger_1.logger.error("Error while processing queue", e);
-        }
-    }
-    async waitForAllTasksToFinish() {
-        return Promise.allSettled(this.uploadExecutionQueue).then(async () => {
-            if (this.uploadExecutionQueue.length > 0) {
-                await this.waitForAllTasksToFinish();
-            }
-        });
-    }
     _buildResult;
     _topLevelErrors = [];
     constructor(options) {
@@ -127,62 +96,68 @@ class HtmlReporter {
         return "v2";
     }
     onTestEnd(test, result) {
+        if (!process.env.TEST_RUN_GITHUB_ACTION_ID) {
+            return;
+        }
         try {
             const attachmentPromises = result.attachments.map((attachment) => {
                 return this.processTestAttachment(attachment);
             });
-            Promise.all(attachmentPromises)
-                .then((uploadedAttachments) => {
-                if (!uploadedAttachments || !process.env.TEST_RUN_GITHUB_ACTION_ID) {
-                    return;
-                }
-                logger_1.logger.info(`All attachments processed, test data sent for test: ${test.title}`);
-                const { suites, projectName } = (0, util_1.suitesAndProjectForTest)(test);
-                let params = {
-                    test,
-                    result,
-                    assetsURL: {
-                        trace: "",
-                        videos: [],
-                    },
-                    suites,
-                    projectName,
-                    runId: process.env.TEST_RUN_GITHUB_ACTION_ID || "",
-                };
-                uploadedAttachments.forEach((attachment) => {
-                    if (attachment) {
-                        Object.entries(attachment).forEach(([key, value]) => {
-                            if (key.includes("video")) {
-                                params.assetsURL.videos.push({
-                                    name: `test-${test.id}-slug-${(0, crypto_1.randomUUID)()}`,
-                                    url: value,
-                                });
-                            }
-                            if (key.includes("trace")) {
-                                params.assetsURL.trace = value;
-                            }
-                        });
-                    }
+            const testCaseRunEventTask = async () => {
+                return Promise.all(attachmentPromises)
+                    .then((uploadedAttachments) => {
+                    logger_1.logger.info(`Attachments for test ${test.title} are uploaded:`, uploadedAttachments);
+                    const { suites, projectName } = (0, util_1.suitesAndProjectForTest)(test);
+                    let params = {
+                        test,
+                        result,
+                        assetsURL: {
+                            trace: "",
+                            videos: [],
+                        },
+                        suites,
+                        projectName,
+                        runId: process.env.TEST_RUN_GITHUB_ACTION_ID || "",
+                    };
+                    uploadedAttachments.forEach((attachment) => {
+                        if (attachment) {
+                            Object.entries(attachment).forEach(([key, value]) => {
+                                if (key.includes("video")) {
+                                    params.assetsURL.videos.push({
+                                        name: `test-${test.id}-slug-${(0, crypto_1.randomUUID)()}`,
+                                        url: value,
+                                    });
+                                }
+                                if (key.includes("trace")) {
+                                    params.assetsURL.trace = value;
+                                }
+                            });
+                        }
+                    });
+                    return (0, util_1.sendTestCaseUpdateToDashboard)(params);
+                })
+                    .catch((error) => {
+                    logger_1.logger.error(`Error sending test case event for: ${test.title}:`, error);
                 });
-                return (0, util_1.sendTestCaseUpdateToDashboard)(params);
-            })
-                .catch((error) => {
-                logger_1.logger.error(`Error processing attachments for test: ${test.title}:`, error);
-            });
+            };
+            void (0, queue_1.sendTaskToQueue)(testCaseRunEventTask);
         }
         catch (e) {
-            logger_1.logger.error(`Error while processing attachments for test ${test.title}:`, e);
+            logger_1.logger.error(`Error in onTestEnd for ${test.title}:`, e);
         }
     }
     async processTestAttachment(attachment) {
-        if (!attachment.path)
+        if (!attachment.path) {
             return;
-        if (this.haveSeenAttachments.has(attachment.path))
+        }
+        if (this.haveSeenAttachments.has(attachment.path)) {
             return;
+        }
         this.haveSeenAttachments.add(attachment.path);
         const folder = path_1.default.relative(this._outputFolder + "/data", attachment.path);
         const folderName = folder.split("/")[0];
-        // on test gen run, we don't have PROJECT_NAME or TEST_RUN_GITHUB_ACTION_ID so we skip uploading since we anyways handle uploads for that, this is a stopgap
+        // on test gen run, we don't have PROJECT_NAME or TEST_RUN_GITHUB_ACTION_ID so we
+        // skip uploading since we anyways handle uploads for that
         if (!process.env.PROJECT_NAME || !process.env.TEST_RUN_GITHUB_ACTION_ID) {
             return;
         }
@@ -196,33 +171,19 @@ class HtmlReporter {
                         process.env.TEST_RUN_GITHUB_ACTION_ID +
                         "/data/" +
                         folderName,
-                    uploadBucket: "test-report",
-                });
+                    uploadBucket: R2_BUCKET_NAME,
+                })
+                    .then((fileMap) => {
+                    logger_1.logger.debug("Finished uploading test attachment", fileMap);
+                    return fileMap;
+                })
+                    .catch((e) => logger_1.logger.error("Error uploading test attachment", e));
                 return uploadedFiles;
             };
-            if (this.uploadExecutionQueue.length <= this.uploadMaxQueueSize) {
-                const promise = uploadTask()
-                    .catch((e) => {
-                    logger_1.logger.error("Upload failed for", attachment.path, e);
-                    // this.retryTask(uploadTask); // Retry logic
-                })
-                    .finally(() => {
-                    // this is a list of promises which we dont want to await right now
-                    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                    this.uploadExecutionQueue = this.uploadExecutionQueue.filter((p) => p !== promise);
-                    this.processQueue(); // Keep processing queue
-                });
-                this.uploadExecutionQueue.push(promise);
-                return promise;
-            }
-            else {
-                logger_1.logger.debug("Queuing upload task ", attachment.path);
-                this.uploadWaitingQueue.push(uploadTask);
-            }
+            return (0, queue_1.sendTaskToQueue)(uploadTask);
         }
         catch (e) {
             logger_1.logger.error("Error while uploading attachment", e);
-            // tests shouldn't stop no matter whatever error we get
         }
     }
     onConfigure(config) {
@@ -269,11 +230,10 @@ class HtmlReporter {
         // await removeFolders([this._outputFolder]);
         const builder = new HtmlBuilder(this.config, this._outputFolder, this._attachmentsBaseURL);
         this._buildResult = await builder.build(this.config.metadata, projectSuites, result, this._topLevelErrors);
-        const startTime = new Date().getTime();
         if (!process.env.PROJECT_NAME || !process.env.TEST_RUN_GITHUB_ACTION_ID) {
-            // Skipping uploads since PROJECT_NAME or TEST_RUN_GITHUB_ACTION_ID is not set,
             return;
         }
+        const startTime = new Date().getTime();
         logger_1.logger.info("Starting final report upload at: ", new Intl.DateTimeFormat("en-US", {
             hour: "2-digit",
             minute: "2-digit",
@@ -302,7 +262,7 @@ class HtmlReporter {
                         "/" +
                         process.env.TEST_RUN_GITHUB_ACTION_ID +
                         "/trace",
-                    uploadBucket: "test-report",
+                    uploadBucket: R2_BUCKET_NAME,
                 })
                     .then((fileMap) => {
                     logger_1.logger.debug("Finished uploading playwright trace", fileMap);
@@ -318,7 +278,7 @@ class HtmlReporter {
                     destinationDir: process.env.PROJECT_NAME +
                         "/" +
                         process.env.TEST_RUN_GITHUB_ACTION_ID,
-                    uploadBucket: "test-report",
+                    uploadBucket: R2_BUCKET_NAME,
                 })
                     .then((fileMap) => {
                     logger_1.logger.debug("Finished uploading html report", fileMap);
@@ -334,26 +294,20 @@ class HtmlReporter {
                     destinationDir: process.env.PROJECT_NAME +
                         "/" +
                         process.env.TEST_RUN_GITHUB_ACTION_ID,
-                    uploadBucket: "test-report",
+                    uploadBucket: R2_BUCKET_NAME,
                 })
                     .then((fileMap) => {
                     logger_1.logger.debug("Finished uploading json report", fileMap);
                 })
                     .catch((e) => logger_1.logger.error("Error uploading json report", e));
             };
-            logger_1.logger.debug("Uploading waiting queue", this.uploadWaitingQueue.length);
-            logger_1.logger.debug("Uploading execution queue", this.uploadExecutionQueue.length);
-            const processQueue = !this.uploadExecutionQueue.length;
             if (traceExists) {
-                this.uploadWaitingQueue.push(uploadTraceTask);
-            }
-            this.uploadWaitingQueue.push(uploadIndexTask);
-            this.uploadWaitingQueue.push(uploadSummaryTask);
-            if (processQueue) {
-                this.processQueue();
+                void (0, queue_1.sendTaskToQueue)(uploadTraceTask);
             }
+            void (0, queue_1.sendTaskToQueue)(uploadIndexTask);
+            void (0, queue_1.sendTaskToQueue)(uploadSummaryTask);
             logger_1.logger.info("Waiting for all uploads to finish");
-            await this.waitForAllTasksToFinish();
+            await (0, queue_1.waitForTaskQueueToFinish)();
             logger_1.logger.info("All uploads finished");
             const endTime = new Date().getTime();
             logger_1.logger.info("Finished final report upload at: ", new Intl.DateTimeFormat("en-US", {
@@ -361,7 +315,6 @@ class HtmlReporter {
                 minute: "2-digit",
                 second: "2-digit",
             }).format(endTime));
-            // time difference
             const timeDiff = endTime - startTime;
             logger_1.logger.info("Time taken to upload after tests ended: ", timeDiff, "ms");
         }

package/dist/reporter/queue.d.ts

@@ -0,0 +1,8 @@
+import { FileMap } from "@empiricalrun/r2-uploader";
+type AsyncTask = () => Promise<FileMap | void>;
+type AsyncTaskReturnType = FileMap | void;
+type AsyncTaskResult = Promise<AsyncTaskReturnType>;
+export declare function sendTaskToQueue(task: AsyncTask): AsyncTaskResult;
+export declare function waitForTaskQueueToFinish(): Promise<void>;
+export {};
+//# sourceMappingURL=queue.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/reporter/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAIpD,KAAK,SAAS,GAAG,MAAM,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;AAC/C,KAAK,mBAAmB,GAAG,OAAO,GAAG,IAAI,CAAC;AAC1C,KAAK,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAoGpD,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,GAAG,eAAe,CAQhE;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC,CAOxD"}

package/dist/reporter/queue.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForTaskQueueToFinish = exports.sendTaskToQueue = void 0;
+const logger_1 = require("../logger");
+class TaskQueue {
+    waitingQueue = [];
+    executingTasks = [];
+    maxConcurrent;
+    constructor() {
+        this.maxConcurrent = process.env.UPLOAD_MAX_QUEUE_SIZE
+            ? parseInt(process.env.UPLOAD_MAX_QUEUE_SIZE)
+            : 2;
+    }
+    async processNextTask() {
+        logger_1.logger.debug("[queue] processing next task in queue, with queue lengths:", taskQueue.queueLength, taskQueue.executingTasksCount);
+        if (this.waitingQueue.length === 0 ||
+            this.executingTasks.length >= this.maxConcurrent) {
+            return;
+        }
+        const queuedTask = this.waitingQueue.shift();
+        if (!queuedTask)
+            return;
+        const { task, resolve, reject } = queuedTask;
+        // Create the promise first
+        let executingPromise;
+        const executeTask = async () => {
+            try {
+                const result = await task();
+                resolve(result);
+            }
+            catch (error) {
+                logger_1.logger.error("Error in processing task", error);
+                reject(error);
+            }
+            finally {
+                // Remove this task from executing tasks
+                const index = this.executingTasks.indexOf(executingPromise);
+                if (index > -1) {
+                    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                    this.executingTasks.splice(index, 1);
+                }
+                // Try to process next task
+                await this.processNextTask();
+            }
+        };
+        // Assign the promise
+        executingPromise = executeTask();
+        this.executingTasks.push(executingPromise);
+    }
+    enqueue(task) {
+        return new Promise((resolve, reject) => {
+            this.waitingQueue.push({ task, resolve, reject });
+            this.processNextTask().catch((error) => {
+                logger_1.logger.error("Error processing queue", error);
+            });
+        });
+    }
+    async waitForCompletion() {
+        if (this.waitingQueue.length === 0 && this.executingTasks.length === 0) {
+            return;
+        }
+        // First wait for all currently executing tasks
+        if (this.executingTasks.length > 0) {
+            await Promise.all(this.executingTasks);
+        }
+        // If there are still tasks in the waiting queue, process them
+        if (this.waitingQueue.length > 0) {
+            await this.processNextTask();
+        }
+        await this.waitForCompletion();
+    }
+    get queueLength() {
+        return this.waitingQueue.length;
+    }
+    get executingTasksCount() {
+        return this.executingTasks.length;
+    }
+}
+const taskQueue = new TaskQueue();
+function sendTaskToQueue(task) {
+    logger_1.logger.debug("[queue] sending task to queue, with queue lengths:", taskQueue.queueLength, taskQueue.executingTasksCount, task);
+    return taskQueue.enqueue(task);
+}
+exports.sendTaskToQueue = sendTaskToQueue;
+function waitForTaskQueueToFinish() {
+    logger_1.logger.debug("[queue] waiting for queue to finish, with queue lengths:", taskQueue.queueLength, taskQueue.executingTasksCount);
+    return taskQueue.waitForCompletion();
+}
+exports.waitForTaskQueueToFinish = waitForTaskQueueToFinish;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.18.15",
+  "version": "0.18.16",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -43,9 +43,9 @@
     "playwright-extra": "^4.3.6",
     "puppeteer-extra-plugin-recaptcha": "^3.6.8",
     "rimraf": "^6.0.1",
-    "@empiricalrun/test-gen": "^0.38.41",
+    "@empiricalrun/r2-uploader": "^0.3.7",
     "@empiricalrun/llm": "^0.9.28",
-    "@empiricalrun/r2-uploader": "^0.3.7"
+    "@empiricalrun/test-gen": "^0.38.41"
   },
   "scripts": {
     "dev": "tsc --build --watch",