@autofleet/matmon 2.0.6 → 2.0.8

package/lib/cache.js

@@ -18,15 +18,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -49,33 +40,40 @@ const getMutexByCacheKey = (key) => {
     }
     return MUTEX_MAP[key];
 };
+const deleteMutexByCacheKey = (key) => {
+    if (MUTEX_MAP[key]) {
+        delete MUTEX_MAP[key];
+    }
+};
 exports.getNewLRU = (lifeTimeInSec, size) => new lru_cache_1.default(getOptions({
     lifeTimeInSec,
     size,
 }));
-exports.getWithCacheSupport = ({ cacheKey, cacheGet, cacheSet, fetching, skipCache, }) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getWithCacheSupport = async ({ cacheKey, cacheGet, cacheSet, fetching, skipCache, }) => {
     if (skipCache || process.env.NODE_ENV === 'test') {
-        const res = yield fetching();
-        yield cacheSet(res);
+        const res = await fetching();
+        await cacheSet(res);
         return res;
     }
     let valueToReturn = null;
     try {
-        yield locking.wrapWithMutex(getMutexByCacheKey(cacheKey), () => __awaiter(void 0, void 0, void 0, function* () {
-            valueToReturn = yield cacheGet();
+        await locking.wrapWithMutex(getMutexByCacheKey(cacheKey), async () => {
+            valueToReturn = await cacheGet();
             if (!valueToReturn) {
-                valueToReturn = yield fetching();
-                yield cacheSet(valueToReturn);
+                valueToReturn = await fetching();
+                await cacheSet(valueToReturn);
             }
             else {
                 // logger.info('get value from cache');
             }
-        }));
+            deleteMutexByCacheKey(cacheKey);
+        });
         // retry without locking if failed
     }
     catch (e) {
-        valueToReturn = yield fetching();
-        yield cacheSet(valueToReturn);
+        valueToReturn = await fetching();
+        await cacheSet(valueToReturn);
+        deleteMutexByCacheKey(cacheKey);
     }
     return valueToReturn;
-});
+};

package/lib/locking.js

@@ -1,26 +1,17 @@
 "use strict";
-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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMutex = exports.wrapWithMutex = void 0;
 const async_mutex_1 = require("async-mutex");
 const CACHE_LOCK_TIMEOUT_MILIS = 3000;
 const LOCK_TIMEOUT_MESSAGE = 'mutex - locking timeout';
 // eslint-disable-next-line import/prefer-default-export
-exports.wrapWithMutex = (mutex, funcToRun) => __awaiter(void 0, void 0, void 0, function* () {
-    const release = yield mutex.acquire();
+exports.wrapWithMutex = async (mutex, funcToRun) => {
+    const release = await mutex.acquire();
     try {
-        yield funcToRun();
+        await funcToRun();
     }
     finally {
         release();
     }
-});
+};
 exports.getMutex = () => async_mutex_1.withTimeout(new async_mutex_1.Mutex(), CACHE_LOCK_TIMEOUT_MILIS, new Error(LOCK_TIMEOUT_MESSAGE));

package/lib/orm-cache/sequelize-adapter.js

@@ -1,13 +1,4 @@
 "use strict";
