Merge pull request #16 from oxygens/master

Small things.

Author: oxygen

README.MD

@@ -41,7 +41,7 @@ See `JSONRPC.ClientPluginBase` and `JSONRPC.ServerPluginBase`. Plugins may be ad
 
 Events may be used instead of plugins. Method names in `JSONRPC.ClientPluginBase` and `JSONRPC.ServerPluginBase` are also event names (event handlers have the same params) while `JSONRPC.Server` and `JSONRPC.Client` emit these events.
 
-Events may be more efficient than plugins, if very small performance gains matter. Plugins on the other hand help write readable and maintanable code (and are asynchronous).
+Events may be more efficient than plugins, if very small performance gains matter. Plugins on the other hand help write readable and maintainable code (and are asynchronous).
 
 
 ## Define an endpoint

bug.js

@@ -4,8 +4,8 @@
   "version": "3.2.3",
   "scripts": {
     "build": "node build.js",
-    "test": "node --expose-gc --max-old-space-size=3072 tests/main.js",
-    "benchmark": "node --expose-gc --max-old-space-size=3072 tests/benchmark.js",
+    "test": "node --expose-gc --max-old-space-size=1024 tests/main.js",
+    "benchmark": "node --expose-gc --max-old-space-size=1024 tests/benchmark.js",
     "lint": "eslint src tests --quiet"
   },
   "repository": {

package.json

@@ -1169,7 +1169,7 @@ class AllTests
 			{
 				return Math.round(Math.random() * (arrMethods.length - 1));
 			}
-		}
+		};
 
 		for(let i = 0; i < nCallCount; i++)
 		{

tests/AllTests.js

@@ -31,6 +31,7 @@ process.on(
 			// uws is consistently slower than ws when benchmarking with a few open connections (2) with the same number of calls.
 			// Most of the randomness was disabled when tested.
 			// Tested on nodejs 7.8.0, Windows 10, 64 bit.
+			// https://github.com/uWebSockets/uWebSockets/issues/585
 			console.log("===== uws (20,000 calls in parallel, over as many reused connections as possible)");
 			allTests = new AllTests(bBenchmarkMode, /*bWebSocketMode*/ true, require("uws"), require("uws").Server, JSONRPC.WebSocketAdapters.uws.WebSocketWrapper, /*bDisableVeryLargePacket*/ true);
 			allTests.websocketServerPort = allTests.httpServerPort + 1;
@@ -40,6 +41,24 @@ process.on(
 			console.log("");
 
 
+			console.log("===== uws.Server, ws.Client (20,000 calls in parallel, over as many reused connections as possible)");
+			allTests = new AllTests(bBenchmarkMode, /*bWebSocketMode*/ true, require("ws"), require("uws").Server, JSONRPC.WebSocketAdapters.uws.WebSocketWrapper, /*bDisableVeryLargePacket*/ true);
+			allTests.websocketServerPort = allTests.httpServerPort + 1;
+			await allTests.runTests();
+			global.gc();
+			console.log("heapTotal after gc(): " + Math.round(process.memoryUsage().heapTotal / 1024 / 1024, 2) + " MB");
+			console.log("");
+
+
+			console.log("===== uw.Server, uws.Client (20,000 calls in parallel, over as many reused connections as possible)");
+			allTests = new AllTests(bBenchmarkMode, /*bWebSocketMode*/ true, require("uws"), require("ws").Server, JSONRPC.WebSocketAdapters.uws.WebSocketWrapper, /*bDisableVeryLargePacket*/ true);
+			allTests.websocketServerPort = allTests.httpServerPort + 1;
+			await allTests.runTests();
+			global.gc();
+			console.log("heapTotal after gc(): " + Math.round(process.memoryUsage().heapTotal / 1024 / 1024, 2) + " MB");
+			console.log("");
+
+
 			console.log("===== ws (20,000 calls in parallel, over as many reused connections as possible)");
 			allTests = new AllTests(bBenchmarkMode, /*bWebSocketMode*/ true, require("ws"), require("ws").Server, undefined, /*bDisableVeryLargePacket*/ true);
 			await allTests.runTests();

tests/benchmark.js

@@ -11,6 +11,8 @@ process.on(
 	}
 );
 
+// https://github.com/uWebSockets/uWebSockets/issues/586
+
 (
 	async () =>
 	{

tests/bug_uws_close_await_hang.js

@@ -11,6 +11,9 @@ process.on(
 	}
 );
 
+
+// https://github.com/uWebSockets/uWebSockets/issues/583
+
 (
 	async () =>
 	{

tests/bug_uws_send_large_string_connection_closed.js

@@ -19,6 +19,8 @@ process.on(
 		let allTests = new AllTests(bBenchmarkMode, /*bWebSocketMode*/ false);
 		await allTests.runTests();
 
+		// uws "Segmentation fault" on .close() in Travis.
+		// https://github.com/uWebSockets/uWebSockets/issues/583
 		//allTests = new AllTests(bBenchmarkMode, /*bWebSocketMode*/ true, require("uws"), require("uws").Server, JSONRPC.WebSocketAdapters.uws.WebSocketWrapper, /*bDisableVeryLargePacket*/ true);
 		//allTests.websocketServerPort = allTests.httpServerPort + 1;
 		//await allTests.runTests();