@microsoft/applicationinsights-channel-js 3.1.3-nightly3.2403-15 → 3.1.3-nightly3.2404-12

package/browser/es5/applicationinsights-channel-js.3.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Channel, 3.1.3-nightly3.2403-15
+ * Application Insights JavaScript SDK - Channel, 3.1.3-nightly3.2404-12
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -7,8 +7,8 @@
     typeof exports === "object" && typeof module !== undef ? factory(exports) :
     typeof define === "function" && define.amd ? define(["exports"], factory) :
     (function(global){
-        var nsKey, key, nm, theExports = {}, modName = "es5_applicationinsights_channel_js_3_1_3_nightly3_2403_15", msMod="__ms$mod__";
-        var mods={}, modDetail=mods[modName]={}, ver="3.1.3-nightly3.2403-15";
+        var nsKey, key, nm, theExports = {}, modName = "es5_applicationinsights_channel_js_3_1_3_nightly3_2404_12", msMod="__ms$mod__";
+        var mods={}, modDetail=mods[modName]={}, ver="3.1.3-nightly3.2404-12";
         var baseNs=global, nsKey="Microsoft", baseNs=baseNs[nsKey]=(baseNs[nsKey]||{});
         // Versioned namespace "Microsoft.ApplicationInsights3"
         var exportNs=baseNs, nsKey="ApplicationInsights3", exportNs=exportNs[nsKey]=(exportNs[nsKey]||{});
@@ -1190,14 +1190,19 @@ function throwAggregationError(message, sourceErrors) {
     throw new aggregationErrorType(theMessage, sourceErrors || []);
 }
 
+var STR_PROMISE = "Promise";
+var REJECTED = "rejected";
+
 function doAwaitResponse(value, cb) {
     return doAwait(value, function (value) {
         return cb ? cb({
-            value: value,
-            rejected: false
+            status: "fulfilled",
+            rejected: false,
+            value: value
         }) : value;
     }, function (reason) {
         return cb ? cb({
+            status: REJECTED,
             rejected: true,
             reason: reason
         }) : reason;
@@ -1205,18 +1210,32 @@ function doAwaitResponse(value, cb) {
 }
 function doAwait(value, resolveFn, rejectFn, finallyFn) {
     var result = value;
-    if (isPromiseLike(value)) {
-        if (resolveFn || rejectFn) {
-            result = value.then(resolveFn, rejectFn);
+    try {
+        if (isPromiseLike(value)) {
+            if (resolveFn || rejectFn) {
+                result = value.then(resolveFn, rejectFn);
+            }
         }
-    }
-    else {
-        if (resolveFn) {
-            result = resolveFn(value);
+        else {
+            try {
+                if (resolveFn) {
+                    result = resolveFn(value);
+                }
+            }
+            catch (err) {
+                if (rejectFn) {
+                    result = rejectFn(err);
+                }
+                else {
+                    throw err;
+                }
+            }
         }
     }
-    if (finallyFn) {
-        doFinally(result, finallyFn);
+    finally {
+        if (finallyFn) {
+            doFinally(result, finallyFn);
+        }
     }
     return result;
 }
@@ -1244,21 +1263,22 @@ function doFinally(value, finallyFn) {
     return result;
 }
 
-var STRING_STATES = [
-    "pending", "resolving", "resolved", "rejected"
+var STRING_STATES =  [
+    "pending", "resolving", "resolved", REJECTED
 ];
 
 var DISPATCH_EVENT = "dispatchEvent";
 var _hasInitEvent;
+function _hasInitEventFn(doc) {
+    var evt;
+    if (doc && doc.createEvent) {
+        evt = doc.createEvent("Event");
+    }
+    return (!!evt && evt.initEvent);
+}
 function emitEvent(target, evtName, populateEvent, useNewEvent) {
     var doc = getDocument();
-    !_hasInitEvent && (_hasInitEvent = safeGetLazy(function () {
-        var evt;
-        if (doc && doc.createEvent) {
-            evt = doc.createEvent("Event");
-        }
-        return (!!evt && evt.initEvent);
-    }, null));
+    !_hasInitEvent && (_hasInitEvent = createCachedValue(!!safe(_hasInitEventFn, [doc]).v));
     var theEvt = _hasInitEvent.v ? doc.createEvent("Event") : (useNewEvent ? new Event(evtName) : {});
     populateEvent && populateEvent(theEvt);
     if (_hasInitEvent.v) {
@@ -1279,8 +1299,6 @@ function emitEvent(target, evtName, populateEvent, useNewEvent) {
     }
 }
 
-var STR_PROMISE = "Promise";
-
 var NODE_UNHANDLED_REJECTION = "unhandledRejection";
 var UNHANDLED_REJECTION = NODE_UNHANDLED_REJECTION.toLowerCase();
 var _unhandledRejectionTimeout = 10;
@@ -1301,7 +1319,7 @@ function _createPromise(newPromise, processor, executor) {
     var _unHandledRejectionHandler = null;
     var _thePromise;
     !_hasPromiseRejectionEvent && (_hasPromiseRejectionEvent = lazySafeGetInst(STR_PROMISE + "RejectionEvent"));
-    var _then = function (onResolved, onRejected) {
+    function _then(onResolved, onRejected) {
         try {
             _handled = true;
             _unHandledRejectionHandler && _unHandledRejectionHandler.cancel();
@@ -1336,11 +1354,11 @@ function _createPromise(newPromise, processor, executor) {
         }
         finally {
         }
-    };
-    var _catch = function (onRejected) {
+    }
+    function _catch(onRejected) {
         return _then(undefined, onRejected);
-    };
-    var _finally = function (onFinally) {
+    }
+    function _finally(onFinally) {
         var thenFinally = onFinally;
         var catchFinally = onFinally;
         if (isFunction(onFinally)) {
@@ -1354,21 +1372,21 @@ function _createPromise(newPromise, processor, executor) {
             };
         }
         return _then(thenFinally, catchFinally);
-    };
-    var _strState = function () {
+    }
+    function _strState() {
         return STRING_STATES[_state];
-    };
-    var _processQueue = function () {
+    }
+    function _processQueue() {
         if (_queue.length > 0) {
             var pending = _queue.slice();
             _queue = [];
             _handled = true;
-            processor(pending);
             _unHandledRejectionHandler && _unHandledRejectionHandler.cancel();
             _unHandledRejectionHandler = null;
+            processor(pending);
         }
-    };
-    var _createSettleIfFn = function (newState, allowState) {
+    }
+    function _createSettleIfFn(newState, allowState) {
         return function (theValue) {
             if (_state === allowState) {
                 if (newState === 2  && isPromiseLike(theValue)) {
@@ -1385,9 +1403,10 @@ function _createPromise(newPromise, processor, executor) {
                 }
             }
         };
-    };
-    var _notifyUnhandledRejection = function () {
+    }
+    function _notifyUnhandledRejection() {
         if (!_handled) {
+            _handled = true;
             if (isNode()) {
                 process.emit(NODE_UNHANDLED_REJECTION, _settledValue, _thePromise);
             }
@@ -1400,7 +1419,7 @@ function _createPromise(newPromise, processor, executor) {
                 }, !!_hasPromiseRejectionEvent.v);
             }
         }
-    };
+    }
     _thePromise = {
         then: _then,
         "catch": _catch,
@@ -1412,9 +1431,9 @@ function _createPromise(newPromise, processor, executor) {
     if (hasSymbol()) {
         _thePromise[getKnownSymbol(11 )] = "IPromise";
     }
-    var _toString = function () {
-        return "IPromise" + ("") + " " + _strState() + (_hasResolved ? (" - " + dumpFnObj(_settledValue)) : "");
-    };
+    function _toString() {
+        return "IPromise" + ("") + " " + _strState() + (_hasResolved ? (" - " + dumpFnObj(_settledValue)) : "") + ("");
+    }
     _thePromise.toString = _toString;
     (function _initialize() {
         if (!isFunction(executor)) {
@@ -1431,7 +1450,7 @@ function _createPromise(newPromise, processor, executor) {
     return _thePromise;
 }
 
-var _processPendingItems = function (pending) {
+function syncItemProcessor(pending) {
     arrForEach(pending, function (fn) {
         try {
             fn();
@@ -1439,12 +1458,12 @@ var _processPendingItems = function (pending) {
         catch (e) {
         }
     });
-};
+}
 function timeoutItemProcessor(timeout) {
     var callbackTimeout = isNumber(timeout) ? timeout : 0;
     return function (pending) {
         scheduleTimeout(function () {
-            _processPendingItems(pending);
+            syncItemProcessor(pending);
         }, callbackTimeout);
     };
 }
@@ -1453,10 +1472,10 @@ function createAsyncPromise(executor, timeout) {
     return _createPromise(createAsyncPromise, timeoutItemProcessor(timeout), executor, timeout);
 }
 
-var _isPromiseSupported;
+var _promiseCls;
 function createNativePromise(executor, timeout) {
-    !_isPromiseSupported && (_isPromiseSupported = lazySafeGetInst(STR_PROMISE));
-    var PrmCls = _isPromiseSupported.v;
+    !_promiseCls && (_promiseCls = createCachedValue((safe(getInst, [STR_PROMISE]).v) || null));
+    var PrmCls = _promiseCls.v;
     if (!PrmCls) {
         return createAsyncPromise(executor);
     }
@@ -1486,7 +1505,7 @@ function createNativePromise(executor, timeout) {
 
 var _promiseCreator;
 function createPromise(executor, timeout) {
-    !_promiseCreator && (_promiseCreator = getLazy(function () { return createNativePromise; }));
+    !_promiseCreator && (_promiseCreator = createCachedValue(createNativePromise));
     return _promiseCreator.v.call(this, executor, timeout);
 }
 
@@ -3724,7 +3743,9 @@ var SenderPostManager = /** @class */ (function () {
                     return;
                 }
                 var xhr = openXhr(STR_POST_METHOD, endPointUrl, _sendCredentials, true, sync, payload[_DYN_TIMEOUT ]);
-                xhr[_DYN_SET_REQUEST_HEADER ]("Content-type", "application/json");
+                if (!_isOneDs) {
+                    xhr[_DYN_SET_REQUEST_HEADER ]("Content-type", "application/json");
+                }
                 arrForEach(objKeys(headers), function (headerName) {
                     xhr[_DYN_SET_REQUEST_HEADER ](headerName, headers[headerName]);
                 });
@@ -4463,6 +4484,20 @@ function utlSetSessionStorage(logger, name, data) {
     }
     return false;
 }
+function utlRemoveSessionStorage(logger, name) {
+    var storage = _getSessionStorageObject();
+    if (storage !== null) {
+        try {
+            storage[_DYN_REMOVE_ITEM ](name);
+            return true;
+        }
+        catch (e) {
+            _canUseSessionStorage = false;
+            _throwInternal(logger, 2 , 6 , "Browser failed removal of session storage item. " + getExceptionName(e), { exception: dumpObj(e) });
+        }
+    }
+    return false;
+}
 
 var Envelope = /** @class */ (function () {
     function Envelope(logger, data, name) {
@@ -5403,6 +5438,7 @@ var _DYN_ENQUEUE = "enqueue";
 var _DYN_COUNT = "count";
 var _DYN_EVENTS_LIMIT_IN_MEM = "eventsLimitInMem";
 var _DYN_PUSH = "push";
+var _DYN_ITEM = "item";
 var _DYN_EMIT_LINE_DELIMITED_0 = "emitLineDelimitedJson";
 var _DYN_CLEAR = "clear";
 var _DYN_CREATE_NEW = "createNew";
@@ -5411,6 +5447,7 @@ var _DYN_CLEAR_SENT = "clearSent";
 var _DYN_BUFFER_OVERRIDE = "bufferOverride";
 var _DYN__BUFFER__KEY = "BUFFER_KEY";
 var _DYN__SENT__BUFFER__KEY = "SENT_BUFFER_KEY";
+var _DYN_CONCAT = "concat";
 var _DYN__MAX__BUFFER__SIZE = "MAX_BUFFER_SIZE";
 var _DYN_TRIGGER_SEND = "triggerSend";
 var _DYN_DIAG_LOG = "diagLog";
@@ -5436,8 +5473,8 @@ var _DYN_SERIALIZE = "serialize";
 var _DYN__ON_ERROR = "_onError";
 var _DYN__ON_PARTIAL_SUCCESS = "_onPartialSuccess";
 var _DYN__ON_SUCCESS = "_onSuccess";
-var _DYN_ITEMS_ACCEPTED = "itemsAccepted";
 var _DYN_ITEMS_RECEIVED = "itemsReceived";
+var _DYN_ITEMS_ACCEPTED = "itemsAccepted";
 var _DYN_ORI_PAYLOAD = "oriPayload";
 var _DYN_BASE_TYPE = "baseType";
 var _DYN_SAMPLE_RATE = "sampleRate";
@@ -5489,6 +5526,7 @@ function _extractPartAExtensions(logger, item, env) {
     var extOs = itmExt.os;
     if (extOs) {
         _setValueIf(envTags, CtxTagKeys.deviceOS, extOs[_DYN_NAME ]);
+        _setValueIf(envTags, CtxTagKeys.deviceOSVersion, extOs.osVer);
     }
     var extTrace = itmExt.trace;
     if (extTrace) {
@@ -5554,7 +5592,7 @@ function EnvelopeCreatorInit(logger, telemetryItem) {
     }
 }
 var EnvelopeCreator = {
-    Version: '3.1.3-nightly3.2403-15'
+    Version: '3.1.3-nightly3.2404-12'
 };
 function DependencyEnvelopeCreator(logger, telemetryItem, customUndefinedValue) {
     EnvelopeCreatorInit(logger, telemetryItem);
@@ -5707,6 +5745,7 @@ var BaseSendBuffer = /** @class */ (function () {
     function BaseSendBuffer(logger, config) {
         var _buffer = [];
         var _bufferFullMessageSent = false;
+        var _maxRetryCnt = config.maxRetryCnt;
         this[_DYN__GET ] = function () {
             return _buffer;
         };
@@ -5723,7 +5762,14 @@ var BaseSendBuffer = /** @class */ (function () {
                     }
                     return;
                 }
+                payload.cnt = payload.cnt || 0;
+                if (!isNullOrUndefined(_maxRetryCnt)) {
+                    if (payload.cnt > _maxRetryCnt) {
+                        return;
+                    }
+                }
                 _buffer[_DYN_PUSH ](payload);
+                return;
             };
             _self[_DYN_COUNT ] = function () {
                 return _buffer[_DYN_LENGTH ];
@@ -5731,7 +5777,7 @@ var BaseSendBuffer = /** @class */ (function () {
             _self.size = function () {
                 var size = _buffer[_DYN_LENGTH ];
                 for (var lp = 0; lp < _buffer[_DYN_LENGTH ]; lp++) {
-                    size += _buffer[lp][_DYN_LENGTH ];
+                    size += (_buffer[lp].item)[_DYN_LENGTH ];
                 }
                 if (!config[_DYN_EMIT_LINE_DELIMITED_0 ]) {
                     size += 2;
@@ -5745,11 +5791,15 @@ var BaseSendBuffer = /** @class */ (function () {
             _self.getItems = function () {
                 return _buffer.slice(0);
             };
-            _self.batchPayloads = function (payload) {
-                if (payload && payload[_DYN_LENGTH ] > 0) {
+            _self.batchPayloads = function (payloads) {
+                if (payloads && payloads[_DYN_LENGTH ] > 0) {
+                    var payloadStr_1 = [];
+                    arrForEach(payloads, function (payload) {
+                        payloadStr_1[_DYN_PUSH ](payload[_DYN_ITEM ]);
+                    });
                     var batch = config[_DYN_EMIT_LINE_DELIMITED_0 ] ?
-                        payload.join("\n") :
-                        "[" + payload.join(",") + "]";
+                        payloadStr_1.join("\n") :
+                        "[" + payloadStr_1.join(",") + "]";
                     return batch;
                 }
                 return null;
@@ -5785,17 +5835,21 @@ var ArraySendBuffer = /** @class */ (function (_super) {
     ArraySendBuffer.__ieDyn=1;
     return ArraySendBuffer;
 }(BaseSendBuffer));
+var PREVIOUS_KEYS = ["AI_buffer", "AI_sentBuffer"];
 var SessionStorageSendBuffer = /** @class */ (function (_super) {
     __extendsFn(SessionStorageSendBuffer, _super);
     function SessionStorageSendBuffer(logger, config) {
         var _this = _super.call(this, logger, config) || this;
         var _bufferFullMessageSent = false;
         var _namePrefix = config === null || config === void 0 ? void 0 : config.namePrefix;
-        var _a = config[_DYN_BUFFER_OVERRIDE ] || { getItem: utlGetSessionStorage, setItem: utlSetSessionStorage }, getItem = _a.getItem, setItem = _a.setItem;
+        var _b = config[_DYN_BUFFER_OVERRIDE ] || { getItem: utlGetSessionStorage, setItem: utlSetSessionStorage }, getItem = _b.getItem, setItem = _b.setItem;
+        var _maxRetryCnt = config.maxRetryCnt;
         dynamicProto(SessionStorageSendBuffer, _this, function (_self, _base) {
             var bufferItems = _getBuffer(SessionStorageSendBuffer[_DYN__BUFFER__KEY ]);
-            var notDeliveredItems = _getBuffer(SessionStorageSendBuffer[_DYN__SENT__BUFFER__KEY ]);
-            var buffer = _self._set(bufferItems.concat(notDeliveredItems));
+            var itemsInSentBuffer = _getBuffer(SessionStorageSendBuffer[_DYN__SENT__BUFFER__KEY ]);
+            var previousItems = _getPreviousEvents();
+            var notDeliveredItems = itemsInSentBuffer[_DYN_CONCAT ](previousItems);
+            var buffer = _self._set(bufferItems[_DYN_CONCAT ](notDeliveredItems));
             if (buffer[_DYN_LENGTH ] > SessionStorageSendBuffer[_DYN__MAX__BUFFER__SIZE ]) {
                 buffer[_DYN_LENGTH ] = SessionStorageSendBuffer[_DYN__MAX__BUFFER__SIZE ];
             }
@@ -5809,6 +5863,12 @@ var SessionStorageSendBuffer = /** @class */ (function (_super) {
                     }
                     return;
                 }
+                payload.cnt = payload.cnt || 0;
+                if (!isNullOrUndefined(_maxRetryCnt)) {
+                    if (payload.cnt > _maxRetryCnt) {
+                        return;
+                    }
+                }
                 _base[_DYN_ENQUEUE ](payload);
                 _setBuffer(SessionStorageSendBuffer.BUFFER_KEY, _self[_DYN__GET ]());
             };
@@ -5822,7 +5882,7 @@ var SessionStorageSendBuffer = /** @class */ (function (_super) {
                 _setBuffer(SessionStorageSendBuffer[_DYN__BUFFER__KEY ], _self._set(_removePayloadsFromBuffer(payload, _self[_DYN__GET ]())));
                 var sentElements = _getBuffer(SessionStorageSendBuffer[_DYN__SENT__BUFFER__KEY ]);
                 if (sentElements instanceof Array && payload instanceof Array) {
-                    sentElements = sentElements.concat(payload);
+                    sentElements = sentElements[_DYN_CONCAT ](payload);
                     if (sentElements[_DYN_LENGTH ] > SessionStorageSendBuffer[_DYN__MAX__BUFFER__SIZE ]) {
                         _throwInternal(logger, 1 , 67 , "Sent buffer reached its maximum size: " + sentElements[_DYN_LENGTH ], true);
                         sentElements[_DYN_LENGTH ] = SessionStorageSendBuffer[_DYN__MAX__BUFFER__SIZE ];
@@ -5853,8 +5913,12 @@ var SessionStorageSendBuffer = /** @class */ (function (_super) {
             };
             function _removePayloadsFromBuffer(payloads, buffer) {
                 var remaining = [];
+                var payloadStr = [];
+                arrForEach(payloads, function (payload) {
+                    payloadStr[_DYN_PUSH ](payload[_DYN_ITEM ]);
+                });
                 arrForEach(buffer, function (value) {
-                    if (!isFunction(value) && arrIndexOf(payloads, value) === -1) {
+                    if (!isFunction(value) && arrIndexOf(payloadStr, value[_DYN_ITEM ]) === -1) {
                         remaining[_DYN_PUSH ](value);
                     }
                 });
@@ -5862,9 +5926,12 @@ var SessionStorageSendBuffer = /** @class */ (function (_super) {
             }
             function _getBuffer(key) {
                 var prefixedKey = key;
+                prefixedKey = _namePrefix ? _namePrefix + "_" + prefixedKey : prefixedKey;
+                return _getBufferBase(prefixedKey);
+            }
+            function _getBufferBase(key) {
                 try {
-                    prefixedKey = _namePrefix ? _namePrefix + "_" + prefixedKey : prefixedKey;
-                    var bufferJson = getItem(logger, prefixedKey);
+                    var bufferJson = getItem(logger, key);
                     if (bufferJson) {
                         var buffer_1 = getJSON().parse(bufferJson);
                         if (isString(buffer_1)) {
@@ -5876,7 +5943,7 @@ var SessionStorageSendBuffer = /** @class */ (function (_super) {
                     }
                 }
                 catch (e) {
-                    _throwInternal(logger, 1 , 42 , " storage key: " + prefixedKey + ", " + getExceptionName(e), { exception: dumpObj(e) });
+                    _throwInternal(logger, 1 , 42 , " storage key: " + key + ", " + getExceptionName(e), { exception: dumpObj(e) });
                 }
                 return [];
             }
@@ -5892,11 +5959,51 @@ var SessionStorageSendBuffer = /** @class */ (function (_super) {
                     _throwInternal(logger, 2 , 41 , " storage key: " + prefixedKey + ", " + getExceptionName(e) + ". Buffer cleared", { exception: dumpObj(e) });
                 }
             }
+            function _getPreviousEvents() {
+                var items = [];
+                try {
+                    arrForEach(PREVIOUS_KEYS, function (key) {
+                        var events = _getItemsFromPreviousKey(key);
+                        items = items[_DYN_CONCAT ](events);
+                        if (_namePrefix) {
+                            var prefixedKey = _namePrefix + "_" + key;
+                            var prefixEvents = _getItemsFromPreviousKey(prefixedKey);
+                            items = items[_DYN_CONCAT ](prefixEvents);
+                        }
+                    });
+                    return items;
+                }
+                catch (e) {
+                    _throwInternal(logger, 2 , 41 , "Transfer events from previous buffers: " + getExceptionName(e) + ". previous Buffer items can not be removed", { exception: dumpObj(e) });
+                }
+                return [];
+            }
+            function _getItemsFromPreviousKey(key) {
+                try {
+                    var items = _getBufferBase(key);
+                    var transFormedItems_1 = [];
+                    arrForEach(items, function (item) {
+                        var internalItem = {
+                            item: item,
+                            cnt: 0
+                        };
+                        transFormedItems_1[_DYN_PUSH ](internalItem);
+                    });
+                    utlRemoveSessionStorage(logger, key);
+                    return transFormedItems_1;
+                }
+                catch (e) {
+                }
+                return [];
+            }
         });
         return _this;
     }
-    SessionStorageSendBuffer.BUFFER_KEY = "AI_buffer";
-    SessionStorageSendBuffer.SENT_BUFFER_KEY = "AI_sentBuffer";
+    var _a;
+    _a = SessionStorageSendBuffer;
+    SessionStorageSendBuffer.VERSION = "_1";
+    SessionStorageSendBuffer.BUFFER_KEY = "AI_buffer" + _a.VERSION;
+    SessionStorageSendBuffer.SENT_BUFFER_KEY = "AI_sentBuffer" + _a.VERSION;
     SessionStorageSendBuffer.MAX_BUFFER_SIZE = 2000;
     return SessionStorageSendBuffer;
 }(BaseSendBuffer));
@@ -6055,7 +6162,7 @@ var HashCodeScoreGenerator = /** @class */ (function () {
             return 0;
         }
         while (input[_DYN_LENGTH ] < MIN_INPUT_LENGTH) {
-            input = input.concat(input);
+            input = input[_DYN_CONCAT ](input);
         }
         var hash = 5381;
         for (var i = 0; i < input[_DYN_LENGTH ]; ++i) {
@@ -6162,6 +6269,7 @@ var defaultAppInsightsChannelConfig = objDeepFreeze((_a = {
     _a[_DYN_ALWAYS_USE_XHR_OVERR4 ] = cfgDfBoolean(),
     _a.transports = UNDEFINED_VALUE,
     _a.retryCodes = UNDEFINED_VALUE,
+    _a.maxRetryCnt = { isVal: isNumber, v: 10 },
     _a));
 function _chkSampling(value) {
     return !isNaN(value) && value > 0 && value <= 100;
@@ -6391,6 +6499,7 @@ var Sender = /** @class */ (function (_super) {
                 }));
             };
             _self.processTelemetry = function (telemetryItem, itemCtx) {
+                var _a;
                 itemCtx = _self._getTelCtx(itemCtx);
                 var diagLogger = itemCtx[_DYN_DIAG_LOG ]();
                 try {
@@ -6405,7 +6514,12 @@ var Sender = /** @class */ (function (_super) {
                     var payload = _serializer[_DYN_SERIALIZE ](aiEnvelope);
                     var buffer = _self[_DYN__BUFFER ];
                     _checkMaxSize(payload);
-                    buffer[_DYN_ENQUEUE ](payload);
+                    var payloadItem = (_a = {},
+                        _a[_DYN_ITEM ] = payload,
+                        _a.cnt = 0
+                    ,
+                        _a);
+                    buffer[_DYN_ENQUEUE ](payloadItem);
                     _setupTimer();
                 }
                 catch (e) {
@@ -6417,6 +6531,9 @@ var Sender = /** @class */ (function (_super) {
                 return !_paused && _syncFetchPayload === 0 && _self._buffer[_DYN_COUNT ]() === 0;
             };
             _self._xhrReadyStateChange = function (xhr, payload, countOfItemsInPayload) {
+                if (_isStringArr(payload)) {
+                    return;
+                }
                 return _xhrReadyStateChange(xhr, payload, countOfItemsInPayload);
             };
             _self[_DYN_TRIGGER_SEND ] = function (async, forcedSender, sendReason) {
@@ -6472,40 +6589,27 @@ var Sender = /** @class */ (function (_super) {
                 _initDefaults();
             };
             _self[_DYN__ON_ERROR ] = function (payload, message, event) {
-                _throwInternal(_self[_DYN_DIAG_LOG ](), 2 , 26 , "Failed to send telemetry.", { message: message });
-                _self._buffer && _self._buffer[_DYN_CLEAR_SENT ](payload);
+                if (_isStringArr(payload)) {
+                    return;
+                }
+                return _onError(payload, message);
             };
             _self[_DYN__ON_PARTIAL_SUCCESS ] = function (payload, results) {
-                var failed = [];
-                var retry = [];
-                var errors = results.errors.reverse();
-                for (var _i = 0, errors_1 = errors; _i < errors_1.length; _i++) {
-                    var error = errors_1[_i];
-                    var extracted = payload.splice(error.index, 1)[0];
-                    if (_isRetriable(error.statusCode)) {
-                        retry[_DYN_PUSH ](extracted);
-                    }
-                    else {
-                        failed[_DYN_PUSH ](extracted);
-                    }
-                }
-                if (payload[_DYN_LENGTH ] > 0) {
-                    _self[_DYN__ON_SUCCESS ](payload, results[_DYN_ITEMS_ACCEPTED ]);
-                }
-                if (failed[_DYN_LENGTH ] > 0) {
-                    _self[_DYN__ON_ERROR ](failed, formatErrorMessageXhr(null, ["partial success", results[_DYN_ITEMS_ACCEPTED ], "of", results.itemsReceived].join(" ")));
-                }
-                if (retry[_DYN_LENGTH ] > 0) {
-                    _resendPayload(retry);
-                    _throwInternal(_self[_DYN_DIAG_LOG ](), 2 , 40 , "Partial success. " +
-                        "Delivered: " + payload[_DYN_LENGTH ] + ", Failed: " + failed[_DYN_LENGTH ] +
-                        ". Will retry to send " + retry[_DYN_LENGTH ] + " our of " + results[_DYN_ITEMS_RECEIVED ] + " items");
+                if (_isStringArr(payload)) {
+                    return;
                 }
+                return _onPartialSuccess(payload, results);
             };
             _self[_DYN__ON_SUCCESS ] = function (payload, countOfItemsInPayload) {
-                _self._buffer && _self._buffer[_DYN_CLEAR_SENT ](payload);
+                if (_isStringArr(payload)) {
+                    return;
+                }
+                return _onSuccess(payload);
             };
             _self._xdrOnLoad = function (xdr, payload) {
+                if (_isStringArr(payload)) {
+                    return;
+                }
                 return _xdrOnLoad(xdr, payload);
             };
             function _xdrOnLoad(xdr, payload) {
@@ -6516,7 +6620,7 @@ var Sender = /** @class */ (function (_super) {
                 }
                 else {
                     var results = parseResponse(responseText);
-                    if (results && results.itemsReceived && results.itemsReceived > results[_DYN_ITEMS_ACCEPTED ]
+                    if (results && results[_DYN_ITEMS_RECEIVED ] && results[_DYN_ITEMS_RECEIVED ] > results[_DYN_ITEMS_ACCEPTED ]
                         && !_isRetryDisabled) {
                         _self[_DYN__ON_PARTIAL_SUCCESS ](payload, results);
                     }
@@ -6574,6 +6678,40 @@ var Sender = /** @class */ (function (_super) {
                     _checkResponsStatus(xhr.status, payload, xhr.responseURL, countOfItemsInPayload, formatErrorMessageXhr(xhr), _getResponseText(xhr) || xhr.response);
                 }
             }
+            function _onError(payload, message, event) {
+                _throwInternal(_self[_DYN_DIAG_LOG ](), 2 , 26 , "Failed to send telemetry.", { message: message });
+                _self._buffer && _self._buffer[_DYN_CLEAR_SENT ](payload);
+            }
+            function _onPartialSuccess(payload, results) {
+                var failed = [];
+                var retry = [];
+                var errors = results.errors.reverse();
+                for (var _i = 0, errors_1 = errors; _i < errors_1.length; _i++) {
+                    var error = errors_1[_i];
+                    var extracted = payload.splice(error.index, 1)[0];
+                    if (_isRetriable(error.statusCode)) {
+                        retry[_DYN_PUSH ](extracted);
+                    }
+                    else {
+                        failed[_DYN_PUSH ](extracted);
+                    }
+                }
+                if (payload[_DYN_LENGTH ] > 0) {
+                    _self[_DYN__ON_SUCCESS ](payload, results[_DYN_ITEMS_ACCEPTED ]);
+                }
+                if (failed[_DYN_LENGTH ] > 0) {
+                    _self[_DYN__ON_ERROR ](failed, formatErrorMessageXhr(null, ["partial success", results[_DYN_ITEMS_ACCEPTED ], "of", results.itemsReceived].join(" ")));
+                }
+                if (retry[_DYN_LENGTH ] > 0) {
+                    _resendPayload(retry);
+                    _throwInternal(_self[_DYN_DIAG_LOG ](), 2 , 40 , "Partial success. " +
+                        "Delivered: " + payload[_DYN_LENGTH ] + ", Failed: " + failed[_DYN_LENGTH ] +
+                        ". Will retry to send " + retry[_DYN_LENGTH ] + " our of " + results[_DYN_ITEMS_RECEIVED ] + " items");
+                }
+            }
+            function _onSuccess(payload, countOfItemsInPayload) {
+                _self._buffer && _self._buffer[_DYN_CLEAR_SENT ](payload);
+            }
             function _getPayloadArr(payload) {
                 try {
                     if (payload) {
@@ -6841,12 +6979,22 @@ var Sender = /** @class */ (function (_super) {
                     _throwInternal(_self[_DYN_DIAG_LOG ](), 2 , 40 , ". " + "Failed to send telemetry with Beacon API, retried with normal sender.");
                 }
             }
+            function _isStringArr(arr) {
+                try {
+                    if (arr && arr[_DYN_LENGTH ]) {
+                        return (isString(arr[0]));
+                    }
+                }
+                catch (e) {
+                }
+                return null;
+            }
             function _fetchKeepAliveSender(payload, isAsync) {
                 var transport = null;
                 if (isArray(payload)) {
                     var payloadSize = payload[_DYN_LENGTH ];
                     for (var lp = 0; lp < payload[_DYN_LENGTH ]; lp++) {
-                        payloadSize += payload[lp][_DYN_LENGTH ];
+                        payloadSize += payload[lp].item[_DYN_LENGTH ];
                     }
                     var syncFetchPayload = _sendPostMgr.getSyncFetchPayload();
                     if ((syncFetchPayload + payloadSize) <= FetchSyncRequestSizeLimitBytes) {
@@ -6874,6 +7022,8 @@ var Sender = /** @class */ (function (_super) {
                 _consecutiveErrors++;
                 for (var _i = 0, payload_1 = payload; _i < payload_1.length; _i++) {
                     var item = payload_1[_i];
+                    item.cnt = item.cnt || 0;
+                    item.cnt++;
                     buffer[_DYN_ENQUEUE ](item);
                 }
                 _setRetryTime(linearFactor);