@teamscale/coverage-collector 0.0.1-beta.5 → 0.0.1-beta.51

package/README.md

@@ -9,7 +9,7 @@ files in the [Teamscale Simple Coverage Format](https://docs.teamscale.com/refer
 The Teamscale JavaScript Profiler consists of this Coverage Collector and the
 [JavaScript Instrumenter](https://www.npmjs.com/package/@teamscale/javascript-instrumenter).
 More details on using them (in combination) can be found 
-on the projects' [Github page](https://github.com/cqse/teamscale-javascript-profiler/).
+in the [Teamscale Documentation](https://docs.teamscale.com/howto/recording-test-coverage-for-javascript/).
 
 The JavaScript Coverage Collector starts a server process that listens for 
 code coverage information from manually or automatically exercised (tested) 
@@ -49,8 +49,3 @@ for example, by setting a corresponding environment variable.
 export NODE_OPTIONS="$NODE_OPTIONS --max-old-space-size=8192"
 ```
 
-## Publishing
-
-The list of files to publish is defined by the `files` attribute in `package.json`.
-The actual files packed by npm can be listed by running `npx npm-packlist`.
-

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/coverage-collector",
-    "version": "0.0.1-beta.5",
+    "version": "0.0.1-beta.51",
     "description": "Collector for JavaScript code coverage information",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",
@@ -12,22 +12,30 @@
         "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"
+        "test": "yarn build && NODE_OPTIONS='--experimental-vm-modules' jest --coverage --silent=true"
     },
     "files": [
         "dist/**/*"
     ],
     "dependencies": {
-        "@cqse/commons": "^0.0.1-beta.1",
+        "@cqse/commons": "^0.0.1-beta.45",
         "argparse": "^2.0.1",
-        "async": "^3.2.0",
+        "async": "^3.2.4",
+        "axios": "^0.24.0",
+        "bunyan": "^1.8.15",
+        "date-and-time": "^2.3.1",
+        "dotenv": "^14.1.0",
+        "express": "^4.18.1",
+        "form-data": "^4.0.0",
+        "mkdirp": "^1.0.4",
         "rxjs": "^7.1.0",
-        "source-map": "^0.7.3",
+        "source-map": "^0.7.4",
+        "tmp": "^0.2.1",
         "typescript-optional": "^2.0.1",
-        "winston": "^3.3.3",
         "ws": "^7.4.5"
     },
     "devDependencies": {
@@ -35,14 +43,18 @@
         "@babel/preset-env": "^7.14.1",
         "@types/argparse": "^2.0.5",
         "@types/async": "^3.2.6",
+        "@types/bunyan": "^1.8.8",
+        "@types/express": "^4.17.13",
         "@types/jest": "^27.0.1",
+        "@types/mkdirp": "^1.0.2",
         "@types/node": "^15.0.1",
         "@types/source-map": "^0.5.7",
-        "@types/winston": "^2.4.4",
+        "@types/tmp": "^0.2.3",
         "@types/ws": "^7.4.2",
         "babel-jest": "^27.2.0",
         "esbuild": "^0.13.4",
         "jest": "^27.2.0",
+        "mockttp": "^3.4.0",
         "rimraf": "^3.0.2",
         "ts-jest": "^27.0.5",
         "ts-node": "^10.2.1",

package/dist/src/App.d.ts

@@ -0,0 +1,39 @@
+import 'dotenv/config';
+import { ConfigParameters } from './utils/ConfigParameters';
+/**
+ * The main class of the Teamscale JavaScript Collector.
+ * Used to start the collector with a given configuration.
+ */
+export declare class App {
+    /**
+     * Parse the given command line arguments into a corresponding options object.
+     */
+    private static parseArguments;
+    /**
+     * Construct the logger.
+     */
+    private static buildLogger;
+    /**
+     * Entry point of the Teamscale JavaScript Profiler.
+     */
+    static run(): void;
+    /**
+     * Run the collector with the given configuration options.
+     *
+     * @param config - The configuration options to run the collector with.
+     */
+    static runWithConfig(config: ConfigParameters): {
+        stop: () => Promise<void>;
+    };
+    /**
+     * Start a timer for dumping the data, depending on the configuration.
+     *
+     * @param config - The config that determines whether to do the timed dump or not.
+     * @param storage - The storage with the information to dump.
+     * @param logger - The logger to use.
+     */
+    private static maybeStartDumpTimer;
+    private static dumpCoverage;
+    private static uploadCoverage;
+    private static startControlServer;
+}

package/dist/src/App.js

@@ -0,0 +1,244 @@
+"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 };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.App = void 0;
+const bunyan_1 = __importDefault(require("bunyan"));
+const DataStorage_1 = require("./storage/DataStorage");
+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 path_1 = __importDefault(require("path"));
+const StdConsoleLogger_1 = require("./utils/StdConsoleLogger");
+const PrettyFileLogger_1 = require("./utils/PrettyFileLogger");
+const express_1 = __importDefault(require("express"));
+const TeamscaleUpload_1 = require("./upload/TeamscaleUpload");
+const CommonUpload_1 = require("./upload/CommonUpload");
+const ArtifactoryUpload_1 = require("./upload/ArtifactoryUpload");
+/**
+ * The main class of the Teamscale JavaScript Collector.
+ * Used to start the collector with a given configuration.
+ */
+class App {
+    /**
+     * Parse the given command line arguments into a corresponding options object.
+     */
+    static parseArguments() {
+        const parser = (0, ConfigParameters_1.buildParameterParser)();
+        return parser.parse_args();
+    }
+    /**
+     * Construct the logger.
+     */
+    static buildLogger(config) {
+        const logfilePath = config.log_to_file.trim();
+        mkdirp_1.default.sync(path_1.default.dirname(logfilePath));
+        const logLevel = config.log_level;
+        const logger = bunyan_1.default.createLogger({
+            name: 'Collector',
+            streams: [
+                // console output
+                { level: logLevel, stream: new StdConsoleLogger_1.StdConsoleLogger(), type: 'raw' },
+                // default log file
+                { level: logLevel, stream: new PrettyFileLogger_1.PrettyFileLogger(fs.createWriteStream(logfilePath)), type: 'raw' }
+            ]
+        });
+        // If the given flag is set, we also log with a JSON-like format
+        if (config.json_log) {
+            logger.addStream({ level: logLevel, path: `${logfilePath}.json` });
+        }
+        return logger;
+    }
+    /**
+     * Entry point of the Teamscale JavaScript Profiler.
+     */
+    static run() {
+        // Parse the command line arguments
+        const config = this.parseArguments();
+        App.runWithConfig(config);
+    }
+    /**
+     * Run the collector with the given configuration options.
+     *
+     * @param config - The configuration options to run the collector with.
+     */
+    static runWithConfig(config) {
+        // Build the logger
+        const logger = this.buildLogger(config);
+        logger.info(`Starting collector in working directory "${process.cwd()}".`);
+        logger.info(`Logging "${config.log_level}" to "${config.log_to_file}".`);
+        // Prepare the storage and the server
+        const storage = new DataStorage_1.DataStorage(logger);
+        const server = new CollectingServer_1.WebSocketCollectingServer(config.port, storage, logger);
+        // Enable the remote control API if configured
+        const controlServerState = this.startControlServer(config, storage, logger);
+        // Start the server socket.
+        // ATTENTION: The server is executed asynchronously
+        const serverState = server.start();
+        // Optionally, start a timer that dumps the coverage after a N seconds
+        const timerState = this.maybeStartDumpTimer(config, storage, logger);
+        // Say bye bye on CTRL+C and exit the process
+        process.on('SIGINT', async () => {
+            // ... and do a final dump before.
+            await this.dumpCoverage(config, storage, logger);
+            logger.info('Bye bye.');
+            process.exit();
+        });
+        return {
+            async stop() {
+                logger.info('Stopping the collector.');
+                timerState.stop();
+                await controlServerState.stop();
+                serverState.stop();
+            }
+        };
+    }
+    /**
+     * Start a timer for dumping the data, depending on the configuration.
+     *
+     * @param config - The config that determines whether to do the timed dump or not.
+     * @param storage - The storage with the information to dump.
+     * @param logger - The logger to use.
+     */
+    static maybeStartDumpTimer(config, storage, logger) {
+        if (config.dump_after_mins > 0) {
+            logger.info(`Will dump coverage information every ${config.dump_after_mins} minute(s).`);
+            const timer = setInterval(async () => {
+                await this.dumpCoverage(config, storage, logger);
+            }, config.dump_after_mins * 1000 * 60);
+            process.on('SIGINT', () => {
+                // Stop the timed file dump
+                if (timer) {
+                    clearInterval(timer);
+                }
+            });
+            return {
+                stop: () => clearInterval(timer)
+            };
+        }
+        return {
+            stop() {
+                // no timer to stop yet
+            }
+        };
+    }
+    static async dumpCoverage(config, storage, logger) {
+        try {
+            // 1. Write coverage to a file
+            const [coverageFile, lines] = storage.dumpToSimpleCoverageFile(config.dump_to_folder, new Date());
+            logger.info(`Dumped ${lines} lines of coverage to ${coverageFile}.`);
+            // 2. Upload to Teamscale or Artifactory if configured
+            if (config.teamscale_server_url || config.artifactory_server_url) {
+                await this.uploadCoverage(config, coverageFile, lines, logger);
+            }
+        }
+        catch (e) {
+            if (e instanceof CommonUpload_1.UploadError) {
+                logger.error(`Coverage upload failed. The coverage files on disk (inside the folder "${config.dump_to_folder}") were not deleted. 
+					You can still upload them manually.`, e);
+            }
+            else {
+                logger.error('Coverage dump failed.', e);
+            }
+        }
+    }
+    static async uploadCoverage(config, coverageFile, lines, logger) {
+        if (config.teamscale_server_url) {
+            await (0, TeamscaleUpload_1.uploadToTeamscale)(config, logger, coverageFile, lines);
+        }
+        if (config.artifactory_server_url) {
+            await (0, ArtifactoryUpload_1.uploadToArtifactory)(config, logger, coverageFile, lines);
+        }
+        // Delete coverage if upload was successful and keeping coverage files on disk was not configure by the user
+        if (!config.keep_coverage_files) {
+            fs.unlinkSync(coverageFile);
+        }
+    }
+    static startControlServer(config, storage, logger) {
+        if (!config.enable_control_port) {
+            return {
+                async stop() {
+                    // nothing to stop in this case
+                }
+            };
+        }
+        const controlServer = (0, express_1.default)();
+        controlServer.use(express_1.default.text({}));
+        const serverSocket = controlServer.listen(config.enable_control_port);
+        controlServer.put('/partition', (request, response) => {
+            const targetPartition = request.body.trim();
+            config.teamscale_partition = targetPartition;
+            logger.info(`Switched the target partition to '${targetPartition}' via the control API.`);
+            response.sendStatus(200);
+        });
+        controlServer.post('/dump', async (request, response) => {
+            logger.info('Dumping coverage requested via the control API.');
+            await this.dumpCoverage(config, storage, logger);
+            response.sendStatus(200);
+        });
+        controlServer.put('/project', async (request, response) => {
+            const targetProject = request.body.trim();
+            config.teamscale_project = targetProject;
+            logger.info(`Switching the target project to '${targetProject}' via the control API.`);
+            response.sendStatus(200);
+        });
+        controlServer.put('/revision', async (request, response) => {
+            const targetRevision = request.body.trim();
+            config.teamscale_revision = targetRevision;
+            logger.info(`Switching the target revision to '${targetRevision}' via the control API.`);
+            response.sendStatus(200);
+        });
+        controlServer.put('/commit', async (request, response) => {
+            const targetCommit = request.body.trim();
+            config.teamscale_commit = targetCommit;
+            logger.info(`Switching the target commit to '${targetCommit}' via the control API.`);
+            response.sendStatus(200);
+        });
+        controlServer.put('/message', async (request, response) => {
+            const uploadMessage = request.body.trim();
+            config.teamscale_message = uploadMessage;
+            logger.info(`Switching the upload message to '${uploadMessage}' via the control API.`);
+            response.sendStatus(200);
+        });
+        controlServer.post('/reset', async (request, response) => {
+            storage.discardCollectedCoverage();
+            logger.info(`Discarding collected coverage information as requested via the control API.`);
+            response.sendStatus(200);
+        });
+        logger.info(`Control server enabled at port ${config.enable_control_port}`);
+        return {
+            async stop() {
+                return new Promise(resolve => {
+                    serverSocket.close(() => resolve());
+                });
+            }
+        };
+    }
+}
+exports.App = App;

package/dist/src/main.d.ts

@@ -1,31 +1,2 @@
 #!/usr/bin/env node
-/**
- * The main class of the Teamscale JavaScript Collector.
- * Used to start-up the collector for with a given configuration.
- */
-export declare class Main {
-    /**
-     * Construct the object for parsing the command line arguments.
-     */
-    private static buildParser;
-    /**
-     * Parse the given command line arguments into a corresponding options object.
-     */
-    private static parseArguments;
-    /**
-     * Construct the logger.
-     */
-    private static buildLogger;
-    /**
-     * Entry point of the Teamscale JavaScript Profiler.
-     */
-    static run(): void;
-    /**
-     * Start a timer for dumping the data, depending on the configuration.
-     *
-     * @param config - The config that determines whether or not to do the timed dump.
-     * @param storage - The storage with the information to dump.
-     * @param logger - The logger to use.
-     */
-    private static maybeStartDumpTimer;
-}
+export {};

package/dist/src/main.js

@@ -1,118 +1,5 @@
 #!/usr/bin/env node
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Main = void 0;
-const package_json_1 = require("../package.json");
-const argparse_1 = require("argparse");
-const winston_1 = __importDefault(require("winston"));
-const DataStorage_1 = require("./storage/DataStorage");
-const CollectingServer_1 = require("./receiver/CollectingServer");
-/**
- * The main class of the Teamscale JavaScript Collector.
- * Used to start-up the collector for with a given configuration.
- */
-class Main {
-    /**
-     * Construct the object for parsing the command line arguments.
-     */
-    static buildParser() {
-        const parser = new argparse_1.ArgumentParser({
-            description: 'Collector of the Teamscale JavaScript Profiler. Collects coverage information from a' +
-                '(headless) Web browser that executes code instrumented with our instrumenter.'
-        });
-        parser.add_argument('-v', '--version', { action: 'version', version: package_json_1.version });
-        parser.add_argument('-p', '--port', { help: 'The port to receive coverage information on.', default: 54678 });
-        parser.add_argument('-f', '--dump-to-file', { help: 'Target file', default: './coverage.simple' });
-        parser.add_argument('-l', '--log-to-file', { help: 'Log file', default: 'logs/collector-combined.log' });
-        parser.add_argument('-e', '--log-level', { help: 'Log level', default: 'info' });
-        parser.add_argument('-t', '--dump-after-mins', {
-            help: 'Dump the coverage information to the target file every N minutes.',
-            default: 120
-        });
-        parser.add_argument('-d', '--debug', {
-            help: 'Print received coverage information to the terminal?',
-            default: false
-        });
-        return parser;
-    }
-    /**
-     * Parse the given command line arguments into a corresponding options object.
-     */
-    static parseArguments() {
-        const parser = this.buildParser();
-        return parser.parse_args();
-    }
-    /**
-     * Construct the logger.
-     */
-    static buildLogger(config) {
-        return winston_1.default.createLogger({
-            level: config.log_level,
-            format: winston_1.default.format.json(),
-            defaultMeta: {},
-            transports: [
-                new winston_1.default.transports.File({ filename: 'logs/collector-error.log', level: 'error' }),
-                new winston_1.default.transports.File({ filename: config.log_to_file.trim() }),
-                new winston_1.default.transports.Console({ format: winston_1.default.format.simple(), level: config.log_level })
-            ]
-        });
-    }
-    /**
-     * Entry point of the Teamscale JavaScript Profiler.
-     */
-    static run() {
-        // Parse the command line arguments
-        const config = this.parseArguments();
-        // Build the logger
-        const logger = this.buildLogger(config);
-        logger.info(`Starting collector in working directory "${process.cwd()}".`);
-        logger.info(`Logging "${config.log_level}" to "${config.log_to_file}".`);
-        // Prepare the storage and the server
-        const storage = new DataStorage_1.DataStorage(logger);
-        const server = new CollectingServer_1.WebSocketCollectingServer(config.port, storage, logger);
-        // Start the server socket.
-        // ATTENTION: The server is executed asynchronously
-        server.start();
-        // Optionally, start a timer that dumps the coverage after a N seconds
-        this.maybeStartDumpTimer(config, storage, logger);
-        // Say bye bye on CTRL+C and exit the process
-        process.on('SIGINT', () => {
-            logger.info('Bye bye.');
-            process.exit();
-        });
-    }
-    /**
-     * Start a timer for dumping the data, depending on the configuration.
-     *
-     * @param config - The config that determines whether or not to do the timed dump.
-     * @param storage - The storage with the information to dump.
-     * @param logger - The logger to use.
-     */
-    static maybeStartDumpTimer(config, storage, logger) {
-        if (config.dump_after_mins > 0) {
-            const timer = setInterval(() => {
-                try {
-                    const lines = storage.dumpToSimpleCoverageFile(config.dump_to_file);
-                    logger.info(`Conducted periodic coverage dump with ${lines} lines to ${config.dump_to_file}.`);
-                }
-                catch (e) {
-                    logger.error('Timed coverage dump failed.', e);
-                }
-            }, config.dump_after_mins * 1000 * 60);
-            process.on('SIGINT', () => {
-                // Stop the timed file dump
-                if (timer) {
-                    clearInterval(timer);
-                }
-                // ... and do a final dump
-                const written = storage.dumpToSimpleCoverageFile(config.dump_to_file);
-                logger.info(`\nCaught interrupt signal. Written ${written} lines of the latest coverage.`);
-            });
-        }
-    }
-}
-exports.Main = Main;
-Main.run();
+const App_1 = require("./App");
+App_1.App.run();

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

@@ -1,5 +1,5 @@
 import { IDataStorage } from '../storage/DataStorage';
-import { Logger } from 'winston';
+import Logger from 'bunyan';
 /**
  * Various constants that are used to exchange data between
  * the instrumented application and the coverage collector.
@@ -18,7 +18,7 @@ export declare class WebSocketCollectingServer {
     /**
      * The WebSocket server component.
      */
-    private readonly server;
+    private server;
     /**
      * The storage to put the received coverage information to for aggregation and further processing.
      */
@@ -38,7 +38,9 @@ export declare class WebSocketCollectingServer {
     /**
      * Start the server socket, handle sessions and dispatch messages.
      */
-    start(): void;
+    start(): {
+        stop: () => void;
+    };
     /**
      * Handle a message from a client.
      *

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];
@@ -60,9 +64,10 @@ class WebSocketCollectingServer {
      * Start the server socket, handle sessions and dispatch messages.
      */
     start() {
-        this.logger.info(`Starting server on port ${this.server.options.port}.`);
+        var _a, _b;
+        this.logger.info(`Starting server on port ${(_a = this.server) === null || _a === void 0 ? void 0 : _a.options.port}.`);
         // Handle new connections from clients
-        this.server.on('connection', (webSocket, req) => {
+        (_b = this.server) === null || _b === void 0 ? void 0 : _b.on('connection', (webSocket, req) => {
             let session = new Session_1.Session(req.socket, this.storage, this.logger);
             this.logger.debug(`Connection from: ${req.socket.remoteAddress}`);
             // Handle disconnecting clients
@@ -75,9 +80,9 @@ class WebSocketCollectingServer {
                 }
             });
             // Handle incoming messages
-            webSocket.on('message', (message) => {
+            webSocket.on('message', async (message) => {
                 if (session && typeof message === 'string') {
-                    this.handleMessage(session, message);
+                    await this.handleMessage(session, message);
                 }
             });
             // Handle errors
@@ -85,6 +90,13 @@ class WebSocketCollectingServer {
                 this.logger.error('Error on server socket triggered.', e);
             });
         });
+        return {
+            stop: () => {
+                var _a;
+                (_a = this.server) === null || _a === void 0 ? void 0 : _a.close();
+                this.server = null;
+            }
+        };
     }
     /**
      * Handle a message from a client.
@@ -92,13 +104,13 @@ class WebSocketCollectingServer {
      * @param session - The session that has been started for the client.
      * @param message - The message to handle.
      */
-    handleMessage(session, message) {
+    async handleMessage(session, message) {
         try {
             if (message.startsWith(ProtocolMessageTypes.TYPE_SOURCEMAP)) {
-                this.handleSourcemapMessage(session, message.substring(1));
+                await this.handleSourcemapMessage(session, message.substring(1));
             }
             else if (message.startsWith(ProtocolMessageTypes.TYPE_COVERAGE)) {
-                this.handleCoverageMessage(session, message.substring(1));
+                await this.handleCoverageMessage(session, message.substring(1));
             }
         }
         catch (e) {
@@ -112,13 +124,13 @@ class WebSocketCollectingServer {
      * @param session - The session to handle the message for.
      * @param body - The body of the message (to be parsed).
      */
-    handleSourcemapMessage(session, body) {
+    async handleSourcemapMessage(session, body) {
         const fileIdSeparatorPosition = body.indexOf(INSTRUMENTATION_SUBJECT_SEPARATOR);
         if (fileIdSeparatorPosition > -1) {
             const fileId = body.substring(0, fileIdSeparatorPosition).trim();
             this.logger.debug(`Received source map information for ${fileId}`);
             const sourcemap = body.substring(fileIdSeparatorPosition + 1);
-            session.putSourcemap(fileId, sourcemap);
+            await session.putSourcemap(fileId, sourcemap);
         }
     }
     /**
@@ -127,16 +139,21 @@ class WebSocketCollectingServer {
      * @param session - The session to handle the message for.
      * @param body - The body of the message (to be parsed).
      */
-    handleCoverageMessage(session, body) {
+    async handleCoverageMessage(session, body) {
         var _a;
-        const bodyPattern = /(?<fileId>\S+) (?<positions>((\d+:\d+)\s+)*(\d+:\d+))/;
+        const bodyPattern = /(?<fileId>\S+) (?<positions>((\d+:\d+(:\d+:\d+)?\s+)*(\d+:\d+(:\d+:\d+)?)))/;
         const matches = bodyPattern.exec(body);
         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+/);
             for (const position of positions) {
-                const [line, column] = position.split(':');
-                session.putCoverage(fileId, Number.parseInt(line), Number.parseInt(column));
+                const positionParts = position.split(':');
+                if (positionParts.length === 2) {
+                    session.putCoverage(fileId, Number.parseInt(positionParts[0]), Number.parseInt(positionParts[1]), Number.parseInt(positionParts[1]), Number.parseInt(positionParts[2]));
+                }
+                else if (positionParts.length === 4) {
+                    session.putCoverage(fileId, Number.parseInt(positionParts[0]), Number.parseInt(positionParts[1]), Number.parseInt(positionParts[2]), Number.parseInt(positionParts[3]));
+                }
             }
         }
     }