@artilleryio/int-core 2.24.0 → 2.25.0-8732536

package/lib/engine_http.js

@@ -4,7 +4,6 @@
 
 const async = require('async');
 const _ = require('lodash');
-const request = require('got');
 const tough = require('tough-cookie');
 const debug = require('debug')('http');
 const debugRequests = require('debug')('http:request');
@@ -30,6 +29,30 @@ const crypto = require('node:crypto');
 
 module.exports = HttpEngine;
 
+const GOT_OPTION_NAMES = [
+  'url',
+  'searchParams',
+  'method',
+  'headers',
+  'body',
+  'json',
+  'form',
+  'allowGetBody',
+  'timeout',
+  'retry',
+  'encoding',
+  'cookieJar',
+  'followRedirect',
+  'maxRedirects',
+  'decompress',
+  'http2',
+  'agent',
+  'username',
+  'password',
+  'https',
+  'throwHttpErrors'
+];
+
 const DEFAULT_AGENT_OPTIONS = {
   keepAlive: true,
   keepAliveMsec: 1000
@@ -126,6 +149,10 @@ function HttpEngine(script) {
   }
 }
 
+HttpEngine.prototype.init = async function () {
+  this.request = (await import('got')).default;
+};
+
 HttpEngine.prototype.createScenario = function (scenarioSpec, ee) {
   ensurePropertyIsAList(scenarioSpec, 'beforeRequest');
   ensurePropertyIsAList(scenarioSpec, 'afterResponse');
@@ -274,7 +301,7 @@ 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,
       uuid: crypto.randomUUID()
     });
 
@@ -683,10 +710,14 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
           );
         }
 
-        requestParams.retry = 0; // disable retries - ignored when using streams
+        requestParams.retry = { limit: 0 }; // disable retries - ignored when using streams
+        // Convert scalar seconds to Got v14 timeout object right before request
+        const gotOptions = _.pick(requestParams, GOT_OPTION_NAMES);
+        gotOptions.timeout = { response: requestParams.timeout * 1000 };
 
         let totalDownloaded = 0;
-        request(_.omit(requestParams, ['uuid']))
+        self
+          .request(gotOptions)
           .on('request', (req) => {
             ee.emit('trace:http:request', requestParams, requestParams.uuid);
 
@@ -937,10 +968,16 @@ HttpEngine.prototype.compile = function compile(tasks, _scenarioSpec, ee) {
         context = await promisify(task)(context);
       } catch (taskErr) {
         ee.emit('error', taskErr.code || taskErr.message);
-        return callback(taskErr, context); // calling back for now for existing client code
+        if (callback) {
+          return callback(taskErr, context);
+        }
+        throw taskErr;
       }
     }
-    return callback(null, context);
+    if (callback) {
+      return callback(null, context);
+    }
+    return context;
   };
 };
 

package/lib/engine_socketio.js

@@ -23,6 +23,10 @@ function SocketIoEngine(script) {
   this.httpDelegate = new EngineHttp(script);
 }
 
+SocketIoEngine.prototype.init = async function () {
+  await this.httpDelegate.init();
+};
+
 SocketIoEngine.prototype.createScenario = function (scenarioSpec, ee) {
   // Adds scenario overridden configuration into the static config
   this.socketioOpts = { ...this.socketioOpts, ...scenarioSpec.socketio };

package/lib/runner.js

@@ -163,6 +163,16 @@ async function runner(script, payload, options, callback) {
     warnings
   );
 
+  for (const e of runnerEngines) {
+    if (
+      e &&
+      typeof e.init === 'function' &&
+      e.init.constructor.name === 'AsyncFunction'
+    ) {
+      await e.init();
+    }
+  }
+
   const promise = new Promise((resolve, _reject) => {
     ee.run = (contextVars) => {
       const runState = {
@@ -506,12 +516,23 @@ function $randomString(length = 10) {
   return s;
 }
 
-function handleScriptHook(hook, script, hookEvents, contextVars = {}) {
+async function handleScriptHook(hook, script, hookEvents, contextVars = {}) {
   if (!script[hook]) {
     return {};
   }
 
   const { loadedEngines: engines } = loadEngines(script, hookEvents);
+
+  for (const e of engines) {
+    if (
+      e &&
+      typeof e.init === 'function' &&
+      e.init.constructor.name === 'AsyncFunction'
+    ) {
+      await e.init();
+    }
+  }
+
   const ee = new EventEmitter();
 
   return new Promise((resolve, reject) => {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@artilleryio/int-core",
-  "version": "2.24.0",
+  "version": "2.25.0-8732536",
   "main": "./index.js",
   "license": "MPL-2.0",
   "dependencies": {
-    "@artilleryio/int-commons": "2.20.0",
+    "@artilleryio/int-commons": "2.21.0-8732536",
     "@artilleryio/sketches-js": "^2.1.1",
     "agentkeepalive": "^4.6.0",
     "arrivals": "^2.1.2",
     "async": "^2.6.4",
     "chalk": "^2.4.2",
-    "cheerio": "^1.1.2",
+    "cheerio": "^1.2.0",
     "cookie-parser": "^1.4.7",
     "csv-parse": "^4.16.3",
     "debug": "^4.4.3",
@@ -22,7 +22,7 @@
     "fast-deep-equal": "^3.1.3",
     "filtrex": "^0.5.4",
     "form-data": "^4.0.5",
-    "got": "^11.8.5",
+    "got": "^14.6.6",
     "hpagent": "^0.1.1",
     "https-proxy-agent": "^5.0.0",
     "lodash": "^4.17.21",