loadtest 5.1.2 → 6.0.0

package/lib/loadtest.js

@@ -1,28 +1,13 @@
-'use strict';
+import * as http from 'http'
+import * as https from 'https'
+import * as httpClient from './httpClient.js'
+import * as websocket from './websocket.js'
+import {Latency} from './latency.js'
+import {HighResolutionTimer} from './hrtimer.js'
+import {processOptions} from './options.js'
 
-/**
- * Load Test a URL, website or websocket.
- * (C) 2013 Alex Fernández.
- */
-
-
-// requires
-const Log = require('log');
-const http = require('http');
-const https = require('https');
-const testing = require('testing');
-const httpClient = require('./httpClient.js');
-const websocket = require('./websocket.js');
-const {Latency} = require('./latency.js');
-const {HighResolutionTimer} = require('./hrtimer.js');
-
-// globals
-const log = new Log('info');
-
-// constants
 const SHOW_INTERVAL_MS = 5000;
 
-// init
 http.globalAgent.maxSockets = 1000;
 https.globalAgent.maxSockets = 1000;
 
@@ -41,42 +26,23 @@ https.globalAgent.maxSockets = 1000;
  *	- contentType: the MIME type to use for the body, default text/plain.
  *	- requestsPerSecond: how many requests per second to send.
  *	- agentKeepAlive: if true, then use connection keep-alive.
- *	- debug: show debug messages.
- *	- quiet: do not log any messages.
  *	- indexParam: string to replace with a unique index.
  *	- insecure: allow https using self-signed certs.
+ *	- debug: show debug messages (deprecated).
+ *	- quiet: do not log any messages (deprecated).
  * An optional callback will be called if/when the test finishes.
  */
