@aws-amplify/analytics 7.0.1-console-preview.a1c533e.0 → 7.0.1-console-preview.23dc225.0

package/lib/providers/kinesis/types/buffer.d.ts

@@ -1,5 +1,5 @@
+import { AWSCredentials } from '@aws-amplify/core/internals/utils';
 import { EventBufferConfig } from '../../../utils';
-import { Credentials } from '@aws-sdk/types';
 import { KinesisShard } from '../../../types';
 export type KinesisBufferEvent = KinesisShard & {
     event: Uint8Array;
@@ -8,7 +8,7 @@ export type KinesisBufferEvent = KinesisShard & {
 };
 export type KinesisEventBufferConfig = EventBufferConfig & {
     region: string;
-    credentials: Credentials;
+    credentials: AWSCredentials;
     identityId?: string;
     resendLimit?: number;
     userAgentValue?: string;

package/lib/providers/kinesis-firehose/types/buffer.d.ts

@@ -1,6 +1,6 @@
 import { EventBufferConfig } from '../../../utils';
 import { KinesisStream } from '../../../types';
-import { Credentials } from '@aws-sdk/types';
+import { AWSCredentials } from '@aws-amplify/core/internals/utils';
 export type KinesisFirehoseBufferEvent = KinesisStream & {
     event: Uint8Array;
     retryCount: number;
@@ -8,7 +8,7 @@ export type KinesisFirehoseBufferEvent = KinesisStream & {
 };
 export type KinesisFirehoseEventBufferConfig = EventBufferConfig & {
     region: string;
-    credentials: Credentials;
+    credentials: AWSCredentials;
     identityId?: string;
     resendLimit?: number;
     userAgentValue?: string;

package/lib/providers/personalize/apis/record.js

@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.record = void 0;
+var tslib_1 = require("tslib");
 var utils_1 = require("../utils");
 var utils_2 = require("../../../utils");
 var utils_3 = require("@aws-amplify/core/internals/utils");
@@ -18,52 +19,65 @@ var record = function (_a) {
     (0, utils_2.resolveCredentials)()
         .then(function (_a) {
         var credentials = _a.credentials, identityId = _a.identityId;
-        var timestamp = Date.now();
-        var _b = (0, utils_1.resolveCachedSession)(trackingId), cachedSessionId = _b.sessionId, cachedUserId = _b.userId;
-        if (eventType === constants_1.IDENTIFY_EVENT_TYPE) {
-            (0, utils_1.updateCachedSession)(typeof properties.userId === 'string' ? properties.userId : '', cachedSessionId, cachedUserId);
-        }
-        else if (!!userId) {
-            (0, utils_1.updateCachedSession)(userId, cachedSessionId, cachedUserId);
-        }
-        var _c = (0, utils_1.resolveCachedSession)(trackingId), updatedSessionId = _c.sessionId, updatedUserId = _c.userId;
-        var eventBuffer = (0, utils_1.getEventBuffer)({
-            region: region,
-            flushSize: flushSize,
-            flushInterval: flushInterval,
-            bufferSize: bufferSize,
-            credentials: credentials,
-            identityId: identityId,
-            userAgentValue: (0, utils_2.getAnalyticsUserAgentString)(utils_3.AnalyticsAction.Record),
-        });
-        if (eventType === constants_1.MEDIA_AUTO_TRACK_EVENT_TYPE) {
-            (0, utils_1.autoTrackMedia)({
-                trackingId: trackingId,
-                sessionId: updatedSessionId,
-                userId: updatedUserId,
-                event: {
-                    eventId: eventId,
-                    eventType: eventType,
-                    properties: properties,
-                },
-            }, eventBuffer);
-        }
-        else {
-            eventBuffer.append({
-                trackingId: trackingId,
-                sessionId: updatedSessionId,
-                userId: updatedUserId,
-                event: {
-                    eventId: eventId,
-                    eventType: eventType,
-                    properties: properties,
-                },
-                timestamp: timestamp,
+        return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+            var timestamp, _b, cachedSessionId, cachedUserId, _c, updatedSessionId, updatedUserId, eventBuffer;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        timestamp = Date.now();
+                        return [4 /*yield*/, (0, utils_1.resolveCachedSession)()];
+                    case 1:
+                        _b = _d.sent(), cachedSessionId = _b.sessionId, cachedUserId = _b.userId;
+                        if (eventType === constants_1.IDENTIFY_EVENT_TYPE) {
+                            (0, utils_1.updateCachedSession)(typeof properties.userId === 'string' ? properties.userId : '', cachedSessionId, cachedUserId);
+                        }
+                        else if (!!userId) {
+                            (0, utils_1.updateCachedSession)(userId, cachedSessionId, cachedUserId);
+                        }
+                        return [4 /*yield*/, (0, utils_1.resolveCachedSession)()];
+                    case 2:
+                        _c = _d.sent(), updatedSessionId = _c.sessionId, updatedUserId = _c.userId;
+                        eventBuffer = (0, utils_1.getEventBuffer)({
+                            region: region,
+                            flushSize: flushSize,
+                            flushInterval: flushInterval,
+                            bufferSize: bufferSize,
+                            credentials: credentials,
+                            identityId: identityId,
+                            userAgentValue: (0, utils_2.getAnalyticsUserAgentString)(utils_3.AnalyticsAction.Record),
+                        });
+                        if (eventType === constants_1.MEDIA_AUTO_TRACK_EVENT_TYPE) {
+                            (0, utils_1.autoTrackMedia)({
+                                trackingId: trackingId,
+                                sessionId: updatedSessionId,
+                                userId: updatedUserId,
+                                event: {
+                                    eventId: eventId,
+                                    eventType: eventType,
+                                    properties: properties,
+                                },
+                            }, eventBuffer);
+                        }
+                        else {
+                            eventBuffer.append({
+                                trackingId: trackingId,
+                                sessionId: updatedSessionId,
+                                userId: updatedUserId,
+                                event: {
+                                    eventId: eventId,
+                                    eventType: eventType,
+                                    properties: properties,
+                                },
+                                timestamp: timestamp,
+                            });
+                        }
+                        if (eventBuffer.length >= bufferSize) {
+                            eventBuffer.flushAll();
+                        }
+                        return [2 /*return*/];
+                }
             });
-        }
-        if (eventBuffer.length >= bufferSize) {
-            eventBuffer.flushAll();
-        }
+        });
     })
         .catch(function (e) {
         logger.warn('Failed to record event.', e);

package/lib/providers/personalize/types/buffer.d.ts

@@ -1,6 +1,6 @@
 import { PersonalizeEvent } from './';
 import { EventBufferConfig } from '../../../utils';
-import { Credentials } from '@aws-sdk/types';
+import { AWSCredentials } from '@aws-amplify/core/internals/utils';
 export type PersonalizeBufferEvent = {
     trackingId: string;
     sessionId?: string;
@@ -10,7 +10,7 @@ export type PersonalizeBufferEvent = {
 };
 export type PersonalizeBufferConfig = EventBufferConfig & {
     region: string;
-    credentials: Credentials;
+    credentials: AWSCredentials;
     identityId?: string;
     userAgentValue?: string;
 };

package/lib/providers/personalize/utils/cachedSession.d.ts

@@ -1,5 +1,5 @@
-export declare const resolveCachedSession: (trackingId: string) => {
+export declare const resolveCachedSession: () => Promise<{
     sessionId: string;
     userId: string | undefined;
-};
+}>;
 export declare const updateCachedSession: (newUserId?: string, currentSessionId?: string, currentUserId?: string) => void;

package/lib/providers/personalize/utils/cachedSession.js

@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateCachedSession = exports.resolveCachedSession = void 0;
+var tslib_1 = require("tslib");
 var core_1 = require("@aws-amplify/core");
 var utils_1 = require("@aws-amplify/core/internals/utils");
-var uuid_1 = require("uuid");
 var PERSONALIZE_CACHE_USERID = '_awsct_uid';
 var PERSONALIZE_CACHE_SESSIONID = '_awsct_sid';
 var DEFAULT_CACHE_PREFIX = 'personalize';
@@ -21,18 +21,27 @@ var setCache = function (key, value) {
         expires: expiredAt.getTime(),
     });
 };
-var resolveCachedSession = function (trackingId) {
-    var sessionId = getCache(PERSONALIZE_CACHE_SESSIONID);
-    if (!sessionId) {
-        sessionId = (0, uuid_1.v4)();
-        setCache(PERSONALIZE_CACHE_SESSIONID, sessionId);
-    }
-    var userId = getCache(PERSONALIZE_CACHE_USERID);
-    return {
-        sessionId: sessionId,
-        userId: userId,
-    };
-};
+var resolveCachedSession = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+    var sessionId, userId;
+    return tslib_1.__generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, getCache(PERSONALIZE_CACHE_SESSIONID)];
+            case 1:
+                sessionId = _a.sent();
+                if (!sessionId) {
+                    sessionId = (0, utils_1.amplifyUuid)();
+                    setCache(PERSONALIZE_CACHE_SESSIONID, sessionId);
+                }
+                return [4 /*yield*/, getCache(PERSONALIZE_CACHE_USERID)];
+            case 2:
+                userId = _a.sent();
+                return [2 /*return*/, {
+                        sessionId: sessionId,
+                        userId: userId,
+                    }];
+        }
+    });
+}); };
 exports.resolveCachedSession = resolveCachedSession;
 var updateCachedSession = function (newUserId, currentSessionId, currentUserId) {
     var isNoCachedSession = !currentSessionId;
@@ -41,7 +50,7 @@ var updateCachedSession = function (newUserId, currentSessionId, currentUserId)
     var isRequireNewSession = isNoCachedSession || isSignOutCase || isSwitchUserCase;
     var isRequireUpdateSession = !!currentSessionId && !currentUserId && !!newUserId;
     if (isRequireNewSession) {
-        var newSessionId = (0, uuid_1.v4)();
+        var newSessionId = (0, utils_1.amplifyUuid)();
         setCache(PERSONALIZE_CACHE_SESSIONID, newSessionId);
         setCache(PERSONALIZE_CACHE_USERID, newUserId);
     }

package/lib/providers/pinpoint/utils/resolveCredentials.d.ts

@@ -2,11 +2,6 @@
  * @internal
  */
 export declare const resolveCredentials: () => Promise<{
-    credentials: {
-        accessKeyId: string;
-        secretAccessKey: string;
-        sessionToken?: string | undefined;
-        expiration?: Date | undefined;
-    };
+    credentials: import("@aws-amplify/core/lib-esm/libraryUtils").AWSCredentials;
     identityId: string | undefined;
 }>;