@naturalcycles/js-lib 14.84.0 → 14.85.1

package/dist/decorators/memoFnAsync.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._memoFnAsync = void 0;
+const time_util_1 = require("../time/time.util");
+const decorator_util_1 = require("./decorator.util");
+const memo_util_1 = require("./memo.util");
+/**
+ * Only supports Sync functions.
+ * To support Async functions - use _memoFnAsync
+ */
+function _memoFnAsync(fn, opt = {}) {
+    const { logHit = false, logMiss = false, logArgs = true, logger = console, cacheRejections = true, cacheFactory = () => new memo_util_1.MapMemoCache(), cacheKeyFn = memo_util_1.jsonMemoSerializer, } = opt;
+    const cache = cacheFactory();
+    const fnName = fn.name;
+    const memoizedFn = async function (...args) {
+        const ctx = this;
+        const cacheKey = cacheKeyFn(args);
+        let value;
+        try {
+            value = await cache.get(cacheKey);
+        }
+        catch (err) {
+            logger.error(err);
+        }
+        if (value !== undefined) {
+            if (logHit) {
+                logger.log(`${fnName}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) memoFnAsync hit`);
+            }
+            if (value instanceof Error) {
+                throw value;
+            }
+            return value;
+        }
+        const started = Date.now();
+        try {
+            value = await fn.apply(ctx, args);
+            void (async () => {
+                try {
+                    await cache.set(cacheKey, value);
+                }
+                catch (err) {
+                    logger.error(err);
+                }
+            })();
+            return value;
+        }
+        catch (err) {
+            if (cacheRejections) {
+                void (async () => {
+                    try {
+                        await cache.set(cacheKey, err);
+                    }
+                    catch (err) {
+                        logger.error(err);
+                    }
+                })();
+            }
+            throw err;
+        }
+        finally {
+            if (logMiss) {
+                logger.log(`${fnName}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) memoFnAsync miss (${(0, time_util_1._since)(started)})`);
+            }
+        }
+    };
+    Object.assign(memoizedFn, { cache });
+    return memoizedFn;
+}
+exports._memoFnAsync = _memoFnAsync;

package/dist/decorators/memoSimple.decorator.d.ts

@@ -2,7 +2,7 @@ import { CommonLogger } from '../log/commonLogger';
 export interface MemoOpts {
     logHit?: boolean;
     logMiss?: boolean;
-    noLogArgs?: boolean;
+    logArgs?: boolean;
     logger?: CommonLogger;
 }
 /**

package/dist/decorators/memoSimple.decorator.js

@@ -37,7 +37,7 @@ const memoSimple = (opt = {}) => (target, key, descriptor) => {
   }
    */
     const cache = new memo_util_1.MapMemoCache();
