@pratham.raval/browser-core 6.22.3 → 6.22.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/cjs/boot/displayAlreadyInitializedError.d.ts +1 -1
- package/cjs/boot/init.d.ts +1 -1
- package/cjs/browser/cookie.d.ts +10 -0
- package/cjs/browser/cookie.js +13 -0
- package/cjs/browser/cookie.js.map +1 -1
- package/cjs/domain/configuration/configuration.js +4 -4
- package/cjs/domain/configuration/configuration.js.map +1 -1
- package/cjs/domain/configuration/endpointBuilder.js +16 -24
- package/cjs/domain/configuration/endpointBuilder.js.map +1 -1
- package/cjs/domain/configuration/transportConfiguration.js +5 -15
- package/cjs/domain/configuration/transportConfiguration.js.map +1 -1
- package/cjs/domain/intakeSites.d.ts +1 -7
- package/cjs/domain/intakeSites.js +2 -8
- package/cjs/domain/intakeSites.js.map +1 -1
- package/cjs/domain/session/oldCookiesMigration.d.ts +1 -1
- package/cjs/domain/session/oldCookiesMigration.js +1 -1
- package/cjs/domain/session/sessionManager.d.ts +1 -0
- package/cjs/domain/session/sessionManager.js +24 -6
- package/cjs/domain/session/sessionManager.js.map +1 -1
- package/cjs/domain/session/sessionState.js +2 -8
- package/cjs/domain/session/sessionState.js.map +1 -1
- package/cjs/domain/session/sessionStore.d.ts +1 -1
- package/cjs/domain/session/sessionStore.js +5 -1
- package/cjs/domain/session/sessionStore.js.map +1 -1
- package/cjs/domain/session/storeStrategies/sessionInCookie.d.ts +5 -1
- package/cjs/domain/session/storeStrategies/sessionInCookie.js +52 -3
- package/cjs/domain/session/storeStrategies/sessionInCookie.js.map +1 -1
- package/cjs/domain/session/storeStrategies/sessionInLocalStorage.d.ts +2 -0
- package/cjs/domain/session/storeStrategies/sessionInLocalStorage.js +1 -0
- package/cjs/domain/session/storeStrategies/sessionInLocalStorage.js.map +1 -1
- package/cjs/domain/session/storeStrategies/sessionStoreStrategy.d.ts +1 -1
- package/cjs/domain/session/storeStrategies/sessionStoreStrategy.js +1 -1
- package/cjs/domain/synthetics/syntheticsWorkerValues.d.ts +6 -6
- package/cjs/domain/synthetics/syntheticsWorkerValues.js +6 -6
- package/cjs/domain/synthetics/syntheticsWorkerValues.js.map +1 -1
- package/cjs/domain/tags.js +6 -5
- package/cjs/domain/tags.js.map +1 -1
- package/cjs/domain/telemetry/telemetry.js +4 -5
- package/cjs/domain/telemetry/telemetry.js.map +1 -1
- package/cjs/domain/telemetry/telemetryEvent.types.d.ts +1 -1
- package/cjs/index.d.ts +1 -1
- package/cjs/index.js +3 -2
- package/cjs/index.js.map +1 -1
- package/cjs/tools/display.js +1 -1
- package/cjs/tools/display.js.map +1 -1
- package/cjs/tools/experimentalFeatures.d.ts +2 -1
- package/cjs/tools/experimentalFeatures.js +1 -0
- package/cjs/tools/experimentalFeatures.js.map +1 -1
- package/cjs/tools/utils/browserDetection.d.ts +2 -0
- package/cjs/tools/utils/browserDetection.js +138 -0
- package/cjs/tools/utils/browserDetection.js.map +1 -1
- package/cjs/tools/utils/stringUtils.d.ts +15 -0
- package/cjs/tools/utils/stringUtils.js +36 -0
- package/cjs/tools/utils/stringUtils.js.map +1 -1
- package/cjs/transport/httpRequest.d.ts +1 -0
- package/cjs/transport/httpRequest.js +26 -4
- package/cjs/transport/httpRequest.js.map +1 -1
- package/cjs/transport/index.d.ts +1 -1
- package/cjs/transport/index.js +2 -1
- package/cjs/transport/index.js.map +1 -1
- package/esm/boot/displayAlreadyInitializedError.d.ts +1 -1
- package/esm/boot/init.d.ts +1 -1
- package/esm/browser/cookie.d.ts +10 -0
- package/esm/browser/cookie.js +13 -1
- package/esm/browser/cookie.js.map +1 -1
- package/esm/domain/configuration/configuration.js +5 -5
- package/esm/domain/configuration/configuration.js.map +1 -1
- package/esm/domain/configuration/endpointBuilder.js +16 -24
- package/esm/domain/configuration/endpointBuilder.js.map +1 -1
- package/esm/domain/configuration/transportConfiguration.js +6 -16
- package/esm/domain/configuration/transportConfiguration.js.map +1 -1
- package/esm/domain/intakeSites.d.ts +1 -7
- package/esm/domain/intakeSites.js +1 -7
- package/esm/domain/intakeSites.js.map +1 -1
- package/esm/domain/session/oldCookiesMigration.d.ts +1 -1
- package/esm/domain/session/oldCookiesMigration.js +1 -1
- package/esm/domain/session/sessionManager.d.ts +1 -0
- package/esm/domain/session/sessionManager.js +25 -7
- package/esm/domain/session/sessionManager.js.map +1 -1
- package/esm/domain/session/sessionState.js +2 -8
- package/esm/domain/session/sessionState.js.map +1 -1
- package/esm/domain/session/sessionStore.d.ts +1 -1
- package/esm/domain/session/sessionStore.js +5 -1
- package/esm/domain/session/sessionStore.js.map +1 -1
- package/esm/domain/session/storeStrategies/sessionInCookie.d.ts +5 -1
- package/esm/domain/session/storeStrategies/sessionInCookie.js +53 -4
- package/esm/domain/session/storeStrategies/sessionInCookie.js.map +1 -1
- package/esm/domain/session/storeStrategies/sessionInLocalStorage.d.ts +2 -0
- package/esm/domain/session/storeStrategies/sessionInLocalStorage.js +1 -1
- package/esm/domain/session/storeStrategies/sessionInLocalStorage.js.map +1 -1
- package/esm/domain/session/storeStrategies/sessionStoreStrategy.d.ts +1 -1
- package/esm/domain/session/storeStrategies/sessionStoreStrategy.js +1 -1
- package/esm/domain/synthetics/syntheticsWorkerValues.d.ts +6 -6
- package/esm/domain/synthetics/syntheticsWorkerValues.js +6 -6
- package/esm/domain/synthetics/syntheticsWorkerValues.js.map +1 -1
- package/esm/domain/tags.js +6 -5
- package/esm/domain/tags.js.map +1 -1
- package/esm/domain/telemetry/telemetry.js +4 -5
- package/esm/domain/telemetry/telemetry.js.map +1 -1
- package/esm/domain/telemetry/telemetryEvent.types.d.ts +1 -1
- package/esm/index.d.ts +1 -1
- package/esm/index.js +1 -1
- package/esm/index.js.map +1 -1
- package/esm/tools/display.js +1 -1
- package/esm/tools/display.js.map +1 -1
- package/esm/tools/experimentalFeatures.d.ts +2 -1
- package/esm/tools/experimentalFeatures.js +1 -0
- package/esm/tools/experimentalFeatures.js.map +1 -1
- package/esm/tools/utils/browserDetection.d.ts +2 -0
- package/esm/tools/utils/browserDetection.js +136 -0
- package/esm/tools/utils/browserDetection.js.map +1 -1
- package/esm/tools/utils/stringUtils.d.ts +15 -0
- package/esm/tools/utils/stringUtils.js +35 -0
- package/esm/tools/utils/stringUtils.js.map +1 -1
- package/esm/transport/httpRequest.d.ts +1 -0
- package/esm/transport/httpRequest.js +25 -4
- package/esm/transport/httpRequest.js.map +1 -1
- package/esm/transport/index.d.ts +1 -1
- package/esm/transport/index.js +1 -1
- package/esm/transport/index.js.map +1 -1
- package/package.json +4 -6
- package/src/boot/displayAlreadyInitializedError.ts +1 -1
- package/src/boot/init.ts +1 -1
- package/src/browser/cookie.ts +19 -1
- package/src/domain/configuration/configuration.ts +4 -4
- package/src/domain/configuration/endpointBuilder.ts +17 -27
- package/src/domain/configuration/transportConfiguration.ts +6 -18
- package/src/domain/intakeSites.ts +2 -17
- package/src/domain/session/oldCookiesMigration.ts +1 -1
- package/src/domain/session/sessionManager.ts +28 -7
- package/src/domain/session/sessionState.ts +2 -7
- package/src/domain/session/sessionStore.ts +6 -2
- package/src/domain/session/storeStrategies/sessionInCookie.ts +66 -4
- package/src/domain/session/storeStrategies/sessionInLocalStorage.ts +1 -1
- package/src/domain/session/storeStrategies/sessionStoreStrategy.ts +1 -1
- package/src/domain/synthetics/syntheticsWorkerValues.ts +9 -9
- package/src/domain/tags.ts +6 -6
- package/src/domain/telemetry/telemetry.ts +5 -5
- package/src/domain/telemetry/telemetryEvent.types.ts +1 -1
- package/src/index.ts +1 -0
- package/src/tools/display.ts +1 -1
- package/src/tools/experimentalFeatures.ts +1 -0
- package/src/tools/utils/browserDetection.ts +146 -0
- package/src/tools/utils/stringUtils.ts +34 -0
- package/src/transport/httpRequest.ts +31 -5
- package/src/transport/index.ts +1 -1
package/README.md
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { InitConfiguration } from '../domain/configuration';
|
|
2
|
-
export declare function displayAlreadyInitializedError(sdkName: '
|
|
2
|
+
export declare function displayAlreadyInitializedError(sdkName: 'MD_RUM' | 'MD_LOGS', initConfiguration: InitConfiguration): void;
|
package/cjs/boot/init.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export interface PublicApi {
|
|
|
4
4
|
*/
|
|
5
5
|
version: string;
|
|
6
6
|
/**
|
|
7
|
-
* For CDN async setup: Early RUM API calls must be wrapped in the `window.
|
|
7
|
+
* For CDN async setup: Early RUM API calls must be wrapped in the `window.MD_RUM.onReady()` callback. This ensures the code only gets executed once the SDK is properly loaded.
|
|
8
8
|
*
|
|
9
9
|
* See [CDN async setup](https://docs.datadoghq.com/real_user_monitoring/browser/#cdn-async) for further information.
|
|
10
10
|
*/
|
package/cjs/browser/cookie.d.ts
CHANGED
|
@@ -5,10 +5,20 @@ export interface CookieOptions {
|
|
|
5
5
|
domain?: string;
|
|
6
6
|
}
|
|
7
7
|
export declare function setCookie(name: string, value: string, expireDelay?: number, options?: CookieOptions): void;
|
|
8
|
+
/**
|
|
9
|
+
* Returns the value of the cookie with the given name
|
|
10
|
+
* If there are multiple cookies with the same name, returns the first one
|
|
11
|
+
*/
|
|
8
12
|
export declare function getCookie(name: string): string | undefined;
|
|
13
|
+
/**
|
|
14
|
+
* Returns all the values of the cookies with the given name
|
|
15
|
+
*/
|
|
16
|
+
export declare function getCookies(name: string): string[];
|
|
9
17
|
/**
|
|
10
18
|
* Returns a cached value of the cookie. Use this during SDK initialization (and whenever possible)
|
|
11
19
|
* to avoid accessing document.cookie multiple times.
|
|
20
|
+
*
|
|
21
|
+
* ⚠️ If there are multiple cookies with the same name, returns the LAST one (unlike `getCookie()`)
|
|
12
22
|
*/
|
|
13
23
|
export declare function getInitCookie(name: string): string | undefined;
|
|
14
24
|
export declare function resetInitCookies(): void;
|
package/cjs/browser/cookie.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setCookie = setCookie;
|
|
4
4
|
exports.getCookie = getCookie;
|
|
5
|
+
exports.getCookies = getCookies;
|
|
5
6
|
exports.getInitCookie = getInitCookie;
|
|
6
7
|
exports.resetInitCookies = resetInitCookies;
|
|
7
8
|
exports.deleteCookie = deleteCookie;
|
|
@@ -22,13 +23,25 @@ function setCookie(name, value, expireDelay = 0, options) {
|
|
|
22
23
|
const partitioned = options && options.partitioned ? ';partitioned' : '';
|
|
23
24
|
document.cookie = `${name}=${value};${expires};path=/;samesite=${sameSite}${domain}${secure}${partitioned}`;
|
|
24
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* Returns the value of the cookie with the given name
|
|
28
|
+
* If there are multiple cookies with the same name, returns the first one
|
|
29
|
+
*/
|
|
25
30
|
function getCookie(name) {
|
|
26
31
|
return (0, stringUtils_1.findCommaSeparatedValue)(document.cookie, name);
|
|
27
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* Returns all the values of the cookies with the given name
|
|
35
|
+
*/
|
|
36
|
+
function getCookies(name) {
|
|
37
|
+
return (0, stringUtils_1.findAllCommaSeparatedValues)(document.cookie).get(name) || [];
|
|
38
|
+
}
|
|
28
39
|
let initCookieParsed;
|
|
29
40
|
/**
|
|
30
41
|
* Returns a cached value of the cookie. Use this during SDK initialization (and whenever possible)
|
|
31
42
|
* to avoid accessing document.cookie multiple times.
|
|
43
|
+
*
|
|
44
|
+
* ⚠️ If there are multiple cookies with the same name, returns the LAST one (unlike `getCookie()`)
|
|
32
45
|
*/
|
|
33
46
|
function getInitCookie(name) {
|
|
34
47
|
if (!initCookieParsed) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../src/browser/cookie.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../src/browser/cookie.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,9 +42,9 @@ function isString(tag, tagName) {
|
|
|
42
42
|
}
|
|
43
43
|
return true;
|
|
44
44
|
}
|
|
45
|
-
function
|
|
46
|
-
if (site && typeof site
|
|
47
|
-
display_1.display.error(
|
|
45
|
+
function isValidSite(site) {
|
|
46
|
+
if (site !== undefined && site !== null && typeof site !== 'string') {
|
|
47
|
+
display_1.display.error('Site must be a non-null string');
|
|
48
48
|
return false;
|
|
49
49
|
}
|
|
50
50
|
return true;
|
|
@@ -67,7 +67,7 @@ function validateAndBuildConfiguration(initConfiguration, errorStack) {
|
|
|
67
67
|
display_1.display.error('Allowed Tracking Origins must be an array');
|
|
68
68
|
return;
|
|
69
69
|
}
|
|
70
|
-
if (!
|
|
70
|
+
if (!isValidSite(initConfiguration.site) ||
|
|
71
71
|
!isSampleRate(initConfiguration.sessionSampleRate, 'Session') ||
|
|
72
72
|
!isSampleRate(initConfiguration.telemetrySampleRate, 'Telemetry') ||
|
|
73
73
|
!isSampleRate(initConfiguration.telemetryConfigurationSampleRate, 'Telemetry Configuration') ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../src/domain/configuration/configuration.ts"],"names":[],"mappings":";;;AAgWA,oCAMC;AAED,sEAsFC;AAED,wDAuBC;AAvdD,iEAA6D;AAC7D,iDAAwE;AAGxE,2DAAwD;AACxD,+DAA4D;AAC5D,2DAA2D;AAC3D,+DAA8D;AAC9D,0DAAwE;AAExE,wDAAoD;AAGpD,sEAAoE;AAEpE,2DAA8D;AAE9D,qEAAwE;AAExE;;;;GAIG;AACU,QAAA,mBAAmB,GAAG;IACjC,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,eAAe,EAAE,iBAAiB;IAClC,uBAAuB,EAAE,yBAAyB;CAC1C,CAAA;AAGV;;;;GAIG;AACU,QAAA,qBAAqB,GAAG;IACnC,GAAG,EAAE,KAAK;IACV,OAAO,EAAE,SAAS;CACV,CAAA;AAwSV,SAAS,QAAQ,CAAC,GAAY,EAAE,OAAe;IAC7C,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACjE,iBAAO,CAAC,KAAK,CAAC,GAAG,OAAO,8BAA8B,CAAC,CAAA;QACvD,OAAO,KAAK,CAAA;IACd,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../src/domain/configuration/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ exports.buildEndpointHost = buildEndpointHost;
|
|
|
5
5
|
const timeUtils_1 = require("../../tools/utils/timeUtils");
|
|
6
6
|
const urlPolyfill_1 = require("../../tools/utils/urlPolyfill");
|
|
7
7
|
const stringUtils_1 = require("../../tools/utils/stringUtils");
|
|
8
|
-
const intakeSites_1 = require("../intakeSites");
|
|
9
8
|
function createEndpointBuilder(initConfiguration, trackType, extraParameters) {
|
|
10
9
|
const buildUrlWithParameters = createEndpointUrlWithParametersBuilder(initConfiguration, trackType);
|
|
11
10
|
return {
|
|
@@ -26,28 +25,21 @@ function createEndpointUrlWithParametersBuilder(initConfiguration, trackType) {
|
|
|
26
25
|
const proxy = initConfiguration.proxy;
|
|
27
26
|
if (typeof proxy === 'string') {
|
|
28
27
|
const normalizedProxyUrl = (0, urlPolyfill_1.normalizeUrl)(proxy);
|
|
29
|
-
return (parameters) => `${normalizedProxyUrl}?
|
|
28
|
+
return (parameters) => `${normalizedProxyUrl}?mdforward=${encodeURIComponent(`${path}?${parameters}`)}`;
|
|
30
29
|
}
|
|
31
30
|
if (typeof proxy === 'function') {
|
|
32
31
|
return (parameters) => proxy({ path, parameters });
|
|
33
32
|
}
|
|
34
33
|
const host = buildEndpointHost(trackType, initConfiguration);
|
|
35
|
-
return (parameters) => `https://${host}${path}?${parameters}
|
|
34
|
+
// return (parameters) => `https://${host}${path}?${parameters}`
|
|
35
|
+
return (parameters) => `${host}${path}?${parameters}`;
|
|
36
36
|
}
|
|
37
37
|
function buildEndpointHost(trackType, initConfiguration) {
|
|
38
|
-
const { site =
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
return `${internalAnalyticsSubdomain}.${intakeSites_1.INTAKE_SITE_US1}`;
|
|
44
|
-
}
|
|
45
|
-
if (site === intakeSites_1.INTAKE_SITE_FED_STAGING) {
|
|
46
|
-
return `http-intake.logs.${site}`;
|
|
47
|
-
}
|
|
48
|
-
const domainParts = site.split('.');
|
|
49
|
-
const extension = domainParts.pop();
|
|
50
|
-
return `browser-intake-${domainParts.join('-')}.${extension}`;
|
|
38
|
+
const { site = 'localhost' } = initConfiguration;
|
|
39
|
+
// Use the site directly as the host
|
|
40
|
+
// If site includes a port, use it as-is
|
|
41
|
+
// If no port is specified, the default HTTPS port 443 will be used automatically
|
|
42
|
+
return site;
|
|
51
43
|
}
|
|
52
44
|
/**
|
|
53
45
|
* Build parameters to be used for an intake request. Parameters should be re-built for each
|
|
@@ -55,19 +47,19 @@ function buildEndpointHost(trackType, initConfiguration) {
|
|
|
55
47
|
*/
|
|
56
48
|
function buildEndpointParameters({ clientToken, internalAnalyticsSubdomain, source = 'browser' }, trackType, api, { retry, encoding }, extraParameters = []) {
|
|
57
49
|
const parameters = [
|
|
58
|
-
`
|
|
59
|
-
`
|
|
60
|
-
`
|
|
61
|
-
'
|
|
62
|
-
`
|
|
50
|
+
`mdsource=${source}`,
|
|
51
|
+
`md-api-key=${clientToken}`,
|
|
52
|
+
`md-evp-origin-version=${encodeURIComponent("dev")}`,
|
|
53
|
+
'md-evp-origin=browser',
|
|
54
|
+
`md-request-id=${(0, stringUtils_1.generateUUID)()}`,
|
|
63
55
|
].concat(extraParameters);
|
|
64
56
|
if (encoding) {
|
|
65
|
-
parameters.push(`
|
|
57
|
+
parameters.push(`md-evp-encoding=${encoding}`);
|
|
66
58
|
}
|
|
67
59
|
if (trackType === 'rum') {
|
|
68
|
-
parameters.push(`batch_time=${(0, timeUtils_1.timeStampNow)()}`, `
|
|
60
|
+
parameters.push(`batch_time=${(0, timeUtils_1.timeStampNow)()}`, `_md.api=${api}`);
|
|
69
61
|
if (retry) {
|
|
70
|
-
parameters.push(`
|
|
62
|
+
parameters.push(`_md.retry_count=${retry.count}`, `_md.retry_after=${retry.lastFailureStatus}`);
|
|
71
63
|
}
|
|
72
64
|
}
|
|
73
65
|
if (internalAnalyticsSubdomain) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpointBuilder.js","sourceRoot":"","sources":["../../../src/domain/configuration/endpointBuilder.ts"],"names":[],"mappings":";;AAqBA,sDAcC;
|
|
1
|
+
{"version":3,"file":"endpointBuilder.js","sourceRoot":"","sources":["../../../src/domain/configuration/endpointBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ exports.isIntakeUrl = isIntakeUrl;
|
|
|
5
5
|
const intakeSites_1 = require("../intakeSites");
|
|
6
6
|
const endpointBuilder_1 = require("./endpointBuilder");
|
|
7
7
|
function computeTransportConfiguration(initConfiguration) {
|
|
8
|
-
const site = initConfiguration.site ||
|
|
8
|
+
const site = initConfiguration.site || 'localhost';
|
|
9
9
|
const source = validateSource(initConfiguration.source);
|
|
10
10
|
const endpointBuilders = computeEndpointBuilders({ ...initConfiguration, site, source });
|
|
11
11
|
const replicaConfiguration = computeReplicaConfiguration({ ...initConfiguration, site, source });
|
|
@@ -32,20 +32,10 @@ function computeEndpointBuilders(initConfiguration) {
|
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
34
|
function computeReplicaConfiguration(initConfiguration) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
...initConfiguration,
|
|
40
|
-
site: intakeSites_1.INTAKE_SITE_US1,
|
|
41
|
-
clientToken: initConfiguration.replica.clientToken,
|
|
42
|
-
};
|
|
43
|
-
return {
|
|
44
|
-
logsEndpointBuilder: (0, endpointBuilder_1.createEndpointBuilder)(replicaConfiguration, 'logs'),
|
|
45
|
-
rumEndpointBuilder: (0, endpointBuilder_1.createEndpointBuilder)(replicaConfiguration, 'rum', [
|
|
46
|
-
`application.id=${initConfiguration.replica.applicationId}`,
|
|
47
|
-
]),
|
|
48
|
-
};
|
|
35
|
+
// Disable replica configuration for custom endpoints to avoid duplicate requests
|
|
36
|
+
// The replica feature was designed for Datadog's internal use and causes unwanted duplicates
|
|
37
|
+
// when using custom endpoints
|
|
38
|
+
return undefined;
|
|
49
39
|
}
|
|
50
40
|
function isIntakeUrl(url) {
|
|
51
41
|
// check if tags is present in the query string
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transportConfiguration.js","sourceRoot":"","sources":["../../../src/domain/configuration/transportConfiguration.ts"],"names":[],"mappings":";;AAuBA,sEAaC;
|
|
1
|
+
{"version":3,"file":"transportConfiguration.js","sourceRoot":"","sources":["../../../src/domain/configuration/transportConfiguration.ts"],"names":[],"mappings":";;AAuBA,sEAaC;AA0BD,kCAGC;AAhED,gDAAsD;AAGtD,uDAAyD;AAmBzD,SAAgB,6BAA6B,CAAC,iBAAoC;IAChF,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,IAAI,WAAW,CAAA;IAClD,MAAM,MAAM,GAAG,cAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAA;IAEvD,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,EAAE,GAAG,iBAAiB,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;IACxF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,EAAE,GAAG,iBAAiB,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;IAEhG,OAAO;QACL,OAAO,EAAE,oBAAoB;QAC7B,IAAI;QACJ,MAAM;QACN,GAAG,gBAAgB;KACpB,CAAA;AACH,CAAC;AAED,SAAS,cAAc,CAAC,MAA0B;IAChD,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QAC/C,OAAO,MAAM,CAAA;IACf,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,uBAAuB,CAAC,iBAAoC;IACnE,OAAO;QACL,mBAAmB,EAAE,IAAA,uCAAqB,EAAC,iBAAiB,EAAE,MAAM,CAAC;QACrE,kBAAkB,EAAE,IAAA,uCAAqB,EAAC,iBAAiB,EAAE,KAAK,CAAC;QACnE,wBAAwB,EAAE,IAAA,uCAAqB,EAAC,iBAAiB,EAAE,SAAS,CAAC;QAC7E,4BAA4B,EAAE,IAAA,uCAAqB,EAAC,iBAAiB,EAAE,QAAQ,CAAC;QAChF,wBAAwB,EAAE,IAAA,uCAAqB,EAAC,iBAAiB,EAAE,WAAW,CAAC;KAChF,CAAA;AACH,CAAC;AAED,SAAS,2BAA2B,CAAC,iBAAoC;IACvE,iFAAiF;IACjF,6FAA6F;IAC7F,8BAA8B;IAC9B,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAgB,WAAW,CAAC,GAAW;IACrC,+CAA+C;IAC/C,OAAO,mCAAqB,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;AACpE,CAAC"}
|
|
@@ -1,8 +1,2 @@
|
|
|
1
|
-
export type Site =
|
|
2
|
-
export declare const INTAKE_SITE_STAGING: Site;
|
|
3
|
-
export declare const INTAKE_SITE_FED_STAGING: Site;
|
|
4
|
-
export declare const INTAKE_SITE_US1: Site;
|
|
5
|
-
export declare const INTAKE_SITE_EU1: Site;
|
|
6
|
-
export declare const INTAKE_SITE_US1_FED: Site;
|
|
7
|
-
export declare const PCI_INTAKE_HOST_US1 = "pci.browser-intake-datadoghq.com";
|
|
1
|
+
export type Site = string;
|
|
8
2
|
export declare const INTAKE_URL_PARAMETERS: string[];
|
|
@@ -1,11 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.INTAKE_URL_PARAMETERS =
|
|
4
|
-
exports.
|
|
5
|
-
exports.INTAKE_SITE_FED_STAGING = 'dd0g-gov.com';
|
|
6
|
-
exports.INTAKE_SITE_US1 = 'datadoghq.com';
|
|
7
|
-
exports.INTAKE_SITE_EU1 = 'datadoghq.eu';
|
|
8
|
-
exports.INTAKE_SITE_US1_FED = 'ddog-gov.com';
|
|
9
|
-
exports.PCI_INTAKE_HOST_US1 = 'pci.browser-intake-datadoghq.com';
|
|
10
|
-
exports.INTAKE_URL_PARAMETERS = ['ddsource', 'dd-api-key', 'dd-request-id'];
|
|
3
|
+
exports.INTAKE_URL_PARAMETERS = void 0;
|
|
4
|
+
exports.INTAKE_URL_PARAMETERS = ['mdsource', 'md-api-key', 'md-request-id'];
|
|
11
5
|
//# sourceMappingURL=intakeSites.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intakeSites.js","sourceRoot":"","sources":["../../src/domain/intakeSites.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"intakeSites.js","sourceRoot":"","sources":["../../src/domain/intakeSites.ts"],"names":[],"mappings":";;;AACa,QAAA,qBAAqB,GAAG,CAAC,UAAU,EAAE,YAAY,EAAE,eAAe,CAAC,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { SessionStoreStrategy } from './storeStrategies/sessionStoreStrategy';
|
|
2
|
-
export declare const OLD_SESSION_COOKIE_NAME = "
|
|
2
|
+
export declare const OLD_SESSION_COOKIE_NAME = "_md";
|
|
3
3
|
export declare const OLD_RUM_COOKIE_NAME = "_dd_r";
|
|
4
4
|
export declare const OLD_LOGS_COOKIE_NAME = "_dd_l";
|
|
5
5
|
export declare const RUM_SESSION_KEY = "rum";
|
|
@@ -5,7 +5,7 @@ exports.tryOldCookiesMigration = tryOldCookiesMigration;
|
|
|
5
5
|
const cookie_1 = require("../../browser/cookie");
|
|
6
6
|
const sessionStoreStrategy_1 = require("./storeStrategies/sessionStoreStrategy");
|
|
7
7
|
const sessionState_1 = require("./sessionState");
|
|
8
|
-
exports.OLD_SESSION_COOKIE_NAME = '
|
|
8
|
+
exports.OLD_SESSION_COOKIE_NAME = '_md';
|
|
9
9
|
exports.OLD_RUM_COOKIE_NAME = '_dd_r';
|
|
10
10
|
exports.OLD_LOGS_COOKIE_NAME = '_dd_l';
|
|
11
11
|
// duplicate values to avoid dependency issues
|
|
@@ -22,6 +22,7 @@ export interface SessionContext<TrackingType extends string> extends Context {
|
|
|
22
22
|
trackingType: TrackingType;
|
|
23
23
|
isReplayForced: boolean;
|
|
24
24
|
anonymousId: string | undefined;
|
|
25
|
+
created: string | undefined;
|
|
25
26
|
}
|
|
26
27
|
export declare const VISIBILITY_CHECK_DELAY: number;
|
|
27
28
|
export declare function startSessionManager<TrackingType extends string>(configuration: Configuration, productKey: string, computeTrackingType: (rawTrackingType?: string) => TrackingType, trackingConsentState: TrackingConsentState): SessionManager<TrackingType>;
|
|
@@ -19,6 +19,7 @@ const sessionStore_1 = require("./sessionStore");
|
|
|
19
19
|
const sessionState_1 = require("./sessionState");
|
|
20
20
|
const sessionInCookie_1 = require("./storeStrategies/sessionInCookie");
|
|
21
21
|
const sessionStoreStrategy_1 = require("./storeStrategies/sessionStoreStrategy");
|
|
22
|
+
const sessionInLocalStorage_1 = require("./storeStrategies/sessionInLocalStorage");
|
|
22
23
|
exports.VISIBILITY_CHECK_DELAY = timeUtils_1.ONE_MINUTE;
|
|
23
24
|
const SESSION_CONTEXT_TIMEOUT_DELAY = sessionConstants_1.SESSION_TIME_OUT_DELAY;
|
|
24
25
|
let stopCallbacks = [];
|
|
@@ -55,7 +56,7 @@ function startSessionManager(configuration, productKey, computeTrackingType, tra
|
|
|
55
56
|
sessionStore.expandOrRenewSession();
|
|
56
57
|
}
|
|
57
58
|
else {
|
|
58
|
-
sessionStore.expire();
|
|
59
|
+
sessionStore.expire(false);
|
|
59
60
|
}
|
|
60
61
|
});
|
|
61
62
|
trackActivity(configuration, () => {
|
|
@@ -68,12 +69,13 @@ function startSessionManager(configuration, productKey, computeTrackingType, tra
|
|
|
68
69
|
function buildSessionContext() {
|
|
69
70
|
const session = sessionStore.getSession();
|
|
70
71
|
if (!session) {
|
|
71
|
-
reportUnexpectedSessionState().catch(() => void 0); // Ignore errors
|
|
72
|
+
reportUnexpectedSessionState(configuration).catch(() => void 0); // Ignore errors
|
|
72
73
|
return {
|
|
73
74
|
id: 'invalid',
|
|
74
75
|
trackingType: sessionConstants_1.SESSION_NOT_TRACKED,
|
|
75
76
|
isReplayForced: false,
|
|
76
77
|
anonymousId: undefined,
|
|
78
|
+
created: undefined,
|
|
77
79
|
};
|
|
78
80
|
}
|
|
79
81
|
return {
|
|
@@ -81,6 +83,7 @@ function startSessionManager(configuration, productKey, computeTrackingType, tra
|
|
|
81
83
|
trackingType: session[productKey],
|
|
82
84
|
isReplayForced: !!session.forcedReplay,
|
|
83
85
|
anonymousId: session.anonymousId,
|
|
86
|
+
created: session.created,
|
|
84
87
|
};
|
|
85
88
|
}
|
|
86
89
|
return {
|
|
@@ -117,16 +120,31 @@ function trackResume(configuration, cb) {
|
|
|
117
120
|
const { stop } = (0, addEventListener_1.addEventListener)(configuration, window, "resume" /* DOM_EVENT.RESUME */, cb, { capture: true });
|
|
118
121
|
stopCallbacks.push(stop);
|
|
119
122
|
}
|
|
120
|
-
async function reportUnexpectedSessionState() {
|
|
121
|
-
const
|
|
123
|
+
async function reportUnexpectedSessionState(configuration) {
|
|
124
|
+
const sessionStoreStrategyType = configuration.sessionStoreStrategyType;
|
|
125
|
+
if (!sessionStoreStrategyType) {
|
|
126
|
+
return;
|
|
127
|
+
}
|
|
128
|
+
let rawSession;
|
|
129
|
+
let cookieContext;
|
|
130
|
+
if (sessionStoreStrategyType.type === sessionConstants_1.SessionPersistence.COOKIE) {
|
|
131
|
+
rawSession = (0, sessionInCookie_1.retrieveSessionCookie)(sessionStoreStrategyType.cookieOptions);
|
|
132
|
+
cookieContext = {
|
|
133
|
+
cookie: await getSessionCookies(),
|
|
134
|
+
currentDomain: `${window.location.protocol}//${window.location.hostname}`,
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
rawSession = (0, sessionInLocalStorage_1.retrieveSessionFromLocalStorage)();
|
|
139
|
+
}
|
|
122
140
|
// monitor-until: forever, could be handy to troubleshoot issues until session manager rework
|
|
123
141
|
(0, telemetry_1.addTelemetryDebug)('Unexpected session state', {
|
|
142
|
+
sessionStoreStrategyType: sessionStoreStrategyType.type,
|
|
124
143
|
session: rawSession,
|
|
125
144
|
isSyntheticsTest: (0, syntheticsWorkerValues_1.isSyntheticsTest)(),
|
|
126
145
|
createdTimestamp: rawSession === null || rawSession === void 0 ? void 0 : rawSession.created,
|
|
127
146
|
expireTimestamp: rawSession === null || rawSession === void 0 ? void 0 : rawSession.expire,
|
|
128
|
-
|
|
129
|
-
currentDomain: `${window.location.protocol}//${window.location.hostname}`,
|
|
147
|
+
...cookieContext,
|
|
130
148
|
});
|
|
131
149
|
}
|
|
132
150
|
function detectSessionIdChange(configuration, initialSessionState) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../src/domain/session/sessionManager.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../src/domain/session/sessionManager.ts"],"names":[],"mappings":";;;AAgDA,kDA2FC;AAED,gDAGC;AAhJD,uDAAmD;AAEnD,2DAA6D;AAE7D,2DAA4F;AAC5F,qEAA+F;AAC/F,6CAA8D;AAG9D,4CAAgD;AAChD,iFAAuE;AAEvE,iDAAqD;AACrD,2EAAoG;AACpG,2DAAsD;AACtD,iDAAkD;AAClD,yDAAoG;AACpG,iDAAkD;AAElD,iDAA+C;AAC/C,uEAAyE;AACzE,iFAA0E;AAC1E,mFAAyF;AAsB5E,QAAA,sBAAsB,GAAG,sBAAU,CAAA;AAChD,MAAM,6BAA6B,GAAG,yCAAsB,CAAA;AAC5D,IAAI,aAAa,GAAsB,EAAE,CAAA;AAEzC,SAAgB,mBAAmB,CACjC,aAA4B,EAC5B,UAAkB,EAClB,mBAA+D,EAC/D,oBAA0C;IAE1C,MAAM,eAAe,GAAG,IAAI,uBAAU,EAAQ,CAAA;IAC9C,MAAM,gBAAgB,GAAG,IAAI,uBAAU,EAAQ,CAAA;IAE/C,yDAAyD;IACzD,MAAM,YAAY,GAAG,IAAA,gCAAiB,EACpC,aAAa,CAAC,wBAAyB,EACvC,aAAa,EACb,UAAU,EACV,mBAAmB,CACpB,CAAA;IACD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAA;IAE7C,MAAM,qBAAqB,GAAG,IAAA,iCAAkB,EAA+B;QAC7E,WAAW,EAAE,6BAA6B;KAC3C,CAAC,CAAA;IACF,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC,CAAA;IAEtD,YAAY,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,EAAE;QAC1C,qBAAqB,CAAC,GAAG,CAAC,mBAAmB,EAAE,EAAE,IAAA,uBAAW,GAAE,CAAC,CAAA;QAC/D,eAAe,CAAC,MAAM,EAAE,CAAA;IAC1B,CAAC,CAAC,CAAA;IACF,YAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,EAAE;QAC3C,gBAAgB,CAAC,MAAM,EAAE,CAAA;QACzB,qBAAqB,CAAC,WAAW,CAAC,IAAA,uBAAW,GAAE,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;IAEF,iGAAiG;IACjG,sBAAsB;IACtB,YAAY,CAAC,oBAAoB,EAAE,CAAA;IACnC,qBAAqB,CAAC,GAAG,CAAC,mBAAmB,EAAE,EAAE,IAAA,wBAAY,GAAE,CAAC,QAAQ,CAAC,CAAA;IACzE,IAAI,IAAA,mDAA4B,EAAC,0CAAmB,CAAC,2BAA2B,CAAC,EAAE,CAAC;QAClF,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,CAAA;QACzC,IAAI,OAAO,EAAE,CAAC;YACZ,qBAAqB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;QAC/C,CAAC;IACH,CAAC;IAED,oBAAoB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE;QAC7C,IAAI,oBAAoB,CAAC,SAAS,EAAE,EAAE,CAAC;YACrC,YAAY,CAAC,oBAAoB,EAAE,CAAA;QACrC,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC5B,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,aAAa,CAAC,aAAa,EAAE,GAAG,EAAE;QAChC,IAAI,oBAAoB,CAAC,SAAS,EAAE,EAAE,CAAC;YACrC,YAAY,CAAC,oBAAoB,EAAE,CAAA;QACrC,CAAC;IACH,CAAC,CAAC,CAAA;IACF,eAAe,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,CAAA;IAClE,WAAW,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC,CAAA;IAE/D,SAAS,mBAAmB;QAC1B,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,CAAA;QAEzC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,4BAA4B,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA,CAAC,gBAAgB;YAEhF,OAAO;gBACL,EAAE,EAAE,SAAS;gBACb,YAAY,EAAE,sCAAmC;gBACjD,cAAc,EAAE,KAAK;gBACrB,WAAW,EAAE,SAAS;gBACtB,OAAO,EAAE,SAAS;aACnB,CAAA;QACH,CAAC;QAED,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAG;YACf,YAAY,EAAE,OAAO,CAAC,UAAU,CAAiB;YACjD,cAAc,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY;YACtC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAA;IACH,CAAC;IAED,OAAO;QACL,WAAW,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;QACnF,eAAe;QACf,gBAAgB;QAChB,4BAA4B,EAAE,YAAY,CAAC,4BAA4B;QACvE,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,kBAAkB,EAAE,YAAY,CAAC,kBAAkB;KACpD,CAAA;AACH,CAAC;AAED,SAAgB,kBAAkB;IAChC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;IACjC,aAAa,GAAG,EAAE,CAAA;AACpB,CAAC;AAED,SAAS,aAAa,CAAC,aAA4B,EAAE,oBAAgC;IACnF,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,oCAAiB,EAChC,aAAa,EACb,MAAM,EACN,8IAA8E,EAC9E,oBAAoB,EACpB,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CACjC,CAAA;IACD,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC;AAED,SAAS,eAAe,CAAC,aAA4B,EAAE,aAAyB;IAC9E,MAAM,wBAAwB,GAAG,GAAG,EAAE;QACpC,IAAI,QAAQ,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;YAC3C,aAAa,EAAE,CAAA;QACjB,CAAC;IACH,CAAC,CAAA;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,mCAAgB,EAAC,aAAa,EAAE,QAAQ,wDAA+B,wBAAwB,CAAC,CAAA;IACjH,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAExB,MAAM,uBAAuB,GAAG,IAAA,mBAAW,EAAC,wBAAwB,EAAE,8BAAsB,CAAC,CAAA;IAC7F,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE;QACtB,IAAA,qBAAa,EAAC,uBAAuB,CAAC,CAAA;IACxC,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,aAA4B,EAAE,EAAc;IAC/D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,mCAAgB,EAAC,aAAa,EAAE,MAAM,mCAAoB,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IACjG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC;AAED,KAAK,UAAU,4BAA4B,CAAC,aAA4B;IACtE,MAAM,wBAAwB,GAAG,aAAa,CAAC,wBAAwB,CAAA;IACvE,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC9B,OAAM;IACR,CAAC;IAED,IAAI,UAAU,CAAA;IACd,IAAI,aAAa,CAAA;IAEjB,IAAI,wBAAwB,CAAC,IAAI,KAAK,qCAAkB,CAAC,MAAM,EAAE,CAAC;QAChE,UAAU,GAAG,IAAA,uCAAqB,EAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;QAE1E,aAAa,GAAG;YACd,MAAM,EAAE,MAAM,iBAAiB,EAAE;YACjC,aAAa,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE;SAC1E,CAAA;IACH,CAAC;SAAM,CAAC;QACN,UAAU,GAAG,IAAA,uDAA+B,GAAE,CAAA;IAChD,CAAC;IACD,6FAA6F;IAC7F,IAAA,6BAAiB,EAAC,0BAA0B,EAAE;QAC5C,wBAAwB,EAAE,wBAAwB,CAAC,IAAI;QACvD,OAAO,EAAE,UAAU;QACnB,gBAAgB,EAAE,IAAA,yCAAgB,GAAE;QACpC,gBAAgB,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO;QACrC,eAAe,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM;QACnC,GAAG,aAAa;KACjB,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,aAA4B,EAAE,mBAAiC;IAC5F,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QACxD,OAAM;IACR,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;IAC9D,MAAM,WAAW,GAAG,IAAA,mBAAO,GAAE,CAAA;IAE7B,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,mCAAgB,EAAC,aAAa,EAAE,WAA0B,mCAAoB,QAAQ,CAAC,CAAA;IACxG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAExB,SAAS,QAAQ,CAAC,KAAwB;QACxC,MAAM,OAAO,GAAG,IAAA,oBAAQ,EAAC,KAAK,CAAC,OAAO,EAAE,CAAC,MAAM,EAA4B,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,wCAAiB,CAAC,CAAA;QAChH,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAM;QACR,CAAC;QAED,MAAM,UAAU,GAAG,IAAA,mBAAO,GAAE,GAAG,kBAAkB,CAAA;QACjD,IAAI,UAAU,GAAG,EAAE,GAAG,sBAAU,EAAE,CAAC;YACjC,4EAA4E;YAC5E,IAAI,EAAE,CAAA;QACR,CAAC;aAAM,CAAC;YACN,MAAM,eAAe,GAAG,IAAA,6BAAc,EAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YACrD,IAAI,eAAe,CAAC,EAAE,IAAI,eAAe,CAAC,EAAE,KAAK,mBAAmB,CAAC,EAAE,EAAE,CAAC;gBACxE,IAAI,EAAE,CAAA;gBACN,MAAM,IAAI,GAAG,IAAA,mBAAO,GAAE,GAAG,WAAW,CAAA;gBACpC,iBAAiB,EAAE;qBAChB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;oBACf,gEAAgE;oBAChE,IAAA,6BAAiB,EAAC,wBAAwB,EAAE;wBAC1C,IAAI;wBACJ,WAAW,EAAE,UAAU;wBACvB,GAAG,EAAE,mBAAmB;wBACxB,GAAG,EAAE,eAAe;wBACpB,MAAM;qBACP,CAAC,CAAA;gBACJ,CAAC,CAAC;qBACD,KAAK,CAAC,sBAAY,CAAC,CAAA;YACxB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB;IAC9B,IAAI,cAAqE,CAAA;IACzE,IAAI,aAAa,IAAI,MAAM,EAAE,CAAC;QAC5B,cAAc,GAAG,MAAO,MAAuC,CAAC,WAAW,CAAC,MAAM,CAAC,wCAAiB,CAAC,CAAA;IACvG,CAAC;SAAM,CAAC;QACN,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,wCAAiB,CAAC,CAAC,CAAA;IAC5G,CAAC;IAED,OAAO;QACL,KAAK,EAAE,cAAc,CAAC,MAAM;QAC5B,MAAM,EAAE,IAAA,uBAAc,GAAE,IAAI,WAAW;QACvC,GAAG,cAAc;KAClB,CAAA;AACH,CAAC"}
|
|
@@ -11,7 +11,6 @@ exports.toSessionState = toSessionState;
|
|
|
11
11
|
const objectUtils_1 = require("../../tools/utils/objectUtils");
|
|
12
12
|
const polyfills_1 = require("../../tools/utils/polyfills");
|
|
13
13
|
const timeUtils_1 = require("../../tools/utils/timeUtils");
|
|
14
|
-
const stringUtils_1 = require("../../tools/utils/stringUtils");
|
|
15
14
|
const sessionConstants_1 = require("./sessionConstants");
|
|
16
15
|
const sessionStateValidation_1 = require("./sessionStateValidation");
|
|
17
16
|
exports.EXPIRED = '1';
|
|
@@ -19,13 +18,8 @@ function getExpiredSessionState(previousSessionState, configuration) {
|
|
|
19
18
|
const expiredSessionState = {
|
|
20
19
|
isExpired: exports.EXPIRED,
|
|
21
20
|
};
|
|
22
|
-
if (configuration.trackAnonymousUser) {
|
|
23
|
-
|
|
24
|
-
expiredSessionState.anonymousId = previousSessionState === null || previousSessionState === void 0 ? void 0 : previousSessionState.anonymousId;
|
|
25
|
-
}
|
|
26
|
-
else {
|
|
27
|
-
expiredSessionState.anonymousId = (0, stringUtils_1.generateUUID)();
|
|
28
|
-
}
|
|
21
|
+
if (configuration.trackAnonymousUser && (previousSessionState === null || previousSessionState === void 0 ? void 0 : previousSessionState.anonymousId)) {
|
|
22
|
+
expiredSessionState.anonymousId = previousSessionState === null || previousSessionState === void 0 ? void 0 : previousSessionState.anonymousId;
|
|
29
23
|
}
|
|
30
24
|
return expiredSessionState;
|
|
31
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionState.js","sourceRoot":"","sources":["../../../src/domain/session/sessionState.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"sessionState.js","sourceRoot":"","sources":["../../../src/domain/session/sessionState.ts"],"names":[],"mappings":"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"}
|
|
@@ -119,6 +119,7 @@ function startSessionStore(sessionStoreStrategyType, configuration, productKey,
|
|
|
119
119
|
(0, sessionStoreOperations_1.processSessionStoreOperations)({
|
|
120
120
|
process: (sessionState) => {
|
|
121
121
|
if ((0, sessionState_1.isSessionInNotStartedState)(sessionState)) {
|
|
122
|
+
sessionState.anonymousId = (0, stringUtils_1.generateUUID)();
|
|
122
123
|
return (0, sessionState_1.getExpiredSessionState)(sessionState, configuration);
|
|
123
124
|
}
|
|
124
125
|
},
|
|
@@ -167,8 +168,11 @@ function startSessionStore(sessionStoreStrategyType, configuration, productKey,
|
|
|
167
168
|
expireObservable,
|
|
168
169
|
sessionStateUpdateObservable,
|
|
169
170
|
restartSession: startSession,
|
|
170
|
-
expire: () => {
|
|
171
|
+
expire: (hasConsent) => {
|
|
171
172
|
cancelExpandOrRenewSession();
|
|
173
|
+
if (hasConsent === false && sessionCache) {
|
|
174
|
+
delete sessionCache.anonymousId;
|
|
175
|
+
}
|
|
172
176
|
sessionStoreStrategy.expireSession(sessionCache);
|
|
173
177
|
synchronizeSession((0, sessionState_1.getExpiredSessionState)(sessionCache, configuration));
|
|
174
178
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionStore.js","sourceRoot":"","sources":["../../../src/domain/session/sessionStore.ts"],"names":[],"mappings":";;;AA4CA,wEAqBC;AAED,0DAOC;AAQD,
|
|
1
|
+
{"version":3,"file":"sessionStore.js","sourceRoot":"","sources":["../../../src/domain/session/sessionStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,5 +4,9 @@ import type { SessionState } from '../sessionState';
|
|
|
4
4
|
import type { SessionStoreStrategy, SessionStoreStrategyType } from './sessionStoreStrategy';
|
|
5
5
|
export declare function selectCookieStrategy(initConfiguration: InitConfiguration): SessionStoreStrategyType | undefined;
|
|
6
6
|
export declare function initCookieStrategy(configuration: Configuration, cookieOptions: CookieOptions): SessionStoreStrategy;
|
|
7
|
-
|
|
7
|
+
/**
|
|
8
|
+
* Retrieve the session state from the cookie that was set with the same cookie options
|
|
9
|
+
* If there is no match, return the first cookie, because that's how `getCookie()` works
|
|
10
|
+
*/
|
|
11
|
+
export declare function retrieveSessionCookie(cookieOptions: CookieOptions): SessionState;
|
|
8
12
|
export declare function buildCookieOptions(initConfiguration: InitConfiguration): CookieOptions | undefined;
|