From: Darren <darren@darrenwhitlen.com>
Date: Fri, 30 Aug 2013 11:06:26 +0000 (+0100)
Subject: Engine.io + Engine.io.tools implemented
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3343212821f3622178c0f71ebd6d90f801c50c84;p=KiwiIRC.git

Engine.io + Engine.io.tools implemented
---

diff --git a/client/assets/libs/websocketrpc.js b/client/assets/libs/websocketrpc.js
deleted file mode 100644
index 01554f8..0000000
--- a/client/assets/libs/websocketrpc.js
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-    Create a document explaining the protocol
-*/
-
-function WebsocketRpc(eio_socket) {
-    var self = this;
-
-    this._next_id = 0;
-    this._callbacks = {};
-    this._socket = eio_socket;
-
-    this._mixinEmitter();
-    this._bindSocketListeners();
-}
-
-
-WebsocketRpc.prototype._bindSocketListeners = function() {
-    var self = this;
-
-    // Proxy the onMessage listener
-    this._onMessageProxy = function rpcOnMessageBoundFunction(){
-        self._onMessage.apply(self, arguments);
-    };
-    this._socket.on('message', this._onMessageProxy);
-};
-
-
-
-WebsocketRpc.prototype.dispose = function() {
-    if (this._onMessageProxy) {
-        this._socket.removeListener('message', this._onMessageProxy);
-        delete this._onMessageProxy;
-    }
-
-    this.removeAllListeners();
-};
-
-
-
-
-/**
- * The engine.io socket already has an emitter mixin so steal it from there
- */
-WebsocketRpc.prototype._mixinEmitter = function() {
-    var funcs = ['on', 'once', 'off', 'removeListener', 'removeAllListeners', 'emit', 'listeners', 'hasListeners'];
-
-    for (var i=0; i<funcs.length; i++) {
-        if (typeof this._socket[funcs[i]] === 'function')
-            this[funcs[i]] = this._socket[funcs[i]];
-    }
-};
-
-
-/**
- * Check if a packet is a valid RPC call
- */
-WebsocketRpc.prototype._isCall = function(packet) {
-    return (typeof packet.method !== 'undefined' &&
-            typeof packet.params !== 'undefined');
-};
-
-
-/**
- * Check if a packet is a valid RPC response
- */
-WebsocketRpc.prototype._isResponse = function(packet) {
-    return (typeof packet.id !== 'undefined' &&
-            typeof packet.response !== 'undefined');
-};
-
-
-
-/**
- * Make an RPC call
- * First argument must be the method name to call
- * If the last argument is a function, it is used as a callback
- * All other arguments are passed to the RPC method
- * Eg. Rpc.call('namespace.method_name', 1, 2, 3, callbackFn)
- */
-WebsocketRpc.prototype.call = function(method) {
-    var params, callback, packet;
-
-    // Get a normal array of passed in params
-    params = Array.prototype.slice.call(arguments, 1, arguments.length);
-
-    // If the last param is a function, take it as a callback and strip it out
-    if (typeof params[params.length-1] === 'function') {
-        callback = params[params.length-1];
-        params = params.slice(0, params.length-1);
-    }
-
-    packet = {
-        method: method,
-        params: params
-    };
-
-    if (typeof callback === 'function') {
-        packet.id = this._next_id;
-
-        this._next_id++;
-        this._callbacks[packet.id] = callback;
-    }
-
-    this.send(packet);
-};
-
-
-/**
- * Encode the packet into JSON and send it over the websocket
- */
-WebsocketRpc.prototype.send = function(packet) {
-    if (this._socket)
-        this._socket.send(JSON.stringify(packet));
-};
-
-
-/**
- * Handler for the websocket `message` event
- */
-WebsocketRpc.prototype._onMessage = function(message_raw) {
-    var self = this,
-        packet,
-        returnFn;
-
-    try {
-        packet = JSON.parse(message_raw);
-        if (!packet) throw 'Corrupt packet';
-    } catch(err) {
-        return;
-    }
-
-    if (this._isResponse(packet)) {
-        this._callbacks[packet.id].apply(this, packet.response);
-        delete this._callbacks[packet.id];
-
-    } else if (this._isCall(packet)) {
-        // Calls with an ID may be responded to
-        if (typeof packet.id !== 'undefined') {
-            returnFn = function returnCallFn() {
-                var value = Array.prototype.slice.call(arguments, 0);
-
-                var ret_packet = {
-                    id: packet.id,
-                    response: value
-                };
-
-                self.send(ret_packet);
-            };
-
-        } else {
-            returnFn = function noop(){};
-        }
-
-        this.emit.apply(this, [packet.method, returnFn].concat(packet.params));
-    }
-};
-
-
-
-
-// If running a node module, set the exports
-if (typeof module === 'object' && typeof module.exports !== 'undefined') {
-    module.exports = WebsocketRpc;
-}
diff --git a/client/assets/src/build.js b/client/assets/src/build.js
index 3c4e882..71b965a 100644
--- a/client/assets/src/build.js
+++ b/client/assets/src/build.js
@@ -128,6 +128,44 @@ concat(source_files, function (err, src) {
 
 
 
+/**
+ * Build the engineio client + tools libs
+ */
+concat([__dirname + '/../libs/engine.io.js', __dirname + '/../libs/engine.io.tools.js'], function (err, src) {
+    if (!err) {
+        fs.writeFile(__dirname + '/../libs/engine.io.bundle.js', src, { encoding: FILE_ENCODING }, function (err) {
+            if (!err) {
+                console.log('Built engine.io.bundle.js');
+            } else {
+                console.error('Error building engine.io.bundle.js:', err);
+            }
+        });
+
+        var ast = uglifyJS.parse(src, {filename: 'engine.io.bundle.js'});
+        ast.figure_out_scope();
+        ast = ast.transform(uglifyJS.Compressor({warnings: false}));
+        ast.figure_out_scope();
+        ast.compute_char_frequency();
+        ast.mangle_names();
+        src = ast.print_to_string();
+
+        fs.writeFile(__dirname + '/../libs/engine.io.bundle.min.js', src, { encoding: FILE_ENCODING }, function (err) {
+            if (!err) {
+                console.log('Built engine.io.bundle.min.js');
+            } else {
+                console.error('Error building engine.io.bundle.min.js:', err);
+            }
+        });
+    } else {
+        console.error('Error building engine.io.bundle.js and engine.io.bundle.min.js:', err);
+    }
+});
+
+
+
+
+
+
 /**
 *   Convert translations from .po to .json
 */
diff --git a/client/assets/src/models/gateway.js b/client/assets/src/models/gateway.js
index 325064c..4db2caf 100644
--- a/client/assets/src/models/gateway.js
+++ b/client/assets/src/models/gateway.js
@@ -140,7 +140,7 @@ _kiwi.model.Gateway = function () {
         this.disconnect_requested = true;
         this.socket.close();
 
-        this.socket = eio();
+        this.socket = null;
         this.connect();
         return;
 
@@ -167,14 +167,14 @@ _kiwi.model.Gateway = function () {
     *   @param  {Function}  callback    A callback function to be invoked once Kiwi's server has connected to the IRC server
     */
     this.connect = function (callback) {
-        this.socket = new reconnectingEioSocket(this.get('kiwi_server'), {
+        this.socket = new EngineioTools.ReconnectingSocket(this.get('kiwi_server'), {
             path: _kiwi.app.get('base_path') + '/transport',
             transports: ['websocket', 'polling', 'flashsocket'],
             reconnect_max_attempts: 5,
             reconnect_delay: 2000
         });
 
-        this.rpc = new WebsocketRpc(this.socket);
+        this.rpc = new EngineioTools.Rpc(this.socket);
 
         this.socket.on('connect_failed', function (reason) {
             this.socket.disconnect();
diff --git a/server/httphandler.js b/server/httphandler.js
index f04dca9..2cddc37 100644
--- a/server/httphandler.js
+++ b/server/httphandler.js
@@ -210,14 +210,17 @@ function generateSettings(request, debug, callback) {
                 [
                     'libs/lodash.min.js'
                 ],
-                'libs/backbone.min.js',
-                'libs/jed.js'
+                ['libs/backbone.min.js', 'libs/jed.js']
             ]
         };
 
     if (debug) {
         vars.scripts = vars.scripts.concat([
-            'src/app.js',
+            [
+                'src/app.js',
+                'libs/engine.io.js',
+                'libs/engine.io.tools.js'
+            ],
             [
                 'src/models/application.js',
                 'src/models/gateway.js'
@@ -278,7 +281,7 @@ function generateSettings(request, debug, callback) {
             ]
         ]);
     } else {
-        vars.scripts.push('kiwi.min.js');
+        vars.scripts.push(['kiwi.min.js', 'libs/engine.io.bundle.min.js']);
     }
 
     // Any restricted server mode set?