@naturalcycles/js-lib 14.125.0 → 14.126.0

package/dist/http/fetcher.d.ts

@@ -43,6 +43,16 @@ export interface FetcherCfg {
     logRequestBody?: boolean;
     logResponse?: boolean;
     logResponseBody?: boolean;
+    /**
+     * Default to true.
+     * Set to false to exclude `prefixUrl` from logs (both success and error)
+     */
+    logWithPrefixUrl?: boolean;
+    /**
+     * Default to true.
+     * Set to false to strip searchParams from url when logging (both success and error)
+     */
+    logWithSearchParams?: boolean;
     /**
      * Defaults to `console`.
      */

package/dist/http/fetcher.js

@@ -116,7 +116,8 @@ class Fetcher {
                 retryTimeout: req.retry.timeout,
             },
         };
-        const shortUrl = this.getShortUrl(req.url);
+        const fullUrl = new URL(req.url);
+        const shortUrl = this.getShortUrl(fullUrl);
         const signature = [method.toUpperCase(), shortUrl].join(' ');
         /* eslint-disable no-await-in-loop */
         while (!res.retryStatus.retryStopped) {
@@ -280,9 +281,18 @@ class Fetcher {
      */
     getShortUrl(url) {
         const { baseUrl } = this.cfg;
-        if (!baseUrl)
-            return url;
-        return url.split('?')[0].slice(baseUrl.length);
+        if (url.password) {
+            url = new URL(url.toString()); // prevent original url mutation
+            url.password = '[redacted]';
+        }
+        let shortUrl = url.toString();
+        if (!this.cfg.logWithSearchParams) {
+            shortUrl = shortUrl.split('?')[0];
+        }
+        if (!this.cfg.logWithPrefixUrl && baseUrl && shortUrl.startsWith(baseUrl)) {
+            shortUrl = shortUrl.slice(baseUrl.length);
+        }
+        return shortUrl;
     }
     normalizeCfg(cfg) {
         if (cfg.baseUrl?.endsWith('/')) {
@@ -306,6 +316,8 @@ class Fetcher {
             logRequestBody: debug,
             logResponse: debug,
             logResponseBody: debug,
+            logWithPrefixUrl: true,
+            logWithSearchParams: true,
             retry: { ...defRetryOptions },
             init: {
                 method: cfg.method || 'get',

package/dist-esm/http/fetcher.js

@@ -124,7 +124,8 @@ export class Fetcher {
                 retryTimeout: req.retry.timeout,
             },
         };
-        const shortUrl = this.getShortUrl(req.url);
+        const fullUrl = new URL(req.url);
+        const shortUrl = this.getShortUrl(fullUrl);
         const signature = [method.toUpperCase(), shortUrl].join(' ');
         /* eslint-disable no-await-in-loop */
         while (!res.retryStatus.retryStopped) {
@@ -320,9 +321,18 @@ export class Fetcher {
      */
     getShortUrl(url) {
         const { baseUrl } = this.cfg;
-        if (!baseUrl)
-            return url;
-        return url.split('?')[0].slice(baseUrl.length);
+        if (url.password) {
+            url = new URL(url.toString()); // prevent original url mutation
+            url.password = '[redacted]';
+        }
+        let shortUrl = url.toString();
+        if (!this.cfg.logWithSearchParams) {
+            shortUrl = shortUrl.split('?')[0];
+        }
+        if (!this.cfg.logWithPrefixUrl && baseUrl && shortUrl.startsWith(baseUrl)) {
+            shortUrl = shortUrl.slice(baseUrl.length);
+        }
+        return shortUrl;
     }
     normalizeCfg(cfg) {
         var _a;
@@ -347,6 +357,8 @@ export class Fetcher {
             logRequestBody: debug,
             logResponse: debug,
             logResponseBody: debug,
+            logWithPrefixUrl: true,
+            logWithSearchParams: true,
             retry: Object.assign({}, defRetryOptions),
             init: {
                 method: cfg.method || 'get',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.125.0",
+  "version": "14.126.0",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/http/fetcher.ts

@@ -65,6 +65,18 @@ export interface FetcherCfg {
   logResponse?: boolean
   logResponseBody?: boolean
 
+  /**
+   * Default to true.
+   * Set to false to exclude `prefixUrl` from logs (both success and error)
+   */
+  logWithPrefixUrl?: boolean
+
+  /**
+   * Default to true.
+   * Set to false to strip searchParams from url when logging (both success and error)
+   */
+  logWithSearchParams?: boolean
+
   /**
    * Defaults to `console`.
    */
@@ -331,7 +343,8 @@ export class Fetcher {
       },
     }
 
-    const shortUrl = this.getShortUrl(req.url)
+    const fullUrl = new URL(req.url)
+    const shortUrl = this.getShortUrl(fullUrl)
     const signature = [method.toUpperCase(), shortUrl].join(' ')
 
     /* eslint-disable no-await-in-loop */
@@ -514,11 +527,25 @@ export class Fetcher {
   /**
    * Returns url without baseUrl and before ?queryString
    */
-  private getShortUrl(url: string): string {
+  private getShortUrl(url: URL): string {
     const { baseUrl } = this.cfg
-    if (!baseUrl) return url
 
-    return url.split('?')[0]!.slice(baseUrl.length)
+    if (url.password) {
+      url = new URL(url.toString()) // prevent original url mutation
+      url.password = '[redacted]'
+    }
+
+    let shortUrl = url.toString()
+
+    if (!this.cfg.logWithSearchParams) {
+      shortUrl = shortUrl.split('?')[0]!
+    }
+
+    if (!this.cfg.logWithPrefixUrl && baseUrl && shortUrl.startsWith(baseUrl)) {
+      shortUrl = shortUrl.slice(baseUrl.length)
+    }
+
+    return shortUrl
   }
 
   private normalizeCfg(cfg: FetcherCfg & FetcherOptions): FetcherNormalizedCfg {
@@ -545,6 +572,8 @@ export class Fetcher {
         logRequestBody: debug,
         logResponse: debug,
         logResponseBody: debug,
+        logWithPrefixUrl: true,
+        logWithSearchParams: true,
         retry: { ...defRetryOptions },
         init: {
           method: cfg.method || 'get',