half way through

Author: pocesar

examples/client.js

@@ -4,7 +4,7 @@ var
 /*
  Connect to HTTP server
  */
-var client = rpc.Client.create(8088, 'localhost', 'myuser', 'secret123');
+var client = rpc.Client.$create(8088, 'localhost', 'myuser', 'secret123');
 
 client.call('add', [1, 2], function (err, result){
   if (err) {
@@ -31,7 +31,7 @@ client.call('delayed.echo', ['Echo.', 1500], function (err, result){
 /*
  Connect to Raw socket server
  */
-var socketClient = rpc.Client.create(8089, 'localhost', 'myuser', 'secret123');
+var socketClient = rpc.Client.$create(8089, 'localhost', 'myuser', 'secret123');
 
 socketClient.connectSocket(function (err, conn){
   if (err) {
@@ -67,7 +67,7 @@ socketClient.connectSocket(function (err, conn){
 /*
  Connect to Websocket server
  */
-var WebsocketClient = rpc.Client.create(8088, 'localhost', 'myuser', 'secret123');
+var WebsocketClient = rpc.Client.$create(8088, 'localhost', 'myuser', 'secret123');
 
 WebsocketClient.connectWebsocket(function (err, conn){
   if (err) {

examples/server.js

@@ -1,6 +1,6 @@
 var rpc = require('../src/jsonrpc');
 
-var server = rpc.Server.create({
+var server = rpc.Server.$create({
   websocket: true
 });
 

examples/stream-client.js

@@ -12,7 +12,7 @@ var rpc = require('../src/jsonrpc');
 /*
  Connect to HTTP server
  */
-var client = rpc.Client.create(8088, 'localhost');
+var client = rpc.Client.$create(8088, 'localhost');
 
 client.stream('listen', [], function (err, connection){
   if (err) {
@@ -32,7 +32,7 @@ client.stream('listen', [], function (err, connection){
 /*
  Connect to Raw socket server
  */
-var socketClient = rpc.Client.create(8089, 'localhost');
+var socketClient = rpc.Client.$create(8089, 'localhost');
 
 socketClient.connectSocket(function (err, conn){
   if (err) {

package.json

@@ -22,7 +22,7 @@
     "jsonparse": "*",
     "debug": "*",
     "lodash": "*",
-    "es5class": "1.x.x",
+    "es5class": "2.x.x",
     "faye-websocket": "*",
     "eventemitter3": "*"
   },

src/client.js

@@ -16,8 +16,8 @@ module.exports = function (classes){
      * JSON-RPC Client.
      */
       Client = Endpoint.$define('Client', {
-      construct    : function (port, host, user, password){
-        this.$super();
+      construct    : function ($super, port, host, user, password){
+        $super();
 
         this.port = port;
         this.host = host;

src/connection.js

@@ -5,8 +5,10 @@ module.exports = function (classes){
     _ = classes._,
     EventEmitter = classes.EventEmitter,
     Connection = EventEmitter.$define('Connection', {
-      construct: function (ep){
-        this.$super();
+      construct: function ($super, ep){
+        console.log('connection super', $super);
+
+        $super();
 
         this.endpoint = ep;
         this.callbacks = {};

src/endpoint.js

@@ -11,8 +11,8 @@ module.exports = function (classes){
      * Has the ability to register RPC events and expose RPC methods.
      */
       Endpoint = EventEmitter.$define('Endpoint', {
-      construct : function (){
-        this.$super();
+      construct : function ($super){
+        $super();
 
         this.functions = {};
         this.scopes = {};

src/error.js

@@ -8,15 +8,16 @@ module.exports = function (classes){
 
   Errors.AbstractError = classes.ES5Class.$define('AbstractError', {
     construct: function(message, extra){
-      this.name = this.$class.$className;
+      this.name = this.$className;
       this.extra = extra || {};
-      this.message = message || this.$class.$className;
+      this.message = message || this.$className;
+
       Error.captureStackTrace(this, this.$class);
     },
     toString: function(){
       return this.message;
     }
-  }).$implement(Error, true);
+  }).$inherit(Error, []);
 
   Errors.ParseError = Errors.AbstractError.$define('ParseError', {
     code: -32700

src/event-emitter.js

@@ -20,7 +20,7 @@ module.exports = function (classes){
     hasId : function (request){
       return request && typeof request['id'] !== 'undefined' && /^\-?\d+$/.test(request['id']);
     }
-  }).$implement(require('eventemitter3').EventEmitter, true);
+  }).$inherit(require('eventemitter3').EventEmitter, []);
 
   return EventEmitter;
 };

src/http-server-connection.js

@@ -4,10 +4,10 @@ module.exports = function (classes){
   var
     Connection = classes.Connection,
     HttpServerConnection = Connection.$define('HttpServerConnection', {
-    construct: function (server, req, res){
+    construct: function ($super, server, req, res){
       var self = this;
 
-      this.$super(server);
+      $super(server);
 
       this.req = req;
       this.res = res;
@@ -21,8 +21,8 @@ module.exports = function (classes){
     /**
      * Can be called before the response callback to keep the connection open.
      */
-    stream: function (onend){
-      this.$super(onend);
+    stream: function ($super, onend){
+      $super(onend);
 
       this.isStreaming = true;
     },