@microsoft/applicationinsights-channel-js 2.7.3-nightly.2112-07 → 2.7.3

package/package.json

@@ -1,57 +1,54 @@
-{
-    "name": "@microsoft/applicationinsights-channel-js",
-    "version": "2.7.3-nightly.2112-07",
-    "description": "Microsoft Application Insights JavaScript SDK Channel",
-    "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme",
-    "author": "Microsoft Application Insights Team",
-    "main": "dist/applicationinsights-channel-js.js",
-    "module": "dist-esm/applicationinsights-channel-js.js",
-    "types": "types/applicationinsights-channel-js.d.ts",
-    "sideEffects": false,
-    "repository": "github:Microsoft/applicationinsights-js",
-    "scripts": {
-        "clean": "rm -rf browser dist dist-esm types",
-        "build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
-        "build:esm": "grunt aichannel",
-        "build:browser": "rollup -c",
-        "rebuild": "npm run build",
-        "test": "grunt aichanneltest",
-        "lint": "tslint -p tsconfig.json",
-        "dtsgen": "api-extractor run --local && node ../../scripts/dtsgen.js \"Microsoft Application Insights JavaScript SDK Channel\"",
-        "sri": "node ../../tools/subResourceIntegrity/generateIntegrityFile.js"
-    },
-    "devDependencies": {
-        "@microsoft/ai-test-framework": "0.0.1",
-        "@microsoft/applicationinsights-rollup-plugin-uglify3-js": "1.0.0",
-        "@microsoft/applicationinsights-rollup-es3": "1.1.3",
-        "@microsoft/api-extractor": "^7.18.1",
-        "@types/sinon": "4.3.3",
-        "grunt": "^1.4.1",
-        "grunt-cli": "^1.4.3",
-        "@nevware21/grunt-ts-plugin": "^0.4.3",
-        "@nevware21/grunt-eslint-ts": "^0.2.2",
-        "globby": "^11.0.0",
-        "magic-string": "^0.25.7",
-        "@rollup/plugin-commonjs": "^18.0.0",
-        "@rollup/plugin-node-resolve": "^11.2.1",
-        "@rollup/plugin-replace": "^2.3.3",
-        "rollup-plugin-cleanup": "3.2.1",
-        "rollup": "^2.32.0",
-        "typescript": "^4.3.4",
-        "tslib": "^2.0.0",
-        "sinon": "^7.3.1"
-    },
-    "peerDependencies": {
-        "tslib": "*"
-    },
-    "dependencies": {
-        "@microsoft/dynamicproto-js": "^1.1.4",
-        "@microsoft/applicationinsights-shims": "2.0.0",
-        "@microsoft/applicationinsights-core-js": "2.7.3-nightly.2112-07",
-        "@microsoft/applicationinsights-common": "2.7.3-nightly.2112-07"
-    },
-    "license": "MIT",
-    "publishConfig": {
-        "tag": "nightly"
-    }
-}
+{
+    "name": "@microsoft/applicationinsights-channel-js",
+    "version": "2.7.3",
+    "description": "Microsoft Application Insights JavaScript SDK Channel",
+    "homepage": "https://github.com/microsoft/ApplicationInsights-JS#readme",
+    "author": "Microsoft Application Insights Team",
+    "main": "dist/applicationinsights-channel-js.js",
+    "module": "dist-esm/applicationinsights-channel-js.js",
+    "types": "types/applicationinsights-channel-js.d.ts",
+    "sideEffects": false,
+    "repository": "github:Microsoft/applicationinsights-js",
+    "scripts": {
+        "clean": "rm -rf browser dist dist-esm types",
+        "build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
+        "build:esm": "grunt aichannel",
+        "build:browser": "rollup -c",
+        "rebuild": "npm run build",
+        "test": "grunt aichanneltest",
+        "lint": "tslint -p tsconfig.json",
+        "dtsgen": "api-extractor run --local && node ../../scripts/dtsgen.js \"Microsoft Application Insights JavaScript SDK Channel\"",
+        "sri": "node ../../tools/subResourceIntegrity/generateIntegrityFile.js"
+    },
+    "devDependencies": {
+        "@microsoft/ai-test-framework": "0.0.1",
+        "@microsoft/applicationinsights-rollup-plugin-uglify3-js": "1.0.0",
+        "@microsoft/applicationinsights-rollup-es3": "1.1.3",
+        "@microsoft/api-extractor": "^7.18.1",
+        "@types/sinon": "4.3.3",
+        "grunt": "^1.4.1",
+        "grunt-cli": "^1.4.3",
+        "@nevware21/grunt-ts-plugin": "^0.4.3",
+        "@nevware21/grunt-eslint-ts": "^0.2.2",
+        "globby": "^11.0.0",
+        "magic-string": "^0.25.7",
+        "@rollup/plugin-commonjs": "^18.0.0",
+        "@rollup/plugin-node-resolve": "^11.2.1",
+        "@rollup/plugin-replace": "^2.3.3",
+        "rollup-plugin-cleanup": "3.2.1",
+        "rollup": "^2.32.0",
+        "typescript": "^4.3.4",
+        "tslib": "^2.0.0",
+        "sinon": "^7.3.1"
+    },
+    "peerDependencies": {
+        "tslib": "*"
+    },
+    "dependencies": {
+        "@microsoft/dynamicproto-js": "^1.1.4",
+        "@microsoft/applicationinsights-shims": "2.0.1",
+        "@microsoft/applicationinsights-core-js": "2.7.3",
+        "@microsoft/applicationinsights-common": "2.7.3"
+    },
+    "license": "MIT"
+}

