@teamscale/coverage-collector 0.0.1-beta.22 → 0.0.1-beta.27

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/coverage-collector",
-    "version": "0.0.1-beta.21",
+    "version": "0.0.1-beta.27",
     "description": "Collector for JavaScript code coverage information",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",
@@ -12,16 +12,18 @@
         "url": "https://github.com/cqse/teamscale-javascript-profiler.git"
     },
     "scripts": {
+        "prepublishOnly": "yarn clean && yarn build",
         "clean": "rimraf dist tsconfig.tsbuildinfo",
         "build": "tsc",
         "collector": "node dist/src/main.js",
         "test": "yarn build && NODE_OPTIONS='--experimental-vm-modules' jest --forceExit --coverage --silent=true --detectOpenHandles"
     },
     "files": [
-        "dist/**/*"
+        "dist/**/*",
+        "lib/**/*"
     ],
     "dependencies": {
-        "@cqse/commons": "^0.0.1-beta.1",
+        "@cqse/commons": "^0.0.1-beta.26",
         "argparse": "^2.0.1",
         "async": "^3.2.0",
         "axios": "^0.24.0",

package/dist/src/main.d.ts

@@ -30,4 +30,5 @@ export declare class Main {
      */
     private static maybeStartDumpTimer;
     private static dumpCoverage;
+    private static uploadToTeamscale;
 }

package/dist/src/main.js

@@ -2,7 +2,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -34,6 +38,7 @@ const fs = __importStar(require("fs"));
 const axios_1 = __importDefault(require("axios"));
 const form_data_1 = __importDefault(require("form-data"));
 const QueryParameters_1 = __importDefault(require("./utils/QueryParameters"));
+const util_1 = require("util");
 const tmp_1 = __importDefault(require("tmp"));
 /**
  * The main class of the Teamscale JavaScript Collector.
@@ -185,42 +190,8 @@ class Main {
                 const lines = storage.dumpToSimpleCoverageFile(coverageFile);
                 logger.info(`Dumped ${lines} lines of coverage to ${coverageFile}.`);
                 // 2. Upload to Teamscale if configured
-                if (!config.teamscale_server_url) {
-                    logger.info('Upload to Teamscale not configured.');
-                }
-                else if (lines === 0) {
-                    // Nothing to upload
-                }
-                else if (config.teamscale_access_token && config.teamscale_user) {
-                    logger.info('Preparing upload to Teamscale');
-                    const form = new form_data_1.default();
-                    form.append('report', fs.createReadStream(coverageFile), 'coverage.simple');
-                    const parameters = new QueryParameters_1.default();
-                    parameters.addIfDefined('format', 'SIMPLE');
-                    parameters.addIfDefined('message', config.teamscale_message);
-                    parameters.addIfDefined('repository', config.teamscale_repository);
-                    parameters.addIfDefined('t', config.teamscale_commit);
-                    parameters.addIfDefined('revision', config.teamscale_revision);
-                    parameters.addIfDefined('partition', config.teamscale_partition);
-                    const response = await axios_1.default.post(`${config.teamscale_server_url.replace(/\/$/, '')}/api/projects/${config.teamscale_project}/external-analysis/session/auto-create/report?${parameters.toString()}`, form, {
-                        auth: {
-                            username: config.teamscale_user,
-                            password: config.teamscale_access_token
-                        },
-                        headers: {
-                            Accept: '*/*',
-                            'Content-Type': `multipart/form-data; boundary=${form.getBoundary()}`
-                        }
-                    });
-                    if (response.status >= 400) {
-                        logger.error(`Upload failed with code ${response.status}: ${response.statusText}`);
-                    }
-                    else {
-                        logger.info(`Upload with status code ${response.status} finished.`);
-                    }
-                }
-                else {
-                    logger.error('Cannot upload to Teamscale: API key and user name must be configured!');
+                if (config.teamscale_server_url) {
+                    await this.uploadToTeamscale(config, logger, coverageFile, lines);
                 }
             }
             finally {
@@ -233,6 +204,58 @@ class Main {
             logger.error('Coverage dump failed.', e);
         }
     }
+    static async uploadToTeamscale(config, logger, coverageFile, lines) {
+        if (!(config.teamscale_access_token && config.teamscale_user && config.teamscale_server_url)) {
+            logger.error('Cannot upload to Teamscale: API key and user name must be configured!');
+            return;
+        }
+        if (lines === 0) {
+            return;
+        }
+        logger.info('Preparing upload to Teamscale');
+        const form = new form_data_1.default();
+        form.append('report', fs.createReadStream(coverageFile), 'coverage.simple');
+        const parameters = new QueryParameters_1.default();
+        parameters.addIfDefined('format', 'SIMPLE');
+        parameters.addIfDefined('message', config.teamscale_message);
+        parameters.addIfDefined('repository', config.teamscale_repository);
+        parameters.addIfDefined('t', config.teamscale_commit);
+        parameters.addIfDefined('revision', config.teamscale_revision);
+        parameters.addIfDefined('partition', config.teamscale_partition);
+        await axios_1.default
+            .post(`${config.teamscale_server_url.replace(/\/$/, '')}/api/projects/${config.teamscale_project}/external-analysis/session/auto-create/report?${parameters.toString()}`, form, {
+            auth: {
+                username: config.teamscale_user,
+                password: config.teamscale_access_token
+            },
+            headers: {
+                Accept: '*/*',
+                'Content-Type': `multipart/form-data; boundary=${form.getBoundary()}`
+            }
+        })
+            .catch(function (error) {
+            if (error.response) {
+                const response = error.response;
+                if (response.status >= 400) {
+                    logger.error(`Upload failed with code ${response.status}: ${response.statusText}`);
+                    logger.error(`Request failed with following response: ${response.data}`);
+                }
+                else {
+                    logger.info(`Upload with status code ${response.status} finished.`);
+                }
+            }
+            else if (error.request) {
+                logger.error(`Upload request did not receive a response.`);
+            }
+            if (error.message) {
+                logger.error(`Something went wrong when uploading data: ${error.message}`);
+                logger.debug(`Details of the error: ${(0, util_1.inspect)(error)}`);
+            }
+            else {
+                logger.error(`Something went wrong when uploading data: ${(0, util_1.inspect)(error)}`);
+            }
+        });
+    }
 }
 exports.Main = Main;
 Main.run();

package/dist/src/receiver/CollectingServer.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/src/receiver/Session.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/src/storage/DataStorage.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/coverage-collector",
-  "version": "0.0.1-beta.22",
+  "version": "0.0.1-beta.27",
   "description": "Collector for JavaScript code coverage information",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",
@@ -12,16 +12,18 @@
     "url": "https://github.com/cqse/teamscale-javascript-profiler.git"
   },
   "scripts": {
+    "prepublishOnly": "yarn clean && yarn build",
     "clean": "rimraf dist tsconfig.tsbuildinfo",
     "build": "tsc",
     "collector": "node dist/src/main.js",
     "test": "yarn build && NODE_OPTIONS='--experimental-vm-modules' jest --forceExit --coverage --silent=true --detectOpenHandles"
   },
   "files": [
-    "dist/**/*"
+    "dist/**/*",
+    "lib/**/*"
   ],
   "dependencies": {
-    "@cqse/commons": "^0.0.1-beta.1",
+    "@cqse/commons": "^0.0.1-beta.26",
     "argparse": "^2.0.1",
     "async": "^3.2.0",
     "axios": "^0.24.0",