@naturalcycles/nodejs-lib 15.72.0 → 15.72.1

package/dist/exec2/exec2.js

@@ -129,7 +129,7 @@ class Exec2 {
      * log: true
      */
     async spawnAsync(cmd, opt = {}) {
-        const { shell = true, cwd, env, passProcessEnv = true, forceColor = hasColors } = opt;
+        const { shell = true, cwd, env, passProcessEnv = true, forceColor = hasColors, stdio = 'inherit', } = opt;
         opt.log ??= true; // by default log should be true, as we are printing the output
         opt.logStart ??= opt.log;
         opt.logFinish ??= opt.log;
@@ -139,7 +139,7 @@ class Exec2 {
             const p = spawn(cmd, opt.args || [], {
                 shell,
                 cwd,
-                stdio: 'inherit',
+                stdio,
                 env: {
                     ...(passProcessEnv ? process.env : {}),
                     ...(forceColor ? { FORCE_COLOR: '1' } : {}),

package/dist/infra/process.util.js

@@ -43,11 +43,12 @@ class ProcessUtil {
         };
     }
     cpuInfo() {
-        const c = os.cpus()[0];
+        const cpus = os.cpus();
+        const c = cpus[0];
         return {
-            count: os.cpus().length,
-            model: c.model,
-            speed: c.speed,
+            count: cpus.length,
+            model: c?.model || '',
+            speed: c?.speed || 0,
         };
     }
     async cpuPercent(ms) {
@@ -61,6 +62,10 @@ class ProcessUtil {
                 const endTotal = stats2.total;
                 const idle = endIdle - startIdle;
                 const total = endTotal - startTotal;
+                if (!total) {
+                    resolve(0);
+                    return;
+                }
                 const perc = idle / total;
                 resolve(Math.round((1 - perc) * 100));
             }, ms);

package/dist/stream/transform/worker/transformMultiThreaded.model.d.ts

@@ -34,4 +34,5 @@ export interface BaseWorkerData {
      * @default 1000
      */
     logEvery: number;
+    silent?: boolean;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.72.0",
+  "version": "15.72.1",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",
@@ -19,7 +19,7 @@
     "yargs": "^18"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "18.4.2"
+    "@naturalcycles/dev-lib": "20.20.0"
   },
   "exports": {
     ".": "./dist/index.js",

package/src/exec2/exec2.ts

@@ -148,7 +148,14 @@ class Exec2 {
    * log: true
    */
   async spawnAsync(cmd: string, opt: SpawnOptions = {}): Promise<void> {
-    const { shell = true, cwd, env, passProcessEnv = true, forceColor = hasColors } = opt
+    const {
+      shell = true,
+      cwd,
+      env,
+      passProcessEnv = true,
+      forceColor = hasColors,
+      stdio = 'inherit',
+    } = opt
     opt.log ??= true // by default log should be true, as we are printing the output
     opt.logStart ??= opt.log
     opt.logFinish ??= opt.log
@@ -159,7 +166,7 @@ class Exec2 {
       const p = spawn(cmd, opt.args || [], {
         shell,
         cwd,
-        stdio: 'inherit',
+        stdio,
         env: {
           ...(passProcessEnv ? process.env : {}),
           ...(forceColor ? { FORCE_COLOR: '1' } : {}),

package/src/infra/process.util.ts

@@ -64,11 +64,12 @@ class ProcessUtil {
   }
 
   cpuInfo(): { count: number; model: string; speed: number } {
-    const c = os.cpus()[0]!
+    const cpus = os.cpus()
+    const c = cpus[0]
     return {
-      count: os.cpus().length,
-      model: c.model,
-      speed: c.speed,
+      count: cpus.length,
+      model: c?.model || '',
+      speed: c?.speed || 0,
     }
   }
 
@@ -85,8 +86,12 @@ class ProcessUtil {
 
         const idle = endIdle - startIdle
         const total = endTotal - startTotal
-        const perc = idle / total
+        if (!total) {
+          resolve(0)
+          return
+        }
 
+        const perc = idle / total
         resolve(Math.round((1 - perc) * 100))
       }, ms)
     })

package/src/stream/transform/worker/transformMultiThreaded.model.ts

@@ -42,4 +42,6 @@ export interface BaseWorkerData {
    * @default 1000
    */
   logEvery: number
+
+  silent?: boolean
 }

package/src/stream/transform/worker/workerClassProxy.js

@@ -1,7 +1,7 @@
 const started = Date.now()
 import { workerData, parentPort } from 'node:worker_threads'
 import { inspect } from 'node:util'
-const { workerFile, workerIndex, logEvery = 1000, metric = 'worker' } = workerData || {}
+const { workerFile, workerIndex, logEvery = 1000, metric = 'worker', silent } = workerData || {}
 
 if (!workerFile) {
   throw new Error('workerData.workerFile is required!')
@@ -17,7 +17,7 @@ try {
 const { WorkerClass } = await import(workerFile)
 const worker = new WorkerClass(workerData)
 
-console.log(`${metric}#${workerIndex} loaded in ${Date.now() - started} ms`)
+log(`${metric}#${workerIndex} loaded in ${Date.now() - started} ms`)
 
 let errors = 0
 let processed = 0
@@ -52,7 +52,7 @@ parentPort.on('message', async msg => {
     })
 
     errors++
-    console.log(`${metric}#${workerIndex} errors: ${errors}`)
+    log(`${metric}#${workerIndex} errors: ${errors}`)
   }
 })
 
@@ -64,7 +64,7 @@ const inspectOpt = {
 function logStats(final) {
   const { rss, heapUsed, heapTotal, external } = process.memoryUsage()
 
-  console.log(
+  log(
     inspect(
       {
         [`${metric}${workerIndex}`]: processed,
@@ -83,3 +83,8 @@ function logStats(final) {
 function mb(b) {
   return Math.round(b / (1024 * 1024))
 }
+
+function log(...args) {
+  if (silent) return
+  console.log(...args)
+}