@artilleryio/int-core 2.3.1-fde8a88 → 2.4.0-042221c

package/lib/engine_http.js

@@ -220,9 +220,19 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
     return function (context, callback) {
       let processFunc = self.config.processor[requestSpec.function];
       if (processFunc) {
-        return processFunc(context, ee, function (hookErr) {
-          return callback(hookErr, context);
-        });
+        if (processFunc.constructor.name === 'Function') {
+          return processFunc(context, ee, function (hookErr) {
+            return callback(hookErr, context);
+          });
+        } else {
+          return processFunc(context, ee)
+            .then(() => {
+              callback(null, context);
+            })
+            .catch((err) => {
+              callback(err, context);
+            });
+        }
       } else {
         debug(`Function "${requestSpec.function}" not defined`);
         debug('processor: %o', self.config.processor);
@@ -280,7 +290,8 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
     const requestParams = _.extend(_.clone(params), {
       url: maybePrependBase(params.url || params.uri, config), // *NOT* templating here
       method: method,
-      timeout: timeout * 1000
+      timeout: timeout * 1000,
+      uuid: crypto.randomUUID()
     });
 
     if (context._enableCookieJar) {
@@ -309,12 +320,16 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
           console.log(`WARNING: custom function ${fn} could not be found`); // TODO: a 'warning' event
         }
 
-        processFunc(requestParams, context, ee, function (err) {
-          if (err) {
-            return next(err);
-          }
-          return next(null);
-        });
+        if (processFunc.constructor.name === 'Function') {
+          processFunc(requestParams, context, ee, function (err) {
+            if (err) {
+              return next(err);
+            }
+            return next(null);
+          });
+        } else {
+          processFunc(requestParams, context, ee).then(next).catch(next);
+        }
       },
       function done(err) {
         if (err) {
@@ -548,7 +563,7 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
               let haveFailedCaptures = false;
 
               if (result !== null) {
-                ee.emit('trace:http:capture', result, uuid);
+                ee.emit('trace:http:capture', result, requestParams.uuid);
                 if (
                   Object.keys(result.matches).length > 0 ||
                   Object.keys(result.captures).length > 0
@@ -608,12 +623,24 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
                   // Got does not have res.body which Request.js used to have, so we attach it here:
                   res.body = body;
 
-                  processFunc(requestParams, res, context, ee, function (err) {
-                    if (err) {
-                      return next(err);
-                    }
-                    return next(null);
-                  });
+                  if (processFunc.constructor.name === 'Function') {
+                    processFunc(
+                      requestParams,
+                      res,
+                      context,
+                      ee,
+                      function (err) {
+                        if (err) {
+                          return next(err);
+                        }
+                        return next(null);
+                      }
+                    );
+                  } else {
+                    processFunc(requestParams, res, context, ee)
+                      .then(next)
+                      .catch(next);
+                  }
                 },
                 function (err) {
                   if (err) {
@@ -663,11 +690,10 @@ 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)
+        request(_.omit(requestParams, ['uuid']))
           .on('request', function (req) {
-            ee.emit('trace:http:request', requestParams, uuid);
+            ee.emit('trace:http:request', requestParams, requestParams.uuid);
 
             debugRequests('request start: %s', req.path);
             ee.emit('counter', 'http.requests', 1);
@@ -676,7 +702,7 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
               res.on('end', () => {
                 ee.emit('counter', 'http.downloaded_bytes', totalDownloaded);
               });
-              ee.emit('trace:http:response', res, uuid);
+              ee.emit('trace:http:response', res, requestParams.uuid);
               self._handleResponse(
                 requestParams,
                 res,
@@ -691,7 +717,7 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
             totalDownloaded = progress.total;
           })
           .on('error', function (err, body, res) {
-            ee.emit('trace:http:error', err, uuid);
+            ee.emit('trace:http:error', err, requestParams.uuid);
             if (err.name === 'HTTPError') {
               return;
             }

package/lib/engine_ws.js

@@ -141,9 +141,19 @@ WSEngine.prototype.step = function (requestSpec, ee) {
     return function (context, callback) {
       const processFunc = self.config.processor[requestSpec.function];
       if (processFunc) {
-        processFunc(context, ee, function () {
-          return callback(null, context);
-        });
+        if (processFunc.constructor.name === 'Function') {
+          processFunc(context, ee, function () {
+            return callback(null, context);
+          });
+        } else {
+          return processFunc(context, ee)
+            .then(() => {
+              callback(null, context);
+            })
+            .catch((err) => {
+              callback(err, context);
+            });
+        }
       }
     };
   }

package/lib/runner.js

@@ -77,15 +77,25 @@ function loadEngines(
   return { loadedEngines, warnings };
 }
 
-function loadProcessor(script, options) {
+async function loadProcessor(script, options) {
+  const absoluteScriptPath = path.resolve(process.cwd(), options.scriptPath);
   if (script.config.processor) {
-    const absoluteScriptPath = path.resolve(process.cwd(), options.scriptPath);
     const processorPath = path.resolve(
       path.dirname(absoluteScriptPath),
       script.config.processor
     );
-    const processor = require(processorPath);
-    script.config.processor = processor;
+
+    if (processorPath.endsWith('.mjs')) {
+      const exports = await import(processorPath);
+      script.config.processor = Object.assign(
+        {},
+        script.config.processor,
+        exports
+      );
+    } else {
+      // CJS (possibly transplied from TS)
+      script.config.processor = require(processorPath);
+    }
   }
 
   return script;
@@ -439,7 +449,7 @@ function createContext(script, contextVars, additionalProperties = {}) {
         $environment: script._environment,
         $processEnvironment: process.env, // TODO: deprecate
         $env: process.env,
-        $testId: global.artillery.testRunId,
+        $testId: global.artillery.testRunId
       },
       contextVars || {}
     ),

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@artilleryio/int-core",
-  "version": "2.3.1-fde8a88",
+  "version": "2.4.0-042221c",
   "main": "./index.js",
   "license": "MPL-2.0",
   "dependencies": {
-    "@artilleryio/int-commons": "2.0.4-fde8a88",
+    "@artilleryio/int-commons": "2.0.4-042221c",
     "@artilleryio/sketches-js": "^2.1.1",
     "agentkeepalive": "^4.1.0",
     "arrivals": "^2.1.2",
@@ -39,8 +39,8 @@
     "lint": "eslint --ext \".js,.ts,.tsx\" .",
     "lint-fix": "npm run lint -- --fix",
     "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"
+    "test:unit": "tap --no-coverage --color --timeout=300 test/unit/*.test.js",
+    "test:acceptance": "tap --no-coverage --color --timeout 300 test/acceptance/*.test.js && tap --no-coverage --color --timeout=300 test/acceptance/**/*.test.js"
   },
   "devDependencies": {
     "@hapi/basic": "^6.0.0",