@naturalcycles/nodejs-lib 13.0.2 → 13.1.1

package/dist/validation/joi/joi.extensions.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Joi = void 0;
-const JoiLib = require("joi");
+const tslib_1 = require("tslib");
+const joi_1 = tslib_1.__importDefault(require("joi"));
 const number_extensions_1 = require("./number.extensions");
 const string_extensions_1 = require("./string.extensions");
 /**
  * This is the only right place to import Joi from
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
-exports.Joi = JoiLib.defaults(schema => {
+exports.Joi = joi_1.default.defaults(schema => {
     // hack to prevent infinite recursion due to .empty('') where '' is a stringSchema itself
     if (schema.type === 'string') {
         return (schema

package/dist/validation/joi/number.extensions.d.ts

@@ -1,4 +1,4 @@
-import * as Joi from 'joi';
+import Joi from 'joi';
 import { Extension, NumberSchema as JoiNumberSchema } from 'joi';
 export interface NumberSchema<TSchema = number> extends JoiNumberSchema<TSchema> {
     dividable: (q: number) => this;

package/dist/validation/joi/string.extensions.d.ts

@@ -1,5 +1,5 @@
 import { Extension, StringSchema as JoiStringSchema } from 'joi';
-import * as Joi from 'joi';
+import Joi from 'joi';
 export interface StringSchema<TSchema = string> extends JoiStringSchema<TSchema> {
     dateString: (min?: string, max?: string) => this;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.0.2",
+  "version": "13.1.1",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -27,7 +27,6 @@
     "dotenv": "^16.0.0",
     "fast-glob": "^3.2.11",
     "globby": "^11.0.0",
-    "got": "^11.0.1",
     "joi": "^17.9.2",
     "jsonwebtoken": "^9.0.0",
     "lru-cache": "^10.0.0",

package/src/bin/del.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { delSync } from '../fs/del'
 import { runScript } from '../script/runScript'
 

package/src/bin/generate-build-info.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import * as fs from 'node:fs'
-import * as path from 'node:path'
-import * as yargs from 'yargs'
+import fs from 'node:fs'
+import path from 'node:path'
+import yargs from 'yargs'
 import { appendToBashEnv, appendToGithubEnv, appendToGithubOutput } from '../fs/json2env'
 import { runScript } from '../script/runScript'
 import { generateBuildInfo } from '../util/buildInfo.util'

package/src/bin/json2env.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { json2env } from '../fs/json2env'
 import { runScript } from '../script/runScript'
 

package/src/bin/kpy.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { kpySync } from '../fs/kpy'
 import { runScript } from '../script/runScript'
 

package/src/bin/secrets-decrypt.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { dimGrey } from '../colors/colors'
 import { runScript } from '../script/runScript'
 import { DecryptCLIOptions, secretsDecrypt } from '../secret/secrets-decrypt.util'

package/src/bin/secrets-encrypt.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { dimGrey } from '../colors/colors'
 import { runScript } from '../script/runScript'
 import { EncryptCLIOptions, secretsEncrypt } from '../secret/secrets-encrypt.util'

package/src/bin/secrets-gen-key.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import * as crypto from 'node:crypto'
-import * as yargs from 'yargs'
+import crypto from 'node:crypto'
+import yargs from 'yargs'
 import { dimGrey } from '../colors/colors'
 import { runScript } from '../script/runScript'
 

package/src/bin/slack-this.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import * as yargs from 'yargs'
+import yargs from 'yargs'
 import { SlackService } from '..'
 import { runScript } from '../script/runScript'
 

package/src/colors/colors.ts

@@ -1,5 +1,5 @@
-import * as tty from 'node:tty'
-import * as chalk from 'chalk'
+import tty from 'node:tty'
+import chalk from 'chalk'
 
 export { chalk }
 

package/src/fs/del.ts

@@ -1,5 +1,5 @@
-import * as fs from 'node:fs'
-import * as fsp from 'node:fs/promises'
+import fs from 'node:fs'
+import fsp from 'node:fs/promises'
 import { pFilter, pMap, _since } from '@naturalcycles/js-lib'
 import { dimGrey, yellow } from '../colors/colors'
 import { _pathExists, _pathExistsSync, globby } from '../index'

package/src/fs/fs.util.ts

@@ -14,9 +14,9 @@ Credit to: fs-extra (https://github.com/jprichardson/node-fs-extra)
 
  */
 
