@jsenv/test 3.0.8 → 3.0.10

package/dist/jsenv_test.js

@@ -1,10 +1,10 @@
-import os, { cpus, totalmem, freemem, availableParallelism } from "node:os";
+import os, { cpus, totalmem, availableParallelism } from "node:os";
+import process$1, { cpuUsage, memoryUsage } from "node:process";
 import { readdir, chmod, stat, lstat, promises, readFile as readFile$1, writeFileSync as writeFileSync$1, mkdirSync, unlink, openSync, closeSync, rmdir, chmodSync, statSync, lstatSync, unlinkSync, readdirSync, rmdirSync, readFileSync, existsSync } from "node:fs";
 import { takeCoverage } from "node:v8";
 import stripAnsi from "strip-ansi";
 import { URL_META, createException } from "./js/exception.js";
 import stringWidth from "string-width";
-import process$1, { memoryUsage } from "node:process";
 import tty from "node:tty";
 import { pathToFileURL, fileURLToPath } from "node:url";
 import { dirname } from "node:path";
@@ -3292,9 +3292,10 @@ process.platform === "linux";
 // https://gist.github.com/GaetanoPiazzolla/c40e1ebb9f709d091208e89baf9f4e00
 
 
-const startMeasuringCpuUsage = () => {
+const startMeasuringTotalCpuUsage = () => {
   let previousCpuArray = cpus();
   let previousMs = Date.now();
+  let previousCpuUsage = cpuUsage();
 
   const overall = {
     inactive: 100,
@@ -3302,6 +3303,12 @@ const startMeasuringCpuUsage = () => {
     system: 0,
     user: 0,
   };
+
+  const thisProcess = {
+    active: 0,
+    system: 0,
+    user: 0,
+  };
   const details = previousCpuArray.map(() => {
     return {
       inactive: 100,
@@ -3358,6 +3365,19 @@ const startMeasuringCpuUsage = () => {
       overallUsageSample,
     });
 
+    const processCpuUsage = cpuUsage();
+    const thisProcessSystemMs = Math.round(
+      (processCpuUsage.system - previousCpuUsage.system) / 1000,
+    );
+    const thisProcessUserMs = Math.round(
+      (processCpuUsage.user - previousCpuUsage.user) / 1000,
+    );
+    previousCpuUsage = processCpuUsage;
+    const thisProcessActiveMs = thisProcessSystemMs + thisProcessUserMs;
+    thisProcess.active = thisProcessActiveMs / overallActiveMs;
+    thisProcess.system = thisProcessSystemMs / overallSystemMs;
+    thisProcess.user = thisProcessUserMs / overallUserMs;
+
     if (samples.length === 10) {
       let index = 0;
       for (const detail of details) {
@@ -3407,6 +3427,7 @@ const startMeasuringCpuUsage = () => {
 
   return {
     overall,
+    thisProcess,
     details,
     stop: () => {
       clearInterval(interval);
@@ -5671,8 +5692,8 @@ const coverageDefault = {
 };
 const parallelDefault = {
   max: "80%", // percentage resolved against the available cpus
-  maxCpu: "90%",
-  maxMemory: "90%",
+  maxCpu: "80%",
+  maxMemory: "50%",
 };
 
 const executeTestPlan = async ({
@@ -5780,7 +5801,7 @@ const executeTestPlan = async ({
   let finalizeCoverage;
 
   try {
-    const cpuUsage = startMeasuringCpuUsage();
+    const cpuUsage = startMeasuringTotalCpuUsage();
     operation.addEndCallback(cpuUsage.stop);
 
     let logger;
@@ -5886,7 +5907,8 @@ const executeTestPlan = async ({
         const maxMemory = parallel.maxMemory;
         if (typeof maxMemory === "string") {
           const maxMemoryAsRatio = assertPercentageAndConvertToRatio(maxMemory);
-          parallel.maxMemory = Math.round(maxMemoryAsRatio * totalmem());
+          const totalMemory = totalmem();
+          parallel.maxMemory = Math.round(maxMemoryAsRatio * totalMemory);
         } else if (typeof maxMemory !== "number") {
           throw new TypeError(
             `parallel.maxMemory must be a number or a percentage, got ${maxMemory}`,
@@ -6424,17 +6446,15 @@ To fix this warning:
             // if nothing is executing these limitations don't apply
             executionExecutingSet.size > 0
           ) {
-            const availableMemory = freemem();
-            const totalMemory = totalmem();
-            const usedMemory = totalMemory - availableMemory;
-            if (usedMemory > parallel.maxMemory) {
+            const memoryUsedByThisProcess = memoryUsage().rss;
+            if (memoryUsedByThisProcess > parallel.maxMemory) {
               // retry after Xms in case memory usage decreases
               const promise = operation.wait(200);
               promises.push(promise);
               break;
             }
 
-            if (cpuUsage.overall.active > parallel.maxCpu) {
+            if (cpuUsage.thisProcess.active > parallel.maxCpu) {
               // retry after Xms in case cpu usage decreases
               const promise = operation.wait(200);
               promises.push(promise);
@@ -6450,7 +6470,10 @@ To fix this warning:
             break;
           }
           if (execution) {
-            const promise = start(execution);
+            const promise = (async () => {
+              await start(execution);
+              await startAsMuchAsPossible();
+            })();
             promises.push(promise);
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/test",
-  "version": "3.0.8",
+  "version": "3.0.10",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/execution/execute_test_plan.js

@@ -2,7 +2,8 @@
  *
  */
 
-import { cpus, availableParallelism, freemem, totalmem } from "node:os";
+import { cpus, availableParallelism, totalmem } from "node:os";
+import { memoryUsage } from "node:process";
 import { existsSync } from "node:fs";
 import { takeCoverage } from "node:v8";
 import stripAnsi from "strip-ansi";
@@ -19,7 +20,7 @@ import {
   readGitHubWorkflowEnv,
 } from "@jsenv/github-check-run";
 
-import { startMeasuringCpuUsage } from "../helpers/cpu_usage.js";
+import { startMeasuringTotalCpuUsage } from "../helpers/cpu_usage.js";
 import { createCallOrderer } from "../helpers/call_orderer.js";
 import { generateCoverage } from "../coverage/generate_coverage.js";
 import { assertAndNormalizeWebServer } from "./web_server_param.js";
@@ -87,8 +88,8 @@ const coverageDefault = {
 };
 const parallelDefault = {
   max: "80%", // percentage resolved against the available cpus
-  maxCpu: "90%",
-  maxMemory: "90%",
+  maxCpu: "80%",
+  maxMemory: "50%",
 };
 
 export const executeTestPlan = async ({
@@ -196,7 +197,7 @@ export const executeTestPlan = async ({
   let finalizeCoverage;
 
   try {
-    const cpuUsage = startMeasuringCpuUsage();
+    const cpuUsage = startMeasuringTotalCpuUsage();
     operation.addEndCallback(cpuUsage.stop);
 
     let logger;
@@ -302,7 +303,8 @@ export const executeTestPlan = async ({
         const maxMemory = parallel.maxMemory;
         if (typeof maxMemory === "string") {
           const maxMemoryAsRatio = assertPercentageAndConvertToRatio(maxMemory);
-          parallel.maxMemory = Math.round(maxMemoryAsRatio * totalmem());
+          const totalMemory = totalmem();
+          parallel.maxMemory = Math.round(maxMemoryAsRatio * totalMemory);
         } else if (typeof maxMemory !== "number") {
           throw new TypeError(
             `parallel.maxMemory must be a number or a percentage, got ${maxMemory}`,
@@ -840,17 +842,15 @@ To fix this warning:
             // if nothing is executing these limitations don't apply
             executionExecutingSet.size > 0
           ) {
-            const availableMemory = freemem();
-            const totalMemory = totalmem();
-            const usedMemory = totalMemory - availableMemory;
-            if (usedMemory > parallel.maxMemory) {
+            const memoryUsedByThisProcess = memoryUsage().rss;
+            if (memoryUsedByThisProcess > parallel.maxMemory) {
               // retry after Xms in case memory usage decreases
               const promise = operation.wait(200);
               promises.push(promise);
               break;
             }
 
-            if (cpuUsage.overall.active > parallel.maxCpu) {
+            if (cpuUsage.thisProcess.active > parallel.maxCpu) {
               // retry after Xms in case cpu usage decreases
               const promise = operation.wait(200);
               promises.push(promise);
@@ -866,7 +866,10 @@ To fix this warning:
             break;
           }
           if (execution) {
-            const promise = start(execution);
+            const promise = (async () => {
+              await start(execution);
+              await startAsMuchAsPossible();
+            })();
             promises.push(promise);
           }
         }

package/src/helpers/cpu_usage.js

@@ -1,10 +1,12 @@
 // https://gist.github.com/GaetanoPiazzolla/c40e1ebb9f709d091208e89baf9f4e00
 
 import { cpus } from "node:os";
+import { cpuUsage } from "node:process";
 
-export const startMeasuringCpuUsage = () => {
+export const startMeasuringTotalCpuUsage = () => {
   let previousCpuArray = cpus();
   let previousMs = Date.now();
+  let previousCpuUsage = cpuUsage();
 
   const overall = {
     inactive: 100,
@@ -12,6 +14,12 @@ export const startMeasuringCpuUsage = () => {
     system: 0,
     user: 0,
   };
+
+  const thisProcess = {
+    active: 0,
+    system: 0,
+    user: 0,
+  };
   const details = previousCpuArray.map(() => {
     return {
       inactive: 100,
@@ -68,6 +76,19 @@ export const startMeasuringCpuUsage = () => {
       overallUsageSample,
     });
 
+    const processCpuUsage = cpuUsage();
+    const thisProcessSystemMs = Math.round(
+      (processCpuUsage.system - previousCpuUsage.system) / 1000,
+    );
+    const thisProcessUserMs = Math.round(
+      (processCpuUsage.user - previousCpuUsage.user) / 1000,
+    );
+    previousCpuUsage = processCpuUsage;
+    const thisProcessActiveMs = thisProcessSystemMs + thisProcessUserMs;
+    thisProcess.active = thisProcessActiveMs / overallActiveMs;
+    thisProcess.system = thisProcessSystemMs / overallSystemMs;
+    thisProcess.user = thisProcessUserMs / overallUserMs;
+
     if (samples.length === 10) {
       let index = 0;
       for (const detail of details) {
@@ -117,6 +138,7 @@ export const startMeasuringCpuUsage = () => {
 
   return {
     overall,
+    thisProcess,
     details,
     stop: () => {
       clearInterval(interval);
@@ -140,3 +162,35 @@ export const ratioAsPercentage = (ratio) => {
   const percentage = `${percentageAsNumberRounded}%`;
   return percentage;
 };
+
+export const startMeasuringCpuUsage = () => {
+  let previousHrtime = process.hrtime();
+  let previousCpuUsage = process.cpuUsage();
+
+  const info = {
+    used: 0,
+  };
+
+  const interval = setInterval(() => {
+    const hrtime = process.hrtime(previousHrtime);
+    previousHrtime = hrtime;
+    const cpuUsage = process.cpuUsage(previousCpuUsage);
+    previousCpuUsage = cpuUsage;
+
+    const ellapsedMs = hrtime[0] * 1000 + hrtime[1] / 1000000;
+    const userMs = Math.round(cpuUsage.user / 1000);
+    const systemMs = Math.round(cpuUsage.system / 1000);
+    const activeMs = userMs + systemMs;
+    const usedRatio = activeMs / ellapsedMs;
+    const used = Math.round(usedRatio * 100) / 100;
+    info.used = used;
+  }, 15);
+  interval.unref();
+
+  return {
+    info,
+    stop: () => {
+      clearInterval(interval);
+    },
+  };
+};

package/src/helpers/cpu_usage.test_manual.js

@@ -1,7 +1,15 @@
-import { startMeasuringCpuUsage, formatUsage } from "./cpu_usage.js";
+import {
+  startMeasuringCpuUsage,
+  startMeasuringTotalCpuUsage,
+  formatUsage,
+} from "./cpu_usage.js";
 
 const cpuUsage = startMeasuringCpuUsage();
+setInterval(() => {
+  console.log(cpuUsage.info.used);
+}, 400);
 
+const totalCpuUsage = startMeasuringTotalCpuUsage();
 setInterval(() => {
-  console.log(formatUsage(cpuUsage.overall));
+  console.log(formatUsage(totalCpuUsage.overall));
 }, 400);