Merge pull request #32 from oxygen/master

NodeClusterBase work.

Author: oxygen

builds/browser/es5/jsonrpc.min.js

@@ -1,29 +1,35 @@
 // Do not use const here, webpack/babel issues.
-var objExports = {};
-
-objExports.Client = require("./src/Client");
-objExports.ClientPluginBase = require("./src/ClientPluginBase");
-
-objExports.Utils = require("./src/Utils.js");
-objExports.Exception = require("./src/Exception");
-
-objExports.EndpointBase = require("./src/EndpointBase.js");
-objExports.Server = require("./src/Server.js");
-objExports.ServerPluginBase = require("./src/ServerPluginBase");
-
-objExports.BidirectionalWebsocketRouter = require("./src/BidirectionalWebsocketRouter.js");
-objExports.BidirectionalWorkerRouter = require("./src/BidirectionalWorkerRouter.js");
-objExports.BidirectionalWebRTCRouter = require("./src/BidirectionalWebRTCRouter.js");
-objExports.RouterBase = require("./src/RouterBase.js");
-
-
-objExports.Plugins = objExports.Plugins || {};
-objExports.Plugins.Client = require("./src/Plugins/Client");
-objExports.Plugins.Server = require("./src/Plugins/Server");
-
-objExports.WebSocketAdapters = objExports.WebSocketAdapters || {};
-objExports.WebSocketAdapters.WebSocketWrapperBase = require("./src/WebSocketAdapters/WebSocketWrapperBase");
-objExports.WebSocketAdapters.uws = objExports.WebSocketAdapters.uws || {};
-objExports.WebSocketAdapters.uws.WebSocketWrapper = require("./src/WebSocketAdapters/uws/WebSocketWrapper");
+var objExports = {
+	Client: require("./src/Client"),
+	ClientPluginBase: require("./src/ClientPluginBase"),
+
+	Server: require("./src/Server"),
+	ServerPluginBase: require("./src/ServerPluginBase"),
+
+	EndpointBase: require("./src/EndpointBase"),
+
+	BidirectionalWebsocketRouter: require("./src/BidirectionalWebsocketRouter"),
+	BidirectionalWorkerRouter: require("./src/BidirectionalWorkerRouter"),
+	BidirectionalWebRTCRouter: require("./src/BidirectionalWebRTCRouter"),
+	RouterBase: require("./src/RouterBase"),
+	
+	Exception: require("./src/Exception"), 
+
+	Utils: require("./src/Utils"),
+
+	Plugins: {
+		Client: require("./src/Plugins/Client"),
+		Server: require("./src/Plugins/Server")
+	},
+
+	WebSocketAdapters: {
+		WebSocketWrapperBase: require("./src/WebSocketAdapters/WebSocketWrapperBase"),
+		uws: {
+			WebSocketWrapper: require("./src/WebSocketAdapters/uws/WebSocketWrapper")
+		}
+	},
+
+	NodeClusterBase: require("./src/NodeClusterBase")
+};
 
 module.exports = objExports;

builds/browser/es5/jsonrpc.min.js.map

@@ -1,4 +1,9 @@
 // Do not use const here, webpack/babel issues.
-module.exports = {
+var objExport = {
 	JSONRPC: require("./index")
 };
+
+objExport.JSONRPC.NodeClusterBase = null;
+delete objExport.JSONRPC.NodeClusterBase;
+
+module.exports = objExport;

builds/browser/es7/jsonrpc.min.js

@@ -1,7 +1,7 @@
 {
   "name": "jsonrpc-bidirectional",
   "description": "Bidirectional JSONRPC over web sockets or HTTP with extensive plugin support.",
-  "version": "5.5.4",
+  "version": "5.7.1",
   "scripts": {
     "build": "node build.js",
     "test": "node --expose-gc --max-old-space-size=1024 tests/main.js",
@@ -35,7 +35,9 @@
   },
   "dependencies": {
     "extendable-error-class": "^0.1.1",
-    "node-fetch": "^1.6.3"
+    "fs-promise": "^2.0.3",
+    "node-fetch": "^1.6.3",
+    "sleep-promise": "^2.0.0"
   },
   "optionalDependencies": {
     "babel-polyfill": "^6.23.0",
@@ -58,7 +60,6 @@
     "eslint-plugin-jsdoc": "^3.3.1",
     "phantom": "^4.0.12",
     "recursive-keys": "^0.9.0",
-    "sleep-promise": "^2.0.0",
     "uglify-js": "^2.8.22",
     "uws": "^0.14.5",
     "webpack": "^2.4.1",

builds/browser/es7/jsonrpc.min.js.map

@@ -166,7 +166,7 @@ class BidirectionalWebRTCRouter extends JSONRPC.RouterBase
 			return;
 		}
 
-		const bNotification = !objMessage.hasOwnProperty("id");
+		let bNotification = !objMessage.hasOwnProperty("id");
 
 		try
 		{
@@ -269,6 +269,9 @@ class BidirectionalWebRTCRouter extends JSONRPC.RouterBase
 			}
 			else
 			{
+				// Malformed message, will attempt to send a response.
+				bNotification = false;
+				
 				throw new Error("Unable to qualify the message as a JSONRPC request or response.");
 			}
 		}

index.js

@@ -212,7 +212,7 @@ class BidirectionalWebsocketRouter extends JSONRPC.RouterBase
 			return;
 		}
 
-		const bNotification = !objMessage.hasOwnProperty("id");
+		let bNotification = !objMessage.hasOwnProperty("id");
 
 		try
 		{
@@ -328,6 +328,9 @@ class BidirectionalWebsocketRouter extends JSONRPC.RouterBase
 			}
 			else
 			{
+				// Malformed message, will attempt to send a response.
+				bNotification = false;
+
 				throw new Error("Unable to qualify the message as a JSONRPC request or response.");
 			}
 		}

index_webpack.js

@@ -295,7 +295,7 @@ class BidirectionalWorkerRouter extends JSONRPC.RouterBase
 			return;
 		}
 
-		const bNotification = !objMessage.hasOwnProperty("id");
+		let bNotification = !objMessage.hasOwnProperty("id");
 
 		try
 		{
@@ -378,6 +378,9 @@ class BidirectionalWorkerRouter extends JSONRPC.RouterBase
 			}
 			else
 			{
+				// Malformed message, will attempt to send a response.
+				bNotification = false;
+
 				throw new Error("Unable to qualify the message as a JSONRPC request or response.");
 			}
 		}