@naturalcycles/js-lib 14.75.1 → 14.78.1

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

@@ -1,9 +1,17 @@
+import { _assert } from '../error/assert';
 import { pTimeout } from '../promise/pTimeout';
+import { _getMethodSignature } from './decorator.util';
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function _Timeout(opt) {
     return (target, key, descriptor) => {
+        _assert(typeof descriptor.value === 'function', '@_Timeout can be applied only to methods');
         const originalFn = descriptor.value;
-        descriptor.value = pTimeout(originalFn, opt);
+        const keyStr = String(key);
+        descriptor.value = async function (...args) {
+            const ctx = this;
+            opt.name || (opt.name = _getMethodSignature(ctx, keyStr));
+            return await pTimeout(originalFn.apply(this, args), opt);
+        };
         return descriptor;
     };
 }

package/dist-esm/error/try.js

@@ -1,3 +1,4 @@
+import { AppError } from './app.error';
 /**
  * Calls a function, returns a Tuple of [error, value].
  * Allows to write shorter code that avoids `try/catch`.
@@ -38,3 +39,45 @@ export async function pTry(promise) {
         return [err, undefined];
     }
 }
+/**
+ * It is thrown when Error was expected, but didn't happen
+ * ("pass" happened instead).
+ * "Pass" means "no error".
+ */
+export class UnexpectedPassError extends AppError {
+    constructor() {
+        super('_expectedError passed unexpectedly');
+    }
+}
+/**
+ * Calls `fn`, expects is to throw, catches the expected error and returns.
+ * If error was NOT thrown - throws UnexpectedPassError instead.
+ */
+export function _expectedError(fn) {
+    try {
+        fn();
+        // Unexpected!
+        throw new UnexpectedPassError();
+    }
+    catch (err) {
+        if (err instanceof UnexpectedPassError)
+            throw err; // re-throw
+        return err; // this is expected!
+    }
+}
+/**
+ * Awaits passed `promise`, expects is to throw (reject), catches the expected error and returns.
+ * If error was NOT thrown - throws UnexpectedPassError instead.
+ */
+export async function pExpectedError(promise) {
+    try {
+        await promise;
+        // Unexpected!
+        throw new UnexpectedPassError();
+    }
+    catch (err) {
+        if (err instanceof UnexpectedPassError)
+            throw err; // re-throw
+        return err; // this is expected!
+    }
+}

package/dist-esm/index.js

@@ -3,24 +3,24 @@ export * from './lazy';
 export * from './string/url.util';
 export * from './array/range';
 import { _createPromiseDecorator, } from './decorators/createPromiseDecorator';
-import { _debounce, _throttle } from './decorators/debounce';
-import { _Debounce, _Throttle } from './decorators/debounce.decorator';
-import { _getArgsSignature } from './decorators/decorator.util';
-import { _LogMethod } from './decorators/logMethod.decorator';
-import { _Memo } from './decorators/memo.decorator';
-import { _memoFn } from './decorators/memoFn';
-import { _Retry } from './decorators/retry.decorator';
-import { _Timeout } from './decorators/timeout.decorator';
-import { AppError } from './error/app.error';
-import { AssertionError, _assert, _assertDeepEquals, _assertEquals, _assertIsError, _assertIsNumber, _assertIsString, _assertTypeOf, } from './error/assert';
+export * from './decorators/debounce';
+export * from './decorators/debounce.decorator';
+export * from './decorators/decorator.util';
+export * from './decorators/logMethod.decorator';
+export * from './decorators/memo.decorator';
+export * from './decorators/memoFn';
+export * from './decorators/retry.decorator';
+export * from './decorators/timeout.decorator';
+export * from './error/app.error';
+export * from './error/assert';
 export * from './error/error.util';
 import { ErrorMode } from './error/errorMode';
-import { HttpError } from './error/http.error';
-import { _try, pTry } from './error/try';
+export * from './error/http.error';
+export * from './error/try';
 import { _TryCatch, _tryCatch } from './error/tryCatch';
-import { generateJsonSchemaFromData } from './json-schema/from-data/generateJsonSchemaFromData';
-import { JSON_SCHEMA_ORDER } from './json-schema/jsonSchema.cnst';
-import { mergeJsonSchemaObjects } from './json-schema/jsonSchema.util';
+export * from './json-schema/from-data/generateJsonSchemaFromData';
+export * from './json-schema/jsonSchema.cnst';
+export * from './json-schema/jsonSchema.util';
 import { jsonSchema, JsonSchemaAnyBuilder, } from './json-schema/jsonSchemaBuilder';
 export * from './math/math.util';
 export * from './math/sma';
