@artilleryio/int-core 2.0.6 → 2.0.8

package/index.js

@@ -20,7 +20,8 @@ async function updateGlobalObject(opts = {}) {
 
   global.artillery.util = global.artillery.util || {};
 
-  global.artillery.util.template = require('@artilleryio/int-commons').engine_util.template;
+  global.artillery.util.template =
+    require('@artilleryio/int-commons').engine_util.template;
 
   global.artillery.plugins = global.artillery.plugins || [];
 
@@ -36,8 +37,7 @@ async function updateGlobalObject(opts = {}) {
   if (!global.artillery.hasOwnProperty('globalEvents')) {
     Object.defineProperty(global.artillery, 'globalEvents', {
       value: new EventEmitter()
-    })
-
+    });
   }
 
   global.artillery.__SSMS = require('./lib/ssms').SSMS;
@@ -50,23 +50,30 @@ async function updateGlobalObject(opts = {}) {
       set(code) {
         global.artillery._exitCode = code;
         if (typeof global.artillery._workerThreadSend === 'function') {
-          global.artillery._workerThreadSend({ event: 'setSuggestedExitCode', code: code });
+          global.artillery._workerThreadSend({
+            event: 'setSuggestedExitCode',
+            code: code
+          });
         }
       }
     });
   }
 
