Merge pull request #9 from oxygens/master

oxygen · web-flow · commit 30a525247854 · 2017-04-22T12:33:32.000+03:00
License and badge fixes.
diff --git a/README.MD b/README.MD
@@ -1,6 +1,6 @@
 # Bidirectional JSON-RPC 2.0 server and client
 
-[![Version npm](https://img.shields.io/npm/v/ws.svg)](https://www.npmjs.com/package/jsonrpc-bidirectional)
+[![Version npm](https://img.shields.io/npm/v/jsonrpc-bidirectional.svg)](https://www.npmjs.com/package/jsonrpc-bidirectional)
 [![Linux build](https://travis-ci.org/oxygens/jsonrpc-bidirectional.svg?branch=master)](https://travis-ci.org/oxygens/jsonrpc-bidirectional)
 [![Windows Build](https://ci.appveyor.com/api/projects/status/github/oxygens/jsonrpc-bidirectional?branch=master&svg=true)](https://ci.appveyor.com/project/oxygens/jsonrpc-bidirectional)
 
diff --git a/builds/browser/es5/jsonrpc.min.js b/builds/browser/es5/jsonrpc.min.js
diff --git a/builds/browser/es5/jsonrpc.min.js.map b/builds/browser/es5/jsonrpc.min.js.map
diff --git a/builds/browser/es7/jsonrpc.min.js b/builds/browser/es7/jsonrpc.min.js
@@ -10290,7 +10290,7 @@ module.exports = class IncomingRequest {
 	}
 
 	set bidirectionalWebsocketRouter(bidirectionalWebsocketRouter) {
-		assert(bidirectionalWebsocketRouter.constructor.name === "BidirectionalWebsocketRouter");
+		assert(bidirectionalWebsocketRouter.constructor.name === "BidirectionalWebsocketRouter", "bidirectionalWebsocketRouter must be an instance of BidirectionalWebsocketRouter.");
 
 		this._bidirectionalWebsocketRouter = bidirectionalWebsocketRouter;
 	}
@@ -12864,7 +12864,7 @@ module.exports = class BidirectionalWebsocketRouter extends EventEmitter {
 	}
 
 	connectionIDToSingletonClient(nConnectionID, ClientClass) {
-		assert(typeof nConnectionID === "number");
+		assert(typeof nConnectionID === "number", "nConnectionID must be a number. Received this: " + JSON.stringify(nConnectionID));
 		assert(typeof ClientClass === "function", "Invalid ClientClass value: " + typeof ClientClass);
 
 		if (!this._objSessions.hasOwnProperty(nConnectionID)) {
@@ -13496,9 +13496,9 @@ JSONRPC.ServerPluginBase = __webpack_require__(15);
 module.exports = class DebugLogger extends JSONRPC.ServerPluginBase {
 	async beforeJSONDecode(incomingRequest) {
 		if (incomingRequest.requestBody.length > 1024 * 1024) {
-			console.log("[" + process.pid + "] [" + new Date().toISOString() + "] Received JSONRPC request at endpoint path" + incomingRequest.endpoint.path + ", " + incomingRequest.requestObject.method + "(). Larger than 1 MB, not logging. \n");
+			console.log("[" + process.pid + "] [" + new Date().toISOString() + "] Received JSONRPC request at endpoint path " + incomingRequest.endpoint.path + ", " + incomingRequest.requestObject.method + "(). Larger than 1 MB, not logging. \n");
 		} else {
-			console.log("[" + process.pid + "] [" + new Date().toISOString() + "] Received JSONRPC request at endpoint path" + incomingRequest.endpoint.path + ": " + incomingRequest.requestBody + "\n");
+			console.log("[" + process.pid + "] [" + new Date().toISOString() + "] Received JSONRPC request at endpoint path " + incomingRequest.endpoint.path + ": " + incomingRequest.requestBody + "\n");
 		}
 	}
 
diff --git a/builds/browser/es7/jsonrpc.min.js.map b/builds/browser/es7/jsonrpc.min.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jsonrpc-bidirectional",
   "description": "Bidirectional JSONRPC over web sockets or HTTP with extensive plugin support.",
-  "version": "2.4.5",
+  "version": "2.4.12",
   "scripts": {
     "build": "node build.js",
     "test": "node tests/main.js",
diff --git a/src/BidirectionalWebsocketRouter.js b/src/BidirectionalWebsocketRouter.js
@@ -132,7 +132,7 @@ class BidirectionalWebsocketRouter extends EventEmitter
 	 */
 	connectionIDToSingletonClient(nConnectionID, ClientClass)
 	{
-		assert(typeof nConnectionID === "number");
+		assert(typeof nConnectionID === "number", "nConnectionID must be a number. Received this: " + JSON.stringify(nConnectionID));
 		assert(typeof ClientClass === "function", "Invalid ClientClass value: " + (typeof ClientClass));
 
 		if(!this._objSessions.hasOwnProperty(nConnectionID))
diff --git a/src/Plugins/Server/DebugLogger.js b/src/Plugins/Server/DebugLogger.js
@@ -13,11 +13,11 @@ class DebugLogger extends JSONRPC.ServerPluginBase
 	{
 		if(incomingRequest.requestBody.length > 1024 * 1024)
 		{
-			console.log("[" + process.pid + "] [" + (new Date()).toISOString() + "] Received JSONRPC request at endpoint path" + incomingRequest.endpoint.path + ", " + incomingRequest.requestObject.method + "(). Larger than 1 MB, not logging. \n");
+			console.log("[" + process.pid + "] [" + (new Date()).toISOString() + "] Received JSONRPC request at endpoint path " + incomingRequest.endpoint.path + ", " + incomingRequest.requestObject.method + "(). Larger than 1 MB, not logging. \n");
 		}
 		else
 		{
-			console.log("[" + process.pid + "] [" + (new Date()).toISOString() + "] Received JSONRPC request at endpoint path" + incomingRequest.endpoint.path + ": " + incomingRequest.requestBody + "\n");
+			console.log("[" + process.pid + "] [" + (new Date()).toISOString() + "] Received JSONRPC request at endpoint path " + incomingRequest.endpoint.path + ": " + incomingRequest.requestBody + "\n");
 		}
 	}
 
diff --git a/tests/AllTests.js b/tests/AllTests.js
@@ -272,7 +272,8 @@ class AllTests
 			"error",
 			(error) => {
 				console.error(error);
-				process.exit(1);
+				//process.exit(1); // Why did I put this here?
+				throw error;
 			}
 		);
 
diff --git a/tests/Browser/TestEndpoint.js b/tests/Browser/TestEndpoint.js
@@ -2,6 +2,8 @@
 /* eslint-disable */
 
 /**
+ * Keep everything IE10 compatible, so it can be tested there as well.
+ * 
  * @class
  */
 function TestEndpoint()
@@ -10,7 +12,7 @@ function TestEndpoint()
 		this,
 		[
 			/*strName*/ "Test", 
-			/*strPath*/ location.protocol + "//" + location.host + '/api',  // /api, replaced / with \x2F because issues.
+			/*strPath*/ location.protocol + "//" + location.host + "/api", 
 			/*objReflection*/ {},
 			/*classReverseCallsClient*/ JSONRPC.Client
 		]
diff --git a/tests/Browser/index.html b/tests/Browser/index.html
@@ -79,10 +79,10 @@
 					client.rpc("ping", ["Calling from html es5 client, http mode."]).then(genericTestsPromiseCatch).catch(genericTestsPromiseCatch);
 				}
 
-				console.info('JSONRPC.Client instantiated as window.client.');
-				console.info('Example call: ');
-				console.debug('client.rpc("ping", ["Calling from browser ES5 client."]).then(console.log).catch(console.error);');
-				console.info('The above command is known to work in at least Internet Explorer 10.');
+				console.info("JSONRPC.Client instantiated as window.client.");
+				console.info("Example call: ");
+				console.debug("client.rpc('ping', ['Calling from browser ES5 client.']).then(console.log).catch(console.error);");
+				console.info("The above command is known to work in at least Internet Explorer 10.");
 			}
 
 
diff --git a/webpack.config.js b/webpack.config.js
@@ -71,12 +71,12 @@ module.exports = [
 						${objPackageJSON.name} v${objPackageJSON.version}
 						${objPackageJSON.description}
 						${objPackageJSON.homepage}
-						${objPackageJSON.homepage}/blob/master/LICENSE
-					*/`.replace(/\t+/g, "\t")
+						\n\n${fs.readFileSync("./LICENSE")}
+					*/`.replace(/\t+/g, "")
 				}
 			})
 		]
-	}/*,
+	},
 	{
 		target: "web", 
 		externals: {
@@ -115,6 +115,6 @@ module.exports = [
 		},
 		plugins: [
 		]
-	}*/
+	}
 ];
 

Original file line number	Diff line number	Diff line change
`@@ -10290,7 +10290,7 @@ module.exports = class IncomingRequest {`
`10290`	`10290`	`}`
`10291`	`10291`
`10292`	`10292`	`set bidirectionalWebsocketRouter(bidirectionalWebsocketRouter) {`
`10293`		`- assert(bidirectionalWebsocketRouter.constructor.name === "BidirectionalWebsocketRouter");`
	`10293`	`+ assert(bidirectionalWebsocketRouter.constructor.name === "BidirectionalWebsocketRouter", "bidirectionalWebsocketRouter must be an instance of BidirectionalWebsocketRouter.");`
`10294`	`10294`
`10295`	`10295`	`this._bidirectionalWebsocketRouter = bidirectionalWebsocketRouter;`
`10296`	`10296`	`}`
`@@ -12864,7 +12864,7 @@ module.exports = class BidirectionalWebsocketRouter extends EventEmitter {`
`12864`	`12864`	`}`
`12865`	`12865`
`12866`	`12866`	`connectionIDToSingletonClient(nConnectionID, ClientClass) {`
`12867`		`- assert(typeof nConnectionID === "number");`
	`12867`	`+ assert(typeof nConnectionID === "number", "nConnectionID must be a number. Received this: " + JSON.stringify(nConnectionID));`
`12868`	`12868`	`assert(typeof ClientClass === "function", "Invalid ClientClass value: " + typeof ClientClass);`
`12869`	`12869`
`12870`	`12870`	`if (!this._objSessions.hasOwnProperty(nConnectionID)) {`
`@@ -13496,9 +13496,9 @@ JSONRPC.ServerPluginBase = __webpack_require__(15);`
`13496`	`13496`	`module.exports = class DebugLogger extends JSONRPC.ServerPluginBase {`
`13497`	`13497`	`async beforeJSONDecode(incomingRequest) {`
`13498`	`13498`	`if (incomingRequest.requestBody.length > 1024 * 1024) {`
`13499`		`- console.log("[" + process.pid + "] [" + new Date().toISOString() + "] Received JSONRPC request at endpoint path" + incomingRequest.endpoint.path + ", " + incomingRequest.requestObject.method + "(). Larger than 1 MB, not logging. \n");`
	`13499`	`+ console.log("[" + process.pid + "] [" + new Date().toISOString() + "] Received JSONRPC request at endpoint path " + incomingRequest.endpoint.path + ", " + incomingRequest.requestObject.method + "(). Larger than 1 MB, not logging. \n");`
`13500`	`13500`	`} else {`
`13501`		`- console.log("[" + process.pid + "] [" + new Date().toISOString() + "] Received JSONRPC request at endpoint path" + incomingRequest.endpoint.path + ": " + incomingRequest.requestBody + "\n");`
	`13501`	`+ console.log("[" + process.pid + "] [" + new Date().toISOString() + "] Received JSONRPC request at endpoint path " + incomingRequest.endpoint.path + ": " + incomingRequest.requestBody + "\n");`
`13502`	`13502`	`}`
`13503`	`13503`	`}`
`13504`	`13504`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jsonrpc-bidirectional",`
`3`	`3`	`"description": "Bidirectional JSONRPC over web sockets or HTTP with extensive plugin support.",`
`4`		`- "version": "2.4.5",`
	`4`	`+ "version": "2.4.12",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "node build.js",`
`7`	`7`	`"test": "node tests/main.js",`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ class BidirectionalWebsocketRouter extends EventEmitter`
`132`	`132`	`*/`
`133`	`133`	`connectionIDToSingletonClient(nConnectionID, ClientClass)`
`134`	`134`	`{`
`135`		`- assert(typeof nConnectionID === "number");`
	`135`	`+ assert(typeof nConnectionID === "number", "nConnectionID must be a number. Received this: " + JSON.stringify(nConnectionID));`
`136`	`136`	`assert(typeof ClientClass === "function", "Invalid ClientClass value: " + (typeof ClientClass));`
`137`	`137`
`138`	`138`	`if(!this._objSessions.hasOwnProperty(nConnectionID))`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ class DebugLogger extends JSONRPC.ServerPluginBase`
`13`	`13`	`{`
`14`	`14`	`if(incomingRequest.requestBody.length > 1024 * 1024)`
`15`	`15`	`{`
`16`		`- console.log("[" + process.pid + "] [" + (new Date()).toISOString() + "] Received JSONRPC request at endpoint path" + incomingRequest.endpoint.path + ", " + incomingRequest.requestObject.method + "(). Larger than 1 MB, not logging. \n");`
	`16`	`+ console.log("[" + process.pid + "] [" + (new Date()).toISOString() + "] Received JSONRPC request at endpoint path " + incomingRequest.endpoint.path + ", " + incomingRequest.requestObject.method + "(). Larger than 1 MB, not logging. \n");`
`17`	`17`	`}`
`18`	`18`	`else`
`19`	`19`	`{`
`20`		`- console.log("[" + process.pid + "] [" + (new Date()).toISOString() + "] Received JSONRPC request at endpoint path" + incomingRequest.endpoint.path + ": " + incomingRequest.requestBody + "\n");`
	`20`	`+ console.log("[" + process.pid + "] [" + (new Date()).toISOString() + "] Received JSONRPC request at endpoint path " + incomingRequest.endpoint.path + ": " + incomingRequest.requestBody + "\n");`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,8 @@ class AllTests`
`272`	`272`	`"error",`
`273`	`273`	`(error) => {`
`274`	`274`	`console.error(error);`
`275`		`- process.exit(1);`
	`275`	`+ //process.exit(1); // Why did I put this here?`
	`276`	`+ throw error;`
`276`	`277`	`}`
`277`	`278`	`);`
`278`	`279`