@@ -40,19 +40,19 @@ import { pMap } from './promise/pMap';
 export * from './promise/pProps';
 import { pRetry } from './promise/pRetry';
 export * from './promise/pState';
-import { pTimeout } from './promise/pTimeout';
+import { pTimeout, pTimeoutFn } from './promise/pTimeout';
 export * from './promise/pTuple';
 export * from './string/case';
 export * from './string/json.util';
 export * from './string/string.util';
 import { _stringifyAny } from './string/stringifyAny';
-import { _ms, _since } from './time/time.util';
+export * from './time/time.util';
 import { END, SKIP, _noop, _objectKeys, _passNothingPredicate, _passthroughMapper, _passthroughPredicate, _passUndefinedMapper, _stringMapEntries, _stringMapValues, } from './types';
-import { _gb, _hb, _kb, _mb } from './unit/size.util';
+export * from './unit/size.util';
 import { is } from './vendor/is';
 import { commonLoggerMinLevel, commonLoggerNoop, commonLogLevelNumber, commonLoggerPipe, commonLoggerPrefix, commonLoggerCreate, } from './log/commonLogger';
-import { _safeJsonStringify } from './string/safeJsonStringify';
+export * from './string/safeJsonStringify';
 import { PQueue } from './promise/pQueue';
 export * from './seq/seq';
 export * from './math/stack.util';
-export { is, _Memo, _memoFn, _LogMethod, _getArgsSignature, _createPromiseDecorator, AppError, HttpError, AssertionError, _assert, _assertEquals, _assertDeepEquals, _assertIsError, _assertIsString, _assertIsNumber, _assertTypeOf, _stringMapValues, _stringMapEntries, _objectKeys, _debounce, _throttle, _Debounce, _Throttle, pMap, _passthroughMapper, _passUndefinedMapper, _passthroughPredicate, _passNothingPredicate, _noop, ErrorMode, pDefer, AggregatedError, pRetry, pTimeout, _Retry, _Timeout, _tryCatch, _TryCatch, _try, pTry, _stringifyAny, _ms, _since, _hb, _gb, _mb, _kb, mergeJsonSchemaObjects, jsonSchema, JsonSchemaAnyBuilder, JSON_SCHEMA_ORDER, generateJsonSchemaFromData, commonLoggerMinLevel, commonLoggerNoop, commonLogLevelNumber, commonLoggerPipe, commonLoggerPrefix, commonLoggerCreate, _safeJsonStringify, PQueue, END, SKIP, };
+export { is, _createPromiseDecorator, _stringMapValues, _stringMapEntries, _objectKeys, pMap, _passthroughMapper, _passUndefinedMapper, _passthroughPredicate, _passNothingPredicate, _noop, ErrorMode, pDefer, AggregatedError, pRetry, pTimeout, pTimeoutFn, _tryCatch, _TryCatch, _stringifyAny, jsonSchema, JsonSchemaAnyBuilder, commonLoggerMinLevel, commonLoggerNoop, commonLogLevelNumber, commonLoggerPipe, commonLoggerPrefix, commonLoggerCreate, PQueue, END, SKIP, };

package/dist-esm/promise/pRetry.js

