@argos-ci/core 1.1.0 → 1.2.1

package/dist/index.d.ts

@@ -38,9 +38,13 @@ declare const upload: (params: UploadParameters) => Promise<{
         url: string;
     };
     screenshots: {
-        metadata: import("@argos-ci/util").ScreenshotMetadata | null;
-        optimizedPath: string;
         hash: string;
+        optimizedPath: string;
+        metadata: import("@argos-ci/util").ScreenshotMetadata | null;
+        pwTrace: {
+            path: string;
+            hash: string;
+        } | null;
         name: string;
         path: string;
     }[];

package/dist/index.mjs

@@ -10,7 +10,7 @@ import tmp from 'tmp';
 import { createHash } from 'node:crypto';
 import axios from 'axios';
 import { readFile } from 'node:fs/promises';
-import { readMetadata } from '@argos-ci/util';
+import { readMetadata, getPlaywrightTracePath } from '@argos-ci/util';
 
 /**
  * Check if the current directory is a git repository.
@@ -528,7 +528,7 @@ const upload$1 = async (input)=>{
         url: input.url,
         data: file,
         headers: {
-            "Content-Type": "image/png"
+            "Content-Type": input.contentType
         }
     });
 };
@@ -558,9 +558,29 @@ const getConfigFromOptions = ({ parallel, ...options })=>{
     });
     return config;
 };
+async function uploadFilesToS3(files) {
+    debug(`Split files in chunks of ${CHUNK_SIZE}`);
+    const chunks = chunk(files, CHUNK_SIZE);
+    debug(`Starting upload of ${chunks.length} chunks`);
+    for(let i = 0; i < chunks.length; i++){
+        // Upload files
+        debug(`Uploading chunk ${i + 1}/${chunks.length}`);
+        const timeLabel = `Chunk ${i + 1}/${chunks.length}`;
+        debugTime(timeLabel);
+        await Promise.all(chunks[i].map(async ({ url, path, contentType })=>{
+            await upload$1({
+                url,
+                path,
+                contentType
+            });
+        }));
+        debugTimeEnd(timeLabel);
+    }
+}
 /**
  * Upload screenshots to argos-ci.com.
  */ const upload = async (params)=>{
+    var _result_pwTraces;
     debug("Starting upload with params", params);
     // Read config
     const config = getConfigFromOptions(params);
@@ -580,61 +600,95 @@ const getConfigFromOptions = ({ parallel, ...options })=>{
     debug("Found screenshots", foundScreenshots);
     // Optimize & compute hashes
     const screenshots = await Promise.all(foundScreenshots.map(async (screenshot)=>{
-        const [metadata, optimizedPath] = await Promise.all([
+        const [metadata, pwTracePath, optimizedPath] = await Promise.all([
             readMetadata(screenshot.path),
+            getPlaywrightTracePath(screenshot.path),
             optimizeScreenshot(screenshot.path)
         ]);
-        const hash = await hashFile(optimizedPath);
+        const [hash, pwTraceHash] = await Promise.all([
+            hashFile(optimizedPath),
+            pwTracePath ? hashFile(pwTracePath) : null
+        ]);
         return {
             ...screenshot,
-            metadata,
+            hash,
             optimizedPath,
-            hash
+            metadata,
+            pwTrace: pwTracePath && pwTraceHash ? {
+                path: pwTracePath,
+                hash: pwTraceHash
+            } : null
         };
     }));
     // Create build
     debug("Creating build");
+    const [pwTraceKeys, screenshotKeys] = screenshots.reduce(([pwTraceKeys, screenshotKeys], screenshot)=>{
+        if (screenshot.pwTrace && !pwTraceKeys.includes(screenshot.pwTrace.hash)) {
+            pwTraceKeys.push(screenshot.pwTrace.hash);
+        }
+        if (!screenshotKeys.includes(screenshot.hash)) {
+            screenshotKeys.push(screenshot.hash);
+        }
+        return [
+            pwTraceKeys,
+            screenshotKeys
+        ];
+    }, [
+        [],
+        []
+    ]);
     const result = await apiClient.createBuild({
         commit: config.commit,
         branch: config.branch,
         name: config.buildName,
         parallel: config.parallel,
         parallelNonce: config.parallelNonce,
-        screenshotKeys: Array.from(new Set(screenshots.map((screenshot)=>screenshot.hash))),
+        screenshotKeys,
+        pwTraceKeys,
         prNumber: config.prNumber,
         prHeadCommit: config.prHeadCommit,
         referenceBranch: config.referenceBranch,
         referenceCommit: config.referenceCommit
     });
-    debug("Got screenshots", result);
-    debug(`Split screenshots in chunks of ${CHUNK_SIZE}`);
-    const chunks = chunk(result.screenshots, CHUNK_SIZE);
-    debug(`Starting upload of ${chunks.length} chunks`);
-    for(let i = 0; i < chunks.length; i++){
-        debug(`Uploading chunk ${i + 1}/${chunks.length}`);
-        const timeLabel = `Chunk ${i + 1}/${chunks.length}`;
-        debugTime(timeLabel);
-        await Promise.all(chunks[i].map(async ({ key, putUrl })=>{
+    debug("Got uploads url", result);
+    const uploadFiles = [
+        ...result.screenshots.map(({ key, putUrl })=>{
             const screenshot = screenshots.find((s)=>s.hash === key);
             if (!screenshot) {
                 throw new Error(`Invariant: screenshot with hash ${key} not found`);
             }
-            await upload$1({
+            return {
                 url: putUrl,
-                path: screenshot.optimizedPath
-            });
-        }));
-        debugTimeEnd(timeLabel);
-    }
+                path: screenshot.optimizedPath,
+                contentType: "image/png"
+            };
+        }),
+        ...((_result_pwTraces = result.pwTraces) === null || _result_pwTraces === void 0 ? void 0 : _result_pwTraces.map(({ key, putUrl })=>{
+            const screenshot = screenshots.find((s)=>s.pwTrace && s.pwTrace.hash === key);
+            if (!screenshot || !screenshot.pwTrace) {
+                throw new Error(`Invariant: trace with ${key} not found`);
+            }
+            return {
+                url: putUrl,
+                path: screenshot.pwTrace.path,
+                contentType: "application/json"
+            };
+        })) ?? []
+    ];
+    await uploadFilesToS3(uploadFiles);
     // Update build
     debug("Updating build");
     await apiClient.updateBuild({
         buildId: result.build.id,
-        screenshots: screenshots.map((screenshot)=>({
+        screenshots: screenshots.map((screenshot)=>{
+            var _screenshot_pwTrace;
+            return {
                 key: screenshot.hash,
                 name: screenshot.name,
-                metadata: screenshot.metadata
-            })),
+                metadata: screenshot.metadata,
+                pwTraceKey: ((_screenshot_pwTrace = screenshot.pwTrace) === null || _screenshot_pwTrace === void 0 ? void 0 : _screenshot_pwTrace.hash) ?? null
+            };
+        }),
         parallel: config.parallel,
         parallelTotal: config.parallelTotal
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/core",
   "description": "Visual testing solution to avoid visual regression. The core component of Argos SDK that handles build creation.",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "type": "module",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
@@ -40,7 +40,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@argos-ci/util": "1.0.0",
+    "@argos-ci/util": "1.1.0",
     "axios": "^1.5.0",
     "convict": "^6.2.4",
     "debug": "^4.3.4",
@@ -59,5 +59,5 @@
     "build": "rollup -c",
     "e2e": "node ./e2e/upload.cjs && node ./e2e/upload.mjs"
   },
-  "gitHead": "08246344886ff258fab097c370b4ff29cb1121b0"
+  "gitHead": "366dc3bdb4a0a8ed87fc7a2cbf28db1f218567ad"
 }