@aws-amplify/core 4.7.6 → 4.7.7-ds-allow-applicable-data.6

package/lib-esm/Util/BackgroundProcessManager.js

@@ -0,0 +1,383 @@
+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 (_) 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 __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+/**
+ * @private For internal Amplify use.
+ *
+ * Creates a new scope for promises, observables, and other types of work or
+ * processes that may be running in the background. This manager provides
+ * an singular entrypoint to request termination and await completion.
+ *
+ * As work completes on its own prior to close, the manager removes them
+ * from the registry to avoid holding references to completed jobs.
+ */
+var BackgroundProcessManager = /** @class */ (function () {
+    /**
+     * Creates a new manager for promises, observables, and other types
+     * of work that may be running in the background. This manager provides
+     * a centralized mechanism to request termination and await completion.
+     */
+    function BackgroundProcessManager() {
+        /**
+         * A string indicating whether the manager is accepting new work ("Open"),
+         * waiting for work to complete ("Closing"), or fully done with all
+         * submitted work and *not* accepting new jobs ("Closed").
+         */
+        this._state = BackgroundProcessManagerState.Open;
+        /**
+         * The list of outstanding jobs we'll need to wait for upon `close()`
+         */
+        this.jobs = new Set();
+    }
+    BackgroundProcessManager.prototype.add = function (jobOrDescription, optionalDescription) {
+        var job;
+        var description;
+        if (typeof jobOrDescription === 'string') {
+            job = undefined;
+            description = jobOrDescription;
+        }
+        else {
+            job = jobOrDescription;
+            description = optionalDescription;
+        }
+        var error = this.closedFailure(description);
+        if (error)
+            return error;
+        if (job === undefined) {
+            return this.addHook(description);
+        }
+        else if (typeof job === 'function') {
+            return this.addFunction(job, description);
+        }
+        else if (job instanceof BackgroundProcessManager) {
+            return this.addManager(job, description);
+        }
+        else {
+            throw new Error('If `job` is provided, it must be an Observable, Function, or BackgroundProcessManager.');
+        }
+    };
+    /**
+     * Adds a **cleaner** function that doesn't immediately get executed.
+     * Instead, the caller gets a **terminate** function back. The *cleaner* is
+     * invoked only once the mananger *closes* or the returned **terminate**
+     * function is called.
+     *
+     * @param clean The cleanup function.
+     * @param description Optional description to help identify pending jobs.
+     * @returns A terminate function.
+     */
+    BackgroundProcessManager.prototype.addCleaner = function (clean, description) {
+        var _this = this;
+        var _a = this.addHook(description), resolve = _a.resolve, onTerminate = _a.onTerminate;
+        var proxy = function () { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, clean()];
+                    case 1:
+                        _a.sent();
+                        resolve();
+                        return [2 /*return*/];
+                }
+            });
+        }); };
+        onTerminate.then(proxy);
+        return proxy;
+    };
+    BackgroundProcessManager.prototype.addFunction = function (job, description) {
+        // the function we call when we want to try to terminate this job.
+        var terminate;
+        // the promise the job can opt into listening to for termination.
+        var onTerminate = new Promise(function (resolve) {
+            terminate = resolve;
+        });
+        // finally! start the job.
+        var jobResult = job(onTerminate);
+        // depending on what the job gives back, register the result
+        // so we can monitor for completion.
+        if (typeof (jobResult === null || jobResult === void 0 ? void 0 : jobResult.then) === 'function') {
+            this.registerPromise(jobResult, terminate, description);
+        }
+        // At the end of the day, or you know, method call, it doesn't matter
+        // what the return value is at all; we just pass it through to the
+        // caller.
+        return jobResult;
+    };
+    BackgroundProcessManager.prototype.addManager = function (manager, description) {
+        var _this = this;
+        this.addCleaner(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, manager.close()];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        }); }); }, description);
+    };
+    /**
+     * Creates and registers a fabricated job for processes that need to operate
+     * with callbacks/hooks. The returned `resolve` and `reject`
+     * functions can be used to signal the job is done successfully or not.
+     * The returned `onTerminate` is a promise that will resolve when the
+     * manager is requesting the termination of the job.
+     *
+     * @param description Optional description to help identify pending jobs.
+     * @returns `{ resolve, reject, onTerminate }`
+     */
+    BackgroundProcessManager.prototype.addHook = function (description) {
+        // the resolve/reject functions we'll provide to the caller to signal
+        // the state of the job.
+        var resolve;
+        var reject;
+        // the underlying promise we'll use to manage it, pretty much like
+        // any other promise.
+        var promise = new Promise(function (res, rej) {
+            resolve = res;
+            reject = rej;
+        });
+        // the function we call when we want to try to terminate this job.
+        var terminate;
+        // the promise the job can opt into listening to for termination.
+        var onTerminate = new Promise(function (resolveTerminate) {
+            terminate = resolveTerminate;
+        });
+        this.registerPromise(promise, terminate, description);
+        return {
+            resolve: resolve,
+            reject: reject,
+            onTerminate: onTerminate,
+        };
+    };
+    /**
+     * Adds a Promise based job to the list of jobs for monitoring and listens
+     * for either a success or failure, upon which the job is considered "done"
+     * and removed from the registry.
+     *
+     * @param promise A promise that is on its way to being returned to a
+     * caller, which needs to be tracked as a background job.
+     * @param terminate The termination function to register, which can be
+     * invoked to request the job stop.
+     * @param description Optional description to help identify pending jobs.
+     */
+    BackgroundProcessManager.prototype.registerPromise = function (promise, terminate, description) {
+        var _this = this;
+        var jobEntry = { promise: promise, terminate: terminate, description: description };
+        this.jobs.add(jobEntry);
+        // in all of my testing, it is safe to multi-subscribe to a promise.
+        // so, rather than create another layer of promising, we're just going
+        // to hook into the promise we already have, and when it's done
+        // (successfully or not), we no longer need to wait for it upon close.
+        //
+        // sorry this is a bit hand-wavy:
+        //
+        // i believe we use `.then` and `.catch` instead of `.finally` because
+        // `.finally` is invoked in a different order in the sequence, and this
+        // breaks assumptions throughout and causes failures.
+        promise
+            .then(function () {
+            _this.jobs.delete(jobEntry);
+        })
+            .catch(function () {
+            _this.jobs.delete(jobEntry);
+        });
+    };
+    Object.defineProperty(BackgroundProcessManager.prototype, "length", {
+        /**
+         * The number of jobs being waited on.
+         *
+         * We don't use this for anything. It's just informational for the caller,
+         * and can be used in logging and testing.
+         *
+         * @returns the number of jobs.
+         */
+        get: function () {
+            return this.jobs.size;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(BackgroundProcessManager.prototype, "state", {
+        /**
+         * The execution state of the manager. One of:
+         *
+         * 1. "Open" -> Accepting new jobs
+         * 1. "Closing" -> Not accepting new work. Waiting for jobs to complete.
+         * 1. "Closed" -> Not accepting new work. All submitted jobs are complete.
+         */
+        get: function () {
+            return this._state;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(BackgroundProcessManager.prototype, "pending", {
+        /**
+         * The registered `description` of all still-pending jobs.
+         *
+         * @returns descriptions as an array.
+         */
+        get: function () {
+            return Array.from(this.jobs).map(function (job) { return job.description; });
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(BackgroundProcessManager.prototype, "isOpen", {
+        /**
+         * Whether the manager is accepting new jobs.
+         */
+        get: function () {
+            return this._state === BackgroundProcessManagerState.Open;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(BackgroundProcessManager.prototype, "isClosing", {
+        /**
+         * Whether the manager is rejecting new work, but still waiting for
+         * submitted work to complete.
+         */
+        get: function () {
+            return this._state === BackgroundProcessManagerState.Closing;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(BackgroundProcessManager.prototype, "isClosed", {
+        /**
+         * Whether the manager is rejecting work and done waiting for submitted
+         * work to complete.
+         */
+        get: function () {
+            return this._state === BackgroundProcessManagerState.Closed;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    BackgroundProcessManager.prototype.closedFailure = function (description) {
+        if (!this.isOpen) {
+            return Promise.reject(new Error([
+                'The manager is closing or closed, which occurs after `close()` has been called.',
+                "This error occurred trying to add \"" + description + "\".",
+                "Pending jobs: [\n" + this.pending
+                    .map(function (t) { return '    ' + t; })
+                    .join(',\n') + "\n]",
+            ].join('\n')));
+        }
+    };
+    /**
+     * Signals jobs to stop (for those that accept interruptions) and waits
+     * for confirmation that jobs have stopped.
+     *
+     * This immediately puts the manager into a closing state and just begins
+     * to reject new work. After all work in the manager is complete, the
+     * manager goes into a `Completed` state and `close()` returns.
+     *
+     * @returns The settled results of each job's promise.
+     */
+    BackgroundProcessManager.prototype.close = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, _b, job, results;
+            var e_1, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        // prevents more jobs from being added
+                        this._state = BackgroundProcessManagerState.Closing;
+                        try {
+                            for (_a = __values(Array.from(this.jobs)), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                job = _b.value;
+                                try {
+                                    job.terminate();
+                                }
+                                catch (error) {
+                                    // Due to potential races with a job's natural completion, it's
+                                    // reasonable to expect the termination call to fail. Hence,
+                                    // not logging as an error.
+                                    console.warn("Failed to send termination signal to job. Error: " + error.message, job);
+                                }
+                            }
+                        }
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                            }
+                            finally { if (e_1) throw e_1.error; }
+                        }
+                        return [4 /*yield*/, Promise.allSettled(Array.from(this.jobs).map(function (j) { return j.promise; }))];
+                    case 1:
+                        results = _d.sent();
+                        // At this point, we're already *not* accepting new work, and all
+                        // pending work is done. It's safe to set state to `Closed`. Any
+                        // process that's checking this property will be able to safely operate
+                        // on this value at this point.
+                        this._state = BackgroundProcessManagerState.Closed;
+                        return [2 /*return*/, results];
+                }
+            });
+        });
+    };
+    return BackgroundProcessManager;
+}());
+export { BackgroundProcessManager };
+/**
+ * All possible states a `BackgroundProcessManager` instance can be in.
+ */
+export var BackgroundProcessManagerState;
+(function (BackgroundProcessManagerState) {
+    /**
+     * Accepting new jobs.
+     */
+    BackgroundProcessManagerState["Open"] = "Open";
+    /**
+     * Not accepting new jobs. Waiting for submitted jobs to complete.
+     */
+    BackgroundProcessManagerState["Closing"] = "Closing";
+    /**
+     * Not accepting new jobs. All submitted jobs are complete.
+     */
+    BackgroundProcessManagerState["Closed"] = "Closed";
+})(BackgroundProcessManagerState || (BackgroundProcessManagerState = {}));
+//# sourceMappingURL=BackgroundProcessManager.js.map

package/lib-esm/Util/BackgroundProcessManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BackgroundProcessManager.js","sourceRoot":"","sources":["../../src/Util/BackgroundProcessManager.ts"],"names":[],"mappings":"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"}

package/lib-esm/Util/Retry.d.ts

@@ -7,7 +7,7 @@ export declare class NonRetryableError extends Error {
  * @private
  * Internal use of Amplify only
  */
-export declare function retry(functionToRetry: Function, args: any[], delayFn: DelayFunction, attempt?: number): any;
+export declare function retry<T>(functionToRetry: (...args: any[]) => T, args: any[], delayFn: DelayFunction, onTerminate?: Promise<void>): Promise<T>;
 /**
  * @private
  * Internal use of Amplify only
@@ -17,4 +17,4 @@ export declare function jitteredBackoff(maxDelayMs?: number): DelayFunction;
  * @private
  * Internal use of Amplify only
  */
-export declare const jitteredExponentialRetry: (functionToRetry: Function, args: any[], maxDelayMs?: number) => any;
+export declare const jitteredExponentialRetry: <T>(functionToRetry: (...args: any[]) => T, args: any[], maxDelayMs?: number, onTerminate?: Promise<void>) => Promise<T>;

package/lib-esm/Util/Retry.js

@@ -87,41 +87,83 @@ var isNonRetryableError = function (obj) {
  * @private
  * Internal use of Amplify only
  */
-export function retry(functionToRetry, args, delayFn, attempt) {
-    if (attempt === void 0) { attempt = 1; }
+export function retry(functionToRetry, args, delayFn, onTerminate) {
     return __awaiter(this, void 0, void 0, function () {
-        var err_1, retryIn_1;
+        var _this = this;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (typeof functionToRetry !== 'function') {
-                        throw Error('functionToRetry must be a function');
-                    }
-                    logger.debug(functionToRetry.name + " attempt #" + attempt + " with this vars: " + JSON.stringify(args));
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 8]);
-                    return [4 /*yield*/, functionToRetry.apply(void 0, __spread(args))];
-                case 2: return [2 /*return*/, _a.sent()];
-                case 3:
-                    err_1 = _a.sent();
-                    logger.debug("error on " + functionToRetry.name, err_1);
-                    if (isNonRetryableError(err_1)) {
-                        logger.debug(functionToRetry.name + " non retryable error", err_1);
-                        throw err_1;
-                    }
-                    retryIn_1 = delayFn(attempt, args, err_1);
-                    logger.debug(functionToRetry.name + " retrying in " + retryIn_1 + " ms");
-                    if (!(retryIn_1 !== false)) return [3 /*break*/, 6];
-                    return [4 /*yield*/, new Promise(function (res) { return setTimeout(res, retryIn_1); })];
-                case 4:
-                    _a.sent();
-                    return [4 /*yield*/, retry(functionToRetry, args, delayFn, attempt + 1)];
-                case 5: return [2 /*return*/, _a.sent()];
-                case 6: throw err_1;
-                case 7: return [3 /*break*/, 8];
-                case 8: return [2 /*return*/];
+            if (typeof functionToRetry !== 'function') {
+                throw Error('functionToRetry must be a function');
             }
+            return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
+                    var attempt, terminated, timeout, wakeUp, lastError, _loop_1, state_1;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                attempt = 0;
+                                terminated = false;
+                                wakeUp = function () { };
+                                onTerminate &&
+                                    onTerminate.then(function () {
+                                        // signal not to try anymore.
+                                        terminated = true;
+                                        // stop sleeping if we're sleeping.
+                                        clearTimeout(timeout);
+                                        wakeUp();
+                                    });
+                                _loop_1 = function () {
+                                    var _a, _b, err_1, retryIn_1;
+                                    return __generator(this, function (_c) {
+                                        switch (_c.label) {
+                                            case 0:
+                                                attempt++;
+                                                logger.debug(functionToRetry.name + " attempt #" + attempt + " with this vars: " + JSON.stringify(args));
+                                                _c.label = 1;
+                                            case 1:
+                                                _c.trys.push([1, 3, , 7]);
+                                                _a = {};
+                                                _b = resolve;
+                                                return [4 /*yield*/, functionToRetry.apply(void 0, __spread(args))];
+                                            case 2: return [2 /*return*/, (_a.value = _b.apply(void 0, [_c.sent()]), _a)];
+                                            case 3:
+                                                err_1 = _c.sent();
+                                                lastError = err_1;
+                                                logger.debug("error on " + functionToRetry.name, err_1);
+                                                if (isNonRetryableError(err_1)) {
+                                                    logger.debug(functionToRetry.name + " non retryable error", err_1);
+                                                    return [2 /*return*/, { value: reject(err_1) }];
+                                                }
+                                                retryIn_1 = delayFn(attempt, args, err_1);
+                                                logger.debug(functionToRetry.name + " retrying in " + retryIn_1 + " ms");
+                                                if (!(retryIn_1 === false || terminated)) return [3 /*break*/, 4];
+                                                return [2 /*return*/, { value: reject(err_1) }];
+                                            case 4: return [4 /*yield*/, new Promise(function (r) {
+                                                    wakeUp = r; // export wakeUp for onTerminate handling
+                                                    timeout = setTimeout(wakeUp, retryIn_1);
+                                                })];
+                                            case 5:
+                                                _c.sent();
+                                                _c.label = 6;
+                                            case 6: return [3 /*break*/, 7];
+                                            case 7: return [2 /*return*/];
+                                        }
+                                    });
+                                };
+                                _a.label = 1;
+                            case 1:
+                                if (!!terminated) return [3 /*break*/, 3];
+                                return [5 /*yield**/, _loop_1()];
+                            case 2:
+                                state_1 = _a.sent();
+                                if (typeof state_1 === "object")
+                                    return [2 /*return*/, state_1.value];
+                                return [3 /*break*/, 1];
+                            case 3:
+                                // reached if terminated while waiting for a timer.
+                                reject(lastError);
+                                return [2 /*return*/];
+                        }
+                    });
+                }); })];
         });
     });
 }