-exports.loadTest = function(options, callback) {
-	if (!options.url) {
-		log.error('Missing URL in options');
-		return;
-	}
-	options.concurrency = options.concurrency || 1;
-	if (options.requestsPerSecond) {
-		options.requestsPerSecond = options.requestsPerSecond / options.concurrency;
-	}
-	if (options.debug) {
-		log.level = Log.DEBUG;
-	}
-	if (!options.url.startsWith('http://') && !options.url.startsWith('https://') && !options.url.startsWith('ws://')) {
-		log.error('Invalid URL %s, must be http://, https:// or ws://', options.url);
-		return;
-	}
-	if (callback && !('quiet' in options)) {
-		options.quiet = true;
-	}
-
-	if (options.url.startsWith('ws:')) {
-		if (options.requestsPerSecond) {
-			log.error('"requestsPerSecond" not supported for WebSockets');
+export function loadTest(options, callback) {
+	processOptions(options, error => {
+		if (error) {
+			if (callback) return callback(error)
+			throw new error
 		}
-	}
-
-	const operation = new Operation(options, callback);
-	operation.start();
-	return operation;
-};
+		const operation = new Operation(options, callback);
+		operation.start();
+		return operation;
+	})
+}
 
 /**
  * Used to keep track of individual load test Operation runs.
@@ -122,9 +88,6 @@ class Operation {
 			if (this.completedRequests == this.options.maxRequests) {
 				this.stop();
 			}
-			if (this.requests > this.options.maxRequests) {
-				log.debug('Should have no more running clients');
-			}
 		}
 		if (this.running && next) {
 			next();
@@ -202,97 +165,3 @@ class Operation {
 	}
 }
 
-/**
- * A load test with max seconds.
- */
-function testMaxSeconds(callback) {
-	const options = {
-		url: 'http://localhost:7357/',
-		maxSeconds: 0.1,
-		concurrency: 1,
-		quiet: true,
-	};
-	exports.loadTest(options, callback);
-}
-
-
-/**
- * A load test with max seconds.
- */
-function testWSEcho(callback) {
-	const options = {
-		url: 'ws://localhost:7357/',
-		maxSeconds: 0.1,
-		concurrency: 1,
-		quiet: true,
-	};
-	exports.loadTest(options, callback);
-}
-
-function testIndexParam(callback) {
-	const options = {
-		url: 'http://localhost:7357/replace',
-		concurrency:1,
-		quiet: true,
-		maxSeconds: 0.1,
-		indexParam: "replace"
-	};
-	exports.loadTest(options, callback);
-}
-
-function testIndexParamWithBody(callback) {
-	const options = {
-		url: 'http://localhost:7357/replace',
-		concurrency:1,
-		quiet: true,
-		maxSeconds: 0.1,
-		indexParam: "replace",
-		body: '{"id": "replace"}'
-	};
-	exports.loadTest(options, callback);
-}
-
-function testIndexParamWithCallback(callback) {
-	const options = {
-		url: 'http://localhost:7357/replace',
-		concurrency:1,
-		quiet: true,
-		maxSeconds: 0.1,
-		indexParam: "replace",
-		indexParamCallback: function() {
-			//https://gist.github.com/6174/6062387
-			return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
-		}
-	};
-	exports.loadTest(options, callback);
-}
-
-function testIndexParamWithCallbackAndBody(callback) {
-	const options = {
-		url: 'http://localhost:7357/replace',
-		concurrency:1,
-		quiet: true,
-		maxSeconds: 0.1,
-		body: '{"id": "replace"}',
-		indexParam: "replace",
-		indexParamCallback: function() {
-			//https://gist.github.com/6174/6062387
-			return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
-		}
-	};
-	exports.loadTest(options, callback);
-}
-
-
-/**
- * Run all tests.
- */
-exports.test = function(callback) {
-	testing.run([testMaxSeconds, testWSEcho, testIndexParam, testIndexParamWithBody, testIndexParamWithCallback, testIndexParamWithCallbackAndBody], callback);
-};
-
-// run tests if invoked directly
-if (__filename == process.argv[1]) {
-	exports.test(testing.show);
-}
-

package/lib/options.js

@@ -0,0 +1,156 @@
+#!/usr/bin/env node
+
+import {readFile} from 'fs/promises'
+import * as path from 'path'
+import * as urlLib from 'url'
+import {addHeaders} from '../lib/headers.js'
+import {loadConfig} from '../lib/config.js'
+
+
+export function processOptions(options, callback) {
+	processOptionsAsync(options).then(result => callback(null, result)).catch(error => callback(error))
+}
+
+async function processOptionsAsync(options) {
+	const packageJson = JSON.parse(await readFile(new URL('../package.json', import.meta.url)))
+	if (!options.url) {
+		throw new Error('Missing URL in options')
+	}
+	options.concurrency = options.concurrency || 1;
+	if (options.requestsPerSecond) {
+		options.requestsPerSecond = options.requestsPerSecond / options.concurrency;
+	}
+	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('ws:')) {
+		if (options.requestsPerSecond) {
+			throw new Error(`"requestsPerSecond" not supported for WebSockets`);
+		}
+	}
+	const configuration = loadConfig();
+
+	options.agentKeepAlive = options.keepalive || options.agent || configuration.agentKeepAlive;
+	options.indexParam = options.index || configuration.indexParam;
+
+	//TODO: add index Param
+	// Allow a post body string in options
+	// Ex -P '{"foo": "bar"}'
+	if (options.postBody) {
+		options.method = 'POST';
+		options.body = options.postBody;
+	}
+	if (options.postFile) {
+		options.method = 'POST';
+		options.body = await readBody(options.postFile, '-p');
+	}
+	if (options.data) {
+		options.body = JSON.parse(options.data);
+	}
+	if (options.method) {
+		const acceptedMethods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'get', 'post', 'put', 'delete', 'patch'];
+		if (acceptedMethods.indexOf(options.method) === -1) {
+			options.method = 'GET';
+		}
+	}
+	if (options.putFile) {
+		options.method = 'PUT';
+		options.body = await readBody(options.putFile, '-u');
+	}
+	if (options.patchBody) {
+		options.method = 'PATCH';
+		options.body = options.patchBody;
+	}
+	if (options.patchFile) {
+		options.method = 'PATCH';
+		options.body = await readBody(options.patchFile, '-a');
+	}
+	if (!options.method) {
+		options.method = configuration.method;
+	}
+	if (!options.body) {
+		if(configuration.body) {
+			options.body = configuration.body;
+		} else if (configuration.file) {
+			options.body = await readBody(configuration.file, 'configuration.request.file');
+		}
+	}
+	options.requestsPerSecond = options.rps ? parseFloat(options.rps) : configuration.requestsPerSecond;
+	if (!options.key) {
+		options.key = configuration.key;
+	}
+	if (options.key) {
+		options.key = await readFile(options.key)
+	}
+	if (!options.cert) {
+		options.cert = configuration.cert;
+	}
+	if (options.cert) {
+		options.cert = await readFile(options.cert);
+	}
+
+	const defaultHeaders = options.headers || !configuration.headers ? {} : configuration.headers;
+	defaultHeaders['host'] = urlLib.parse(options.url).host;
+	defaultHeaders['user-agent'] = 'loadtest/' + packageJson.version;
+	defaultHeaders['accept'] = '*/*';
+
+	if (options.headers) {
+		addHeaders(options.headers, defaultHeaders);
+		console.log('headers: %s, %j', typeof defaultHeaders, defaultHeaders);
+	}
+	options.headers = defaultHeaders;
+
+	if (!options.requestGenerator) {
+		options.requestGenerator = configuration.requestGenerator;
+	}
+	if (typeof options.requestGenerator == 'string') {
+		options.requestGenerator = await import(options.requestGenerator)
+	}
+
+	// Use configuration file for other values
+	if(!options.maxRequests) {
+		options.maxRequests = configuration.maxRequests;
+	}
+	if(!options.concurrency) {
+		options.concurrency = configuration.concurrency;
+	}
+	if(!options.maxSeconds) {
+		options.maxSeconds = configuration.maxSeconds;
+	}
+	if(!options.timeout && configuration.timeout) {
+		options.timeout = configuration.timeout;
+	}
+	if(!options.contentType) {
+		options.contentType = configuration.contentType;
+	}
+	if(!options.cookies) {
+		options.cookies = configuration.cookies;
+	}
+	if(!options.secureProtocol) {
+		options.secureProtocol = configuration.secureProtocol;
+	}
+	if(!options.insecure) {
+		options.insecure = configuration.insecure;
+	}
+	if(!options.recover) {
+		options.recover = configuration.recover;
+	}
+	if(!options.proxy) {
+		options.proxy = configuration.proxy;
+	}
+}
+
+async function readBody(filename, option) {
+	if (typeof filename !== 'string') {
+		throw new Error(`Invalid file to open with ${option}: ${filename}`);
+	}
+
+	if (path.extname(filename) === '.js') {
+		return await import(new URL(filename, `file://${process.cwd()}/`))
+	}
+
+	const ret = await readFile(filename, {encoding: 'utf8'}).replace("\n", "");
+
+	return ret;
+}
+

