@microsoft/applicationinsights-dependencies-js 3.0.3-nightly3.2308-11 → 3.0.3-nightly3.2308-16
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/browser/es5/applicationinsights-dependencies-js.cjs.js +127 -58
- package/browser/es5/applicationinsights-dependencies-js.cjs.js.map +1 -1
- package/browser/es5/applicationinsights-dependencies-js.cjs.min.js +2 -2
- package/browser/es5/applicationinsights-dependencies-js.cjs.min.js.map +1 -1
- package/browser/es5/applicationinsights-dependencies-js.gbl.js +129 -60
- package/browser/es5/applicationinsights-dependencies-js.gbl.js.map +1 -1
- package/browser/es5/applicationinsights-dependencies-js.gbl.min.js +2 -2
- package/browser/es5/applicationinsights-dependencies-js.gbl.min.js.map +1 -1
- package/browser/es5/applicationinsights-dependencies-js.integrity.json +25 -25
- package/browser/es5/applicationinsights-dependencies-js.js +129 -60
- package/browser/es5/applicationinsights-dependencies-js.js.map +1 -1
- package/browser/es5/applicationinsights-dependencies-js.min.js +2 -2
- package/browser/es5/applicationinsights-dependencies-js.min.js.map +1 -1
- package/dist/es5/applicationinsights-dependencies-js.js +127 -58
- package/dist/es5/applicationinsights-dependencies-js.js.map +1 -1
- package/dist/es5/applicationinsights-dependencies-js.min.js +2 -2
- package/dist/es5/applicationinsights-dependencies-js.min.js.map +1 -1
- package/dist-es5/DependencyInitializer.js +1 -1
- package/dist-es5/DependencyListener.js +1 -1
- package/dist-es5/InternalConstants.js +1 -1
- package/dist-es5/__DynamicConstants.js +1 -1
- package/dist-es5/ajax.js +139 -58
- package/dist-es5/ajax.js.map +1 -1
- package/dist-es5/ajaxRecord.js +1 -1
- package/dist-es5/ajaxUtils.js +1 -1
- package/dist-es5/applicationinsights-dependencies-js.js +1 -1
- package/package.json +3 -3
- package/types/applicationinsights-dependencies-js.d.ts +18 -2
- package/types/applicationinsights-dependencies-js.namespaced.d.ts +18 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* Application Insights JavaScript SDK - Dependencies Plugin, 3.0.3-nightly3.2308-
|
|
2
|
+
* Application Insights JavaScript SDK - Dependencies Plugin, 3.0.3-nightly3.2308-16
|
|
3
3
|
* Copyright (c) Microsoft and contributors. All rights reserved.
|
|
4
4
|
*/
|
|
5
5
|
(function (global, factory) {
|
|
@@ -1365,7 +1365,7 @@
|
|
|
1365
1365
|
return result;
|
|
1366
1366
|
}
|
|
1367
1367
|
|
|
1368
|
-
var version = '3.0.3-nightly3.2308-
|
|
1368
|
+
var version = '3.0.3-nightly3.2308-16';
|
|
1369
1369
|
var instanceName = "." + newId(6);
|
|
1370
1370
|
var _dataUid = 0;
|
|
1371
1371
|
function _canAcceptData(target) {
|
|
@@ -4070,7 +4070,7 @@
|
|
|
4070
4070
|
var _a;
|
|
4071
4071
|
var AJAX_MONITOR_PREFIX = "ai.ajxmn.";
|
|
4072
4072
|
var strDiagLog = "diagLog";
|
|
4073
|
-
var
|
|
4073
|
+
var AJAX_DATA_CONTAINER = "_ajaxData";
|
|
4074
4074
|
var STR_FETCH = "fetch";
|
|
4075
4075
|
var ERROR_HEADER = "Failed to monitor XMLHttpRequest";
|
|
4076
4076
|
var ERROR_PREFIX = ", monitoring data for this ajax call ";
|
|
@@ -4090,8 +4090,8 @@
|
|
|
4090
4090
|
}
|
|
4091
4091
|
return _global[STR_FETCH];
|
|
4092
4092
|
}
|
|
4093
|
-
function _supportsAjaxMonitoring(ajaxMonitorInstance) {
|
|
4094
|
-
var _a;
|
|
4093
|
+
function _supportsAjaxMonitoring(ajaxMonitorInstance, ajaxDataId) {
|
|
4094
|
+
var _a, _b;
|
|
4095
4095
|
var result = false;
|
|
4096
4096
|
if (isXhrSupported()) {
|
|
4097
4097
|
var proto = XMLHttpRequest[strShimPrototype];
|
|
@@ -4107,24 +4107,63 @@
|
|
|
4107
4107
|
if (result) {
|
|
4108
4108
|
try {
|
|
4109
4109
|
var xhr = new XMLHttpRequest();
|
|
4110
|
-
|
|
4110
|
+
var xhrData = {
|
|
4111
|
+
xh: [],
|
|
4112
|
+
i: (_a = {},
|
|
4113
|
+
_a[ajaxDataId] = {},
|
|
4114
|
+
_a)
|
|
4115
|
+
};
|
|
4116
|
+
xhr[AJAX_DATA_CONTAINER] = xhrData;
|
|
4111
4117
|
var theOpen = XMLHttpRequest[strShimPrototype].open;
|
|
4112
4118
|
XMLHttpRequest[strShimPrototype].open = theOpen;
|
|
4113
4119
|
}
|
|
4114
4120
|
catch (e) {
|
|
4115
4121
|
result = false;
|
|
4116
|
-
_throwInternalCritical(ajaxMonitorInstance, 15 , "Failed to enable XMLHttpRequest monitoring, extension is not supported", (
|
|
4117
|
-
|
|
4118
|
-
|
|
4122
|
+
_throwInternalCritical(ajaxMonitorInstance, 15 , "Failed to enable XMLHttpRequest monitoring, extension is not supported", (_b = {},
|
|
4123
|
+
_b[_DYN_EXCEPTION ] = dumpObj(e),
|
|
4124
|
+
_b));
|
|
4119
4125
|
}
|
|
4120
4126
|
}
|
|
4121
4127
|
return result;
|
|
4122
4128
|
}
|
|
4123
|
-
function
|
|
4129
|
+
var _getAjaxData = function (xhr, ajaxDataId) {
|
|
4130
|
+
if (xhr && ajaxDataId && xhr[AJAX_DATA_CONTAINER]) {
|
|
4131
|
+
return (xhr[AJAX_DATA_CONTAINER].i || {})[ajaxDataId];
|
|
4132
|
+
}
|
|
4133
|
+
return null;
|
|
4134
|
+
};
|
|
4135
|
+
var _addSharedXhrHeaders = function (xhr, name, value) {
|
|
4136
|
+
if (xhr) {
|
|
4137
|
+
var headers = (xhr[AJAX_DATA_CONTAINER] || {}).xh;
|
|
4138
|
+
if (headers) {
|
|
4139
|
+
headers.push({
|
|
4140
|
+
n: name,
|
|
4141
|
+
v: value
|
|
4142
|
+
});
|
|
4143
|
+
}
|
|
4144
|
+
}
|
|
4145
|
+
};
|
|
4146
|
+
var _isHeaderSet = function (xhr, name) {
|
|
4147
|
+
var isPresent = false;
|
|
4148
|
+
if (xhr) {
|
|
4149
|
+
var headers = (xhr[AJAX_DATA_CONTAINER] || {}).xh;
|
|
4150
|
+
if (headers) {
|
|
4151
|
+
arrForEach(headers, function (header) {
|
|
4152
|
+
if (header.n === name) {
|
|
4153
|
+
isPresent = true;
|
|
4154
|
+
return -1;
|
|
4155
|
+
}
|
|
4156
|
+
});
|
|
4157
|
+
}
|
|
4158
|
+
}
|
|
4159
|
+
return isPresent;
|
|
4160
|
+
};
|
|
4161
|
+
function _getFailedAjaxDiagnosticsMessage(xhr, ajaxDataId) {
|
|
4124
4162
|
var result = "";
|
|
4125
4163
|
try {
|
|
4126
|
-
|
|
4127
|
-
|
|
4164
|
+
var ajaxData = _getAjaxData(xhr, ajaxDataId);
|
|
4165
|
+
if (ajaxData && ajaxData[_DYN_REQUEST_URL ]) {
|
|
4166
|
+
result += "(url: '" + ajaxData[_DYN_REQUEST_URL ] + "')";
|
|
4128
4167
|
}
|
|
4129
4168
|
}
|
|
4130
4169
|
catch (e) {
|
|
@@ -4138,12 +4177,12 @@
|
|
|
4138
4177
|
_throwInternal(ajaxMonitorInstance[strDiagLog](), 2 , msgId, message, properties, isUserAct);
|
|
4139
4178
|
}
|
|
4140
4179
|
function _createErrorCallbackFunc(ajaxMonitorInstance, internalMessage, message) {
|
|
4141
|
-
return function (
|
|
4180
|
+
return function (callDetails) {
|
|
4142
4181
|
var _a;
|
|
4143
4182
|
_throwInternalCritical(ajaxMonitorInstance, internalMessage, message, (_a = {
|
|
4144
|
-
ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(
|
|
4183
|
+
ajaxDiagnosticsMessage: _getFailedAjaxDiagnosticsMessage(callDetails[_DYN_INST ], ajaxMonitorInstance._ajaxDataId)
|
|
4145
4184
|
},
|
|
4146
|
-
_a[_DYN_EXCEPTION ] = dumpObj(
|
|
4185
|
+
_a[_DYN_EXCEPTION ] = dumpObj(callDetails.err),
|
|
4147
4186
|
_a));
|
|
4148
4187
|
};
|
|
4149
4188
|
}
|
|
@@ -4268,6 +4307,7 @@
|
|
|
4268
4307
|
var _excludeRequestFromAutoTrackingPatterns;
|
|
4269
4308
|
var _addRequestContext;
|
|
4270
4309
|
var _evtNamespace;
|
|
4310
|
+
var _ajaxDataId;
|
|
4271
4311
|
var _dependencyHandlerId;
|
|
4272
4312
|
var _dependencyListeners;
|
|
4273
4313
|
var _dependencyInitializers;
|
|
@@ -4337,17 +4377,27 @@
|
|
|
4337
4377
|
else if (xhr) {
|
|
4338
4378
|
if (correlationIdCanIncludeCorrelationHeader(_extensionConfig, ajaxData[_DYN_GET_ABSOLUTE_URL ](), currentWindowHost)) {
|
|
4339
4379
|
if (_isUsingAIHeaders) {
|
|
4340
|
-
|
|
4341
|
-
|
|
4342
|
-
|
|
4343
|
-
|
|
4380
|
+
if (!_isHeaderSet(xhr, RequestHeaders[3 ])) {
|
|
4381
|
+
var id = "|" + ajaxData[_DYN_TRACE_ID ] + "." + ajaxData[_DYN_SPAN_ID ];
|
|
4382
|
+
xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[3 ], id);
|
|
4383
|
+
if (_enableRequestHeaderTracking) {
|
|
4384
|
+
ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[3 ]] = id;
|
|
4385
|
+
}
|
|
4386
|
+
}
|
|
4387
|
+
else {
|
|
4388
|
+
_throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[3 ] + "] as it has already been set by another instance");
|
|
4344
4389
|
}
|
|
4345
4390
|
}
|
|
4346
4391
|
var appId = _appId || (_context && _context.appId());
|
|
4347
4392
|
if (appId) {
|
|
4348
|
-
|
|
4349
|
-
|
|
4350
|
-
|
|
4393
|
+
if (!_isHeaderSet(xhr, RequestHeaders[0 ])) {
|
|
4394
|
+
xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[0 ], RequestHeaders[2 ] + appId);
|
|
4395
|
+
if (_enableRequestHeaderTracking) {
|
|
4396
|
+
ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[0 ]] = RequestHeaders[2 ] + appId;
|
|
4397
|
+
}
|
|
4398
|
+
}
|
|
4399
|
+
else {
|
|
4400
|
+
_throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[0 ] + "] as it has already been set by another instance");
|
|
4351
4401
|
}
|
|
4352
4402
|
}
|
|
4353
4403
|
if (_isUsingW3CHeaders) {
|
|
@@ -4355,10 +4405,15 @@
|
|
|
4355
4405
|
if (isNullOrUndefined(traceFlags)) {
|
|
4356
4406
|
traceFlags = 0x01;
|
|
4357
4407
|
}
|
|
4358
|
-
|
|
4359
|
-
|
|
4360
|
-
|
|
4361
|
-
|
|
4408
|
+
if (!_isHeaderSet(xhr, RequestHeaders[4 ])) {
|
|
4409
|
+
var traceParent = formatTraceParent(createTraceParent(ajaxData[_DYN_TRACE_ID ], ajaxData[_DYN_SPAN_ID ], traceFlags));
|
|
4410
|
+
xhr[_DYN_SET_REQUEST_HEADER ](RequestHeaders[4 ], traceParent);
|
|
4411
|
+
if (_enableRequestHeaderTracking) {
|
|
4412
|
+
ajaxData[_DYN_REQUEST_HEADERS ][RequestHeaders[4 ]] = traceParent;
|
|
4413
|
+
}
|
|
4414
|
+
}
|
|
4415
|
+
else {
|
|
4416
|
+
_throwInternalWarning(_self, 71 , "Unable to set [" + RequestHeaders[4 ] + "] as it has already been set by another instance");
|
|
4362
4417
|
}
|
|
4363
4418
|
}
|
|
4364
4419
|
}
|
|
@@ -4416,6 +4471,8 @@
|
|
|
4416
4471
|
_dependencyHandlerId = 0;
|
|
4417
4472
|
_dependencyListeners = [];
|
|
4418
4473
|
_dependencyInitializers = [];
|
|
4474
|
+
_ajaxDataId = createUniqueNamespace("ajaxData");
|
|
4475
|
+
_self._ajaxDataId = _ajaxDataId;
|
|
4419
4476
|
_ignoreHeaders = null;
|
|
4420
4477
|
_maxAjaxPerfLookupAttempts = 1;
|
|
4421
4478
|
_ajaxPerfLookupDelay = 1;
|
|
@@ -4552,7 +4609,7 @@
|
|
|
4552
4609
|
_addHook(InstrumentProto(target, funcName, callbacks));
|
|
4553
4610
|
}
|
|
4554
4611
|
function _instrumentXhr() {
|
|
4555
|
-
if (!_supportsAjaxMonitoring(_self)) {
|
|
4612
|
+
if (!_supportsAjaxMonitoring(_self, _ajaxDataId)) {
|
|
4556
4613
|
return;
|
|
4557
4614
|
}
|
|
4558
4615
|
_self[_DYN__ADD_HOOK ](onConfigChange(_extensionConfig, function () {
|
|
@@ -4561,15 +4618,15 @@
|
|
|
4561
4618
|
if (!_disableAjaxTracking && !_xhrInitialized) {
|
|
4562
4619
|
_hookProto(XMLHttpRequest, "open", {
|
|
4563
4620
|
ns: _evtNamespace,
|
|
4564
|
-
req: function (
|
|
4621
|
+
req: function (callDetails, method, url, async) {
|
|
4565
4622
|
if (!_disableAjaxTracking) {
|
|
4566
|
-
var xhr =
|
|
4567
|
-
var ajaxData = xhr
|
|
4568
|
-
if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, true)) {
|
|
4623
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4624
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4625
|
+
if (!_isDisabledRequest(xhr, url) && _isMonitoredXhrInstance(xhr, ajaxData, true)) {
|
|
4569
4626
|
if (!ajaxData || !ajaxData.xhrMonitoringState[_DYN_OPEN_DONE ]) {
|
|
4570
|
-
_openHandler(xhr, method, url, async);
|
|
4627
|
+
ajaxData = _openHandler(xhr, method, url, async);
|
|
4571
4628
|
}
|
|
4572
|
-
_attachToOnReadyStateChange(xhr);
|
|
4629
|
+
_attachToOnReadyStateChange(xhr, ajaxData);
|
|
4573
4630
|
}
|
|
4574
4631
|
}
|
|
4575
4632
|
},
|
|
@@ -4577,11 +4634,11 @@
|
|
|
4577
4634
|
});
|
|
4578
4635
|
_hookProto(XMLHttpRequest, "send", {
|
|
4579
4636
|
ns: _evtNamespace,
|
|
4580
|
-
req: function (
|
|
4637
|
+
req: function (callDetails, context) {
|
|
4581
4638
|
if (!_disableAjaxTracking) {
|
|
4582
|
-
var xhr =
|
|
4583
|
-
var ajaxData = xhr
|
|
4584
|
-
if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState[_DYN_SEND_DONE ]) {
|
|
4639
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4640
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4641
|
+
if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState[_DYN_SEND_DONE ]) {
|
|
4585
4642
|
_createMarkId("xhr", ajaxData);
|
|
4586
4643
|
ajaxData[_DYN_REQUEST_SENT_TIME ] = dateTimeUtilsNow();
|
|
4587
4644
|
_self[_DYN_INCLUDE_CORRELATION_2 ](ajaxData, undefined, undefined, xhr);
|
|
@@ -4593,11 +4650,11 @@
|
|
|
4593
4650
|
});
|
|
4594
4651
|
_hookProto(XMLHttpRequest, "abort", {
|
|
4595
4652
|
ns: _evtNamespace,
|
|
4596
|
-
req: function (
|
|
4653
|
+
req: function (callDetails) {
|
|
4597
4654
|
if (!_disableAjaxTracking) {
|
|
4598
|
-
var xhr =
|
|
4599
|
-
var ajaxData = xhr
|
|
4600
|
-
if (_isMonitoredXhrInstance(xhr) && !ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ]) {
|
|
4655
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4656
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4657
|
+
if (_isMonitoredXhrInstance(xhr, ajaxData) && !ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ]) {
|
|
4601
4658
|
ajaxData[_DYN_ABORTED ] = 1;
|
|
4602
4659
|
ajaxData.xhrMonitoringState[_DYN_ABORT_DONE ] = true;
|
|
4603
4660
|
}
|
|
@@ -4607,11 +4664,17 @@
|
|
|
4607
4664
|
});
|
|
4608
4665
|
_hookProto(XMLHttpRequest, "setRequestHeader", {
|
|
4609
4666
|
ns: _evtNamespace,
|
|
4610
|
-
req: function (
|
|
4611
|
-
if (!_disableAjaxTracking
|
|
4612
|
-
var xhr =
|
|
4613
|
-
|
|
4614
|
-
|
|
4667
|
+
req: function (callDetails, header, value) {
|
|
4668
|
+
if (!_disableAjaxTracking) {
|
|
4669
|
+
var xhr = callDetails[_DYN_INST ];
|
|
4670
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4671
|
+
if (ajaxData && _isMonitoredXhrInstance(xhr, ajaxData)) {
|
|
4672
|
+
_addSharedXhrHeaders(xhr, header, value);
|
|
4673
|
+
if (_enableRequestHeaderTracking && _canIncludeHeaders(header)) {
|
|
4674
|
+
if (ajaxData) {
|
|
4675
|
+
ajaxData[_DYN_REQUEST_HEADERS ][header] = value;
|
|
4676
|
+
}
|
|
4677
|
+
}
|
|
4615
4678
|
}
|
|
4616
4679
|
}
|
|
4617
4680
|
},
|
|
@@ -4666,11 +4729,11 @@
|
|
|
4666
4729
|
}
|
|
4667
4730
|
return isDisabled;
|
|
4668
4731
|
}
|
|
4669
|
-
function _isMonitoredXhrInstance(xhr, excludeAjaxDataValidation) {
|
|
4732
|
+
function _isMonitoredXhrInstance(xhr, ajaxData, excludeAjaxDataValidation) {
|
|
4670
4733
|
var ajaxValidation = true;
|
|
4671
4734
|
var initialized = _xhrInitialized;
|
|
4672
4735
|
if (!isNullOrUndefined(xhr)) {
|
|
4673
|
-
ajaxValidation = excludeAjaxDataValidation === true || !isNullOrUndefined(
|
|
4736
|
+
ajaxValidation = excludeAjaxDataValidation === true || !isNullOrUndefined(ajaxData);
|
|
4674
4737
|
}
|
|
4675
4738
|
return initialized
|
|
4676
4739
|
&& ajaxValidation;
|
|
@@ -4690,7 +4753,9 @@
|
|
|
4690
4753
|
var distributedTraceCtx = _getDistributedTraceCtx();
|
|
4691
4754
|
var traceID = (distributedTraceCtx && distributedTraceCtx[_DYN_GET_TRACE_ID ]()) || generateW3CId();
|
|
4692
4755
|
var spanID = strSubstr(generateW3CId(), 0, 16);
|
|
4693
|
-
var
|
|
4756
|
+
var xhrRequestData = xhr[AJAX_DATA_CONTAINER] = (xhr[AJAX_DATA_CONTAINER] || { xh: [], i: {} });
|
|
4757
|
+
var ajaxDataCntr = xhrRequestData.i = (xhrRequestData.i || {});
|
|
4758
|
+
var ajaxData = ajaxDataCntr[_ajaxDataId] = (ajaxDataCntr[_ajaxDataId] || new ajaxRecord(traceID, spanID, _self[strDiagLog](), (_a = _self.core) === null || _a === void 0 ? void 0 : _a.getTraceCtx()));
|
|
4694
4759
|
ajaxData[_DYN_TRACE_FLAGS ] = distributedTraceCtx && distributedTraceCtx[_DYN_GET_TRACE_FLAGS ]();
|
|
4695
4760
|
ajaxData[_DYN_METHOD ] = method;
|
|
4696
4761
|
ajaxData[_DYN_REQUEST_URL ] = url;
|
|
@@ -4698,13 +4763,13 @@
|
|
|
4698
4763
|
ajaxData[_DYN_REQUEST_HEADERS ] = {};
|
|
4699
4764
|
ajaxData.async = async;
|
|
4700
4765
|
ajaxData[_DYN_ERROR_STATUS_TEXT ] = _enableAjaxErrorStatusText;
|
|
4701
|
-
|
|
4766
|
+
return ajaxData;
|
|
4702
4767
|
}
|
|
4703
|
-
function _attachToOnReadyStateChange(xhr) {
|
|
4704
|
-
|
|
4768
|
+
function _attachToOnReadyStateChange(xhr, ajaxData) {
|
|
4769
|
+
ajaxData.xhrMonitoringState[_DYN_STATE_CHANGE_ATTACHE13 ] = eventOn(xhr, "readystatechange", function () {
|
|
4705
4770
|
var _a;
|
|
4706
4771
|
try {
|
|
4707
|
-
if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr)) {
|
|
4772
|
+
if (xhr && xhr.readyState === 4 && _isMonitoredXhrInstance(xhr, ajaxData)) {
|
|
4708
4773
|
_onAjaxComplete(xhr);
|
|
4709
4774
|
}
|
|
4710
4775
|
}
|
|
@@ -4712,7 +4777,7 @@
|
|
|
4712
4777
|
var exceptionText = dumpObj(e);
|
|
4713
4778
|
if (!exceptionText || _indexOf(exceptionText[_DYN_TO_LOWER_CASE ](), "c00c023f") === -1) {
|
|
4714
4779
|
_throwInternalCritical(_self, 16 , ERROR_HEADER + " 'readystatechange' event handler" + ERROR_POSTFIX, (_a = {},
|
|
4715
|
-
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr),
|
|
4780
|
+
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
|
|
4716
4781
|
_a[_DYN_EXCEPTION ] = exceptionText,
|
|
4717
4782
|
_a));
|
|
4718
4783
|
}
|
|
@@ -4731,12 +4796,12 @@
|
|
|
4731
4796
|
return null;
|
|
4732
4797
|
}
|
|
4733
4798
|
function _onAjaxComplete(xhr) {
|
|
4734
|
-
var ajaxData = xhr
|
|
4799
|
+
var ajaxData = _getAjaxData(xhr, _ajaxDataId);
|
|
4735
4800
|
ajaxData[_DYN_RESPONSE_FINISHED_TI14 ] = dateTimeUtilsNow();
|
|
4736
4801
|
ajaxData[_DYN_STATUS ] = xhr[_DYN_STATUS ];
|
|
4737
4802
|
function _reportXhrError(e, failedProps) {
|
|
4738
4803
|
var errorProps = failedProps || {};
|
|
4739
|
-
errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr);
|
|
4804
|
+
errorProps["ajaxDiagnosticsMessage"] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId);
|
|
4740
4805
|
if (e) {
|
|
4741
4806
|
errorProps["exception"] = dumpObj(e);
|
|
4742
4807
|
}
|
|
@@ -4798,7 +4863,11 @@
|
|
|
4798
4863
|
}
|
|
4799
4864
|
finally {
|
|
4800
4865
|
try {
|
|
4801
|
-
xhr[
|
|
4866
|
+
var xhrRequestData = (xhr[AJAX_DATA_CONTAINER] || { i: {} });
|
|
4867
|
+
var ajaxDataCntr = (xhrRequestData.i || {});
|
|
4868
|
+
if (ajaxDataCntr[_ajaxDataId]) {
|
|
4869
|
+
ajaxDataCntr[_ajaxDataId] = null;
|
|
4870
|
+
}
|
|
4802
4871
|
}
|
|
4803
4872
|
catch (e) {
|
|
4804
4873
|
}
|
|
@@ -4821,7 +4890,7 @@
|
|
|
4821
4890
|
}
|
|
4822
4891
|
catch (e) {
|
|
4823
4892
|
_throwInternalWarning(_self, 18 , CORRELATION_HEADER_ERROR, (_a = {},
|
|
4824
|
-
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr),
|
|
4893
|
+
_a[_DYN_AJAX_DIAGNOSTICS_MES16 ] = _getFailedAjaxDiagnosticsMessage(xhr, _ajaxDataId),
|
|
4825
4894
|
_a[_DYN_EXCEPTION ] = dumpObj(e),
|
|
4826
4895
|
_a));
|
|
4827
4896
|
}
|