@aws-amplify/core 6.0.1-api-v6-models.9351bcf.0 → 6.0.1-api-v6-models.58f2536.0

package/lib-esm/providers/pinpoint/apis/updateEndpoint.js

@@ -1,52 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import { amplifyUuid } from '../../../utils/amplifyUuid';
 import { getClientInfo } from '../../../utils/getClientInfo';
 import { updateEndpoint as clientUpdateEndpoint, } from '../../../awsClients/pinpoint';
@@ -54,65 +7,65 @@ import { cacheEndpointId, getEndpointId } from '../utils';
 /**
  * @internal
  */
-export var updateEndpoint = function (_a) {
-    var address = _a.address, appId = _a.appId, category = _a.category, channelType = _a.channelType, credentials = _a.credentials, identityId = _a.identityId, optOut = _a.optOut, region = _a.region, userAttributes = _a.userAttributes, userId = _a.userId, userProfile = _a.userProfile, userAgentValue = _a.userAgentValue;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var endpointId, createdEndpointId, _b, customProperties, demographic, email, location, metrics, name, plan, clientInfo, mergedDemographic, shouldAddAttributes, attributes, input;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, getEndpointId(appId, category)];
-                case 1:
-                    endpointId = _c.sent();
-                    createdEndpointId = !endpointId ? amplifyUuid() : undefined;
-                    _b = userProfile !== null && userProfile !== void 0 ? userProfile : {}, customProperties = _b.customProperties, demographic = _b.demographic, email = _b.email, location = _b.location, metrics = _b.metrics, name = _b.name, plan = _b.plan;
-                    clientInfo = getClientInfo();
-                    mergedDemographic = __assign({ appVersion: clientInfo.appVersion, make: clientInfo.make, model: clientInfo.model, modelVersion: clientInfo.version, platform: clientInfo.platform }, demographic);
-                    shouldAddAttributes = email || customProperties || name || plan;
-                    attributes = __assign(__assign(__assign(__assign({}, (email && { email: [email] })), (name && { name: [name] })), (plan && { plan: [plan] })), customProperties);
-                    input = {
-                        ApplicationId: appId,
-                        EndpointId: endpointId !== null && endpointId !== void 0 ? endpointId : createdEndpointId,
-                        EndpointRequest: {
-                            RequestId: amplifyUuid(),
-                            EffectiveDate: new Date().toISOString(),
-                            ChannelType: channelType,
-                            Address: address,
-                            Attributes: shouldAddAttributes ? attributes : undefined,
-                            Demographic: {
-                                AppVersion: mergedDemographic.appVersion,
-                                Locale: mergedDemographic.locale,
-                                Make: mergedDemographic.make,
-                                Model: mergedDemographic.model,
-                                ModelVersion: mergedDemographic.modelVersion,
-                                Platform: mergedDemographic.platform,
-                                PlatformVersion: mergedDemographic.platformVersion,
-                                Timezone: mergedDemographic.timezone,
-                            },
-                            Location: {
-                                City: location === null || location === void 0 ? void 0 : location.city,
-                                Country: location === null || location === void 0 ? void 0 : location.country,
-                                Latitude: location === null || location === void 0 ? void 0 : location.latitude,
-                                Longitude: location === null || location === void 0 ? void 0 : location.longitude,
-                                PostalCode: location === null || location === void 0 ? void 0 : location.postalCode,
-                                Region: location === null || location === void 0 ? void 0 : location.region,
-                            },
-                            Metrics: metrics,
-                            OptOut: optOut,
-                            User: {
-                                UserId: userId !== null && userId !== void 0 ? userId : identityId,
-                                UserAttributes: userAttributes,
-                            },
-                        },
-                    };
-                    return [4 /*yield*/, clientUpdateEndpoint({ credentials: credentials, region: region, userAgentValue: userAgentValue }, input)];
-                case 2:
-                    _c.sent();
-                    // if we had to create an endpoint id, we need to now cache it
-                    if (!!createdEndpointId) {
-                        return [2 /*return*/, cacheEndpointId(appId, category, createdEndpointId)];
-                    }
-                    return [2 /*return*/];
-            }
-        });
-    });
+export const updateEndpoint = async ({ address, appId, category, channelType, credentials, identityId, optOut, region, userAttributes, userId, userProfile, userAgentValue, }) => {
+    const endpointId = await getEndpointId(appId, category);
+    // only generate a new endpoint id if one was not found in cache
+    const createdEndpointId = !endpointId ? amplifyUuid() : undefined;
+    const { customProperties, demographic, email, location, metrics, name, plan, } = userProfile ?? {};
+    const clientInfo = getClientInfo();
+    const mergedDemographic = {
+        appVersion: clientInfo.appVersion,
+        make: clientInfo.make,
+        model: clientInfo.model,
+        modelVersion: clientInfo.version,
+        platform: clientInfo.platform,
+        ...demographic,
+    };
+    const shouldAddAttributes = email || customProperties || name || plan;
+    const attributes = {
+        ...(email && { email: [email] }),
+        ...(name && { name: [name] }),
+        ...(plan && { plan: [plan] }),
+        ...customProperties,
+    };
+    const input = {
+        ApplicationId: appId,
+        EndpointId: endpointId ?? createdEndpointId,
+        EndpointRequest: {
+            RequestId: amplifyUuid(),
+            EffectiveDate: new Date().toISOString(),
+            ChannelType: channelType,
+            Address: address,
+            Attributes: shouldAddAttributes ? attributes : undefined,
+            Demographic: {
+                AppVersion: mergedDemographic.appVersion,
+                Locale: mergedDemographic.locale,
+                Make: mergedDemographic.make,
+                Model: mergedDemographic.model,
+                ModelVersion: mergedDemographic.modelVersion,
+                Platform: mergedDemographic.platform,
+                PlatformVersion: mergedDemographic.platformVersion,
+                Timezone: mergedDemographic.timezone,
+            },
+            Location: {
+                City: location?.city,
+                Country: location?.country,
+                Latitude: location?.latitude,
+                Longitude: location?.longitude,
+                PostalCode: location?.postalCode,
+                Region: location?.region,
+            },
+            Metrics: metrics,
+            OptOut: optOut,
+            User: {
+                UserId: userId ?? identityId,
+                UserAttributes: userAttributes,
+            },
+        },
+    };
+    await clientUpdateEndpoint({ credentials, region, userAgentValue }, input);
+    // if we had to create an endpoint id, we need to now cache it
+    if (!!createdEndpointId) {
+        return cacheEndpointId(appId, category, createdEndpointId);
+    }
 };

