@microsoft/1ds-post-js 3.2.2 → 3.2.5

package/src/HttpManager.ts

@@ -3,38 +3,37 @@
 * @author Abhilash Panwar (abpanwar); Hector Hernandez (hectorh); Nev Wylie (newylie)
 * @copyright Microsoft 2018-2020
 */
+import dynamicProto from "@microsoft/dynamicproto-js";
+import EVTClockSkewManager from "./ClockSkewManager";
+import EVTKillSwitch from "./KillSwitch";
 import {
-    isReactNative, isValueAssigned, isString, getTime, arrForEach, getLocation, strTrim, isFetchSupported, isXhrSupported,
-    isBeaconsSupported, FullVersionString, useXDomainRequest, IExtendedAppInsightsCore, IExtendedConfiguration,
-    eLoggingSeverity, _eExtendedInternalMessageId, SendRequestReason, strUndefined, getNavigator, doPerf, IPerfEvent,
-    dateNow, isUndefined, isNullOrUndefined, objForEachKey, ICookieMgr, isNumber, isArray, TransportType, dumpObj, objKeys, extend,
-    EventSendType, hasOwnProperty, openXhr, _throwInternal, _eInternalMessageId
+    EventSendType, FullVersionString, ICookieMgr, IDiagnosticLogger, IExtendedAppInsightsCore, IExtendedConfiguration, IPerfEvent,
+    SendRequestReason, TransportType, _eExtendedInternalMessageId, _eInternalMessageId, _throwInternal, _warnToConsole, arrForEach, dateNow,
+    doPerf, dumpObj, eLoggingSeverity, extend, getLocation, getNavigator, getTime, hasOwnProperty, isArray, isBeaconsSupported,
+    isFetchSupported, isNullOrUndefined, isNumber, isReactNative, isString, isUndefined, isValueAssigned, isXhrSupported, objForEachKey,
+    objKeys, openXhr, strTrim, strUndefined, useXDomainRequest
 } from "@microsoft/1ds-core-js";
+import { BatchNotificationAction, BatchNotificationActions } from "./BatchNotificationActions";
 import {
-    IXHROverride, IPostTransmissionTelemetryItem, ICollectorResult,
-    IPostChannel, PayloadPreprocessorFunction, PayloadListenerFunction, IPayloadData,
-    SendPOSTFunction, EventBatchNotificationReason,
+    EventBatchNotificationReason, ICollectorResult, IPayloadData, IPostChannel, IPostTransmissionTelemetryItem, IXHROverride,
+    PayloadListenerFunction, PayloadPreprocessorFunction, SendPOSTFunction
 } from "./DataModels";
-import { BatchNotificationAction, BatchNotificationActions } from "./BatchNotificationActions";
 import { EventBatch } from "./EventBatch";
-import { Serializer, ISerializedPayload } from "./Serializer";
-import { retryPolicyGetMillisToBackoffForRetry, retryPolicyShouldRetryForStatus } from "./RetryPolicy";
-import EVTKillSwitch from "./KillSwitch";
-import EVTClockSkewManager from "./ClockSkewManager";
-import dynamicProto from "@microsoft/dynamicproto-js";
 import { IChannelConfiguration } from "./Index";
-import { XDomainRequest as IXDomainRequest } from "./typings/XDomainRequest";
-import { 
-    defaultCacheControl, defaultContentType, DisabledPropertyName, Method, strApiKey, strAuthXToken, strCacheControl, 
-    strClientId, strClientVersion, strContentTypeHeader, strDropped, strKillDurationHeader, strKillDurationSecondsHeader, 
-    strKillTokensHeader, strMsaDeviceTicket, strMsfpc, strNoResponseBody, strOther, strRequeue, strResponseFail, strSending, strTimeDeltaHeader,
-    strTimeDeltaToApply, strUploadTime
-} from "./Constants";
+import {
+    DEFAULT_CACHE_CONTROL, DEFAULT_CONTENT_TYPE, STR_API_KEY, STR_AUTH_XTOKEN, STR_CACHE_CONTROL, STR_CLIENT_ID, STR_CLIENT_VERSION,
+    STR_CONTENT_TYPE_HEADER, STR_DISABLED_PROPERTY_NAME, STR_DROPPED, STR_KILL_DURATION_HEADER, STR_KILL_DURATION_SECONDS_HEADER,
+    STR_KILL_TOKENS_HEADER, STR_MSA_DEVICE_TICKET, STR_MSFPC, STR_NO_RESPONSE_BODY, STR_OTHER, STR_POST_METHOD, STR_REQUEUE,
+    STR_RESPONSE_FAIL, STR_SENDING, STR_TIME_DELTA_HEADER, STR_TIME_DELTA_TO_APPLY, STR_UPLOAD_TIME
+} from "./InternalConstants";
+import { retryPolicyGetMillisToBackoffForRetry, retryPolicyShouldRetryForStatus } from "./RetryPolicy";
+import { ISerializedPayload, Serializer } from "./Serializer";
 import { ITimeoutOverrideWrapper } from "./TimeoutOverrideWrapper";
