@testomatio/reporter 1.6.0-beta-3-artifacts → 1.6.0-beta-5-artifacts

package/lib/bin/cli.js

@@ -172,15 +172,16 @@ program
     const apiKey = config.TESTOMATIO;
 
     process.env.TESTOMATIO_DISABLE_ARTIFACTS = '';
-    process.env.TESTOMATIO_RUN ||= readLatestRunId();
+    const runId = process.env.TESTOMATIO_RUN || process.env.runId || readLatestRunId();
 
-    if (!process.env.TESTOMATIO_RUN) {
+    if (!runId) {
       console.log('TESTOMATIO_RUN environment variable must be set or restored from a previous run.');
       return process.exit(1);
     }
 
     const client = new TestomatClient({
       apiKey,
+      runId,
       isBatchEnabled: false,
     });
 

package/lib/bin/uploadArtifacts.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
-const program = require('commander');
+const { program } = require('commander');
 const chalk = require('chalk');
 const debug = require('debug')('@testomatio/reporter:upload-cli');
 const TestomatClient = require('../client');
 const { APP_PREFIX } = require('../constants');
 const { version } = require('../../package.json');
 const config = require('../config');
+const { readLatestRunId } = require('../utils/utils');
 
 console.log(chalk.cyan.bold(` 🤩 Testomat.io Reporter v${version}`));
 
@@ -21,15 +22,19 @@ program
     }
 
     const apiKey = config.TESTOMATIO;
-
     process.env.TESTOMATIO_DISABLE_ARTIFACTS = '';
-    // process.env.TESTOMATIO_ARTIFACTS_SIZE = null;
+    const runId = process.env.TESTOMATIO_RUN || process.env.runId || readLatestRunId();
+
+    if (!runId) {
+      console.log('TESTOMATIO_RUN environment variable must be set or restored from a previous run.');
+      return process.exit(1);
+    }
 
     const client = new TestomatClient({
       apiKey,
+      runId,
       isBatchEnabled: false,
     });
-
     let testruns = client.uploader.readUploadedFiles(process.env.TESTOMATIO_RUN);
 
     const numTotalArtifacts = testruns.length;

package/lib/client.js

@@ -263,7 +263,11 @@ class Client {
         }
 
         if (this.uploader.failedUploadsCount) {
-          console.log(APP_PREFIX, `${this.uploader.failedUploadsCount} artifacts failed to upload`);
+          console.log(
+            APP_PREFIX,
+            chalk.gray('[CLIENT]'),
+            `${this.uploader.failedUploadsCount} artifacts failed to upload`,
+          );
         }
 
         if (this.uploader.isEnabled && this.uploader.skippedUploadsCount) {
@@ -271,7 +275,7 @@ class Client {
         }
 
         if (this.uploader.skippedUploadsCount || this.uploader.failedUploadsCount) {
-          const command = `TESTOMATIO_RUN=${this.runId} npx upload-artifacts`;
+          const command = `TESTOMATIO_RUN=${this.runId} npx @testomatio/reporter upload-artifacts`;
           console.log(
             APP_PREFIX,
             `Run "${chalk.magenta(command)}" with valid S3 credentials to upload skipped & failed artifacts`,

package/lib/uploader.js

@@ -129,14 +129,19 @@ class S3Uploader {
     }
 
     const stats = fs.statSync(tempFilePath);
+    debug('Artifacts file stats:', +stats.mtime);
+    debug('Current time:', +new Date());
     const diff = +new Date() - +stats.mtime;
+    debug('Diff:', diff);
     const diffHours = diff / 1000 / 60 / 60;
+    debug('Diff hours:', diffHours);
     if (diffHours > 3) {
       console.log(APP_PREFIX, "Artifacts file is too old, can't process artifacts. Please re-run the tests.");
       return [];
     }
 
     const data = fs.readFileSync(tempFilePath, 'utf8');
+    debug('Artifacts file contents:', data);
     const lines = data.split('\n').filter(Boolean);
     return lines.map(line => JSON.parse(line));
   }
@@ -157,6 +162,10 @@ class S3Uploader {
 
     const tempFilePath = this.#getUploadFilePath(runId);
 
+    if (!path.isAbsolute(filePath)) {
+      filePath = path.join(process.cwd(), filePath);
+    }
+
     const data = { rid, file: filePath, uploaded };
     const jsonLine = `${JSON.stringify(data)}\n`;
 
@@ -170,6 +179,8 @@ class S3Uploader {
   async uploadFileByPath(filePath, pathInS3) {
     const [runId, rid] = pathInS3;
 
+    if (!filePath) return;
+
     if (!this.isEnabled) {
       this.storeUploadedFile(filePath, runId, rid, false);
       this.skippedUploadsCount++;
@@ -183,7 +194,6 @@ class S3Uploader {
     const isFileExist = await this.checkFileExists(filePath, 20, 500);
 
     if (!isFileExist) {
-      this.failedUploadsCount++;
       console.error(chalk.yellow(`Artifacts file ${filePath} does not exist. Skipping...`));
       return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "1.6.0-beta-3-artifacts",
+  "version": "1.6.0-beta-5-artifacts",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "typings": "typings/index.d.ts",