slnodejs 6.1.192 → 6.1.206

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

@@ -23622,7 +23622,7 @@ module.exports={
   "_resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
   "_shasum": "da37cebd31e79a1367e941b592ed1fbebd58abbb",
   "_spec": "elliptic@^6.5.3",
-  "_where": "/var/lib/jenkins/workspace/.OnPremise.Agent.JavaScript_main/browser-agent/node_modules/browserify-sign",
+  "_where": "/var/lib/jenkins/workspace/.OnPremise.Agent.JavaScript_main@2/browser-agent/node_modules/browserify-sign",
   "author": {
     "name": "Fedor Indutny",
     "email": "fedor@indutny.com"
@@ -46240,6 +46240,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
     var system_date_1 = require("../system-date");
     var AgentEventsController = (function () {
         function AgentEventsController(agentConfig, agentInstanceData, logger, backendProxy, tool, tags) {
+            this.active = false;
             validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(agentConfig, 'agentConfig');
             validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(agentInstanceData, 'agentInstanceData');
             validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(logger, 'logger');
@@ -46259,6 +46260,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            this.active = true;
                             this.startRequestStatus = StartRequestStatus.PENDING;
                             event = this.buildAgentStartEvent(packageJsonFile || {});
                             return [4, this.submitAgentEventRequest(event)];
@@ -46282,6 +46284,10 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            if (!this.active) {
+                                this._logger.debug('Agent not active - not submitting event');
+                                return [2, false];
+                            }
                             request = {
                                 agentId: this._agentInstanceData.agentId,
                                 events: Array.isArray(event) ? event : [event],
@@ -46320,27 +46326,32 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
         };
         AgentEventsController.prototype.submitAgentShutdownEvent = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var event;
+                var event, result;
                 var _this = this;
                 return __generator(this, function (_a) {
-                    this.shutDownRetries++;
-                    if (this.startRequestStatus == StartRequestStatus.FAILED) {
-                        this._logger.debug('Agent start not submitted - not sending shut down events');
-                        return [2];
-                    }
-                    if (this.shutDownRetries > AgentEventsController.MAX_SHUTDOWN_RETRIES) {
-                        this._logger.debug('Stop trying to send shutdown event after 60 seconds ');
-                        return [2];
-                    }
-                    this._pingWatchdog.stop();
-                    event = this.buildAgentShutdownEvent();
-                    if (this.startRequestStatus == StartRequestStatus.PENDING) {
-                        setTimeout(function () { return _this.submitAgentShutdownEvent.call(_this); }, 1000);
-                    }
-                    else {
-                        return [2, this.submitAgentEventRequest(event)];
+                    switch (_a.label) {
+                        case 0:
+                            this.shutDownRetries++;
+                            if (this.startRequestStatus == StartRequestStatus.FAILED) {
+                                this._logger.debug('Agent start not submitted - not sending shut down events');
+                                return [2];
+                            }
+                            if (this.shutDownRetries > AgentEventsController.MAX_SHUTDOWN_RETRIES) {
+                                this._logger.debug('Stop trying to send shutdown event after 60 seconds ');
+                                return [2];
+                            }
+                            this._pingWatchdog.stop();
+                            event = this.buildAgentShutdownEvent();
+                            if (!(this.startRequestStatus == StartRequestStatus.PENDING)) return [3, 1];
+                            setTimeout(function () { return _this.submitAgentShutdownEvent.call(_this); }, 1000);
+                            return [3, 3];
+                        case 1: return [4, this.submitAgentEventRequest(event)];
+                        case 2:
+                            result = _a.sent();
+                            this.active = false;
+                            return [2, result];
+                        case 3: return [2];
                     }
-                    return [2];
                 });
             });
         };
@@ -46532,7 +46543,8 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
         };
         AgentInstanceInfoBuilder.prototype.fillFromAgentConfig = function () {
             this.info.buildSessionId = this.agentConfig.buildSessionId.value;
-            this.info.labId = this.agentConfig.labId.value;
+            this.info.labId = this.agentConfig.labId.value || this.agentConfig.buildSessionId.value;
+            this.info.testStage = this.agentConfig.testStage.value;
             this.info.agentConfig = this.agentConfig.toJsonObject();
         };
         AgentInstanceInfoBuilder.prototype.fillFromProcessObject = function () {