@naturalcycles/nodejs-lib 12.65.0 → 12.65.3

package/dist/got/getGot.js

@@ -178,6 +178,11 @@ function gotBeforeRetryHook(opt) {
     return (options, err, retryCount) => {
         // opt.logger!.log('beforeRetry', retryCount)
         const statusCode = err?.response?.statusCode || 0;
+        if (statusCode && statusCode < 300) {
+            // todo: possibly remove the log message completely in the future
+            opt.logger.log(`skipping got.beforeRetry hook as statusCode is ${statusCode}, err.msg is ${err?.message}`);
+            return;
+        }
         const { method, url, prefixUrl } = options;
         const shortUrl = getShortUrl(opt, url, prefixUrl);
         const { started } = options.context;

package/dist/index.d.ts

@@ -54,7 +54,7 @@ export * from './stream/writable/writablePushToArray';
 export * from './stream/writable/writableVoid';
 import { inspectAny, InspectAnyOptions, inspectAnyStringifyFn } from './string/inspectAny';
 export * from './util/env.util';
-import { LRUMemoCache } from './util/lruMemoCache';
+export * from './util/lruMemoCache';
 export * from './util/zip.util';
 import { readAjvSchemas, readJsonSchemas } from './validation/ajv/ajv.util';
 import { AjvSchema, AjvSchemaCfg, AjvValidationOptions } from './validation/ajv/ajvSchema';
@@ -67,4 +67,4 @@ import { JoiValidationError, JoiValidationErrorData } from './validation/joi/joi
 import { convert, getValidationResult, isValid, JoiValidationResult, undefinedIfInvalid, validate } from './validation/joi/joi.validation.util';
 import { runScript, RunScriptOptions } from './script';
 export type { RunScriptOptions, JoiValidationErrorData, JoiValidationResult, ValidationErrorItem, ExtendedJoi, SchemaTyped, AnySchema, AnySchemaTyped, ArraySchemaTyped, BooleanSchemaTyped, NumberSchemaTyped, ObjectSchemaTyped, StringSchemaTyped, IDebug, IDebugger, SlackServiceCfg, SlackMessage, SlackMessageProps, SlackApiBody, SlackMessagePrefixHook, ReadableTyped, WritableTyped, TransformTyped, PipelineFromNDJsonFileOptions, PipelineToNDJsonFileOptions, TransformJsonParseOptions, TransformToNDJsonOptions, TransformMapOptions, TransformMapSyncOptions, NDJSONStreamForEachOptions, TransformOptions, TransformMultiThreadedOptions, WorkerClassInterface, WorkerInput, WorkerOutput, TableDiffOptions, InspectAnyOptions, Got, GetGotOptions, AfterResponseHook, BeforeErrorHook, BeforeRequestHook, AjvValidationOptions, AjvSchemaCfg, AjvValidationErrorData, };
-export { JoiValidationError, validate, getValidationResult, isValid, undefinedIfInvalid, convert, Joi, LRUMemoCache, Debug, SlackService, slackDefaultMessagePrefixHook, ndjsonStreamForEach, pipelineFromNDJsonFile, pipelineToNDJsonFile, NDJsonStats, streamToNDJsonFile, transformJsonParse, bufferReviver, transformToNDJson, transformMap, transformMapSync, transformMultiThreaded, BaseWorkerClass, tableDiff, inspectAny, inspectAnyStringifyFn, RequestError, TimeoutError, _chunkBuffer, Ajv, AjvSchema, AjvValidationError, readJsonSchemas, readAjvSchemas, runScript, };
+export { JoiValidationError, validate, getValidationResult, isValid, undefinedIfInvalid, convert, Joi, Debug, SlackService, slackDefaultMessagePrefixHook, ndjsonStreamForEach, pipelineFromNDJsonFile, pipelineToNDJsonFile, NDJsonStats, streamToNDJsonFile, transformJsonParse, bufferReviver, transformToNDJson, transformMap, transformMapSync, transformMultiThreaded, BaseWorkerClass, tableDiff, inspectAny, inspectAnyStringifyFn, RequestError, TimeoutError, _chunkBuffer, Ajv, AjvSchema, AjvValidationError, readJsonSchemas, readAjvSchemas, runScript, };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runScript = exports.readAjvSchemas = exports.readJsonSchemas = exports.AjvValidationError = exports.AjvSchema = exports.Ajv = exports._chunkBuffer = exports.TimeoutError = exports.RequestError = exports.inspectAnyStringifyFn = exports.inspectAny = exports.tableDiff = exports.BaseWorkerClass = exports.transformMultiThreaded = exports.transformMapSync = exports.transformMap = exports.transformToNDJson = exports.bufferReviver = exports.transformJsonParse = exports.streamToNDJsonFile = exports.NDJsonStats = exports.pipelineToNDJsonFile = exports.pipelineFromNDJsonFile = exports.ndjsonStreamForEach = exports.slackDefaultMessagePrefixHook = exports.SlackService = exports.Debug = exports.LRUMemoCache = exports.Joi = exports.convert = exports.undefinedIfInvalid = exports.isValid = exports.getValidationResult = exports.validate = exports.JoiValidationError = void 0;
+exports.runScript = exports.readAjvSchemas = exports.readJsonSchemas = exports.AjvValidationError = exports.AjvSchema = exports.Ajv = exports._chunkBuffer = exports.TimeoutError = exports.RequestError = exports.inspectAnyStringifyFn = exports.inspectAny = exports.tableDiff = exports.BaseWorkerClass = exports.transformMultiThreaded = exports.transformMapSync = exports.transformMap = exports.transformToNDJson = exports.bufferReviver = exports.transformJsonParse = exports.streamToNDJsonFile = exports.NDJsonStats = exports.pipelineToNDJsonFile = exports.pipelineFromNDJsonFile = exports.ndjsonStreamForEach = exports.slackDefaultMessagePrefixHook = exports.SlackService = exports.Debug = exports.Joi = exports.convert = exports.undefinedIfInvalid = exports.isValid = exports.getValidationResult = exports.validate = exports.JoiValidationError = void 0;
 const tslib_1 = require("tslib");
 const ajv_1 = require("ajv");
 exports.Ajv = ajv_1.default;
@@ -74,8 +74,7 @@ const inspectAny_1 = require("./string/inspectAny");
 Object.defineProperty(exports, "inspectAny", { enumerable: true, get: function () { return inspectAny_1.inspectAny; } });
 Object.defineProperty(exports, "inspectAnyStringifyFn", { enumerable: true, get: function () { return inspectAny_1.inspectAnyStringifyFn; } });
 (0, tslib_1.__exportStar)(require("./util/env.util"), exports);
-const lruMemoCache_1 = require("./util/lruMemoCache");
-Object.defineProperty(exports, "LRUMemoCache", { enumerable: true, get: function () { return lruMemoCache_1.LRUMemoCache; } });
+(0, tslib_1.__exportStar)(require("./util/lruMemoCache"), exports);
 (0, tslib_1.__exportStar)(require("./util/zip.util"), exports);
 const ajv_util_1 = require("./validation/ajv/ajv.util");
 Object.defineProperty(exports, "readAjvSchemas", { enumerable: true, get: function () { return ajv_util_1.readAjvSchemas; } });

package/dist/util/lruMemoCache.d.ts

@@ -1,6 +1,7 @@
 import { MemoCache } from '@naturalcycles/js-lib';
 import LRUCache = require('lru-cache');
-export declare type LRUMemoCacheOpts = LRUCache.Options<string, any>;
+export interface LRUMemoCacheOptions<KEY, VALUE> extends Partial<LRUCache.Options<KEY, VALUE>> {
+}
 /**
  * @example
  * Use it like this:
@@ -8,8 +9,8 @@ export declare type LRUMemoCacheOpts = LRUCache.Options<string, any>;
  * @_Memo({ cacheFactory: () => new LRUMemoCache({...}) })
  * method1 ()
  */
-export declare class LRUMemoCache implements MemoCache {
-    constructor(opt: LRUMemoCacheOpts);
+export declare class LRUMemoCache<KEY = any, VALUE = any> implements MemoCache<KEY, VALUE> {
+    constructor(opt: LRUMemoCacheOptions<KEY, VALUE>);
     private lru;
     has(k: any): boolean;
     get(k: any): any;

package/dist/util/lruMemoCache.js

@@ -11,7 +11,10 @@ const LRUCache = require("lru-cache");
  */
 class LRUMemoCache {
     constructor(opt) {
-        this.lru = new LRUCache(opt);
+        this.lru = new LRUCache({
+            max: 100,
+            ...opt,
+        });
     }
     has(k) {
         return this.lru.has(k);
@@ -23,7 +26,7 @@ class LRUMemoCache {
         this.lru.set(k, v);
     }
     clear() {
-        this.lru.reset();
+        this.lru.clear();
     }
 }
 exports.LRUMemoCache = LRUMemoCache;

package/dist/validation/ajv/ajv.util.js

@@ -13,7 +13,7 @@ const ajvSchema_1 = require("./ajvSchema");
  * @experimental
  */
 function readJsonSchemas(patterns, opt) {
-    return globby.sync(patterns, opt).map(fileName => JSON.parse(fs.readFileSync(fileName, 'utf-8')));
+    return globby.sync(patterns, opt).map(fileName => JSON.parse(fs.readFileSync(fileName, 'utf8')));
 }
 exports.readJsonSchemas = readJsonSchemas;
 /**

package/dist/validation/ajv/ajvSchema.js

@@ -60,7 +60,7 @@ class AjvSchema {
      */
     static readJsonSync(filePath, cfg = {}) {
         (0, index_1.requireFileToExist)(filePath);
-        const schema = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+        const schema = JSON.parse(fs.readFileSync(filePath, 'utf8'));
         return new AjvSchema(schema, cfg);
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.65.0",
+  "version": "12.65.3",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@naturalcycles/js-lib": "^14.0.0",
     "@naturalcycles/time-lib": "^3.0.1",
-    "@types/lru-cache": "^5.1.0",
+    "@types/lru-cache": "^7.4.0",
     "@types/through2-concurrent": "^2.0.0",
     "ajv": "^8.6.2",
     "ajv-formats": "^2.1.0",
@@ -32,7 +32,7 @@
     "globby": "^11.0.0",
     "got": "^11.0.1",
     "joi": "17.4.2",
-    "lru-cache": "^6.0.0",
+    "lru-cache": "^7.4.0",
     "move-file": "^2.0.0",
     "nanoid": "^3.0.0",
     "through2-concurrent": "^2.0.0",

package/src/got/getGot.ts

@@ -204,6 +204,15 @@ function gotBeforeRetryHook(opt: GetGotOptions): BeforeRetryHook {
   return (options, err, retryCount) => {
     // opt.logger!.log('beforeRetry', retryCount)
     const statusCode = err?.response?.statusCode || 0
+
+    if (statusCode && statusCode < 300) {
+      // todo: possibly remove the log message completely in the future
+      opt.logger!.log(
+        `skipping got.beforeRetry hook as statusCode is ${statusCode}, err.msg is ${err?.message}`,
+      )
+      return
+    }
+
     const { method, url, prefixUrl } = options
     const shortUrl = getShortUrl(opt, url, prefixUrl)
     const { started } = options.context as GotRequestContext

package/src/index.ts

@@ -81,7 +81,7 @@ export * from './stream/writable/writablePushToArray'
 export * from './stream/writable/writableVoid'
 import { inspectAny, InspectAnyOptions, inspectAnyStringifyFn } from './string/inspectAny'
 export * from './util/env.util'
-import { LRUMemoCache } from './util/lruMemoCache'
+export * from './util/lruMemoCache'
 export * from './util/zip.util'
 import { readAjvSchemas, readJsonSchemas } from './validation/ajv/ajv.util'
 import { AjvSchema, AjvSchemaCfg, AjvValidationOptions } from './validation/ajv/ajvSchema'
@@ -165,7 +165,6 @@ export {
   undefinedIfInvalid,
   convert,
   Joi,
-  LRUMemoCache,
   Debug,
   SlackService,
   slackDefaultMessagePrefixHook,

package/src/util/lruMemoCache.ts

@@ -1,7 +1,8 @@
 import { MemoCache } from '@naturalcycles/js-lib'
 import LRUCache = require('lru-cache')
 
-export type LRUMemoCacheOpts = LRUCache.Options<string, any>
+// Partial, to be able to provide default `max`
+export interface LRUMemoCacheOptions<KEY, VALUE> extends Partial<LRUCache.Options<KEY, VALUE>> {}
 
 /**
  * @example
@@ -10,12 +11,15 @@ export type LRUMemoCacheOpts = LRUCache.Options<string, any>
  * @_Memo({ cacheFactory: () => new LRUMemoCache({...}) })
  * method1 ()
  */
-export class LRUMemoCache implements MemoCache {
-  constructor(opt: LRUMemoCacheOpts) {
-    this.lru = new LRUCache<string, any>(opt)
+export class LRUMemoCache<KEY = any, VALUE = any> implements MemoCache<KEY, VALUE> {
+  constructor(opt: LRUMemoCacheOptions<KEY, VALUE>) {
+    this.lru = new LRUCache<KEY, VALUE>({
+      max: 100,
+      ...opt,
+    })
   }
 
-  private lru!: LRUCache<string, any>
+  private lru!: LRUCache<KEY, VALUE>
 
   has(k: any): boolean {
     return this.lru.has(k)
@@ -30,6 +34,6 @@ export class LRUMemoCache implements MemoCache {
   }
 
   clear(): void {
-    this.lru.reset()
+    this.lru.clear()
   }
 }

package/src/validation/ajv/ajv.util.ts

@@ -13,7 +13,7 @@ import { AjvSchema, AjvSchemaCfg } from './ajvSchema'
  * @experimental
  */
 export function readJsonSchemas(patterns: string | string[], opt?: GlobbyOptions): JsonSchema[] {
-  return globby.sync(patterns, opt).map(fileName => JSON.parse(fs.readFileSync(fileName, 'utf-8')))
+  return globby.sync(patterns, opt).map(fileName => JSON.parse(fs.readFileSync(fileName, 'utf8')))
 }
 
 /**

package/src/validation/ajv/ajvSchema.ts

@@ -132,7 +132,7 @@ export class AjvSchema<T = unknown> {
     cfg: Partial<AjvSchemaCfg> = {},
   ): AjvSchema<T> {
     requireFileToExist(filePath)
-    const schema = JSON.parse(fs.readFileSync(filePath, 'utf-8'))
+    const schema = JSON.parse(fs.readFileSync(filePath, 'utf8'))
     return new AjvSchema<T>(schema, cfg)
   }