Merge pull request #10 from golya/master

handle different data types at request

gulpfile.js

@@ -0,0 +1,19 @@
+var gulp = require('gulp');
+var mocha = require('gulp-mocha');
+
+var paths = {
+    src: 'src/*.js',
+    test: 'test/*.js'
+};
+
+gulp.task('default', ['test']);
+
+gulp.task('test', function () {
+    return gulp.src('test/*.js', {read: false})
+        .pipe(mocha({reporter: 'spec'}));
+});
+
+gulp.task('watch', function () {
+    gulp.watch(paths.src, ['test']);
+    gulp.watch(paths.test, ['test']);
+});

package.json

@@ -41,6 +41,8 @@
     "istanbul": "git://github.com/mekwall/istanbul.git",
     "koa": "^0.17.0",
     "koa-generic-session": "^1.6.0",
+    "gulp": "^3.9.0",
+    "gulp-mocha": "^2.1.3",
     "mocha": "^2.1.0",
     "mocha-lcov-reporter": "0.0.1",
     "supertest": "^0.15.0"

src/jsonrpc.js

@@ -1,6 +1,19 @@
 var Request = require('./request');
 
-module.exports = function (debug, socket, data) {
+module.exports = function(debug, socket, data) {
+    try {
+        return request.call(this, debug, socket, data);
+    } catch (e){
+        console.error('Something went wrong: ', e.stack);
+        return;
+    }
+};
+
+function request(debug, socket, data) {
+    if (typeof data != 'string') {
+        data = data.data;
+    }
+
     // If heartbeat, respond
     if (data === '--thump--') {
         debug('← Thump!');
@@ -85,4 +98,5 @@ module.exports = function (debug, socket, data) {
         socket.error.apply(request, [-32601, 'Method not found']);
     }
 
-};
+    return;
+}

src/middleware.js

@@ -22,6 +22,9 @@ module.exports = function (app, passedOptions) {
         debug('Attaching server...')
         app.server = oldListen.apply(app, arguments);
         app.ws.listen(app.server);
+        app.address = function() {
+            return app.server.address();
+        }
         return app;
     };
 

test/test.js

@@ -42,6 +42,13 @@ describe('koa-ws', function () {
             expect(app).to.have.property('ws');
         });
 
+        it('expect provide address', function () {
+            var address = app.listen().address();
+            expect(address.address).to.equal('::');
+            expect(address.family).to.be.a('string');
+            expect(address.port).to.be.a('number');
+        });
+
         it('expect to be able to register a simple server method', function () {
             app.ws.register('hello', function* () {
                 this.result('world');
@@ -234,3 +241,9 @@ describe('protocol', function () {
     });
 
 });
+
+describe('http server', function () {
+    it('expect close connection', function () {
+        app.server.close();
+    });
+});