@usebruno/js 0.9.1 → 0.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usebruno/js",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "license": "MIT",
   "main": "src/index.js",
   "files": [
@@ -17,7 +17,7 @@
     "@usebruno/query": "0.1.0",
     "ajv": "^8.12.0",
     "atob": "^2.1.2",
-    "axios": "^0.26.0",
+    "axios": "^1.5.1",
     "btoa": "^1.2.1",
     "chai": "^4.3.7",
     "chai-string": "^1.5.0",
@@ -28,6 +28,7 @@
     "moment": "^2.29.4",
     "nanoid": "3.3.4",
     "node-fetch": "2.*",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.0",
+    "node-vault": "^0.10.2"
   }
 }

package/src/bru.js

@@ -1,6 +1,8 @@
 const Handlebars = require('handlebars');
 const { cloneDeep } = require('lodash');
 
+const variableNameRegex = /^[\w-.]*$/;
+
 class Bru {
   constructor(envVariables, collectionVariables, processEnvVars, collectionPath) {
     this.envVariables = envVariables;
@@ -43,12 +45,7 @@ class Bru {
 
   setEnvVar(key, value) {
     if (!key) {
-      throw new Error('Key is required');
-    }
-
-    // gracefully ignore if key is not present in environment
-    if (!this.envVariables.hasOwnProperty(key)) {
-      return;
+      throw new Error('Creating a env variable without specifying a name is not allowed.');
     }
 
     this.envVariables[key] = value;
@@ -56,13 +53,27 @@ class Bru {
 
   setVar(key, value) {
     if (!key) {
-      throw new Error('Key is required');
+      throw new Error('Creating a variable without specifying a name is not allowed.');
+    }
+
+    if (variableNameRegex.test(key) === false) {
+      throw new Error(
+        `Variable name: "${key}" contains invalid characters!` +
+          ' Names must only contain alpha-numeric characters, "-", "_", "."'
+      );
     }
 
     this.collectionVariables[key] = value;
   }
 
   getVar(key) {
+    if (variableNameRegex.test(key) === false) {
+      throw new Error(
+        `Variable name: "${key}" contains invalid characters!` +
+          ' Names must only contain alpha-numeric characters, "-", "_", "."'
+      );
+    }
+
     return this.collectionVariables[key];
   }
 }

package/src/bruno-response.js

@@ -5,6 +5,7 @@ class BrunoResponse {
     this.statusText = res ? res.statusText : null;
     this.headers = res ? res.headers : null;
     this.body = res ? res.data : null;
+    this.responseTime = res ? res.responseTime : null;
   }
 
   getStatus() {
@@ -22,6 +23,10 @@ class BrunoResponse {
   getBody() {
     return this.res ? this.res.data : null;
   }
+
+  getResponseTime() {
+    return this.res ? this.res.responseTime : null;
+  }
 }
 
 module.exports = BrunoResponse;

package/src/runtime/script-runtime.js

@@ -26,6 +26,7 @@ const axios = require('axios');
 const fetch = require('node-fetch');
 const chai = require('chai');
 const CryptoJS = require('crypto-js');
+const NodeVault = require('node-vault');
 
 class ScriptRuntime {
   constructor() {}
@@ -46,6 +47,11 @@ class ScriptRuntime {
     const req = new BrunoRequest(request);
     const allowScriptFilesystemAccess = get(scriptingConfig, 'filesystemAccess.allow', false);
     const moduleWhitelist = get(scriptingConfig, 'moduleWhitelist', []);
+    const additionalContextRoots = get(scriptingConfig, 'additionalContextRoots', []);
+    const additionalContextRootsAbsolute = lodash
+      .chain(additionalContextRoots)
+      .map((acr) => (acr.startsWith('/') ? acr : path.join(collectionPath, acr)))
+      .value();
 
     const whitelistedModules = {};
 
@@ -83,7 +89,7 @@ class ScriptRuntime {
       require: {
         context: 'sandbox',
         external: true,
-        root: [collectionPath],
+        root: [collectionPath, ...additionalContextRootsAbsolute],
         mock: {
           // node libs
           path,
@@ -107,7 +113,8 @@ class ScriptRuntime {
           'node-fetch': fetch,
           'crypto-js': CryptoJS,
           ...whitelistedModules,
-          fs: allowScriptFilesystemAccess ? fs : undefined
+          fs: allowScriptFilesystemAccess ? fs : undefined,
+          'node-vault': NodeVault
         }
       }
     });
@@ -196,7 +203,8 @@ class ScriptRuntime {
           'node-fetch': fetch,
           'crypto-js': CryptoJS,
           ...whitelistedModules,
-          fs: allowScriptFilesystemAccess ? fs : undefined
+          fs: allowScriptFilesystemAccess ? fs : undefined,
+          'node-vault': NodeVault
         }
       }
     });

package/src/runtime/test-runtime.js

@@ -28,6 +28,7 @@ const nanoid = require('nanoid');
 const axios = require('axios');
 const fetch = require('node-fetch');
 const CryptoJS = require('crypto-js');
+const NodeVault = require('node-vault');
 
 class TestRuntime {
   constructor() {}
@@ -48,6 +49,11 @@ class TestRuntime {
     const res = new BrunoResponse(response);
     const allowScriptFilesystemAccess = get(scriptingConfig, 'filesystemAccess.allow', false);
     const moduleWhitelist = get(scriptingConfig, 'moduleWhitelist', []);
+    const additionalContextRoots = get(scriptingConfig, 'additionalContextRoots', []);
+    const additionalContextRootsAbsolute = lodash
+      .chain(additionalContextRoots)
+      .map((acr) => (acr.startsWith('/') ? acr : path.join(collectionPath, acr)))
+      .value();
 
     const whitelistedModules = {};
 
@@ -101,7 +107,7 @@ class TestRuntime {
       require: {
         context: 'sandbox',
         external: true,
-        root: [collectionPath],
+        root: [collectionPath, ...additionalContextRootsAbsolute],
         mock: {
           // node libs
           path,
@@ -125,7 +131,8 @@ class TestRuntime {
           'node-fetch': fetch,
           'crypto-js': CryptoJS,
           ...whitelistedModules,
-          fs: allowScriptFilesystemAccess ? fs : undefined
+          fs: allowScriptFilesystemAccess ? fs : undefined,
+          'node-vault': NodeVault
         }
       }
     });

package/src/utils.js

@@ -109,6 +109,7 @@ const createResponseParser = (response = {}) => {
   res.statusText = response.statusText;
   res.headers = response.headers;
   res.body = response.data;
+  res.responseTime = response.responseTime;
 
   res.jq = (expr) => {
     const output = jsonQuery(expr, { data: response.data });