-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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -87,7 +78,7 @@ class SequelizeAdapter {
         }
     }
     injectGetWithCacheFunction(cache, modelOptions) {
-        const addDependencies = (instance) => __awaiter(this, void 0, void 0, function* () {
+        const addDependencies = async (instance) => {
             const dependencyKeys = getInstanceDependencyKeys(modelOptions, instance);
             const instanceKey = generateInstanceKey(modelOptions.name, instance.id);
             this.debug('Adding dependencies', { instanceKey, dependencyKeys });
@@ -95,16 +86,16 @@ class SequelizeAdapter {
             const addDependenciesMultiAsync = util_1.promisify(addDependenciesMulti.exec).bind(addDependenciesMulti);
             dependencyKeys.reduce((multi, key) => multi.sadd(key, instanceKey), addDependenciesMulti);
             return addDependenciesMultiAsync();
-        });
+        };
         const model = this.getModel(modelOptions.name);
-        model.findByPkCached = (id, scopes, options) => __awaiter(this, void 0, void 0, function* () {
+        model.findByPkCached = async (id, scopes, options) => {
             const cacheKey = generateInstanceKey(modelOptions.name, id);
-            let value = JSON.parse(yield cache.getClient().getAsync(cacheKey));
+            let value = JSON.parse(await cache.getClient().getAsync(cacheKey));
             if (!value) {
                 this.debug('Value not found in cache, looking in db', { id, cacheKey });
-                value = yield model.scope(scopes).findByPk(id, options);
+                value = await model.scope(scopes).findByPk(id, options);
                 this.debug('Value from DB', { value: value || 'not found', cacheKey });
-                yield Promise.all([
+                await Promise.all([
                     cache.getClient().setAsync(cacheKey, JSON.stringify(value)),
                     value && addDependencies(value),
                 ]);
@@ -114,10 +105,10 @@ class SequelizeAdapter {
                 this.debug('Found cached value', { value, id, cacheKey });
             }
             return value;
-        });
+        };
     }
     addInvalidationHooks(cache, modelOptions) {
-        const invalidateModelInstance = (instance) => __awaiter(this, void 0, void 0, function* () {
+        const invalidateModelInstance = async (instance) => {
             const dependencyKeys = getInstanceDependencyKeys(modelOptions, instance);
             const instanceKey = generateInstanceKey(modelOptions.name, instance.id);
             this.debug('Removing dependencies', { instance, instanceKey, dependencyKeys });
@@ -126,14 +117,14 @@ class SequelizeAdapter {
             dependencyKeys.map(key => removeMulti.srem(key, instanceKey));
             removeMulti.del(instanceKey);
             return removeMultiAsync();
-        });
-        const invalidateModelInstanceByAssociation = (association, associationId) => __awaiter(this, void 0, void 0, function* () {
-            const dependentInstancesKeys = yield cache.getClient().smembersAsync(generateDependencyKey(modelOptions.name, association, associationId));
+        };
+        const invalidateModelInstanceByAssociation = async (association, associationId) => {
+            const dependentInstancesKeys = await cache.getClient().smembersAsync(generateDependencyKey(modelOptions.name, association, associationId));
             this.debug('Invalidating dependent instances', { dependentInstancesKeys });
             const removeMulti = cache.getClient().multi();
             const removeMultiAsync = util_1.promisify(removeMulti.exec).bind(removeMulti);
-            const dependenciesToRemove = yield Promise.all(dependentInstancesKeys.map((instanceKey) => __awaiter(this, void 0, void 0, function* () {
-                const instance = JSON.parse(yield cache.getClient().getAsync(instanceKey));
+            const dependenciesToRemove = await Promise.all(dependentInstancesKeys.map(async (instanceKey) => {
+                const instance = JSON.parse(await cache.getClient().getAsync(instanceKey));
                 if (!instance) {
                     return [];
                 }
@@ -141,10 +132,10 @@ class SequelizeAdapter {
                 dependencyKeys.reduce((multi, key) => multi.srem(key, instanceKey), removeMulti);
                 removeMulti.del(instanceKey);
                 return dependencyKeys;
-            })));
+            }));
             this.debug('Removing dependencies', { dependentInstancesKeys, dependenciesToRemove });
             return removeMultiAsync();
-        });
+        };
         const model = this.getModel(modelOptions.name);
         INVALIDATION_HOOKS.map(hook => model.addHook(hook, (instance, options) => handleTransactionHook(instance, options, instance => invalidateModelInstance(instance))));
         BULK_HOOKS.map(hook => model.addHook(hook, options => options.individualHook = true));

package/lib/redis/index.js

@@ -1,13 +1,4 @@
 "use strict";
-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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -32,85 +23,76 @@ if (!SERVICE_NAME) {
 }
 class RedisCache {
     constructor(options) {
-        var _a, _b, _c, _d;
         this.client = redis_1.default.createClient({
             host: options.host || HOST,
             port: options.port || PORT,
         });
-        this.locker = util_1.promisify(redis_lock_1.default(this.client, (_a = options.lockRetries) !== null && _a !== void 0 ? _a : 10));
-        this.lockTimeout = (_b = options.lockTimeout) !== null && _b !== void 0 ? _b : DEFAULT_LOCK_TIMEOUT;
-        this.lockDuration = (_c = options.lockDuration) !== null && _c !== void 0 ? _c : DEFAULT_LOCK_DURATION;
-        this.baseTTL = (_d = options.ttl) !== null && _d !== void 0 ? _d : DEFAULT_BASE_TTL;
+        this.locker = util_1.promisify(redis_lock_1.default(this.client, options.lockRetries ?? 10));
+        this.lockTimeout = options.lockTimeout ?? DEFAULT_LOCK_TIMEOUT;
+        this.lockDuration = options.lockDuration ?? DEFAULT_LOCK_DURATION;
+        this.baseTTL = options.ttl ?? DEFAULT_BASE_TTL;
         this.locks = {};
         this.useLock = !!options.useLock;
     }
-    get(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const keyWithPrefix = KEY_PREFIX + key;
-            let value;
+    async get(key) {
+        const keyWithPrefix = KEY_PREFIX + key;
+        let value;
+        try {
+            // Try to get the value from redis.
+            value = await this.client.getAsync(keyWithPrefix);
+        }
+        catch (err) {
+            throw new errors_1.RedisCacheError('Failed to get a value', err);
+        }
+        if (this.useLock) {
+            let lock;
             try {
-                // Try to get the value from redis.
-                value = yield this.client.getAsync(keyWithPrefix);
+                // Try to lock the key.
+                lock = await this.lock(keyWithPrefix);
             }
             catch (err) {
-                throw new errors_1.RedisCacheError('Failed to get a value', err);
-            }
-            if (this.useLock) {
-                let lock;
-                try {
-                    // Try to lock the key.
-                    lock = yield this.lock(keyWithPrefix);
-                }
-                catch (err) {
-                    throw new errors_1.RedisLockError('Failed to lock key', err, keyWithPrefix);
-                }
-                // If the lock did not fail, add it to a locks dictionary.
-                this.locks[keyWithPrefix] = lock;
+                throw new errors_1.RedisLockError('Failed to lock key', err, keyWithPrefix);
             }
-            return JSON.parse(value);
-        });
+            // If the lock did not fail, add it to a locks dictionary.
+            this.locks[keyWithPrefix] = lock;
+        }
+        return JSON.parse(value);
     }
-    set(key, value) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const keyWithPrefix = KEY_PREFIX + key;
-            const ttl = parseInt(String(this.baseTTL * (Math.random() + 1)), 10);
-            try {
-                yield this.client.setAsync(keyWithPrefix, JSON.stringify(value), 'EX', ttl);
-                if (this.locks[keyWithPrefix]) {
-                    yield this.locks[keyWithPrefix]();
-                    delete this.locks[keyWithPrefix];
-                }
+    async set(key, value) {
+        const keyWithPrefix = KEY_PREFIX + key;
+        const ttl = parseInt(String(this.baseTTL * (Math.random() + 1)), 10);
+        try {
+            await this.client.setAsync(keyWithPrefix, JSON.stringify(value), 'EX', ttl);
+            if (this.locks[keyWithPrefix]) {
+                await this.locks[keyWithPrefix]();
+                delete this.locks[keyWithPrefix];
             }
-            catch (err) {
-                throw new errors_1.RedisCacheError('Failed to set a key-value pair', err);
-            }
-        });
+        }
+        catch (err) {
+            throw new errors_1.RedisCacheError('Failed to set a key-value pair', err);
+        }
     }
-    remove(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const keyWithPrefix = KEY_PREFIX + key;
-            try {
-                if (this.locks[keyWithPrefix]) {
-                    yield this.locks[keyWithPrefix]();
-                    delete this.locks[keyWithPrefix];
-                }
-                yield this.client.delAsync(keyWithPrefix);
+    async remove(key) {
+        const keyWithPrefix = KEY_PREFIX + key;
+        try {
+            if (this.locks[keyWithPrefix]) {
+                await this.locks[keyWithPrefix]();
+                delete this.locks[keyWithPrefix];
             }
-            catch (err) {
-                throw new errors_1.RedisCacheError(`Failed to delete key ${keyWithPrefix}`, err);
-            }
-        });
+            await this.client.delAsync(keyWithPrefix);
+        }
+        catch (err) {
+            throw new errors_1.RedisCacheError(`Failed to delete key ${keyWithPrefix}`, err);
+        }
     }
-    removeMultiple(keys) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const keysWithPrefix = keys.map(key => KEY_PREFIX + key);
-            try {
-                yield this.client.delAsync(keysWithPrefix);
-            }
-            catch (err) {
-                throw new errors_1.RedisCacheError(`Failed to delete multiple keys ${keysWithPrefix.join('|')}`, err);
-            }
-        });
+    async removeMultiple(keys) {
+        const keysWithPrefix = keys.map(key => KEY_PREFIX + key);
+        try {
+            await this.client.delAsync(keysWithPrefix);
+        }
+        catch (err) {
+            throw new errors_1.RedisCacheError(`Failed to delete multiple keys ${keysWithPrefix.join('|')}`, err);
+        }
     }
     getClient() {
         return this.client;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/matmon",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",