@aws-amplify/core 6.0.1-api-v6-models.9351bcf.0 → 6.0.1-api-v6-models.891fe0d.0

package/lib-esm/Cache/StorageCacheCommon.js

@@ -1,87 +1,31 @@
 // 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 __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.");
-};
 import { ConsoleLogger as Logger } from '../Logger';
 import { currentSizeKey, defaultConfig } from './constants';
 import { getCurrentSizeKey, getCurrentTime, getByteLength } from './utils';
 import { assert, CacheErrorCode } from './utils/errorHelpers';
-var logger = new Logger('StorageCache');
+const logger = new Logger('StorageCache');
 /**
  * Initialization of the cache
  *
  */
-var StorageCacheCommon = /** @class */ (function () {
+export class StorageCacheCommon {
     /**
      * Initialize the cache
      *
      * @param config - Custom configuration for this instance.
      */
-    function StorageCacheCommon(_a) {
-        var config = _a.config, keyValueStorage = _a.keyValueStorage;
-        this.config = __assign(__assign({}, defaultConfig), config);
+    constructor({ config, keyValueStorage, }) {
+        this.config = {
+            ...defaultConfig,
+            ...config,
+        };
         this.keyValueStorage = keyValueStorage;
         this.sanitizeConfig();
     }
-    StorageCacheCommon.prototype.getModuleName = function () {
+    getModuleName() {
         return 'Cache';
-    };
+    }
     /**
      * Set custom configuration for the cache instance.
      *
@@ -89,39 +33,31 @@ var StorageCacheCommon = /** @class */ (function () {
      *
      * @return - the current configuration
      */
-    StorageCacheCommon.prototype.configure = function (config) {
+    configure(config) {
         if (config) {
             if (config.keyPrefix) {
                 logger.warn('keyPrefix can not be re-configured on an existing Cache instance.');
             }
-            this.config = __assign(__assign({}, this.config), config);
+            this.config = {
+                ...this.config,
+                ...config,
+            };
         }
         this.sanitizeConfig();
         return this.config;
-    };
+    }
     /**
      * return the current size of the cache
      * @return {Promise}
      */
-    StorageCacheCommon.prototype.getCurrentCacheSize = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var size;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getStorage().getItem(getCurrentSizeKey(this.config.keyPrefix))];
-                    case 1:
-                        size = _a.sent();
-                        if (!!size) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.getStorage().setItem(getCurrentSizeKey(this.config.keyPrefix), '0')];
-                    case 2:
-                        _a.sent();
-                        size = '0';
-                        _a.label = 3;
-                    case 3: return [2 /*return*/, Number(size)];
-                }
-            });
-        });
-    };
+    async getCurrentCacheSize() {
+        let size = await this.getStorage().getItem(getCurrentSizeKey(this.config.keyPrefix));
+        if (!size) {
+            await this.getStorage().setItem(getCurrentSizeKey(this.config.keyPrefix), '0');
+            size = '0';
+        }
+        return Number(size);
+    }
     /**
      * Set item into cache. You can put number, string, boolean or object.
      * The cache will first check whether has the same key.
@@ -140,79 +76,56 @@ var StorageCacheCommon = /** @class */ (function () {
      *
      * @return {Promise}
      */
-    StorageCacheCommon.prototype.setItem = function (key, value, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var cacheItemOptions, prefixedKey, item, val, validKeys, sizeToPop, e_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        logger.debug("Set item: key is ".concat(key, ", value is ").concat(value, " with options: ").concat(options));
-                        if (!key || key === currentSizeKey) {
-                            logger.warn("Invalid key: should not be empty or reserved key: '".concat(currentSizeKey, "'"));
-                            return [2 /*return*/];
-                        }
-                        if (typeof value === 'undefined') {
-                            logger.warn("The value of item should not be undefined!");
-                            return [2 /*return*/];
-                        }
-                        cacheItemOptions = {
-                            priority: (options === null || options === void 0 ? void 0 : options.priority) !== undefined
-                                ? options.priority
-                                : this.config.defaultPriority,
-                            expires: (options === null || options === void 0 ? void 0 : options.expires) !== undefined
-                                ? options.expires
-                                : this.config.defaultTTL + getCurrentTime(),
-                        };
-                        if (cacheItemOptions.priority < 1 || cacheItemOptions.priority > 5) {
-                            logger.warn("Invalid parameter: priority due to out or range. It should be within 1 and 5.");
-                            return [2 /*return*/];
-                        }
-                        prefixedKey = "".concat(this.config.keyPrefix).concat(key);
-                        item = this.fillCacheItem(prefixedKey, value, cacheItemOptions);
-                        // check whether this item is too big;
-                        if (item.byteSize > this.config.itemMaxSize) {
-                            logger.warn("Item with key: ".concat(key, " you are trying to put into is too big!"));
-                            return [2 /*return*/];
-                        }
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 11, , 12]);
-                        return [4 /*yield*/, this.getStorage().getItem(prefixedKey)];
-                    case 2:
-                        val = _a.sent();
-                        if (!val) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.removeCacheItem(prefixedKey, JSON.parse(val).byteSize)];
-                    case 3:
-                        _a.sent();
-                        _a.label = 4;
-                    case 4: return [4 /*yield*/, this.isCacheFull(item.byteSize)];
-                    case 5:
-                        if (!_a.sent()) return [3 /*break*/, 10];
-                        return [4 /*yield*/, this.clearInvalidAndGetRemainingKeys()];
-                    case 6:
-                        validKeys = _a.sent();
-                        return [4 /*yield*/, this.isCacheFull(item.byteSize)];
-                    case 7:
-                        if (!_a.sent()) return [3 /*break*/, 10];
-                        return [4 /*yield*/, this.sizeToPop(item.byteSize)];
-                    case 8:
-                        sizeToPop = _a.sent();
-                        return [4 /*yield*/, this.popOutItems(validKeys, sizeToPop)];
-                    case 9:
-                        _a.sent();
-                        _a.label = 10;
-                    case 10: 
-                    // put item in the cache
-                    return [2 /*return*/, this.setCacheItem(prefixedKey, item)];
-                    case 11:
-                        e_1 = _a.sent();
-                        logger.warn("setItem failed! ".concat(e_1));
-                        return [3 /*break*/, 12];
-                    case 12: return [2 /*return*/];
+    async setItem(key, value, options) {
+        logger.debug(`Set item: key is ${key}, value is ${value} with options: ${options}`);
+        if (!key || key === currentSizeKey) {
+            logger.warn(`Invalid key: should not be empty or reserved key: '${currentSizeKey}'`);
+            return;
+        }
+        if (typeof value === 'undefined') {
+            logger.warn(`The value of item should not be undefined!`);
+            return;
+        }
+        const cacheItemOptions = {
+            priority: options?.priority !== undefined
+                ? options.priority
+                : this.config.defaultPriority,
+            expires: options?.expires !== undefined
+                ? options.expires
+                : this.config.defaultTTL + getCurrentTime(),
+        };
+        if (cacheItemOptions.priority < 1 || cacheItemOptions.priority > 5) {
+            logger.warn(`Invalid parameter: priority due to out or range. It should be within 1 and 5.`);
+            return;
+        }
+        const prefixedKey = `${this.config.keyPrefix}${key}`;
+        const item = this.fillCacheItem(prefixedKey, value, cacheItemOptions);
+        // check whether this item is too big;
+        if (item.byteSize > this.config.itemMaxSize) {
+            logger.warn(`Item with key: ${key} you are trying to put into is too big!`);
+            return;
+        }
+        try {
+            // first look into the storage, if it exists, delete it.
+            const val = await this.getStorage().getItem(prefixedKey);
+            if (val) {
+                await this.removeCacheItem(prefixedKey, JSON.parse(val).byteSize);
+            }
+            // check whether the cache is full
+            if (await this.isCacheFull(item.byteSize)) {
+                const validKeys = await this.clearInvalidAndGetRemainingKeys();
+                if (await this.isCacheFull(item.byteSize)) {
+                    const sizeToPop = await this.sizeToPop(item.byteSize);
+                    await this.popOutItems(validKeys, sizeToPop);
                 }
-            });
-        });
-    };
+            }
+            // put item in the cache
+            return this.setCacheItem(prefixedKey, item);
+        }
+        catch (e) {
+            logger.warn(`setItem failed! ${e}`);
+        }
+    }
     /**
      * Get item from cache. It will return null if item doesn’t exist or it has been expired.
      * If you specified callback function in the options,
@@ -228,57 +141,41 @@ var StorageCacheCommon = /** @class */ (function () {
      *
      * @return {Promise} - return a promise resolves to be the value of the item
      */
-    StorageCacheCommon.prototype.getItem = function (key, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var cached, prefixedKey, item, val, e_2;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        logger.debug("Get item: key is ".concat(key, " with options ").concat(options));
-                        if (!key || key === currentSizeKey) {
-                            logger.warn("Invalid key: should not be empty or reserved key: '".concat(currentSizeKey, "'"));
-                            return [2 /*return*/, null];
-                        }
-                        prefixedKey = "".concat(this.config.keyPrefix).concat(key);
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 11, , 12]);
-                        return [4 /*yield*/, this.getStorage().getItem(prefixedKey)];
-                    case 2:
-                        cached = _a.sent();
-                        if (!(cached != null)) return [3 /*break*/, 7];
-                        return [4 /*yield*/, this.isExpired(prefixedKey)];
-                    case 3:
-                        if (!_a.sent()) return [3 /*break*/, 5];
-                        // if expired, remove that item and return null
-                        return [4 /*yield*/, this.removeCacheItem(prefixedKey, JSON.parse(cached).byteSize)];
-                    case 4:
-                        // if expired, remove that item and return null
-                        _a.sent();
-                        return [3 /*break*/, 7];
-                    case 5: return [4 /*yield*/, this.updateVisitedTime(JSON.parse(cached), prefixedKey)];
-                    case 6:
-                        item = _a.sent();
-                        return [2 /*return*/, item.data];
-                    case 7:
-                        if (!(options === null || options === void 0 ? void 0 : options.callback)) return [3 /*break*/, 10];
-                        val = options.callback();
-                        if (!(val !== null)) return [3 /*break*/, 9];
-                        return [4 /*yield*/, this.setItem(key, val, options)];
-                    case 8:
-                        _a.sent();
-                        _a.label = 9;
-                    case 9: return [2 /*return*/, val];
-                    case 10: return [2 /*return*/, null];
-                    case 11:
-                        e_2 = _a.sent();
-                        logger.warn("getItem failed! ".concat(e_2));
-                        return [2 /*return*/, null];
-                    case 12: return [2 /*return*/];
+    async getItem(key, options) {
+        logger.debug(`Get item: key is ${key} with options ${options}`);
+        let cached;
+        if (!key || key === currentSizeKey) {
+            logger.warn(`Invalid key: should not be empty or reserved key: '${currentSizeKey}'`);
+            return null;
+        }
+        const prefixedKey = `${this.config.keyPrefix}${key}`;
+        try {
+            cached = await this.getStorage().getItem(prefixedKey);
+            if (cached != null) {
+                if (await this.isExpired(prefixedKey)) {
+                    // if expired, remove that item and return null
+                    await this.removeCacheItem(prefixedKey, JSON.parse(cached).byteSize);
                 }
-            });
-        });
-    };
+                else {
+                    // if not expired, update its visitedTime and return the value
+                    const item = await this.updateVisitedTime(JSON.parse(cached), prefixedKey);
+                    return item.data;
+                }
+            }
+            if (options?.callback) {
+                const val = options.callback();
+                if (val !== null) {
+                    await this.setItem(key, val, options);
+                }
+                return val;
+            }
+            return null;
+        }
+        catch (e) {
+            logger.warn(`getItem failed! ${e}`);
+            return null;
+        }
+    }
     /**
      * remove item from the cache
      * The cache will abort output a warning:
@@ -286,66 +183,41 @@ var StorageCacheCommon = /** @class */ (function () {
      * @param {String} key - the key of the item
      * @return {Promise}
      */
-    StorageCacheCommon.prototype.removeItem = function (key) {
-        return __awaiter(this, void 0, void 0, function () {
-            var prefixedKey, val, e_3;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        logger.debug("Remove item: key is ".concat(key));
-                        if (!key || key === currentSizeKey) {
-                            logger.warn("Invalid key: should not be empty or reserved key: '".concat(currentSizeKey, "'"));
-                            return [2 /*return*/];
-                        }
-                        prefixedKey = "".concat(this.config.keyPrefix).concat(key);
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 5, , 6]);
-                        return [4 /*yield*/, this.getStorage().getItem(prefixedKey)];
-                    case 2:
-                        val = _a.sent();
-                        if (!val) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.removeCacheItem(prefixedKey, JSON.parse(val).byteSize)];
-                    case 3:
-                        _a.sent();
-                        _a.label = 4;
-                    case 4: return [3 /*break*/, 6];
-                    case 5:
-                        e_3 = _a.sent();
-                        logger.warn("removeItem failed! ".concat(e_3));
-                        return [3 /*break*/, 6];
-                    case 6: return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async removeItem(key) {
+        logger.debug(`Remove item: key is ${key}`);
+        if (!key || key === currentSizeKey) {
+            logger.warn(`Invalid key: should not be empty or reserved key: '${currentSizeKey}'`);
+            return;
+        }
+        const prefixedKey = `${this.config.keyPrefix}${key}`;
+        try {
+            const val = await this.getStorage().getItem(prefixedKey);
+            if (val) {
+                await this.removeCacheItem(prefixedKey, JSON.parse(val).byteSize);
+            }
+        }
+        catch (e) {
+            logger.warn(`removeItem failed! ${e}`);
+        }
+    }
     /**
      * Return all the keys owned by this cache.
      * Will return an empty array if error occurred.
      *
      * @return {Promise}
      */
-    StorageCacheCommon.prototype.getAllKeys = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var e_4;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.getAllCacheKeys()];
-                    case 1: return [2 /*return*/, _a.sent()];
-                    case 2:
-                        e_4 = _a.sent();
-                        logger.warn("getAllkeys failed! ".concat(e_4));
-                        return [2 /*return*/, []];
-                    case 3: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    StorageCacheCommon.prototype.getStorage = function () {
+    async getAllKeys() {
+        try {
+            return await this.getAllCacheKeys();
+        }
+        catch (e) {
+            logger.warn(`getAllkeys failed! ${e}`);
+            return [];
+        }
+    }
+    getStorage() {
         return this.keyValueStorage;
-    };
+    }
     /**
      * check whether item is expired
      *
@@ -353,66 +225,37 @@ var StorageCacheCommon = /** @class */ (function () {
      *
      * @return true if the item is expired.
      */
-    StorageCacheCommon.prototype.isExpired = function (key) {
-        return __awaiter(this, void 0, void 0, function () {
-            var text, item;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getStorage().getItem(key)];
-                    case 1:
-                        text = _a.sent();
-                        assert(text !== null, CacheErrorCode.NoCacheItem, "Key: ".concat(key));
-                        item = JSON.parse(text);
-                        if (getCurrentTime() >= item.expires) {
-                            return [2 /*return*/, true];
-                        }
-                        return [2 /*return*/, false];
-                }
-            });
-        });
-    };
+    async isExpired(key) {
+        const text = await this.getStorage().getItem(key);
+        assert(text !== null, CacheErrorCode.NoCacheItem, `Key: ${key}`);
+        const item = JSON.parse(text);
+        if (getCurrentTime() >= item.expires) {
+            return true;
+        }
+        return false;
+    }
     /**
      * delete item from cache
      *
      * @param prefixedKey - the key of the item
      * @param size - optional, the byte size of the item
      */
