@naturalcycles/nodejs-lib 12.69.0 → 12.71.0

package/dist/got/getGot.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGot = void 0;
+const url_1 = require("url");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const got_1 = require("got");
 const __1 = require("..");
@@ -180,7 +181,9 @@ function gotBeforeRetryHook(opt) {
         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}`);
+            // opt.logger!.log(
+            //   `skipping got.beforeRetry hook as statusCode is ${statusCode}, err.msg is ${err?.message}`,
+            // )
             return;
         }
         const { method, url, prefixUrl } = options;
@@ -242,6 +245,10 @@ function gotAfterResponseHook(opt = {}) {
     };
 }
 function getShortUrl(opt, url, prefixUrl) {
+    if (url.password) {
+        url = new url_1.URL(url.toString()); // prevent original url mutation
+        url.password = '[redacted]';
+    }
     let shortUrl = url.toString();
     if (opt.logWithSearchParams === false) {
         shortUrl = shortUrl.split('?')[0];

package/dist/stream/ndjson/pipelineFromNDJsonFile.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ZlibOptions } from 'zlib';
 import { NDJsonStats } from './ndjson.model';
 import { TransformJsonParseOptions } from './transformJsonParse';

package/dist/stream/ndjson/pipelineToNDJsonFile.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ZlibOptions } from 'zlib';
 import { NDJsonStats } from './ndjson.model';
 import { TransformToNDJsonOptions } from './transformToNDJson';

package/dist/stream/pipeline/pipeline.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Readable, Transform } from 'stream';
 import { DeferredPromise } from '@naturalcycles/js-lib';
 declare type AnyStream = NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream;

package/dist/stream/transform/transformMap.d.ts

@@ -29,7 +29,7 @@ export interface TransformMapOptions<IN = any, OUT = IN> {
      * If defined - will be called on every error happening in the stream.
      * Called BEFORE observable will emit error (unless skipErrors is set to true).
      */
-    onError?: (err: unknown, input: IN) => any;
+    onError?: (err: Error, input: IN) => any;
     /**
      * Progress metric
      *

package/dist/stream/transform/transformMap.js

@@ -67,7 +67,7 @@ function transformMap(mapper, opt = {}) {
             logErrorStats();
             if (onError) {
                 try {
-                    onError(err, chunk);
+                    onError((0, js_lib_1._anyToError)(err), chunk);
                 }
                 catch { }
             }

package/dist/stream/transform/transformMapSync.d.ts

@@ -27,7 +27,7 @@ export interface TransformMapSyncOptions<IN = any, OUT = IN> {
      * If defined - will be called on every error happening in the stream.
      * Called BEFORE observable will emit error (unless skipErrors is set to true).
      */
-    onError?: (err: unknown, input: IN) => any;
+    onError?: (err: Error, input: IN) => any;
     /**
      * Progress metric
      *

package/dist/stream/transform/transformMapSync.js

@@ -50,7 +50,7 @@ function transformMapSync(mapper, opt = {}) {
                 logErrorStats();
                 if (onError) {
                     try {
-                        onError(err, chunk);
+                        onError((0, js_lib_1._anyToError)(err), chunk);
                     }
                     catch { }
                 }

package/dist/util/lruMemoCache.d.ts

@@ -1,5 +1,5 @@
 import { MemoCache } from '@naturalcycles/js-lib';
-import LRUCache = require('lru-cache');
+import * as LRUCache from 'lru-cache';
 export declare type LRUMemoCacheOptions<KEY, VALUE> = Partial<LRUCache.Options<KEY, VALUE>>;
 /**
  * @example

package/dist/util/zip.util.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ZlibOptions } from 'zlib';
 /**
  * deflateBuffer uses `deflate`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.69.0",
+  "version": "12.71.0",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -15,7 +15,6 @@
   },
   "dependencies": {
     "@naturalcycles/js-lib": "^14.0.0",
-    "@types/lru-cache": "^7.4.0",
     "@types/through2-concurrent": "^2.0.0",
     "ajv": "^8.6.2",
     "ajv-formats": "^2.1.0",
@@ -42,7 +41,7 @@
     "@naturalcycles/dev-lib": "^12.0.0",
     "@types/node": "^17.0.0",
     "@types/yargs": "^16.0.0",
-    "jest": "^27.0.1",
+    "jest": "^28.0.3",
     "nock": "^13.0.2",
     "patch-package": "^6.2.1",
     "prettier": "^2.0.0",

package/src/got/getGot.ts

@@ -207,9 +207,9 @@ function gotBeforeRetryHook(opt: GetGotOptions): BeforeRetryHook {
 
     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}`,
-      )
+      // opt.logger!.log(
+      //   `skipping got.beforeRetry hook as statusCode is ${statusCode}, err.msg is ${err?.message}`,
+      // )
       return
     }
 
@@ -284,6 +284,11 @@ function gotAfterResponseHook(opt: GetGotOptions = {}): AfterResponseHook {
 }
 
 function getShortUrl(opt: GetGotOptions, url: URL, prefixUrl?: string): string {
+  if (url.password) {
+    url = new URL(url.toString()) // prevent original url mutation
+    url.password = '[redacted]'
+  }
+
   let shortUrl = url.toString()
 
   if (opt.logWithSearchParams === false) {

package/src/stream/transform/transformMap.ts

@@ -1,4 +1,5 @@
 import {
+  _anyToError,
   AbortableAsyncMapper,
   AggregatedError,
   AsyncPredicate,
@@ -47,7 +48,7 @@ export interface TransformMapOptions<IN = any, OUT = IN> {
    * If defined - will be called on every error happening in the stream.
    * Called BEFORE observable will emit error (unless skipErrors is set to true).
    */
-  onError?: (err: unknown, input: IN) => any
+  onError?: (err: Error, input: IN) => any
 
   /**
    * Progress metric
@@ -144,7 +145,7 @@ export function transformMap<IN = any, OUT = IN>(
 
         if (onError) {
           try {
-            onError(err, chunk)
+            onError(_anyToError(err), chunk)
           } catch {}
         }
 

package/src/stream/transform/transformMapSync.ts

@@ -1,4 +1,5 @@
 import {
+  _anyToError,
   AggregatedError,
   CommonLogger,
   END,
@@ -42,7 +43,7 @@ export interface TransformMapSyncOptions<IN = any, OUT = IN> {
    * If defined - will be called on every error happening in the stream.
    * Called BEFORE observable will emit error (unless skipErrors is set to true).
    */
-  onError?: (err: unknown, input: IN) => any
+  onError?: (err: Error, input: IN) => any
 
   /**
    * Progress metric
@@ -116,7 +117,7 @@ export function transformMapSync<IN = any, OUT = IN>(
 
         if (onError) {
           try {
-            onError(err, chunk)
+            onError(_anyToError(err), chunk)
           } catch {}
         }
 

package/src/util/lruMemoCache.ts

@@ -1,5 +1,5 @@
 import { MemoCache } from '@naturalcycles/js-lib'
-import LRUCache = require('lru-cache')
+import * as LRUCache from 'lru-cache'
 
 // Partial, to be able to provide default `max`
 export type LRUMemoCacheOptions<KEY, VALUE> = Partial<LRUCache.Options<KEY, VALUE>>