-import * as fs from 'node:fs'
-import * as fsp from 'node:fs/promises'
-import * as path from 'node:path'
+import fs from 'node:fs'
+import fsp from 'node:fs/promises'
+import path from 'node:path'
 import { _jsonParse } from '@naturalcycles/js-lib'
 
 /**

package/src/fs/json2env.ts

@@ -1,4 +1,4 @@
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import { AnyObject } from '@naturalcycles/js-lib'
 import { dimGrey } from '../colors/colors'
 import { _pathExistsSync, _readJsonSync, _writeFileSync } from './fs.util'

package/src/fs/kpy.ts

@@ -1,4 +1,4 @@
-import * as path from 'node:path'
+import path from 'node:path'
 import { _since } from '@naturalcycles/js-lib'
 import { boldWhite, dimGrey, grey, yellow } from '../colors/colors'
 import {

package/src/index.ts

@@ -1,10 +1,8 @@
 import Ajv from 'ajv'
-import * as fastGlob from 'fast-glob'
+import fastGlob from 'fast-glob'
 import type { Options as FastGlobOptions } from 'fast-glob'
-import * as globby from 'globby'
+import globby from 'globby'
 import type { GlobbyOptions } from 'globby'
-import { RequestError, TimeoutError } from 'got'
-import type { AfterResponseHook, BeforeErrorHook, BeforeRequestHook, Got } from 'got'
 import type {
   AnySchema,
   ValidationErrorItem,
@@ -18,8 +16,6 @@ import type {
 } from 'joi'
 export * from './buffer/buffer.util'
 export * from './diff/tableDiff'
-export * from './got/getGot'
-export * from './got/got.model'
 export * from './infra/process.util'
 export * from './log/debug'
 export * from './security/hash.util'
@@ -99,10 +95,6 @@ export type {
   GlobbyOptions,
   FastGlobOptions,
   ValidationErrorItem,
-  Got,
-  AfterResponseHook,
-  BeforeErrorHook,
-  BeforeRequestHook,
   AlternativesSchema,
   AnySchema,
   ArraySchema,
@@ -116,4 +108,4 @@ export type {
   // StringSchema,
 }
 
-export { globby, fastGlob, RequestError, TimeoutError, Ajv }
+export { globby, fastGlob, Ajv }

package/src/infra/process.util.ts

@@ -1,4 +1,4 @@
-import * as os from 'node:os'
+import os from 'node:os'
 import { _mb } from '@naturalcycles/js-lib'
 
 export function memoryUsage(): {

package/src/jwt/jwt.service.ts

@@ -1,7 +1,7 @@
 import { _assert, _errorDataAppend, AnyObject, ErrorData, JWTString } from '@naturalcycles/js-lib'
 import { AnySchema } from 'joi'
 import type { Algorithm, VerifyOptions, JwtHeader, SignOptions } from 'jsonwebtoken'
-import * as jsonwebtoken from 'jsonwebtoken'
+import jsonwebtoken from 'jsonwebtoken'
 import { anyObjectSchema } from '../validation/joi/joi.shared.schemas'
 import { validate } from '../validation/joi/joi.validation.util'
 export { jsonwebtoken }

package/src/secret/secrets-decrypt.util.ts

@@ -1,5 +1,5 @@
-import * as path from 'node:path'
-import * as fs from 'node:fs'
+import path from 'node:path'
+import fs from 'node:fs'
 import { _assert } from '@naturalcycles/js-lib'
 import { dimGrey, yellow } from '../colors/colors'
 import { _readJsonSync, _writeJsonSync, fastGlob } from '../index'

package/src/secret/secrets-encrypt.util.ts

@@ -1,5 +1,5 @@
-import * as fs from 'node:fs'
-import * as path from 'node:path'
+import fs from 'node:fs'
+import path from 'node:path'
 import { _assert } from '@naturalcycles/js-lib'
 import { dimGrey, yellow } from '../colors/colors'
 import { _readJsonSync, _writeJsonSync, fastGlob } from '../index'

package/src/security/crypto.util.ts

@@ -1,4 +1,4 @@
-import * as crypto from 'node:crypto'
+import crypto from 'node:crypto'
 import { _stringMapEntries, Base64String, StringMap } from '@naturalcycles/js-lib'
 import { md5AsBuffer, sha256AsBuffer } from './hash.util'
 

package/src/security/hash.util.ts

@@ -1,4 +1,4 @@
-import * as crypto from 'node:crypto'
+import crypto from 'node:crypto'
 import { Base64String } from '@naturalcycles/js-lib'
 
 export function md5(s: string | Buffer): string {

package/src/security/id.util.ts

@@ -1,4 +1,4 @@
-import * as crypto from 'node:crypto'
+import crypto from 'node:crypto'
 import {
   ALPHABET_ALPHANUMERIC,
   ALPHABET_ALPHANUMERIC_LOWERCASE,

package/src/security/secret.util.ts

@@ -1,4 +1,4 @@
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import { _assert, _jsonParseIfPossible, Base64String, StringMap } from '@naturalcycles/js-lib'
 import { decryptObject, decryptRandomIVBuffer } from './crypto.util'
 

package/src/stream/ndjson/ndjsonStreamForEach.ts

@@ -1,4 +1,4 @@
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import { createUnzip } from 'node:zlib'
 import { AbortableAsyncMapper, ErrorMode } from '@naturalcycles/js-lib'
 import {

package/src/stream/ndjson/pipelineFromNDJsonFile.ts

@@ -1,5 +1,5 @@
 import { createUnzip, ZlibOptions } from 'node:zlib'
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import { _hb } from '@naturalcycles/js-lib'
 import { transformTap, _pipeline, transformSplit } from '../..'
 import { dimWhite, grey } from '../../colors/colors'

package/src/stream/ndjson/pipelineToNDJsonFile.ts

@@ -1,5 +1,5 @@
 import { createGzip, ZlibOptions } from 'node:zlib'
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import { AppError } from '@naturalcycles/js-lib'
 import { transformTap, _pipeline, _pathExistsSync, _ensureFileSync } from '../..'
 import { grey } from '../../colors/colors'

package/src/util/env.util.ts

@@ -1,4 +1,4 @@
-import * as fs from 'node:fs'
+import fs from 'node:fs'
 import type { ValuesOf } from '@naturalcycles/js-lib'
 import 'dotenv/config' // ensure .env is read before requiring keys
 

package/src/util/exec.util.ts

@@ -1,5 +1,5 @@
 import type { ProcessEnvOptions, SpawnOptions } from 'node:child_process'
-import * as cp from 'node:child_process'
+import cp from 'node:child_process'
 
 export async function execVoidCommand(
   cmd: string,

package/src/util/git.util.ts

@@ -1,5 +1,5 @@
-import * as cp from 'node:child_process'
-import * as path from 'node:path'
+import cp from 'node:child_process'
+import path from 'node:path'
 import type { UnixTimestampNumber } from '@naturalcycles/js-lib'
 import { grey } from '../colors/colors'
 

package/src/util/zip.util.ts

@@ -1,6 +1,6 @@
 import { promisify } from 'node:util'
 import { ZlibOptions } from 'node:zlib'
-import * as zlib from 'node:zlib'
+import zlib from 'node:zlib'
 
 const deflate = promisify(zlib.deflate.bind(zlib))
 const inflate = promisify(zlib.inflate.bind(zlib))

package/src/validation/joi/joi.extensions.ts

@@ -1,4 +1,4 @@
-import * as JoiLib from 'joi'
+import JoiLib from 'joi'
 import { NumberSchema, numberExtensions } from './number.extensions'
 import { StringSchema, stringExtensions } from './string.extensions'
 

package/src/validation/joi/number.extensions.ts

@@ -1,4 +1,4 @@
-import * as Joi from 'joi'
+import Joi from 'joi'
 import { Extension, NumberSchema as JoiNumberSchema } from 'joi'
 
 export interface NumberSchema<TSchema = number> extends JoiNumberSchema<TSchema> {

package/src/validation/joi/string.extensions.ts

@@ -1,6 +1,6 @@
 import { LocalDate, localTime } from '@naturalcycles/js-lib'
 import { Extension, StringSchema as JoiStringSchema } from 'joi'
-import * as Joi from 'joi'
+import Joi from 'joi'
 
 export interface StringSchema<TSchema = string> extends JoiStringSchema<TSchema> {
   dateString: (min?: string, max?: string) => this

package/dist/got/getGot.d.ts

@@ -1,13 +0,0 @@
-import { Got } from 'got';
-import { GetGotOptions } from './got.model';
-/**
- * Returns instance of Got with "reasonable defaults":
- *
- * 1. Error handler hook that prints helpful errors.
- * 2. Hooks that log start/end of request (optional, false by default).
- * 3. Reasonable defaults(tm), e.g non-infinite Timeout
- * 4. Preserves error stack traces (!) (experimental!)
- *
- * @deprecated `getGot` (together with `getKy`) is deprecated in favor of `getFetcher` of js-lib
- */
-export declare function getGot(opt?: GetGotOptions): Got;

