slnodejs 6.1.309 → 6.1.315

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

@@ -34126,7 +34126,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@3/browser-agent/node_modules/browserify-sign",
   "author": {
     "name": "Fedor Indutny",
     "email": "fedor@indutny.com"
@@ -54206,7 +54206,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.SL_AGENT_TYPE = exports.SL_AGENT_VERSION = void 0;
-    exports.SL_AGENT_VERSION = '6.1.309';
+    exports.SL_AGENT_VERSION = '6.1.315';
     exports.SL_AGENT_TYPE = 'browser';
 });
 
@@ -54650,16 +54650,45 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.CustomFetchInstrumentation = void 0;
+    exports.CustomFetchInstrumentation = exports.handleAddHeaders = void 0;
     const instrumentation_fetch_1 = require("@opentelemetry/instrumentation-fetch");
     const utils_1 = require("../utils");
+    const setPropagationHeaders = (options, contextPropagationHeaders) => {
+        for (const [key, value] of Object.entries(contextPropagationHeaders)) {
+            if (value) {
+                options.headers.set(key, typeof value === 'string' ? value : String(value));
+            }
+        }
+    };
+    function handleAddHeaders(options) {
+        const origin = window.location.hostname;
+        const url = options.url;
+        const isMatch = url === null || url === void 0 ? void 0 : url.includes(origin);
+        if (!isMatch) {
+            return;
+        }
+        const contextPropagationHeaders = utils_1.constructBaggageHeader();
+        if (options instanceof Request && contextPropagationHeaders) {
+            setPropagationHeaders(options, contextPropagationHeaders);
+        }
+        else if (options.headers instanceof Headers && contextPropagationHeaders) {
+            setPropagationHeaders(options, contextPropagationHeaders);
+        }
+        else if (typeof options.headers === 'object' && options.headers !== null) {
+            for (const [key, value] of Object.entries(contextPropagationHeaders)) {
+                options.headers[key] = value;
+            }
+        }
+        else {
+            const headers = utils_1.constructBaggageHeader();
+            options.headers = Object.assign({}, headers, options.headers || {});
+        }
+    }
+    exports.handleAddHeaders = handleAddHeaders;
     class CustomFetchInstrumentation extends instrumentation_fetch_1.FetchInstrumentation {
         constructor(config) {
             super(config);
-            this['_addHeaders'] = (options) => {
-                const headers = utils_1.constructBaggageHeader();
-                options.headers = Object.assign({}, headers, options.headers || {});
-            };
+            this['_addHeaders'] = (options) => handleAddHeaders(options);
         }
     }
     exports.CustomFetchInstrumentation = CustomFetchInstrumentation;
@@ -54685,6 +54714,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             super(config);
             this['_addHeaders'] = (xhr) => {
                 var _a;
+                const origin = window.location.hostname;
+                const url = xhr.responseURL;
+                const isMatch = url === null || url === void 0 ? void 0 : url.includes(origin);
+                if (!isMatch) {
+                    return;
+                }
                 const headers = utils_1.constructBaggageHeader();
                 if ((_a = headers === null || headers === void 0 ? void 0 : headers.baggage) === null || _a === void 0 ? void 0 : _a.length)
                     xhr.setRequestHeader('baggage', headers.baggage);
@@ -56018,7 +56053,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             throw new Error('\'delete\' not implemented yet');
         }
         get(urlPath, callback, isNotFoundAcceptable = true, async = false) {
-            urlPath = this.serverUrl + urlPath;
+            urlPath = `${this.getBaseUrl()}${urlPath}`;
             const onSuccess = (response) => callback(null, response, response.statusCode);
             const onError = (response) => {
                 const error = new Error(response.responseText);
@@ -56030,7 +56065,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             throw new Error('\'delete\' not implemented yet');
         }
         post(requestData, urlPath, callback, async = true, contentType) {
-            urlPath = `${this.getBaseUrlForPostRequest()}${urlPath}`;
+            urlPath = `${this.getBaseUrl()}${urlPath}`;
             const onSuccess = (response) => callback(null, response, response.statusCode);
             const onError = (response) => {
                 const error = new Error(response.responseText);
@@ -56041,7 +56076,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         postMultipart(requestData, urlPath, callback) {
             throw new Error('\'postMultipart\' not implemented yet');
         }
-        getBaseUrlForPostRequest() {
+        getBaseUrl() {
             if (this.collectorUrl) {
                 return this.collectorUrl;
             }
@@ -59510,7 +59545,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../constants/sl-env-vars", "../coverage-elements/original-module-loader"], factory);
+        define(["require", "exports", "../constants/sl-env-vars", "../coverage-elements/original-module-loader", "../agent-events/cockpit-notifier"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -59518,9 +59553,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     exports.HitsCollector = void 0;
     const sl_env_vars_1 = require("../constants/sl-env-vars");
     const original_module_loader_1 = require("../coverage-elements/original-module-loader");
+    const cockpit_notifier_1 = require("../agent-events/cockpit-notifier");
     const GLOBAL_ISTANBUL_CONTAINER_NAMES = ['__coverage__'];
     class HitsCollector {
         constructor(logger, globalCoverageObject) {
+            this.errors = [];
             this.logger = logger;
             this._globalCoverageObject = globalCoverageObject;
             this.latestCoverageSnapshot = {};
@@ -59667,12 +59704,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 this._latestCoverageSnapshot[istanbulModule].f[funcId] = f[funcId];
             }
         }
+        sendErrors() {
+            if (this.errors.length > 0) {
+                const data = JSON.stringify(this.errors);
+                cockpit_notifier_1.CockpitNotifier.sendGenericMessage(`Errors during hit collection: ${data}`);
+            }
+        }
     }
     exports.HitsCollector = HitsCollector;
 });
 
 }).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"../constants/sl-env-vars":472,"../coverage-elements/original-module-loader":477}],488:[function(require,module,exports){
+},{"../agent-events/cockpit-notifier":459,"../constants/sl-env-vars":472,"../coverage-elements/original-module-loader":477}],488:[function(require,module,exports){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -59964,6 +60007,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         stop() {
             return __awaiter(this, void 0, void 0, function* () {
                 this.sendToServerWatchdog.stop();
+                this.hitsCollector.sendErrors();
                 if (!this.shouldSubmitFootprints()) {
                     this.isRunning = false;
                     return;