preflight + ES5Class 2.x

Author: pocesar

README.md

@@ -24,7 +24,7 @@ Firing up an efficient JSON-RPC server becomes extremely simple:
 var rpc = require('json-rpc2');
 
 var server = rpc.Server.create({
-    'websocket': true // is true by default
+    'websocket': true, // is true by default
     'headers': { // allow custom headers is empty by default
         'Access-Control-Allow-Origin': '*'
     }
@@ -122,8 +122,8 @@ Don't forget, when you are overloading an existing function, you can call the or
 var rpc = require('json-rpc2');
 
 rpc.Endpoint.implement({
-    'trace': function(direction, message){
-        this.$super(' (' + direction + ')', message); //call the last defined function
+    'trace': function($super, direction, message){
+        $super(' (' + direction + ')', message); //call the last defined function
     }
 });
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-rpc2",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "JSON-RPC 2.0 server and client library, with HTTP, TCP and Websocket endpoints",
   "main": "./src/jsonrpc.js",
   "keywords": [

src/connection.js

@@ -6,8 +6,6 @@ module.exports = function (classes){
     EventEmitter = classes.EventEmitter,
     Connection = EventEmitter.$define('Connection', {
       construct: function ($super, ep){
-        console.log('connection super', $super);
-
         $super();
 
         this.endpoint = ep;
@@ -64,7 +62,9 @@ module.exports = function (classes){
        */
       stream: function (onend){
         if (_.isFunction(onend)) {
-          this.on('end', onend);
+          this.on('end', function(){
+            onend();
+          });
         }
       },
 

src/socket-connection.js

@@ -14,8 +14,6 @@ module.exports = function (classes){
       construct: function ($super, endpoint, conn){
         var self = this;
 
-        console.log('socket connection super', $super);
-
         $super(endpoint);
 
         self.conn = conn;