@teamscale/coverage-collector 0.0.1-beta.54 → 0.0.1-beta.55

package/README.md

@@ -19,12 +19,12 @@ information back to the original source code.
 ## Building
 
 The Collector is written in TypeScript/JavaScript. For building and running it,
-NodeJs (>= v14) and Yarn are needed as prerequisites.
+NodeJs (>= v16) and pnpm are needed as prerequisites.
 
 ```
-yarn clean
-yarn install
-yarn build
+pnpm clean
+pnpm install
+pnpm build
 ```
 
 ## Running the Collector

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/coverage-collector",
-    "version": "0.0.1-beta.54",
+    "version": "0.0.1-beta.55",
     "description": "Collector for JavaScript code coverage information",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",
@@ -12,53 +12,51 @@
         "url": "https://github.com/cqse/teamscale-javascript-profiler.git"
     },
     "scripts": {
-        "prepublishOnly": "yarn clean && yarn build",
+        "prepublishOnly": "pnpm clean && pnpm build",
         "clean": "rimraf dist tsconfig.tsbuildinfo",
         "build": "tsc",
         "collector": "node dist/src/main.js",
-        "test": "yarn build && NODE_OPTIONS='--experimental-vm-modules' jest --coverage --silent=true"
+        "test": "pnpm build && NODE_OPTIONS='--experimental-vm-modules' jest --coverage --silent=true --detectOpenHandles --forceExit"
     },
     "files": [
         "dist/**/*"
     ],
     "dependencies": {
-        "@cqse/commons": "^0.0.1-beta.45",
+        "@cqse/commons": "^0.0.1-beta.54",
         "argparse": "^2.0.1",
         "async": "^3.2.4",
-        "axios": "^0.24.0",
+        "axios": "^1.4.0",
         "bunyan": "^1.8.15",
-        "date-and-time": "^2.3.1",
-        "dotenv": "^14.1.0",
-        "express": "^4.18.1",
+        "date-and-time": "^3.0.2",
+        "dotenv": "^16.3.1",
+        "express": "^4.18.2",
         "form-data": "^4.0.0",
-        "mkdirp": "^1.0.4",
-        "rxjs": "^7.1.0",
+        "mkdirp": "^3.0.1",
+        "rxjs": "^7.8.1",
         "source-map": "^0.7.4",
         "tmp": "^0.2.1",
         "typescript-optional": "^2.0.1",
-        "ws": "^7.4.5"
+        "ws": "^8.13.0"
     },
     "devDependencies": {
-        "@babel/core": "^7.21.8",
-        "@babel/preset-env": "^7.21.5",
-        "@types/argparse": "^2.0.5",
-        "@types/async": "^3.2.6",
+        "@babel/core": "^7.22.8",
+        "@babel/preset-env": "^7.22.7",
+        "@types/argparse": "^2.0.10",
+        "@types/async": "^3.2.20",
         "@types/bunyan": "^1.8.8",
-        "@types/express": "^4.17.13",
-        "@types/jest": "^29.5.1",
-        "@types/mkdirp": "^1.0.2",
-        "@types/node": "^15.0.1",
-        "@types/source-map": "^0.5.7",
+        "@types/express": "^4.17.17",
+        "@types/jest": "^29.5.3",
+        "@types/node": "^20.4.1",
         "@types/tmp": "^0.2.3",
-        "@types/ws": "^7.4.2",
-        "babel-jest": "^29.5.0",
-        "esbuild": "^0.13.4",
-        "jest": "^29.5.0",
-        "mockttp": "^3.7.5",
-        "rimraf": "^3.0.2",
-        "ts-jest": "^29.1.0",
-        "ts-node": "^10.2.1",
-        "typescript": "^4.4.3"
+        "@types/ws": "^8.5.5",
+        "babel-jest": "^29.6.1",
+        "esbuild": "^0.18.11",
+        "jest": "^29.6.1",
+        "mockttp": "^3.7.6",
+        "rimraf": "^5.0.1",
+        "ts-jest": "^29.1.1",
+        "ts-node": "^10.9.1",
+        "typescript": "^5.1.6"
     },
     "publishConfig": {
         "access": "public"

package/dist/src/App.js

@@ -33,7 +33,7 @@ const CollectingServer_1 = require("./receiver/CollectingServer");
 require("dotenv/config");
 const fs = __importStar(require("fs"));
 const ConfigParameters_1 = require("./utils/ConfigParameters");
-const mkdirp_1 = __importDefault(require("mkdirp"));
+const mkdirp_1 = require("mkdirp");
 const path_1 = __importDefault(require("path"));
 const StdConsoleLogger_1 = require("./utils/StdConsoleLogger");
 const PrettyFileLogger_1 = require("./utils/PrettyFileLogger");
@@ -58,7 +58,7 @@ class App {
      */
     static buildLogger(config) {
         const logfilePath = config.log_to_file.trim();
-        mkdirp_1.default.sync(path_1.default.dirname(logfilePath));
+        mkdirp_1.mkdirp.sync(path_1.default.dirname(logfilePath));
         const logLevel = config.log_level;
         const logger = bunyan_1.default.createLogger({
             name: 'Collector',

package/dist/src/receiver/CollectingServer.js

@@ -37,7 +37,7 @@ var ProtocolMessageTypes;
     ProtocolMessageTypes["TYPE_SOURCEMAP"] = "s";
     /** A message that provides coverage information */
     ProtocolMessageTypes["TYPE_COVERAGE"] = "c";
-})(ProtocolMessageTypes = exports.ProtocolMessageTypes || (exports.ProtocolMessageTypes = {}));
+})(ProtocolMessageTypes || (exports.ProtocolMessageTypes = ProtocolMessageTypes = {}));
 /**
  * Separates the instrumentation subject from the coverage information.
  */
@@ -58,7 +58,7 @@ class WebSocketCollectingServer {
         commons_1.Contract.require(port > 0 && port < 65536, 'Port must be valid (range).');
         this.storage = commons_1.Contract.requireDefined(storage);
         this.logger = commons_1.Contract.requireDefined(logger);
-        this.server = new WebSocket.Server({ port: port });
+        this.server = new WebSocket.Server({ port });
     }
     /**
      * Start the server socket, handle sessions and dispatch messages.
@@ -80,9 +80,9 @@ class WebSocketCollectingServer {
                 }
             });
             // Handle incoming messages
-            webSocket.on('message', async (message) => {
-                if (session && typeof message === 'string') {
-                    await this.handleMessage(session, message);
+            webSocket.on('message', (message) => {
+                if (session && Buffer.isBuffer(message)) {
+                    void this.handleMessage(session, message);
                 }
             });
             // Handle errors
@@ -106,15 +106,16 @@ class WebSocketCollectingServer {
      */
     async handleMessage(session, message) {
         try {
-            if (message.startsWith(ProtocolMessageTypes.TYPE_SOURCEMAP)) {
-                await this.handleSourcemapMessage(session, message.substring(1));
+            const messageType = message.toString('utf8', 0, 1);
+            if (messageType.startsWith(ProtocolMessageTypes.TYPE_SOURCEMAP)) {
+                await this.handleSourcemapMessage(session, message.subarray(1));
             }
-            else if (message.startsWith(ProtocolMessageTypes.TYPE_COVERAGE)) {
-                await this.handleCoverageMessage(session, message.substring(1));
+            else if (messageType.startsWith(ProtocolMessageTypes.TYPE_COVERAGE)) {
+                await this.handleCoverageMessage(session, message.subarray(1));
             }
         }
         catch (e) {
-            this.logger.error(`Error while processing message starting with ${message.substring(0, Math.min(50, message.length))}`);
+            this.logger.error(`Error while processing message starting with ${message.toString('utf8', 0, Math.min(50, message.length))}`);
             this.logger.error(e.message);
         }
     }
@@ -125,11 +126,11 @@ class WebSocketCollectingServer {
      * @param body - The body of the message (to be parsed).
      */
     async handleSourcemapMessage(session, body) {
-        const fileIdSeparatorPosition = body.indexOf(INSTRUMENTATION_SUBJECT_SEPARATOR);
+        const fileIdSeparatorPosition = body.indexOf(INSTRUMENTATION_SUBJECT_SEPARATOR.charCodeAt(0));
         if (fileIdSeparatorPosition > -1) {
-            const fileId = body.substring(0, fileIdSeparatorPosition).trim();
+            const fileId = body.toString('utf8', 0, fileIdSeparatorPosition).trim();
             this.logger.debug(`Received source map information for ${fileId}`);
-            const sourcemap = body.substring(fileIdSeparatorPosition + 1);
+            const sourcemap = body.subarray(fileIdSeparatorPosition + 1);
             await session.putSourcemap(fileId, sourcemap);
         }
     }
@@ -142,7 +143,7 @@ class WebSocketCollectingServer {
     async handleCoverageMessage(session, body) {
         var _a;
         const bodyPattern = /(?<fileId>\S+) (?<positions>((\d+:\d+(:\d+:\d+)?\s+)*(\d+:\d+(:\d+:\d+)?)))/;
-        const matches = bodyPattern.exec(body);
+        const matches = bodyPattern.exec(body.toString());
         if (matches === null || matches === void 0 ? void 0 : matches.groups) {
             const fileId = matches.groups.fileId;
             const positions = ((_a = matches.groups.positions) !== null && _a !== void 0 ? _a : '').split(/\s+/);

package/dist/src/receiver/Session.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Socket } from 'net';
 import { IDataStorage } from '../storage/DataStorage';
 import Logger from 'bunyan';
@@ -78,7 +79,7 @@ export declare class Session {
      * @param fileId - The identifier of the file bundle.
      * @param sourceMapText - The actual source map.
      */
-    putSourcemap(fileId: string, sourceMapText: string): Promise<void>;
+    putSourcemap(fileId: string, sourceMapText: Buffer): Promise<void>;
     private processUnmappedCoverageOf;
     /**
      * Destroy the session and free the memory it allocates.

package/dist/src/receiver/Session.js

@@ -137,7 +137,7 @@ class Session {
      * @param sourceMapText - The actual source map.
      */
     async putSourcemap(fileId, sourceMapText) {
-        const rawSourceMap = JSON.parse(sourceMapText);
+        const rawSourceMap = JSON.parse(sourceMapText.toString());
         try {
             const sourceMapConsumer = await new sourceMap.SourceMapConsumer(rawSourceMap);
             this.sourceMaps.set(fileId, sourceMapConsumer);
@@ -150,7 +150,7 @@ class Session {
     processUnmappedCoverageOf(fileId) {
         var _a;
         const unmapped = (_a = this.unmappedCoverage.get(fileId)) !== null && _a !== void 0 ? _a : [];
-        unmapped.forEach((entry) => {
+        unmapped.forEach(entry => {
             if (!this.putCoverage(entry.fileId, entry.startLine, entry.startColumn, entry.endLine, entry.endColumn)) {
                 this.storage.signalUnmappedCoverage(this.projectId);
             }

package/dist/src/upload/CommonUpload.d.ts

@@ -13,4 +13,4 @@ export declare function prepareFormData(coverageFile: string): FormData;
 /**
  * Uploads a coverage file with the provided configuration.
  */
-export declare function performUpload(url: string, form: FormData, config: AxiosRequestConfig<FormData>, uploadFunction: <T = any, R = AxiosResponse<T>, D = FormData>(url: string, data?: D, config?: AxiosRequestConfig<D>) => Promise<R>, logger: Logger): Promise<void>;
+export declare function performUpload(url: string, form: FormData, config: AxiosRequestConfig<FormData>, uploadFunction: <T = unknown, R = AxiosResponse<T>, D = FormData>(url: string, data?: D, config?: AxiosRequestConfig<D>) => Promise<R>, logger: Logger): Promise<void>;

package/dist/src/upload/CommonUpload.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.performUpload = exports.prepareFormData = exports.UploadError = void 0;
 const form_data_1 = __importDefault(require("form-data"));
 const fs_1 = __importDefault(require("fs"));
+const axios_1 = __importDefault(require("axios"));
 const util_1 = require("util");
 /**
  * Error that is thrown when the upload failed
@@ -31,25 +32,25 @@ async function performUpload(url, form, config, uploadFunction, logger) {
         logger.info(`Upload finished with code ${response.status}.`);
     }
     catch (error) {
-        if (error.response) {
-            const response = error.response;
-            if (response.status >= 400) {
-                throw new UploadError(`Upload failed with code ${response.status}: ${response.statusText}. Response Data: ${response.data}`);
+        if (axios_1.default.isAxiosError(error)) {
+            if (error.response) {
+                const response = error.response;
+                if (response.status >= 400) {
+                    throw new UploadError(`Upload failed with code ${response.status}: ${response.statusText}. Response Data: ${response.data}`);
+                }
+                else {
+                    logger.info(`Upload with status code ${response.status} finished.`);
+                }
             }
-            else {
-                logger.info(`Upload with status code ${response.status} finished.`);
+            else if (error.request) {
+                throw new UploadError(`Upload request did not receive a response.`);
+            }
+            if (error.message) {
+                logger.debug(`Something went wrong when uploading data: ${error.message}. Details of the error: ${(0, util_1.inspect)(error)}`);
+                throw new UploadError(`Something went wrong when uploading data: ${error.message}`);
             }
         }
-        else if (error.request) {
-            throw new UploadError(`Upload request did not receive a response.`);
-        }
-        if (error.message) {
-            logger.debug(`Something went wrong when uploading data: ${error.message}. Details of the error: ${(0, util_1.inspect)(error)}`);
-            throw new UploadError(`Something went wrong when uploading data: ${error.message}`);
-        }
-        else {
-            throw new UploadError(`Something went wrong when uploading data: ${(0, util_1.inspect)(error)}`);
-        }
+        throw new UploadError(`Something went wrong when uploading data: ${(0, util_1.inspect)(error)}`);
     }
 }
 exports.performUpload = performUpload;

package/dist/src/utils/PrettyFileLogger.d.ts

@@ -8,6 +8,6 @@ import { WriteStream } from 'fs';
 export declare class PrettyFileLogger {
     outputStream: WriteStream;
     constructor(outputStream: WriteStream);
-    write(rec: Record<any, any>): void;
+    write(rec: any): void;
     end(): void;
 }

package/dist/src/utils/PrettyFileLogger.js

@@ -14,6 +14,7 @@ class PrettyFileLogger {
     constructor(outputStream) {
         this.outputStream = outputStream;
     }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     write(rec) {
         this.outputStream.write(`[${rec.time.toISOString()}] ${bunyan_1.default.nameFromLevel[rec.level].toUpperCase()}: ${rec.msg}\n`);
     }

package/dist/src/utils/StdConsoleLogger.d.ts

@@ -1,5 +1,5 @@
 import 'dotenv/config';
 /** Class for console logger. Doesn't print all information to ensure better readability. */
 export declare class StdConsoleLogger {
-    write(rec: Record<any, any>): void;
+    write(rec: any): void;
 }

package/dist/src/utils/StdConsoleLogger.js

@@ -8,6 +8,7 @@ const bunyan_1 = __importDefault(require("bunyan"));
 require("dotenv/config");
 /** Class for console logger. Doesn't print all information to ensure better readability. */
 class StdConsoleLogger {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     write(rec) {
         console.log(`[${rec.time.toISOString()}] ${bunyan_1.default.nameFromLevel[rec.level].toUpperCase()}: ${rec.msg}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/coverage-collector",
-  "version": "0.0.1-beta.54",
+  "version": "0.0.1-beta.55",
   "description": "Collector for JavaScript code coverage information",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",
@@ -12,53 +12,51 @@
     "url": "https://github.com/cqse/teamscale-javascript-profiler.git"
   },
   "scripts": {
-    "prepublishOnly": "yarn clean && yarn build",
+    "prepublishOnly": "pnpm clean && pnpm build",
     "clean": "rimraf dist tsconfig.tsbuildinfo",
     "build": "tsc",
     "collector": "node dist/src/main.js",
-    "test": "yarn build && NODE_OPTIONS='--experimental-vm-modules' jest --coverage --silent=true"
+    "test": "pnpm build && NODE_OPTIONS='--experimental-vm-modules' jest --coverage --silent=true --detectOpenHandles --forceExit"
   },
   "files": [
     "dist/**/*"
   ],
   "dependencies": {
-    "@cqse/commons": "^0.0.1-beta.45",
+    "@cqse/commons": "^0.0.1-beta.54",
     "argparse": "^2.0.1",
     "async": "^3.2.4",
-    "axios": "^0.24.0",
+    "axios": "^1.4.0",
     "bunyan": "^1.8.15",
-    "date-and-time": "^2.3.1",
-    "dotenv": "^14.1.0",
-    "express": "^4.18.1",
+    "date-and-time": "^3.0.2",
+    "dotenv": "^16.3.1",
+    "express": "^4.18.2",
     "form-data": "^4.0.0",
-    "mkdirp": "^1.0.4",
-    "rxjs": "^7.1.0",
+    "mkdirp": "^3.0.1",
+    "rxjs": "^7.8.1",
     "source-map": "^0.7.4",
     "tmp": "^0.2.1",
     "typescript-optional": "^2.0.1",
-    "ws": "^7.4.5"
+    "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.8",
-    "@babel/preset-env": "^7.21.5",
-    "@types/argparse": "^2.0.5",
-    "@types/async": "^3.2.6",
+    "@babel/core": "^7.22.8",
+    "@babel/preset-env": "^7.22.7",
+    "@types/argparse": "^2.0.10",
+    "@types/async": "^3.2.20",
     "@types/bunyan": "^1.8.8",
-    "@types/express": "^4.17.13",
-    "@types/jest": "^29.5.1",
-    "@types/mkdirp": "^1.0.2",
-    "@types/node": "^15.0.1",
-    "@types/source-map": "^0.5.7",
+    "@types/express": "^4.17.17",
+    "@types/jest": "^29.5.3",
+    "@types/node": "^20.4.1",
     "@types/tmp": "^0.2.3",
-    "@types/ws": "^7.4.2",
-    "babel-jest": "^29.5.0",
-    "esbuild": "^0.13.4",
-    "jest": "^29.5.0",
-    "mockttp": "^3.7.5",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.2.1",
-    "typescript": "^4.4.3"
+    "@types/ws": "^8.5.5",
+    "babel-jest": "^29.6.1",
+    "esbuild": "^0.18.11",
+    "jest": "^29.6.1",
+    "mockttp": "^3.7.6",
+    "rimraf": "^5.0.1",
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.1.6"
   },
   "publishConfig": {
     "access": "public"