loadtest 8.0.7 → 8.1.0

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/httpClient.js

@@ -3,7 +3,7 @@ import * as http from 'http'
 import * as https from 'https'
 import * as querystring from 'querystring'
 import * as websocket from 'websocket'
-import {addUserAgent} from './headers.js'
+import { addUserAgent } from './headers.js'
 import * as agentkeepalive from 'agentkeepalive'
 import * as HttpsProxyAgent from 'https-proxy-agent'
 
@@ -68,7 +68,7 @@ export class HttpClient {
 		}
 		if (this.options.cookies) {
 			if (Array.isArray(this.options.cookies)) {
-				this.params.headers.Cookie =  this.options.cookies.join('; ');
+				this.params.headers.Cookie = this.options.cookies.join('; ');
 			} else if (typeof this.options.cookies == 'string') {
 				this.params.headers.Cookie = this.options.cookies;
 			} else {
@@ -119,7 +119,7 @@ export class HttpClient {
 			return
 		}
 		const id = this.latency.begin();
-		const params = {...this.params, headers: {...this.params.headers}}
+		const params = { ...this.params, headers: { ...this.params.headers } }
 		this.customizeIndex(params)
 		const request = this.getRequest(id, params)
 		if (this.options.timeout) {
@@ -183,7 +183,7 @@ export class HttpClient {
 		if (this.params.protocol == 'https:') {
 			return https;
 		}
-		if (this.params.protocol == 'ws:') {
+		if (this.params.protocol == 'ws:' || this.params.protocol == 'wss:') {
 			return websocket;
 		}
 		return http;

package/lib/options.js

@@ -56,10 +56,10 @@ class Options {
 		if (!options.url) {
 			throw new Error('Missing URL in options')
 		}
-		if (!options.url.startsWith('http://') && !options.url.startsWith('https://') && !options.url.startsWith('ws://')) {
-			throw new Error(`Invalid URL ${options.url}, must be http://, https:// or ws://'`)
+		if (!options.url.startsWith('http://') && !options.url.startsWith('https://') && !options.url.startsWith('ws://') && !options.url.startsWith('wss://')) {
+			throw new Error(`Invalid URL ${options.url}, must be http://, https://, ws://, or wss://'`)
 		}
-		if (options.url.startsWith('ws:')) {
+		if (options.url.startsWith('ws:') || options.url.startsWith('wss:')) {
 			if (options.requestsPerSecond) {
 				throw new Error(`"requestsPerSecond" not supported for WebSockets`);
 			}
@@ -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/lib/pool.js

@@ -46,8 +46,7 @@ export class Pool {
 	}
 
 	createClient() {
-		// TODO: || this.options.url.startsWith('wss:'))
-		if (this.options.url.startsWith('ws:')) {
+		if (this.options.url.startsWith('ws:') || this.options.url.startsWith('wss:')) {
 			return new WebsocketClient(this.loadTest)
 		}
 		if (this.options.tcp) {

package/lib/websocket.js

@@ -1,5 +1,5 @@
 import websocket from 'websocket'
-import {BaseClient} from './baseClient.js'
+import { BaseClient } from './baseClient.js'
 
 let latency;
 
@@ -21,10 +21,13 @@ export class WebsocketClient extends BaseClient {
 	 * Start the websocket client.
 	 */
 	start() {
-		this.client = new websocket.client();
-		this.client.on('connectFailed', () => {});
+		this.client = new websocket.client({ rejectUnauthorized: false });
+		this.client.on('connectFailed', (e) => console.error(`Websocket connection error: ${e.message}`));
 		this.client.on('connect', connection => this.connect(connection));
-		this.client.connect(this.options.url, []);
+		if (this.options.insecure)
+			this.client.connect(this.options.url, undefined, undefined, undefined, { "rejectUnauthorized": false });
+		else
+			this.client.connect(this.options.url);
 	}
 
 	/**
@@ -84,7 +87,7 @@ export class WebsocketClient extends BaseClient {
 				try {
 					json = JSON.parse(message.utf8Data);
 				}
-				catch(e) {
+				catch (e) {
 					console.error('Invalid JSON: ' + message.utf8Data);
 					return;
 				}
@@ -104,7 +107,7 @@ export class WebsocketClient extends BaseClient {
 				requestFinished(null, json);
 			});
 
-			let message={some:"message"};
+			let message = { some: "message" };
 
 			if (this.generateMessage) {
 				message = this.generateMessage(id);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "loadtest",
-	"version": "8.0.7",
+	"version": "8.1.0",
 	"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);