@artilleryio/int-commons 2.0.1 → 2.0.2-18ad4ac

package/engine_util.js

@@ -10,6 +10,7 @@ const deepForEach = require('deep-for-each');
 const espree = require('espree');
 const L = require('lodash');
 const vm = require('vm');
+const ms = require('ms');
 const A = require('async');
 const { JSONPath: jsonpath } = require('jsonpath-plus');
 const cheerio = require('cheerio');
@@ -22,6 +23,8 @@ try {
   xmlCapture = null;
 }
 
+// TODO Write tests
+
 module.exports = {
   createThink: createThink,
   createLoopWithCount: createLoopWithCount,
@@ -40,7 +43,15 @@ function createThink(requestSpec, opts) {
   let thinkspec = requestSpec.think;
 
   let f = function think(context, callback) {
-    let thinktime = parseFloat(template(thinkspec, context)) * 1000;
+    let templatedThink = template(thinkspec, context);
+    let thinktime = Number.isInteger(L.toNumber(templatedThink))
+      ? ms(`${templatedThink}s`)
+      : ms(templatedThink);
+
+    if (typeof thinktime == 'undefined') {
+      throw new Error(`Invalid think time: ${templatedThink || thinkspec}`);
+    }
+
     if (requestSpec.jitter || opts.jitter) {
       thinktime = jitter(`${thinktime}:${requestSpec.jitter || opts.jitter}`);
     }
@@ -607,10 +618,16 @@ function extractRegExp(doc, expr, opts) {
     return '';
   }
 
+  // Captures named group (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Named_capturing_group)
   if (group && match.groups) {
     return match.groups[group];
+    // Captures integer index defined group since those don't show up in match.groups
+  } else if (group && match[group]) {
+    return match[group];
+    // Defaults to first match if found and no group defined
   } else if (match[0]) {
     return match[0];
+    // If no match returns empty string
   } else {
     return '';
   }

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@artilleryio/int-commons",
-  "version": "2.0.1",
+  "version": "2.0.2-18ad4ac",
   "main": "./index.js",
+  "license": "MPL-2.0",
   "dependencies": {
     "async": "^2.6.4",
     "cheerio": "^1.0.0-rc.10",
@@ -9,10 +10,11 @@
     "deep-for-each": "^3.0.0",
     "espree": "^9.4.1",
     "jsonpath-plus": "^7.2.0",
-    "lodash": "^4.17.19"
+    "lodash": "^4.17.19",
+    "ms": "^2.1.3"
   },
   "scripts": {
     "lint": "eslint --ext \".js,.ts,.tsx\" .",
     "lint-fix": "npm run lint -- --fix"
   }
-}
+}