+import { XDomainRequest as IXDomainRequest } from "./typings/XDomainRequest";
 
 const strSendAttempt = "sendAttempt";
 
-const _noResponseQs =  "&" + strNoResponseBody + "=true";
+const _noResponseQs =  "&" + STR_NO_RESPONSE_BODY + "=true";
 
 // TypeScript removed this interface so we need to declare the global so we can check for it's existence.
 declare var XDomainRequest: {
@@ -52,11 +51,11 @@ interface IRequestUrlDetails {
  * Identifies the default notification reason to the action names
  */
 const _eventActionMap: any = {
-    [EventBatchNotificationReason.Paused]: strRequeue,
-    [EventBatchNotificationReason.RequeueEvents]: strRequeue,
+    [EventBatchNotificationReason.Paused]: STR_REQUEUE,
+    [EventBatchNotificationReason.RequeueEvents]: STR_REQUEUE,
     [EventBatchNotificationReason.Complete]: "sent",
-    [EventBatchNotificationReason.KillSwitch]: strDropped,
-    [EventBatchNotificationReason.SizeLimitExceeded]: strDropped
+    [EventBatchNotificationReason.KillSwitch]: STR_DROPPED,
+    [EventBatchNotificationReason.SizeLimitExceeded]: STR_DROPPED
 };
 
 const _collectorQsHeaders = { };
@@ -69,13 +68,13 @@ function _addCollectorHeaderQsMapping(qsName: string, headerName: string, allowQ
     }
 }
 
-_addCollectorHeaderQsMapping(strMsaDeviceTicket, strMsaDeviceTicket, false);
-_addCollectorHeaderQsMapping(strClientVersion, strClientVersion);
-_addCollectorHeaderQsMapping(strClientId, "Client-Id");
-_addCollectorHeaderQsMapping(strApiKey, strApiKey);
-_addCollectorHeaderQsMapping(strTimeDeltaToApply, strTimeDeltaToApply);
-_addCollectorHeaderQsMapping(strUploadTime, strUploadTime);
-_addCollectorHeaderQsMapping(strAuthXToken, strAuthXToken);
+_addCollectorHeaderQsMapping(STR_MSA_DEVICE_TICKET, STR_MSA_DEVICE_TICKET, false);
+_addCollectorHeaderQsMapping(STR_CLIENT_VERSION, STR_CLIENT_VERSION);
+_addCollectorHeaderQsMapping(STR_CLIENT_ID, "Client-Id");
+_addCollectorHeaderQsMapping(STR_API_KEY, STR_API_KEY);
+_addCollectorHeaderQsMapping(STR_TIME_DELTA_TO_APPLY, STR_TIME_DELTA_TO_APPLY);
+_addCollectorHeaderQsMapping(STR_UPLOAD_TIME, STR_UPLOAD_TIME);
+_addCollectorHeaderQsMapping(STR_AUTH_XTOKEN, STR_AUTH_XTOKEN);
 
 type OnCompleteCallback = (status: number, headers: { [headerName: string]: string }, response?: string) => void;
 
@@ -143,13 +142,14 @@ export class HttpManager {
      * @param requestQueue   - The queue that contains the requests to be sent.
      */
     constructor(maxEventsPerBatch: number, maxConnections: number, maxRequestRetriesBeforeBackoff: number, actions: BatchNotificationActions, timeoutOverride: ITimeoutOverrideWrapper) {
-        let _urlString: string = "?cors=true&" + strContentTypeHeader.toLowerCase() + "=" + defaultContentType;
+        let _urlString: string = "?cors=true&" + STR_CONTENT_TYPE_HEADER.toLowerCase() + "=" + DEFAULT_CONTENT_TYPE;
         let _killSwitch: EVTKillSwitch = new EVTKillSwitch();
         let _paused = false;
         let _clockSkewManager = new EVTClockSkewManager();
         let _useBeacons = false;
         let _outstandingRequests = 0;           // Holds the number of outstanding async requests that have not returned a response yet
         let _postManager: IPostChannel;
+        let _logger: IDiagnosticLogger;
         let _sendInterfaces: { [key: number]: IInternalXhrOverride };
         let _core: IExtendedAppInsightsCore;
         let _customHttpInterface = true;
@@ -186,6 +186,7 @@ export class HttpManager {
                 _enableEventTimings = !(_core.config as IExtendedConfiguration).disableEventTimings;
                 let enableCompoundKey = !!(_core.config as IExtendedConfiguration).enableCompoundKey;
                 _postManager = postChannel;
+                _logger = _postManager.diagLog();
                 let valueSanitizer = channelConfig.valueSanitizer;
                 let stringifyObjects = channelConfig.stringifyObjects;
                 if (!isUndefined(channelConfig.enableCompoundKey)) {
@@ -233,7 +234,7 @@ export class HttpManager {
                     httpInterface = _getSenderInterface(theTransports, false);
                     syncHttpInterface = _getSenderInterface(theTransports, true);
                     if (!httpInterface) {
-                        _postManager.diagLog().warnToConsole("No available transport to send events");
+                        _warnToConsole(_logger, "No available transport to send events");
                     }
                 }
 
@@ -285,7 +286,7 @@ export class HttpManager {
             function _xdrSendPost(payload: IPayloadData, oncomplete: OnCompleteCallback, sync?: boolean) {
                 // It doesn't support custom headers, so no action is taken with current requestHeaders
                 let xdr = new XDomainRequest();
-                xdr.open(Method, payload.urlString);
+                xdr.open(STR_POST_METHOD, payload.urlString);
                 if (payload.timeout) {
                     xdr.timeout = payload.timeout;
                 }
@@ -326,8 +327,8 @@ export class HttpManager {
                 let responseHandled = false;
                 let requestInit: RequestInit = {
                     body: payload.data,
-                    method: Method,
-                    [DisabledPropertyName]: true
+                    method: STR_POST_METHOD,
+                    [STR_DISABLED_PROPERTY_NAME]: true
                 };
 
                 if (sync) {
@@ -353,8 +354,9 @@ export class HttpManager {
                 fetch(theUrl, requestInit).then((response) => {
                     let headerMap = {};
                     let responseText = "";
-                    if (response.headers) {
-                        response.headers.forEach((value: string, name: string) => {
+                    var headers = response.headers;
+                    if (headers) {
+                        headers["forEach"]((value: string, name: string) => {
                             headerMap[name] = value;
                         });
                     }
@@ -417,9 +419,9 @@ export class HttpManager {
                         // Firefox 2-63 doesn't have getAllResponseHeaders function but it does have getResponseHeader
                         // Only call these if getAllResponseHeaders doesn't exist, otherwise we can get invalid response errors
                         // as collector is not currently returning the correct header to allow JS to access these headers
-                        theHeaders = _appendHeader(theHeaders, xhr, strTimeDeltaHeader);
-                        theHeaders = _appendHeader(theHeaders, xhr, strKillDurationHeader);
-                        theHeaders = _appendHeader(theHeaders, xhr, strKillDurationSecondsHeader);
+                        theHeaders = _appendHeader(theHeaders, xhr, STR_TIME_DELTA_HEADER);
+                        theHeaders = _appendHeader(theHeaders, xhr, STR_KILL_DURATION_HEADER);
+                        theHeaders = _appendHeader(theHeaders, xhr, STR_KILL_DURATION_SECONDS_HEADER);
                     } else {
                         theHeaders = _convertAllHeadersToMap(xhr.getAllResponseHeaders());
                     }
@@ -434,7 +436,7 @@ export class HttpManager {
                     sync = false;
                 }
 
-                let xhrRequest = openXhr(Method, theUrl, _sendCredentials, true, sync, payload.timeout);
+                let xhrRequest = openXhr(STR_POST_METHOD, theUrl, _sendCredentials, true, sync, payload.timeout);
 
                 // Set custom headers (e.g. gzip) here (after open())
                 objForEachKey(payload.headers, (name, value) => {
@@ -458,7 +460,7 @@ export class HttpManager {
                 try {
                     oncomplete(status, headers, response);
                 } catch (e) {
-                    _throwInternal(_postManager.diagLog(),
+                    _throwInternal(_logger,
                         eLoggingSeverity.WARNING,
                         _eExtendedInternalMessageId.SendPostOnCompleteFailure, dumpObj(e));
                 }
@@ -500,7 +502,7 @@ export class HttpManager {
                     }
 
                 } catch (ex) {
-                    _postManager.diagLog().warnToConsole("Failed to send telemetry using sendBeacon API. Ex:" + dumpObj(ex));
+                    _warnToConsole(_logger, "Failed to send telemetry using sendBeacon API. Ex:" + dumpObj(ex));
                     status = 0;
                 } finally {
                     _doOnComplete(oncomplete, status, {}, "");
@@ -738,7 +740,7 @@ export class HttpManager {
                         _sendBatchesNotification(droppedBatches, EventBatchNotificationReason.KillSwitch, sendType);
                     }, () => ({ batches: _createDebugBatches(orgBatches), retryCount, isTeardown, isSynchronous, sendReason, useSendBeacon: _isBeaconPayload(sendType), sendType }), !isSynchronous);
                 } catch (ex) {
-                    _throwInternal(_postManager.diagLog(),
+                    _throwInternal(_logger,
                         eLoggingSeverity.WARNING,
                         _eInternalMessageId.CannotSerializeObject, "Unexpected Exception sending batch: " + dumpObj(ex));
                 }
@@ -768,8 +770,8 @@ export class HttpManager {
                     requestDetails.useHdrs = (objKeys(requestDetails.hdrs).length > 0);
                 }
 
-                _addRequestDetails(requestDetails, strClientId, "NO_AUTH", useHeaders);
-                _addRequestDetails(requestDetails, strClientVersion, FullVersionString, useHeaders);
+                _addRequestDetails(requestDetails, STR_CLIENT_ID, "NO_AUTH", useHeaders);
+                _addRequestDetails(requestDetails, STR_CLIENT_VERSION, FullVersionString, useHeaders);
 
                 let apiQsKeys = "";
                 arrForEach(thePayload.apiKeys, (apiKey) => {
@@ -780,8 +782,8 @@ export class HttpManager {
                     apiQsKeys += apiKey;
                 });
 
-                _addRequestDetails(requestDetails, strApiKey, apiQsKeys, useHeaders);
-                _addRequestDetails(requestDetails, strUploadTime, dateNow().toString(), useHeaders);
+                _addRequestDetails(requestDetails, STR_API_KEY, apiQsKeys, useHeaders);
+                _addRequestDetails(requestDetails, STR_UPLOAD_TIME, dateNow().toString(), useHeaders);
 
                 let msfpc = _getMsfpc(thePayload);
                 if (isValueAssigned(msfpc)) {
@@ -789,7 +791,7 @@ export class HttpManager {
                 }
 
                 if (_clockSkewManager.shouldAddClockSkewHeaders()) {
-                    _addRequestDetails(requestDetails, strTimeDeltaToApply, _clockSkewManager.getClockSkewHeaderValue(), useHeaders);
+                    _addRequestDetails(requestDetails, STR_TIME_DELTA_TO_APPLY, _clockSkewManager.getClockSkewHeaderValue(), useHeaders);
                 }
 
                 if (_core.getWParam) {
@@ -881,12 +883,12 @@ export class HttpManager {
 
                         // Only automatically add the following headers if already sending headers and we are not attempting to avoid an options call
                         if (useHeaders) {
-                            if (!_hasHeader(orgPayloadData.headers, strCacheControl)) {
-                                orgPayloadData.headers[strCacheControl] = defaultCacheControl;
+                            if (!_hasHeader(orgPayloadData.headers, STR_CACHE_CONTROL)) {
+                                orgPayloadData.headers[STR_CACHE_CONTROL] = DEFAULT_CACHE_CONTROL;
                             }
     
-                            if (!_hasHeader(orgPayloadData.headers, strContentTypeHeader)) {
-                                orgPayloadData.headers[strContentTypeHeader] = defaultContentType;
+                            if (!_hasHeader(orgPayloadData.headers, STR_CONTENT_TYPE_HEADER)) {
+                                orgPayloadData.headers[STR_CONTENT_TYPE_HEADER] = DEFAULT_CONTENT_TYPE;
                             }
                         }
 
@@ -910,7 +912,7 @@ export class HttpManager {
                                         _self.sendListener(orgPayloadData, payload, isSync, thePayload.isBeacon);
                                     }
                                 } catch (ex) {
-                                    _postManager.diagLog().warnToConsole("Unexpected exception sending payload. Ex:" + dumpObj(ex));
+                                    _warnToConsole(_logger, "Unexpected exception sending payload. Ex:" + dumpObj(ex));
 
                                     _doOnComplete(onComplete, 0, {});
                                 }
@@ -1002,9 +1004,9 @@ export class HttpManager {
 
                     if (typeof status !== strUndefined) {
                         if (headers) {
-                            _clockSkewManager.setClockSkew(headers[strTimeDeltaHeader]);
-                            let killDuration = headers[strKillDurationHeader] || headers["kill-duration-seconds"];
-                            arrForEach(_killSwitch.setKillSwitchTenants(headers[strKillTokensHeader], killDuration), (killToken) => {
+                            _clockSkewManager.setClockSkew(headers[STR_TIME_DELTA_HEADER]);
+                            let killDuration = headers[STR_KILL_DURATION_HEADER] || headers["kill-duration-seconds"];
+                            arrForEach(_killSwitch.setKillSwitchTenants(headers[STR_KILL_TOKENS_HEADER], killDuration), (killToken) => {
                                 arrForEach(thePayload.batches, (theBatch) => {
                                     if (theBatch.iKey() === killToken) {
                                         // Make sure we have initialized the array
@@ -1184,7 +1186,7 @@ export class HttpManager {
                         try {
                             responseHandlers[i](responseText);
                         } catch (e) {
-                            _throwInternal(_postManager.diagLog(),
+                            _throwInternal(_logger,
                                 eLoggingSeverity.CRITICAL,
                                 _eExtendedInternalMessageId.PostResponseHandler,
                                 "Response handler failed: " + e);
@@ -1192,9 +1194,9 @@ export class HttpManager {
                     }
                     if (responseText) {
                         let response = JSON.parse(responseText) as ICollectorResult;
-                        if (isValueAssigned(response.webResult) && isValueAssigned(response.webResult[strMsfpc])) {
+                        if (isValueAssigned(response.webResult) && isValueAssigned(response.webResult[STR_MSFPC])) {
                             // Set cookie
-                            _cookieMgr.set("MSFPC", response.webResult[strMsfpc], 365 * 86400);
+                            _cookieMgr.set("MSFPC", response.webResult[STR_MSFPC], 365 * 86400);
                         }
                     }
                 } catch (ex) {
@@ -1213,7 +1215,7 @@ export class HttpManager {
                                 try {
                                     theAction.call(actions, theBatches, batchReason, isSyncRequest, sendType);
                                 } catch (e) {
-                                    _throwInternal(_postManager.diagLog(),
+                                    _throwInternal(_logger,
                                         eLoggingSeverity.CRITICAL,
                                         _eInternalMessageId.NotificationException,
                                         "send request notification failed: " + e);
@@ -1227,13 +1229,13 @@ export class HttpManager {
             function _getNotificationAction(reason: EventBatchNotificationReason): string {
                 let action = _eventActionMap[reason];
                 if (!isValueAssigned(action)) {
-                    action = strOther;
+                    action = STR_OTHER;
                     if (reason >= EventBatchNotificationReason.ResponseFailure && reason <= EventBatchNotificationReason.ResponseFailureMax) {
-                        action = strResponseFail;
+                        action = STR_RESPONSE_FAIL;
                     } else if (reason >= EventBatchNotificationReason.EventsDropped && reason <= EventBatchNotificationReason.EventsDroppedMax) {
-                        action = strDropped;
+                        action = STR_DROPPED;
                     } else if (reason >= EventBatchNotificationReason.SendingUndefined && reason <= EventBatchNotificationReason.SendingEventMax) {
-                        action = strSending;
+                        action = STR_SENDING;
                     }
                 }
 

package/src/InternalConstants.ts

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// Note: DON'T Export these const from the package as we are still targeting ES3 this will export a mutable variables that someone could change!!!
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+// Generally you should only put values that are used more than 2 times and then only if not already exposed as a constant (such as SdkCoreNames)
+// as when using "short" named values from here they will be will be minified smaller than the SdkCoreNames[eSdkCoreNames.xxxx] value.
+
+export const STR_POST_METHOD = "POST";
+export const STR_DISABLED_PROPERTY_NAME: string = "Microsoft_ApplicationInsights_BypassAjaxInstrumentation";
+
+export const STR_DROPPED = "drop";
+export const STR_SENDING = "send";
+export const STR_REQUEUE = "requeue";
+export const STR_RESPONSE_FAIL = "rspFail";
+export const STR_OTHER = "oth";
+
+export const DEFAULT_CACHE_CONTROL = "no-cache, no-store";
+export const DEFAULT_CONTENT_TYPE = "application/x-json-stream";
+export const STR_CACHE_CONTROL = "cache-control";
+export const STR_CONTENT_TYPE_HEADER = "content-type";
+export const STR_KILL_TOKENS_HEADER = "kill-tokens";
+export const STR_KILL_DURATION_HEADER = "kill-duration";
+export const STR_KILL_DURATION_SECONDS_HEADER = "kill-duration-seconds";
+export const STR_TIME_DELTA_HEADER = "time-delta-millis";
+export const STR_CLIENT_VERSION = "client-version";
+export const STR_CLIENT_ID = "client-id";
+export const STR_TIME_DELTA_TO_APPLY = "time-delta-to-apply-millis";
+export const STR_UPLOAD_TIME = "upload-time";
+export const STR_API_KEY = "apikey";
+export const STR_MSA_DEVICE_TICKET = "AuthMsaDeviceTicket";
+export const STR_AUTH_XTOKEN = "AuthXToken";
+export const STR_SDK_VERSION = "sdk-version";
+export const STR_NO_RESPONSE_BODY = "NoResponseBody";
+
+export const STR_MSFPC = "msfpc";
+
+export const STR_TRACE = "trace";
+export const STR_USER = "user";

package/src/KillSwitch.ts

@@ -5,7 +5,7 @@
 */
 
 import dynamicProto from "@microsoft/dynamicproto-js";
-import { arrForEach, strTrim, dateNow } from "@microsoft/1ds-core-js";
+import { arrForEach, dateNow, strTrim } from "@microsoft/1ds-core-js";
 
 const SecToMsMultiplier = 1000;
 

package/src/PostChannel.ts

@@ -5,26 +5,22 @@
 */
 import dynamicProto from "@microsoft/dynamicproto-js";
 import {
-    BaseTelemetryPlugin, IChannelControls, IExtendedConfiguration, IExtendedAppInsightsCore,
-    EventLatencyValue, NotificationManager, EventsDiscardedReason, IPlugin, ITelemetryItem,
-    IAppInsightsCore, isValueAssigned, setProcessTelemetryTimings,
-    IProcessTelemetryContext, SendRequestReason, arrForEach, eLoggingSeverity, _eExtendedInternalMessageId,
-    doPerf, objForEachKey, optimizeObject, isChromium, getWindow, EventSendType, isNumber, mergeEvtNamespace,
-    createUniqueNamespace, IProcessTelemetryUnloadContext, ITelemetryUnloadState,
-    addPageUnloadEventListener, addPageHideEventListener, addPageShowEventListener,
-    removePageUnloadEventListener, removePageHideEventListener, removePageShowEventListener,
-    _throwInternal, _eInternalMessageId, objDefineAccessors
+    BaseTelemetryPlugin, EventLatencyValue, EventSendType, EventsDiscardedReason, IAppInsightsCore, IChannelControls,
+    IExtendedAppInsightsCore, IExtendedConfiguration, IPlugin, IProcessTelemetryContext, IProcessTelemetryUnloadContext, ITelemetryItem,
+    ITelemetryUnloadState, NotificationManager, SendRequestReason, _eInternalMessageId, _throwInternal, addPageHideEventListener,
+    addPageShowEventListener, addPageUnloadEventListener, arrForEach, createUniqueNamespace, doPerf, eLoggingSeverity, getWindow, isChromium,
+    isNumber, isValueAssigned, mergeEvtNamespace, objDefineAccessors, objForEachKey, optimizeObject, removePageHideEventListener,
+    removePageShowEventListener, removePageUnloadEventListener, setProcessTelemetryTimings
 } from "@microsoft/1ds-core-js";
 import {
-    IChannelConfiguration, RT_PROFILE, NRT_PROFILE, IPostChannel,
-    BE_PROFILE, IXHROverride, IPostTransmissionTelemetryItem,
-    EventBatchNotificationReason,
+    BE_PROFILE, EventBatchNotificationReason, IChannelConfiguration, IPostChannel, IPostTransmissionTelemetryItem, IXHROverride, NRT_PROFILE,
+    RT_PROFILE
 } from "./DataModels";
 import { EventBatch } from "./EventBatch";
 import { HttpManager } from "./HttpManager";
+import { STR_MSA_DEVICE_TICKET, STR_TRACE, STR_USER } from "./InternalConstants";
 import { retryPolicyGetMillisToBackoffForRetry } from "./RetryPolicy";
-import { strMsaDeviceTicket } from "./Constants";
-import { createTimeoutWrapper, ITimeoutOverrideWrapper, TimeoutClearFunc, TimeoutSetFunc } from "./TimeoutOverrideWrapper";
+import { ITimeoutOverrideWrapper, TimeoutClearFunc, TimeoutSetFunc, createTimeoutWrapper } from "./TimeoutOverrideWrapper";
 
 const FlushCheckTimer = 0.250;          // This needs to be in seconds, so this is 250ms
 const MaxNumberEventPerBatch = 500;
@@ -100,7 +96,6 @@ export default class PostChannel extends BaseTelemetryPlugin implements IChannel
         let _delayedBatchReason: SendRequestReason;
         let _optimizeObject: boolean = true;
         let _isPageUnloadTriggered = false;
-        let _disableXhrSync = false;
         let _maxEventSendAttempts: number = MaxSendAttempts;
         let _maxUnloadEventSendAttempts: number = MaxSyncUnloadSendAttempts;
         let _evtNamespace: string | string[];
@@ -144,7 +139,6 @@ export default class PostChannel extends BaseTelemetryPlugin implements IChannel
                             _autoFlushEventsLimit = _config.autoFlushEventsLimit;
                         }
     
-                        _disableXhrSync = _config.disableXhrSync;
                         if (isNumber(_config[strMaxEventRetryAttempts])) {
                             _maxEventSendAttempts = _config[strMaxEventRetryAttempts];
                         }
@@ -275,15 +269,15 @@ export default class PostChannel extends BaseTelemetryPlugin implements IChannel
                 }
 
                 // Remove extra AI properties if present
-                if (event.ext && event.ext["trace"]) {
-                    delete (event.ext["trace"]);
+                if (event.ext && event.ext[STR_TRACE]) {
+                    delete (event.ext[STR_TRACE]);
                 }
-                if (event.ext && event.ext["user"] && event.ext["user"]["id"]) {
-                    delete (event.ext["user"]["id"]);
+                if (event.ext && event.ext[STR_USER] && event.ext[STR_USER]["id"]) {
+                    delete (event.ext[STR_USER]["id"]);
                 }
 
                 // v8 performance optimization for iterating over the keys
-                if (_optimizeObject) {
+                if (_optimizeObject) {setProcessTelemetryTimings
                     event.ext = optimizeObject(event.ext);
                     if (event.baseData) {
                         event.baseData = optimizeObject(event.baseData);
@@ -424,20 +418,19 @@ export default class PostChannel extends BaseTelemetryPlugin implements IChannel
 
             _self.flush = (async = true, callback?: () => void, sendReason?: SendRequestReason) => {
                 if (!_paused) {
-                    // Clear the normal schedule timer as we are going to try and flush ASAP
-                    _clearScheduledTimer();
 
                     sendReason = sendReason || SendRequestReason.ManualFlush;
 
                     if (async) {
-                        // Move all queued events to the HttpManager
-                        _queueBatches(EventLatencyValue.Normal, EventSendType.Batched, sendReason);
-
-                        // All events (should) have been queue -- lets just make sure the queue counts are correct to avoid queue exhaustion (previous bug #9685112)
-                        _resetQueueCounts();
-
                         if (_flushCallbackTimerId == null) {
+                            // Clear the normal schedule timer as we are going to try and flush ASAP
+                            _clearScheduledTimer();
+
+                            // Move all queued events to the HttpManager so that we don't discard new events (Auto flush scenario)
+                            _queueBatches(EventLatencyValue.Normal, EventSendType.Batched, sendReason);
+                            
                             _flushCallbackTimerId = _createTimer(() => {
+                                _flushCallbackTimerId = null;
                                 _flushImpl(callback, sendReason);
                             }, 0);
                         } else {
@@ -446,18 +439,26 @@ export default class PostChannel extends BaseTelemetryPlugin implements IChannel
                             _flushCallbackQueue.push(callback);
                         }
                     } else {
+                        // Clear the normal schedule timer as we are going to try and flush ASAP
+                        let cleared = _clearScheduledTimer();
+
                         // Now cause all queued events to be sent synchronously
                         _sendEventsForLatencyAndAbove(EventLatencyValue.Normal, EventSendType.Synchronous, sendReason);
 
                         if (callback !== null && callback !== undefined) {
                             callback();
                         }
+
+                        if (cleared) {
+                            // restart the normal event timer if it was cleared
+                            _scheduleTimer();
+                        }
                     }
                 }
             };
 
             _self.setMsaAuthTicket = (ticket: string) => {
-                _httpManager.addHeader(strMsaDeviceTicket, ticket);
+                _httpManager.addHeader(STR_MSA_DEVICE_TICKET, ticket);
             };
 
             _self.hasEvents = _hasEvents;
@@ -575,7 +576,6 @@ export default class PostChannel extends BaseTelemetryPlugin implements IChannel
                 _delayedBatchReason = null;
                 _optimizeObject = true;
                 _isPageUnloadTriggered = false;
-                _disableXhrSync = false;
                 _maxEventSendAttempts = MaxSendAttempts;
                 _maxUnloadEventSendAttempts = MaxSyncUnloadSendAttempts;
                 _evtNamespace = null;
@@ -612,7 +612,10 @@ export default class PostChannel extends BaseTelemetryPlugin implements IChannel
                     _timeoutWrapper.clear(_scheduledTimerId);
                     _scheduledTimerId = null;
                     _timerCount = 0;
+                    return true;
                 }
+
+                return false;
             }
 
             // Try to send all queued events using beacons if available
@@ -833,6 +836,9 @@ export default class PostChannel extends BaseTelemetryPlugin implements IChannel
                 // Add any additional queued events and cause all queued events to be sent asynchronously
                 _sendEventsForLatencyAndAbove(EventLatencyValue.Normal, EventSendType.Batched, sendReason);
 
+                // All events (should) have been queue -- lets just make sure the queue counts are correct to avoid queue exhaustion (previous bug #9685112)
+                _resetQueueCounts();
+
                 _waitForIdleManager(() => {
                     // Only called AFTER the httpManager does not have any outstanding requests
                     if (callback) {
@@ -840,14 +846,16 @@ export default class PostChannel extends BaseTelemetryPlugin implements IChannel
                     }
 
                     if (_flushCallbackQueue.length > 0) {
-                        _flushCallbackTimerId = _createTimer(() => _flushImpl(_flushCallbackQueue.shift(), sendReason), 0);
+                        _flushCallbackTimerId = _createTimer(() => {
+                            _flushCallbackTimerId = null;
+                            _flushImpl(_flushCallbackQueue.shift(), sendReason);
+                        }, 0);
                     } else {
                         // No more flush requests
                         _flushCallbackTimerId = null;
-                        if (_hasEvents()) {
-                            // We still have events, so restart the normal timer schedule
-                            _scheduleTimer();
-                        }
+
+                        // Restart the normal timer schedule
+                        _scheduleTimer();
                     }
                 });
             }
@@ -857,6 +865,7 @@ export default class PostChannel extends BaseTelemetryPlugin implements IChannel
                     callback();
                 } else {
                     _flushCallbackTimerId = _createTimer(() => {
+                        _flushCallbackTimerId = null;
                         _waitForIdleManager(callback);
                     }, FlushCheckTimer);
                 }

package/src/Serializer.ts

@@ -3,14 +3,16 @@
 * @author Abhilash Panwar (abpanwar); Hector Hernandez (hectorh); Nev Wylie (newylie)
 * @copyright Microsoft 2018-2020
 */
+// @skip-file-minify
+
+import dynamicProto from "@microsoft/dynamicproto-js";
 import {
-    IEventProperty, getTenantId, getCommonSchemaMetaData, isArray, sanitizeProperty,
-    IPerfManagerProvider, doPerf, isValueAssigned, IValueSanitizer, strStartsWith,
-    FieldValueSanitizerType, FieldValueSanitizerFunc, objForEachKey, arrIndexOf, optimizeObject, SendRequestReason, EventSendType,
+    EventSendType, FieldValueSanitizerFunc, FieldValueSanitizerType, IEventProperty, IPerfManagerProvider, IValueSanitizer,
+    SendRequestReason, arrIndexOf, doPerf, getCommonSchemaMetaData, getTenantId, isArray, isValueAssigned, objForEachKey, sanitizeProperty,
+    strStartsWith
 } from "@microsoft/1ds-core-js";
-import { IPostTransmissionTelemetryItem  } from "./DataModels";
+import { IPostTransmissionTelemetryItem } from "./DataModels";
 import { EventBatch } from "./EventBatch";
-import dynamicProto from "@microsoft/dynamicproto-js";
 
 /**
  * Note: This is an optimization for V8-based browsers. When V8 concatenates a string,

package/src/TimeoutOverrideWrapper.ts

@@ -1,9 +1,9 @@
 /**
- * TimeoutOverrideWrapper.ts
- * @author  Nev Wylie (newylie)
- * @copyright Microsoft 2022
- * Simple internal timeout wrapper
- */
+* TimeoutOverrideWrapper.ts
+* @author  Nev Wylie (newylie)
+* @copyright Microsoft 2022
+* Simple internal timeout wrapper
+*/
 
 export type TimeoutSetFunc<T = any> = (callback: (...args: any[]) => void, ms: number, ...args: any[]) => T;
 export type TimeoutClearFunc<T = any> = (timeoutId?: T) => void;
@@ -26,4 +26,4 @@ export function createTimeoutWrapper<T = any>(argSetTimeout?: TimeoutSetFunc<T>,
         set: argSetTimeout || defaultSetTimeout,
         clear: argClearTimeout || defaultClearTimeout
     } 
-}
+}