@@ -5,7 +5,7 @@ import { _since, _stringifyAny } from '..';
  */
 // eslint-disable-next-line @typescript-eslint/ban-types
 export function pRetry(fn, opt = {}) {
-    const { maxAttempts = 4, delay: initialDelay = 1000, delayMultiplier = 2, predicate, logger = console, } = opt;
+    const { maxAttempts = 4, delay: initialDelay = 1000, delayMultiplier = 2, predicate, logger = console, name = fn.name, } = opt;
     let { logFirstAttempt = false, logRetries = true, logFailures = false, logSuccess = false } = opt;
     if (opt.logAll) {
         logFirstAttempt = logRetries = logFailures = true;
@@ -13,7 +13,7 @@ export function pRetry(fn, opt = {}) {
     if (opt.logNone) {
         logSuccess = logFirstAttempt = logRetries = logFailures = false;
     }
-    const fname = ['pRetry', fn.name].filter(Boolean).join('.');
+    const fname = ['pRetry', name].filter(Boolean).join('.');
     return async function (...args) {
         let delay = initialDelay;
         let attempt = 0;
@@ -33,9 +33,9 @@ export function pRetry(fn, opt = {}) {
                 }
                 catch (err) {
                     if (logFailures) {
-                        logger.warn(`${fname} attempt #${attempt} error in ${_since(started)}:\n${_stringifyAny(err, {
+                        logger.warn(`${fname} attempt #${attempt} error in ${_since(started)}:`, _stringifyAny(err, {
                             includeErrorData: true,
-                        })}`);
+                        }));
                     }
                     if (attempt >= maxAttempts || (predicate && !predicate(err, attempt, maxAttempts))) {
                         // Give up

package/dist-esm/promise/pTimeout.js

@@ -1,37 +1,55 @@
+import { AppError } from '../error/app.error';
+export class TimeoutError extends AppError {
+}
 /**
  * Decorates a Function with a timeout.
  * Throws an Error if the Function is not resolved in a certain time.
  * If the Function rejects - passes this rejection further.
  */
-export function pTimeout(fn, opt) {
-    // const fname = fn.name || 'function'
-    const { timeout, name, onTimeout } = opt;
-    return async function (...args) {
-        // eslint-disable-next-line no-async-promise-executor
-        return await new Promise(async (resolve, reject) => {
-            // Prepare the timeout timer
-            const timer = setTimeout(() => {
-                if (onTimeout) {
-                    try {
-                        resolve(onTimeout());
-                    }
-                    catch (err) {
-                        reject(err);
-                    }
-                    return;
+export function pTimeoutFn(fn, opt) {
+    opt.name || (opt.name = fn.name);
+    return async function pTimeoutInternalFn(...args) {
+        return await pTimeout(fn.apply(this, args), opt);
+    };
+}
+/**
+ * Decorates a Function with a timeout and immediately calls it.
+ * Throws an Error if the Function is not resolved in a certain time.
+ * If the Function rejects - passes this rejection further.
+ */
+export async function pTimeout(promise, opt) {
+    // todo: check how we can automatically infer function name (only applicable to named functions)
+    const { timeout, name, onTimeout, keepStackTrace = true } = opt;
+    const fakeError = keepStackTrace ? new Error('TimeoutError') : undefined;
+    // eslint-disable-next-line no-async-promise-executor
+    return await new Promise(async (resolve, reject) => {
+        // Prepare the timeout timer
+        const timer = setTimeout(() => {
+            if (onTimeout) {
+                try {
+                    resolve(onTimeout());
                 }
-                reject(new Error(`"${name || fn.name || 'pTimeout function'}" timed out after ${timeout} ms`));
-            }, timeout);
-            // Execute the Function
-            try {
-                resolve(await fn.apply(this, args));
-            }
-            catch (err) {
-                reject(err);
-            }
-            finally {
-                clearTimeout(timer);
+                catch (err) {
+                    if (fakeError)
+                        err.stack = fakeError.stack; // keep original stack
+                    reject(err);
+                }
+                return;
             }
-        });
-    };
+            const err = new TimeoutError(`"${name || 'pTimeout function'}" timed out after ${timeout} ms`);
+            if (fakeError)
+                err.stack = fakeError.stack; // keep original stack
+            reject(err);
+        }, timeout);
+        // Execute the Function
+        try {
+            resolve(await promise);
+        }
+        catch (err) {
+            reject(err);
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    });
 }

package/dist-esm/seq/seq.js

@@ -127,6 +127,16 @@ export class Sequence {
             a.push(v);
         }
     }
+    forEach(fn) {
+        let i = -1;
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const v = this.next();
+            if (v === END)
+                return;
+            fn(v, ++i);
+        }
+    }
 }
 /**
  * Convenience function to create a Sequence.

package/dist-esm/unit/size.util.js

@@ -1,8 +1,8 @@
 export function _gb(b) {
-    return Math.round(b / (1024 * 1024 * 1024));
+    return Math.round(b / 1024 ** 3);
 }
 export function _mb(b) {
-    return Math.round(b / (1024 * 1024));
+    return Math.round(b / 1024 ** 2);
 }
 export function _kb(b) {
     return Math.round(b / 1024);
@@ -11,11 +11,33 @@ export function _kb(b) {
  * Byte size to Human byte size string
  */
 export function _hb(b = 0) {
-    if (b < 800)
-        return `${Math.round(b)} byte(s)`;
-    if (b < 800 * 1024)
-        return `${Math.round(b / 1024)} Kb`;
-    if (b < 800 * 1024 * 1024)
-        return `${Math.round(b / 1024 / 1024)} Mb`;
-    return `${Math.round(b / 1024 / 1024 / 1024)} Gb`;
+    if (b < 1024)
+        return `${Math.round(b)} byte`;
+    if (b < 1024 ** 2)
+        return `${(b / 1024).toPrecision(3)} Kb`;
+    if (b < 1024 ** 3)
+        return `${(b / 1024 ** 2).toPrecision(3)} Mb`;
+    if (b < 1024 ** 4)
+        return `${(b / 1024 ** 3).toPrecision(3)} Gb`;
+    if (b < 1024 ** 5)
+        return `${(b / 1024 ** 4).toPrecision(3)} Tb`;
+    return `${Math.round(b / 1024 ** 4)} Tb`;
+}
+/**
+ * hc stands for "human count", similar to "human bytes" `_hb` function.
+ * Helpful to print big numbers, as it adds `K` (kilo), `M` (mega), etc to make
+ * them more readable.
+ */
+export function _hc(c = 0) {
+    if (c < 10 ** 4)
+        return String(c);
+    if (c < 10 ** 6)
+        return (c / 10 ** 3).toPrecision(3) + ' K';
+    if (c < 10 ** 9)
+        return (c / 10 ** 6).toPrecision(3) + ' M'; // million
+    if (c < 10 ** 12)
+        return (c / 10 ** 9).toPrecision(3) + ' B'; // billion
+    if (c < 10 ** 15)
+        return (c / 10 ** 12).toPrecision(3) + ' T'; // trillion
+    return Math.round(c / 10 ** 12) + ' T';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.75.1",
+  "version": "14.78.1",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",
@@ -14,13 +14,14 @@
     "@naturalcycles/bench-lib": "^1.5.0",
     "@naturalcycles/dev-lib": "^12.0.0",
     "@naturalcycles/nodejs-lib": "^12.33.4",
-    "@types/node": "^16.0.0",
+    "@types/node": "^17.0.4",
     "jest": "^27.0.1",
     "patch-package": "^6.2.1",
     "prettier": "^2.1.2",
     "rxjs": "^7.0.1",
     "vuepress": "^1.7.1",
-    "vuepress-plugin-typescript": "^0.3.1"
+    "vuepress-plugin-typescript": "^0.3.1",
+    "weak-napi": "^2.0.2"
   },
   "files": [
     "dist",

package/src/decorators/logMethod.decorator.ts

@@ -1,4 +1,4 @@
-import { SimpleMovingAverage, _stringifyAny, CommonLogger } from '..'
+import { SimpleMovingAverage, _stringifyAny, CommonLogger, _assert } from '..'
 import { _ms } from '../time/time.util'
 import { _getArgsSignature, _getMethodSignature } from './decorator.util'
 
@@ -69,9 +69,7 @@ export interface LogMethodOptions {
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function _LogMethod(opt: LogMethodOptions = {}): MethodDecorator {
   return (target, key, descriptor) => {
-    if (typeof descriptor.value !== 'function') {
-      throw new TypeError('@_LogMethod can be applied only to methods')
-    }
+    _assert(typeof descriptor.value === 'function', '@_LogMethod can be applied only to methods')
 
     const originalFn = descriptor.value
     const keyStr = String(key)

package/src/decorators/timeout.decorator.ts

@@ -1,10 +1,21 @@
+import { _assert } from '../error/assert'
 import { pTimeout, PTimeoutOptions } from '../promise/pTimeout'
+import { _getMethodSignature } from './decorator.util'
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function _Timeout(opt: PTimeoutOptions): MethodDecorator {
   return (target, key, descriptor) => {
+    _assert(typeof descriptor.value === 'function', '@_Timeout can be applied only to methods')
+
     const originalFn = descriptor.value
-    descriptor.value = pTimeout(originalFn as any, opt)
+    const keyStr = String(key)
+
+    descriptor.value = async function (this: typeof target, ...args: any[]) {
+      const ctx = this
+      opt.name ||= _getMethodSignature(ctx, keyStr)
+      return await pTimeout(originalFn.apply(this, args), opt)
+    } as any
+
     return descriptor
   }
 }

package/src/error/try.ts

@@ -1,3 +1,6 @@
+import { AnyFunction } from '../types'
+import { AppError } from './app.error'
+
 /**
  * Calls a function, returns a Tuple of [error, value].
  * Allows to write shorter code that avoids `try/catch`.
@@ -42,3 +45,44 @@ export async function pTry<ERR = unknown, RETURN = void>(
     return [err as ERR, undefined as any]
   }
 }
+
+/**
+ * It is thrown when Error was expected, but didn't happen
+ * ("pass" happened instead).
+ * "Pass" means "no error".
+ */
+export class UnexpectedPassError extends AppError {
+  constructor() {
+    super('_expectedError passed unexpectedly')
+  }
+}
+
+/**
+ * Calls `fn`, expects is to throw, catches the expected error and returns.
+ * If error was NOT thrown - throws UnexpectedPassError instead.
+ */
+export function _expectedError<ERR = Error>(fn: AnyFunction): ERR {
+  try {
+    fn()
+    // Unexpected!
+    throw new UnexpectedPassError()
+  } catch (err) {
+    if (err instanceof UnexpectedPassError) throw err // re-throw
+    return err as ERR // this is expected!
+  }
+}
+
+/**
+ * Awaits passed `promise`, expects is to throw (reject), catches the expected error and returns.
+ * If error was NOT thrown - throws UnexpectedPassError instead.
+ */
+export async function pExpectedError<ERR = Error>(promise: Promise<any>): Promise<ERR> {
+  try {
+    await promise
+    // Unexpected!
+    throw new UnexpectedPassError()
+  } catch (err) {
+    if (err instanceof UnexpectedPassError) throw err // re-throw
+    return err as ERR // this is expected!
+  }
+}

package/src/index.ts

@@ -7,26 +7,17 @@ import {
   PromiseDecoratorResp,
   _createPromiseDecorator,
 } from './decorators/createPromiseDecorator'
-import { _debounce, _throttle } from './decorators/debounce'
-import { _Debounce, _Throttle } from './decorators/debounce.decorator'
-import { _getArgsSignature } from './decorators/decorator.util'
-import { _LogMethod } from './decorators/logMethod.decorator'
-import { _Memo } from './decorators/memo.decorator'
+export * from './decorators/debounce'
+export * from './decorators/debounce.decorator'
+export * from './decorators/decorator.util'
+export * from './decorators/logMethod.decorator'
+export * from './decorators/memo.decorator'
 import { MemoCache } from './decorators/memo.util'
-import { _memoFn } from './decorators/memoFn'
-import { _Retry } from './decorators/retry.decorator'
-import { _Timeout } from './decorators/timeout.decorator'
-import { AppError } from './error/app.error'
-import {
-  AssertionError,
-  _assert,
-  _assertDeepEquals,
-  _assertEquals,
-  _assertIsError,
-  _assertIsNumber,
-  _assertIsString,
-  _assertTypeOf,
-} from './error/assert'
+export * from './decorators/memoFn'
+export * from './decorators/retry.decorator'
+export * from './decorators/timeout.decorator'
+export * from './error/app.error'
+export * from './error/assert'
 import {
   Admin401ErrorData,
   Admin403ErrorData,
@@ -37,11 +28,11 @@ import {
 } from './error/error.model'
 export * from './error/error.util'
 import { ErrorMode } from './error/errorMode'
-import { HttpError } from './error/http.error'
-import { _try, pTry } from './error/try'
+export * from './error/http.error'
+export * from './error/try'
 import { TryCatchOptions, _TryCatch, _tryCatch } from './error/tryCatch'
-import { generateJsonSchemaFromData } from './json-schema/from-data/generateJsonSchemaFromData'
-import { JSON_SCHEMA_ORDER } from './json-schema/jsonSchema.cnst'
+export * from './json-schema/from-data/generateJsonSchemaFromData'
+export * from './json-schema/jsonSchema.cnst'
 import {
   JsonSchema,
   JsonSchemaAllOf,
@@ -61,7 +52,7 @@ import {
   JsonSchemaString,
   JsonSchemaTuple,
 } from './json-schema/jsonSchema.model'
-import { mergeJsonSchemaObjects } from './json-schema/jsonSchema.util'
+export * from './json-schema/jsonSchema.util'
 import {
   jsonSchema,
   JsonSchemaAnyBuilder,
@@ -85,13 +76,13 @@ import { pMap, PMapOptions } from './promise/pMap'
 export * from './promise/pProps'
 import { pRetry, PRetryOptions } from './promise/pRetry'
 export * from './promise/pState'
-import { pTimeout, PTimeoutOptions } from './promise/pTimeout'
+import { pTimeout, pTimeoutFn, PTimeoutOptions } from './promise/pTimeout'
 export * from './promise/pTuple'
 export * from './string/case'
 export * from './string/json.util'
 export * from './string/string.util'
 import { JsonStringifyFunction, StringifyAnyOptions, _stringifyAny } from './string/stringifyAny'
-import { _ms, _since } from './time/time.util'
+export * from './time/time.util'
 import {
   Class,
   ConditionalExcept,
@@ -144,7 +135,7 @@ import {
   _stringMapEntries,
   _stringMapValues,
 } from './types'
-import { _gb, _hb, _kb, _mb } from './unit/size.util'
+export * from './unit/size.util'
 import { is } from './vendor/is'
 import {
   CommonLogLevel,
@@ -158,7 +149,7 @@ import {
   CommonLogWithLevelFunction,
   commonLoggerCreate,
 } from './log/commonLogger'
-import { _safeJsonStringify } from './string/safeJsonStringify'
+export * from './string/safeJsonStringify'
 import { PQueue, PQueueCfg } from './promise/pQueue'
 export * from './seq/seq'
 export * from './math/stack.util'
@@ -245,28 +236,10 @@ export type {
 
 export {
   is,
-  _Memo,
-  _memoFn,
-  _LogMethod,
-  _getArgsSignature,
   _createPromiseDecorator,
-  AppError,
-  HttpError,
-  AssertionError,
-  _assert,
-  _assertEquals,
-  _assertDeepEquals,
-  _assertIsError,
-  _assertIsString,
-  _assertIsNumber,
-  _assertTypeOf,
   _stringMapValues,
   _stringMapEntries,
   _objectKeys,
-  _debounce,
-  _throttle,
-  _Debounce,
-  _Throttle,
   pMap,
   _passthroughMapper,
   _passUndefinedMapper,
@@ -278,31 +251,18 @@ export {
   AggregatedError,
   pRetry,
   pTimeout,
-  _Retry,
-  _Timeout,
+  pTimeoutFn,
   _tryCatch,
   _TryCatch,
-  _try,
-  pTry,
   _stringifyAny,
-  _ms,
-  _since,
-  _hb,
-  _gb,
-  _mb,
-  _kb,
-  mergeJsonSchemaObjects,
   jsonSchema,
   JsonSchemaAnyBuilder,
-  JSON_SCHEMA_ORDER,
-  generateJsonSchemaFromData,
   commonLoggerMinLevel,
   commonLoggerNoop,
   commonLogLevelNumber,
   commonLoggerPipe,
   commonLoggerPrefix,
   commonLoggerCreate,
-  _safeJsonStringify,
   PQueue,
   END,
   SKIP,

package/src/promise/pRetry.ts

@@ -1,6 +1,12 @@
-import { _since, _stringifyAny, CommonLogger } from '..'
+import { _since, _stringifyAny, AnyFunction, CommonLogger } from '..'
 
 export interface PRetryOptions {
+  /**
+   * If set - will be included in the error message.
+   * Can be used to identify the place in the code that failed.
+   */
+  name?: string
+
   /**
    * How many attempts to try.
    * First attempt is not a retry, but "initial try". It still counts.
@@ -75,13 +81,14 @@ export interface PRetryOptions {
  * Implements "Exponential back-off strategy" by multiplying the delay by `delayMultiplier` with each try.
  */
 // eslint-disable-next-line @typescript-eslint/ban-types
-export function pRetry<T extends Function>(fn: T, opt: PRetryOptions = {}): T {
+export function pRetry<T extends AnyFunction>(fn: T, opt: PRetryOptions = {}): T {
   const {
     maxAttempts = 4,
     delay: initialDelay = 1000,
     delayMultiplier = 2,
     predicate,
     logger = console,
+    name = fn.name,
   } = opt
 
   let { logFirstAttempt = false, logRetries = true, logFailures = false, logSuccess = false } = opt
@@ -93,7 +100,7 @@ export function pRetry<T extends Function>(fn: T, opt: PRetryOptions = {}): T {
     logSuccess = logFirstAttempt = logRetries = logFailures = false
   }
 
-  const fname = ['pRetry', fn.name].filter(Boolean).join('.')
+  const fname = ['pRetry', name].filter(Boolean).join('.')
 
   return async function (this: any, ...args: any[]) {
     let delay = initialDelay
@@ -118,9 +125,10 @@ export function pRetry<T extends Function>(fn: T, opt: PRetryOptions = {}): T {
         } catch (err) {
           if (logFailures) {
             logger.warn(
-              `${fname} attempt #${attempt} error in ${_since(started)}:\n${_stringifyAny(err, {
+              `${fname} attempt #${attempt} error in ${_since(started)}:`,
+              _stringifyAny(err, {
                 includeErrorData: true,
-              })}`,
+              }),
             )
           }