package/lib/testserver.js

@@ -1,24 +1,9 @@
-'use strict';
+import * as http from 'http'
+import {server as WebSocketServer} from 'websocket'
+import * as util from 'util'
+import * as net from 'net'
+import {Latency} from './latency.js'
 
-/**
- * Test server to load test.
- * (C) 2013 Alex Fernández.
- */
-
-
-// requires
-const testing = require('testing');
-const http = require('http');
-const WebSocketServer = require('websocket').server;
-const util = require('util');
-const net = require('net');
-const Log = require('log');
-const {Latency} = require('./latency.js');
-
-// globals
-const log = new Log('info');
-
-// constants
 const PORT = 7357;
 const LOG_HEADERS_INTERVAL_SECONDS = 1;
 
@@ -34,9 +19,6 @@ class TestServer {
 		this.wsServer = null;
 		this.latency = new Latency({});
 		this.debuggedTime = Date.now();
-		if (options.quiet) {
-			log.level = 'notice';
-		}
 	}
 
 	/**
@@ -63,7 +45,7 @@ class TestServer {
 			return this.createError('Could not start server on port ' + this.port + ': ' + error, callback);
 		});
 		this.server.listen(this.port, () => {
-			log.info('Listening on port %s', this.port);
+			console.info(`Listening on http://localhost:${this.port}/`);
 			if (callback) {
 				callback();
 			}
@@ -71,18 +53,15 @@ class TestServer {
 		this.wsServer.on('request', request => {
 			// explicity omitting origin check here.
 			const connection = request.accept(null, request.origin);
-			log.debug(' Connection accepted.');
 			connection.on('message', message => {
 				if (message.type === 'utf8') {
-					log.debug('Received Message: ' + message.utf8Data);
 					connection.sendUTF(message.utf8Data);
 				} else if (message.type === 'binary') {
-					log.debug('Received Binary Message of ' + message.binaryData.length + ' bytes');
 					connection.sendBytes(message.binaryData);
 				}
 			});
 			connection.on('close', () => {
-				log.info('Peer %s disconnected', connection.remoteAddress);
+				console.info('Peer %s disconnected', connection.remoteAddress);
 			});
 		});
 		return this.server;
@@ -93,7 +72,7 @@ class TestServer {
 	 */
 	createError(message, callback) {
 		if (!callback) {
-			return log.error(message);
+			return console.error(message);
 		}
 		callback(message);
 	}
