@empiricalrun/test-run 0.12.0 → 0.13.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @empiricalrun/test-run
 
+## 0.13.0
+
+### Minor Changes
+
+- d270c6d: feat: add cancellation watcher to self destruct
+- 2d9919d: feat: consolidate zip utils and move to streaming
+
+### Patch Changes
+
+- Updated dependencies [2d9919d]
+  - @empiricalrun/r2-uploader@0.7.0
+
 ## 0.12.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -6,6 +6,7 @@ import { Platform, TestCase } from "./types";
 import { getProjectsFromPlaywrightConfig } from "./utils/config";
 export { getProjectsFromPlaywrightConfig, parseTestListOutput, Platform, runSpecificTestsCmd, spawnCmd, };
 export * from "./glob-matcher";
+export { type CancellationWatcher, startCancellationWatcher, } from "./lib/cancellation-watcher";
 export { filterArrayByGlobMatchersSet, generateProjectFilters } from "./utils";
 export declare function runSingleTest({ testName, suites, filePath, projects, envOverrides, repoDir, stdout, stderr, }: {
     testName: string;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAI/E,OAAO,EAAkB,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE7C,OAAO,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AAMjE,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,QAAQ,EACR,mBAAmB,EACnB,QAAQ,GACT,CAAC;AACF,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAc/E,wBAAsB,aAAa,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,MAAM,EACN,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC;IACV,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,oBAAoB,CAAC;CACnC,CAAC,CAoBD;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACnE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;CACjD,CAAC,CAeD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAI/E,OAAO,EAAkB,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE7C,OAAO,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AAMjE,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,QAAQ,EACR,mBAAmB,EACnB,QAAQ,GACT,CAAC;AACF,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EACL,KAAK,mBAAmB,EACxB,wBAAwB,GACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAc/E,wBAAsB,aAAa,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,MAAM,EACN,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC;IACV,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,oBAAoB,CAAC;CACnC,CAAC,CAoBD;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACnE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;CACjD,CAAC,CAeD"}

package/dist/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.spawnCmd = exports.runSpecificTestsCmd = exports.Platform = exports.parseTestListOutput = exports.getProjectsFromPlaywrightConfig = void 0;
+exports.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.startCancellationWatcher = exports.spawnCmd = exports.runSpecificTestsCmd = exports.Platform = exports.parseTestListOutput = exports.getProjectsFromPlaywrightConfig = void 0;
 exports.runSingleTest = runSingleTest;
 exports.listProjectsAndTests = listProjectsAndTests;
 const fs_1 = __importDefault(require("fs"));
@@ -37,6 +37,8 @@ Object.defineProperty(exports, "getProjectsFromPlaywrightConfig", { enumerable:
 // The bin entrypoint has support for mobile also
 const supportedPlatform = types_1.Platform.WEB;
 __exportStar(require("./glob-matcher"), exports);
+var cancellation_watcher_1 = require("./lib/cancellation-watcher");
+Object.defineProperty(exports, "startCancellationWatcher", { enumerable: true, get: function () { return cancellation_watcher_1.startCancellationWatcher; } });
 var utils_2 = require("./utils");
 Object.defineProperty(exports, "filterArrayByGlobMatchersSet", { enumerable: true, get: function () { return utils_2.filterArrayByGlobMatchersSet; } });
 Object.defineProperty(exports, "generateProjectFilters", { enumerable: true, get: function () { return utils_2.generateProjectFilters; } });

package/dist/lib/cancellation-watcher.d.ts

@@ -0,0 +1,5 @@
+export type CancellationWatcher = {
+    stop: () => void;
+};
+export declare function startCancellationWatcher(testRunId: string, apiKey: string, onCancel: () => void, pollIntervalMs?: number): CancellationWatcher;
+//# sourceMappingURL=cancellation-watcher.d.ts.map

package/dist/lib/cancellation-watcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cancellation-watcher.d.ts","sourceRoot":"","sources":["../../src/lib/cancellation-watcher.ts"],"names":[],"mappings":"AAqCA,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB,CAAC;AAEF,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,IAAI,EACpB,cAAc,SAA2B,GACxC,mBAAmB,CAgCrB"}

package/dist/lib/cancellation-watcher.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startCancellationWatcher = startCancellationWatcher;
+const DOMAIN = process.env.DASHBOARD_DOMAIN || "https://dash.empirical.run";
+const DEFAULT_POLL_INTERVAL_MS = 5000;
+async function checkTestRunStatus(testRunId, apiKey) {
+    const url = `${DOMAIN}/api/test-runs/${testRunId}/status`;
+    try {
+        const response = await fetch(url, {
+            headers: { Authorization: `Bearer ${apiKey}` },
+        });
+        if (!response.ok) {
+            console.log(`[CancellationWatcher] Failed to check status: HTTP ${response.status} from ${url}`);
+            return { isTerminal: false, status: null };
+        }
+        const result = (await response.json());
+        const status = result.data || { isTerminal: false, status: null };
+        return status;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        console.log(`[CancellationWatcher] Failed to check status: ${message}`);
+        return { isTerminal: false, status: null };
+    }
+}
+function startCancellationWatcher(testRunId, apiKey, onCancel, pollIntervalMs = DEFAULT_POLL_INTERVAL_MS) {
+    let stopped = false;
+    console.log(`[CancellationWatcher] Starting watcher for test run ${testRunId} (polling every ${pollIntervalMs}ms)`);
+    console.log(`[CancellationWatcher] Dashboard domain: ${DOMAIN}`);
+    const poll = async () => {
+        while (!stopped) {
+            const { status } = await checkTestRunStatus(testRunId, apiKey);
+            if (status === "cancelling" || status === "cancelled") {
+                console.log(`[CancellationWatcher] Test run ${testRunId} is ${status}, triggering cancellation`);
+                onCancel();
+                stopped = true;
+                return;
+            }
+            await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+        }
+    };
+    poll();
+    return {
+        stop: () => {
+            console.log(`[CancellationWatcher] Stopping watcher for ${testRunId}`);
+            stopped = true;
+        },
+    };
+}

package/dist/lib/cmd.d.ts

@@ -1,3 +1,4 @@
+import { type ChildProcess } from "child_process";
 import { CommandToRun } from "../types";
 export declare function getCommandFromString(command: string): {
     command: string;
@@ -8,6 +9,7 @@ export declare function runTestsForCmd({ command, args, env }: CommandToRun, cwd
     stderr?: NodeJS.WritableStream;
 }): Promise<{
     hasTestPassed: boolean;
+    wasCancelled: boolean;
 }>;
 export declare function spawnCmd(command: string, args: string[], options: {
     cwd: string;
@@ -16,6 +18,7 @@ export declare function spawnCmd(command: string, args: string[], options: {
     throwOnError: boolean;
     stdout?: NodeJS.WritableStream;
     stderr?: NodeJS.WritableStream;
+    onSpawn?: (proc: ChildProcess) => void;
 }): Promise<{
     code: number;
     output?: string;

package/dist/lib/cmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/lib/cmd.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG;IACrD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAeA;AAED,wBAAsB,cAAc,CAClC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,YAAY,EACpC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC;;GAiBF;AAED,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE;IACP,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC,GACA,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA+C5C"}
+{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/lib/cmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,eAAe,CAAC;AAGzD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAMxC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG;IACrD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAeA;AAED,wBAAsB,cAAc,CAClC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,YAAY,EACpC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC;;;GAqEF;AAED,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE;IACP,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;CACxC,GACA,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiD5C"}

package/dist/lib/cmd.js

@@ -5,6 +5,7 @@ exports.runTestsForCmd = runTestsForCmd;
 exports.spawnCmd = spawnCmd;
 const child_process_1 = require("child_process");
 const logger_1 = require("../logger");
+const cancellation_watcher_1 = require("./cancellation-watcher");
 function getCommandFromString(command) {
     const regex = /[^\s"']+|"([^"]*)"|'([^']*)'/g;
     const matches = command.match(regex) || [];
@@ -21,7 +22,37 @@ function getCommandFromString(command) {
 }
 async function runTestsForCmd({ command, args, env }, cwd, options) {
     logger_1.logger.debug(`Running cmd: ${command} with args: ${args}`);
+    const testRunId = process.env.TEST_RUN_GITHUB_ACTION_ID;
+    const apiKey = process.env.EMPIRICALRUN_API_KEY;
+    console.log(`[CancellationWatcher] Environment: TEST_RUN_GITHUB_ACTION_ID=${testRunId}, EMPIRICALRUN_API_KEY=${apiKey ? "***" : "undefined"}`);
     let hasTestPassed = true;
+    let wasCancelled = false;
+    let cancellationWatcher;
+    let childProcess;
+    const cancelHandler = () => {
+        wasCancelled = true;
+        console.log(`[CancellationWatcher] Cancel handler invoked, killing child process (pid: ${childProcess?.pid})`);
+        if (childProcess && !childProcess.killed) {
+            // Use SIGTERM for more forceful termination that propagates to child processes
+            childProcess.kill("SIGTERM");
+            // Also try to kill the process group to ensure Playwright workers are stopped
+            if (childProcess.pid) {
+                try {
+                    process.kill(-childProcess.pid, "SIGTERM");
+                    console.log(`[CancellationWatcher] Sent SIGTERM to process group ${childProcess.pid}`);
+                }
+                catch {
+                    // Process group kill may fail if not a group leader
+                }
+            }
+        }
+    };
+    if (testRunId && apiKey) {
+        cancellationWatcher = (0, cancellation_watcher_1.startCancellationWatcher)(testRunId, apiKey, cancelHandler);
+    }
+    else {
+        console.log("[CancellationWatcher] Not starting watcher - missing testRunId or apiKey");
+    }
     try {
         await spawnCmd(command, args, {
             cwd,
@@ -30,12 +61,18 @@ async function runTestsForCmd({ command, args, env }, cwd, options) {
             throwOnError: true,
             stdout: options?.stdout,
             stderr: options?.stderr,
+            onSpawn: (proc) => {
+                childProcess = proc;
+            },
         });
     }
     catch {
         hasTestPassed = false;
     }
-    return { hasTestPassed };
+    finally {
+        cancellationWatcher?.stop();
+    }
+    return { hasTestPassed, wasCancelled };
 }
 async function spawnCmd(command, args, options) {
     let output = options.captureOutput ? "" : undefined;
@@ -44,9 +81,10 @@ async function spawnCmd(command, args, options) {
         const p = (0, child_process_1.spawn)(command, args, {
             env: { ...process.env, ...options.envOverrides },
             cwd: options.cwd,
-            // Ensure child process receives signals
-            detached: false,
+            // Create new process group so we can kill all child processes together
+            detached: true,
         });
+        options.onSpawn?.(p);
         // Setup signal handlers and get cleanup function
         const cleanupSignalHandlers = setupProcessSignalHandlers(p);
         p.stdout.on("data", (x) => {

package/dist/lib/merge-reports.d.ts

@@ -12,7 +12,7 @@ interface UploadOptions {
 export declare function runPlaywrightMergeReports(options: MergeReportsOptions): Promise<{
     success: boolean;
 }>;
-export declare function extractUrlMappingsFromBlobs(blobDir: string): Record<string, string>;
+export declare function extractUrlMappingsFromBlobs(blobDir: string): Promise<Record<string, string>>;
 export declare function patchMergedHtmlReport(htmlFilePath: string, urlMappings: Record<string, string>): Promise<void>;
 export declare function patchSummaryJson(jsonFilePath: string, urlMappings: Record<string, string>): Promise<void>;
 export declare function uploadMergedReports(cwd: string, outputDir: string, uploadOptions: UploadOptions): Promise<void>;

package/dist/lib/merge-reports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-reports.d.ts","sourceRoot":"","sources":["../../src/lib/merge-reports.ts"],"names":[],"mappings":"AAYA,UAAU,mBAAmB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA2B/B;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA4BxB;AAED,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC,CAqFf;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,IAAI,CAAC,CAkDf;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAuDhC"}
+{"version":3,"file":"merge-reports.d.ts","sourceRoot":"","sources":["../../src/lib/merge-reports.ts"],"names":[],"mappings":"AAgBA,UAAU,mBAAmB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AA+BD,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA2B/B;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA2BjC;AAED,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC,CA8Ff;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,IAAI,CAAC,CAkDf;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAuDhC"}

package/dist/lib/merge-reports.js

@@ -10,11 +10,28 @@ exports.patchSummaryJson = patchSummaryJson;
 exports.uploadMergedReports = uploadMergedReports;
 exports.mergeReports = mergeReports;
 const r2_uploader_1 = require("@empiricalrun/r2-uploader");
-const adm_zip_1 = __importDefault(require("adm-zip"));
+const zip_1 = require("@empiricalrun/r2-uploader/zip");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const logger_1 = require("../logger");
 const cmd_1 = require("./cmd");
+function buildMappingPatterns(urlMappings) {
+    return Object.entries(urlMappings).map(([resourcePath, url]) => {
+        const resourceFileName = resourcePath.replace(/^resources\//, "");
+        const escaped = resourceFileName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+        const regex = new RegExp(`[^"]*${escaped}`, "g");
+        return { regex, resourceFileName, url };
+    });
+}
+function applyMappingPatterns(content, patterns) {
+    let modified = content;
+    for (const { regex, resourceFileName, url } of patterns) {
+        if (!modified.includes(resourceFileName))
+            continue;
+        modified = modified.replace(regex, url);
+    }
+    return modified;
+}
 async function runPlaywrightMergeReports(options) {
     const { blobDir, outputDir, cwd } = options;
     logger_1.logger.debug(`[Merge Reports] Running playwright merge-reports`);
@@ -38,16 +55,15 @@ async function runPlaywrightMergeReports(options) {
         return { success: false };
     }
 }
-function extractUrlMappingsFromBlobs(blobDir) {
+async function extractUrlMappingsFromBlobs(blobDir) {
     const combinedMap = {};
     const files = fs_1.default.readdirSync(blobDir);
     for (const fileName of files.filter((f) => f.endsWith(".zip"))) {
         const zipPath = path_1.default.join(blobDir, fileName);
         try {
-            const zip = new adm_zip_1.default(zipPath);
-            const urlsEntry = zip.getEntry("_empirical_urls.json");
-            if (urlsEntry) {
-                const content = JSON.parse(urlsEntry.getData().toString("utf8"));
+            const buffer = await (0, zip_1.readZipEntry)(zipPath, "_empirical_urls.json");
+            if (buffer) {
+                const content = JSON.parse(buffer.toString("utf8"));
                 Object.assign(combinedMap, content);
                 logger_1.logger.debug(`[Merge Reports] Extracted ${Object.keys(content).length} URL mappings from ${fileName}`);
             }
@@ -65,8 +81,11 @@ async function patchMergedHtmlReport(htmlFilePath, urlMappings) {
         return;
     }
     let htmlContent;
+    const startTime = Date.now();
+    logger_1.logger.info(`[Merge Reports] Starting HTML patch...`);
     try {
         htmlContent = await fs_1.default.promises.readFile(htmlFilePath, "utf8");
+        logger_1.logger.info(`[Merge Reports] HTML file read: ${(htmlContent.length / 1024 / 1024).toFixed(2)} MB in ${Date.now() - startTime}ms`);
     }
     catch (error) {
         logger_1.logger.error(`[Merge Reports] Failed to read HTML file:`, error);
@@ -83,28 +102,29 @@ async function patchMergedHtmlReport(htmlFilePath, urlMappings) {
     const tempDir = fs_1.default.mkdtempSync(path_1.default.join(htmlDir, "merge-patch-"));
     const zipPath = path_1.default.join(tempDir, "archive.zip");
     try {
+        let stepTime = Date.now();
         await fs_1.default.promises.writeFile(zipPath, Buffer.from(base64, "base64"));
-        const zip = new adm_zip_1.default(zipPath);
-        zip.extractAllTo(tempDir, true);
+        await (0, zip_1.extractZipToDirectory)(zipPath, tempDir);
         await fs_1.default.promises.unlink(zipPath);
+        logger_1.logger.info(`[Merge Reports] Zip extracted in ${Date.now() - stepTime}ms`);
         const jsonFiles = (await fs_1.default.promises.readdir(tempDir)).filter((f) => f.endsWith(".json"));
+        logger_1.logger.info(`[Merge Reports] Patching ${jsonFiles.length} JSON files with ${Object.keys(urlMappings).length} mappings`);
+        const mappingPatterns = buildMappingPatterns(urlMappings);
+        stepTime = Date.now();
         for (const file of jsonFiles) {
             const filePath = path_1.default.join(tempDir, file);
             const content = await fs_1.default.promises.readFile(filePath, "utf8");
-            let modified = content;
-            for (const [resourcePath, url] of Object.entries(urlMappings)) {
-                const resourceFileName = resourcePath.replace(/^resources\//, "");
-                const regex = new RegExp(`[^"]*${resourceFileName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "g");
-                modified = modified.replace(regex, url);
-            }
+            const modified = applyMappingPatterns(content, mappingPatterns);
             if (modified !== content) {
                 await fs_1.default.promises.writeFile(filePath, modified, "utf8");
                 logger_1.logger.debug(`[Merge Reports] Patched ${file}`);
             }
         }
-        const newZip = new adm_zip_1.default();
-        newZip.addLocalFolder(tempDir);
-        const newBase64 = newZip.toBuffer().toString("base64");
+        logger_1.logger.info(`[Merge Reports] JSON patching completed in ${Date.now() - stepTime}ms`);
+        stepTime = Date.now();
+        const newBuffer = await (0, zip_1.createZipFromDirectory)(tempDir);
+        const newBase64 = newBuffer.toString("base64");
+        logger_1.logger.info(`[Merge Reports] New zip created in ${Date.now() - stepTime}ms`);
         let updatedHtml;
         if (oldFormatMatch) {
             updatedHtml = htmlContent.replace(/(window\.playwrightReportBase64\s*=\s*")(?:data:application\/zip;base64,)?[^"]*(")/, `$1data:application/zip;base64,${newBase64}$2`);
@@ -128,13 +148,10 @@ async function patchSummaryJson(jsonFilePath, urlMappings) {
         return;
     }
     try {
-        let content = await fs_1.default.promises.readFile(jsonFilePath, "utf8");
-        for (const [resourcePath, url] of Object.entries(urlMappings)) {
-            const resourceFileName = resourcePath.replace(/^resources\//, "");
-            const regex = new RegExp(`[^"]*${resourceFileName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "g");
-            content = content.replace(regex, url);
-        }
-        await fs_1.default.promises.writeFile(jsonFilePath, content, "utf8");
+        const content = await fs_1.default.promises.readFile(jsonFilePath, "utf8");
+        const mappingPatterns = buildMappingPatterns(urlMappings);
+        const modified = applyMappingPatterns(content, mappingPatterns);
+        await fs_1.default.promises.writeFile(jsonFilePath, modified, "utf8");
         logger_1.logger.info(`[Merge Reports] summary.json patched successfully`);
     }
     catch (error) {
@@ -200,7 +217,7 @@ async function mergeReports(options) {
         logger_1.logger.error(`[Merge Reports] Blob directory does not exist: ${blobDir}`);
         return { success: false };
     }
-    const urlMappings = extractUrlMappingsFromBlobs(blobDir);
+    const urlMappings = await extractUrlMappingsFromBlobs(blobDir);
     const { success } = await runPlaywrightMergeReports({
         blobDir,
         outputDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-run",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -26,18 +26,16 @@
   },
   "author": "Empirical Team <hey@empirical.run>",
   "dependencies": {
-    "adm-zip": "^0.5.16",
     "async-retry": "^1.3.3",
     "commander": "^12.1.0",
     "console-log-level": "^1.4.1",
     "dotenv": "^16.4.5",
     "minimatch": "^10.0.1",
     "ts-morph": "^23.0.0",
-    "@empiricalrun/r2-uploader": "^0.6.0"
+    "@empiricalrun/r2-uploader": "^0.7.0"
   },
   "devDependencies": {
     "@playwright/test": "1.53.2",
-    "@types/adm-zip": "^0.5.7",
     "@types/async-retry": "^1.4.8",
     "@types/console-log-level": "^1.4.5",
     "@types/node": "^22.5.5",

package/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/dashboard.ts","./src/glob-matcher.ts","./src/index.ts","./src/logger.ts","./src/bin/index.ts","./src/bin/merge-reports.ts","./src/lib/cmd.ts","./src/lib/merge-reports.ts","./src/lib/run-all-tests.ts","./src/lib/run-specific-test.ts","./src/lib/memfs/read-hello-world.ts","./src/stdout-parser/index.ts","./src/types/index.ts","./src/utils/config-parser.ts","./src/utils/config.ts","./src/utils/index.ts"],"version":"5.8.3"}
+{"root":["./src/dashboard.ts","./src/glob-matcher.ts","./src/index.ts","./src/logger.ts","./src/bin/index.ts","./src/bin/merge-reports.ts","./src/lib/cancellation-watcher.ts","./src/lib/cmd.ts","./src/lib/merge-reports.ts","./src/lib/run-all-tests.ts","./src/lib/run-specific-test.ts","./src/lib/memfs/read-hello-world.ts","./src/stdout-parser/index.ts","./src/types/index.ts","./src/utils/config-parser.ts","./src/utils/config.ts","./src/utils/index.ts"],"version":"5.8.3"}