@naturalcycles/nodejs-lib 12.64.0 → 12.65.0

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/dist/script/index.d.ts

@@ -26,5 +26,7 @@ export interface RunScriptOptions {
  * - No need to add `.catch(err => { console.error(err); process.exit(1) })`
  *
  * This function is kept light, dependency-free, exported separately.
+ *
+ * Set env DEBUG_RUN_SCRIPT for extra debugging.
  */
 export declare function runScript(fn: (...args: any[]) => any, opt?: RunScriptOptions): void;

package/dist/script/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runScript = void 0;
+const { DEBUG_RUN_SCRIPT } = process.env;
 /**
  * Use it in your top-level scripts like this:
  *
@@ -16,6 +17,8 @@ exports.runScript = void 0;
  * - No need to add `.catch(err => { console.error(err); process.exit(1) })`
  *
  * This function is kept light, dependency-free, exported separately.
+ *
+ * Set env DEBUG_RUN_SCRIPT for extra debugging.
  */
 function runScript(fn, opt = {}) {
     const { logger = console, noExit } = opt;
@@ -25,9 +28,17 @@ function runScript(fn, opt = {}) {
     process.on('unhandledRejection', err => {
         logger.error('unhandledRejection:', err);
     });
+    if (DEBUG_RUN_SCRIPT) {
+        process.on('exit', code => logger.log(`process.exit event, code=${code}`));
+        process.on('beforeExit', code => logger.log(`process.beforeExit event, code=${code}`));
+    }
+    // fake timeout, to ensure node.js process won't exit until runScript main promise is resolved
+    const timeout = setTimeout(() => { }, 10000000);
     void (async () => {
         try {
             await fn();
+            if (DEBUG_RUN_SCRIPT)
+                logger.log(`runScript promise resolved`);
             if (!noExit) {
                 setImmediate(() => process.exit(0));
             }
@@ -39,6 +50,9 @@ function runScript(fn, opt = {}) {
                 setImmediate(() => process.exit(1));
             }
         }
+        finally {
+            clearTimeout(timeout);
+        }
     })();
 }
 exports.runScript = runScript;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.64.0",
+  "version": "12.65.0",
   "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": "^14.2.0",
+    "dotenv": "^16.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

@@ -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)

package/src/script/index.ts

@@ -14,6 +14,8 @@ export interface RunScriptOptions {
   logger?: CommonLogger
 }
 
+const { DEBUG_RUN_SCRIPT } = process.env
+
 /**
  * Use it in your top-level scripts like this:
  *
@@ -29,6 +31,8 @@ export interface RunScriptOptions {
  * - No need to add `.catch(err => { console.error(err); process.exit(1) })`
  *
  * This function is kept light, dependency-free, exported separately.
+ *
+ * Set env DEBUG_RUN_SCRIPT for extra debugging.
  */
 export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {}): void {
   const { logger = console, noExit } = opt
@@ -40,10 +44,20 @@ export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {
     logger.error('unhandledRejection:', err)
   })
 
+  if (DEBUG_RUN_SCRIPT) {
+    process.on('exit', code => logger.log(`process.exit event, code=${code}`))
+    process.on('beforeExit', code => logger.log(`process.beforeExit event, code=${code}`))
+  }
+
+  // fake timeout, to ensure node.js process won't exit until runScript main promise is resolved
+  const timeout = setTimeout(() => {}, 10000000)
+
   void (async () => {
     try {
       await fn()
 
+      if (DEBUG_RUN_SCRIPT) logger.log(`runScript promise resolved`)
+
       if (!noExit) {
         setImmediate(() => process.exit(0))
       }
@@ -53,6 +67,8 @@ export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {
       if (!noExit) {
         setImmediate(() => process.exit(1))
       }
+    } finally {
+      clearTimeout(timeout)
     }
   })()
 }