loadtest 8.0.7 → 8.0.9

package/.loadtestrc

@@ -0,0 +1,2 @@
+{
+}

package/doc/api.md

@@ -109,7 +109,8 @@ An array of cookies to send. Each cookie should be a string of the form `name=va
 
 #### `headers`
 
-A map of headers. Each header should be an entry in the map with the value given as a string.
+An object containing headers of the form `key: 'value'}.
+Each attribute of the object should be a header with the value given as a string.
 If you want to have several values for a header, write a single value separated by semicolons,
 like this:
 

package/lib/headers.js

@@ -6,25 +6,30 @@
 export function addHeaders(rawHeaders, headers) {
 	if (Array.isArray(rawHeaders)) {
 		rawHeaders.forEach(function(header) {
-			addHeader(header, headers);
+			addTextHeader(header, headers);
 		});
 	} else if (typeof rawHeaders == 'string') {
-		addHeader(rawHeaders, headers);
+		addTextHeader(rawHeaders, headers);
+	} else if (typeof rawHeaders == 'object') {
+		for (const key of Object.keys(rawHeaders)) {
+			addHeader(key, rawHeaders[key], headers)
+		}
 	} else {
 		console.error('Invalid header structure %j, it should be an array', rawHeaders);
 	}
 }
 
-/**
- * Add a single header to an array.
- */
-function addHeader(rawHeader, headers) {
+function addTextHeader(rawHeader, headers) {
 	if (!rawHeader.includes(':')) {
 		return console.error('Invalid header %s, it should be in the form -H key:value', rawHeader);
 	}
 	const index = rawHeader.indexOf(':');
 	const key = rawHeader.substr(0, index);
 	const value = rawHeader.substr(index + 1);
+	addHeader(key, value, headers)
+}
+
+function addHeader(key, value, headers) {
 	headers[key.toLowerCase()] = value;
 }
 
@@ -33,7 +38,7 @@ function addHeader(rawHeader, headers) {
  */
 export function addUserAgent(headers) {
 	if(!headers['user-agent']) {
-		headers['user-agent'] = 'node.js loadtest bot';
+		addHeader('user-agent', 'node.js loadtest bot', headers)
 	}
 }
 

package/lib/options.js

@@ -118,7 +118,7 @@ class Options {
 		if (this.certFile) {
 			this.cert = await readFile(this.certFile);
 		}
-		if (typeof this.requestGenerator == 'string') {
+		if (this.requestGenerator && typeof this.requestGenerator == 'string') {
 			this.requestGenerator = await import(this.requestGenerator)
 		}
 		if (this.bodyFile) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "loadtest",
-	"version": "8.0.7",
+	"version": "8.0.9",
 	"type": "module",
 	"description": "Run load tests for your web application. Mostly ab-compatible interface, with an option to force requests per second. Includes an API for automated load testing.",
 	"homepage": "https://github.com/alexfernandez/loadtest",

package/test/headers.js

@@ -3,7 +3,7 @@ import {addHeaders, addUserAgent} from '../lib/headers.js'
 
 
 function testAddHeaders(callback) {
-	const tests = [ {
+	const tests = [{
 		raw: 'k:v',
 		headers: { 'k': 'v' }
 	}, {
@@ -18,8 +18,10 @@ function testAddHeaders(callback) {
 	}, {
 		raw: 'k:v:w',
 		headers: { 'k': 'v:w' }
-	}
-	];
+	}, {
+		raw: {accept: 'text/plain;text/html'},
+		headers: {accept: 'text/plain;text/html'},
+	}];
 	tests.forEach(function(test) {
 		const headers = {};
 		addHeaders(test.raw, headers);