Merge branch 'bencxr-allowStringIds'

Author: pocesar

package.json

@@ -1,51 +1,51 @@
-{
-  "name": "json-rpc2",
-  "version": "0.8.1",
-  "description": "JSON-RPC 2.0 server and client library, with HTTP, TCP and Websocket endpoints",
-  "main": "./src/jsonrpc.js",
-  "keywords": [
-    "json",
-    "rpc",
-    "rpc2",
-    "json-rpc",
-    "json-rpc2",
-    "jsonrpc",
-    "jsonrpc2",
-    "server",
-    "client",
-    "tcp",
-    "websocket",
-    "http"
-  ],
-  "author": "Eric Florenzano <floguy@gmail.com> (eflorenzano.com)",
-  "dependencies": {
-    "jsonparse": "0.x.x",
-    "debug": "1.x.x",
-    "lodash": "2.x.x",
-    "es5class": "2.x.x",
-    "faye-websocket": "0.x.x",
-    "eventemitter3": "0.x.x"
-  },
-  "engines": {
-    "node": "0.10.x"
-  },
-  "contributors": [
-    "Bill Casarin <bill@casarin.ca> (jb55.com)",
-    "Stefan Thomas <justmoon@members.fsf.org> (justmoon.net)",
-    "Paulo Cesar <email@pocesar.e4ward.com> (github.com/pocesar)"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/pocesar/node-jsonrpc2.git"
-  },
-  "devDependencies": {
-    "mocha": "1.x.x",
-    "expect.js": "0.x.x",
-    "jshint": "2.x.x",
-    "istanbul": "0.x.x"
-  },
-  "scripts": {
-    "test": "jshint examples src test && mocha test/*.js",
-    "coverage": "node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -t 5000 test/jsonrpc-test.js"
-  }
-}
+{
+  "name": "json-rpc2",
+  "version": "0.8.1",
+  "description": "JSON-RPC 2.0 server and client library, with HTTP, TCP and Websocket endpoints",
+  "main": "./src/jsonrpc.js",
+  "keywords": [
+    "json",
+    "rpc",
+    "rpc2",
+    "json-rpc",
+    "json-rpc2",
+    "jsonrpc",
+    "jsonrpc2",
+    "server",
+    "client",
+    "tcp",
+    "websocket",
+    "http"
+  ],
+  "author": "Eric Florenzano <floguy@gmail.com> (eflorenzano.com)",
+  "dependencies": {
+    "jsonparse": "0.x.x",
+    "debug": "1.x.x",
+    "lodash": "2.x.x",
+    "es5class": "2.x.x",
+    "faye-websocket": "0.x.x",
+    "eventemitter3": "0.x.x"
+  },
+  "engines": {
+    "node": "0.10.x"
+  },
+  "contributors": [
+    "Bill Casarin <bill@casarin.ca> (jb55.com)",
+    "Stefan Thomas <justmoon@members.fsf.org> (justmoon.net)",
+    "Paulo Cesar <email@pocesar.e4ward.com> (github.com/pocesar)"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/pocesar/node-jsonrpc2.git"
+  },
+  "devDependencies": {
+    "mocha": "1.x.x",
+    "expect.js": "0.x.x",
+    "jshint": "2.x.x",
+    "istanbul": "0.x.x"
+  },
+  "scripts": {
+    "test": "jshint examples src test && mocha test/*.js",
+    "coverage": "node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -t 5000 test/jsonrpc-test.js"
+  }
+}

src/event-emitter.js

@@ -13,12 +13,17 @@ module.exports = function (classes){
       return msg;
     },
     /**
-     * Check if current request has an integer id
+     * Check if current request has an id adn it is of type integer (non fractional) or string.
+     *
      * @param {Object} request
      * @return {Boolean}
      */
-    hasId : function (request){
-      return request && typeof request['id'] !== 'undefined' && /^\-?\d+$/.test(request['id']);
+    hasId : function (request) {
+      return request && typeof request['id'] !== 'undefined' &&
+      (
+        (typeof(request['id']) === 'number' && /^\-?\d+$/.test(request['id'])) ||
+        (typeof(request['id']) === 'string') || (request['id'] === null)
+      );
     }
   }).$inherit(require('eventemitter3').EventEmitter, []);
 

test/jsonrpc-test.js

@@ -174,6 +174,34 @@ module.exports = {
       expect(decoded.result).to.equal('Hello, World!');
     },
 
+    'Simple synchronous echo with id as null': function (){
+      var testJSON = '{ "method": "echo", "params": ["Hello, World!"], "id": null }';
+      var req = new MockRequest('POST');
+      var res = new MockResponse();
+      server.handleHttp(req, res);
+      req.emit('data', testJSON);
+      req.emit('end');
+      expect(res.httpCode).to.equal(200);
+      var decoded = JSON.parse(res.httpBody);
+      expect(decoded.id).to.equal(null);
+      expect(decoded.error).to.equal(undefined);
+      expect(decoded.result).to.equal('Hello, World!');
+    },
+
+    'Simple synchronous echo with string as id': function (){
+      var testJSON = '{ "method": "echo", "params": ["Hello, World!"], "id": "test" }';
+      var req = new MockRequest('POST');
+      var res = new MockResponse();
+      server.handleHttp(req, res);
+      req.emit('data', testJSON);
+      req.emit('end');
+      expect(res.httpCode).to.equal(200);
+      var decoded = JSON.parse(res.httpBody);
+      expect(decoded.id).to.equal('test');
+      expect(decoded.error).to.equal(undefined);
+      expect(decoded.result).to.equal('Hello, World!');
+    },
+
     'Using promise': function (){
       // Expose a function that just returns a promise that we can control.
       var callbackRef = null;