@argos-ci/core 6.0.2 → 6.1.0

package/dist/index.d.mts

@@ -236,6 +236,7 @@ declare function finalize(params: FinalizeParameters): Promise<{
       gitlab: {
         state: "pending" | "running" | "success" | "failed" | "canceled";
       };
+      url: string;
     } | null;
   }[];
 }>;

package/dist/index.mjs

@@ -1002,6 +1002,18 @@ async function uploadFile(input) {
 	});
 	if (!response.ok) throw new Error(`Failed to upload file to ${input.url}: ${response.status} ${response.statusText}`);
 }
+async function uploadFileWithPresignedPost(input) {
+	const file = await readFile(input.path);
+	const formData = new FormData();
+	for (const [key, value] of Object.entries(input.fields)) formData.append(key, value);
+	formData.append("file", new Blob([new Uint8Array(file)], { type: input.contentType }), basename(input.path));
+	const response = await fetch(input.url, {
+		method: "POST",
+		signal: AbortSignal.timeout(3e4),
+		body: formData
+	});
+	if (!response.ok) throw new Error(`Failed to upload file to ${input.url}: ${response.status} ${response.statusText}`);
+}
 //#endregion
 //#region src/util/chunk.ts
 /**
@@ -1348,7 +1360,7 @@ async function skip(params) {
 		runId: config.runId,
 		runAttempt: config.runAttempt,
 		skipped: true,
-		screenshotKeys: [],
+		screenshots: [],
 		pwTraceKeys: [],
 		parentCommits: []
 	} });
@@ -1361,6 +1373,7 @@ async function skip(params) {
 * Size of the chunks used to upload screenshots to Argos.
 */
 const CHUNK_SIZE = 10;
+const PLAYWRIGHT_TRACE_CONTENT_TYPE = "application/zip";
 /**
 * Upload screenshots to Argos.
 */
@@ -1447,11 +1460,15 @@ async function upload(params) {
 		return null;
 	})();
 	debug("Creating build");
-	const [pwTraceKeys, snapshotKeys] = snapshots.reduce(([pwTraceKeys, snapshotKeys], snapshot) => {
+	const pwTraceKeys = [];
+	const screenshots = [];
+	for (const snapshot of snapshots) {
 		if (snapshot.pwTrace && !pwTraceKeys.includes(snapshot.pwTrace.hash)) pwTraceKeys.push(snapshot.pwTrace.hash);
-		if (!snapshotKeys.includes(snapshot.hash)) snapshotKeys.push(snapshot.hash);
-		return [pwTraceKeys, snapshotKeys];
-	}, [[], []]);
+		if (!screenshots.some((item) => item.key === snapshot.hash)) screenshots.push({
+			key: snapshot.hash,
+			contentType: snapshot.contentType
+		});
+	}
 	const createBuildResponse = await apiClient.POST("/builds", { body: {
 		commit: config.commit,
 		branch: config.branch,
@@ -1459,7 +1476,7 @@ async function upload(params) {
 		mode: config.mode,
 		parallel: config.parallel,
 		parallelNonce: config.parallelNonce,
-		screenshotKeys: snapshotKeys,
+		screenshots,
 		pwTraceKeys,
 		prNumber: config.prNumber,
 		prHeadCommit: config.prHeadCommit,
@@ -1477,22 +1494,20 @@ async function upload(params) {
 	if (createBuildResponse.error) throwAPIError(createBuildResponse.error);
 	const result = createBuildResponse.data;
 	debug("Got uploads url", result);
-	await uploadFilesToS3([...result.screenshots.map(({ key, putUrl }) => {
-		const snapshot = snapshots.find((s) => s.hash === key);
-		if (!snapshot) throw new Error(`Invariant: snapshot with hash ${key} not found`);
-		return {
-			url: putUrl,
+	await uploadFilesToS3([...result.screenshots.map((upload) => {
+		const snapshot = snapshots.find((s) => s.hash === upload.key);
+		if (!snapshot) throw new Error(`Invariant: snapshot with hash ${upload.key} not found`);
+		return createSecureUploadFileInput(upload, {
 			path: snapshot.optimizedPath,
 			contentType: snapshot.contentType
-		};
-	}), ...result.pwTraces?.map(({ key, putUrl }) => {
-		const snapshot = snapshots.find((s) => s.pwTrace && s.pwTrace.hash === key);
-		if (!snapshot || !snapshot.pwTrace) throw new Error(`Invariant: trace with ${key} not found`);
-		return {
-			url: putUrl,
+		});
+	}), ...result.pwTraces?.map((upload) => {
+		const snapshot = snapshots.find((s) => s.pwTrace && s.pwTrace.hash === upload.key);
+		if (!snapshot || !snapshot.pwTrace) throw new Error(`Invariant: trace with ${upload.key} not found`);
+		return createSecureUploadFileInput(upload, {
 			path: snapshot.pwTrace.path,
-			contentType: "application/json"
-		};
+			contentType: PLAYWRIGHT_TRACE_CONTENT_TYPE
+		});
 	}) ?? []]);
 	debug("Updating build");
 	const uploadBuildResponse = await apiClient.PUT("/builds/{buildId}", {
@@ -1530,16 +1545,18 @@ async function uploadFilesToS3(files) {
 		debugTime(timeLabel);
 		const chunk = chunks[i];
 		if (!chunk) throw new Error(`Invariant: chunk ${i} is empty`);
-		await Promise.all(chunk.map(async ({ url, path, contentType }) => {
-			await uploadFile({
-				url,
-				path,
-				contentType
-			});
-		}));
+		await Promise.all(chunk.map((file) => uploadFileWithPresignedPost(file)));
 		debugTimeEnd(timeLabel);
 	}
 }
+function createSecureUploadFileInput(upload, file) {
+	if (!("postUrl" in upload)) throw new Error(`Invariant: expected secure upload for ${upload.key}`);
+	return {
+		url: upload.postUrl,
+		fields: upload.fields,
+		...file
+	};
+}
 /**
 * Format the preview URL.
 */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/core",
   "description": "Node.js SDK for visual testing with Argos.",
-  "version": "6.0.2",
+  "version": "6.1.0",
   "type": "module",
   "exports": {
     ".": {
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@argos-ci/api-client": "0.20.1",
+    "@argos-ci/api-client": "0.22.0",
     "@argos-ci/util": "4.0.0",
     "convict": "^6.2.5",
     "debug": "^4.4.3",
@@ -67,5 +67,5 @@
     "lint": "eslint .",
     "test": "vitest"
   },
-  "gitHead": "9c0f1aa0c2ca4bd1255f95f2dc1a9ad7c4cf36e9"
+  "gitHead": "4d890d5091bd313c327eb4e8c17dc1bee9d48578"
 }