@naturalcycles/nodejs-lib 12.64.3 → 12.65.2

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/script/index.d.ts

@@ -26,5 +26,7 @@ export interface RunScriptOptions {
  * - No need to add `.catch(err => { console.error(err); process.exit(1) })`
  *
  * This function is kept light, dependency-free, exported separately.
+ *
+ * Set env DEBUG_RUN_SCRIPT for extra debugging.
  */
 export declare function runScript(fn: (...args: any[]) => any, opt?: RunScriptOptions): void;

package/dist/script/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runScript = void 0;
+const { DEBUG_RUN_SCRIPT } = process.env;
 /**
  * Use it in your top-level scripts like this:
  *
@@ -16,6 +17,8 @@ exports.runScript = void 0;
  * - No need to add `.catch(err => { console.error(err); process.exit(1) })`
  *
  * This function is kept light, dependency-free, exported separately.
+ *
+ * Set env DEBUG_RUN_SCRIPT for extra debugging.
  */
 function runScript(fn, opt = {}) {
     const { logger = console, noExit } = opt;
@@ -25,9 +28,17 @@ function runScript(fn, opt = {}) {
     process.on('unhandledRejection', err => {
         logger.error('unhandledRejection:', err);
     });
+    if (DEBUG_RUN_SCRIPT) {
+        process.on('exit', code => logger.log(`process.exit event, code=${code}`));
+        process.on('beforeExit', code => logger.log(`process.beforeExit event, code=${code}`));
+    }
+    // fake timeout, to ensure node.js process won't exit until runScript main promise is resolved
+    const timeout = setTimeout(() => { }, 10000000);
     void (async () => {
         try {
             await fn();
+            if (DEBUG_RUN_SCRIPT)
+                logger.log(`runScript promise resolved`);
             if (!noExit) {
                 setImmediate(() => process.exit(0));
             }
@@ -39,6 +50,9 @@ function runScript(fn, opt = {}) {
                 setImmediate(() => process.exit(1));
             }
         }
+        finally {
+            clearTimeout(timeout);
+        }
     })();
 }
 exports.runScript = runScript;

package/dist/util/lruMemoCache.js

@@ -23,7 +23,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.64.3",
+  "version": "12.65.2",
   "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/script/index.ts

@@ -14,6 +14,8 @@ export interface RunScriptOptions {
   logger?: CommonLogger
 }
 
+const { DEBUG_RUN_SCRIPT } = process.env
+
 /**
  * Use it in your top-level scripts like this:
  *
@@ -29,6 +31,8 @@ export interface RunScriptOptions {
  * - No need to add `.catch(err => { console.error(err); process.exit(1) })`
  *
  * This function is kept light, dependency-free, exported separately.
+ *
+ * Set env DEBUG_RUN_SCRIPT for extra debugging.
  */
 export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {}): void {
   const { logger = console, noExit } = opt
@@ -40,10 +44,20 @@ export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {
     logger.error('unhandledRejection:', err)
   })
 
+  if (DEBUG_RUN_SCRIPT) {
+    process.on('exit', code => logger.log(`process.exit event, code=${code}`))
+    process.on('beforeExit', code => logger.log(`process.beforeExit event, code=${code}`))
+  }
+
+  // fake timeout, to ensure node.js process won't exit until runScript main promise is resolved
+  const timeout = setTimeout(() => {}, 10000000)
+
   void (async () => {
     try {
       await fn()
 
+      if (DEBUG_RUN_SCRIPT) logger.log(`runScript promise resolved`)
+
       if (!noExit) {
         setImmediate(() => process.exit(0))
       }
@@ -53,6 +67,8 @@ export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {
       if (!noExit) {
         setImmediate(() => process.exit(1))
       }
+    } finally {
+      clearTimeout(timeout)
     }
   })()
 }

package/src/util/lruMemoCache.ts

@@ -30,6 +30,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)
   }