@naturalcycles/nodejs-lib 12.64.0 → 12.64.1

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.js

@@ -135,7 +135,23 @@ function gotErrorHook(opt = {}) {
             .join('\n');
         const stack = err.options.context?.err?.stack;
         if (stack) {
-            err.stack += '\n    --' + stack.replace('Error: RequestError', '');
+            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;
     };
@@ -196,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.64.0",
+  "version": "12.64.1",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",

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

@@ -151,7 +151,25 @@ function gotErrorHook(opt: GetGotOptions = {}): BeforeErrorHook {
 
     const stack = (err.options.context as GotRequestContext)?.err?.stack
     if (stack) {
-      err.stack += '\n    --' + stack.replace('Error: RequestError', '')
+      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
@@ -226,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)