package/lib-esm/providers/pinpoint/types/pinpoint.d.ts

@@ -3,7 +3,7 @@ import { UserProfile } from '../../../types';
 export type SupportedCategory = 'Analytics' | 'Core' | 'InAppMessaging' | 'PushNotification';
 type SupportedChannelType = 'APNS' | 'APNS_SANDBOX' | 'GCM' | 'IN_APP';
 export type PinpointProviderConfig = {
-    Pinpoint?: {
+    Pinpoint: {
         appId: string;
         region: string;
     };
@@ -15,7 +15,9 @@ export type PinpointServiceOptions = {
 };
 export type PinpointSession = {
     Id: string;
+    Duration?: number;
     StartTimestamp: string;
+    StopTimestamp?: string;
 };
 export type PinpointAnalyticsEvent = {
     name: string;

package/lib-esm/providers/pinpoint/utils/PinpointEventBuffer.js

@@ -1,85 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 import { ConsoleLogger as Logger } from '../../../Logger';
 import { putEvents, } from '../../../awsClients/pinpoint';
 import { isAppInForeground } from './isAppInForeground';
-var logger = new Logger('PinpointEventBuffer');
-var RETRYABLE_CODES = [429, 500];
-var ACCEPTED_CODES = [202];
-var PinpointEventBuffer = /** @class */ (function () {
-    function PinpointEventBuffer(config) {
+const logger = new Logger('PinpointEventBuffer');
+const RETRYABLE_CODES = [429, 500];
+const ACCEPTED_CODES = [202];
+export class PinpointEventBuffer {
+    constructor(config) {
         this._interval = undefined;
         this._pause = false;
         this._flush = false;
@@ -88,96 +16,85 @@ var PinpointEventBuffer = /** @class */ (function () {
         this._sendBatch = this._sendBatch.bind(this);
         this._startLoop();
     }
-    PinpointEventBuffer.prototype.push = function (event) {
-        var _a;
+    push(event) {
         if (this._buffer.length >= this._config.bufferSize) {
             logger.debug('Exceeded Pinpoint event buffer limits, event dropped.', {
                 eventId: event.eventId,
             });
             return;
         }
-        this._buffer.push((_a = {}, _a[event.eventId] = event, _a));
-    };
-    PinpointEventBuffer.prototype.pause = function () {
+        this._buffer.push({ [event.eventId]: event });
+    }
+    pause() {
         this._pause = true;
-    };
-    PinpointEventBuffer.prototype.resume = function () {
+    }
+    resume() {
         this._pause = false;
-    };
-    PinpointEventBuffer.prototype.flush = function () {
+    }
+    flush() {
         this._flush = true;
-    };
-    PinpointEventBuffer.prototype.identityHasChanged = function (identityId) {
+    }
+    identityHasChanged(identityId) {
         return this._config.identityId !== identityId;
-    };
-    PinpointEventBuffer.prototype.flushAll = function () {
+    }
+    flushAll() {
         this._putEvents(this._buffer.splice(0, this._buffer.length));
-    };
-    PinpointEventBuffer.prototype._startLoop = function () {
+    }
+    _startLoop() {
         if (this._interval) {
             clearInterval(this._interval);
         }
-        var flushInterval = this._config.flushInterval;
+        const { flushInterval } = this._config;
         this._interval = setInterval(this._sendBatch, flushInterval);
-    };
-    PinpointEventBuffer.prototype._sendBatch = function () {
-        var bufferLength = this._buffer.length;
+    }
+    _sendBatch() {
+        const bufferLength = this._buffer.length;
         if (this._flush && !bufferLength && this._interval) {
             clearInterval(this._interval);
         }
         if (this._pause || !bufferLength || !isAppInForeground()) {
             return;
         }
-        var flushSize = this._config.flushSize;
-        var batchSize = Math.min(flushSize, bufferLength);
-        var bufferSubset = this._buffer.splice(0, batchSize);
+        const { flushSize } = this._config;
+        const batchSize = Math.min(flushSize, bufferLength);
+        const bufferSubset = this._buffer.splice(0, batchSize);
         this._putEvents(bufferSubset);
-    };
-    PinpointEventBuffer.prototype._putEvents = function (buffer) {
-        return __awaiter(this, void 0, void 0, function () {
-            var eventMap, batchEventParams, _a, credentials, region, userAgentValue, data, err_1;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        eventMap = this._bufferToMap(buffer);
-                        batchEventParams = this._generateBatchEventParams(eventMap);
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 3, , 4]);
-                        _a = this._config, credentials = _a.credentials, region = _a.region, userAgentValue = _a.userAgentValue;
-                        return [4 /*yield*/, putEvents({
-                                credentials: credentials,
-                                region: region,
-                                userAgentValue: userAgentValue,
-                            }, batchEventParams)];
-                    case 2:
-                        data = _b.sent();
-                        this._processPutEventsSuccessResponse(data, eventMap);
-                        return [3 /*break*/, 4];
-                    case 3:
-                        err_1 = _b.sent();
-                        return [2 /*return*/, this._handlePutEventsFailure(err_1, eventMap)];
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    PinpointEventBuffer.prototype._generateBatchEventParams = function (eventMap) {
-        var batchItem = {};
-        Object.values(eventMap).forEach(function (item) {
-            var _a;
-            var _b, _c;
-            var event = item.event, timestamp = item.timestamp, endpointId = item.endpointId, eventId = item.eventId, session = item.session;
-            var name = event.name, attributes = event.attributes, metrics = event.metrics;
+    }
+    async _putEvents(buffer) {
+        const eventMap = this._bufferToMap(buffer);
+        const batchEventParams = this._generateBatchEventParams(eventMap);
+        try {
+            const { credentials, region, userAgentValue } = this._config;
+            const data = await putEvents({
+                credentials,
+                region,
+                userAgentValue,
+            }, batchEventParams);
+            this._processPutEventsSuccessResponse(data, eventMap);
+        }
+        catch (err) {
+            return this._handlePutEventsFailure(err, eventMap);
+        }
+    }
+    _generateBatchEventParams(eventMap) {
+        const batchItem = {};
+        Object.values(eventMap).forEach(item => {
+            const { event, timestamp, endpointId, eventId, session } = item;
+            const { name, attributes, metrics } = event;
             batchItem[endpointId] = {
-                Endpoint: __assign({}, (_b = batchItem[endpointId]) === null || _b === void 0 ? void 0 : _b.Endpoint),
-                Events: __assign(__assign({}, (_c = batchItem[endpointId]) === null || _c === void 0 ? void 0 : _c.Events), (_a = {}, _a[eventId] = {
-                    EventType: name,
-                    Timestamp: new Date(timestamp).toISOString(),
-                    Attributes: attributes,
-                    Metrics: metrics,
-                    Session: session,
-                }, _a)),
+                Endpoint: {
+                    ...batchItem[endpointId]?.Endpoint,
+                },
+                Events: {
+                    ...batchItem[endpointId]?.Events,
+                    [eventId]: {
+                        EventType: name,
+                        Timestamp: new Date(timestamp).toISOString(),
+                        Attributes: attributes,
+                        Metrics: metrics,
+                        Session: session,
+                    },
+                },
             };
         });
         return {
@@ -186,42 +103,37 @@ var PinpointEventBuffer = /** @class */ (function () {
                 BatchItem: batchItem,
             },
         };
-    };
-    PinpointEventBuffer.prototype._handlePutEventsFailure = function (err, eventMap) {
+    }
+    _handlePutEventsFailure(err, eventMap) {
         logger.debug('putEvents call to Pinpoint failed.', err);
-        var statusCode = err.$metadata && err.$metadata.httpStatusCode;
+        const statusCode = err.$metadata && err.$metadata.httpStatusCode;
         if (RETRYABLE_CODES.includes(statusCode)) {
-            var retryableEvents = Object.values(eventMap);
+            const retryableEvents = Object.values(eventMap);
             this._retry(retryableEvents);
             return;
         }
-    };
-    PinpointEventBuffer.prototype._processPutEventsSuccessResponse = function (data, eventMap) {
-        var _a;
-        var _b = ((_a = data.EventsResponse) !== null && _a !== void 0 ? _a : {}).Results, Results = _b === void 0 ? {} : _b;
-        var retryableEvents = [];
-        Object.entries(Results).forEach(function (_a) {
-            var _b;
-            var _c = __read(_a, 2), endpointId = _c[0], endpointValues = _c[1];
-            var responses = (_b = endpointValues.EventsItemResponse) !== null && _b !== void 0 ? _b : {};
-            Object.entries(responses).forEach(function (_a) {
-                var _b, _c;
-                var _d = __read(_a, 2), eventId = _d[0], eventValues = _d[1];
-                var eventObject = eventMap[eventId];
+    }
+    _processPutEventsSuccessResponse(data, eventMap) {
+        const { Results = {} } = data.EventsResponse ?? {};
+        const retryableEvents = [];
+        Object.entries(Results).forEach(([endpointId, endpointValues]) => {
+            const responses = endpointValues.EventsItemResponse ?? {};
+            Object.entries(responses).forEach(([eventId, eventValues]) => {
+                const eventObject = eventMap[eventId];
                 if (!eventObject) {
                     return;
                 }
-                var _e = eventValues !== null && eventValues !== void 0 ? eventValues : {}, StatusCode = _e.StatusCode, Message = _e.Message;
+                const { StatusCode, Message } = eventValues ?? {};
                 // manually crafting handlers response to keep API consistant
-                var response = {
+                const response = {
                     EventsResponse: {
-                        Results: (_b = {},
-                            _b[endpointId] = {
-                                EventsItemResponse: (_c = {},
-                                    _c[eventId] = { StatusCode: StatusCode, Message: Message },
-                                    _c),
+                        Results: {
+                            [endpointId]: {
+                                EventsItemResponse: {
+                                    [eventId]: { StatusCode, Message },
+                                },
                             },
-                            _b),
+                        },
                     },
                 };
                 if (StatusCode && ACCEPTED_CODES.includes(StatusCode)) {
@@ -231,10 +143,10 @@ var PinpointEventBuffer = /** @class */ (function () {
                     retryableEvents.push(eventObject);
                     return;
                 }
-                var name = eventObject.event.name;
+                const { name } = eventObject.event;
                 logger.warn('Pinpoint event failed to send.', {
-                    eventId: eventId,
-                    name: name,
+                    eventId,
+                    name,
                     message: Message,
                 });
             });
@@ -242,39 +154,35 @@ var PinpointEventBuffer = /** @class */ (function () {
         if (retryableEvents.length) {
             this._retry(retryableEvents);
         }
-    };
-    PinpointEventBuffer.prototype._retry = function (retryableEvents) {
-        var _a;
+    }
+    _retry(retryableEvents) {
         // retryable events that haven't reached the resendLimit
-        var eligibleEvents = [];
-        retryableEvents.forEach(function (bufferedEvent) {
-            var _a;
-            var eventId = bufferedEvent.eventId;
-            var name = bufferedEvent.event.name;
+        const eligibleEvents = [];
+        retryableEvents.forEach((bufferedEvent) => {
+            const { eventId } = bufferedEvent;
+            const { name } = bufferedEvent.event;
             if (bufferedEvent.resendLimit-- > 0) {
                 logger.debug('Resending event.', {
-                    eventId: eventId,
-                    name: name,
+                    eventId,
+                    name,
                     remainingAttempts: bufferedEvent.resendLimit,
                 });
-                eligibleEvents.push((_a = {}, _a[eventId] = bufferedEvent, _a));
+                eligibleEvents.push({ [eventId]: bufferedEvent });
                 return;
             }
             logger.debug('No retry attempts remaining for event.', {
-                eventId: eventId,
-                name: name,
+                eventId,
+                name,
             });
         });
         // add the events to the front of the buffer
-        (_a = this._buffer).unshift.apply(_a, __spreadArray([], __read(eligibleEvents), false));
-    };
-    PinpointEventBuffer.prototype._bufferToMap = function (buffer) {
-        return buffer.reduce(function (acc, curVal) {
-            var _a = __read(Object.entries(curVal), 1), _b = __read(_a[0], 2), key = _b[0], value = _b[1];
+        this._buffer.unshift(...eligibleEvents);
+    }
+    _bufferToMap(buffer) {
+        return buffer.reduce((acc, curVal) => {
+            const [[key, value]] = Object.entries(curVal);
             acc[key] = value;
             return acc;
         }, {});
-    };
-    return PinpointEventBuffer;
-}());
-export { PinpointEventBuffer };
+    }
+}

package/lib-esm/providers/pinpoint/utils/cacheEndpointId.js

@@ -1,41 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import { Cache } from '../../..';
 import { getCacheKey } from './getCacheKey';
 /**
@@ -43,15 +7,14 @@ import { getCacheKey } from './getCacheKey';
  *
  * @internal
  */
-export var cacheEndpointId = function (appId, category, endpointId) { return __awaiter(void 0, void 0, void 0, function () {
-    var cacheKey, ttl, expiration;
-    return __generator(this, function (_a) {
-        cacheKey = getCacheKey(appId, category);
-        ttl = 1000 * 60 * 60 * 24 * 365 * 100;
-        expiration = new Date().getTime() + ttl;
-        return [2 /*return*/, Cache.setItem(cacheKey, endpointId, {
-                expires: expiration,
-                priority: 1,
-            })];
+export const cacheEndpointId = async (appId, category, endpointId) => {
+    const cacheKey = getCacheKey(appId, category);
+    // Set a longer TTL to avoid endpoint id being deleted after the default TTL (3 days)
+    // Also set its priority to the highest to reduce its chance of being deleted when cache is full
+    const ttl = 1000 * 60 * 60 * 24 * 365 * 100; // 100 years
+    const expiration = new Date().getTime() + ttl;
+    return Cache.setItem(cacheKey, endpointId, {
+        expires: expiration,
+        priority: 1,
     });
-}); };
+};