@dev-blinq/cucumber-js 1.0.58 → 1.0.59-stage

package/lib/formatter/helpers/upload_serivce.js

@@ -2,41 +2,62 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RunUploadService = void 0;
-const axios_1 = __importDefault(require("axios"));
 const fs_1 = require("fs");
 const promises_1 = __importDefault(require("fs/promises"));
+const axios_client_1 = require("../../configuration/axios_client");
+const path_1 = __importDefault(require("path"));
+const bvt_analysis_formatter_1 = require("../bvt_analysis_formatter");
+const constants_1 = require("./constants");
+const REPORT_SERVICE_URL = (_a = process.env.REPORT_SERVICE_URL) !== null && _a !== void 0 ? _a : URL;
+const BATCH_SIZE = 10;
+const MAX_RETRIES = 3;
+const REPORT_SERVICE_TOKEN = (_b = process.env.TOKEN) !== null && _b !== void 0 ? _b : process.env.REPORT_SERVICE_TOKEN;
 class RunUploadService {
     constructor(runsApiBaseURL, accessToken) {
         this.runsApiBaseURL = runsApiBaseURL;
         this.accessToken = accessToken;
     }
     async createRunDocument(name) {
-        const runDocResult = await axios_1.default.post(this.runsApiBaseURL + '/cucumber-runs/create', {
-            name: name ? name : 'TEST',
-        }, {
-            headers: {
-                Authorization: 'Bearer ' + this.accessToken,
-                'x-source': 'cucumber_js',
-            },
-        });
-        if (runDocResult.status !== 200) {
-            throw new Error('Failed to create run document in the server');
+        try {
+            const runDocResult = await axios_client_1.axiosClient.post(this.runsApiBaseURL + '/cucumber-runs/create', {
+                name: name ? name : 'TEST',
+            }, {
+                headers: {
+                    Authorization: 'Bearer ' + this.accessToken,
+                    'x-source': 'cucumber_js',
+                },
+            });
+            if (runDocResult.status !== 200) {
+                throw new Error('Failed to create run document in the server');
+            }
+            if (runDocResult.data.status !== true) {
+                throw new Error('Failed to create run document in the server');
+            }
+            return runDocResult.data.run;
         }
-        if (runDocResult.data.status !== true) {
-            throw new Error('Failed to create run document in the server');
+        catch (error) {
+            if (error.response && error.response.status === 403) {
+                console.log('Warning: Your trial plan has ended. Cannot create or upload reports.');
+                process.exit(1);
+            }
+            throw new Error('Failed to create run document in the server: ' + error);
         }
-        return runDocResult.data.run;
     }
     async upload(formData) {
-        const response = await axios_1.default.post(this.runsApiBaseURL + '/cucumber-runs/upload', formData, {
+        const response = await axios_client_1.axiosClient.post(this.runsApiBaseURL + '/cucumber-runs/upload', formData, {
             headers: {
                 ...formData.getHeaders(),
                 Authorization: 'Bearer ' + this.accessToken,
                 'x-source': 'cucumber_js',
             },
         });
+        if (response.status === 401) {
+            console.log('Warning: Your trial plan has ended. Cannot upload reports and perform retraining');
+            throw new Error('Warning: Your trial plan has ended. Cannot upload reports and perform retraining');
+        }
         if (response.status !== 200) {
             throw new Error('Failed to upload run to the server');
         }
@@ -45,7 +66,7 @@ class RunUploadService {
         }
     }
     async getPreSignedUrls(fileUris, runId) {
-        const response = await axios_1.default.post(this.runsApiBaseURL + '/cucumber-runs/generateuploadurls', {
+        const response = await axios_client_1.axiosClient.post(this.runsApiBaseURL + '/cucumber-runs/generateuploadurls', {
             fileUris,
             runId,
         }, {
@@ -54,6 +75,10 @@ class RunUploadService {
                 'x-source': 'cucumber_js',
             },
         });
+        if (response.status === 403) {
+            console.log('Warning: Your trial plan has ended. Cannot upload reports and perform retraining');
+            throw new Error('Warning: Your trial plan has ended. Cannot upload reports and perform retraining');
+        }
         if (response.status !== 200) {
             throw new Error('Failed to get pre-signed urls for the files');
         }
@@ -62,30 +87,97 @@ class RunUploadService {
         }
         return response.data.uploadUrls;
     }
+    async uploadTestCase(testCaseReport, runId, projectId, reportFolder) {
+        const fileUris = [];
+        //iterate over all the files in the JsonCommand.screenshotId and insert them into the fileUris array
+        for (const step of testCaseReport.steps) {
+            for (const command of step.commands) {
+                if (command.screenshotId) {
+                    fileUris.push('screenshots' + '/' + String(command.screenshotId) + '.png');
+                }
+            }
+        }
+        const preSignedUrls = await this.getPreSignedUrls(fileUris, runId);
+        //upload all the files in the fileUris array
+        try {
+            for (let i = 0; i < fileUris.length; i += BATCH_SIZE) {
+                const batch = fileUris.slice(i, Math.min(i + BATCH_SIZE, fileUris.length));
+                await Promise.all(batch
+                    .filter((fileUri) => preSignedUrls[fileUri])
+                    .map(async (fileUri) => {
+                    for (let j = 0; j < MAX_RETRIES; j++) {
+                        if ((0, fs_1.existsSync)(path_1.default.join(reportFolder, fileUri))) {
+                            const success = await this.uploadFile(path_1.default.join(reportFolder, fileUri), preSignedUrls[fileUri]);
+                            if (success) {
+                                return;
+                            }
+                        }
+                    }
+                    console.error('Failed to upload file:', fileUri);
+                }));
+            }
+            await axios_client_1.axiosClient.post(this.runsApiBaseURL + '/cucumber-runs/createNewTestCase', {
+                runId,
+                projectId,
+                testProgressReport: testCaseReport,
+                mode: process.env.MODE === 'cloud' ? 'cloud' : 'local',
+                browser: process.env.BROWSER ? process.env.BROWSER : 'chromium',
+            }, {
+                headers: {
+                    Authorization: 'Bearer ' + this.accessToken,
+                    'x-source': 'cucumber_js',
+                },
+            });
+            try {
+                await axios_client_1.axiosClient.post(`${constants_1.SERVICES_URI.STORAGE}/event`, {
+                    event: constants_1.ActionEvents.upload_report,
+                }, {
+                    headers: {
+                        Authorization: 'Bearer ' + this.accessToken,
+                        'x-source': 'cucumber_js',
+                        'x-bvt-project-id': projectId,
+                    },
+                });
+            }
+            catch (error) {
+                // no event tracking
+            }
+            (0, bvt_analysis_formatter_1.logReportLink)(runId, projectId);
+        }
+        catch (e) {
+            console.error(`failed to upload the test case: ${testCaseReport.id} ${e}`);
+        }
+    }
     async uploadFile(filePath, preSignedUrl) {
         const fileStream = (0, fs_1.createReadStream)(filePath);
+        let success = true;
         try {
             const fileStats = await promises_1.default.stat(filePath);
             const fileSize = fileStats.size;
-            await axios_1.default.put(preSignedUrl, fileStream, {
+            await axios_client_1.axiosClient.put(preSignedUrl, fileStream, {
                 headers: {
                     'Content-Type': 'application/octet-stream',
                     'Content-Length': fileSize,
                 },
             });
-            console.log('Uploaded successfully:\n', filePath);
         }
         catch (error) {
-            console.error('Error uploading file:', error);
+            if (process.env.NODE_ENV_BLINQ === 'dev') {
+                console.error('Error uploading file:', error);
+            }
+            success = false;
         }
         finally {
             fileStream.close();
         }
+        return success;
     }
-    async uploadComplete(runId, report) {
-        const response = await axios_1.default.post(this.runsApiBaseURL + '/cucumber-runs/uploadcomplete', {
+    async uploadComplete(runId, projectId) {
+        const response = await axios_client_1.axiosClient.post(this.runsApiBaseURL + '/cucumber-runs/uploadCompletion', {
             runId,
-            report,
+            projectId,
+            mode: process.env.MODE === 'cloud' ? 'cloud' : 'local',
+            browser: process.env.BROWSER ? process.env.BROWSER : 'chromium',
         }, {
             headers: {
                 Authorization: 'Bearer ' + this.accessToken,
@@ -98,6 +190,44 @@ class RunUploadService {
         if (response.data.status !== true) {
             throw new Error('Failed to mark run as complete');
         }
+        try {
+            await axios_client_1.axiosClient.post(`${constants_1.SERVICES_URI.STORAGE}/event`, {
+                event: constants_1.ActionEvents.upload_report,
+            }, {
+                headers: {
+                    Authorization: 'Bearer ' + this.accessToken,
+                    'x-source': 'cucumber_js',
+                    'x-bvt-project-id': projectId,
+                },
+            });
+        }
+        catch (error) {
+            // no event tracking
+        }
+    }
+    async modifyTestCase(runId, projectId, testProgressReport) {
+        try {
+            const res = await axios_client_1.axiosClient.post(this.runsApiBaseURL + '/cucumber-runs/modifyTestCase', {
+                runId,
+                projectId,
+                testProgressReport,
+            }, {
+                headers: {
+                    Authorization: 'Bearer ' + this.accessToken,
+                    'x-source': 'cucumber_js',
+                },
+            });
+            if (res.status !== 200) {
+                throw new Error('');
+            }
+            if (res.data.status !== true) {
+                throw new Error('');
+            }
+            (0, bvt_analysis_formatter_1.logReportLink)(runId, projectId);
+        }
+        catch (e) {
+            console.error(`failed to modify the test case: ${testProgressReport.id} ${e}`);
+        }
     }
 }
 exports.RunUploadService = RunUploadService;

package/lib/formatter/helpers/upload_serivce.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload_serivce.js","sourceRoot":"","sources":["../../../src/formatter/helpers/upload_serivce.ts"],"names":[],"mappings":"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","sourcesContent":["import axios from 'axios'\nimport FormData from 'form-data'\nimport { createReadStream } from 'fs'\nimport fs from 'fs/promises'\nimport { JsonReport } from './report_generator'\nclass RunUploadService {\n  constructor(private runsApiBaseURL: string, private accessToken: string) {}\n  async createRunDocument(name: string) {\n    const runDocResult = await axios.post(\n      this.runsApiBaseURL + '/cucumber-runs/create',\n      {\n        name: name ? name : 'TEST',\n      },\n      {\n        headers: {\n          Authorization: 'Bearer ' + this.accessToken,\n          'x-source': 'cucumber_js',\n        },\n      }\n    )\n    if (runDocResult.status !== 200) {\n      throw new Error('Failed to create run document in the server')\n    }\n    if (runDocResult.data.status !== true) {\n      throw new Error('Failed to create run document in the server')\n    }\n    return runDocResult.data.run\n  }\n  async upload(formData: FormData) {\n    const response = await axios.post(\n      this.runsApiBaseURL + '/cucumber-runs/upload',\n      formData,\n      {\n        headers: {\n          ...formData.getHeaders(),\n          Authorization: 'Bearer ' + this.accessToken,\n          'x-source': 'cucumber_js',\n        },\n      }\n    )\n    if (response.status !== 200) {\n      throw new Error('Failed to upload run to the server')\n    }\n    if (response.data.status !== true) {\n      throw new Error('Failed to upload run to the server')\n    }\n  }\n  async getPreSignedUrls(fileUris: string[], runId: string) {\n    const response = await axios.post(\n      this.runsApiBaseURL + '/cucumber-runs/generateuploadurls',\n      {\n        fileUris,\n        runId,\n      },\n      {\n        headers: {\n          Authorization: 'Bearer ' + this.accessToken,\n          'x-source': 'cucumber_js',\n        },\n      }\n    )\n    if (response.status !== 200) {\n      throw new Error('Failed to get pre-signed urls for the files')\n    }\n    if (response.data.status !== true) {\n      throw new Error('Failed to get pre-signed urls for the files')\n    }\n\n    return response.data.uploadUrls\n  }\n\n  async uploadFile(filePath: string, preSignedUrl: string) {\n    const fileStream = createReadStream(filePath)\n\n    try {\n      const fileStats = await fs.stat(filePath)\n      const fileSize = fileStats.size\n\n      await axios.put(preSignedUrl, fileStream, {\n        headers: {\n          'Content-Type': 'application/octet-stream',\n          'Content-Length': fileSize,\n        },\n      })\n      console.log('Uploaded successfully:\\n', filePath)\n    } catch (error) {\n      console.error('Error uploading file:', error)\n    } finally {\n      fileStream.close()\n    }\n  }\n  async uploadComplete(runId: string, report: JsonReport) {\n    const response = await axios.post(\n      this.runsApiBaseURL + '/cucumber-runs/uploadcomplete',\n      {\n        runId,\n        report,\n      },\n      {\n        headers: {\n          Authorization: 'Bearer ' + this.accessToken,\n          'x-source': 'cucumber_js',\n        },\n      }\n    )\n    if (response.status !== 200) {\n      throw new Error('Failed to mark run as complete')\n    }\n    if (response.data.status !== true) {\n      throw new Error('Failed to mark run as complete')\n    }\n  }\n}\n\nexport { RunUploadService }\n"]}
+{"version":3,"file":"upload_serivce.js","sourceRoot":"","sources":["../../../src/formatter/helpers/upload_serivce.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable no-console */\nimport FormData from 'form-data'\nimport { createReadStream, existsSync } from 'fs'\nimport fs from 'fs/promises'\n\nimport { JsonReport, JsonTestProgress } from './report_generator'\nimport { axiosClient } from '../../configuration/axios_client'\nimport path from 'path'\nimport { logReportLink } from '../bvt_analysis_formatter'\nimport { ActionEvents, SERVICES_URI } from './constants'\n\nconst REPORT_SERVICE_URL = process.env.REPORT_SERVICE_URL ?? URL\nconst BATCH_SIZE = 10\nconst MAX_RETRIES = 3\nconst REPORT_SERVICE_TOKEN =\n  process.env.TOKEN ?? process.env.REPORT_SERVICE_TOKEN\nclass RunUploadService {\n  constructor(private runsApiBaseURL: string, private accessToken: string) {}\n  async createRunDocument(name: string) {\n    try {\n      const runDocResult = await axiosClient.post(\n        this.runsApiBaseURL + '/cucumber-runs/create',\n        {\n          name: name ? name : 'TEST',\n        },\n        {\n          headers: {\n            Authorization: 'Bearer ' + this.accessToken,\n            'x-source': 'cucumber_js',\n          },\n        }\n      )\n      if (runDocResult.status !== 200) {\n        throw new Error('Failed to create run document in the server')\n      }\n      if (runDocResult.data.status !== true) {\n        throw new Error('Failed to create run document in the server')\n      }\n      return runDocResult.data.run\n    } catch (error) {\n      if (error.response && error.response.status === 403) {\n        console.log(\n          'Warning: Your trial plan has ended. Cannot create or upload reports.'\n        )\n        process.exit(1)\n      }\n      throw new Error('Failed to create run document in the server: ' + error)\n    }\n  }\n  async upload(formData: FormData) {\n    const response = await axiosClient.post(\n      this.runsApiBaseURL + '/cucumber-runs/upload',\n      formData,\n      {\n        headers: {\n          ...formData.getHeaders(),\n          Authorization: 'Bearer ' + this.accessToken,\n          'x-source': 'cucumber_js',\n        },\n      }\n    )\n    if (response.status === 401) {\n      console.log(\n        'Warning: Your trial plan has ended. Cannot upload reports and perform retraining'\n      )\n      throw new Error(\n        'Warning: Your trial plan has ended. Cannot upload reports and perform retraining'\n      )\n    }\n    if (response.status !== 200) {\n      throw new Error('Failed to upload run to the server')\n    }\n    if (response.data.status !== true) {\n      throw new Error('Failed to upload run to the server')\n    }\n  }\n  async getPreSignedUrls(fileUris: string[], runId: string) {\n    const response = await axiosClient.post(\n      this.runsApiBaseURL + '/cucumber-runs/generateuploadurls',\n      {\n        fileUris,\n        runId,\n      },\n      {\n        headers: {\n          Authorization: 'Bearer ' + this.accessToken,\n          'x-source': 'cucumber_js',\n        },\n      }\n    )\n    if (response.status === 403) {\n      console.log(\n        'Warning: Your trial plan has ended. Cannot upload reports and perform retraining'\n      )\n      throw new Error(\n        'Warning: Your trial plan has ended. Cannot upload reports and perform retraining'\n      )\n    }\n    if (response.status !== 200) {\n      throw new Error('Failed to get pre-signed urls for the files')\n    }\n    if (response.data.status !== true) {\n      throw new Error('Failed to get pre-signed urls for the files')\n    }\n\n    return response.data.uploadUrls\n  }\n\n  async uploadTestCase(\n    testCaseReport: JsonTestProgress,\n    runId: string,\n    projectId: string,\n    reportFolder: string\n  ) {\n    const fileUris = []\n    //iterate over all the files in the JsonCommand.screenshotId and insert them into the fileUris array\n    for (const step of testCaseReport.steps) {\n      for (const command of step.commands) {\n        if (command.screenshotId) {\n          fileUris.push(\n            'screenshots' + '/' + String(command.screenshotId) + '.png'\n          )\n        }\n      }\n    }\n    const preSignedUrls = await this.getPreSignedUrls(fileUris, runId)\n    //upload all the files in the fileUris array\n    try {\n      for (let i = 0; i < fileUris.length; i += BATCH_SIZE) {\n        const batch = fileUris.slice(\n          i,\n          Math.min(i + BATCH_SIZE, fileUris.length)\n        )\n        await Promise.all(\n          batch\n            .filter((fileUri) => preSignedUrls[fileUri])\n            .map(async (fileUri) => {\n              for (let j = 0; j < MAX_RETRIES; j++) {\n                if (existsSync(path.join(reportFolder, fileUri))) {\n                  const success = await this.uploadFile(\n                    path.join(reportFolder, fileUri),\n                    preSignedUrls[fileUri]\n                  )\n                  if (success) {\n                    return\n                  }\n                }\n              }\n              console.error('Failed to upload file:', fileUri)\n            })\n        )\n      }\n      await axiosClient.post(\n        this.runsApiBaseURL + '/cucumber-runs/createNewTestCase',\n        {\n          runId,\n          projectId,\n          testProgressReport: testCaseReport,\n          mode: process.env.MODE === 'cloud' ? 'cloud' : 'local',\n          browser: process.env.BROWSER ? process.env.BROWSER : 'chromium',\n        },\n        {\n          headers: {\n            Authorization: 'Bearer ' + this.accessToken,\n            'x-source': 'cucumber_js',\n          },\n        }\n      )\n\n      try {\n        await axiosClient.post(\n          `${SERVICES_URI.STORAGE}/event`,\n          {\n            event: ActionEvents.upload_report,\n          },\n          {\n            headers: {\n              Authorization: 'Bearer ' + this.accessToken,\n              'x-source': 'cucumber_js',\n              'x-bvt-project-id': projectId,\n            },\n          }\n        )\n      } catch (error) {\n        // no event tracking\n      }\n      logReportLink(runId, projectId)\n    } catch (e) {\n      console.error(`failed to upload the test case: ${testCaseReport.id} ${e}`)\n    }\n  }\n  async uploadFile(filePath: string, preSignedUrl: string) {\n    const fileStream = createReadStream(filePath)\n    let success = true\n    try {\n      const fileStats = await fs.stat(filePath)\n      const fileSize = fileStats.size\n\n      await axiosClient.put(preSignedUrl, fileStream, {\n        headers: {\n          'Content-Type': 'application/octet-stream',\n          'Content-Length': fileSize,\n        },\n      })\n    } catch (error) {\n      if (process.env.NODE_ENV_BLINQ === 'dev') {\n        console.error('Error uploading file:', error)\n      }\n      success = false\n    } finally {\n      fileStream.close()\n    }\n    return success\n  }\n  async uploadComplete(runId: string, projectId: string) {\n    const response = await axiosClient.post(\n      this.runsApiBaseURL + '/cucumber-runs/uploadCompletion',\n      {\n        runId,\n        projectId,\n        mode: process.env.MODE === 'cloud' ? 'cloud' : 'local',\n        browser: process.env.BROWSER ? process.env.BROWSER : 'chromium',\n      },\n      {\n        headers: {\n          Authorization: 'Bearer ' + this.accessToken,\n          'x-source': 'cucumber_js',\n        },\n      }\n    )\n    if (response.status !== 200) {\n      throw new Error('Failed to mark run as complete')\n    }\n    if (response.data.status !== true) {\n      throw new Error('Failed to mark run as complete')\n    }\n\n    try {\n      await axiosClient.post(\n        `${SERVICES_URI.STORAGE}/event`,\n        {\n          event: ActionEvents.upload_report,\n        },\n        {\n          headers: {\n            Authorization: 'Bearer ' + this.accessToken,\n            'x-source': 'cucumber_js',\n            'x-bvt-project-id': projectId,\n          },\n        }\n      )\n    } catch (error) {\n      // no event tracking\n    }\n  }\n  async modifyTestCase(\n    runId: string,\n    projectId: string,\n    testProgressReport: JsonTestProgress\n  ) {\n    try {\n      const res = await axiosClient.post(\n        this.runsApiBaseURL + '/cucumber-runs/modifyTestCase',\n        {\n          runId,\n          projectId,\n          testProgressReport,\n        },\n        {\n          headers: {\n            Authorization: 'Bearer ' + this.accessToken,\n            'x-source': 'cucumber_js',\n          },\n        }\n      )\n      if (res.status !== 200) {\n        throw new Error('')\n      }\n      if (res.data.status !== true) {\n        throw new Error('')\n      }\n      logReportLink(runId, projectId)\n    } catch (e) {\n      console.error(\n        `failed to modify the test case: ${testProgressReport.id} ${e}`\n      )\n    }\n  }\n}\n\nexport { RunUploadService }\n"]}

package/lib/formatter/helpers/uploader.d.ts

@@ -1,4 +1,4 @@
-import ReportGenerator, { JsonReport } from './report_generator';
+import ReportGenerator, { JsonReport, JsonTestProgress } from './report_generator';
 export default class ReportUploader {
     private uploadService;
     private reportGenerator;
@@ -7,5 +7,6 @@ export default class ReportUploader {
         runId: any;
         projectId: any;
     }>;
+    modifyTestCase(testCase: JsonTestProgress): Promise<void>;
     createZip(reportFolder: string | null, report: JsonReport): Promise<string>;
 }

package/lib/formatter/helpers/uploader.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,15 +29,26 @@ var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 const upload_serivce_1 = require("./upload_serivce");
 const form_data_1 = __importDefault(require("form-data"));
-const fs_1 = __importDefault(require("fs"));
+const fs_1 = __importStar(require("fs"));
 const jszip_1 = __importDefault(require("jszip"));
 const path_1 = __importDefault(require("path"));
-const URL = process.env.NODE_ENV_BLINQ === 'dev'
-    ? 'https://dev.api.blinq.io/api/runs'
-    : process.env.NODE_ENV_BLINQ === 'local'
-        ? 'http://localhost:5001/api/runs'
-        : 'https://api.blinq.io/api/runs';
+let URL;
+switch (process.env.NODE_ENV_BLINQ) {
+    case 'stage':
+        URL = 'https://stage.api.blinq.io/api/runs';
+        break;
+    case 'dev':
+        URL = 'https://dev.api.blinq.io/api/runs';
+        break;
+    case 'local':
+        URL = 'http://localhost:5001/api/runs';
+        break;
+    default:
+        URL = 'https://api.blinq.io/api/runs';
+}
 const REPORT_SERVICE_URL = (_a = process.env.REPORT_SERVICE_URL) !== null && _a !== void 0 ? _a : URL;
+const BATCH_SIZE = 10;
+const MAX_RETRIES = 3;
 const REPORT_SERVICE_TOKEN = (_b = process.env.TOKEN) !== null && _b !== void 0 ? _b : process.env.REPORT_SERVICE_TOKEN;
 class ReportUploader {
     constructor(reportGenerator) {
@@ -31,6 +65,7 @@ class ReportUploader {
         if (!fs_1.default.existsSync(reportFolder)) {
             fs_1.default.mkdirSync(reportFolder);
         }
+        (0, fs_1.writeFileSync)(path_1.default.join(reportFolder, 'report.json'), JSON.stringify(report, null, 2));
         if (process.env.NODE_ENV_BLINQ === 'local') {
             const formData = new form_data_1.default();
             const zipPath = await this.createZip(reportFolder, report);
@@ -38,15 +73,29 @@ class ReportUploader {
             await this.uploadService.upload(formData);
         }
         else {
-            const fileUris = getFileUrisScreenShotDir(reportFolder);
+            const fileUris = [
+                ...getFileUris(reportFolder, 'screenshots'),
+                ...getFileUris(reportFolder, 'trace'),
+                'report.json',
+                'network.json',
+            ];
             try {
                 const preSignedUrls = await this.uploadService.getPreSignedUrls(fileUris, runDocId);
-                await Promise.all(fileUris
-                    .filter((fileUri) => preSignedUrls[fileUri])
-                    .map((fileUri) => {
-                    return this.uploadService.uploadFile(path_1.default.join(reportFolder, fileUri), preSignedUrls[fileUri]);
-                }));
-                await this.uploadService.uploadComplete(runDocId, report);
+                for (let i = 0; i < fileUris.length; i += BATCH_SIZE) {
+                    const batch = fileUris.slice(i, Math.min(i + BATCH_SIZE, fileUris.length));
+                    await Promise.all(batch
+                        .filter((fileUri) => preSignedUrls[fileUri])
+                        .map(async (fileUri) => {
+                        for (let j = 0; j < MAX_RETRIES; j++) {
+                            const success = await this.uploadService.uploadFile(path_1.default.join(reportFolder, fileUri), preSignedUrls[fileUri]);
+                            if (success) {
+                                return;
+                            }
+                        }
+                        console.error('Failed to upload file:', fileUri);
+                    }));
+                }
+                await this.uploadService.uploadComplete(runDocId, runDoc.project_id);
             }
             catch (err) {
                 throw new Error('Failed to upload  all the files');
@@ -54,7 +103,23 @@ class ReportUploader {
         }
         return { runId: runDoc._id, projectId: runDoc.project_id };
     }
+    async modifyTestCase(testCase) {
+        const runId = process.env.RUN_ID;
+        if (!runId) {
+            return;
+        }
+        const projectId = process.env.PROJECT_ID;
+        if (!projectId) {
+            return;
+        }
+        await this.uploadService.modifyTestCase(runId, projectId, testCase);
+    }
     async createZip(reportFolder, report) {
+        if (reportFolder === null) {
+            console.error('report folder is empty');
+            console.error('it is likey that there are no scenarios to run');
+            throw new Error('Empty report folder');
+        }
         const zip = new jszip_1.default();
         zip.file('report.json', JSON.stringify(report, null, 2));
         const folder = zip.folder('screenshots');
@@ -65,7 +130,7 @@ class ReportUploader {
         const zipBuffer = await zip.generateAsync({ type: 'nodebuffer' });
         // save zip file
         const zipPath = path_1.default.join(reportFolder, 'report.zip');
-        fs_1.default.writeFileSync(zipPath, zipBuffer);
+        fs_1.default.writeFileSync(zipPath, new Uint8Array(zipBuffer));
         fs_1.default.writeFileSync(path_1.default.join(reportFolder, 'report.json'), JSON.stringify(report, null, 2));
         return zipPath;
     }
@@ -75,4 +140,12 @@ const getFileUrisScreenShotDir = (reportFolder) => {
     const files = fs_1.default.readdirSync(path_1.default.join(reportFolder, 'screenshots'));
     return files.map((file) => ['screenshots', file].join('/'));
 };
+const getFileUris = (reportFolder, targetFolder) => {
+    const resultFolder = path_1.default.join(reportFolder, targetFolder);
+    if (!fs_1.default.existsSync(resultFolder)) {
+        return [];
+    }
+    const files = fs_1.default.readdirSync(resultFolder);
+    return files.map((file) => [targetFolder, file].join('/'));
+};
 //# sourceMappingURL=uploader.js.map

package/lib/formatter/helpers/uploader.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../src/formatter/helpers/uploader.ts"],"names":[],"mappings":"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","sourcesContent":["import ReportGenerator, { JsonReport } from './report_generator'\nimport { RunUploadService } from './upload_serivce'\n\nimport FormData from 'form-data'\nimport fs from 'fs'\nimport JSZip from 'jszip'\nimport path from 'path'\nconst URL =\n  process.env.NODE_ENV_BLINQ === 'dev'\n    ? 'https://dev.api.blinq.io/api/runs'\n    : process.env.NODE_ENV_BLINQ === 'local'\n    ? 'http://localhost:5001/api/runs'\n    : 'https://api.blinq.io/api/runs'\n\nconst REPORT_SERVICE_URL = process.env.REPORT_SERVICE_URL ?? URL\nconst REPORT_SERVICE_TOKEN =\n  process.env.TOKEN ?? process.env.REPORT_SERVICE_TOKEN\n\nexport default class ReportUploader {\n  private uploadService = new RunUploadService(\n    REPORT_SERVICE_URL,\n    REPORT_SERVICE_TOKEN\n  )\n  private reportGenerator: ReportGenerator\n  constructor(reportGenerator: ReportGenerator) {\n    if (!REPORT_SERVICE_URL || !REPORT_SERVICE_TOKEN) {\n      throw new Error('REPORT_SERVICE_URL and REPORT_SERVICE_TOKEN must be set')\n    }\n    this.reportGenerator = reportGenerator\n  }\n\n  async uploadRun(report: JsonReport, runName: string) {\n    const runDoc = await this.uploadService.createRunDocument(runName)\n    const runDocId = runDoc._id\n    const reportFolder = this.reportGenerator.reportFolder\n    if (!fs.existsSync(reportFolder)) {\n      fs.mkdirSync(reportFolder)\n    }\n    if (process.env.NODE_ENV_BLINQ === 'local') {\n      const formData = new FormData()\n      const zipPath = await this.createZip(reportFolder, report)\n      formData.append(runDocId, fs.readFileSync(zipPath), 'report.zip')\n      await this.uploadService.upload(formData)\n    } else {\n      const fileUris = getFileUrisScreenShotDir(reportFolder)\n      try {\n        const preSignedUrls = await this.uploadService.getPreSignedUrls(\n          fileUris,\n          runDocId\n        )\n        await Promise.all(\n          fileUris\n            .filter((fileUri) => preSignedUrls[fileUri])\n            .map((fileUri) => {\n              return this.uploadService.uploadFile(\n                path.join(reportFolder, fileUri),\n                preSignedUrls[fileUri]\n              )\n            })\n        )\n        await this.uploadService.uploadComplete(runDocId, report)\n      } catch (err) {\n        throw new Error('Failed to upload  all the files')\n      }\n    }\n    return { runId: runDoc._id, projectId: runDoc.project_id }\n  }\n  async createZip(reportFolder: string | null, report: JsonReport) {\n    const zip = new JSZip()\n    zip.file('report.json', JSON.stringify(report, null, 2))\n    const folder = zip.folder('screenshots')\n    const files = fs.readdirSync(path.join(reportFolder, 'screenshots'))\n    files.forEach((file) => {\n      folder.file(\n        file,\n        fs.readFileSync(path.join(reportFolder, 'screenshots', file))\n      )\n    })\n    const zipBuffer = await zip.generateAsync({ type: 'nodebuffer' })\n    // save zip file\n    const zipPath = path.join(reportFolder, 'report.zip')\n    fs.writeFileSync(zipPath, zipBuffer)\n    fs.writeFileSync(\n      path.join(reportFolder, 'report.json'),\n      JSON.stringify(report, null, 2)\n    )\n    return zipPath\n  }\n}\nconst getFileUrisScreenShotDir = (reportFolder: string) => {\n  const files = fs.readdirSync(path.join(reportFolder, 'screenshots'))\n\n  return files.map((file) => ['screenshots', file].join('/'))\n}\n"]}
+{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../src/formatter/helpers/uploader.ts"],"names":[],"mappings":"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","sourcesContent":["import axios from 'axios'\nimport ReportGenerator, {\n  JsonReport,\n  JsonTestProgress,\n} from './report_generator'\nimport { RunUploadService } from './upload_serivce'\n\nimport FormData from 'form-data'\nimport fs, { writeFileSync } from 'fs'\nimport JSZip from 'jszip'\nimport path from 'path'\n\nlet URL\n\nswitch (process.env.NODE_ENV_BLINQ) {\n  case 'stage':\n    URL = 'https://stage.api.blinq.io/api/runs'\n    break\n  case 'dev':\n    URL = 'https://dev.api.blinq.io/api/runs'\n    break\n  case 'local':\n    URL = 'http://localhost:5001/api/runs'\n    break\n  default:\n    URL = 'https://api.blinq.io/api/runs'\n}\n\nconst REPORT_SERVICE_URL = process.env.REPORT_SERVICE_URL ?? URL\nconst BATCH_SIZE = 10\nconst MAX_RETRIES = 3\nconst REPORT_SERVICE_TOKEN =\n  process.env.TOKEN ?? process.env.REPORT_SERVICE_TOKEN\n\nexport default class ReportUploader {\n  private uploadService = new RunUploadService(\n    REPORT_SERVICE_URL,\n    REPORT_SERVICE_TOKEN\n  )\n  private reportGenerator: ReportGenerator\n  constructor(reportGenerator: ReportGenerator) {\n    if (!REPORT_SERVICE_URL || !REPORT_SERVICE_TOKEN) {\n      throw new Error('REPORT_SERVICE_URL and REPORT_SERVICE_TOKEN must be set')\n    }\n    this.reportGenerator = reportGenerator\n  }\n\n  async uploadRun(report: JsonReport, runName: string) {\n    const runDoc = await this.uploadService.createRunDocument(runName)\n    const runDocId = runDoc._id\n    const reportFolder = this.reportGenerator.reportFolder\n    if (!fs.existsSync(reportFolder)) {\n      fs.mkdirSync(reportFolder)\n    }\n    writeFileSync(\n      path.join(reportFolder, 'report.json'),\n      JSON.stringify(report, null, 2)\n    )\n    if (process.env.NODE_ENV_BLINQ === 'local') {\n      const formData = new FormData()\n      const zipPath = await this.createZip(reportFolder, report)\n      formData.append(runDocId, fs.readFileSync(zipPath), 'report.zip')\n      await this.uploadService.upload(formData)\n    } else {\n      const fileUris = [\n        ...getFileUris(reportFolder, 'screenshots'),\n        ...getFileUris(reportFolder, 'trace'),\n        'report.json',\n        'network.json',\n      ]\n      try {\n        const preSignedUrls = await this.uploadService.getPreSignedUrls(\n          fileUris,\n          runDocId\n        )\n\n        for (let i = 0; i < fileUris.length; i += BATCH_SIZE) {\n          const batch = fileUris.slice(\n            i,\n            Math.min(i + BATCH_SIZE, fileUris.length)\n          )\n          await Promise.all(\n            batch\n              .filter((fileUri) => preSignedUrls[fileUri])\n              .map(async (fileUri) => {\n                for (let j = 0; j < MAX_RETRIES; j++) {\n                  const success = await this.uploadService.uploadFile(\n                    path.join(reportFolder, fileUri),\n                    preSignedUrls[fileUri]\n                  )\n                  if (success) {\n                    return\n                  }\n                }\n                console.error('Failed to upload file:', fileUri)\n              })\n          )\n        }\n        await this.uploadService.uploadComplete(runDocId, runDoc.project_id)\n      } catch (err) {\n        throw new Error('Failed to upload  all the files')\n      }\n    }\n    return { runId: runDoc._id, projectId: runDoc.project_id }\n  }\n\n  async modifyTestCase(testCase: JsonTestProgress) {\n    const runId = process.env.RUN_ID\n    if (!runId) {\n      return\n    }\n    const projectId = process.env.PROJECT_ID\n    if (!projectId) {\n      return\n    }\n    await this.uploadService.modifyTestCase(runId, projectId, testCase)\n  }\n  async createZip(reportFolder: string | null, report: JsonReport) {\n    if (reportFolder === null) {\n      console.error('report folder is empty')\n      console.error('it is likey that there are no scenarios to run')\n      throw new Error('Empty report folder')\n    }\n    const zip = new JSZip()\n    zip.file('report.json', JSON.stringify(report, null, 2))\n    const folder = zip.folder('screenshots')\n    const files = fs.readdirSync(path.join(reportFolder, 'screenshots'))\n    files.forEach((file) => {\n      folder.file(\n        file,\n        fs.readFileSync(path.join(reportFolder, 'screenshots', file))\n      )\n    })\n    const zipBuffer = await zip.generateAsync({ type: 'nodebuffer' })\n    // save zip file\n    const zipPath = path.join(reportFolder, 'report.zip')\n    fs.writeFileSync(zipPath, new Uint8Array(zipBuffer))\n    fs.writeFileSync(\n      path.join(reportFolder, 'report.json'),\n      JSON.stringify(report, null, 2)\n    )\n    return zipPath\n  }\n}\n\nconst getFileUrisScreenShotDir = (reportFolder: string) => {\n  const files = fs.readdirSync(path.join(reportFolder, 'screenshots'))\n\n  return files.map((file) => ['screenshots', file].join('/'))\n}\n\nconst getFileUris = (reportFolder: string, targetFolder: string) => {\n  const resultFolder = path.join(reportFolder, targetFolder)\n  if (!fs.existsSync(resultFolder)) {\n    return []\n  }\n  const files = fs.readdirSync(resultFolder)\n  return files.map((file) => [targetFolder, file].join('/'))\n}\n"]}

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.0.58";
+export declare const version = "1.0.59-stage";

package/lib/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // Generated by genversion.
-exports.version = '1.0.58';
+exports.version = '1.0.59-stage';
 //# sourceMappingURL=version.js.map

package/lib/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AACd,QAAA,OAAO,GAAG,QAAQ,CAAA","sourcesContent":["// Generated by genversion.\nexport const version = '1.0.58'\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AACd,QAAA,OAAO,GAAG,cAAc,CAAA","sourcesContent":["// Generated by genversion.\nexport const version = '1.0.59-stage'\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber-js",
-  "description": "The official JavaScript implementation of Cucumber.",
+  "description": "",
   "keywords": [
     "testing",
     "bdd",
@@ -8,7 +8,7 @@
     "gherkin",
     "tests"
   ],
-  "version": "1.0.58",
+  "version": "1.0.59-stage",
   "homepage": "https://github.com/blinq-io/cucumber-js",
   "author": "blinq.io",
   "contributors": [
@@ -60,6 +60,7 @@
     "@cucumber/messages": "22.0.0",
     "@cucumber/tag-expressions": "5.0.1",
     "@faker-js/faker": "^8.0.2",
+    "@types/tunnel": "^0.0.7",
     "assertion-error-formatter": "^3.0.0",
     "axios": "^1.6.2",
     "capital-case": "^1.0.4",
@@ -74,6 +75,7 @@
     "indent-string": "^4.0.0",
     "is-installed-globally": "^0.4.0",
     "is-stream": "^2.0.0",
+    "json5": "^2.2.3",
     "jszip": "^3.10.1",
     "knuth-shuffle-seeded": "^1.0.6",
     "lodash.merge": "^4.6.2",
@@ -89,6 +91,7 @@
     "supports-color": "^8.1.1",
     "tmp": "^0.2.1",
     "tmp-promise": "^3.0.3",
+    "tunnel": "^0.0.6",
     "util-arity": "^1.1.0",
     "verror": "^1.10.0",
     "xmlbuilder": "^15.1.1",