Merge pull request #6 from PlayNetwork/falseFix

Fix conditional to check if there is a result returned from Server method

.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - "4"
   - "6"
   - "8"
 after_success:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-ipc-lib",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Enables creation and consumption of Unix domain socket based IPC channels between Node.js apps using JSON-RPC 2.0 as a protocol.",
   "main": "./dist",
   "scripts": {

src/Client.js

@@ -99,7 +99,7 @@ export class Client {
 					}
 
 					// resolve when a result is received
-					if (response && response.result) {
+					if (response && typeof response.result !== 'undefined') {
 						return resolve(response.result);
 					}
 
@@ -173,4 +173,4 @@ export class Client {
 	}
 }
 
-export default { Client };
+export default { Client };

src/Server.js

@@ -204,7 +204,7 @@ export class Server extends EventEmitter {
 			}
 
 			// handle synchronous results
-			if (result && (!result.then || typeof result.then !== 'function')) {
+			if (typeof result !== 'undefined' && (!result.then || typeof result.then !== 'function')) {
 				debug('Server: method %s returned synchronously', socket.request.method);
 
 				// handle the result of the method when not a Promise...
@@ -340,4 +340,4 @@ export class Server extends EventEmitter {
 	}
 }
 
-export default { Server };
+export default { Server };

test/src/Client.js

@@ -16,6 +16,13 @@ describe('Client', () => {
 				waitToReturn : (duration, val) => new Promise((resolve) => setTimeout(
 					() => resolve(val),
 					duration))
+			},
+			d : {
+				falsePromise : () => Promise.resolve(false),
+				synchronousFalse : () => {
+					return false;
+				},
+				truePromise : () => Promise.resolve(true)
 			}
 		};
 
@@ -138,6 +145,51 @@ describe('Client', () => {
 			await server.close();
 		});
 
+		it('should support asynchronous server methods returning boolean true', async () => {
+			let
+				client = new Client(mockPath),
+				server = new Server(mockPath, mockServices);
+
+			await server.listen();
+
+			let result = await client.call('d.truePromise');
+
+			should.exist(result);
+			result.should.equal(true);
+
+			await server.close();
+		});
+
+		it('should support asynchronous server methods returning boolean false', async () => {
+			let
+				client = new Client(mockPath),
+				server = new Server(mockPath, mockServices);
+
+			await server.listen();
+
+			let result = await client.call('d.falsePromise');
+
+			should.exist(result);
+			result.should.equal(false);
+
+			await server.close();
+		});
+
+		it('should support synchronous server methods returning boolean false', async () => {
+			let
+				client = new Client(mockPath),
+				server = new Server(mockPath, mockServices);
+
+			await server.listen();
+
+			let result = await client.call('d.synchronousFalse');
+
+			should.exist(result);
+			result.should.equal(false);
+
+			await server.close();
+		});
+
 		it('should support timeout', async () => {
 			let
 				client = new Client(mockPath, { timeout : 500 }),
@@ -158,4 +210,4 @@ describe('Client', () => {
 			await server.close();
 		});
 	});
-});
+});