-    const { logHit, logMiss, noLogArgs, logger = console } = opt;
+    const { logHit, logMiss, logArgs = true, logger = console } = opt;
     const keyStr = String(key);
     const methodSignature = (0, decorator_util_1._getTargetMethodSignature)(target, keyStr);
     descriptor.value = function (...args) {
@@ -45,14 +45,14 @@ const memoSimple = (opt = {}) => (target, key, descriptor) => {
         const cacheKey = (0, memo_util_1.jsonMemoSerializer)(args);
         if (cache.has(cacheKey)) {
             if (logHit) {
-                logger.log(`${methodSignature}(${(0, decorator_util_1._getArgsSignature)(args, noLogArgs)}) @memo hit`);
+                logger.log(`${methodSignature}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) @memo hit`);
             }
             return cache.get(cacheKey);
         }
         const d = Date.now();
         const res = originalFn.apply(ctx, args);
         if (logMiss) {
-            logger.log(`${methodSignature}(${(0, decorator_util_1._getArgsSignature)(args, noLogArgs)}) @memo miss (${Date.now() - d} ms)`);
+            logger.log(`${methodSignature}(${(0, decorator_util_1._getArgsSignature)(args, logArgs)}) @memo miss (${Date.now() - d} ms)`);
         }
         cache.set(cacheKey, res);
         return res;

package/dist/error/assert.d.ts

@@ -1,4 +1,4 @@
-import { ErrorData, HttpErrorData } from '..';
+import { ErrorData } from '..';
 import { AppError } from './app.error';
 /**
  * Evaluates the `condition` (casts it to Boolean).
@@ -16,21 +16,21 @@ import { AppError } from './app.error';
  * 3. Sets `userFriendly` flag to true, cause it's always better to have at least SOME clue, rather than fully generic "Oops" error.
  */
 export declare function _assert(condition: any, // will be evaluated as Boolean
-message?: string, errorData?: Partial<HttpErrorData>): asserts condition;
+message?: string, errorData?: ErrorData): asserts condition;
 /**
  * Like _assert(), but prints more helpful error message.
  * API is similar to Node's assert.equals().
  *
  * Does SHALLOW, but strict equality (===), use _assertDeepEquals() for deep equality.
  */
-export declare function _assertEquals<T>(actual: any, expected: T, message?: string, errorData?: Partial<HttpErrorData>): asserts actual is T;
+export declare function _assertEquals<T>(actual: any, expected: T, message?: string, errorData?: ErrorData): asserts actual is T;
 /**
  * Like _assert(), but prints more helpful error message.
  * API is similar to Node's assert.deepEquals().
  *
  * Does DEEP equality via _deepEquals()
  */
-export declare function _assertDeepEquals<T>(actual: any, expected: T, message?: string, errorData?: Partial<HttpErrorData>): asserts actual is T;
+export declare function _assertDeepEquals<T>(actual: any, expected: T, message?: string, errorData?: ErrorData): asserts actual is T;
 export declare function _assertIsError<ERR extends Error = Error>(err: any, message?: string): asserts err is ERR;
 export declare function _assertIsString(v: any, message?: string): asserts v is string;
 export declare function _assertIsNumber(v: any, message?: string): asserts v is number;

package/dist/error/error.model.d.ts

@@ -32,6 +32,7 @@ export interface ErrorData {
      * Can be used to force-group errors that are NOT needed to be split by endpoint or calling function.
      */
     fingerprint?: string[];
+    httpStatusCode?: number;
     /**
      * Open-ended.
      */

package/dist/index.d.ts

@@ -11,6 +11,7 @@ export * from './decorators/memo.decorator';
 export * from './decorators/asyncMemo.decorator';
 import { MemoCache, AsyncMemoCache } from './decorators/memo.util';
 export * from './decorators/memoFn';
+export * from './decorators/memoFnAsync';
 export * from './decorators/retry.decorator';
 export * from './decorators/timeout.decorator';
 export * from './error/app.error';

package/dist/index.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "_createPromiseDecorator", { enumerable: true, ge
 (0, tslib_1.__exportStar)(require("./decorators/memo.decorator"), exports);
 (0, tslib_1.__exportStar)(require("./decorators/asyncMemo.decorator"), exports);
 (0, tslib_1.__exportStar)(require("./decorators/memoFn"), exports);
+(0, tslib_1.__exportStar)(require("./decorators/memoFnAsync"), exports);
 (0, tslib_1.__exportStar)(require("./decorators/retry.decorator"), exports);
 (0, tslib_1.__exportStar)(require("./decorators/timeout.decorator"), exports);
 (0, tslib_1.__exportStar)(require("./error/app.error"), exports);

package/dist/promise/pRetry.d.ts

@@ -1,4 +1,4 @@
-import { AnyFunction, AnyObject, CommonLogger } from '..';
+import { AnyFunction, CommonLogger, ErrorData } from '..';
 export interface PRetryOptions {
     /**
      * If set - will be included in the error message.
@@ -79,7 +79,7 @@ export interface PRetryOptions {
     /**
      * Will be merged with `err.data` object.
      */
-    errorData?: AnyObject;
+    errorData?: ErrorData;
 }
 /**
  * Returns a Function (!), enhanced with retry capabilities.

package/dist/promise/pTimeout.d.ts

@@ -1,5 +1,6 @@
 import { AppError } from '../error/app.error';
-import { AnyFunction, AnyObject } from '../types';
+import { ErrorData } from '../error/error.model';
+import { AnyFunction } from '../types';
 export declare class TimeoutError extends AppError {
 }
 export interface PTimeoutOptions {
@@ -28,7 +29,7 @@ export interface PTimeoutOptions {
     /**
      * Will be merged with `err.data` object.
      */
-    errorData?: AnyObject;
+    errorData?: ErrorData;
 }
 /**
  * Decorates a Function with a timeout.

package/dist-esm/decorators/asyncMemo.decorator.js

@@ -1,8 +1,6 @@
-import { __asyncValues } from "tslib";
 import { _since } from '../time/time.util';
 import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util';
-import { CACHE_DROP } from './memo.decorator';
-import { jsonMemoSerializer } from './memo.util';
+import { jsonMemoSerializer, MapMemoCache } from './memo.util';
 /**
  * Like @_Memo, but allowing async MemoCache implementation.
  *
@@ -10,18 +8,17 @@ import { jsonMemoSerializer } from './memo.util';
  * Return `null` instead (it'll be cached).
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
-export const _AsyncMemo = (opt) => (target, key, descriptor) => {
+export const _AsyncMemo = (opt = {}) => (target, key, descriptor) => {
     if (typeof descriptor.value !== 'function') {
         throw new TypeError('Memoization can be applied only to methods');
     }
     const originalFn = descriptor.value;
     // Map from "instance" of the Class where @_AsyncMemo is applied to AsyncMemoCache instance.
     const cache = new Map();
-    const { logHit = false, logMiss = false, noLogArgs = false, logger = console, cacheFactory, cacheKeyFn = jsonMemoSerializer, noCacheRejected = false, noCacheResolved = false, } = opt;
+    const { logHit = false, logMiss = false, logArgs = true, logger = console, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, cacheRejections = true, } = opt;
     const keyStr = String(key);
     const methodSignature = _getTargetMethodSignature(target, keyStr);
     descriptor.value = async function (...args) {
-        var e_1, _a;
         const ctx = this;
         const cacheKey = cacheKeyFn(args);
         if (!cache.has(ctx)) {
@@ -29,37 +26,9 @@ export const _AsyncMemo = (opt) => (target, key, descriptor) => {
             // here, no need to check the cache. It's definitely a miss, because the cacheLayers is just created
             // UPD: no! AsyncMemo supports "persistent caches" (e.g Database-backed cache)
         }
-        if (args.length === 1 && args[0] === CACHE_DROP) {
-            // Special event - CACHE_DROP
-            // Function will return undefined
-            logger.log(`${methodSignature} @_AsyncMemo.dropCache()`);
-            try {
-                await Promise.all(cache.get(ctx).map(c => c.clear()));
-            }
-            catch (err) {
-                logger.error(err);
-            }
-            return;
-        }
         let value;
         try {
-            try {
-                for (var _b = __asyncValues(cache.get(ctx)), _c; _c = await _b.next(), !_c.done;) {
-                    const cacheLayer = _c.value;
-                    value = await cacheLayer.get(cacheKey);
-                    if (value !== undefined) {
-                        // it's a hit!
-                        break;
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) await _a.call(_b);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
+            value = await cache.get(ctx).get(cacheKey);
         }
         catch (err) {
             // log error, but don't throw, treat it as a "miss"
@@ -68,37 +37,61 @@ export const _AsyncMemo = (opt) => (target, key, descriptor) => {
         if (value !== undefined) {
             // hit!
             if (logHit) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_AsyncMemo hit`);
+                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_AsyncMemo hit`);
+            }
+            if (value instanceof Error) {
+                throw value;
             }
-            return value instanceof Error ? Promise.reject(value) : Promise.resolve(value);
+            return value;
         }
         // Here we know it's a MISS, let's execute the real method
         const started = Date.now();
         try {
             value = await originalFn.apply(ctx, args);
-            if (!noCacheResolved) {
-                Promise.all(cache.get(ctx).map(cacheLayer => cacheLayer.set(cacheKey, value))).catch(err => {
+            // Save the value in the Cache, without awaiting it
+            // This is to support both sync and async functions
+            void (async () => {
+                try {
+                    await cache.get(ctx).set(cacheKey, value);
+                }
+                catch (err) {
                     // log and ignore the error
                     logger.error(err);
-                });
-            }
+                }
+            })();
             return value;
         }
         catch (err) {
-            if (!noCacheRejected) {
+            if (cacheRejections) {
                 // We put it to cache as raw Error, not Promise.reject(err)
-                Promise.all(cache.get(ctx).map(cacheLayer => cacheLayer.set(cacheKey, err))).catch(err => {
-                    // log and ignore the error
-                    logger.error(err);
-                });
+                // This is to support both sync and async functions
+                void (async () => {
+                    try {
+                        await cache.get(ctx).set(cacheKey, err);
+                    }
+                    catch (err) {
+                        // log and ignore the error
+                        logger.error(err);
+                    }
+                })();
             }
             throw err;
         }
         finally {
             if (logMiss) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_AsyncMemo miss (${_since(started)})`);
+                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_AsyncMemo miss (${_since(started)})`);
             }
         }
     };
+    descriptor.value.dropCache = async () => {
+        logger.log(`${methodSignature} @_AsyncMemo.dropCache()`);
+        try {
+            await Promise.all([...cache.values()].map(c => c.clear()));
+            cache.clear();
+        }
+        catch (err) {
+            logger.error(err);
+        }
+    };
     return descriptor;
 };

package/dist-esm/decorators/decorator.util.js

@@ -19,8 +19,8 @@ export function _getTargetMethodSignature(target, keyStr) {
  * returns:
  * a, b, c
  */
-export function _getArgsSignature(args = [], noLogArgs = false) {
-    if (noLogArgs)
+export function _getArgsSignature(args = [], logArgs = true) {
+    if (!logArgs)
         return '';
     return args
         .map(arg => {

package/dist-esm/decorators/logMethod.decorator.js

@@ -20,13 +20,13 @@ export function _LogMethod(opt = {}) {
         _assert(typeof descriptor.value === 'function', '@_LogMethod can be applied only to methods');
         const originalFn = descriptor.value;
         const keyStr = String(key);
-        const { avg, noLogArgs, logStart, logResult, noLogResultLength, logger = console } = opt;
+        const { avg, logArgs = true, logStart, logResult, logResultLength = true, logger = console, } = opt;
         let { logResultFn } = opt;
         if (!logResultFn) {
             if (logResult) {
                 logResultFn = r => ['result:', _stringifyAny(r)];
             }
-            else if (!noLogResultLength) {
+            else if (logResultLength) {
                 logResultFn = r => (Array.isArray(r) ? [`result: ${r.length} items`] : []);
             }
         }
@@ -38,7 +38,7 @@ export function _LogMethod(opt = {}) {
             // e.g `NameOfYourClass.methodName`
             // or `NameOfYourClass(instanceId).methodName`
             const methodSignature = _getMethodSignature(ctx, keyStr);
-            const argsStr = _getArgsSignature(args, noLogArgs);
+            const argsStr = _getArgsSignature(args, logArgs);
             const callSignature = `${methodSignature}(${argsStr}) #${++count}`;
             if (logStart)
                 logger.log(`>> ${callSignature}`);

package/dist-esm/decorators/memo.decorator.js

@@ -1,15 +1,6 @@
-// Based on:
-// https://github.com/mgechev/memo-decorator/blob/master/index.ts
-// http://decodize.com/blog/2012/08/27/javascript-memoization-caching-results-for-better-performance/
-// http://inlehmansterms.net/2015/03/01/javascript-memoization/
-// https://community.risingstack.com/the-worlds-fastest-javascript-memoization-library/
 import { _since } from '../time/time.util';
 import { _getArgsSignature, _getMethodSignature, _getTargetMethodSignature } from './decorator.util';
 import { jsonMemoSerializer, MapMemoCache } from './memo.util';
-/**
- * Symbol to indicate that the Cache should be dropped.
- */
-export const CACHE_DROP = Symbol('CACHE_DROP');
 /**
  * Memoizes the method of the class, so it caches the output and returns the cached version if the "key"
  * of the cache is the same. Key, by defaul, is calculated as `JSON.stringify(...args)`.
@@ -19,6 +10,15 @@ export const CACHE_DROP = Symbol('CACHE_DROP');
  * If you don't want it that way - you can use a static method, then there will be only one "instance".
  *
  * Supports dropping it's cache by calling .dropCache() method of decorated function (useful in unit testing).
+ *
+ * Doesn't support Async functions, use @_AsyncMemo instead!
+ * (or, it will simply return the [unresolved] Promise further, without awaiting it)
+ *
+ * Based on:
+ * https://github.com/mgechev/memo-decorator/blob/master/index.ts
+ * http://decodize.com/blog/2012/08/27/javascript-memoization-caching-results-for-better-performance/
+ * http://inlehmansterms.net/2015/03/01/javascript-memoization/
+ * https://community.risingstack.com/the-worlds-fastest-javascript-memoization-library/
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const _Memo = (opt = {}) => (target, key, descriptor) => {
@@ -34,70 +34,58 @@ export const _Memo = (opt = {}) => (target, key, descriptor) => {
     // UPD: tests show that normal Map also doesn't leak (to be tested further)
     // Normal Map is needed to allow .dropCache()
     const cache = new Map();
-    const { logHit = false, logMiss = false, noLogArgs = false, logger = console, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, noCacheRejected = false, noCacheResolved = false, } = opt;
-    const awaitPromise = Boolean(noCacheRejected || noCacheResolved);
+    const { logHit = false, logMiss = false, logArgs = true, logger = console, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, cacheErrors = true, } = opt;
     const keyStr = String(key);
     const methodSignature = _getTargetMethodSignature(target, keyStr);
     descriptor.value = function (...args) {
-        var _a;
         const ctx = this;
-        if (args.length === 1 && args[0] === CACHE_DROP) {
-            // Special event - CACHE_DROP
-            // Function will return undefined
-            logger.log(`${methodSignature} @_Memo.CACHE_DROP`);
-            return (_a = cache.get(ctx)) === null || _a === void 0 ? void 0 : _a.clear();
-        }
         const cacheKey = cacheKeyFn(args);
+        let value;
         if (!cache.has(ctx)) {
             cache.set(ctx, cacheFactory());
         }
         else if (cache.get(ctx).has(cacheKey)) {
             if (logHit) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_Memo hit`);
-            }
-            const res = cache.get(ctx).get(cacheKey);
-            if (awaitPromise) {
-                return res instanceof Error ? Promise.reject(res) : Promise.resolve(res);
+                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_Memo hit`);
             }
-            else {
-                return res;
+            value = cache.get(ctx).get(cacheKey);
+            if (value instanceof Error) {
+                throw value;
             }
+            return value;
         }
         const started = Date.now();
-        const res = originalFn.apply(ctx, args);
-        if (awaitPromise) {
-            return res
-                .then(res => {
-                // console.log('RESOLVED', res)
-                if (logMiss) {
-                    logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_Memo miss resolved (${_since(started)})`);
-                }
-                if (!noCacheResolved) {
-                    cache.get(ctx).set(cacheKey, res);
-                }
-                return res;
-            })
-                .catch(err => {
-                // console.log('REJECTED', err)
-                if (logMiss) {
-                    logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_Memo miss rejected (${_since(started)})`);
+        try {
+            value = originalFn.apply(ctx, args);
+            try {
+                cache.get(ctx).set(cacheKey, value);
+            }
+            catch (err) {
+                logger.error(err);
+            }
+            return value;
+        }
+        catch (err) {
+            if (cacheErrors) {
+                try {
+                    cache.get(ctx).set(cacheKey, err);
                 }
-                if (!noCacheRejected) {
-                    // We put it to cache as raw Error, not Promise.reject(err)
-                    // So, we'll need to check if it's instanceof Error to reject it or resolve
-                    // Wrap as Error if it's not Error
-                    cache.get(ctx).set(cacheKey, err instanceof Error ? err : new Error(err));
+                catch (err) {
+                    logger.error(err);
                 }
-                throw err;
-            });
+            }
+            throw err;
         }
-        else {
+        finally {
             if (logMiss) {
-                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, noLogArgs)}) @_Memo miss (${_since(started)})`);
+                logger.log(`${_getMethodSignature(ctx, keyStr)}(${_getArgsSignature(args, logArgs)}) @_Memo miss (${_since(started)})`);
             }
-            cache.get(ctx).set(cacheKey, res);
-            return res;
         }
     };
+    descriptor.value.dropCache = () => {
+        logger.log(`${methodSignature} @_Memo.dropCache()`);
+        cache.forEach(memoCache => memoCache.clear());
+        cache.clear();
+    };
     return descriptor;
 };

package/dist-esm/decorators/memoFn.js

@@ -1,60 +1,55 @@
 import { _since } from '../time/time.util';
 import { _getArgsSignature } from './decorator.util';
 import { jsonMemoSerializer, MapMemoCache } from './memo.util';
+/**
+ * Only supports Sync functions.
+ * To support Async functions - use _memoFnAsync.
+ * Technically, you can use it with Async functions, but it'll return the Promise without awaiting it.
+ */
 export function _memoFn(fn, opt = {}) {
-    const { logHit = false, logMiss = false, noLogArgs = false, logger = console, noCacheRejected = false, noCacheResolved = false, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, } = opt;
+    const { logHit = false, logMiss = false, logArgs = true, logger = console, cacheErrors = true, cacheFactory = () => new MapMemoCache(), cacheKeyFn = jsonMemoSerializer, } = opt;
     const cache = cacheFactory();
-    const awaitPromise = Boolean(noCacheRejected || noCacheResolved);
     const fnName = fn.name;
     const memoizedFn = function (...args) {
         const ctx = this;
         const cacheKey = cacheKeyFn(args);
+        let value;
         if (cache.has(cacheKey)) {
             if (logHit) {
-                logger.log(`${fnName}(${_getArgsSignature(args, noLogArgs)}) memoFn hit`);
+                logger.log(`${fnName}(${_getArgsSignature(args, logArgs)}) memoFn hit`);
             }
-            const res = cache.get(cacheKey);
-            if (awaitPromise) {
-                return res instanceof Error ? Promise.reject(res) : Promise.resolve(res);
-            }
-            else {
-                return res;
+            value = cache.get(cacheKey);
+            if (value instanceof Error) {
+                throw value;
             }
+            return value;
         }
         const started = Date.now();
-        const res = fn.apply(ctx, args);
-        if (awaitPromise) {
-            return res
-                .then(res => {
-                // console.log('RESOLVED', res)
-                if (logMiss) {
-                    logger.log(`${fnName}(${_getArgsSignature(args, noLogArgs)}) memoFn miss resolved (${_since(started)})`);
-                }
-                if (!noCacheResolved) {
-                    cache.set(cacheKey, res);
-                }
-                return res;
-            })
-                .catch(err => {
-                // console.log('REJECTED', err)
-                if (logMiss) {
-                    logger.log(`${fnName}(${_getArgsSignature(args, noLogArgs)}) memoFn miss rejected (${_since(started)})`);
+        try {
+            value = fn.apply(ctx, args);
+            try {
+                cache.set(cacheKey, value);
+            }
+            catch (err) {
+                logger.error(err);
+            }
+            return value;
+        }
+        catch (err) {
+            if (cacheErrors) {
+                try {
+                    cache.set(cacheKey, err);
                 }
-                if (!noCacheRejected) {
-                    // We put it to cache as raw Error, not Promise.reject(err)
-                    // So, we'll need to check if it's instanceof Error to reject it or resolve
-                    // Wrap as Error if it's not Error
-                    cache.set(cacheKey, err instanceof Error ? err : new Error(err));
+                catch (err) {
+                    logger.error(err);
                 }
-                throw err;
-            });
+            }
+            throw err;
         }
-        else {
+        finally {
             if (logMiss) {
-                logger.log(`${fnName}(${_getArgsSignature(args, noLogArgs)}) memoFn miss (${_since(started)})`);
+                logger.log(`${fnName}(${_getArgsSignature(args, logArgs)}) memoFn miss (${_since(started)})`);
             }
-            cache.set(cacheKey, res);
-            return res;
         }
     };
     Object.assign(memoizedFn, { cache });