@autofleet/matmon 2.1.7 → 2.2.0

package/lib/cache.d.ts

@@ -1,24 +1,16 @@
-import LRU from 'lru-cache';
-interface Options {
-    lifeTimeInSec: number;
-    size?: number;
-}
-export declare const getNewLRU: <K = unknown, V = unknown>(lifeTimeInSec: Options["lifeTimeInSec"], size?: Options["size"]) => LRU<K, V>;
-interface GetWithCacheOptions<V = unknown> {
-    cacheKey: string;
-    cacheGet: () => Promise<V>;
-    cacheSet: (value: V) => Promise<void>;
-    fetching: () => Promise<V>;
-    skipCache?: boolean;
-}
-export declare const getWithCacheSupport: <V = unknown>({ cacheKey, cacheGet, cacheSet, fetching, skipCache, }: GetWithCacheOptions<V>) => Promise<any>;
-interface GetMultipleWithCacheOptions<V = unknown> {
-    getFromCache?: (query: any) => Promise<V>;
-    multiGetterFromCache?: (queries: any[]) => Promise<V[]>;
-    setInCache: (key: string, value: V) => Promise<void>;
-    getter?: (query: any) => Promise<V>;
-    multiGetter?: (queries: any[]) => Promise<V[]>;
+export declare const getNewLRU: (lifeTimeInSec: any, size: any) => any;
+export declare const getWithCacheSupport: ({ cacheKey, cacheGet, cacheSet, fetching, skipCache, }: {
+    cacheKey: any;
+    cacheGet: any;
+    cacheSet: any;
+    fetching: any;
+    skipCache: any;
+}) => Promise<any>;
+export declare const getMultipleWithCache: ({ getFromCache, multiGetterFromCache, setInCache, getter, multiGetter, idField, }: {
+    getFromCache?: any;
+    multiGetterFromCache?: any;
+    setInCache: any;
+    getter?: any;
+    multiGetter?: any;
     idField?: string;
-}
-export declare const getMultipleWithCache: <V = unknown>({ getFromCache, multiGetterFromCache, setInCache, getter, multiGetter, idField, }: GetMultipleWithCacheOptions<V>) => (queries: any[]) => Promise<V[]>;
-export {};
+}) => (queries: any[]) => Promise<any[]>;

package/lib/cache.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -18,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -39,7 +35,9 @@ const getOptions = ({ lifeTimeInSec, size = DEFAULT_CACHE_SIZE, }) => ({
     maxAge: process.env.NODE_ENV !== 'test' ? 1000 * lifeTimeInSec : 0,
 });
 const getMutexByCacheKey = (key) => {
-    MUTEX_MAP[key] || (MUTEX_MAP[key] = locking.getMutex());
+    if (!MUTEX_MAP[key]) {
+        MUTEX_MAP[key] = locking.getMutex();
+    }
     return MUTEX_MAP[key];
 };
 const deleteMutexByCacheKey = (key) => {
@@ -47,12 +45,11 @@ const deleteMutexByCacheKey = (key) => {
         delete MUTEX_MAP[key];
     }
 };
