@sentinelqa/uploader 0.1.1 → 0.1.3

package/dist/cli.js

@@ -190,6 +190,26 @@ const extractTestsFromReport = (reportJson) => {
 const computeRunStatus = (tests) => {
     return tests.some((t) => t.status === "failed") ? "failed" : "passed";
 };
+const bestEffortComplete = async (appUrl, ingestToken, runId, status, tests) => {
+    try {
+        await fetch(`${appUrl}/api/runs/${runId}/complete`, {
+            method: "POST",
+            headers: {
+                "content-type": "application/json",
+                authorization: `Bearer ${ingestToken}`
+            },
+            body: JSON.stringify({
+                status,
+                finishedAt: new Date().toISOString(),
+                tests,
+                artifacts: []
+            })
+        });
+    }
+    catch {
+        // Ignore best-effort failures; original error will be surfaced.
+    }
+};
 const detectGitLabEnv = () => {
     const isGitLab = readEnv("GITLAB_CI") === "true" || !!readEnv("CI_PROJECT_ID");
     if (!isGitLab)
@@ -198,10 +218,21 @@ const detectGitLabEnv = () => {
         provider: "gitlab",
         commit: {
             sha: readEnv("CI_COMMIT_SHA"),
-            branch: readEnv("CI_COMMIT_BRANCH") || readEnv("CI_COMMIT_REF_NAME")
+            branch: readEnv("CI_COMMIT_BRANCH") || readEnv("CI_COMMIT_REF_NAME"),
+            message: readEnv("CI_COMMIT_MESSAGE"),
+            author: readEnv("GITLAB_USER_NAME") || readEnv("GITLAB_USER_LOGIN")
+        },
+        workflow: {
+            id: readEnv("CI_PIPELINE_ID"),
+            name: readEnv("CI_PIPELINE_SOURCE")
+        },
+        job: {
+            id: readEnv("CI_JOB_ID"),
+            name: readEnv("CI_JOB_NAME")
         },
         ci: {
-            url: readEnv("CI_JOB_URL") || readEnv("CI_PIPELINE_URL")
+            url: readEnv("CI_JOB_URL") || readEnv("CI_PIPELINE_URL"),
+            pipelineUrl: readEnv("CI_PIPELINE_URL")
         }
     };
 };
@@ -218,8 +249,21 @@ const detectGitHubEnv = () => {
     const url = serverUrl && repo && runId ? `${serverUrl}/${repo}/actions/runs/${runId}` : null;
     return {
         provider: "github",
-        commit: { sha, branch },
-        ci: { url }
+        commit: {
+            sha,
+            branch,
+            message: readEnv("GITHUB_COMMIT_MESSAGE") || null,
+            author: readEnv("GITHUB_ACTOR")
+        },
+        workflow: {
+            id: runId,
+            name: readEnv("GITHUB_WORKFLOW")
+        },
+        job: {
+            id: readEnv("GITHUB_RUN_ATTEMPT"),
+            name: readEnv("GITHUB_JOB")
+        },
+        ci: { url, pipelineUrl: url }
     };
 };
 const getArtifacts = (rootDir, typeOverride, runId, s3Prefix) => {
@@ -328,6 +372,8 @@ const main = async () => {
         fail("Commit branch is required.");
     if (!ci.ci.url)
         fail("CI run URL is required.");
+    if (!ci.workflow.id)
+        fail("Workflow ID is required.");
     const appUrl = readEnv("SENTINEL_URL") || readEnv("APP_URL") || DEFAULT_APP_URL;
     const createRes = await withRetry(() => fetch(`${appUrl}/api/runs`, {
         method: "POST",
@@ -338,6 +384,8 @@ const main = async () => {
         body: JSON.stringify({
             provider: ci.provider,
             commit: ci.commit,
+            workflow: ci.workflow,
+            job: ci.job,
             ci: ci.ci
         })
     }), "POST /api/runs");
@@ -374,77 +422,86 @@ const main = async () => {
         return { ...artifact, sizeBytes: stat.size, contentType };
     });
     let finalArtifacts = artifactsWithMeta;
-    if (byoBucket) {
-        const s3Region = readEnv("SENTINEL_S3_REGION") || readEnv("AWS_REGION") || readEnv("S3_REGION");
-        if (!s3Region)
-            fail("SENTINEL_S3_REGION is required for BYO S3.");
-        const s3Endpoint = readEnv("SENTINEL_S3_ENDPOINT") || readEnv("S3_ENDPOINT");
-        const accessKeyId = readEnv("SENTINEL_S3_ACCESS_KEY_ID") || readEnv("AWS_ACCESS_KEY_ID");
-        const secretAccessKey = readEnv("SENTINEL_S3_SECRET_ACCESS_KEY") || readEnv("AWS_SECRET_ACCESS_KEY");
-        if (!accessKeyId || !secretAccessKey) {
-            fail("SENTINEL_S3_ACCESS_KEY_ID and SENTINEL_S3_SECRET_ACCESS_KEY are required.");
-        }
-        const s3Client = new client_s3_1.S3Client({
-            region: s3Region,
-            ...(s3Endpoint ? { endpoint: s3Endpoint } : {}),
-            credentials: { accessKeyId, secretAccessKey }
-        });
-        await withRetry(async () => {
-            await uploadArtifacts(s3Client, byoBucket, finalArtifacts);
-        }, "upload artifacts");
-        finalArtifacts = finalArtifacts.map((artifact) => ({
-            ...artifact,
-            bucket: byoBucket
-        }));
-    }
-    else {
-        const presignRes = await withRetry(() => fetch(`${appUrl}/api/uploads/presign`, {
-            method: "POST",
-            headers: {
-                "content-type": "application/json",
-                authorization: `Bearer ${ingestToken}`
-            },
-            body: JSON.stringify({
-                items: finalArtifacts.map((artifact) => ({
-                    relPath: artifact.objectKey,
-                    contentType: artifact.contentType,
-                    sizeBytes: artifact.sizeBytes,
-                    kind: artifact.type
-                }))
-            })
-        }), "POST /api/uploads/presign");
-        if (!presignRes.ok) {
-            const body = await presignRes.text();
-            fail(`POST /api/uploads/presign failed (${presignRes.status}): ${body}`);
+    try {
+        if (byoBucket) {
+            const s3Region = readEnv("SENTINEL_S3_REGION") ||
+                readEnv("AWS_REGION") ||
+                readEnv("S3_REGION");
+            if (!s3Region)
+                fail("SENTINEL_S3_REGION is required for BYO S3.");
+            const s3Endpoint = readEnv("SENTINEL_S3_ENDPOINT") || readEnv("S3_ENDPOINT");
+            const accessKeyId = readEnv("SENTINEL_S3_ACCESS_KEY_ID") || readEnv("AWS_ACCESS_KEY_ID");
+            const secretAccessKey = readEnv("SENTINEL_S3_SECRET_ACCESS_KEY") ||
+                readEnv("AWS_SECRET_ACCESS_KEY");
+            if (!accessKeyId || !secretAccessKey) {
+                fail("SENTINEL_S3_ACCESS_KEY_ID and SENTINEL_S3_SECRET_ACCESS_KEY are required.");
+            }
+            const s3Client = new client_s3_1.S3Client({
+                region: s3Region,
+                ...(s3Endpoint ? { endpoint: s3Endpoint } : {}),
+                credentials: { accessKeyId, secretAccessKey }
+            });
+            await withRetry(async () => {
+                await uploadArtifacts(s3Client, byoBucket, finalArtifacts);
+            }, "upload artifacts");
+            finalArtifacts = finalArtifacts.map((artifact) => ({
+                ...artifact,
+                bucket: byoBucket
+            }));
         }
-        const presignData = await presignRes.json();
-        const uploadMap = new Map((presignData.items || []).map((item) => [item.relPath, item]));
-        await withRetry(async () => {
-            for (const artifact of finalArtifacts) {
-                const item = uploadMap.get(artifact.objectKey);
-                if (!item?.uploadUrl || !item?.objectKey) {
-                    throw new Error(`Missing upload URL for ${artifact.objectKey}`);
-                }
-                await withRetry(async () => {
-                    const body = fs_1.default.createReadStream(artifact.filePath);
-                    const res = await fetch(item.uploadUrl, {
-                        method: "PUT",
-                        headers: {
-                            "content-type": artifact.contentType
-                        },
-                        body
-                    });
-                    if (!res.ok) {
-                        throw new Error(`Upload failed (${res.status}) for ${artifact.objectKey}`);
-                    }
-                }, `upload ${artifact.objectKey}`);
-                artifact.objectKey = item.objectKey;
+        else {
+            const presignRes = await withRetry(() => fetch(`${appUrl}/api/uploads/presign`, {
+                method: "POST",
+                headers: {
+                    "content-type": "application/json",
+                    authorization: `Bearer ${ingestToken}`
+                },
+                body: JSON.stringify({
+                    items: finalArtifacts.map((artifact) => ({
+                        relPath: artifact.objectKey,
+                        contentType: artifact.contentType,
+                        sizeBytes: artifact.sizeBytes,
+                        kind: artifact.type
+                    }))
+                })
+            }), "POST /api/uploads/presign");
+            if (!presignRes.ok) {
+                const body = await presignRes.text();
+                fail(`POST /api/uploads/presign failed (${presignRes.status}): ${body}`);
             }
-        }, "upload artifacts");
-        finalArtifacts = finalArtifacts.map((artifact) => ({
-            ...artifact,
-            bucket: presignData.bucket
-        }));
+            const presignData = await presignRes.json();
+            const uploadMap = new Map((presignData.items || []).map((item) => [item.relPath, item]));
+            await withRetry(async () => {
+                for (const artifact of finalArtifacts) {
+                    const item = uploadMap.get(artifact.objectKey);
+                    if (!item?.uploadUrl || !item?.objectKey) {
+                        throw new Error(`Missing upload URL for ${artifact.objectKey}`);
+                    }
+                    await withRetry(async () => {
+                        const body = fs_1.default.createReadStream(artifact.filePath);
+                        const res = await fetch(item.uploadUrl, {
+                            method: "PUT",
+                            headers: {
+                                "content-type": artifact.contentType
+                            },
+                            body
+                        });
+                        if (!res.ok) {
+                            throw new Error(`Upload failed (${res.status}) for ${artifact.objectKey}`);
+                        }
+                    }, `upload ${artifact.objectKey}`);
+                    artifact.objectKey = item.objectKey;
+                }
+            }, "upload artifacts");
+            finalArtifacts = finalArtifacts.map((artifact) => ({
+                ...artifact,
+                bucket: presignData.bucket
+            }));
+        }
+    }
+    catch (err) {
+        await bestEffortComplete(appUrl, ingestToken, runId, "failed", tests);
+        fail(err?.message || String(err));
     }
     const uploadDurationMs = Date.now() - uploadStart;
     const completeRes = await withRetry(() => fetch(`${appUrl}/api/runs/${runId}/complete`, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentinelqa/uploader",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "private": false,
   "description": "Sentinel uploader CLI for CI/CD debugging artifacts",
   "license": "MIT",