package/dist/got/getGot.js

@@ -1,262 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGot = void 0;
-const node_url_1 = require("node:url");
-const js_lib_1 = require("@naturalcycles/js-lib");
-const got_1 = require("got");
-const __1 = require("..");
-/**
- * Returns instance of Got with "reasonable defaults":
- *
- * 1. Error handler hook that prints helpful errors.
- * 2. Hooks that log start/end of request (optional, false by default).
- * 3. Reasonable defaults(tm), e.g non-infinite Timeout
- * 4. Preserves error stack traces (!) (experimental!)
- *
- * @deprecated `getGot` (together with `getKy`) is deprecated in favor of `getFetcher` of js-lib
- */
-function getGot(opt = {}) {
-    opt.logger ||= console;
-    if (opt.debug) {
-        opt.logStart = opt.logFinished = opt.logResponse = opt.logRequest = true;
-    }
-    return got_1.default.extend({
-        // Most-important is to set to anything non-empty (so, requests don't "hang" by default).
-        // Should be long enough to handle for slow responses from scaled cloud APIs in times of spikes
-        // Ideally should be LESS than default Request timeout in backend-lib (so, it has a chance to error
-        // before server times out with 503).
-        //
-        // UPD 2021-11-27
-        // There are 2 types/strategies for requests:
-        // 1. Optimized to get result no matter what. E.g in Cron jobs, where otherwise there'll be a job failure
-        // 2. Part of the Backend request, where we better retry quickly and fail on timeout before Backend aborts it with "503 Request timeout"
-        //
-        // Here it's hard to set the default timeout right for both use-cases.
-        // So, if it's important, you should override it according to your use-cases:
-        // - set it longer for Type 1 (e.g 120 seconds)
-        // - set it shorter for Type 2 (e.g 10/20 seconds)
-        // Please beware of default Retry strategy of Got:
-        // by default it will retry 2 times (after first try)
-        // First delay between tries will be ~1 second, then ~2 seconds
-        // Each retry it'll wait up to `timeout` (so, up to 60 seconds by default).
-        // So, for 3 tries it multiplies your timeout by 3 (+3 seconds between the tries).
-        // So, e.g 60 seconds timeout with 2 retries becomes up to 183 seconds.
-        // Which definitely doesn't fit into default "RequestTimeout"
-        timeout: 60000,
-        ...opt,
-        handlers: [
-            (options, next) => {
-                options.context = {
-                    ...options.context,
-                    started: Date.now(),
-                    // This is to preserve original stack trace
-                    // https://github.com/sindresorhus/got/blob/main/documentation/async-stack-traces.md
-                    err: new Error('RequestError'),
-                };
-                return next(options);
-            },
-        ],
-        hooks: {
-            ...opt.hooks,
-            beforeError: [
-                ...(opt.hooks?.beforeError || []),
-                // User hooks go BEFORE
-                gotErrorHook(opt),
-            ],
-            beforeRequest: [
-                gotBeforeRequestHook(opt),
-                // User hooks go AFTER
-                ...(opt.hooks?.beforeRequest || []),
-            ],
-            beforeRetry: [
-                gotBeforeRetryHook(opt),
-                // User hooks go AFTER
-                ...(opt.hooks?.beforeRetry || []),
-            ],
-            afterResponse: [
-                ...(opt.hooks?.afterResponse || []),
-                // User hooks go BEFORE
-                gotAfterResponseHook(opt),
-            ],
-        },
-    });
-}
-exports.getGot = getGot;
-/**
- * Without this hook (default behaviour):
- *
- * HTTPError: Response code 422 (Unprocessable Entity)
- *  at EventEmitter.<anonymous> (.../node_modules/got/dist/source/as-promise.js:118:31)
- *  at processTicksAndRejections (internal/process/task_queues.js:97:5) {
- *  name: 'HTTPError'
- *
- *
- * With this hook:
- *
- * HTTPError 422 GET http://a.com/err?q=1 in 8 ms
- * {
- *   message: 'Reference already exists',
- *   documentation_url: 'https://developer.github.com/v3/git/refs/#create-a-reference'
- * }
- *
- * Features:
- * 1. Includes original method and URL (including e.g searchParams) in the error message.
- * 2. Includes response.body in the error message (limited length).
- * 3. Auto-detects and parses JSON response body (limited length).
- * 4. Includes time spent (gotBeforeRequestHook must also be enabled).
- * UPD: excluded now to allow automatic Sentry error grouping
- */
-function gotErrorHook(opt = {}) {
-    const { maxResponseLength = 10000 } = opt;
-    return err => {
-        const statusCode = err.response?.statusCode || 0;
-        const { method, url, prefixUrl } = err.options;
-        const shortUrl = getShortUrl(opt, url, prefixUrl);
-        const { started, retryCount } = (err.request?.options.context || {});
-        const body = err.response?.body
-            ? (0, __1.inspectAny)(err.response.body, {
-                maxLen: maxResponseLength,
-                colors: false,
-            })
-            : err.message;
-        // We don't include Response/Body/Message in the log, because it's included in the Error thrown from here
-        opt.logger.log([
-            ' <<',
-            statusCode,
-            method,
-            shortUrl,
-            retryCount && `(retry ${retryCount})`,
-            'error',
-            started && 'in ' + (0, js_lib_1._since)(started),
-        ]
-            .filter(Boolean)
-            .join(' '));
-        // timings are not part of err.message to allow automatic error grouping in Sentry
-        // Colors are not used, because there's high chance that this Error will be propagated all the way to the Frontend
-        err.message = [[statusCode, method, shortUrl].filter(Boolean).join(' '), body]
-            .filter(Boolean)
-            .join('\n');
-        const stack = err.options.context?.err?.stack;
-        if (stack) {
-            const originalStack = err.stack.split('\n');
-            let originalStackIndex = originalStack.findIndex(line => line.includes(' at '));
-            if (originalStackIndex === -1)
-                originalStackIndex = originalStack.length - 1;
-            // Skipping first line as it has RequestError: ...
-            // Skipping second line as it's known to be from e.g at got_1.default.extend.handlers
-            const syntheticStack = stack.split('\n').slice(2);
-            let firstNonNodeModulesIndex = syntheticStack.findIndex(line => !line.includes('node_modules'));
-            if (firstNonNodeModulesIndex === -1)
-                firstNonNodeModulesIndex = 0;
-            err.stack = [
-                // First lines of original error
-                ...originalStack.slice(0, originalStackIndex),
-                // Other lines from "Synthetic error"
-                ...syntheticStack.slice(firstNonNodeModulesIndex),
-            ].join('\n');
-            // err.stack += '\n    --' + stack.replace('Error: RequestError', '')
-        }
-        return err;
-    };
-}
-function gotBeforeRequestHook(opt) {
-    return options => {
-        if (opt.logStart) {
-            const { retryCount } = options.context;
-            const shortUrl = getShortUrl(opt, options.url, options.prefixUrl);
-            opt.logger.log([' >>', options.method, shortUrl, retryCount && `(retry ${retryCount})`].join(' '));
-        }
-        if (opt.logRequest) {
-            const body = options.json || options.body;
-            if (body) {
-                opt.logger.log(body);
-            }
-        }
-    };
-}
-// Here we log always, because it's similar to ErrorHook - we always log errors
-// Because Retries are always result of some Error
-function gotBeforeRetryHook(opt) {
-    const { maxResponseLength = 10000 } = 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;
-        Object.assign(options.context, { retryCount });
-        const body = err?.response?.body
-            ? (0, __1.inspectAny)(err.response.body, {
-                maxLen: maxResponseLength,
-                colors: false,
-            })
-            : err?.message;
-        // We don't include Response/Body/Message in the log, because it's included in the Error thrown from here
-        opt.logger.warn([
-            [
-                ' <<',
-                statusCode,
-                method,
-                shortUrl,
-                retryCount && retryCount > 1 ? `(retry ${retryCount - 1})` : '(first try)',
-                'error',
-                started && 'in ' + (0, js_lib_1._since)(started),
-            ]
-                .filter(Boolean)
-                .join(' '),
-            body,
-        ]
-            .filter(Boolean)
-            .join('\n'));
-    };
-}
-// AfterResponseHook is never called on Error
-// So, coloredHttpCode(resp.statusCode) is probably useless
-function gotAfterResponseHook(opt = {}) {
-    return resp => {
-        const success = resp.statusCode >= 200 && resp.statusCode < 400;
-        // Errors are not logged here, as they're logged by gotErrorHook
-        if (opt.logFinished && success) {
-            const { started, retryCount } = resp.request.options.context;
-            const { url, prefixUrl, method } = resp.request.options;
-            const shortUrl = getShortUrl(opt, url, prefixUrl);
-            opt.logger.log([
-                ' <<',
-                resp.statusCode,
-                method,
-                shortUrl,
-                retryCount && `(retry ${retryCount - 1})`,
-                started && 'in ' + (0, js_lib_1._since)(started),
-            ]
-                .filter(Boolean)
-                .join(' '));
-            // console.log(`afterResp! ${resp.request.options.method} ${resp.url}`, { context: resp.request.options.context })
-        }
-        // Error responses are not logged, cause they're included in Error message already
-        if (opt.logResponse && success) {
-            opt.logger.log((0, __1.inspectAny)(resp.body, { maxLen: opt.maxResponseLength }));
-        }
-        return resp;
-    };
-}
-function getShortUrl(opt, url, prefixUrl) {
-    if (url.password) {
-        url = new node_url_1.URL(url.toString()); // prevent original url mutation
-        url.password = '[redacted]';
-    }
-    let shortUrl = url.toString();
-    if (opt.logWithSearchParams === false) {
-        shortUrl = shortUrl.split('?')[0];
-    }
-    if (opt.logWithPrefixUrl === false && prefixUrl && shortUrl.startsWith(prefixUrl)) {
-        shortUrl = shortUrl.slice(prefixUrl.length);
-    }
-    return shortUrl;
-}