@artilleryio/int-core 2.0.11 → 2.1.0-1eac5df

package/lib/phases.js

@@ -12,6 +12,7 @@ const arrivals = require('arrivals');
 const debug = require('debug')('phases');
 const { randomUUID } = require('crypto');
 const driftless = require('driftless');
+const ms = require('ms');
 
 module.exports = phaser;
 
@@ -25,7 +26,6 @@ function phaser(phaseSpecs) {
   let ee = new EventEmitter();
 
   let tasks = _.map(phaseSpecs, function (spec, i) {
-    // Cast defined but non-number (eg: from ENV) values
     [
       'arrivalRate',
       'arrivalCount',
@@ -34,9 +34,27 @@ function phaser(phaseSpecs) {
       'duration',
       'maxVusers'
     ].forEach(function (k) {
-      if (!isUndefined(spec[k]) && typeof spec[k] !== 'number') {
-        spec[k] = _.toNumber(spec[k]);
+      if (isUndefined(spec[k]) || spec[k] == 'number') {
+        return;
       }
+
+      if (k == 'duration' || k == 'pause') {
+        //if it's already a number in string format, don't apply ms, as it's the default behaviour, so we don't want to do ms calculations
+        //otherwise, ms returns the value in milliseconds, so we need to convert to seconds
+        const convertedDuration = Number.isInteger(_.toNumber(spec[k]))
+          ? spec[k]
+          : ms(spec[k]) / 1000;
+
+        //throw error if invalid time format to prevent test from running infinitely
+        if (!convertedDuration) {
+          throw new Error(`Invalid ${k} for phase: ${spec[k]}`);
+        }
+
+        spec[k] = convertedDuration;
+      }
+
+      // Cast defined but non-number (eg: from ENV) values
+      spec[k] = _.toNumber(spec[k]);
     });
 
     if (isUndefined(spec.index)) {

package/lib/runner.js

@@ -299,9 +299,17 @@ function runScenario(script, metrics, runState, contextVars) {
 
     runState.compiledScenarios = _.map(
       script.scenarios,
-      function (scenarioSpec) {
+      function (scenarioSpec, scenarioIndex) {
         const name = scenarioSpec.engine || script.config.engine || 'http';
         const engine = runState.engines.find((e) => e.__name === name);
+
+        if (typeof engine === 'undefined') {
+          const scenarioNameOrIndex = scenarioSpec.name || scenarioIndex;
+          throw new Error(
+            `Failed to run scenario "${scenarioNameOrIndex}": unknown engine "${name}". Did you forget to include it in "config.engines.${name}"?`
+          );
+        }
+
         return engine.createScenario(scenarioSpec, runState.scenarioEvents);
       }
     );

package/lib/ssms.js

@@ -626,6 +626,7 @@ function summarizeHistogram(h) {
     min: round(h.min, 1),
     max: round(h.max, 1),
     count: h.count,
+    mean: round(h.sum/h.count, 1),
     p50: round(h.getValueAtQuantile(0.5), 1),
     median: round(h.getValueAtQuantile(0.5), 1), // Here for compatibility
     p75: round(h.getValueAtQuantile(0.75), 1),

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@artilleryio/int-core",
-  "version": "2.0.11",
+  "version": "2.1.0-1eac5df",
   "main": "./index.js",
+  "license": "MPL-2.0",
   "dependencies": {
-    "@artilleryio/int-commons": "latest",
+    "@artilleryio/int-commons": "2.0.1-1eac5df",
     "@artilleryio/sketches-js": "^2.1.1",
     "agentkeepalive": "^4.1.0",
     "arrivals": "^2.1.2",
@@ -25,6 +26,7 @@
     "hpagent": "^0.1.1",
     "https-proxy-agent": "^5.0.0",
     "lodash": "^4.17.19",
+    "ms": "^2.1.3",
     "protobufjs": "^7.2.4",
     "proxy": "^1.0.2",
     "socket.io-client": "^4.5.1",
@@ -37,7 +39,9 @@
   "scripts": {
     "lint": "eslint --ext \".js,.ts,.tsx\" .",
     "lint-fix": "npm run lint -- --fix",
-    "test": "tap --no-coverage --color --timeout=300 test/core/unit/*.test.js && bash test/core/run.sh"
+    "test": "npm run test:unit && npm run test:acceptance",
+    "test:unit": "tap --no-coverage --color --timeout=300 test/core/unit/*.test.js",
+    "test:acceptance": "bash test/core/run.sh"
   },
   "devDependencies": {
     "@hapi/basic": "^6.0.0",