@naturalcycles/nodejs-lib 12.63.0 → 12.64.2

package/dist/fs/del.js

@@ -55,14 +55,14 @@ async function del(_opt) {
     }));
     const dirnamesSorted = dirnames.sort().reverse();
     // console.log({ dirnamesSorted })
-    const deletedDirs = await (0, js_lib_1.pFilter)(dirnamesSorted, async (dirpath) => {
+    const deletedDirs = [];
+    for await (const dirpath of dirnamesSorted) {
         if (await isEmptyDir(dirpath)) {
             // console.log(`empty dir: ${dirpath}`)
             await fs.remove(dirpath);
-            return true;
+            deletedDirs.push(dirpath);
         }
-        return false;
-    }, { concurrency: 1 });
+    }
     if (verbose || debug)
         console.log({ deletedDirs });
     if (!silent) {

package/dist/got/getGot.d.ts

@@ -6,5 +6,6 @@ import { GetGotOptions } from './got.model';
  * 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!)
  */
 export declare function getGot(opt?: GetGotOptions): Got;

package/dist/got/getGot.js

@@ -10,6 +10,7 @@ const __1 = require("..");
  * 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!)
  */
 function getGot(opt = {}) {
     opt.logger || (opt.logger = console);
@@ -40,6 +41,18 @@ function getGot(opt = {}) {
         // 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: [
@@ -120,15 +133,31 @@ function gotErrorHook(opt = {}) {
         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 => {
-        options.context = {
-            ...options.context,
-            started: Date.now(),
-        };
         if (opt.logStart) {
             const { retryCount } = options.context;
             const shortUrl = getShortUrl(opt, options.url, options.prefixUrl);
@@ -183,7 +212,8 @@ function gotBeforeRetryHook(opt) {
 function gotAfterResponseHook(opt = {}) {
     return resp => {
         const success = resp.statusCode >= 200 && resp.statusCode < 400;
-        if (opt.logFinished) {
+        // 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);

package/dist/got/got.model.d.ts

@@ -54,5 +54,6 @@ export interface GotRequestContext extends AnyObject {
      * Millisecond-timestamp of when the request was started. To be able to count "time spent".
      */
     started: number;
+    err?: Error;
     retryCount?: number;
 }

package/dist/validation/joi/joi.shared.schemas.d.ts

@@ -43,5 +43,5 @@ export declare const semVerSchema: import("./string.extensions").ExtendedStringS
 export declare const userAgentSchema: import("./string.extensions").ExtendedStringSchema;
 export declare const utcOffsetSchema: import("./number.extensions").ExtendedNumberSchema;
 export declare const ipAddressSchema: import("./string.extensions").ExtendedStringSchema;
-export declare const baseDBEntitySchema: ObjectSchemaTyped<Partial<SavedDBEntity>, Partial<SavedDBEntity>>;
-export declare const savedDBEntitySchema: ObjectSchemaTyped<SavedDBEntity, SavedDBEntity>;
+export declare const baseDBEntitySchema: ObjectSchemaTyped<Partial<SavedDBEntity<string>>, Partial<SavedDBEntity<string>>>;
+export declare const savedDBEntitySchema: ObjectSchemaTyped<SavedDBEntity<string>, SavedDBEntity<string>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.63.0",
+  "version": "12.64.2",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -26,7 +26,7 @@
     "chalk": "^4.0.0",
     "cp-file": "^9.0.0",
     "debug": "^4.1.1",
-    "dotenv": "^11.0.0",
+    "dotenv": "^15.0.0",
     "execa": "^5.0.0",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.0",

package/src/fs/del.ts

@@ -90,18 +90,14 @@ export async function del(_opt: DelOptions | DelSingleOption): Promise<void> {
 
   // console.log({ dirnamesSorted })
 
-  const deletedDirs = await pFilter(
-    dirnamesSorted,
-    async dirpath => {
-      if (await isEmptyDir(dirpath)) {
-        // console.log(`empty dir: ${dirpath}`)
-        await fs.remove(dirpath)
-        return true
-      }
-      return false
-    },
-    { concurrency: 1 },
-  )
+  const deletedDirs: string[] = []
+  for await (const dirpath of dirnamesSorted) {
+    if (await isEmptyDir(dirpath)) {
+      // console.log(`empty dir: ${dirpath}`)
+      await fs.remove(dirpath)
+      deletedDirs.push(dirpath)
+    }
+  }
 
   if (verbose || debug) console.log({ deletedDirs })
 

package/src/got/getGot.ts

@@ -16,6 +16,7 @@ import { GetGotOptions, GotRequestContext } from './got.model'
  * 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!)
  */
 export function getGot(opt: GetGotOptions = {}): Got {
   opt.logger ||= console
@@ -48,6 +49,19 @@ export function getGot(opt: GetGotOptions = {}): Got {
     // Which definitely doesn't fit into default "RequestTimeout"
     timeout: 60_000,
     ...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'),
+        } as GotRequestContext
+
+        return next(options)
+      },
+    ],
     hooks: {
       ...opt.hooks,
       beforeError: [
@@ -135,17 +149,35 @@ function gotErrorHook(opt: GetGotOptions = {}): BeforeErrorHook {
       .filter(Boolean)
       .join('\n')
 
+    const stack = (err.options.context as GotRequestContext)?.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: GetGotOptions): BeforeRequestHook {
   return options => {
-    options.context = {
-      ...options.context,
-      started: Date.now(),
-    } as GotRequestContext
-
     if (opt.logStart) {
       const { retryCount } = options.context as GotRequestContext
       const shortUrl = getShortUrl(opt, options.url, options.prefixUrl)
@@ -212,7 +244,8 @@ function gotAfterResponseHook(opt: GetGotOptions = {}): AfterResponseHook {
   return resp => {
     const success = resp.statusCode >= 200 && resp.statusCode < 400
 
-    if (opt.logFinished) {
+    // Errors are not logged here, as they're logged by gotErrorHook
+    if (opt.logFinished && success) {
       const { started, retryCount } = resp.request.options.context as GotRequestContext
       const { url, prefixUrl, method } = resp.request.options
       const shortUrl = getShortUrl(opt, url, prefixUrl)

package/src/got/got.model.ts

@@ -65,5 +65,7 @@ export interface GotRequestContext extends AnyObject {
    */
   started: number
 
+  err?: Error
+
   retryCount?: number
 }