-    StorageCacheCommon.prototype.removeCacheItem = function (prefixedKey, size) {
-        return __awaiter(this, void 0, void 0, function () {
-            var item, itemSize, removeItemError_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getStorage().getItem(prefixedKey)];
-                    case 1:
-                        item = _a.sent();
-                        assert(item !== null, CacheErrorCode.NoCacheItem, "Key: ".concat(prefixedKey));
-                        itemSize = size !== null && size !== void 0 ? size : JSON.parse(item).byteSize;
-                        // first try to update the current size of the cache
-                        return [4 /*yield*/, this.decreaseCurrentSizeInBytes(itemSize)];
-                    case 2:
-                        // first try to update the current size of the cache
-                        _a.sent();
-                        _a.label = 3;
-                    case 3:
-                        _a.trys.push([3, 5, , 7]);
-                        return [4 /*yield*/, this.getStorage().removeItem(prefixedKey)];
-                    case 4:
-                        _a.sent();
-                        return [3 /*break*/, 7];
-                    case 5:
-                        removeItemError_1 = _a.sent();
-                        // if some error happened, we need to rollback the current size
-                        return [4 /*yield*/, this.increaseCurrentSizeInBytes(itemSize)];
-                    case 6:
-                        // if some error happened, we need to rollback the current size
-                        _a.sent();
-                        logger.error("Failed to remove item: ".concat(removeItemError_1));
-                        return [3 /*break*/, 7];
-                    case 7: return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async removeCacheItem(prefixedKey, size) {
+        const item = await this.getStorage().getItem(prefixedKey);
+        assert(item !== null, CacheErrorCode.NoCacheItem, `Key: ${prefixedKey}`);
+        const itemSize = size ?? JSON.parse(item).byteSize;
+        // first try to update the current size of the cache
+        await this.decreaseCurrentSizeInBytes(itemSize);
+        // try to remove the item from cache
+        try {
+            await this.getStorage().removeItem(prefixedKey);
+        }
+        catch (removeItemError) {
+            // if some error happened, we need to rollback the current size
+            await this.increaseCurrentSizeInBytes(itemSize);
+            logger.error(`Failed to remove item: ${removeItemError}`);
+        }
+    }
     /**
      * produce a JSON object with meta-data and data value
      * @param value - the value of the item
@@ -420,15 +263,14 @@ var StorageCacheCommon = /** @class */ (function () {
      *
      * @return - the item which has the meta-data and the value
      */
-    StorageCacheCommon.prototype.fillCacheItem = function (key, value, options) {
-        var _a, _b;
-        var item = {
-            key: key,
+    fillCacheItem(key, value, options) {
+        const item = {
+            key,
             data: value,
             timestamp: getCurrentTime(),
             visitedTime: getCurrentTime(),
-            priority: (_a = options.priority) !== null && _a !== void 0 ? _a : 0,
-            expires: (_b = options.expires) !== null && _b !== void 0 ? _b : 0,
+            priority: options.priority ?? 0,
+            expires: options.expires ?? 0,
             type: typeof value,
             byteSize: 0,
         };
@@ -437,8 +279,8 @@ var StorageCacheCommon = /** @class */ (function () {
         // re-calculate using cache item with updated byteSize property
         item.byteSize = getByteLength(JSON.stringify(item));
         return item;
-    };
-    StorageCacheCommon.prototype.sanitizeConfig = function () {
+    }
+    sanitizeConfig() {
         if (this.config.itemMaxSize > this.config.capacityInBytes) {
             logger.error('Invalid parameter: itemMaxSize. It should be smaller than capacityInBytes. Setting back to default.');
             this.config.itemMaxSize = defaultConfig.itemMaxSize;
@@ -453,54 +295,30 @@ var StorageCacheCommon = /** @class */ (function () {
             this.config.warningThreshold = defaultConfig.warningThreshold;
         }
         // Set 5MB limit
-        var cacheLimit = 5 * 1024 * 1024;
+        const cacheLimit = 5 * 1024 * 1024;
         if (this.config.capacityInBytes > cacheLimit) {
             logger.error('Cache Capacity should be less than 5MB. Setting back to default. Setting back to default.');
             this.config.capacityInBytes = defaultConfig.capacityInBytes;
         }
-    };
+    }
     /**
      * increase current size of the cache
      *
      * @param amount - the amount of the cache szie which need to be increased
      */
-    StorageCacheCommon.prototype.increaseCurrentSizeInBytes = function (amount) {
-        return __awaiter(this, void 0, void 0, function () {
-            var size;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getCurrentCacheSize()];
-                    case 1:
-                        size = _a.sent();
-                        return [4 /*yield*/, this.getStorage().setItem(getCurrentSizeKey(this.config.keyPrefix), (size + amount).toString())];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async increaseCurrentSizeInBytes(amount) {
+        const size = await this.getCurrentCacheSize();
+        await this.getStorage().setItem(getCurrentSizeKey(this.config.keyPrefix), (size + amount).toString());
+    }
     /**
      * decrease current size of the cache
      *
      * @param amount - the amount of the cache size which needs to be decreased
      */
-    StorageCacheCommon.prototype.decreaseCurrentSizeInBytes = function (amount) {
-        return __awaiter(this, void 0, void 0, function () {
-            var size;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getCurrentCacheSize()];
-                    case 1:
-                        size = _a.sent();
-                        return [4 /*yield*/, this.getStorage().setItem(getCurrentSizeKey(this.config.keyPrefix), (size - amount).toString())];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async decreaseCurrentSizeInBytes(amount) {
+        const size = await this.getCurrentCacheSize();
+        await this.getStorage().setItem(getCurrentSizeKey(this.config.keyPrefix), (size - amount).toString());
+    }
     /**
      * update the visited time if item has been visited
      *
@@ -509,20 +327,11 @@ var StorageCacheCommon = /** @class */ (function () {
      *
      * @return the updated item
      */
-    StorageCacheCommon.prototype.updateVisitedTime = function (item, prefixedKey) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        item.visitedTime = getCurrentTime();
-                        return [4 /*yield*/, this.getStorage().setItem(prefixedKey, JSON.stringify(item))];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/, item];
-                }
-            });
-        });
-    };
+    async updateVisitedTime(item, prefixedKey) {
+        item.visitedTime = getCurrentTime();
+        await this.getStorage().setItem(prefixedKey, JSON.stringify(item));
+        return item;
+    }
     /**
      * put item into cache
      *
@@ -530,38 +339,19 @@ var StorageCacheCommon = /** @class */ (function () {
      * @param itemData - the value of the item
      * @param itemSizeInBytes - the byte size of the item
      */
-    StorageCacheCommon.prototype.setCacheItem = function (prefixedKey, item) {
-        return __awaiter(this, void 0, void 0, function () {
-            var setItemErr_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: 
-                    // first try to update the current size of the cache.
-                    return [4 /*yield*/, this.increaseCurrentSizeInBytes(item.byteSize)];
-                    case 1:
-                        // first try to update the current size of the cache.
-                        _a.sent();
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 6]);
-                        return [4 /*yield*/, this.getStorage().setItem(prefixedKey, JSON.stringify(item))];
-                    case 3:
-                        _a.sent();
-                        return [3 /*break*/, 6];
-                    case 4:
-                        setItemErr_1 = _a.sent();
-                        // if some error happened, we need to rollback the current size
-                        return [4 /*yield*/, this.decreaseCurrentSizeInBytes(item.byteSize)];
-                    case 5:
-                        // if some error happened, we need to rollback the current size
-                        _a.sent();
-                        logger.error("Failed to set item ".concat(setItemErr_1));
-                        return [3 /*break*/, 6];
-                    case 6: return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async setCacheItem(prefixedKey, item) {
+        // first try to update the current size of the cache.
+        await this.increaseCurrentSizeInBytes(item.byteSize);
+        // try to add the item into cache
+        try {
+            await this.getStorage().setItem(prefixedKey, JSON.stringify(item));
+        }
+        catch (setItemErr) {
+            // if some error happened, we need to rollback the current size
+            await this.decreaseCurrentSizeInBytes(item.byteSize);
+            logger.error(`Failed to set item ${setItemErr}`);
+        }
+    }
     /**
      * total space needed when poping out items
      *
@@ -569,23 +359,14 @@ var StorageCacheCommon = /** @class */ (function () {
      *
      * @return total space needed
      */
-    StorageCacheCommon.prototype.sizeToPop = function (itemSize) {
-        return __awaiter(this, void 0, void 0, function () {
-            var cur, spaceItemNeed, cacheThresholdSpace;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getCurrentCacheSize()];
-                    case 1:
-                        cur = _a.sent();
-                        spaceItemNeed = cur + itemSize - this.config.capacityInBytes;
-                        cacheThresholdSpace = (1 - this.config.warningThreshold) * this.config.capacityInBytes;
-                        return [2 /*return*/, spaceItemNeed > cacheThresholdSpace
-                                ? spaceItemNeed
-                                : cacheThresholdSpace];
-                }
-            });
-        });
-    };
+    async sizeToPop(itemSize) {
+        const cur = await this.getCurrentCacheSize();
+        const spaceItemNeed = cur + itemSize - this.config.capacityInBytes;
+        const cacheThresholdSpace = (1 - this.config.warningThreshold) * this.config.capacityInBytes;
+        return spaceItemNeed > cacheThresholdSpace
+            ? spaceItemNeed
+            : cacheThresholdSpace;
+    }
     /**
      * see whether cache is full
      *
@@ -593,19 +374,10 @@ var StorageCacheCommon = /** @class */ (function () {
      *
      * @return true if cache is full
      */
-    StorageCacheCommon.prototype.isCacheFull = function (itemSize) {
-        return __awaiter(this, void 0, void 0, function () {
-            var cur;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getCurrentCacheSize()];
-                    case 1:
-                        cur = _a.sent();
-                        return [2 /*return*/, itemSize + cur > this.config.capacityInBytes];
-                }
-            });
-        });
-    };
+    async isCacheFull(itemSize) {
+        const cur = await this.getCurrentCacheSize();
+        return itemSize + cur > this.config.capacityInBytes;
+    }
     /**
      * get all the items we have, sort them by their priority,
      * if priority is same, sort them by their last visited time
@@ -614,69 +386,42 @@ var StorageCacheCommon = /** @class */ (function () {
      * @param keys - all the keys in this cache
      * @param sizeToPop - the total size of the items which needed to be poped out
      */
-    StorageCacheCommon.prototype.popOutItems = function (keys, sizeToPop) {
-        return __awaiter(this, void 0, void 0, function () {
-            var items, remainedSize, i, val, item, i;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        items = [];
-                        remainedSize = sizeToPop;
-                        i = 0;
-                        _a.label = 1;
-                    case 1:
-                        if (!(i < keys.length)) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.getStorage().getItem(keys[i])];
-                    case 2:
-                        val = _a.sent();
-                        if (val != null) {
-                            item = JSON.parse(val);
-                            items.push(item);
-                        }
-                        _a.label = 3;
-                    case 3:
-                        i += 1;
-                        return [3 /*break*/, 1];
-                    case 4:
-                        // first compare priority
-                        // then compare visited time
-                        items.sort(function (a, b) {
-                            if (a.priority > b.priority) {
-                                return -1;
-                            }
-                            else if (a.priority < b.priority) {
-                                return 1;
-                            }
-                            else {
-                                if (a.visitedTime < b.visitedTime) {
-                                    return -1;
-                                }
-                                else
-                                    return 1;
-                            }
-                        });
-                        i = 0;
-                        _a.label = 5;
-                    case 5:
-                        if (!(i < items.length)) return [3 /*break*/, 8];
-                        // pop out items until we have enough room for new item
-                        return [4 /*yield*/, this.removeCacheItem(items[i].key, items[i].byteSize)];
-                    case 6:
-                        // pop out items until we have enough room for new item
-                        _a.sent();
-                        remainedSize -= items[i].byteSize;
-                        if (remainedSize <= 0) {
-                            return [2 /*return*/];
-                        }
-                        _a.label = 7;
-                    case 7:
-                        i += 1;
-                        return [3 /*break*/, 5];
-                    case 8: return [2 /*return*/];
+    async popOutItems(keys, sizeToPop) {
+        const items = [];
+        let remainedSize = sizeToPop;
+        for (let i = 0; i < keys.length; i += 1) {
+            const val = await this.getStorage().getItem(keys[i]);
+            if (val != null) {
+                const item = JSON.parse(val);
+                items.push(item);
+            }
+        }
+        // first compare priority
+        // then compare visited time
+        items.sort((a, b) => {
+            if (a.priority > b.priority) {
+                return -1;
+            }
+            else if (a.priority < b.priority) {
+                return 1;
+            }
+            else {
+                if (a.visitedTime < b.visitedTime) {
+                    return -1;
                 }
-            });
+                else
+                    return 1;
+            }
         });
-    };
+        for (let i = 0; i < items.length; i += 1) {
+            // pop out items until we have enough room for new item
+            await this.removeCacheItem(items[i].key, items[i].byteSize);
+            remainedSize -= items[i].byteSize;
+            if (remainedSize <= 0) {
+                return;
+            }
+        }
+    }
     /**
      * Scan the storage and combine the following operations for efficiency
      *   1. Clear out all expired keys owned by this cache, not including the size key.
@@ -684,111 +429,36 @@ var StorageCacheCommon = /** @class */ (function () {
      *
      * @return The remaining valid keys
      */
-    StorageCacheCommon.prototype.clearInvalidAndGetRemainingKeys = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var remainingKeys, keys, keys_1, keys_1_1, key, e_5_1;
-            var e_5, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        remainingKeys = [];
-                        return [4 /*yield*/, this.getAllCacheKeys({
-                                omitSizeKey: true,
-                            })];
-                    case 1:
-                        keys = _b.sent();
-                        _b.label = 2;
-                    case 2:
-                        _b.trys.push([2, 9, 10, 11]);
-                        keys_1 = __values(keys), keys_1_1 = keys_1.next();
-                        _b.label = 3;
-                    case 3:
-                        if (!!keys_1_1.done) return [3 /*break*/, 8];
-                        key = keys_1_1.value;
-                        return [4 /*yield*/, this.isExpired(key)];
-                    case 4:
-                        if (!_b.sent()) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.removeCacheItem(key)];
-                    case 5:
-                        _b.sent();
-                        return [3 /*break*/, 7];
-                    case 6:
-                        remainingKeys.push(key);
-                        _b.label = 7;
-                    case 7:
-                        keys_1_1 = keys_1.next();
-                        return [3 /*break*/, 3];
-                    case 8: return [3 /*break*/, 11];
-                    case 9:
-                        e_5_1 = _b.sent();
-                        e_5 = { error: e_5_1 };
-                        return [3 /*break*/, 11];
-                    case 10:
-                        try {
-                            if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
-                        }
-                        finally { if (e_5) throw e_5.error; }
-                        return [7 /*endfinally*/];
-                    case 11: return [2 /*return*/, remainingKeys];
-                }
-            });
+    async clearInvalidAndGetRemainingKeys() {
+        const remainingKeys = [];
+        const keys = await this.getAllCacheKeys({
+            omitSizeKey: true,
         });
-    };
+        for (const key of keys) {
+            if (await this.isExpired(key)) {
+                await this.removeCacheItem(key);
+            }
+            else {
+                remainingKeys.push(key);
+            }
+        }
+        return remainingKeys;
+    }
     /**
      * clear the entire cache
      * The cache will abort and output a warning if error occurs
      * @return {Promise}
      */
-    StorageCacheCommon.prototype.clear = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var keys, keys_2, keys_2_1, key, e_6_1, e_7;
-            var e_6, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        logger.debug("Clear Cache");
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 11, , 12]);
-                        return [4 /*yield*/, this.getAllKeys()];
-                    case 2:
-                        keys = _b.sent();
-                        _b.label = 3;
-                    case 3:
-                        _b.trys.push([3, 8, 9, 10]);
-                        keys_2 = __values(keys), keys_2_1 = keys_2.next();
-                        _b.label = 4;
-                    case 4:
-                        if (!!keys_2_1.done) return [3 /*break*/, 7];
-                        key = keys_2_1.value;
-                        return [4 /*yield*/, this.getStorage().removeItem(key)];
-                    case 5:
-                        _b.sent();
-                        _b.label = 6;
-                    case 6:
-                        keys_2_1 = keys_2.next();
-                        return [3 /*break*/, 4];
-                    case 7: return [3 /*break*/, 10];
-                    case 8:
-                        e_6_1 = _b.sent();
-                        e_6 = { error: e_6_1 };
-                        return [3 /*break*/, 10];
-                    case 9:
-                        try {
-                            if (keys_2_1 && !keys_2_1.done && (_a = keys_2.return)) _a.call(keys_2);
-                        }
-                        finally { if (e_6) throw e_6.error; }
-                        return [7 /*endfinally*/];
-                    case 10: return [3 /*break*/, 12];
-                    case 11:
-                        e_7 = _b.sent();
-                        logger.warn("clear failed! ".concat(e_7));
-                        return [3 /*break*/, 12];
-                    case 12: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    return StorageCacheCommon;
-}());
-export { StorageCacheCommon };
+    async clear() {
+        logger.debug(`Clear Cache`);
+        try {
+            const keys = await this.getAllKeys();
+            for (const key of keys) {
+                await this.getStorage().removeItem(key);
+            }
+        }
+        catch (e) {
+            logger.warn(`clear failed! ${e}`);
+        }
+    }
+}