slnodejs 6.1.163 → 6.1.168

package/browser-agent/dist/browser-agent-all.js

@@ -43067,7 +43067,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             this.footprintsProcess.stop(function () { });
         };
         BrowserAgentInstanceFpv6.prototype.submitFootprints = function () {
-            this.footprintsProcess.submitQueuedFootprints();
+            this.footprintsProcess.submitQueuedFootprints(this.stateTracker.currentExecution);
         };
         BrowserAgentInstanceFpv6.prototype.submitFootprintsSync = function () {
             return __awaiter(this, void 0, void 0, function () {
@@ -43079,7 +43079,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                             return [4, this.footprintsProcess.flushCurrentFootprints()];
                         case 1:
                             _a.sent();
-                            return [4, this.footprintsProcess.submitQueuedFootprints()];
+                            return [4, this.footprintsProcess.submitQueuedFootprints(this.stateTracker.currentExecution)];
                         case 2:
                             _a.sent();
                             return [3, 4];
@@ -47731,6 +47731,9 @@ var __extends = (this && this.__extends) || (function () {
         SlEnvVars.getDisableHookDependencyGuard = function () {
             return parsing_utils_1.ParsingUtils.parseBoolean(SlEnvVars.DISABLE_HOOK_DEPENDENCY_GUARD);
         };
+        SlEnvVars.useSlMapping = function () {
+            return parsing_utils_1.ParsingUtils.parseBoolean(SlEnvVars.USE_SL_MAPPING);
+        };
         var _a;
         SlEnvVars.HTTP_TIMEOUT = 'SL_httpTimeout';
         SlEnvVars.HTTP_MAX_ATTEMPTS = 'SL_HttpMaxAttempts';
@@ -47748,6 +47751,7 @@ var __extends = (this && this.__extends) || (function () {
         SlEnvVars.FOOTPRINTS_BUFFER_THRESHOLD_MB = 'SL_footprintsBufferThresholdMb';
         SlEnvVars.BLOCK_BROWSER_HTTP_TRAFFIC = 'SL_blockBrowserHttpTraffic';
         SlEnvVars.DISABLE_HOOK_DEPENDENCY_GUARD = 'SL_disableHookDependencyGuard';
+        SlEnvVars.USE_SL_MAPPING = 'SL_useSlMapping';
         SlEnvVars.CIA = (_a = (function () {
                 function class_1() {
                 }
@@ -49372,6 +49376,7 @@ var __extends = (this && this.__extends) || (function () {
     var HitsConverter = (function () {
         function HitsConverter(relativePathResolver, sourceMapData, projectRoot, logger) {
             this.conversionErrors = [];
+            this._slMapping = {};
             this.relativePathResolver = relativePathResolver;
             this.sourceMapData = sourceMapData;
             this.projectRoot = projectRoot;
@@ -49398,6 +49403,16 @@ var __extends = (this && this.__extends) || (function () {
                 methods: methodUniqueIds
             };
         };
+        Object.defineProperty(HitsConverter.prototype, "slMapping", {
+            get: function () {
+                return this._slMapping;
+            },
+            set: function (value) {
+                this._slMapping = value;
+            },
+            enumerable: false,
+            configurable: true
+        });
         HitsConverter.prototype.createMethodIds = function (hitFunctions, relativePath, absolutePath) {
             var _this = this;
             var methodIds = [];
@@ -49476,7 +49491,7 @@ var __extends = (this && this.__extends) || (function () {
             return uniqueId;
         };
         HitsConverter.prototype.resolveIdParts = function (startLoc, relativePath, absolutePath) {
-            var sourcePosition = this.sourceMapData.getSourcePosition(relativePath, absolutePath, startLoc, this.projectRoot);
+            var sourcePosition = this.sourceMapData.getSourcePosition(relativePath, absolutePath, startLoc, this.projectRoot, this.slMapping);
             return sourcePosition ? sourcePosition : { relativePath: relativePath, start: startLoc, absolutePath: absolutePath };
         };
         HitsConverter.prototype.buildMethodUniqueId = function (parts) {
@@ -49499,6 +49514,17 @@ var __extends = (this && this.__extends) || (function () {
 });
 
 },{"../agent-events/cockpit-notifier":294,"../constants/sl-env-vars":305,"../coverage-elements/new-id-resolver":309,"../coverage-elements/original-module-loader":310,"./hits-collector":318}],320:[function(require,module,exports){
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -49541,7 +49567,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./footprints-buffer", "../footprints-process/collection-interval", "../state-tracker", "../agent-events/cockpit-notifier", "../agent-events/agent-events-conracts"], factory);
+        define(["require", "exports", "./footprints-buffer", "../footprints-process/collection-interval", "../state-tracker", "../agent-events/cockpit-notifier", "../agent-events/agent-events-conracts", "../constants/sl-env-vars"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -49552,6 +49578,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     var state_tracker_1 = require("../state-tracker");
     var cockpit_notifier_1 = require("../agent-events/cockpit-notifier");
     var agent_events_conracts_1 = require("../agent-events/agent-events-conracts");
+    var sl_env_vars_1 = require("../constants/sl-env-vars");
     var FootprintsProcess = (function () {
         function FootprintsProcess(cfg, sendToServerWatchdog, keepaliveWatchdog, logger, hitsCollector, hitsConverter, footprintsBuffer, backendProxy, stateTracker) {
             this.isRunning = false;
@@ -49569,15 +49596,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             this.logger = logger;
             this.delegateEvents();
         }
-        FootprintsProcess.prototype.enqueueCurrentFootprints = function (executionId, testName, executionBsid, isFinalFootprints) {
+        FootprintsProcess.prototype.enqueueCurrentFootprints = function (execution, testName, isFinalFootprints) {
             if (isFinalFootprints === void 0) { isFinalFootprints = false; }
-            this.currentExecutionBsid = executionBsid;
+            this.currentExecutionBsid = execution.buildSessionId;
             this.collectionInterval.next();
             var hitFilesData = this.hitsCollector.getHitElements();
             if (hitFilesData.length) {
                 this.logger.info("Collecting hits for '" + hitFilesData.length + "' files");
                 var convertedHits = this.hitsConverter.convertHits(hitFilesData);
-                this.footprintsBuffer.addHit(convertedHits, this.collectionInterval.toJson(), executionId, testName, this.isInitFootprints(), isFinalFootprints);
+                this.footprintsBuffer.addHit(convertedHits, this.collectionInterval.toJson(), execution.executionId, testName, this.isInitFootprints(), isFinalFootprints);
             }
             else {
                 this.logger.info('No files were hits, not collecting footprints');
@@ -49602,7 +49629,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         FootprintsProcess.prototype.ensureKeepaliveThreadRunning = function () {
             this.keepaliveWatchdog.start();
         };
-        FootprintsProcess.prototype.submitQueuedFootprints = function () {
+        FootprintsProcess.prototype.submitQueuedFootprints = function (execution) {
             return __awaiter(this, void 0, void 0, function () {
                 var packet, e_1;
                 return __generator(this, function (_a) {
@@ -49617,7 +49644,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                             _a.label = 1;
                         case 1:
                             _a.trys.push([1, 3, 4, 5]);
-                            return [4, this.backendProxy.submitFootprintsV6(packet, this.currentExecutionBsid, this.stateTracker.getTestStage(), this.cfg.buildSessionId.value)];
+                            return [4, this.backendProxy.submitFootprintsV6(packet, execution.buildSessionId, execution.testStage, this.cfg.buildSessionId.value)];
                         case 2:
                             _a.sent();
                             this.logger.info("Footprints packet submitted successfully. packet contains " + packet.methods.length + " methods, " + packet.branches.length + " branches in " + packet.executions.length + " executions");
@@ -49694,14 +49721,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                 }
                 this.logger.debug('Test identifier changed, start enqueuing footprints process.');
                 var prevTestIdentifierParts = state_tracker_1.StateTracker.splitTestIdToExecutionAndTestName(previousTestIdentifier);
-                this.enqueueCurrentFootprints(this.stateTracker.currentExecution.executionId, prevTestIdentifierParts.testName, this.stateTracker.currentExecution.buildSessionId);
+                this.enqueueCurrentFootprints(this.stateTracker.currentExecution, prevTestIdentifierParts.testName);
             }
         };
         FootprintsProcess.prototype.delegateEvents = function () {
             var _this = this;
             this.sendToServerWatchdog.on(FootprintsProcess.ALARM_FIRED, function () {
                 _this.logger.debug('Start submitting footprints, triggered by send to server watchdog.');
-                _this.submitQueuedFootprints();
+                _this.submitQueuedFootprints(_this.stateTracker.currentExecution);
             });
             this.keepaliveWatchdog.on(FootprintsProcess.ALARM_FIRED, function () {
                 if (!_this.hasOngoingRequests() && !_this.footprintsBuffer.hasHitsInBuffer()) {
@@ -49709,7 +49736,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                 }
             });
             this.footprintsBuffer.on(footprints_buffer_1.FootprintsBuffer.BUFFER_FULL, function () {
-                _this.submitQueuedFootprints();
+                _this.submitQueuedFootprints(_this.stateTracker.currentExecution);
             });
             this.stateTracker.on(state_tracker_1.StateTracker.EXECUTION_BSID_CHANGED, function (prevExecution, newBuildSession) {
                 _this.logger.warn("Execution points to different build session '" + newBuildSession + "'. Collecting and submitting previous footprints");
@@ -49717,17 +49744,20 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             });
             this.stateTracker.on(state_tracker_1.StateTracker.EXECUTION_ID_CHANGED, function (prevExecution, newExecutionId) {
                 _this.logger.warn("Execution id changed to'" + newExecutionId + "'. Collecting previous footprints");
-                _this.enqueueCurrentFootprints(prevExecution.executionId, null, prevExecution.buildSessionId);
+                _this.enqueueCurrentFootprints(prevExecution, null);
             });
             this.stateTracker.on(state_tracker_1.StateTracker.TEST_STAGE_CHANGED, function (prevExecution, newTestStage) {
                 _this.logger.warn("Execution points to different test stage '" + newTestStage + "'. Collecting and submitting previous footprints");
                 _this.enqueueAndSubmit(prevExecution);
             });
+            this.stateTracker.on(state_tracker_1.StateTracker.EXECUTION_STATUS_PENDING_DELETE, function (execution) {
+                _this.enqueueAndSubmit(execution);
+            });
         };
         FootprintsProcess.prototype.enqueueAndSubmit = function (executionData, isFinalFootprints) {
             if (isFinalFootprints === void 0) { isFinalFootprints = false; }
-            this.enqueueCurrentFootprints(executionData.executionId, null, executionData.buildSessionId, isFinalFootprints);
-            this.submitQueuedFootprints();
+            this.enqueueCurrentFootprints(executionData, null, isFinalFootprints);
+            this.submitQueuedFootprints(executionData);
         };
         FootprintsProcess.prototype.flushCurrentFootprints = function (isFinalFootprints) {
             if (isFinalFootprints === void 0) { isFinalFootprints = false; }
@@ -49735,11 +49765,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             if (currentTestIdentifier) {
                 var testIdentifierParts = state_tracker_1.StateTracker.splitTestIdToExecutionAndTestName(currentTestIdentifier);
                 this.logger.debug('Enqueue footprints interval - start enqueuing process. currentTestIdentifier: \'%s\'', currentTestIdentifier);
-                this.enqueueCurrentFootprints(this.stateTracker.currentExecution.executionId, testIdentifierParts.testName, this.stateTracker.currentExecution.buildSessionId, isFinalFootprints);
+                this.enqueueCurrentFootprints(this.stateTracker.currentExecution, testIdentifierParts.testName, isFinalFootprints);
             }
             else if (this.stateTracker.shouldCollectHits()) {
                 this.logger.debug('Enqueue footprints interval - start enqueuing process. anonymous footprints');
-                this.enqueueCurrentFootprints(this.stateTracker.currentExecution.executionId, null, this.stateTracker.currentExecution.buildSessionId, isFinalFootprints);
+                this.enqueueCurrentFootprints(this.stateTracker.currentExecution, null, isFinalFootprints);
             }
             else {
                 this.logger.info('Enqueue footprints interval - no active execution. skip enqueuing process.');
@@ -49758,13 +49788,35 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         FootprintsProcess.prototype.hasOngoingRequests = function () {
             return this.ongoingRequestsCounter > 0;
         };
+        FootprintsProcess.prototype.loadSlMapping = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var mappingsArr, flatted;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!sl_env_vars_1.SlEnvVars.useSlMapping()) {
+                                return [2];
+                            }
+                            return [4, this.backendProxy.getBlobsAsJson(this.cfg.buildSessionId.value)];
+                        case 1:
+                            mappingsArr = _a.sent();
+                            flatted = {};
+                            mappingsArr.forEach(function (mapping) {
+                                flatted = __assign(__assign({}, flatted), mapping);
+                            });
+                            this.hitsConverter.slMapping = flatted;
+                            return [2];
+                    }
+                });
+            });
+        };
         FootprintsProcess.ALARM_FIRED = 'alarm';
         return FootprintsProcess;
     }());
     exports.FootprintsProcess = FootprintsProcess;
 });
 
-},{"../agent-events/agent-events-conracts":289,"../agent-events/cockpit-notifier":294,"../footprints-process/collection-interval":323,"../state-tracker":332,"./footprints-buffer":317}],321:[function(require,module,exports){
+},{"../agent-events/agent-events-conracts":289,"../agent-events/cockpit-notifier":294,"../constants/sl-env-vars":305,"../footprints-process/collection-interval":323,"../state-tracker":332,"./footprints-buffer":317}],321:[function(require,module,exports){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -51195,7 +51247,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             return this._currentExecution != null;
         };
         StateTracker.prototype.shouldCollectHits = function () {
-            return this.hasMappingAtServer();
+            return this.hasMappingAtServer() && this.currentExecution.executionId !== this.pendingDeleteExecId;
         };
         Object.defineProperty(StateTracker.prototype, "currentExecution", {
             get: function () {
@@ -51267,7 +51319,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             }
         };
         StateTracker.prototype.getTestStage = function () {
-            return (this.currentExecution && this.currentExecution.testStage) || this.cfg.testStage.value;
+            var _a;
+            return (_a = this.currentExecution) === null || _a === void 0 ? void 0 : _a.testStage;
         };
         StateTracker.splitTestIdToExecutionAndTestName = function (testId) {
             testId = testId || '';
@@ -51318,6 +51371,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             if (!executionData) {
                 return;
             }
+            if (executionData.status == StateTracker.EXECUTION_STATUS_PENDING_DELETE) {
+                if (executionData.executionId !== this.pendingDeleteExecId) {
+                    this.currentExecution = executionData;
+                    this.emit(StateTracker.EXECUTION_STATUS_PENDING_DELETE, executionData);
+                    this.pendingDeleteExecId = executionData.executionId;
+                }
+                return;
+            }
             if (!this.currentExecution) {
                 return;
             }