@@ -143,8 +185,8 @@ export function jitteredBackoff(maxDelayMs) {
  * @private
  * Internal use of Amplify only
  */
-export var jitteredExponentialRetry = function (functionToRetry, args, maxDelayMs) {
+export var jitteredExponentialRetry = function (functionToRetry, args, maxDelayMs, onTerminate) {
     if (maxDelayMs === void 0) { maxDelayMs = MAX_DELAY_MS; }
-    return retry(functionToRetry, args, jitteredBackoff(maxDelayMs));
+    return retry(functionToRetry, args, jitteredBackoff(maxDelayMs), onTerminate);
 };
 //# sourceMappingURL=Retry.js.map

package/lib-esm/Util/Retry.js.map

@@ -1 +1 @@
-{"version":3,"file":"Retry.js","sourceRoot":"","sources":["../../src/Util/Retry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Retry.js","sourceRoot":"","sources":["../../src/Util/Retry.ts"],"names":[],"mappings":"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"}

package/lib-esm/Util/index.d.ts

@@ -4,3 +4,4 @@ export { default as Reachability } from './Reachability';
 export * from './DateUtils';
 export * from './StringUtils';
 export * from './Constants';
+export * from './BackgroundProcessManager';

package/lib-esm/Util/index.js

@@ -4,4 +4,5 @@ export { default as Reachability } from './Reachability';
 export * from './DateUtils';
 export * from './StringUtils';
 export * from './Constants';
+export * from './BackgroundProcessManager';
 //# sourceMappingURL=index.js.map

package/lib-esm/Util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Util/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACzD,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Util/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACzD,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,4BAA4B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "4.7.6",
+	"version": "4.7.7-ds-allow-applicable-data.6+d82091b85",
 	"description": "Core category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -108,5 +108,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "97edbbe008b5ff54790827a2f4f35ac2574a2529"
+	"gitHead": "d82091b85c02867800d3e012977604b8851328cc"
 }

package/src/Credentials.ts

@@ -187,7 +187,7 @@ export class CredentialsClass {
 		const MAX_DELAY_MS = 10 * 1000;
 		// refreshHandler will retry network errors, otherwise it will
 		// return NonRetryableError to break out of jitteredExponentialRetry
-		return jitteredExponentialRetry(refreshHandler, [], MAX_DELAY_MS)
+		return jitteredExponentialRetry<any>(refreshHandler, [], MAX_DELAY_MS)
 			.then(data => {
 				logger.debug('refresh federated token sucessfully', data);
 				return this._setCredentialsFromFederation({
@@ -256,7 +256,7 @@ export class CredentialsClass {
 			);
 		}
 
-		const identityId = this._identityId = await this._getGuestIdentityId();
+		const identityId = (this._identityId = await this._getGuestIdentityId());
 
 		const cognitoClient = new CognitoIdentityClient({
 			region,
@@ -446,19 +446,14 @@ export class CredentialsClass {
 			}
 
 			const {
-				Credentials: {
-					AccessKeyId,
-					Expiration,
-					SecretKey,
-					SessionToken,
-				},
+				Credentials: { AccessKeyId, Expiration, SecretKey, SessionToken },
 				// single source of truth for the primary identity associated with the logins
 				// only if a guest identity is used for a first-time user, that guest identity will become its primary identity
 				IdentityId: primaryIdentityId,
 			} = await cognitoClient.send(
 				new GetCredentialsForIdentityCommand({
-				  IdentityId: guestIdentityId || generatedOrRetrievedIdentityId,
-				  Logins: logins,
+					IdentityId: guestIdentityId || generatedOrRetrievedIdentityId,
+					Logins: logins,
 				})
 			);
 
@@ -466,9 +461,13 @@ export class CredentialsClass {
 			if (guestIdentityId) {
 				// if guestIdentity is found and used by GetCredentialsForIdentity
 				// it will be linked to the logins provided, and disqualified as an unauth identity
-				logger.debug(`The guest identity ${guestIdentityId} has been successfully linked to the logins`);
+				logger.debug(
+					`The guest identity ${guestIdentityId} has been successfully linked to the logins`
+				);
 				if (guestIdentityId === primaryIdentityId) {
-					logger.debug(`The guest identity ${guestIdentityId} has become the primary identity`);
+					logger.debug(
+						`The guest identity ${guestIdentityId} has become the primary identity`
+					);
 				}
 				// remove it from local storage to avoid being used as a guest Identity by _setCredentialsForGuest
 				await this._removeGuestIdentityId();
@@ -481,7 +480,7 @@ export class CredentialsClass {
 				sessionToken: SessionToken,
 				expiration: Expiration,
 				identityId: primaryIdentityId,
-			  };
+			};
 		};
 
 		const credentials = credentialsProvider().catch(async err => {
@@ -587,7 +586,7 @@ export class CredentialsClass {
 			await this._storageSync;
 			this._storage.setItem(
 				this._getCognitoIdentityIdStorageKey(identityPoolId),
-				identityId,
+				identityId
 			);
 		} catch (e) {
 			logger.debug('Failed to cache guest identityId', e);