loadtest 6.4.0 → 7.1.0

package/lib/websocket.js

@@ -7,16 +7,16 @@ let latency;
 /**
  * Create a client for a websocket.
  */
-export function create(operation, params) {
-	return new WebsocketClient(operation, params);
+export function create(loadTest, options) {
+	return new WebsocketClient(loadTest, options);
 }
 
 /**
  * A client that connects to a websocket.
  */
 class WebsocketClient extends BaseClient {
-	constructor(operation, params) {
-		super(operation, params);
+	constructor(loadTest, options) {
+		super(loadTest, options);
 		this.connection = null;
 		this.lastCall = null;
 		this.client = null;
@@ -30,7 +30,7 @@ class WebsocketClient extends BaseClient {
 		this.client = new websocket.client();
 		this.client.on('connectFailed', () => {});
 		this.client.on('connect', connection => this.connect(connection));
-		this.client.connect(this.params.url, []);
+		this.client.connect(this.options.url, []);
 	}
 
 	/**
@@ -55,7 +55,7 @@ class WebsocketClient extends BaseClient {
 	 * Make a single request to the server.
 	 */
 	makeRequest() {
-		const id = this.operation.latency.start();
+		const id = this.loadTest.latency.start();
 		const requestFinished = this.getRequestFinisher(id);
 
 		if (this.connection.connected) {
@@ -115,7 +115,7 @@ class WebsocketClient extends BaseClient {
 			if (this.generateMessage) {
 				message = this.generateMessage(id);
 			}
-			if (typeof this.params.requestGenerator == 'function') {
+			if (typeof this.options.requestGenerator == 'function') {
 				// create a 'fake' object which can function like the http client
 				const req = () => {
 					return {
@@ -124,7 +124,7 @@ class WebsocketClient extends BaseClient {
 						}
 					};
 				};
-				this.params.requestGenerator(this.params, this.options, req, requestFinished);
+				this.options.requestGenerator(this.options, this.params, req, requestFinished);
 			} else {
 				this.connection.sendUTF(JSON.stringify(message));
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "loadtest",
-	"version": "6.4.0",
+	"version": "7.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",
@@ -23,7 +23,8 @@
 		"websocket": "^1.0.34"
 	},
 	"devDependencies": {
-		"eslint": "^8.47.0"
+		"eslint": "^8.47.0",
+		"microprofiler": "^2.0.0"
 	},
 	"keywords": [
 		"testing",

package/test/integration.js

@@ -187,13 +187,34 @@ async function testIndexParam() {
 	await server.close()
 }
 
+async function testStatusCallback() {
+	let calls = 0
+	const server = await startServer(serverOptions)
+	const options = {
+		url: `http://localhost:${PORT}/`,
+		maxRequests: 100,
+		concurrency: 10,
+		postBody: {
+			hi: 'hey',
+		},
+		quiet: true,
+		statusCallback: (error, result) => {
+			testing.assertEquals(result.statusCode, 200, 'Should receive status 200')
+			calls += 1
+		}
+	};
+	await loadTest(options)
+	testing.assertEquals(calls, 100, 'Should have 100 calls')
+	await server.close()
+}
+
 /**
  * Run all tests.
  */
 export function test(callback) {
 	testing.run([
 		testIntegration, testIntegrationFile, testDelay, testWSIntegration,
-		testPromise, testIndexParam,
+		testPromise, testIndexParam, testStatusCallback,
 	], 4000, callback);
 }