@openobserve/browser-core 0.2.12-beta.24 → 0.2.12-beta.26
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/cjs/boot/init.js +1 -1
- package/cjs/domain/configuration/endpointBuilder.js +6 -2
- package/cjs/domain/configuration/endpointBuilder.js.map +1 -1
- package/cjs/domain/tags.js +1 -1
- package/cjs/domain/telemetry/telemetry.js +1 -1
- package/cjs/transport/httpRequest.js +4 -0
- package/cjs/transport/httpRequest.js.map +1 -1
- package/esm/boot/init.js +1 -1
- package/esm/domain/configuration/endpointBuilder.js +6 -2
- package/esm/domain/configuration/endpointBuilder.js.map +1 -1
- package/esm/domain/tags.js +1 -1
- package/esm/domain/telemetry/telemetry.js +1 -1
- package/esm/transport/httpRequest.js +4 -0
- package/esm/transport/httpRequest.js.map +1 -1
- package/package.json +1 -1
- package/src/domain/configuration/endpointBuilder.ts +5 -1
- package/src/transport/httpRequest.ts +4 -0
package/cjs/boot/init.js
CHANGED
|
@@ -7,7 +7,7 @@ const monitor_1 = require("../tools/monitor");
|
|
|
7
7
|
const display_1 = require("../tools/display");
|
|
8
8
|
function makePublicApi(stub) {
|
|
9
9
|
const publicApi = {
|
|
10
|
-
version: "0.2.12-beta.
|
|
10
|
+
version: "0.2.12-beta.26",
|
|
11
11
|
// This API method is intentionally not monitored, since the only thing executed is the
|
|
12
12
|
// user-provided 'callback'. All SDK usages executed in the callback should be monitored, and
|
|
13
13
|
// we don't want to interfere with the user uncaught exceptions.
|
|
@@ -8,6 +8,10 @@ const stringUtils_1 = require("../../tools/utils/stringUtils");
|
|
|
8
8
|
const intakeSites_1 = require("../intakeSites");
|
|
9
9
|
function createEndpointBuilder(initConfiguration, trackType, extraParameters) {
|
|
10
10
|
const buildUrlWithParameters = createEndpointUrlWithParametersBuilder(initConfiguration, trackType);
|
|
11
|
+
console.log('extraParameters', extraParameters);
|
|
12
|
+
console.log('initConfiguration', initConfiguration);
|
|
13
|
+
console.log('trackType', trackType);
|
|
14
|
+
console.log('buildUrlWithParameters', buildUrlWithParameters);
|
|
11
15
|
return {
|
|
12
16
|
build(api, payload) {
|
|
13
17
|
const parameters = buildEndpointParameters(initConfiguration, trackType, api, payload, extraParameters);
|
|
@@ -31,7 +35,7 @@ function createEndpointUrlWithParametersBuilder(initConfiguration, trackType) {
|
|
|
31
35
|
console.log('path', path);
|
|
32
36
|
if (typeof proxy === 'string') {
|
|
33
37
|
const normalizedProxyUrl = (0, urlPolyfill_1.normalizeUrl)(proxy);
|
|
34
|
-
return (parameters) => `${normalizedProxyUrl}?
|
|
38
|
+
return (parameters) => `${normalizedProxyUrl}?o2forward=${encodeURIComponent(`${path}?${parameters}`)}`;
|
|
35
39
|
}
|
|
36
40
|
if (typeof proxy === 'function') {
|
|
37
41
|
return (parameters) => proxy({ path, parameters });
|
|
@@ -64,7 +68,7 @@ function buildEndpointParameters({ clientToken, internalAnalyticsSubdomain, sour
|
|
|
64
68
|
const parameters = [
|
|
65
69
|
`o2source=${source}`,
|
|
66
70
|
`o2-api-key=${clientToken}`,
|
|
67
|
-
`o2-evp-origin-version=${encodeURIComponent("0.2.12-beta.
|
|
71
|
+
`o2-evp-origin-version=${encodeURIComponent("0.2.12-beta.26")}`,
|
|
68
72
|
'o2-evp-origin=browser',
|
|
69
73
|
`o2-request-id=${(0, stringUtils_1.generateUUID)()}`,
|
|
70
74
|
].concat(extraParameters);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpointBuilder.js","sourceRoot":"","sources":["../../../src/domain/configuration/endpointBuilder.ts"],"names":[],"mappings":";;AAqBA,
|
|
1
|
+
{"version":3,"file":"endpointBuilder.js","sourceRoot":"","sources":["../../../src/domain/configuration/endpointBuilder.ts"],"names":[],"mappings":"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"}
|
package/cjs/domain/tags.js
CHANGED
|
@@ -9,7 +9,7 @@ const display_1 = require("../tools/display");
|
|
|
9
9
|
exports.TAG_SIZE_LIMIT = 200;
|
|
10
10
|
function buildTags(configuration) {
|
|
11
11
|
const { env, service, version, datacenter, sdkVersion, variant } = configuration;
|
|
12
|
-
const tags = [buildTag('sdk_version', sdkVersion !== null && sdkVersion !== void 0 ? sdkVersion : "0.2.12-beta.
|
|
12
|
+
const tags = [buildTag('sdk_version', sdkVersion !== null && sdkVersion !== void 0 ? sdkVersion : "0.2.12-beta.26")];
|
|
13
13
|
if (env) {
|
|
14
14
|
tags.push(buildTag('env', env));
|
|
15
15
|
}
|
|
@@ -105,7 +105,7 @@ function startTelemetryCollection(telemetryService, configuration, hooks, observ
|
|
|
105
105
|
type: 'telemetry',
|
|
106
106
|
date: clockNow.timeStamp,
|
|
107
107
|
service: telemetryService,
|
|
108
|
-
version: "0.2.12-beta.
|
|
108
|
+
version: "0.2.12-beta.26",
|
|
109
109
|
source: 'browser',
|
|
110
110
|
_oo: {
|
|
111
111
|
format_version: 2,
|
|
@@ -20,6 +20,7 @@ function createHttpRequest(endpointBuilders, reportError, bytesLimit = exports.R
|
|
|
20
20
|
return {
|
|
21
21
|
observable,
|
|
22
22
|
send: (payload) => {
|
|
23
|
+
console.log('httpRequest.send called', { trackTypes: endpointBuilders.map(eb => eb.trackType), payloadSize: payload.bytesCount });
|
|
23
24
|
for (const endpointBuilder of endpointBuilders) {
|
|
24
25
|
(0, sendWithRetryStrategy_1.sendWithRetryStrategy)(payload, retryState, (payload, onResponse) => {
|
|
25
26
|
if ((0, experimentalFeatures_1.isExperimentalFeatureEnabled)(experimentalFeatures_1.ExperimentalFeature.AVOID_FETCH_KEEPALIVE)) {
|
|
@@ -67,8 +68,10 @@ function reportBeaconError(e) {
|
|
|
67
68
|
}
|
|
68
69
|
function fetchKeepAliveStrategy(endpointBuilder, bytesLimit, payload, onResponse) {
|
|
69
70
|
const canUseKeepAlive = isKeepAliveSupported() && payload.bytesCount < bytesLimit;
|
|
71
|
+
console.log('fetchKeepAliveStrategy', { trackType: endpointBuilder.trackType, canUseKeepAlive, bytesCount: payload.bytesCount, bytesLimit });
|
|
70
72
|
if (canUseKeepAlive) {
|
|
71
73
|
const fetchUrl = endpointBuilder.build('fetch-keepalive', payload);
|
|
74
|
+
console.log('Making fetch request to:', fetchUrl);
|
|
72
75
|
fetch(fetchUrl, { method: 'POST', body: payload.data, keepalive: true, mode: 'cors' })
|
|
73
76
|
.then((0, monitor_1.monitor)((response) => onResponse === null || onResponse === void 0 ? void 0 : onResponse({ status: response.status, type: response.type })))
|
|
74
77
|
.catch((0, monitor_1.monitor)(() => fetchStrategy(endpointBuilder, payload, onResponse)));
|
|
@@ -79,6 +82,7 @@ function fetchKeepAliveStrategy(endpointBuilder, bytesLimit, payload, onResponse
|
|
|
79
82
|
}
|
|
80
83
|
function fetchStrategy(endpointBuilder, payload, onResponse) {
|
|
81
84
|
const fetchUrl = endpointBuilder.build('fetch', payload);
|
|
85
|
+
console.log('fetchStrategy - Making fetch request to:', fetchUrl);
|
|
82
86
|
fetch(fetchUrl, { method: 'POST', body: payload.data, mode: 'cors' })
|
|
83
87
|
.then((0, monitor_1.monitor)((response) => onResponse === null || onResponse === void 0 ? void 0 : onResponse({ status: response.status, type: response.type })))
|
|
84
88
|
.catch((0, monitor_1.monitor)(() => onResponse === null || onResponse === void 0 ? void 0 : onResponse({ status: 0 })));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpRequest.js","sourceRoot":"","sources":["../../src/transport/httpRequest.ts"],"names":[],"mappings":";;;AAwEA,
|
|
1
|
+
{"version":3,"file":"httpRequest.js","sourceRoot":"","sources":["../../src/transport/httpRequest.ts"],"names":[],"mappings":"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"}
|
package/esm/boot/init.js
CHANGED
|
@@ -3,7 +3,7 @@ import { setDebugMode } from '../tools/monitor';
|
|
|
3
3
|
import { display } from '../tools/display';
|
|
4
4
|
export function makePublicApi(stub) {
|
|
5
5
|
const publicApi = {
|
|
6
|
-
version: "0.2.12-beta.
|
|
6
|
+
version: "0.2.12-beta.26",
|
|
7
7
|
// This API method is intentionally not monitored, since the only thing executed is the
|
|
8
8
|
// user-provided 'callback'. All SDK usages executed in the callback should be monitored, and
|
|
9
9
|
// we don't want to interfere with the user uncaught exceptions.
|
|
@@ -4,6 +4,10 @@ import { generateUUID } from '../../tools/utils/stringUtils';
|
|
|
4
4
|
import { INTAKE_SITE_FED_STAGING, INTAKE_SITE_US1, PCI_INTAKE_HOST_US1 } from '../intakeSites';
|
|
5
5
|
export function createEndpointBuilder(initConfiguration, trackType, extraParameters) {
|
|
6
6
|
const buildUrlWithParameters = createEndpointUrlWithParametersBuilder(initConfiguration, trackType);
|
|
7
|
+
console.log('extraParameters', extraParameters);
|
|
8
|
+
console.log('initConfiguration', initConfiguration);
|
|
9
|
+
console.log('trackType', trackType);
|
|
10
|
+
console.log('buildUrlWithParameters', buildUrlWithParameters);
|
|
7
11
|
return {
|
|
8
12
|
build(api, payload) {
|
|
9
13
|
const parameters = buildEndpointParameters(initConfiguration, trackType, api, payload, extraParameters);
|
|
@@ -27,7 +31,7 @@ function createEndpointUrlWithParametersBuilder(initConfiguration, trackType) {
|
|
|
27
31
|
console.log('path', path);
|
|
28
32
|
if (typeof proxy === 'string') {
|
|
29
33
|
const normalizedProxyUrl = normalizeUrl(proxy);
|
|
30
|
-
return (parameters) => `${normalizedProxyUrl}?
|
|
34
|
+
return (parameters) => `${normalizedProxyUrl}?o2forward=${encodeURIComponent(`${path}?${parameters}`)}`;
|
|
31
35
|
}
|
|
32
36
|
if (typeof proxy === 'function') {
|
|
33
37
|
return (parameters) => proxy({ path, parameters });
|
|
@@ -60,7 +64,7 @@ function buildEndpointParameters({ clientToken, internalAnalyticsSubdomain, sour
|
|
|
60
64
|
const parameters = [
|
|
61
65
|
`o2source=${source}`,
|
|
62
66
|
`o2-api-key=${clientToken}`,
|
|
63
|
-
`o2-evp-origin-version=${encodeURIComponent("0.2.12-beta.
|
|
67
|
+
`o2-evp-origin-version=${encodeURIComponent("0.2.12-beta.26")}`,
|
|
64
68
|
'o2-evp-origin=browser',
|
|
65
69
|
`o2-request-id=${generateUUID()}`,
|
|
66
70
|
].concat(extraParameters);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpointBuilder.js","sourceRoot":"","sources":["../../../src/domain/configuration/endpointBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAC5D,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAiB9F,MAAM,UAAU,qBAAqB,CACnC,iBAAoC,EACpC,SAAoB,EACpB,eAA0B;IAE1B,MAAM,sBAAsB,GAAG,sCAAsC,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"endpointBuilder.js","sourceRoot":"","sources":["../../../src/domain/configuration/endpointBuilder.ts"],"names":[],"mappings":"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"}
|
package/esm/domain/tags.js
CHANGED
|
@@ -2,7 +2,7 @@ import { DOCS_ORIGIN, MORE_DETAILS, display } from '../tools/display';
|
|
|
2
2
|
export const TAG_SIZE_LIMIT = 200;
|
|
3
3
|
export function buildTags(configuration) {
|
|
4
4
|
const { env, service, version, datacenter, sdkVersion, variant } = configuration;
|
|
5
|
-
const tags = [buildTag('sdk_version', sdkVersion !== null && sdkVersion !== void 0 ? sdkVersion : "0.2.12-beta.
|
|
5
|
+
const tags = [buildTag('sdk_version', sdkVersion !== null && sdkVersion !== void 0 ? sdkVersion : "0.2.12-beta.26")];
|
|
6
6
|
if (env) {
|
|
7
7
|
tags.push(buildTag('env', env));
|
|
8
8
|
}
|
|
@@ -92,7 +92,7 @@ export function startTelemetryCollection(telemetryService, configuration, hooks,
|
|
|
92
92
|
type: 'telemetry',
|
|
93
93
|
date: clockNow.timeStamp,
|
|
94
94
|
service: telemetryService,
|
|
95
|
-
version: "0.2.12-beta.
|
|
95
|
+
version: "0.2.12-beta.26",
|
|
96
96
|
source: 'browser',
|
|
97
97
|
_oo: {
|
|
98
98
|
format_version: 2,
|
|
@@ -14,6 +14,7 @@ export function createHttpRequest(endpointBuilders, reportError, bytesLimit = RE
|
|
|
14
14
|
return {
|
|
15
15
|
observable,
|
|
16
16
|
send: (payload) => {
|
|
17
|
+
console.log('httpRequest.send called', { trackTypes: endpointBuilders.map(eb => eb.trackType), payloadSize: payload.bytesCount });
|
|
17
18
|
for (const endpointBuilder of endpointBuilders) {
|
|
18
19
|
sendWithRetryStrategy(payload, retryState, (payload, onResponse) => {
|
|
19
20
|
if (isExperimentalFeatureEnabled(ExperimentalFeature.AVOID_FETCH_KEEPALIVE)) {
|
|
@@ -61,8 +62,10 @@ function reportBeaconError(e) {
|
|
|
61
62
|
}
|
|
62
63
|
export function fetchKeepAliveStrategy(endpointBuilder, bytesLimit, payload, onResponse) {
|
|
63
64
|
const canUseKeepAlive = isKeepAliveSupported() && payload.bytesCount < bytesLimit;
|
|
65
|
+
console.log('fetchKeepAliveStrategy', { trackType: endpointBuilder.trackType, canUseKeepAlive, bytesCount: payload.bytesCount, bytesLimit });
|
|
64
66
|
if (canUseKeepAlive) {
|
|
65
67
|
const fetchUrl = endpointBuilder.build('fetch-keepalive', payload);
|
|
68
|
+
console.log('Making fetch request to:', fetchUrl);
|
|
66
69
|
fetch(fetchUrl, { method: 'POST', body: payload.data, keepalive: true, mode: 'cors' })
|
|
67
70
|
.then(monitor((response) => onResponse === null || onResponse === void 0 ? void 0 : onResponse({ status: response.status, type: response.type })))
|
|
68
71
|
.catch(monitor(() => fetchStrategy(endpointBuilder, payload, onResponse)));
|
|
@@ -73,6 +76,7 @@ export function fetchKeepAliveStrategy(endpointBuilder, bytesLimit, payload, onR
|
|
|
73
76
|
}
|
|
74
77
|
export function fetchStrategy(endpointBuilder, payload, onResponse) {
|
|
75
78
|
const fetchUrl = endpointBuilder.build('fetch', payload);
|
|
79
|
+
console.log('fetchStrategy - Making fetch request to:', fetchUrl);
|
|
76
80
|
fetch(fetchUrl, { method: 'POST', body: payload.data, mode: 'cors' })
|
|
77
81
|
.then(monitor((response) => onResponse === null || onResponse === void 0 ? void 0 : onResponse({ status: response.status, type: response.type })))
|
|
78
82
|
.catch(monitor(() => onResponse === null || onResponse === void 0 ? void 0 : onResponse({ status: 0 })));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpRequest.js","sourceRoot":"","sources":["../../src/transport/httpRequest.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAExD,OAAO,EAAE,4BAA4B,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AACjG,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAE9E;;;GAGG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,EAAE,GAAG,aAAa,CAAA;AA2DjE,MAAM,UAAU,iBAAiB,CAC/B,gBAAmC,EACnC,WAAsC,EACtC,aAAqB,+BAA+B;IAEpD,MAAM,UAAU,GAAG,IAAI,UAAU,EAA0B,CAAA;IAC3D,MAAM,UAAU,GAAG,aAAa,EAAQ,CAAA;IAExC,OAAO;QACL,UAAU;QACV,IAAI,EAAE,CAAC,OAAa,EAAE,EAAE;YACtB,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE,CAAC;gBAC/C,qBAAqB,CACnB,OAAO,EACP,UAAU,EACV,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE;oBACtB,IAAI,4BAA4B,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,EAAE,CAAC;wBAC5E,aAAa,CAAC,eAAe,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;oBACrD,CAAC;yBAAM,CAAC;wBACN,sBAAsB,CAAC,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;oBAC1E,CAAC;gBACH,CAAC,EACD,eAAe,CAAC,SAAS,EACzB,WAAW,EACX,UAAU,CACX,CAAA;YACH,CAAC;QACH,CAAC;QACD;;;WAGG;QACH,UAAU,EAAE,CAAC,OAAa,EAAE,EAAE;YAC5B,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE,CAAC;gBAC/C,kBAAkB,CAAC,eAAe,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;YAC1D,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,eAAgC,EAAE,UAAkB,EAAE,OAAgB;IAChG,MAAM,YAAY,GAAG,CAAC,CAAC,SAAS,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9E,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YAC1D,MAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;YAE9D,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAM;YACR,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,iBAAiB,CAAC,CAAC,CAAC,CAAA;QACtB,CAAC;IACH,CAAC;IAED,aAAa,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;AACzC,CAAC;AAED,IAAI,sBAAsB,GAAG,KAAK,CAAA;AAElC,SAAS,iBAAiB,CAAC,CAAU;IACnC,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5B,sBAAsB,GAAG,IAAI,CAAA;QAC7B,YAAY,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,eAAgC,EAChC,UAAkB,EAClB,OAAgB,EAChB,UAAsC;IAEtC,MAAM,eAAe,GAAG,oBAAoB,EAAE,IAAI,OAAO,CAAC,UAAU,GAAG,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"httpRequest.js","sourceRoot":"","sources":["../../src/transport/httpRequest.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -25,6 +25,10 @@ export function createEndpointBuilder(
|
|
|
25
25
|
extraParameters?: string[]
|
|
26
26
|
) {
|
|
27
27
|
const buildUrlWithParameters = createEndpointUrlWithParametersBuilder(initConfiguration, trackType)
|
|
28
|
+
console.log('extraParameters', extraParameters);
|
|
29
|
+
console.log('initConfiguration', initConfiguration);
|
|
30
|
+
console.log('trackType', trackType);
|
|
31
|
+
console.log('buildUrlWithParameters', buildUrlWithParameters);
|
|
28
32
|
|
|
29
33
|
return {
|
|
30
34
|
build(api: ApiType, payload: Payload) {
|
|
@@ -54,7 +58,7 @@ function createEndpointUrlWithParametersBuilder(
|
|
|
54
58
|
console.log('path', path)
|
|
55
59
|
if (typeof proxy === 'string') {
|
|
56
60
|
const normalizedProxyUrl = normalizeUrl(proxy)
|
|
57
|
-
return (parameters) => `${normalizedProxyUrl}?
|
|
61
|
+
return (parameters) => `${normalizedProxyUrl}?o2forward=${encodeURIComponent(`${path}?${parameters}`)}`
|
|
58
62
|
}
|
|
59
63
|
if (typeof proxy === 'function') {
|
|
60
64
|
return (parameters) => proxy({ path, parameters })
|
|
@@ -81,6 +81,7 @@ export function createHttpRequest<Body extends Payload = Payload>(
|
|
|
81
81
|
return {
|
|
82
82
|
observable,
|
|
83
83
|
send: (payload: Body) => {
|
|
84
|
+
console.log('httpRequest.send called', { trackTypes: endpointBuilders.map(eb => eb.trackType), payloadSize: payload.bytesCount })
|
|
84
85
|
for (const endpointBuilder of endpointBuilders) {
|
|
85
86
|
sendWithRetryStrategy(
|
|
86
87
|
payload,
|
|
@@ -144,9 +145,11 @@ export function fetchKeepAliveStrategy(
|
|
|
144
145
|
onResponse?: (r: HttpResponse) => void
|
|
145
146
|
) {
|
|
146
147
|
const canUseKeepAlive = isKeepAliveSupported() && payload.bytesCount < bytesLimit
|
|
148
|
+
console.log('fetchKeepAliveStrategy', { trackType: endpointBuilder.trackType, canUseKeepAlive, bytesCount: payload.bytesCount, bytesLimit })
|
|
147
149
|
|
|
148
150
|
if (canUseKeepAlive) {
|
|
149
151
|
const fetchUrl = endpointBuilder.build('fetch-keepalive', payload)
|
|
152
|
+
console.log('Making fetch request to:', fetchUrl)
|
|
150
153
|
|
|
151
154
|
fetch(fetchUrl, { method: 'POST', body: payload.data, keepalive: true, mode: 'cors' })
|
|
152
155
|
.then(monitor((response: Response) => onResponse?.({ status: response.status, type: response.type })))
|
|
@@ -162,6 +165,7 @@ export function fetchStrategy(
|
|
|
162
165
|
onResponse?: (r: HttpResponse) => void
|
|
163
166
|
) {
|
|
164
167
|
const fetchUrl = endpointBuilder.build('fetch', payload)
|
|
168
|
+
console.log('fetchStrategy - Making fetch request to:', fetchUrl)
|
|
165
169
|
|
|
166
170
|
fetch(fetchUrl, { method: 'POST', body: payload.data, mode: 'cors' })
|
|
167
171
|
.then(monitor((response: Response) => onResponse?.({ status: response.status, type: response.type })))
|