@@ -127,7 +106,7 @@ class TestServer {
 	 */
 	socketListen(socket) {
 		socket.on('error', error => {
-			log.error('socket error: %s', error);
+			console.error('socket error: %s', error);
 			socket.end();
 		});
 		socket.on('data', data => this.readData(data));
@@ -137,16 +116,16 @@ class TestServer {
 	 * Read some data off the socket.
 	 */
 	readData(data) {
-		log.info('data: %s', data);
+		console.info('data: %s', data);
 	}
 
 	/**
 	 * Debug headers and other interesting information: POST body.
 	 */
 	debug(request) {
-		log.info('Headers for %s to %s: %s', request.method, request.url, util.inspect(request.headers));
+		console.info('Headers for %s to %s: %s', request.method, request.url, util.inspect(request.headers));
 		if (request.body) {
-			log.info('Body: %s', request.body);
+			console.info('Body: %s', request.body);
 		}
 	}
 
@@ -173,7 +152,7 @@ class TestServer {
 		}
 		const percent = parseInt(this.options.percent, 10);
 		if (!percent) {
-			log.error('Invalid error percent %s', this.options.percent);
+			console.error('Invalid error percent %s', this.options.percent);
 			return false;
 		}
 		return (Math.random() < percent / 100);
@@ -184,42 +163,13 @@ class TestServer {
  * Start a test server. Options can contain:
  *	- port: the port to use, default 7357.
  *	- delay: wait the given milliseconds before answering.
- *	- quiet: do not log any messages.
+ *	- quiet: do not log any messages (deprecated).
  *	- percent: give an error (default 500) on some % of requests.
  *	- error: set an HTTP error code, default is 500.
  * An optional callback is called after the server has started.
- * In this case the quiet option is enabled.
  */
-exports.startServer = function(options, callback) {
-	if (callback) {
-		options.quiet = true;
-	}
+export function startServer(options, callback) {
 	const server = new TestServer(options);
 	return server.start(callback);
-};
-
-function testStartServer(callback) {
-	const options = {
-		port: 10530,
-	};
-	const server = exports.startServer(options, error => {
-		testing.check(error, 'Could not start server', callback);
-		server.close(error => {
-			testing.check(error, 'Could not stop server', callback);
-			testing.success(callback);
-		});
-	});
-}
-
-/**
- * Run the tests.
- */
-exports.test = function(callback) {
-	testing.run([testStartServer], 5000, callback);
-};
-
-// start server if invoked directly
-if (__filename == process.argv[1]) {
-	exports.test(testing.show);
 }
 

package/lib/websocket.js

@@ -1,28 +1,15 @@
-'use strict';
+import websocket from 'websocket'
+import {BaseClient} from './baseClient.js'
 
-/**
- * Load test a websocket.
- * (C) 2013 Alex Fernández.
- */
-
-
-// requires
-const WebSocketClient = require('websocket').client;
-const testing = require('testing');
-const Log = require('log');
-const BaseClient = require('./baseClient.js').BaseClient;
-
-// globals
-const log = new Log('info');
 let latency;
 
 
 /**
  * Create a client for a websocket.
  */
-exports.create = function(operation, params) {
+export function create(operation, params) {
 	return new WebsocketClient(operation, params);
-};
+}
 
 /**
  * A client that connects to a websocket.
@@ -40,13 +27,10 @@ class WebsocketClient extends BaseClient {
 	 * Start the websocket client.
 	 */
 	start() {
-		this.client = new WebSocketClient();
-		this.client.on('connectFailed', error => {
-			log.debug('WebSocket client connection error ' + error);
-		});
+		this.client = new websocket.client();
+		this.client.on('connectFailed', () => {});
 		this.client.on('connect', connection => this.connect(connection));
 		this.client.connect(this.params.url, []);
-		log.debug('WebSocket client connected to ' + this.params.url);
 	}
 
 	/**
@@ -55,7 +39,6 @@ class WebsocketClient extends BaseClient {
 	stop() {
 		if (this.connection) {
 			this.connection.close();
-			log.debug('WebSocket client disconnected from ' + this.params.url);
 		}
 	}
 
@@ -100,7 +83,7 @@ class WebsocketClient extends BaseClient {
 				ended = true;
 
 				if (message.type != 'utf8') {
-					log.error('Invalid message type ' + message.type);
+					console.error('Invalid message type ' + message.type);
 					return;
 				}
 				let json;
@@ -108,12 +91,10 @@ class WebsocketClient extends BaseClient {
 					json = JSON.parse(message.utf8Data);
 				}
 				catch(e) {
-					log.error('Invalid JSON: ' + message.utf8Data);
+					console.error('Invalid JSON: ' + message.utf8Data);
 					return;
 				}
 
-				log.debug("Received response %j", json);
-
 				// eat the client_connected message we get at the beginning
 				if ((json && json[0] && json[0][0] == 'client_connected')) {
 					ended = false;
@@ -123,7 +104,6 @@ class WebsocketClient extends BaseClient {
 				if (this.lastCall) {
 					const newCall = new Date().getTime();
 					latency.add(newCall - this.lastCall);
-					log.debug('latency: ' + (newCall - this.lastCall));
 					this.lastCall = null;
 				}
 
@@ -152,29 +132,3 @@ class WebsocketClient extends BaseClient {
 	}
 }
 
-
-function testWebsocketClient(callback) {
-	const options = {
-		url: 'ws://localhost:7357/',
-		maxSeconds: 0.1,
-		concurrency: 1,
-		quiet: true,
-	};
-	exports.create({}, options);
-	testing.success(callback);
-}
-
-/**
- * Run tests, currently nothing.
- */
-exports.test = function(callback) {
-	testing.run([
-		testWebsocketClient,
-	], callback);
-};
-
-// start tests if invoked directly
-if (__filename == process.argv[1]) {
-	exports.test(testing.show);
-}
-

package/package.json

@@ -1,6 +1,7 @@
 {
 	"name": "loadtest",
-	"version": "5.1.2",
+	"version": "6.0.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",
 	"contributors": [
@@ -17,13 +18,12 @@
 		"agentkeepalive": "^2.0.3",
 		"confinode": "^2.1.1",
 		"https-proxy-agent": "^2.2.1",
-		"log": "1.4.*",
-		"stdio": "^0.2.3",
-		"testing": "^1.1.1",
-		"websocket": "^1.0.28"
+		"stdio": "0.2.7",
+		"testing": "^3.0.3",
+		"websocket": "^1.0.34"
 	},
 	"devDependencies": {
-		"eslint": "^4.19.1"
+		"eslint": "^8.47.0"
 	},
 	"keywords": [
 		"testing",
@@ -35,7 +35,7 @@
 		"black box"
 	],
 	"engines": {
-		"node": ">=10"
+		"node": ">=16"
 	},
 	"bin": {
 		"loadtest": "bin/loadtest.js",
@@ -43,7 +43,7 @@
 	},
 	"preferGlobal": true,
 	"scripts": {
-		"test": "node test.js",
+		"test": "node test/all.js",
 		"posttest": "eslint ."
 	},
 	"publishConfig": {

package/sample/post-file.js

@@ -0,0 +1,13 @@
+/**
+ * Sample post-file content for test.
+ * Contains a single exported function that generates the body.
+ */
+
+export default function bodyGenerator(requestId) {
+	// this object will be serialized to JSON and sent in the body of the request
+	return {
+		key: 'value',
+		requestId: requestId
+	}
+}
+