@aws-amplify/analytics 7.0.1-api-v6-models.9351bcf.0 → 7.0.1-api-v6-models.891fe0d.0

package/lib-esm/utils/eventBuffer/EventBuffer.js

@@ -1,88 +1,59 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { __read, __spreadArray, __values } from "tslib";
 import { ConsoleLogger } from '@aws-amplify/core';
-var logger = new ConsoleLogger('EventBuffer');
-var EventBuffer = /** @class */ (function () {
-    function EventBuffer(config, getAnalyticsClient) {
+const logger = new ConsoleLogger('EventBuffer');
+export class EventBuffer {
+    constructor(config, getAnalyticsClient) {
         this.list = [];
         this.config = config;
         this.getAnalyticsClient = getAnalyticsClient;
         this.startEventLoop();
     }
-    EventBuffer.prototype.append = function () {
-        var e_1, _a;
-        var events = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            events[_i] = arguments[_i];
-        }
-        try {
-            for (var events_1 = __values(events), events_1_1 = events_1.next(); !events_1_1.done; events_1_1 = events_1.next()) {
-                var event_1 = events_1_1.value;
-                if (this.list.length + 1 > this.config.bufferSize) {
-                    logger.debug("Exceed ".concat(typeof event_1, " event buffer limits, event dropped"));
-                    continue;
-                }
-                this.list.push(event_1);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (events_1_1 && !events_1_1.done && (_a = events_1.return)) _a.call(events_1);
+    append(...events) {
+        for (const event of events) {
+            if (this.list.length + 1 > this.config.bufferSize) {
+                logger.debug(`Exceed ${typeof event} event buffer limits, event dropped`);
+                continue;
             }
-            finally { if (e_1) throw e_1.error; }
+            this.list.push(event);
         }
-    };
-    EventBuffer.prototype.flushAll = function () {
+    }
+    flushAll() {
         return this.submitEvents(this.list.length);
-    };
-    EventBuffer.prototype.release = function () {
+    }
+    release() {
         this.list = [];
         if (this.timer) {
             clearInterval(this.timer);
         }
-    };
-    Object.defineProperty(EventBuffer.prototype, "length", {
-        get: function () {
-            return this.list.length;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    EventBuffer.prototype.head = function (count) {
+    }
+    get length() {
+        return this.list.length;
+    }
+    head(count) {
         return this.list.splice(0, count);
-    };
-    EventBuffer.prototype.insertAtBeginning = function () {
-        var _a;
-        var data = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            data[_i] = arguments[_i];
-        }
-        (_a = this.list).unshift.apply(_a, __spreadArray([], __read(data), false));
-    };
-    EventBuffer.prototype.startEventLoop = function () {
-        var _this = this;
+    }
+    insertAtBeginning(...data) {
+        this.list.unshift(...data);
+    }
+    startEventLoop() {
         if (this.timer) {
             clearInterval(this.timer);
         }
-        var _a = this.config, flushSize = _a.flushSize, flushInterval = _a.flushInterval;
-        setInterval(function () {
-            _this.submitEvents(flushSize);
+        const { flushSize, flushInterval } = this.config;
+        setInterval(() => {
+            this.submitEvents(flushSize);
         }, flushInterval);
-    };
-    EventBuffer.prototype.submitEvents = function (count) {
-        var _this = this;
-        var events = this.head(count);
+    }
+    submitEvents(count) {
+        const events = this.head(count);
         if (events.length === 0) {
             return Promise.resolve();
         }
-        return this.getAnalyticsClient()(events).then(function (result) {
+        return this.getAnalyticsClient()(events).then(result => {
             if (result.length > 0) {
-                _this.insertAtBeginning.apply(_this, __spreadArray([], __read(result), false));
+                this.insertAtBeginning(...result);
             }
         });
-    };
-    return EventBuffer;
-}());
-export { EventBuffer };
+    }
+}

package/lib-esm/utils/groupBy.js

@@ -1,11 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { __assign, __read, __spreadArray } from "tslib";
-export var groupBy = function (getGroupId, list) {
-    return list.reduce(function (result, current) {
-        var _a;
-        var _b;
-        var groupId = getGroupId(current);
-        return __assign(__assign({}, result), (_a = {}, _a[groupId] = __spreadArray(__spreadArray([], __read(((_b = result[groupId]) !== null && _b !== void 0 ? _b : [])), false), [current], false), _a));
+export const groupBy = (getGroupId, list) => {
+    return list.reduce((result, current) => {
+        const groupId = getGroupId(current);
+        return { ...result, [groupId]: [...(result[groupId] ?? []), current] };
     }, {});
 };

package/lib-esm/utils/resolveCredentials.js

@@ -1,17 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { __awaiter, __generator } from "tslib";
 import { AnalyticsValidationErrorCode, assertValidationError } from '../errors';
 import { fetchAuthSession } from '@aws-amplify/core';
-export var resolveCredentials = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, credentials, identityId;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, fetchAuthSession()];
-            case 1:
-                _a = _b.sent(), credentials = _a.credentials, identityId = _a.identityId;
-                assertValidationError(!!credentials, AnalyticsValidationErrorCode.NoCredentials);
-                return [2 /*return*/, { credentials: credentials, identityId: identityId }];
-        }
-    });
-}); };
+export const resolveCredentials = async () => {
+    const { credentials, identityId } = await fetchAuthSession();
+    assertValidationError(!!credentials, AnalyticsValidationErrorCode.NoCredentials);
+    return { credentials, identityId };
+};

package/lib-esm/utils/statusHelpers.js

@@ -1,13 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var analyticsEnabled = true;
-export var enableAnalytics = function () {
+let analyticsEnabled = true;
+export const enableAnalytics = () => {
     analyticsEnabled = true;
 };
-export var disableAnalytics = function () {
+export const disableAnalytics = () => {
     analyticsEnabled = false;
 };
 /**
  * Returns the current status of the Analytics category.
  */
-export var isAnalyticsEnabled = function () { return analyticsEnabled; };
+export const isAnalyticsEnabled = () => analyticsEnabled;

package/lib-esm/utils/trackerConfigHelpers.js

@@ -4,7 +4,7 @@ import { AnalyticsValidationErrorCode, assertValidationError } from '../errors';
 /**
  * Validates tracker configuration.
  */
-export var validateTrackerConfiguration = function (input) {
+export const validateTrackerConfiguration = (input) => {
     assertValidationError(input.type === 'event' ||
         input.type === 'pageView' ||
         input.type === 'session', AnalyticsValidationErrorCode.InvalidTracker);

package/lib-esm/utils/trackerConfigHelpers.native.js

@@ -4,7 +4,7 @@ import { AnalyticsValidationErrorCode, assertValidationError } from '../errors';
 /**
  * Validates tracker configuration.
  */
-export var validateTrackerConfiguration = function (input) {
+export const validateTrackerConfiguration = (input) => {
     // React Native only supports session tracking
     assertValidationError(input.type === 'session', AnalyticsValidationErrorCode.UnsupportedPlatform);
 };

package/lib-esm/utils/trackerHelpers.js

@@ -7,10 +7,10 @@ import { EventTracker, PageViewTracker, SessionTracker } from '../trackers';
  * @remark
  * This utility will mutate the provider's configured trackers via `providerTrackers`.
  */
-export var updateProviderTrackers = function (input, providerEventRecorder, providerTrackers) {
-    var trackerInstance;
-    var trackerType = input.type;
-    var currentTracker = providerTrackers[trackerType];
+export const updateProviderTrackers = (input, providerEventRecorder, providerTrackers) => {
+    let trackerInstance;
+    const trackerType = input.type;
+    const currentTracker = providerTrackers[trackerType];
     // Check if the tracker was disabled & should be cleaned up
     if (!input.enable) {
         if (currentTracker) {

package/lib-esm/utils/userAgent.js

@@ -4,12 +4,12 @@ import { Category, getAmplifyUserAgentObject, getAmplifyUserAgent, } from '@aws-
 export function getAnalyticsUserAgent(action) {
     return getAmplifyUserAgentObject({
         category: Category.Analytics,
-        action: action,
+        action,
     });
 }
 export function getAnalyticsUserAgentString(action) {
     return getAmplifyUserAgent({
         category: Category.Analytics,
-        action: action,
+        action,
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/analytics",
-  "version": "7.0.1-api-v6-models.9351bcf.0+9351bcf",
+  "version": "7.0.1-api-v6-models.891fe0d.0+891fe0d",
   "description": "Analytics category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -26,10 +26,7 @@
   },
   "react-native": "./lib-esm/index.js",
   "typesVersions": {
-    ">=4.0": {
-      "*": [
-        "./lib-esm/index.d.ts"
-      ],
+    ">=4.2": {
       "pinpoint": [
         "./lib-esm/providers/pinpoint/index.d.ts"
       ],
@@ -99,11 +96,11 @@
     "tslib": "^2.5.0"
   },
   "peerDependencies": {
-    "@aws-amplify/core": "6.0.1-api-v6-models.9351bcf.0+9351bcf"
+    "@aws-amplify/core": "6.0.1-api-v6-models.891fe0d.0+891fe0d"
   },
   "devDependencies": {
-    "@aws-amplify/core": "6.0.1-api-v6-models.9351bcf.0+9351bcf",
-    "@aws-amplify/react-native": "1.0.1-api-v6-models.9351bcf.0+9351bcf",
+    "@aws-amplify/core": "6.0.1-api-v6-models.891fe0d.0+891fe0d",
+    "@aws-amplify/react-native": "1.0.1-api-v6-models.891fe0d.0+891fe0d",
     "@aws-sdk/types": "3.398.0",
     "typescript": "5.0.2"
   },
@@ -151,5 +148,5 @@
       "<rootDir>/src/setupTests.ts"
     ]
   },
-  "gitHead": "9351bcfbeb9ec15f67fc6404ca192689a398d260"
+  "gitHead": "891fe0dc64e168de42b3b8d42def3eb9aed89efa"
 }

package/src/providers/kinesis/utils/getEventBuffer.ts

@@ -66,10 +66,7 @@ export const getEventBuffer = ({
 	resendLimit,
 	userAgentValue,
 }: KinesisEventBufferConfig): EventBuffer<KinesisBufferEvent> => {
-	const { sessionToken } = credentials;
-	const sessionIdentityKey = [region, sessionToken, identityId]
-		.filter(x => !!x)
-		.join('-');
+	const sessionIdentityKey = [region, identityId].filter(x => !!x).join('-');
 
 	if (!eventBufferMap[sessionIdentityKey]) {
 		const getKinesisClient = (): IAnalyticsClient<KinesisBufferEvent> => {
@@ -100,9 +97,11 @@ export const getEventBuffer = ({
 			x => x !== sessionIdentityKey
 		);
 		for (const releaseSessionKey of releaseSessionKeys) {
-			eventBufferMap[releaseSessionKey].release();
-			delete eventBufferMap[releaseSessionKey];
-			delete cachedClients[releaseSessionKey];
+			eventBufferMap[releaseSessionKey].flushAll().finally(() => {
+				eventBufferMap[releaseSessionKey].release();
+				delete eventBufferMap[releaseSessionKey];
+				delete cachedClients[releaseSessionKey];
+			});
 		}
 	}
 

package/src/providers/kinesis-firehose/utils/getEventBuffer.ts

@@ -75,10 +75,7 @@ export const getEventBuffer = ({
 	resendLimit,
 	userAgentValue,
 }: KinesisFirehoseEventBufferConfig): EventBuffer<KinesisFirehoseBufferEvent> => {
-	const { sessionToken } = credentials;
-	const sessionIdentityKey = [region, sessionToken, identityId]
-		.filter(id => !!id)
-		.join('-');
+	const sessionIdentityKey = [region, identityId].filter(id => !!id).join('-');
 
 	if (!eventBufferMap[sessionIdentityKey]) {
 		const getClient = (): IAnalyticsClient<KinesisFirehoseBufferEvent> => {
@@ -108,9 +105,11 @@ export const getEventBuffer = ({
 			key => key !== sessionIdentityKey
 		);
 		for (const releaseSessionKey of releaseSessionKeys) {
-			eventBufferMap[releaseSessionKey].release();
-			delete eventBufferMap[releaseSessionKey];
-			delete cachedClients[releaseSessionKey];
+			eventBufferMap[releaseSessionKey].flushAll().finally(() => {
+				eventBufferMap[releaseSessionKey].release();
+				delete eventBufferMap[releaseSessionKey];
+				delete cachedClients[releaseSessionKey];
+			});
 		}
 	}
 

package/src/providers/personalize/utils/getEventBuffer.ts

@@ -70,10 +70,7 @@ export const getEventBuffer = ({
 	identityId,
 	userAgentValue,
 }: PersonalizeBufferConfig): EventBuffer<PersonalizeBufferEvent> => {
-	const { sessionToken } = credentials;
-	const sessionIdentityKey = [region, sessionToken, identityId]
-		.filter(x => !!x)
-		.join('-');
+	const sessionIdentityKey = [region, identityId].filter(x => !!x).join('-');
 
 	if (!eventBufferMap[sessionIdentityKey]) {
 		const getClient = (): IAnalyticsClient<PersonalizeBufferEvent> => {
@@ -101,9 +98,11 @@ export const getEventBuffer = ({
 			key => key !== sessionIdentityKey
 		);
 		for (const releaseSessionKey of releaseSessionKeys) {
-			eventBufferMap[releaseSessionKey].release();
-			delete eventBufferMap[releaseSessionKey];
-			delete cachedClients[releaseSessionKey];
+			eventBufferMap[releaseSessionKey].flushAll().finally(() => {
+				eventBufferMap[releaseSessionKey].release();
+				delete eventBufferMap[releaseSessionKey];
+				delete cachedClients[releaseSessionKey];
+			});
 		}
 	}
 

package/src/trackers/SessionTracker.native.ts

@@ -4,6 +4,8 @@
 import {
 	sessionListener,
 	SessionState,
+	SESSION_START_EVENT,
+	SESSION_STOP_EVENT,
 } from '@aws-amplify/core/internals/utils';
 import { ConsoleLogger } from '@aws-amplify/core';
 import {
@@ -12,9 +14,6 @@ import {
 	TrackerInterface,
 } from '../types/trackers';
 
-const SESSION_START_EVENT = '_session.start';
-const SESSION_STOP_EVENT = '_session.stop';
-
 const logger = new ConsoleLogger('SessionTracker');
 
 export class SessionTracker implements TrackerInterface {

package/src/trackers/SessionTracker.ts

@@ -4,6 +4,8 @@
 import {
 	sessionListener,
 	SessionState,
+	SESSION_START_EVENT,
+	SESSION_STOP_EVENT,
 } from '@aws-amplify/core/internals/utils';
 import { ConsoleLogger } from '@aws-amplify/core';
 import {
@@ -12,9 +14,6 @@ import {
 	TrackerInterface,
 } from '../types/trackers';
 
-const SESSION_START_EVENT = '_session.start';
-const SESSION_STOP_EVENT = '_session.stop';
-
 const logger = new ConsoleLogger('SessionTracker');
 
 export class SessionTracker implements TrackerInterface {