@artilleryio/int-core 2.0.10 → 2.0.11-006b8d0

package/lib/engine_http.js

@@ -85,6 +85,10 @@ function HttpEngine(script) {
     this.config.http = {};
   }
 
+  if (typeof this.config.http.defaults === 'undefined') {
+    this.config.http.defaults = {};
+  }
+
   if (typeof this.config.http.cookieJarOptions === 'undefined') {
     this.config.http.cookieJarOptions = {};
   }
@@ -197,7 +201,10 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
   }
 
   if (typeof requestSpec.think !== 'undefined') {
-    return engineUtil.createThink(requestSpec, self.config.defaults.think);
+    return engineUtil.createThink(
+      requestSpec,
+      self.config.http.defaults.think || self.config.defaults.think
+    );
   }
 
   if (typeof requestSpec.log !== 'undefined') {
@@ -350,8 +357,11 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
 
         // Request.js -> Got.js translation
         if (params.qs) {
-          requestParams.searchParams = template(params.qs, context);
+          requestParams.searchParams = qs.stringify(
+            template(params.qs, context)
+          );
         }
+
         if (typeof params.gzip === 'boolean') {
           requestParams.decompress = params.gzip;
         } else {
@@ -384,7 +394,8 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
 
         // Assign default headers then overwrite as needed
         let defaultHeaders = lowcaseKeys(
-          config.defaults.headers || { 'user-agent': USER_AGENT }
+          config.http.defaults.headers ||
+            config.defaults.headers || { 'user-agent': USER_AGENT }
         );
         const combinedHeaders = _.extend(
           defaultHeaders,
@@ -808,7 +819,9 @@ function lastRequest(res, requestParams) {
 HttpEngine.prototype.setInitialContext = function (initialContext) {
   initialContext._successCount = 0;
 
-  initialContext._defaultStrictCapture = this.config.defaults.strictCapture;
+  initialContext._defaultStrictCapture =
+    this.config.http.defaults.strictCapture ||
+    this.config.defaults.strictCapture;
   initialContext._jar = new tough.CookieJar(
     null,
     this.config.http.cookieJarOptions
@@ -816,8 +829,12 @@ HttpEngine.prototype.setInitialContext = function (initialContext) {
 
   initialContext._enableCookieJar = false;
   // If a default cookie is set, we will use the jar straightaway:
-  if (typeof this.config.defaults.cookie === 'object') {
-    initialContext._defaultCookie = this.config.defaults.cookie;
+  if (
+    typeof this.config.http.defaults.cookie === 'object' ||
+    typeof this.config.defaults.cookie === 'object'
+  ) {
+    initialContext._defaultCookie =
+      this.config.http.defaults.cookie || this.config.defaults.cookie;
     initialContext._enableCookieJar = true;
   }
 

package/lib/phases.js

@@ -10,8 +10,9 @@ const _ = require('lodash');
 const isUndefined = _.isUndefined;
 const arrivals = require('arrivals');
 const debug = require('debug')('phases');
-const crypto = require('crypto');
+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)) {
@@ -89,8 +107,11 @@ function phaser(phaseSpecs) {
 function createPause(spec, ee) {
   const duration = spec.pause * 1000;
   const task = function (callback) {
+    spec.startTime = Date.now();
+    spec.id = randomUUID();
     ee.emit('phaseStarted', spec);
     setTimeout(function () {
+      spec.endTime = Date.now();
       ee.emit('phaseCompleted', spec);
       return callback(null);
     }, duration);
@@ -144,12 +165,14 @@ function createRamp(spec, ee) {
   debug(`periodTick ${periodTick}`);
 
   return async function rampTask(callback) {
+    spec.startTime = Date.now();
+    spec.id = randomUUID();
     ee.emit('phaseStarted', spec);
     for (let period = 0; period < periods; period++) {
       ticker(period);
       await sleep(1000);
     }
-
+    spec.endTime = Date.now();
     ee.emit('phaseCompleted', spec);
   };
 
@@ -185,6 +208,8 @@ function createRamp(spec, ee) {
 
 function createArrivalCount(spec, ee) {
   const task = function (callback) {
+    spec.startTime = Date.now();
+    spec.id = randomUUID();
     ee.emit('phaseStarted', spec);
     const duration = spec.duration * 1000;
 
@@ -195,6 +220,7 @@ function createArrivalCount(spec, ee) {
         ee.emit('arrival', spec);
       });
       p.on('finished', function () {
+        spec.endTime = Date.now();
         ee.emit('phaseCompleted', spec);
         return callback(null);
       });
@@ -209,6 +235,8 @@ function createArrivalCount(spec, ee) {
 
 function createArrivalRate(spec, ee) {
   const task = function (callback) {
+    spec.startTime = Date.now();
+    spec.id = randomUUID();
     ee.emit('phaseStarted', spec);
     const ar = 1000 / spec.arrivalRate;
     const duration = spec.duration * 1000;
@@ -218,6 +246,7 @@ function createArrivalRate(spec, ee) {
       ee.emit('arrival', spec);
     });
     p.on('finished', function () {
+      spec.endTime = Date.now();
       ee.emit('phaseCompleted', spec);
       return callback(null);
     });

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@artilleryio/int-core",
-  "version": "2.0.10",
+  "version": "2.0.11-006b8d0",
   "main": "./index.js",
   "dependencies": {
-    "@artilleryio/int-commons": "latest",
+    "@artilleryio/int-commons": "2.0.1-006b8d0",
     "@artilleryio/sketches-js": "^2.1.1",
     "agentkeepalive": "^4.1.0",
     "arrivals": "^2.1.2",
@@ -25,6 +25,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 +38,9 @@
   "scripts": {
     "lint": "eslint --ext \".js,.ts,.tsx\" .",
     "lint-fix": "npm run lint -- --fix",
-    "test": "tap --no-coverage --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",
@@ -47,6 +50,6 @@
     "rewiremock": "^3.14.3",
     "sinon": "^4.5.0",
     "socket.io": "^4.7.1",
-    "tap": "15.2.3"
+    "tap": "^16.3.7"
   }
-}
+}