-  global.artillery.logger = global.artillery.logger || function (opts) {
-    return {
-      log: (...args) => {
-        global.artillery.globalEvents.emit('log', opts, ...args);
-      }
+  global.artillery.logger =
+    global.artillery.logger ||
+    function (opts) {
+      return {
+        log: (...args) => {
+          global.artillery.globalEvents.emit('log', opts, ...args);
+        }
+      };
     };
-  };
 
-  global.artillery.log = global.artillery.log || function (...args) {
-    global.artillery.globalEvents.emit('log', {}, ...args);
-  };
+  global.artillery.log =
+    global.artillery.log ||
+    function (...args) {
+      global.artillery.globalEvents.emit('log', {}, ...args);
+    };
 
   if (opts.version) {
     global.artillery.version = opts.version;

package/lib/engine_http.js

@@ -85,9 +85,9 @@ function HttpEngine(script) {
     this.config.http = {};
   }
 
-  if(typeof this.config.http.cookieJarOptions === 'undefined') {
+  if (typeof this.config.http.cookieJarOptions === 'undefined') {
     this.config.http.cookieJarOptions = {};
-  };
+  }
 
   // If config.http.pool is set, create & reuse agents for all requests (with
   // max sockets set). That's what we're done here.
@@ -507,7 +507,7 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
           debugResponse(JSON.stringify(body, null, 2));
 
           // capture/match/response hooks run only for last request in a task
-          if(!isLast) {
+          if (!isLast) {
             return done(null, context);
           }
 
@@ -612,10 +612,7 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
 
                   if (haveFailedMatches || haveFailedCaptures) {
                     // FIXME: This means only one error in the report even if multiple captures failed for the same request.
-                    return done(
-                      new Error('Failed capture or match'),
-                      context
-                    );
+                    return done(new Error('Failed capture or match'), context);
                   }
                   return done(null, context);
                 }
@@ -656,6 +653,7 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
         requestParams.retry = 0; // disable retries - ignored when using streams
 
         const uuid = crypto.randomUUID();
+        let totalDownloaded = 0;
         request(requestParams)
           .on('request', function (req) {
             ee.emit('trace:http:request', requestParams, uuid);
@@ -664,6 +662,9 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
             ee.emit('counter', 'http.requests', 1);
             ee.emit('rate', 'http.request_rate');
             req.on('response', function (res) {
+              res.on('end', () => {
+                ee.emit('counter', 'http.downloaded_bytes', totalDownloaded);
+              });
               ee.emit('trace:http:response', res, uuid);
               self._handleResponse(
                 requestParams,
@@ -674,7 +675,9 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
                 callback
               );
             });
-
+          })
+          .on('downloadProgress', (progress) => {
+            totalDownloaded = progress.total;
           })
           .on('error', function (err, body, res) {
             ee.emit('trace:http:error', err, uuid);
@@ -730,7 +733,9 @@ HttpEngine.prototype._handleResponse = function (
         try {
           context._jar.setCookieSync(cookieString, url);
         } catch (err) {
-          debug(`Could not parse cookieString "${cookieString}" from response header, skipping it`);
+          debug(
+            `Could not parse cookieString "${cookieString}" from response header, skipping it`
+          );
           debug(err);
           ee.emit('error', 'cookie_parse_error_invalid_cookie');
         }
@@ -768,8 +773,8 @@ HttpEngine.prototype._handleResponse = function (
 
     if (responseProcessor) {
       responseProcessor(isLastRequest, res, body, (processResponseErr) => {
-          // capture/match returned an error object, or a hook function returned
-          // with an error
+        // capture/match returned an error object, or a hook function returned
+        // with an error
         if (processResponseErr) {
           return callback(processResponseErr, context);
         }
@@ -791,15 +796,23 @@ function lastRequest(res, requestParams) {
   // - 3xx response and not following redirects
   // - not a 3xx response
 
-  return ((res.statusCode >= 300 && res.statusCode < 400 && !requestParams.followRedirect) ||
-         (res.statusCode < 300 || res.statusCode >= 400))
+  return (
+    (res.statusCode >= 300 &&
+      res.statusCode < 400 &&
+      !requestParams.followRedirect) ||
+    res.statusCode < 300 ||
+    res.statusCode >= 400
+  );
 }
 
 HttpEngine.prototype.setInitialContext = function (initialContext) {
   initialContext._successCount = 0;
 
   initialContext._defaultStrictCapture = this.config.defaults.strictCapture;
-  initialContext._jar = new tough.CookieJar(null, this.config.http.cookieJarOptions);
+  initialContext._jar = new tough.CookieJar(
+    null,
+    this.config.http.cookieJarOptions
+  );
 
   initialContext._enableCookieJar = false;
   // If a default cookie is set, we will use the jar straightaway:

package/lib/readers.js

@@ -11,9 +11,14 @@ module.exports = createReader;
 function createReader(order, spec) {
   if (order === 'sequence') {
     return createSequencedReader();
-  } else if (typeof order === 'undefined' && (typeof spec?.name !== 'undefined') && spec?.loadAll === true) {
+  } else if (
+    typeof order === 'undefined' &&
+    typeof spec?.name !== 'undefined' &&
+    spec?.loadAll === true
+  ) {
     return createEverythingReader(spec);
-  } else { // random
+  } else {
+    // random
     return createRandomReader();
   }
 }
@@ -42,10 +47,10 @@ function createEverythingReader(spec) {
       if (spec.fields?.length > 0) {
         for (const row of data) {
           let o = {};
-            for(let i = 0; i < spec.fields.length; i++) {
-              const fieldName = spec.fields[i];
-              o[fieldName] = row[i];
-            }
+          for (let i = 0; i < spec.fields.length; i++) {
+            const fieldName = spec.fields[i];
+            o[fieldName] = row[i];
+          }
           parsedData.push(o);
         }
       } else {

package/lib/runner.js

@@ -103,7 +103,10 @@ function prepareScript(script, payload) {
       runnableScript.config.payload = [
         {
           fields: runnableScript.config.payload.fields,
-          reader: createReader(runnableScript.config.payload.order, runnableScript.config.payload),
+          reader: createReader(
+            runnableScript.config.payload.order,
+            runnableScript.config.payload
+          ),
           data: payload
         }
       ];
@@ -386,7 +389,8 @@ function createContext(script, contextVars) {
       {
         target: script.config.target,
         $environment: script._environment,
-        $processEnvironment: process.env
+        $processEnvironment: process.env, // TODO: deprecate
+        $env: process.env
       },
       contextVars || {}
     ),

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@artilleryio/int-core",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "main": "./index.js",
   "dependencies": {
     "@artilleryio/int-commons": "latest",
-    "@artilleryio/sketches-js": "^1.0.4",
+    "@artilleryio/sketches-js": "^2.1.0",
     "agentkeepalive": "^4.1.0",
     "arrivals": "^2.1.2",
     "async": "^2.6.4",
@@ -26,7 +26,6 @@
     "https-proxy-agent": "^5.0.0",
     "lodash": "^4.17.19",
     "proxy": "^1.0.2",
-    "socket.io": "^3.1.2",
     "socket.io-client": "^4.5.1",
     "socketio-wildcard": "^2.0.0",
     "tough-cookie": "^4.0.0",
@@ -46,6 +45,7 @@
     "nock": "^11.8.2",
     "rewiremock": "^3.14.3",
     "sinon": "^4.5.0",
+    "socket.io": "^4.7.1",
     "tap": "15.2.3"
   }
 }