@artilleryio/int-commons 2.17.0-d38a728 → 2.17.0-d42fb8f

package/engine_util.js

@@ -2,14 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-'use strict';
-
 const async = require('async');
 const debug = require('debug')('engine_util');
 const deepForEach = require('deep-for-each');
 const espree = require('espree');
 const L = require('lodash');
-const vm = require('vm');
+const vm = require('node:vm');
 const ms = require('ms');
 const A = require('async');
 const { JSONPath: jsonpath } = require('jsonpath-plus');
@@ -19,7 +17,7 @@ const jitter = require('./jitter').jitter;
 let xmlCapture;
 try {
   xmlCapture = require('artillery-xml-capture');
-} catch (e) {
+} catch (_e) {
   xmlCapture = null;
 }
 
@@ -40,15 +38,15 @@ module.exports = {
 function createThink(requestSpec, opts) {
   opts = opts || {};
 
-  let thinkspec = requestSpec.think;
+  const thinkspec = requestSpec.think;
 
-  let f = function think(context, callback) {
-    let templatedThink = template(thinkspec, context);
+  const f = function think(context, callback) {
+    const templatedThink = template(thinkspec, context);
     let thinktime = Number.isInteger(L.toNumber(templatedThink))
       ? ms(`${templatedThink}s`)
       : ms(templatedThink);
 
-    if (typeof thinktime == 'undefined') {
+    if (typeof thinktime === 'undefined') {
       throw new Error(`Invalid think time: ${templatedThink || thinkspec}`);
     }
 
@@ -62,7 +60,7 @@ function createThink(requestSpec, opts) {
       opts.jitter,
       thinktime
     );
-    setTimeout(function () {
+    setTimeout(() => {
       callback(null, context);
     }, thinktime);
   };
@@ -79,13 +77,13 @@ function createLoopWithCount(count, steps, opts) {
       count2 = template(count, context);
     }
 
-    let from = parseLoopCount(count2).from;
-    let to = parseLoopCount(count2).to;
+    const from = parseLoopCount(count2).from;
+    const to = parseLoopCount(count2).to;
 
     let i = from;
     let newContext = context;
-    let loopIndexVar = (opts && opts.loopValue) || '$loopCount';
-    let loopElementVar = (opts && opts.loopElement) || '$loopElement';
+    const loopIndexVar = opts?.loopValue || '$loopCount';
+    const loopElementVar = opts?.loopElement || '$loopElement';
     // Should we stop early because the value of "over" is not an array
     let abortEarly = false;
 
@@ -125,12 +123,10 @@ function createLoopWithCount(count, steps, opts) {
         }
       },
       function repeated(cb) {
-        let zero = function (cb2) {
-          return cb2(null, newContext);
-        };
-        let steps2 = L.flatten([zero, steps]);
+        const zero = (cb2) => cb2(null, newContext);
+        const steps2 = L.flatten([zero, steps]);
 
-        A.waterfall(steps2, function (err, context2) {
+        A.waterfall(steps2, (err, context2) => {
           if (err) {
             return cb(err, context2);
           }
@@ -152,7 +148,7 @@ function createLoopWithCount(count, steps, opts) {
           }
         });
       },
-      function (err, finalContext) {
+      (err, finalContext) => {
         if (typeof finalContext === 'undefined') {
           // this happens if test() returns false immediately, e.g. with
           // nested loops where one of the inner loops goes over an
@@ -166,21 +162,19 @@ function createLoopWithCount(count, steps, opts) {
 }
 
 function createParallel(steps, opts) {
-  let limit = (opts && opts.limitValue) || 100;
+  const limit = opts?.limitValue || 100;
 
   return function aParallel(context, callback) {
-    let newContext = context;
-    let newCallback = callback;
+    const newContext = context;
+    const newCallback = callback;
 
     // Remap the steps array to pass the context into each step.
-    let newSteps = L.map(steps, function (step) {
-      return function (callback) {
-        step(newContext, callback);
-      };
+    const newSteps = L.map(steps, (step) => (callback) => {
+      step(newContext, callback);
     });
 
     // Run each of the steps in parallel.
-    A.parallelLimit(newSteps, limit, function (err, finalContext) {
+    A.parallelLimit(newSteps, limit, (err, _finalContext) => {
       // We don't need to do anything with the array of contexts returned from each step at the moment.
       return newCallback(err, newContext);
     });
@@ -197,7 +191,7 @@ function isProbableEnough(obj) {
     probability = 100;
   }
 
-  let r = L.random(100);
+  const r = L.random(100);
   return r < probability;
 }
 
@@ -221,7 +215,7 @@ function template(o, context, inPlace) {
     }
     const funcCallRegex =
       /{{\s*(\$[A-Za-z0-9_]+\s*\(\s*[A-Za-z0-9_,\s]*\s*\))\s*}}/;
-    let match = o.match(funcCallRegex);
+    const match = o.match(funcCallRegex);
     if (match) {
       // This looks like it could be a function call:
       const syntax = espree.parse(match[1]);
@@ -231,10 +225,11 @@ function template(o, context, inPlace) {
         syntax.body.length === 1 &&
         syntax.body[0].type === 'ExpressionStatement'
       ) {
-        let funcName = syntax.body[0].expression.callee.name;
-        let args = L.map(syntax.body[0].expression.arguments, function (arg) {
-          return arg.value;
-        });
+        const funcName = syntax.body[0].expression.callee.name;
+        const args = L.map(
+          syntax.body[0].expression.arguments,
+          (arg) => arg.value
+        );
         if (funcName in context.funcs) {
           return template(
             o.replace(funcCallRegex, context.funcs[funcName].apply(null, args)),
@@ -271,7 +266,8 @@ function templateObjectOrArray(o, context) {
     debug(
       `path = ${path} ; value = ${JSON.stringify(
         value
-      )} (${typeof value}) ; (subj type: ${subj.length ? 'list' : 'hash'
+      )} (${typeof value}) ; (subj type: ${
+        subj.length ? 'list' : 'hash'
       }) ; newValue = ${JSON.stringify(newValue)} ; newPath = ${newPath}`
     );
 
@@ -293,8 +289,8 @@ function templateObjectOrArray(o, context) {
 }
 
 function renderVariables(str, vars) {
-  const RX = /{{{?[\s$\w\.\[\]\'\"-]+}}}?/g;
-  let rxmatch;
+  const RX = /{{{?[\s$\w.[\]'"-]+}}}?/g;
+  let _rxmatch;
   let result = str.substring(0, str.length);
 
   // Special case for handling integer/boolean/object substitution:
@@ -312,7 +308,7 @@ function renderVariables(str, vars) {
   }
 
   while (result.search(RX) > -1) {
-    let templateStr = result.match(RX)[0];
+    const templateStr = result.match(RX)[0];
     const varName = templateStr.replace(/{/g, '').replace(/}/g, '').trim();
 
     let varValue = L.get(vars, varName);
@@ -328,11 +324,11 @@ function renderVariables(str, vars) {
 
 // Presume code is valid JS code (i.e. that it has been checked elsewhere)
 function evil(sandbox, code) {
-  let context = vm.createContext(sandbox);
-  let script = new vm.Script(code);
+  const context = vm.createContext(sandbox);
+  const script = new vm.Script(code);
   try {
     return script.runInContext(context);
-  } catch (e) {
+  } catch (_e) {
     return null;
   }
 }
@@ -345,8 +341,8 @@ function parseLoopCount(countSpec) {
     from = 0;
     to = countSpec;
   } else if (typeof countSpec === 'string') {
-    if (isNaN(Number(countSpec))) {
-      if (/\d\-\d/.test(countSpec)) {
+    if (Number.isNaN(Number(countSpec))) {
+      if (/\d-\d/.test(countSpec)) {
         from = Number(countSpec.split('-')[0]);
         to = Number(countSpec.split('-')[1]);
       } else {
@@ -399,7 +395,7 @@ function captureOrMatch(params, response, context, done) {
     return done(null, null);
   }
 
-  let result = {
+  const result = {
     captures: {},
     matches: {},
     failedCaptures: false
@@ -409,15 +405,15 @@ function captureOrMatch(params, response, context, done) {
   ensurePropertyIsAList(params, 'capture');
   ensurePropertyIsAList(params, 'match');
 
-  let specs = params.capture.concat(params.match);
+  const specs = params.capture.concat(params.match);
 
   async.eachSeries(
     specs,
-    function (spec, next) {
-      let parsedSpec = parseSpec(spec, response);
-      let parser = parsedSpec.parser;
-      let extractor = parsedSpec.extractor;
-      let expr = parsedSpec.expr;
+    (spec, next) => {
+      const parsedSpec = parseSpec(spec, response);
+      const parser = parsedSpec.parser;
+      const extractor = parsedSpec.extractor;
+      const expr = parsedSpec.expr;
 
       // are we looking at body or headers:
       var content = response.body;
@@ -425,7 +421,7 @@ function captureOrMatch(params, response, context, done) {
         content = response.headers;
       }
 
-      parser(content, function (err, doc) {
+      parser(content, (err, doc) => {
         if (err) {
           if (spec.as) {
             result.captures[spec.as] = {
@@ -445,11 +441,11 @@ function captureOrMatch(params, response, context, done) {
           return next(null);
         }
 
-        let extractedValue = extractor(doc, template(expr, context), spec);
+        const extractedValue = extractor(doc, template(expr, context), spec);
 
         if (spec.value !== undefined) {
           // this is a match spec
-          let expected = template(spec.value, context);
+          const expected = template(spec.value, context);
           debug(
             'match: %s, expected: %s, got: %s',
             expr,
@@ -491,7 +487,7 @@ function captureOrMatch(params, response, context, done) {
         return next(null);
       });
     },
-    function (err) {
+    (err) => {
       if (err) {
         return done(err, null);
       } else {
@@ -602,8 +598,8 @@ function extractJSONPath(doc, expr, opts) {
 
 // doc is a string or an object (body parsed by Request when headers indicate JSON)
 function extractRegExp(doc, expr, opts) {
-  let group = opts.group;
-  let flags = opts.flags;
+  const group = opts.group;
+  const flags = opts.flags;
   let str;
   if (typeof doc === 'string') {
     str = doc;
@@ -616,7 +612,7 @@ function extractRegExp(doc, expr, opts) {
   } else {
     rx = new RegExp(expr);
   }
-  let match = rx.exec(str);
+  const match = rx.exec(str);
   if (!match) {
     return '';
   }
@@ -641,8 +637,8 @@ function extractHeader(headers, headerName) {
 }
 
 function extractCheerio(doc, expr, opts) {
-  let $ = cheerio.load(doc);
-  let els = $(expr);
+  const $ = cheerio.load(doc);
+  const els = $(expr);
   let i = 0;
   if (typeof opts.index !== 'undefined') {
     if (opts.index === 'random') {

package/jitter.js

@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-'use strict';
-
 module.exports = {
   jitter: jitter
 };
@@ -21,9 +19,9 @@ function jitter(sApprox) {
     return sApprox;
   }
 
-  let inputs = sApprox.split(':');
-  let nb = parseInt(inputs[0], 10);
-  let approxPercent = parseInt(inputs[1], 10);
+  const inputs = sApprox.split(':');
+  const nb = parseInt(inputs[0], 10);
+  const approxPercent = parseInt(inputs[1], 10);
 
   let approx = approxPercent;
   if (inputs[1].indexOf('%') >= 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artilleryio/int-commons",
-  "version": "2.17.0-d38a728",
+  "version": "2.17.0-d42fb8f",
   "main": "./index.js",
   "license": "MPL-2.0",
   "dependencies": {
@@ -14,8 +14,8 @@
     "ms": "^2.1.3"
   },
   "scripts": {
-    "lint": "eslint --ext \".js,.ts,.tsx\" .",
-    "lint-fix": "npm run lint -- --fix",
+    "lint": "npx @biomejs/biome check .",
+    "lint-fix": "npx @biomejs/biome check --write .",
     "test": "echo \"No test specified\" && exit 0"
   }
 }