-const getNewLRU = (lifeTimeInSec, size) => new lru_cache_1.default(getOptions({
+exports.getNewLRU = (lifeTimeInSec, size) => new lru_cache_1.default(getOptions({
     lifeTimeInSec,
     size,
 }));
-exports.getNewLRU = getNewLRU;
-const getWithCacheSupport = async ({ cacheKey, cacheGet, cacheSet, fetching, skipCache, }) => {
+exports.getWithCacheSupport = async ({ cacheKey, cacheGet, cacheSet, fetching, skipCache, }) => {
     if (skipCache || process.env.NODE_ENV === 'test') {
         const res = await fetching();
         await cacheSet(res);
@@ -80,29 +77,36 @@ const getWithCacheSupport = async ({ cacheKey, cacheGet, cacheSet, fetching, ski
     }
     return valueToReturn;
 };
-exports.getWithCacheSupport = getWithCacheSupport;
 const getIdField = (query, idField) => {
     if (typeof query === 'string') {
         return query;
     }
     return query[idField];
 };
-const getMultipleWithCache = ({ getFromCache, multiGetterFromCache, setInCache, getter, multiGetter, idField = 'id', }) => async (queries) => {
+exports.getMultipleWithCache = ({ getFromCache = undefined, multiGetterFromCache = undefined, setInCache, getter = undefined, multiGetter = undefined, idField = 'id', }) => async (queries) => {
     const queriesMap = new Map(queries.filter(Boolean).map(query => [getIdField(query, idField), query]));
     const resultMap = new Map();
     const valuesToPullFromCache = [...queriesMap.values()];
-    const valuesFromCache = await (multiGetterFromCache?.(valuesToPullFromCache) || // Use multiGetterFromCache if it's provided
-        Promise.all(valuesToPullFromCache.map(query => getFromCache(query))) // Otherwise, iterate over the queries with getFromCache
-    );
-    valuesFromCache.filter(Boolean).forEach((value) => {
+    let valuesFromCache;
+    if (multiGetterFromCache) {
+        valuesFromCache = await multiGetterFromCache(valuesToPullFromCache);
+    }
+    else {
+        valuesFromCache = await Promise.all(valuesToPullFromCache.map(query => getFromCache(query)));
+    }
+    valuesFromCache.filter(Boolean).map((value) => {
         queriesMap.delete(getIdField(value, idField));
         resultMap.set(getIdField(value, idField), value);
+        return value;
     });
     let valuesFromGetter = [];
     if (queriesMap.size > 0) {
-        const valuesFromGetter = await (multiGetter?.([...queriesMap.values()]) || // Use multiGetter if it's provided
-            Promise.all([...queriesMap.values()].map(id => getter(id))) // Otherwise, iterate over the queries with getter
-        );
+        if (multiGetter) {
+            valuesFromGetter = await multiGetter([...queriesMap.values()]);
+        }
+        else {
+            valuesFromGetter = await Promise.all([...queriesMap.values()].map(id => getter(id)));
+        }
         valuesFromGetter.forEach((value) => {
             setInCache(value[idField], value);
             resultMap.set(getIdField(value, idField), value);
@@ -115,4 +119,3 @@ const getMultipleWithCache = ({ getFromCache, multiGetterFromCache, setInCache,
         return resultMap.get(getIdField(query, idField));
     });
 };
-exports.getMultipleWithCache = getMultipleWithCache;

package/lib/locking.d.ts

@@ -1,3 +1,3 @@
 import { MutexInterface } from 'async-mutex';
-export declare const wrapWithMutex: (mutex: MutexInterface, funcToRun: () => PromiseLike<void>) => Promise<void>;
+export declare const wrapWithMutex: (mutex: any, funcToRun: any) => Promise<void>;
 export declare const getMutex: () => MutexInterface;

package/lib/locking.js

@@ -4,7 +4,8 @@ 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';
-const wrapWithMutex = async (mutex, funcToRun) => {
+// eslint-disable-next-line import/prefer-default-export
+exports.wrapWithMutex = async (mutex, funcToRun) => {
     const release = await mutex.acquire();
     try {
         await funcToRun();
@@ -13,6 +14,4 @@ const wrapWithMutex = async (mutex, funcToRun) => {
         release();
     }
 };
-exports.wrapWithMutex = wrapWithMutex;
-const getMutex = () => (0, async_mutex_1.withTimeout)(new async_mutex_1.Mutex(), CACHE_LOCK_TIMEOUT_MILIS, new Error(LOCK_TIMEOUT_MESSAGE));
-exports.getMutex = getMutex;
+exports.getMutex = () => async_mutex_1.withTimeout(new async_mutex_1.Mutex(), CACHE_LOCK_TIMEOUT_MILIS, new Error(LOCK_TIMEOUT_MESSAGE));

package/lib/logger.js

@@ -4,5 +4,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = __importDefault(require("@autofleet/logger"));
-const logger = (0, logger_1.default)();
+const logger = logger_1.default();
 exports.default = logger;

package/lib/orm-cache/adapter.d.ts

@@ -1,4 +1,4 @@
-import type RedisCache from '../redis';
+import RedisCache from '../redis';
 export interface ModelOptions {
     name: string;
     associations?: AssociationOptions[];

package/lib/orm-cache/index.js

@@ -11,7 +11,7 @@ const logger_1 = __importDefault(require("../logger"));
 var ORMTypes;
 (function (ORMTypes) {
     ORMTypes["SEQUELIZE"] = "sequelize";
-})(ORMTypes || (exports.ORMTypes = ORMTypes = {}));
+})(ORMTypes = exports.ORMTypes || (exports.ORMTypes = {}));
 const ORMInstanceFactory = (options) => {
     switch (options.type) {
         case ORMTypes.SEQUELIZE: {
@@ -22,7 +22,7 @@ const ORMInstanceFactory = (options) => {
         }
     }
 };
-const ORMCache = (options) => {
+exports.ORMCache = (options) => {
     const { models } = options;
     logger_1.default.info('Starting ORM Cache', { options });
     const adapter = ORMInstanceFactory(options);
@@ -36,4 +36,3 @@ const ORMCache = (options) => {
         adapter.injectGetWithCacheFunction(cache, modelOptions);
     });
 };
-exports.ORMCache = ORMCache;

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

@@ -83,7 +83,7 @@ class SequelizeAdapter {
             const instanceKey = generateInstanceKey(modelOptions.name, instance.id);
             this.debug('Adding dependencies', { instanceKey, dependencyKeys });
             const addDependenciesMulti = cache.getClient().multi();
-            const addDependenciesMultiAsync = (0, util_1.promisify)(addDependenciesMulti.exec).bind(addDependenciesMulti);
+            const addDependenciesMultiAsync = util_1.promisify(addDependenciesMulti.exec).bind(addDependenciesMulti);
             dependencyKeys.reduce((multi, key) => multi.sadd(key, instanceKey), addDependenciesMulti);
             return addDependenciesMultiAsync();
         };
@@ -113,7 +113,7 @@ class SequelizeAdapter {
             const instanceKey = generateInstanceKey(modelOptions.name, instance.id);
             this.debug('Removing dependencies', { instance, instanceKey, dependencyKeys });
             const removeMulti = cache.getClient().multi();
-            const removeMultiAsync = (0, util_1.promisify)(removeMulti.exec).bind(removeMulti);
+            const removeMultiAsync = util_1.promisify(removeMulti.exec).bind(removeMulti);
             dependencyKeys.map(key => removeMulti.srem(key, instanceKey));
             removeMulti.del(instanceKey);
             return removeMultiAsync();
@@ -122,7 +122,7 @@ class SequelizeAdapter {
             const dependentInstancesKeys = await cache.getClient().smembersAsync(generateDependencyKey(modelOptions.name, association, associationId));
             this.debug('Invalidating dependent instances', { dependentInstancesKeys });
             const removeMulti = cache.getClient().multi();
-            const removeMultiAsync = (0, util_1.promisify)(removeMulti.exec).bind(removeMulti);
+            const removeMultiAsync = util_1.promisify(removeMulti.exec).bind(removeMulti);
             const dependenciesToRemove = await Promise.all(dependentInstancesKeys.map(async (instanceKey) => {
                 const instance = JSON.parse(await cache.getClient().getAsync(instanceKey));
                 if (!instance) {

package/lib/redis/index.js

@@ -27,7 +27,7 @@ class RedisCache {
             host: options.host || HOST,
             port: options.port || PORT,
         });
-        this.locker = (0, util_1.promisify)((0, redis_lock_1.default)(this.client, options.lockRetries ?? 10));
+        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;
@@ -62,9 +62,6 @@ class RedisCache {
         const keysWithPrefix = keys.map(key => KEY_PREFIX + key);
         let values;
         try {
-            if (keysWithPrefix.length === 0) {
-                return [];
-            }
             // Try to get the value from redis.
             values = await this.client.mgetAsync(keysWithPrefix);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/matmon",
-  "version": "2.1.7",
+  "version": "2.2.0",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -27,6 +27,8 @@
   },
   "homepage": "https://github.com/Autofleet/matmon",
   "dependencies": {
+    "@autofleet/logger": "4.0.6",
+    "@types/node": "^14.14.20",
     "async-mutex": "^0.2.6",
     "bluebird": "^3.7.2",
     "dotenv": "^8.2.0",
@@ -37,13 +39,7 @@
     "sequelize-typescript": "^2.1.0"
   },
   "devDependencies": {
-    "@autofleet/logger": "^4.0.3",
-    "@types/lru-cache": "^5.1.1",
-    "@types/node": "^14.14.20",
-    "typescript": "^5.5.2"
-  },
-  "peerDependencies": {
-    "@autofleet/logger": "^4"
+    "typescript": "^3.9.5"
   },
   "files": [
     "lib/**/*"