+++ /dev/null
-/*
- 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;
-}
\r
\r
\r
+/**\r
+ * Build the engineio client + tools libs\r
+ */\r
+concat([__dirname + '/../libs/engine.io.js', __dirname + '/../libs/engine.io.tools.js'], function (err, src) {\r
+ if (!err) {\r
+ fs.writeFile(__dirname + '/../libs/engine.io.bundle.js', src, { encoding: FILE_ENCODING }, function (err) {\r
+ if (!err) {\r
+ console.log('Built engine.io.bundle.js');\r
+ } else {\r
+ console.error('Error building engine.io.bundle.js:', err);\r
+ }\r
+ });\r
+\r
+ var ast = uglifyJS.parse(src, {filename: 'engine.io.bundle.js'});\r
+ ast.figure_out_scope();\r
+ ast = ast.transform(uglifyJS.Compressor({warnings: false}));\r
+ ast.figure_out_scope();\r
+ ast.compute_char_frequency();\r
+ ast.mangle_names();\r
+ src = ast.print_to_string();\r
+\r
+ fs.writeFile(__dirname + '/../libs/engine.io.bundle.min.js', src, { encoding: FILE_ENCODING }, function (err) {\r
+ if (!err) {\r
+ console.log('Built engine.io.bundle.min.js');\r
+ } else {\r
+ console.error('Error building engine.io.bundle.min.js:', err);\r
+ }\r
+ });\r
+ } else {\r
+ console.error('Error building engine.io.bundle.js and engine.io.bundle.min.js:', err);\r
+ }\r
+});\r
+\r
+\r
+\r
+\r
+\r
+\r
/**\r
* Convert translations from .po to .json\r
*/\r
this.disconnect_requested = true;\r
this.socket.close();\r
\r
- this.socket = eio();\r
+ this.socket = null;\r
this.connect();\r
return;\r
\r
* @param {Function} callback A callback function to be invoked once Kiwi's server has connected to the IRC server\r
*/\r
this.connect = function (callback) {\r
- this.socket = new reconnectingEioSocket(this.get('kiwi_server'), {\r
+ this.socket = new EngineioTools.ReconnectingSocket(this.get('kiwi_server'), {\r
path: _kiwi.app.get('base_path') + '/transport',\r
transports: ['websocket', 'polling', 'flashsocket'],\r
reconnect_max_attempts: 5,\r
reconnect_delay: 2000\r
});\r
\r
- this.rpc = new WebsocketRpc(this.socket);\r
+ this.rpc = new EngineioTools.Rpc(this.socket);\r
\r
this.socket.on('connect_failed', function (reason) {\r
this.socket.disconnect();\r
projects / KiwiIRC.git / commitdiff