slnodejs 6.1.410 → 6.1.429

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

@@ -27754,7 +27754,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 this.instanceAddedForBsid[configuration.buildSessionId] = true;
                 const browserAgent = agent_factory_1.AgentFactory.createBrowserAgent(this.window, this.featureDetection, configuration);
                 const { enableOpenTelemetry } = configuration;
-                (0, events_bridge_1.registerEventsBridge)(this.logger, enableOpenTelemetry);
+                (0, events_bridge_1.registerEventsBridge)(this.logger, enableOpenTelemetry, true, configuration.allowCORS);
                 if (browserAgent) {
                     browserAgent.start();
                     this.instances.push(browserAgent);
@@ -28066,7 +28066,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.410';
+    exports.SL_AGENT_VERSION = '6.1.429';
     exports.SL_AGENT_TYPE = 'browser';
 });
 
@@ -28664,7 +28664,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", "@opentelemetry/instrumentation-fetch", "../utils", "../const"], factory);
+        define(["require", "exports", "@opentelemetry/instrumentation-fetch", "../utils"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -28672,7 +28672,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     exports.CustomFetchInstrumentation = exports.handleAddHeaders = void 0;
     const instrumentation_fetch_1 = require("@opentelemetry/instrumentation-fetch");
     const utils_1 = require("../utils");
-    const const_1 = require("../const");
     const setPropagationHeaders = (options, contextPropagationHeaders) => {
         for (const [key, value] of Object.entries(contextPropagationHeaders)) {
             if (value) {
@@ -28680,13 +28679,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             }
         }
     };
-    function handleAddHeaders(options, spanUrl) {
-        const origin = window.location.origin;
-        const startsWithOrigin = spanUrl === null || spanUrl === void 0 ? void 0 : spanUrl.startsWith(origin);
-        const isRelativeUrl = const_1.relativePathRegex.test(spanUrl);
-        if (!startsWithOrigin && !isRelativeUrl) {
+    function handleAddHeaders(options, spanUrl, allowCORS) {
+        const allowHeadersPropagation = (0, utils_1.shouldAddHeaders)(window.location.origin, spanUrl, allowCORS);
+        if (!allowHeadersPropagation)
             return;
-        }
         const contextPropagationHeaders = Object.assign(Object.assign({}, (0, utils_1.constructBaggageHeader)()), (0, utils_1.constructContextHeaders)());
         if (options instanceof Request && contextPropagationHeaders) {
             setPropagationHeaders(options, contextPropagationHeaders);
@@ -28707,20 +28703,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     class CustomFetchInstrumentation extends instrumentation_fetch_1.FetchInstrumentation {
         constructor(config) {
             super(config);
-            this['_addHeaders'] = (options, spanUrl) => handleAddHeaders(options, spanUrl);
+            this['_addHeaders'] = (options, spanUrl) => handleAddHeaders(options, spanUrl, config === null || config === void 0 ? void 0 : config.allowCORS);
         }
     }
     exports.CustomFetchInstrumentation = CustomFetchInstrumentation;
 });
 
-},{"../const":237,"../utils":244,"@opentelemetry/instrumentation-fetch":89}],241:[function(require,module,exports){
+},{"../utils":244,"@opentelemetry/instrumentation-fetch":89}],241:[function(require,module,exports){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "@opentelemetry/instrumentation-xml-http-request", "../utils", "../const"], factory);
+        define(["require", "exports", "@opentelemetry/instrumentation-xml-http-request", "../utils"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -28728,14 +28724,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     exports.CustomXMLHttpRequestInstrumentation = exports.handleAddHeaders = void 0;
     const instrumentation_xml_http_request_1 = require("@opentelemetry/instrumentation-xml-http-request");
     const utils_1 = require("../utils");
-    const const_1 = require("../const");
-    function handleAddHeaders(xhr, spanUrl) {
-        const origin = window.location.origin;
-        const startsWithOrigin = spanUrl === null || spanUrl === void 0 ? void 0 : spanUrl.startsWith(origin);
-        const isRelativeUrl = const_1.relativePathRegex.test(spanUrl);
-        if (!startsWithOrigin && !isRelativeUrl) {
+    function handleAddHeaders(xhr, spanUrl, allowCORS) {
+        const allowHeadersPropagation = (0, utils_1.shouldAddHeaders)(window.location.origin, spanUrl, allowCORS);
+        if (!allowHeadersPropagation)
             return;
-        }
         const headers = Object.assign(Object.assign({}, (0, utils_1.constructBaggageHeader)()), (0, utils_1.constructContextHeaders)());
         Object.keys(headers).forEach((headerKey) => {
             xhr.setRequestHeader(headerKey, headers[headerKey]);
@@ -28745,13 +28737,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     class CustomXMLHttpRequestInstrumentation extends instrumentation_xml_http_request_1.XMLHttpRequestInstrumentation {
         constructor(config) {
             super(config);
-            this['_addHeaders'] = (xhr, spanUrl) => handleAddHeaders(xhr, spanUrl);
+            this['_addHeaders'] = (xhr, spanUrl) => handleAddHeaders(xhr, spanUrl, config === null || config === void 0 ? void 0 : config.allowCORS);
         }
     }
     exports.CustomXMLHttpRequestInstrumentation = CustomXMLHttpRequestInstrumentation;
 });
 
-},{"../const":237,"../utils":244,"@opentelemetry/instrumentation-xml-http-request":93}],242:[function(require,module,exports){
+},{"../utils":244,"@opentelemetry/instrumentation-xml-http-request":93}],242:[function(require,module,exports){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -28767,7 +28759,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     const otel_1 = require("./otel");
     const events_1 = require("./events");
     const const_1 = require("./const");
-    const registerEventsBridge = (logger, enableOpenTelemetry, sendCockpitEvents = true) => {
+    const registerEventsBridge = (logger, enableOpenTelemetry, sendCockpitEvents = true, allowCORS) => {
         var _a, _b, _c, _d;
         const eventsBridgeRegistered = (_b = (_a = window.$Sealights) === null || _a === void 0 ? void 0 : _a.eventsBridge) === null || _b === void 0 ? void 0 : _b.loaded;
         const otelRegistered = (_d = (_c = window.$Sealights) === null || _c === void 0 ? void 0 : _c.eventsBridge) === null || _d === void 0 ? void 0 : _d.otel;
@@ -28775,7 +28767,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             (0, events_1.registerEvents)(logger, enableOpenTelemetry, sendCockpitEvents);
         }
         if (enableOpenTelemetry && !otelRegistered) {
-            (0, otel_1.registerOpenTelemetry)(logger);
+            (0, otel_1.registerOpenTelemetry)(logger, allowCORS);
         }
         const event = new Event(const_1.EVENTS.READY_EVENTS_BRIDGE);
         window.dispatchEvent(event);
@@ -28800,12 +28792,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     const CustomFetchInstrumentation_1 = require("./implementations/CustomFetchInstrumentation");
     const CustomXMLHttpRequestInstrumentation_1 = require("./implementations/CustomXMLHttpRequestInstrumentation");
     const cockpit_notifier_1 = require("../../../common/agent-events/cockpit-notifier");
-    const registerOpenTelemetry = (logger) => {
+    const registerOpenTelemetry = (logger, allowCORS) => {
         try {
             (0, instrumentation_1.registerInstrumentations)({
                 instrumentations: [
-                    new CustomFetchInstrumentation_1.CustomFetchInstrumentation(),
-                    new CustomXMLHttpRequestInstrumentation_1.CustomXMLHttpRequestInstrumentation(),
+                    new CustomFetchInstrumentation_1.CustomFetchInstrumentation({ allowCORS }),
+                    new CustomXMLHttpRequestInstrumentation_1.CustomXMLHttpRequestInstrumentation({ allowCORS }),
                 ],
             });
         }
@@ -28830,7 +28822,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.sendAckEvent = exports.checkIsDiagnosisBaggage = exports.constructContextHeaders = exports.constructBaggageHeader = exports.mapHeaderValuesToString = void 0;
+    exports.shouldAddHeaders = exports.sendAckEvent = exports.checkIsDiagnosisBaggage = exports.constructContextHeaders = exports.constructBaggageHeader = exports.mapHeaderValuesToString = void 0;
     const const_1 = require("./const");
     const SlConst = require("./const");
     const mapHeaderValuesToString = (headerValues) => {
@@ -28884,6 +28876,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         }));
     };
     exports.sendAckEvent = sendAckEvent;
+    const shouldAddHeaders = (origin, spanUrl, allowCORS) => {
+        if ((allowCORS === null || allowCORS === void 0 ? void 0 : allowCORS.trim()) === '*')
+            return true;
+        const isRelativeUrl = const_1.relativePathRegex.test(spanUrl);
+        if (isRelativeUrl) {
+            spanUrl = `${origin}${spanUrl.startsWith('/') ? '' : '/'}${spanUrl}`;
+        }
+        const allowCORSArray = !(allowCORS === null || allowCORS === void 0 ? void 0 : allowCORS.length)
+            ? [origin]
+            : allowCORS === null || allowCORS === void 0 ? void 0 : allowCORS.split(',');
+        return allowCORSArray.some((propagationOrigin) => spanUrl === null || spanUrl === void 0 ? void 0 : spanUrl.startsWith(propagationOrigin.trim()));
+    };
+    exports.shouldAddHeaders = shouldAddHeaders;
 });
 
 },{"./const":237}],245:[function(require,module,exports){