package/src/EnvelopeCreator.ts

@@ -175,7 +175,7 @@ function EnvelopeCreatorInit(logger: IDiagnosticLogger, telemetryItem: ITelemetr
 }
 
 export const EnvelopeCreator = {
-    Version: "2.7.3-nightly.2112-07"
+    Version: "2.7.3"
 };
 
 export function DependencyEnvelopeCreator(logger: IDiagnosticLogger, telemetryItem: ITelemetryItem, customUndefinedValue?: any): IEnvelope {
@@ -284,7 +284,7 @@ export function PageViewEnvelopeCreator(logger: IDiagnosticLogger, telemetryItem
     if (((telemetryItem.ext || {}).trace || {}).traceID) {
         currentContextId = telemetryItem.ext.trace.traceID;
     }
-    const id = bd.id || currentContextId
+    const id = bd.id || currentContextId;
     const name = bd.name;
     const url = bd.uri;
     const properties = bd[strProperties] || {};

package/src/Offline.ts

@@ -1,4 +1,4 @@
-import { EventHelper, getWindow, getDocument, getNavigator, isUndefined, isNullOrUndefined, attachEvent } from "@microsoft/applicationinsights-core-js";
+import { getWindow, getDocument, getNavigator, isUndefined, isNullOrUndefined, attachEvent } from "@microsoft/applicationinsights-core-js";
 import dynamicProto from "@microsoft/dynamicproto-js";
 
 /**

package/src/SendBuffer.ts

@@ -266,7 +266,7 @@ export class SessionStorageSendBuffer extends BaseSendBuffer implements ISendBuf
                 sentElements = _removePayloadsFromBuffer(payload, sentElements);
         
                 _setBuffer(SessionStorageSendBuffer.SENT_BUFFER_KEY, sentElements);
-            }
+            };
         
             function _removePayloadsFromBuffer(payloads: string[], buffer: string[]): string[] {
                 const remaining: string[] = [];

package/src/Sender.ts

@@ -233,7 +233,7 @@ export class Sender extends BaseTelemetryPlugin implements IChannelControlsAI {
 
             _self.addHeader = (name: string, value: string) => {
                 _headers[name] = value;
-            }
+            };
         
             _self.initialize = (config: IConfiguration & IConfig, core: IAppInsightsCore, extensions: IPlugin[], pluginChain?:ITelemetryPluginChain): void => {
                 _base.initialize(config, core, extensions, pluginChain);
@@ -757,7 +757,7 @@ export class Sender extends BaseTelemetryPlugin implements IChannelControlsAI {
             /**
              * Send fetch API request
              * @param payload {string} - The data payload to be sent.
-             * @param isAsync {boolean} - not used
+             * @param isAsync {boolean} - For fetch this identifies whether we are "unloading" (false) or a normal request
              */
              function _doFetchSender(payload: string[], isAsync: boolean) {
                 const endPointUrl = _self._senderConfig.endpointUrl();
@@ -765,6 +765,8 @@ export class Sender extends BaseTelemetryPlugin implements IChannelControlsAI {
                 const plainTextBatch = new Blob([batch], { type: "application/json" });
                 let requestHeaders = new Headers();
                 let batchLength = batch.length;
+                let ignoreResponse = false;
+                let responseHandled = false;
 
                 // append Sdk-Context request header only in case of breeze endpoint
                 if (isInternalApplicationInsightsEndpoint(endPointUrl)) {
@@ -780,10 +782,13 @@ export class Sender extends BaseTelemetryPlugin implements IChannelControlsAI {
                     headers: requestHeaders,
                     body: plainTextBatch,
                     [DisabledPropertyName]: true            // Mark so we don't attempt to track this request
-                }
+                };
 
                 if (!isAsync) {
                     init.keepalive = true;
+                    // As a sync request (during unload), it is unlikely that we will get a chance to process the response so
+                    // just like beacon send assume that the events have been accepted and processed
+                    ignoreResponse = true;
                     _syncFetchPayload += batchLength;
                 }
 
@@ -796,34 +801,53 @@ export class Sender extends BaseTelemetryPlugin implements IChannelControlsAI {
                     // cause the request to fail and we no telemetry would be sent
                 }
 
-                fetch(request).then(response => {
-                    if (!isAsync) {
-                        _syncFetchPayload -= batchLength;
-                        batchLength = 0;
-                    }
+                _self._buffer.markAsSent(payload);
 
-                    /**
-                     * The Promise returned from fetch() won’t reject on HTTP error status even if the response is an HTTP 404 or 500.
-                     * Instead, it will resolve normally (with ok status set to false), and it will only reject on network failure
-                     * or if anything prevented the request from completing.
-                     */
-                    if (!response.ok) {
-                        _self._onError(payload, response.statusText)
-                    } else {
-                        response.text().then(text => {
-                            _checkResponsStatus(response.status, payload, response.url, payload.length, response.statusText, text);
-                        });
-                    }
-                }).catch((error: Error) => {
-                    if (!isAsync) {
-                        _syncFetchPayload -= batchLength;
-                        batchLength = 0;
+                try {
+                    fetch(request).then(response => {
+                        if (!isAsync) {
+                            _syncFetchPayload -= batchLength;
+                            batchLength = 0;
+                        }
+    
+                        if (!responseHandled) {
+                            responseHandled = true;
+
+                            /**
+                             * The Promise returned from fetch() won’t reject on HTTP error status even if the response is an HTTP 404 or 500.
+                             * Instead, it will resolve normally (with ok status set to false), and it will only reject on network failure
+                             * or if anything prevented the request from completing.
+                             */
+                            if (!response.ok) {
+                                _self._onError(payload, response.statusText)
+                            } else {
+                                response.text().then(text => {
+                                    _checkResponsStatus(response.status, payload, response.url, payload.length, response.statusText, text);
+                                });
+                            }
+                        }
+                    }).catch((error: Error) => {
+                        if (!isAsync) {
+                            _syncFetchPayload -= batchLength;
+                            batchLength = 0;
+                        }
+    
+                        if (!responseHandled) {
+                            responseHandled = true;
+                            _self._onError(payload, error.message)
+                        }
+                    });
+                } catch (e) {
+                    if (!responseHandled) {
+                        _self._onError(payload, dumpObj(e));
                     }
+                }
 
-                    _self._onError(payload, error.message)
-                });
-
-                _self._buffer.markAsSent(payload);
+                if (ignoreResponse && !responseHandled) {
+                    // Assume success during unload processing as we most likely won't get the response
+                    responseHandled = true;
+                    _self._onSuccess(payload, payload.length);
+                }
             }
         
             /**

package/types/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.18.21"
+      "packageVersion": "7.19.4"
     }
   ]
 }