From 0a3da3972aa0a0c99e9aa2bccd0c981341ee1c9b Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 7 Aug 2015 15:15:03 +0800
Subject: [PATCH 01/78] update monitor component

---
 lib/application.js            | 315 ++++++++---------------
 lib/components/monitor.js     |   6 +-
 lib/master/master.js          | 126 ----------
 lib/master/starter.js         | 220 ----------------
 lib/master/watchdog.js        | 129 ----------
 lib/modules/console.js        | 458 ----------------------------------
 lib/modules/masterwatcher.js  | 110 --------
 lib/modules/monitorwatcher.js | 131 ----------
 lib/monitor/cmd.js            |  36 +++
 lib/monitor/monitor.js        | 134 +++++-----
 lib/monitor/zkClient.js       | 193 ++++++++++++++
 lib/util/appUtil.js           |  81 ++----
 lib/util/constants.js         |  17 +-
 lib/util/moduleUtil.js        |  96 -------
 package.json                  |   6 +-
 15 files changed, 436 insertions(+), 1622 deletions(-)
 delete mode 100644 lib/master/master.js
 delete mode 100644 lib/master/starter.js
 delete mode 100644 lib/master/watchdog.js
 delete mode 100644 lib/modules/console.js
 delete mode 100644 lib/modules/masterwatcher.js
 delete mode 100644 lib/modules/monitorwatcher.js
 create mode 100644 lib/monitor/cmd.js
 create mode 100644 lib/monitor/zkClient.js
 delete mode 100644 lib/util/moduleUtil.js

diff --git a/lib/application.js b/lib/application.js
index e143df017..ae89dcf5d 100644
--- a/lib/application.js
+++ b/lib/application.js
@@ -7,22 +7,22 @@
 /**
  * Module dependencies.
  */
-var utils = require('./util/utils');
-var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-var EventEmitter = require('events').EventEmitter;
-var events = require('./util/events');
-var appUtil = require('./util/appUtil');
-var Constants = require('./util/constants');
-var appManager = require('./common/manager/appManager');
-var fs = require('fs');
-var path = require('path');
+ var utils = require('./util/utils');
+ var logger = require('pomelo-logger').getLogger('pomelo', __filename);
+ var EventEmitter = require('events').EventEmitter;
+ var events = require('./util/events');
+ var appUtil = require('./util/appUtil');
+ var Constants = require('./util/constants');
+ var appManager = require('./common/manager/appManager');
+ var fs = require('fs');
+ var path = require('path');
 
 /**
  * Application prototype.
  *
  * @module
  */
-var Application = module.exports = {};
+ var Application = module.exports = {};
 
 /**
  * Application states
@@ -37,7 +37,7 @@ var STATE_STOPED  = 4;  // app has stoped
  *
  *   - setup default configuration
  */
-Application.init = function(opts) {
+ Application.init = function(opts) {
   opts = opts || {};
   this.loaded = [];       // loaded component list
   this.components = {};   // name -> component map
@@ -53,7 +53,6 @@ Application.init = function(opts) {
   this.startTime = null; // current server start time
 
   // global server infos
-  this.master = null;         // master server info
   this.servers = {};          // current global server info maps, id -> info
   this.serverTypeMaps = {};   // current global type maps, type -> [info]
   this.serverTypes = [];      // current global server type list
@@ -77,7 +76,7 @@ Application.init = function(opts) {
  *
  * @memberOf Application
  */
-Application.getBase = function() {
+ Application.getBase = function() {
   return this.get(Constants.RESERVED.BASE);
 };
 
@@ -88,7 +87,7 @@ Application.getBase = function() {
  *
  * @memberOf Application
  */
-Application.require = function(ph) {
+ Application.require = function(ph) {
   return require(path.join(Application.getBase(), ph));
 };
 
@@ -99,7 +98,7 @@ Application.require = function(ph) {
  *
  * @memberOf Application
  */
-Application.configureLogger = function(logger) {
+ Application.configureLogger = function(logger) {
   if (process.env.POMELO_LOGGER !== 'off') {
     var base = this.getBase();
     var env = this.get(Constants.RESERVED.ENV);
@@ -122,7 +121,7 @@ Application.configureLogger = function(logger) {
  *                        A filter should have two methods: before and after.
  * @memberOf Application
  */
-Application.filter = function (filter) {
+ Application.filter = function (filter) {
   this.before(filter);
   this.after(filter);
 };
@@ -133,7 +132,7 @@ Application.filter = function (filter) {
  * @param {Object|Function} bf before fileter, bf(msg, session, next)
  * @memberOf Application
  */
-Application.before = function (bf) {
+ Application.before = function (bf) {
   addFilter(this, Constants.KEYWORDS.BEFORE_FILTER, bf);
 };
 
@@ -143,7 +142,7 @@ Application.before = function (bf) {
  * @param {Object|Function} af after filter, `af(err, msg, session, resp, next)`
  * @memberOf Application
  */
-Application.after = function (af) {
+ Application.after = function (af) {
   addFilter(this, Constants.KEYWORDS.AFTER_FILTER, af);
 };
 
@@ -154,7 +153,7 @@ Application.after = function (af) {
  *                        A filter should have two methods: before and after.
  * @memberOf Application
  */
-Application.globalFilter = function (filter) {
+ Application.globalFilter = function (filter) {
   this.globalBefore(filter);
   this.globalAfter(filter);
 };
@@ -165,7 +164,7 @@ Application.globalFilter = function (filter) {
  * @param {Object|Function} bf before fileter, bf(msg, session, next)
  * @memberOf Application
  */
-Application.globalBefore = function (bf) {
+ Application.globalBefore = function (bf) {
   addFilter(this, Constants.KEYWORDS.GLOBAL_BEFORE_FILTER, bf);
 };
 
@@ -175,7 +174,7 @@ Application.globalBefore = function (bf) {
  * @param {Object|Function} af after filter, `af(err, msg, session, resp, next)`
  * @memberOf Application
  */
-Application.globalAfter = function (af) {
+ Application.globalAfter = function (af) {
   addFilter(this, Constants.KEYWORDS.GLOBAL_AFTER_FILTER, af);
 };
 
@@ -185,7 +184,7 @@ Application.globalAfter = function (af) {
  * @param {Object|Function} bf before fileter, bf(serverId, msg, opts, next)
  * @memberOf Application
  */
-Application.rpcBefore = function(bf) {
+ Application.rpcBefore = function(bf) {
   addFilter(this, Constants.KEYWORDS.RPC_BEFORE_FILTER, bf);
 };
 
@@ -195,7 +194,7 @@ Application.rpcBefore = function(bf) {
  * @param {Object|Function} af after filter, `af(serverId, msg, opts, next)`
  * @memberOf Application
  */
-Application.rpcAfter = function(af) {
+ Application.rpcAfter = function(af) {
   addFilter(this, Constants.KEYWORDS.RPC_AFTER_FILTER, af);
 };
 
@@ -206,7 +205,7 @@ Application.rpcAfter = function(af) {
  *                        A filter should have two methods: before and after.
  * @memberOf Application
  */
-Application.rpcFilter = function(filter) {
+ Application.rpcFilter = function(filter) {
   this.rpcBefore(filter);
   this.rpcAfter(filter);
 };
@@ -220,7 +219,7 @@ Application.rpcFilter = function(filter) {
  * @return {Object}     app instance for chain invoke
  * @memberOf Application
  */
-Application.load = function(name, component, opts) {
+ Application.load = function(name, component, opts) {
   if(typeof name !== 'string') {
     opts = component;
     component = name;
@@ -262,35 +261,35 @@ Application.load = function(name, component, opts) {
  * @return {Server|Mixed} for chaining, or the setting value
  * @memberOf Application
  */
-Application.loadConfigBaseApp = function (key, val, reload) {
+ Application.loadConfigBaseApp = function (key, val, reload) {
   var self = this;
   var env = this.get(Constants.RESERVED.ENV);
   var originPath = path.join(Application.getBase(), val);
   var presentPath = path.join(Application.getBase(), Constants.FILEPATH.CONFIG_DIR, env, path.basename(val));
   var realPath;
   if(fs.existsSync(originPath)) {
-     realPath = originPath;
-     var file = require(originPath);
-     if (file[env]) {
-       file = file[env];
-     }
-     this.set(key, file);
-  } else if(fs.existsSync(presentPath)) {
-    realPath = presentPath;
-    var pfile = require(presentPath);
-    this.set(key, pfile);
-  } else {
-    logger.error('invalid configuration with file path: %s', key);
-  }
-
-  if(!!realPath && !!reload) {
-    fs.watch(realPath, function (event, filename) {
-      if(event === 'change') {
-        delete require.cache[require.resolve(realPath)]
-        self.loadConfigBaseApp(key, val);
-      }
-    });
-  }
+   realPath = originPath;
+   var file = require(originPath);
+   if (file[env]) {
+     file = file[env];
+   }
+   this.set(key, file);
+ } else if(fs.existsSync(presentPath)) {
+  realPath = presentPath;
+  var pfile = require(presentPath);
+  this.set(key, pfile);
+} else {
+  logger.error('invalid configuration with file path: %s', key);
+}
+
+if(!!realPath && !!reload) {
+  fs.watch(realPath, function (event, filename) {
+    if(event === 'change') {
+      delete require.cache[require.resolve(realPath)]
+      self.loadConfigBaseApp(key, val);
+    }
+  });
+}
 };
 
 /**
@@ -301,7 +300,7 @@ Application.loadConfigBaseApp = function (key, val, reload) {
  * @return {Server|Mixed} for chaining, or the setting value
  * @memberOf Application
  */
-Application.loadConfig = function(key, val) {
+ Application.loadConfig = function(key, val) {
   var env = this.get(Constants.RESERVED.ENV);
   val = require(val);
   if (val[env]) {
@@ -328,7 +327,7 @@ Application.loadConfig = function(key, val) {
  * @return {Object}     current application instance for chain invoking
  * @memberOf Application
  */
-Application.route = function(serverType, routeFunc) {
+ Application.route = function(serverType, routeFunc) {
   var routes = this.get(Constants.KEYWORDS.ROUTE);
   if(!routes) {
     routes = {};
@@ -345,7 +344,7 @@ Application.route = function(serverType, routeFunc) {
  * @return {Void}
  * @memberOf Application
  */
-Application.beforeStopHook = function(fun) {
+ Application.beforeStopHook = function(fun) {
   logger.warn('this method was deprecated in pomelo 0.8');
   if(!!fun && typeof fun === 'function') {
     this.set(Constants.KEYWORDS.BEFORE_STOP_HOOK, fun);
@@ -366,26 +365,24 @@ Application.beforeStopHook = function(fun) {
   }
   
   var self = this;
-  appUtil.startByType(self, function() {
-    appUtil.loadDefaultComponents(self);
-    var startUp = function() {
-      appUtil.optComponents(self.loaded, Constants.RESERVED.START, function(err) {
-        self.state = STATE_START;
-        if(err) {
-          utils.invokeCallback(cb, err);
-        } else {
-          logger.info('%j enter after start...', self.getServerId());
-          self.afterStart(cb);
-        }
-      });
-    };
-    var beforeFun = self.lifecycleCbs[Constants.LIFECYCLE.BEFORE_STARTUP];
-    if(!!beforeFun) {
-      beforeFun.call(null, self, startUp);
-    } else {
-      startUp();
-    }
-  });
+  appUtil.loadDefaultComponents(self);
+  var startUp = function() {
+    appUtil.optComponents(self.loaded, Constants.RESERVED.START, function(err) {
+      self.state = STATE_START;
+      if(err) {
+        utils.invokeCallback(cb, err);
+      } else {
+        logger.info('%j enter after start...', self.getServerId());
+        self.afterStart(cb);
+      }
+    });
+  };
+  var beforeFun = self.lifecycleCbs[Constants.LIFECYCLE.BEFORE_STARTUP];
+  if(!!beforeFun) {
+    beforeFun.call(null, self, startUp);
+  } else {
+    startUp();
+  }
 };
 
 /**
@@ -394,7 +391,7 @@ Application.beforeStopHook = function(fun) {
  * @param  {Function} cb callback function
  * @return {Void}
  */
-Application.afterStart = function(cb) {
+ Application.afterStart = function(cb) {
   if(this.state !== STATE_START) {
     utils.invokeCallback(cb, new Error('application is not running now.'));
     return;
@@ -426,7 +423,7 @@ Application.afterStart = function(cb) {
  *
  * @param  {Boolean} force whether stop the app immediately
  */
-Application.stop = function(force) {
+ Application.stop = function(force) {
   if(this.state > STATE_STARTED) {
     logger.warn('[pomelo application] application is not running now.');
     return;
@@ -439,9 +436,9 @@ Application.stop = function(force) {
   }, Constants.TIME.TIME_WAIT_STOP);
 
   var cancelShutDownTimer =function(){
-      if(!!self.stopTimer) {
-        clearTimeout(self.stopTimer);
-      }
+    if(!!self.stopTimer) {
+      clearTimeout(self.stopTimer);
+    }
   };
   var shutDown = function() {
     appUtil.stopComps(self.loaded, 0, force, function() {
@@ -481,7 +478,7 @@ Application.stop = function(force) {
  * @return {Server|Mixed} for chaining, or the setting value
  * @memberOf Application
  */
-Application.set = function (setting, val, attach) {
+ Application.set = function (setting, val, attach) {
   if (arguments.length === 1) {
     return this.settings[setting];
   }
@@ -499,7 +496,7 @@ Application.set = function (setting, val, attach) {
  * @return {String} val
  * @memberOf Application
  */
-Application.get = function (setting) {
+ Application.get = function (setting) {
   return this.settings[setting];
 };
 
@@ -510,7 +507,7 @@ Application.get = function (setting) {
  * @return {Boolean}
  * @memberOf Application
  */
-Application.enabled = function (setting) {
+ Application.enabled = function (setting) {
   return !!this.get(setting);
 };
 
@@ -521,7 +518,7 @@ Application.enabled = function (setting) {
  * @return {Boolean}
  * @memberOf Application
  */
-Application.disabled = function (setting) {
+ Application.disabled = function (setting) {
   return !this.get(setting);
 };
 
@@ -532,7 +529,7 @@ Application.disabled = function (setting) {
  * @return {app} for chaining
  * @memberOf Application
  */
-Application.enable = function (setting) {
+ Application.enable = function (setting) {
   return this.set(setting, true);
 };
 
@@ -543,7 +540,7 @@ Application.enable = function (setting) {
  * @return {app} for chaining
  * @memberOf Application
  */
-Application.disable = function (setting) {
+ Application.disable = function (setting) {
   return this.set(setting, false);
 };
 
@@ -573,7 +570,7 @@ Application.disable = function (setting) {
  * @return {Application} for chaining
  * @memberOf Application
  */
-Application.configure = function (env, type, fn) {
+ Application.configure = function (env, type, fn) {
   var args = [].slice.call(arguments);
   fn = args.pop();
   env = type = Constants.RESERVED.ALL;
@@ -601,7 +598,7 @@ Application.configure = function (env, type, fn) {
  * @param {Object} opts construct parameter for module
  * @memberOf Application
  */
-Application.registerAdmin = function(moduleId, module, opts) {
+ Application.registerAdmin = function(moduleId, module, opts) {
   var modules = this.get(Constants.KEYWORDS.MODULE);
   if(!modules) {
     modules = {};
@@ -634,7 +631,7 @@ Application.registerAdmin = function(moduleId, module, opts) {
  * @param  {[type]} opts    (optional) construct parameters for the factory function
  * @memberOf Application
  */
-Application.use = function(plugin, opts) {
+ Application.use = function(plugin, opts) {
   if(!plugin.components) {
     logger.error('invalid components, no components exist');
     return;
@@ -696,27 +693,17 @@ Application.use = function(plugin, opts) {
  * @param {Number} retry retry times to execute handlers if conditions are successfully executed
  * @memberOf Application
  */
-Application.transaction = function(name, conditions, handlers, retry) {
+ Application.transaction = function(name, conditions, handlers, retry) {
   appManager.transaction(name, conditions, handlers, retry);
 };
 
-/**
- * Get master server info.
- *
- * @return {Object} master server info, {id, host, port}
- * @memberOf Application
- */
-Application.getMaster = function() {
-  return this.master;
-};
-
 /**
  * Get current server info.
  *
  * @return {Object} current server info, {id, serverType, host, port}
  * @memberOf Application
  */
-Application.getCurServer = function() {
+ Application.getCurServer = function() {
   return this.curServer;
 };
 
@@ -726,7 +713,7 @@ Application.getCurServer = function() {
  * @return {String|Number} current server id from servers.json
  * @memberOf Application
  */
-Application.getServerId = function() {
+ Application.getServerId = function() {
   return this.serverId;
 };
 
@@ -736,7 +723,7 @@ Application.getServerId = function() {
  * @return {String|Number} current server type from servers.json
  * @memberOf Application
  */
-Application.getServerType = function() {
+ Application.getServerType = function() {
   return this.serverType;
 };
 
@@ -746,7 +733,7 @@ Application.getServerType = function() {
  * @return {Object} server info map, key: server id, value: server info
  * @memberOf Application
  */
-Application.getServers = function() {
+ Application.getServers = function() {
   return this.servers;
 };
 
@@ -756,7 +743,7 @@ Application.getServers = function() {
  * @return {Object} server info map, key: server id, value: server info
  * @memberOf Application
  */
-Application.getServersFromConfig = function() {
+ Application.getServersFromConfig = function() {
   return this.get(Constants.KEYWORDS.SERVER_MAP);
 };
 
@@ -766,7 +753,7 @@ Application.getServersFromConfig = function() {
  * @return {Array} server type list
  * @memberOf Application
  */
-Application.getServerTypes = function() {
+ Application.getServerTypes = function() {
   return this.serverTypes;
 };
 
@@ -777,7 +764,7 @@ Application.getServerTypes = function() {
  * @return {Object} server info or undefined
  * @memberOf Application
  */
-Application.getServerById = function(serverId) {
+ Application.getServerById = function(serverId) {
   return this.servers[serverId];
 };
 
@@ -789,7 +776,7 @@ Application.getServerById = function(serverId) {
  * @memberOf Application
  */
 
-Application.getServerFromConfig = function(serverId) {
+ Application.getServerFromConfig = function(serverId) {
   return this.get(Constants.KEYWORDS.SERVER_MAP)[serverId];
 };
 
@@ -800,7 +787,7 @@ Application.getServerFromConfig = function(serverId) {
  * @return {Array}      server info list
  * @memberOf Application
  */
-Application.getServersByType = function(serverType) {
+ Application.getServersByType = function(serverType) {
   return this.serverTypeMaps[serverType];
 };
 
@@ -813,7 +800,7 @@ Application.getServersByType = function(serverType) {
  *
  * @memberOf Application
  */
-Application.isFrontend = function(server) {
+ Application.isFrontend = function(server) {
   server = server || this.getCurServer();
   return !!server && server.frontend === 'true';
 };
@@ -826,90 +813,19 @@ Application.isFrontend = function(server) {
  * @return {Boolean}
  * @memberOf Application
  */
-Application.isBackend = function(server) {
+ Application.isBackend = function(server) {
   server = server || this.getCurServer();
   return !!server && !server.frontend;
 };
 
-/**
- * Check whether current server is a master server
- *
- * @return {Boolean}
- * @memberOf Application
- */
-Application.isMaster = function() {
-  return this.serverType === Constants.RESERVED.MASTER;
-};
-
-/**
- * Add new server info to current application in runtime.
- *
- * @param {Array} servers new server info list
- * @memberOf Application
- */
-Application.addServers = function(servers) {
-  if(!servers || !servers.length) {
-    return;
-  }
-
-  var item, slist;
-  for(var i=0, l=servers.length; i<l; i++) {
-    item = servers[i];
-    // update global server map
-    this.servers[item.id] = item;
-
-    // update global server type map
-    slist = this.serverTypeMaps[item.serverType];
-    if(!slist) {
-      this.serverTypeMaps[item.serverType] = slist = [];
-    }
-    replaceServer(slist, item);
-
-    // update global server type list
-    if(this.serverTypes.indexOf(item.serverType) < 0) {
-      this.serverTypes.push(item.serverType);
-    }
-  }
-  this.event.emit(events.ADD_SERVERS, servers);
-};
-
-/**
- * Remove server info from current application at runtime.
- *
- * @param  {Array} ids server id list
- * @memberOf Application
- */
-Application.removeServers = function(ids) {
-  if(!ids || !ids.length) {
-    return;
-  }
-
-  var id, item, slist;
-  for(var i=0, l=ids.length; i<l; i++) {
-    id = ids[i];
-    item = this.servers[id];
-    if(!item) {
-      continue;
-    }
-    // clean global server map
-    delete this.servers[id];
-
-    // clean global server type map
-    slist = this.serverTypeMaps[item.serverType];
-    removeServer(slist, id);
-    // TODO: should remove the server type if the slist is empty?
-  }
-  this.event.emit(events.REMOVE_SERVERS, ids);
-};
-
 /**
  * Replace server info from current application at runtime.
  *
  * @param  {Object} server id map
  * @memberOf Application
  */
-Application.replaceServers = function(servers) {
-  if(!servers){
+ Application.replaceServers = function(servers) {
+  if(!servers) {
     return;
   }
 
@@ -917,7 +833,7 @@ Application.replaceServers = function(servers) {
   this.serverTypeMaps = {};
   this.serverTypes = [];
   var serverArray = [];
-  for(var id in servers){
+  for(var id in servers) {
     var server = servers[id];
     var serverType = server[Constants.RESERVED.SERVER_TYPE];
     var slist = this.serverTypeMaps[serverType];
@@ -940,7 +856,7 @@ Application.replaceServers = function(servers) {
  * @param  {Array} crons new crons would be added in application
  * @memberOf Application
  */
-Application.addCrons = function(crons) {
+ Application.addCrons = function(crons) {
   if(!crons || !crons.length) {
     logger.warn('crons is not defined.');
     return;
@@ -954,7 +870,7 @@ Application.addCrons = function(crons) {
  * @param  {Array} crons old crons would be removed in application
  * @memberOf Application
  */
-Application.removeCrons = function(crons) {
+ Application.removeCrons = function(crons) {
   if(!crons || !crons.length) {
     logger.warn('ids is not defined.');
     return;
@@ -962,29 +878,6 @@ Application.removeCrons = function(crons) {
   this.event.emit(events.REMOVE_CRONS, crons);
 };
 
-var replaceServer = function(slist, serverInfo) {
-  for(var i=0, l=slist.length; i<l; i++) {
-    if(slist[i].id === serverInfo.id) {
-      slist[i] = serverInfo;
-      return;
-    }
-  }
-  slist.push(serverInfo);
-};
-
-var removeServer = function(slist, id) {
-  if(!slist || !slist.length) {
-    return;
-  }
-
-  for(var i=0, l=slist.length; i<l; i++) {
-    if(slist[i].id === id) {
-      slist.splice(i, 1);
-      return;
-    }
-  }
-};
-
 var contains = function(str, settings) {
   if(!settings) {
     return false;
@@ -1010,9 +903,9 @@ var bindEvents = function(Event, app) {
 
 var addFilter = function(app, type, filter) {
  var filters = app.get(type);
-  if(!filters) {
-    filters = [];
-    app.set(type, filters);
-  }
-  filters.push(filter);
+ if(!filters) {
+  filters = [];
+  app.set(type, filters);
+}
+filters.push(filter);
 };
\ No newline at end of file
diff --git a/lib/components/monitor.js b/lib/components/monitor.js
index b1e9648c6..3f779687c 100644
--- a/lib/components/monitor.js
+++ b/lib/components/monitor.js
@@ -30,8 +30,4 @@ pro.start = function(cb) {
 
 pro.stop = function(force, cb) {
   this.monitor.stop(cb);
-};
-
-pro.reconnect = function(masterInfo) {
-  this.monitor.reconnect(masterInfo);
-};
+};
\ No newline at end of file
diff --git a/lib/master/master.js b/lib/master/master.js
deleted file mode 100644
index d5005d518..000000000
--- a/lib/master/master.js
+++ /dev/null
@@ -1,126 +0,0 @@
-var starter = require('./starter');
-var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-var crashLogger = require('pomelo-logger').getLogger('crash-log', __filename);
-var adminLogger = require('pomelo-logger').getLogger('admin-log', __filename);
-var admin = require('pomelo-admin');
-var util = require('util');
-var utils = require('../util/utils');
-var moduleUtil = require('../util/moduleUtil');
-var Constants = require('../util/constants');
-
-var Server = function(app, opts) {
-  this.app = app;
-  this.masterInfo = app.getMaster();
-  this.registered = {};
-  this.modules = [];
-  opts = opts || {};
-  
-  opts.port = this.masterInfo.port;
-  opts.env = this.app.get(Constants.RESERVED.ENV);
-  this.closeWatcher = opts.closeWatcher;
-  this.masterConsole = admin.createMasterConsole(opts);
-};
-
-module.exports = Server;
-
-Server.prototype.start = function(cb) {
-  moduleUtil.registerDefaultModules(true, this.app, this.closeWatcher);
-  moduleUtil.loadModules(this, this.masterConsole);
-
-  var self = this;
-  // start master console
-  this.masterConsole.start(function(err) {
-    if(err) {
-      process.exit(0);
-    }
-    moduleUtil.startModules(self.modules, function(err) {
-      if(err) {
-        utils.invokeCallback(cb, err);
-        return;
-      }
-
-      if(self.app.get(Constants.RESERVED.MODE) !== Constants.RESERVED.STAND_ALONE) {
-        starter.runServers(self.app);
-      }
-      utils.invokeCallback(cb);
-    });
-  });
-  
-  this.masterConsole.on('error', function(err) {
-    if(!!err) {
-      logger.error('masterConsole encounters with error: ' + err.stack);
-      return;
-    }
-  });
-  
-  this.masterConsole.on('reconnect', function(info){
-    self.app.addServers([info]);
-  });
-
-  // monitor servers disconnect event
-  this.masterConsole.on('disconnect', function(id, type, info, reason) {
-    crashLogger.info(util.format('[%s],[%s],[%s],[%s]', type, id, Date.now(), reason || 'disconnect'));
-    var count = 0;
-    var time = 0;
-    var pingTimer = null;
-    var server = self.app.getServerById(id);
-    var stopFlags = self.app.get(Constants.RESERVED.STOP_SERVERS) || [];
-    if(!!server && (server[Constants.RESERVED.AUTO_RESTART] === 'true' || server[Constants.RESERVED.RESTART_FORCE] === 'true') && stopFlags.indexOf(id) < 0) {
-      var setTimer = function(time) {
-        pingTimer = setTimeout(function() {
-          utils.ping(server.host, function(flag) {
-            if(flag)  {
-              handle();
-            } else {
-              count++;
-              if(count > 3) {
-                time = Constants.TIME.TIME_WAIT_MAX_PING;
-              } else {
-                time = Constants.TIME.TIME_WAIT_PING * count;
-              }
-              setTimer(time);
-            }
-          });
-        }, time);
-      };
-      setTimer(time);
-      var handle = function() {
-        clearTimeout(pingTimer);
-        utils.checkPort(server, function(status) {
-          if(status === 'error') {
-            utils.invokeCallback(cb, new Error('Check port command executed with error.'));
-            return;
-          } else if(status === 'busy') {
-            if(!!server[Constants.RESERVED.RESTART_FORCE]) {
-              starter.kill([info.pid], [server]);
-            } else {
-              utils.invokeCallback(cb, new Error('Port occupied already, check your server to add.'));
-              return;
-            }
-          }
-          setTimeout(function() {
-            starter.run(self.app, server, null);
-          }, Constants.TIME.TIME_WAIT_STOP);
-        });
-      };
-    }
-  });
-
-  // monitor servers register event
-  this.masterConsole.on('register', function(record) {
-    starter.bindCpu(record.id, record.pid, record.host);
-  });
-
-  this.masterConsole.on('admin-log', function(log, error) {
-    if(error) {
-      adminLogger.error(JSON.stringify(log));
-    } else {
-      adminLogger.info(JSON.stringify(log));
-    }
-  });
-};
-
-Server.prototype.stop = function(cb) {
-  this.masterConsole.stop();
-  process.nextTick(cb);
-};
diff --git a/lib/master/starter.js b/lib/master/starter.js
deleted file mode 100644
index f23bc3647..000000000
--- a/lib/master/starter.js
+++ /dev/null
@@ -1,220 +0,0 @@
-var cp = require('child_process');
-var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-var starter = module.exports;
-var util = require('util');
-var utils = require('../util/utils');
-var Constants = require('../util/constants');
-var env = Constants.RESERVED.ENV_DEV;
-var os=require('os');
-var cpus = {};
-var pomelo = require('../pomelo');
-
-/**
- * Run all servers
- *
- * @param {Object} app current application  context
- * @return {Void}
- */
- starter.runServers = function(app) {
-  var server, servers;
-  var condition = app.startId || app.type;
-  switch(condition) {
-    case Constants.RESERVED.MASTER:
-    break;
-    case Constants.RESERVED.ALL:
-    servers = app.getServersFromConfig();
-    for (var serverId in servers) {
-      this.run(app, servers[serverId]);
-    }
-    break;
-    default:
-    server = app.getServerFromConfig(condition);
-    if(!!server) {
-      this.run(app, server);
-    } else {
-      servers = app.get(Constants.RESERVED.SERVERS)[condition];
-      for(var i=0; i<servers.length; i++) {
-        this.run(app, servers[i]);
-      }
-    }
-  }
-};
-
-/**
- * Run server
- *
- * @param {Object} app current application context
- * @param {Object} server
- * @return {Void}
- */
-starter.run = function(app, server, cb) {
-  env = app.get(Constants.RESERVED.ENV);
-  var cmd, key;
-  if (utils.isLocal(server.host)) {
-    var options = [];
-    if (!!server.args) {
-      if(typeof server.args === 'string') {
-        options.push(server.args.trim());
-      } else {
-        options = options.concat(server.args);
-      }
-    }
-    cmd = app.get(Constants.RESERVED.MAIN);
-    options.push(cmd);
-    options.push(util.format('env=%s',  env));
-    for(key in server) {
-      if(key === Constants.RESERVED.CPU) {
-        cpus[server.id] = server[key];
-      }
-      options.push(util.format('%s=%s', key, server[key]));
-    }
-    starter.localrun(process.execPath, null, options, cb);
-  } else {
-    cmd = util.format('cd "%s" && "%s"', app.getBase(), process.execPath);
-    var arg = server.args;
-    if (arg !== undefined) {
-      cmd += arg;
-    }
-    cmd += util.format(' "%s" env=%s ', app.get(Constants.RESERVED.MAIN), env);
-    for(key in server) {
-      if(key === Constants.RESERVED.CPU) {
-        cpus[server.id] = server[key];
-      }
-      cmd += util.format(' %s=%s ', key, server[key]);
-    }
-    starter.sshrun(cmd, server.host, cb);
-  }
-};
-
-/**
- * Bind process with cpu
- *
- * @param {String} sid server id
- * @param {String} pid process id
- * @param {String} host server host
- * @return {Void}
- */
-starter.bindCpu = function(sid, pid, host) {
-  if(os.platform() === Constants.PLATFORM.LINUX && cpus[sid] !== undefined) {
-    if (utils.isLocal(host)) {
-      var options = [];
-      options.push('-pc');
-      options.push(cpus[sid]);
-      options.push(pid);
-      starter.localrun(Constants.COMMAND.TASKSET, null, options);
-    }
-    else {
-      var cmd = util.format('taskset -pc "%s" "%s"', cpus[sid], pid);
-      starter.sshrun(cmd, host, null);
-    }
-  }
-};
-
-/**
- * Kill application in all servers
- *
- * @param {String} pids  array of server's pid
- * @param {String} serverIds array of serverId
- */
-starter.kill = function(pids, servers) {
-  var cmd;
-  for(var i = 0; i < servers.length; i++) {
-    var server = servers[i];
-    if(utils.isLocal(server.host)) {
-      var options = [];
-      if(os.platform() === Constants.PLATFORM.WIN) {
-        cmd = Constants.COMMAND.TASKKILL;
-        options.push('/pid');
-        options.push('/f');
-      } else {
-        cmd = Constants.COMMAND.KILL;
-        options.push(-9);
-      }
-      options.push(pids[i]);
-      starter.localrun(cmd,null,options);
-    } else {
-      if(os.platform() === Constants.PLATFORM.WIN) {
-        cmd = util.format('taskkill /pid %s /f', pids[i]);
-      } else {
-        cmd = util.format('kill -9 %s', pids[i]);
-      }
-      starter.sshrun(cmd, server.host);
-    }
-  }
-};
-
-/**
- * Use ssh to run command.
- *
- * @param {String} cmd command that would be executed in the remote server
- * @param {String} host remote server host
- * @param {Function} cb callback function
- *
- */
-starter.sshrun = function(cmd, host, cb) {
-  var args = [];
-  args.push(host);
-  var ssh_params = pomelo.app.get(Constants.RESERVED.SSH_CONFIG_PARAMS);
-  if(!!ssh_params && Array.isArray(ssh_params)) {
-    args = args.concat(ssh_params);
-  }
-  args.push(cmd);
-
-  logger.info('Executing ' + cmd + ' on ' + host + ':22');
-  spawnProcess(Constants.COMMAND.SSH, host, args, cb);
-  return;
-};
-
-/**
- * Run local command.
- *
- * @param {String} cmd
- * @param {Callback} callback
- *
- */
-starter.localrun = function (cmd, host, options, callback) {
-  logger.info('Executing ' + cmd + ' ' + options + ' locally');
-  spawnProcess(cmd, host, options, callback);
-};
-
-/**
- * Fork child process to run command.
- *
- * @param {String} command
- * @param {Object} options
- * @param {Callback} callback
- *
- */
-var spawnProcess = function(command, host, options, cb) {
-  var child = null;
-
-  if(env === Constants.RESERVED.ENV_DEV) {
-    child = cp.spawn(command, options);
-    var prefix = command === Constants.COMMAND.SSH ? '[' + host + '] ' : '';
-
-    child.stderr.on('data', function (chunk) {
-      var msg = chunk.toString();
-      process.stderr.write(msg);
-      if(!!cb) {
-        cb(msg);
-      }
-    });
-
-    child.stdout.on('data', function (chunk) {
-      var msg = prefix + chunk.toString();
-      process.stdout.write(msg);
-    });
-  } else {
-    child = cp.spawn(command, options, {detached: true, stdio: 'inherit'});
-    child.unref();
-  }
-
-  child.on('exit', function (code) {
-    if(code !== 0) {
-      logger.warn('child process exit with error, error code: %s, executed command: %s', code,  command);
-    }
-    if (typeof cb === 'function') {
-      cb(code === 0 ? null : code);
-    }
-  });
-};
diff --git a/lib/master/watchdog.js b/lib/master/watchdog.js
deleted file mode 100644
index 29ee46e8b..000000000
--- a/lib/master/watchdog.js
+++ /dev/null
@@ -1,129 +0,0 @@
-var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-var utils = require('../util/utils');
-var Constants = require('../util/constants');
-var countDownLatch = require('../util/countDownLatch');
-var EventEmitter = require('events').EventEmitter;
-var util = require('util');
-
-var Watchdog = function(app, service) {
-  EventEmitter.call(this);
-
-  this.app = app;
-  this.service = service;
-  this.isStarted = false;
-  this.count = utils.size(app.getServersFromConfig());
-
-  this.servers = {};
-  this.listeners = {};
-};
-util.inherits(Watchdog, EventEmitter);
-
-module.exports = Watchdog;
-
-Watchdog.prototype.addServer = function(server) {
-  if(!server) {
-    return;
-  }
-  this.servers[server.id] = server;
-  this.notify({action: 'addServer', server: server});
-};
-
-Watchdog.prototype.removeServer = function(id) {
-  if(!id) {
-    return;
-  }
-  this.unsubscribe(id);
-  delete this.servers[id];
-  this.notify({action: 'removeServer', id: id});
-};
-
-Watchdog.prototype.reconnectServer = function(server) {
-  var self = this;
-  if(!server) {
-    return;
-  }
-  if(!this.servers[server.id]) {
-    this.servers[server.id] = server;
-  }
-  //replace server in reconnect server
-  this.notifyById(server.id, {action: 'replaceServer', servers: self.servers});
-  // notify other server to add server
-  this.notify({action: 'addServer', server: server});
-  // add server in listener
-  this.subscribe(server.id);
-};
-
-Watchdog.prototype.subscribe = function(id) {
-  this.listeners[id] = 1;
-};
-
-Watchdog.prototype.unsubscribe = function(id) {
-  delete this.listeners[id];
-};
-
-Watchdog.prototype.query = function() {
-  return this.servers;
-};
-
-Watchdog.prototype.record = function(id) {
-  if(!this.isStarted && --this.count < 0) {
-    var usedTime = Date.now() - this.app.startTime;
-    logger.info('all servers startup in %s ms', usedTime);
-    this.notify({action: 'startOver'});
-    this.isStarted = true;
-  }
-};
-
-Watchdog.prototype.notifyById = function(id, msg) {
-  this.service.agent.request(id, Constants.KEYWORDS.MONITOR_WATCHER, msg, function(signal) {
-    if(signal !== Constants.SIGNAL.OK) {
-      logger.error('master watchdog fail to notify to monitor, id: %s, msg: %j', id, msg);
-    } else {
-      logger.debug('master watchdog notify to monitor success, id: %s, msg: %j', id, msg);
-    }
-  });
-};
-
-Watchdog.prototype.notify = function(msg) {
-  var listeners = this.listeners;
-  var success = true;
-  var fails = [];
-  var timeouts = [];
-  var requests = {};
-  var count = utils.size(listeners);
-  if(count === 0) {
-    logger.warn('master watchdog listeners is none, msg: %j', msg);
-    return;
-  }
-  var latch = countDownLatch.createCountDownLatch(count, {timeout: Constants.TIME.TIME_WAIT_COUNTDOWN}, function(isTimeout) {
-    if(!!isTimeout) {
-      for(var key in requests) {
-        if(!requests[key])  {
-          timeouts.push(key);
-        }
-      }
-      logger.error('master watchdog request timeout message: %j, timeouts: %j, fails: %j', msg, timeouts, fails);
-    }
-    if(!success) {
-      logger.error('master watchdog request fail message: %j, fails: %j', msg, fails);
-    }
-  });
-
-  var moduleRequest = function(self, id) {
-    return (function() {
-      self.service.agent.request(id, Constants.KEYWORDS.MONITOR_WATCHER, msg, function(signal) {
-        if(signal !== Constants.SIGNAL.OK) {
-          fails.push(id);
-          success = false;
-        }
-        requests[id] = 1;
-        latch.done();
-      });
-    })();
-  };
-
-  for(var id in listeners) {
-    requests[id] = 0;
-    moduleRequest(this, id);
-  }
-};
\ No newline at end of file
diff --git a/lib/modules/console.js b/lib/modules/console.js
deleted file mode 100644
index 8bb2a4318..000000000
--- a/lib/modules/console.js
+++ /dev/null
@@ -1,458 +0,0 @@
-/*!
- * Pomelo -- consoleModule serverStop stop/kill
- * Copyright(c) 2012 fantasyni <fantasyni@163.com>
- * MIT Licensed
- */
-var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-var countDownLatch = require('../util/countDownLatch');
-var utils = require('../util/utils');
-var Constants = require('../util/constants');
-var starter = require('../master/starter');
-var exec = require('child_process').exec;
-
-module.exports = function(opts) {
-  return new Module(opts);
-};
-
-module.exports.moduleId = '__console__';
-
-var Module = function(opts) {
-  opts = opts || {};
-  this.app = opts.app;
-  this.starter = opts.starter;
-};
-
-Module.prototype.monitorHandler = function(agent, msg, cb) {
-  var serverId = agent.id;
-  switch(msg.signal) {
-    case 'stop':
-      if(agent.type === Constants.RESERVED.MASTER) {
-        return;
-      }
-      this.app.stop(true);
-      break;
-    case 'list':
-      var serverType = agent.type;
-      var pid = process.pid;
-      var heapUsed = (process.memoryUsage().heapUsed/(1024 * 1024)).toFixed(2);
-      var rss = (process.memoryUsage().rss/(1024 * 1024)).toFixed(2);
-      var heapTotal = (process.memoryUsage().heapTotal/(1024 * 1024)).toFixed(2);
-      var uptime = (process.uptime()/60).toFixed(2);
-      utils.invokeCallback(cb, {
-        serverId: serverId,
-        body: {serverId:serverId, serverType: serverType, pid:pid, rss: rss, heapTotal: heapTotal, heapUsed:heapUsed, uptime:uptime}
-      });
-      break;
-    case 'kill':
-      utils.invokeCallback(cb, serverId);
-      if (agent.type !== 'master') {
-        setTimeout(function() {
-          process.exit(-1);
-        }, Constants.TIME.TIME_WAIT_MONITOR_KILL);
-      }
-      break;
-    case 'addCron':
-      this.app.addCrons([msg.cron]);
-      break;
-    case 'removeCron':
-      this.app.removeCrons([msg.cron]);
-      break;
-    case 'blacklist':
-      if(this.app.isFrontend()) {
-        var connector = this.app.components.__connector__;
-        connector.blacklist = connector.blacklist.concat(msg.blacklist);
-      }
-      break;
-    case 'restart':
-      if(agent.type === Constants.RESERVED.MASTER) {
-        return;
-      }
-      var self = this;
-      var server = this.app.get(Constants.RESERVED.CURRENT_SERVER);
-      utils.invokeCallback(cb, server);
-      process.nextTick(function() {
-        self.app.stop(true);
-      });
-      break;
-    default:
-      logger.error('receive error signal: %j', msg);
-      break;
-  }
-};
-
-Module.prototype.clientHandler = function(agent, msg, cb) {
-  var app = this.app;
-  switch(msg.signal) {
-    case 'kill':
-      kill(app, agent, msg, cb);
-      break;
-    case 'stop':
-      stop(app, agent, msg, cb);
-      break;
-    case 'list':
-      list(agent, msg, cb);
-      break;
-    case 'add':
-      add(app, msg, cb);
-      break;
-    case 'addCron':
-      addCron(app, agent, msg, cb);
-      break;
-    case 'removeCron':
-      removeCron(app, agent, msg, cb);
-      break;
-    case 'blacklist':
-      blacklist(agent, msg, cb);
-      break;
-    case 'restart':
-      restart(app, agent, msg, cb);
-      break;
-    default:
-      utils.invokeCallback(cb, new Error('The command cannot be recognized, please check.'), null);
-      break;
-  }
-};
-
-var kill = function(app, agent, msg, cb) {
-  var sid, record;
-  var serverIds = [];
-  var count = utils.size(agent.idMap);
-  var latch = countDownLatch.createCountDownLatch(count, {timeout: Constants.TIME.TIME_WAIT_MASTER_KILL}, function(isTimeout) {
-    if (!isTimeout) {
-      utils.invokeCallback(cb, null, {code: 'ok'});
-    } else {
-      utils.invokeCallback(cb, null, {code: 'remained', serverIds: serverIds});
-    }
-    setTimeout(function() {
-      process.exit(-1);
-    }, Constants.TIME.TIME_WAIT_MONITOR_KILL);
-  });
-
-  var agentRequestCallback = function(msg) {
-      for (var i = 0; i < serverIds.length; ++i) {
-        if (serverIds[i] === msg) {
-          serverIds.splice(i,1);
-          latch.done();
-          break;
-        }
-      }
-  };
-
-  for(sid in agent.idMap) {
-    record = agent.idMap[sid];
-    serverIds.push(record.id);
-    agent.request(record.id, module.exports.moduleId, { signal: msg.signal }, agentRequestCallback);
-  }
-};
-
-var stop = function(app, agent, msg, cb) {
-  var serverIds = msg.ids;
-  if(!!serverIds.length) {
-    var servers = app.getServers();
-    app.set(Constants.RESERVED.STOP_SERVERS, serverIds);
-    for(var i=0; i<serverIds.length; i++) {
-      var serverId = serverIds[i];
-      if(!servers[serverId]) {
-        utils.invokeCallback(cb, new Error('Cannot find the server to stop.'), null);
-      } else {
-        agent.notifyById(serverId, module.exports.moduleId, { signal: msg.signal });
-      }
-    }
-    utils.invokeCallback(cb, null, { status: "part" });
-  } else {
-    agent.notifyAll(module.exports.moduleId, { signal: msg.signal });
-    setTimeout(function() {
-      app.stop(true);
-      utils.invokeCallback(cb, null, { status: "all" });
-    }, Constants.TIME.TIME_WAIT_STOP);
-  }
-};
-
-var restart = function(app, agent, msg, cb) {
-  var successFlag;
-  var successIds = [];
-  var serverIds = msg.ids;
-  var type = msg.type;
-  var servers;
-  if(!serverIds.length && !!type) {
-    servers = app.getServersByType(type);
-    if(!servers) {
-      utils.invokeCallback(cb, new Error('restart servers with unknown server type: ' + type));
-      return;
-    }
-    for(var i=0; i<servers.length; i++) {
-      serverIds.push(servers[i].id);
-    }
-  } else if(!serverIds.length) {
-    servers = app.getServers();
-    for(var key in servers) {
-      serverIds.push(key);
-    }
-  }  
-  var count = serverIds.length;
-  var latch = countDownLatch.createCountDownLatch(count, {timeout: Constants.TIME.TIME_WAIT_COUNTDOWN}, function() {
-    if(!successFlag) {
-      utils.invokeCallback(cb, new Error('all servers start failed.'));
-      return;
-    }
-    utils.invokeCallback(cb, null, utils.arrayDiff(serverIds, successIds));
-  });
-
-  var request = function(id) {
-    return (function() {
-      agent.request(id, module.exports.moduleId, { signal: msg.signal }, function(msg) {
-        if(!utils.size(msg)) {
-          latch.done();
-          return;
-        }
-        setTimeout(function() {
-         runServer(app, msg, function(err, status) {
-          if(!!err) {
-            logger.error('restart ' + id + ' failed.');
-          } else {
-            successIds.push(id);
-            successFlag = true;
-          }
-          latch.done();
-        });
-       }, Constants.TIME.TIME_WAIT_RESTART);
-      });
-    })();
-  };
-
-  for(var j=0; j<serverIds.length; j++) {
-    request(serverIds[j]);
-  }
-};
-
-var list = function(agent, msg, cb) {
-  var sid, record;
-  var serverInfo = {};
-  var count = utils.size(agent.idMap);
-  var latch = countDownLatch.createCountDownLatch(count, {timeout: Constants.TIME.TIME_WAIT_COUNTDOWN}, function() {
-    utils.invokeCallback(cb, null, { msg: serverInfo });
-  });
-
-  var callback = function(msg) {
-    serverInfo[msg.serverId] = msg.body;
-    latch.done();
-  };
-  for(sid in agent.idMap) {
-    record = agent.idMap[sid];
-    agent.request(record.id, module.exports.moduleId, { signal: msg.signal }, callback);
-  }
-};
-
-var add = function(app, msg, cb) {
-  if(checkCluster(msg)) {
-    startCluster(app, msg, cb);
-  } else {
-    startServer(app, msg, cb);
-  }
-  reset(ServerInfo);
-};
-
-var addCron = function(app, agent, msg, cb) {
-  var cron = parseArgs(msg, CronInfo, cb);
-  sendCronInfo(cron, agent, msg, CronInfo, cb);
-};
-
-var removeCron = function(app, agent, msg, cb) {
-  var cron = parseArgs(msg, RemoveCron, cb);
-  sendCronInfo(cron, agent, msg, RemoveCron, cb);
-};
-
-var blacklist = function(agent, msg, cb) {
-  var ips = msg.args;
-  for(var i=0; i<ips.length; i++) {
-    if(!(new RegExp(/(\d+)\.(\d+)\.(\d+)\.(\d+)/g).test(ips[i]))) {
-      utils.invokeCallback(cb, new Error('blacklist ip: ' + ips[i] + ' is error format.'), null);
-      return;
-    }
-  }
-  agent.notifyAll(module.exports.moduleId, { signal: msg.signal, blacklist: msg.args });
-  process.nextTick(function() {
-    cb(null, { status: "ok" });
-  });
-};
-
-var checkPort = function(server, cb) {
-  if (!server.port && !server.clientPort) {
-    utils.invokeCallback(cb, 'leisure');
-    return;
-  }
-
-  var p = server.port || server.clientPort;
-  var host = server.host;
-  var cmd = 'netstat -tln | grep ';
-  if (!utils.isLocal(host)) {
-    cmd = 'ssh ' + host + ' ' + cmd;
-  }
-
-  exec(cmd + p, function(err, stdout, stderr) {
-    if (stdout || stderr) {
-      utils.invokeCallback(cb, 'busy');
-    } else {
-      p = server.clientPort;
-      exec(cmd + p, function(err, stdout, stderr) {
-        if (stdout || stderr) {
-          utils.invokeCallback(cb, 'busy');
-        } else {
-          utils.invokeCallback(cb, 'leisure');
-        }
-      });
-    }
-  });
-};
-
-var parseArgs = function(msg, info, cb) {
-  var rs = {};
-  var args = msg.args;
-  for(var i =0; i<args.length; i++) {
-    if(args[i].indexOf('=') < 0) {
-      cb(new Error('Error server parameters format.'), null);
-      return;
-    }
-    var pairs = args[i].split('=');
-    var key = pairs[0];
-    if(!!info[key]) {
-      info[key] = 1;
-    }
-    rs[pairs[0]] = pairs[1];
-  }
-  return rs;
-};
-
-var sendCronInfo = function(cron, agent, msg, info, cb) {
-  if(isReady(info) && (cron.serverId || cron.serverType)) {
-    if(!!cron.serverId) {
-      agent.notifyById(cron.serverId, module.exports.moduleId, { signal: msg.signal, cron: cron });
-    } else {
-      agent.notifyByType(cron.serverType, module.exports.moduleId, { signal: msg.signal, cron: cron });
-    }
-    process.nextTick(function() {
-      cb(null, { status: "ok" });
-    });
-  } else {
-    cb(new Error('Miss necessary server parameters.'), null);
-  }
-  reset(info);
-};
-
-var startServer = function(app, msg, cb) {
-  var server = parseArgs(msg, ServerInfo, cb);
-  if(isReady(ServerInfo)) {
-    runServer(app, server, cb);
-  } else {
-    cb(new Error('Miss necessary server parameters.'), null);
-  }
-};
-
-var runServer = function(app, server, cb) {
-  checkPort(server, function(status) {
-    if(status === 'busy') {
-      utils.invokeCallback(cb, new Error('Port occupied already, check your server to add.'));
-    } else {
-      starter.run(app, server, function(err) {
-        if(err) {
-          utils.invokeCallback(cb, new Error(err), null);
-          return;
-        }
-      });
-      process.nextTick(function() {
-        utils.invokeCallback(cb, null, { status: "ok" });
-      });
-    }
-  });
-};
-
-var startCluster = function(app, msg, cb) {
-  var serverMap = {};
-  var fails = [];
-  var successFlag;
-  var serverInfo = parseArgs(msg, ClusterInfo, cb);
-  utils.loadCluster(app, serverInfo, serverMap);
-  var count = utils.size(serverMap);
-  var latch = countDownLatch.createCountDownLatch(count, function() {
-    if(!successFlag) {
-      utils.invokeCallback(cb, new Error('all servers start failed.'));
-      return;
-    }
-    utils.invokeCallback(cb, null, fails);
-  });
-
-  var start = function(server) {
-    return (function() {
-      checkPort(server, function(status) {
-        if(status === 'busy') {
-          fails.push(server);
-          latch.done();
-        } else {
-          starter.run(app, server, function(err) {
-            if(err) {
-              fails.push(server);
-              latch.done();
-            }
-          });
-          process.nextTick(function() {
-            successFlag = true;
-            latch.done();
-          });
-        }
-      });
-    })();
-  };
-  for(var key in serverMap) {
-    var server = serverMap[key];
-    start(server);
-  }
-};
-
-var checkCluster = function(msg) {
-  var flag = false;
-  var args = msg.args;
-  for(var i=0; i < args.length; i++) {
-    if(utils.startsWith(args[i], Constants.RESERVED.CLUSTER_COUNT)) {
-      flag = true;
-    }
-  }
-  return flag;
-};
-
-var isReady = function(info) {
-  for(var key in info) {
-    if(info[key]) {
-      return false;
-    }
-  }
-  return true;
-};
-
-var reset = function(info) {
-  for(var key in info) {
-    info[key] = 0;
-  }
-};
-
-var ServerInfo = {
-  host: 0,
-  port: 0,
-  id:   0,
-  serverType: 0
-};
-
-var CronInfo = {
-  id: 0,
-  action: 0,
-  time: 0
-};
-
-var RemoveCron = {
-  id: 0
-};
-
-var ClusterInfo = {
-  host: 0,
-  port: 0,
-  clusterCount: 0
-};
\ No newline at end of file
diff --git a/lib/modules/masterwatcher.js b/lib/modules/masterwatcher.js
deleted file mode 100644
index a59a79843..000000000
--- a/lib/modules/masterwatcher.js
+++ /dev/null
@@ -1,110 +0,0 @@
-var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-var utils = require('../util/utils');
-var Constants = require('../util/constants');
-var MasterWatchdog = require('../master/watchdog');
-
-module.exports = function(opts, consoleService) {
-  return new Module(opts, consoleService);
-};
-
-module.exports.moduleId = Constants.KEYWORDS.MASTER_WATCHER;
-
-var Module = function(opts, consoleService) {
-  this.app = opts.app;
-  this.service = consoleService;
-  this.id = this.app.getServerId();
-
-  this.watchdog = new MasterWatchdog(this.app, this.service);
-  this.service.on('register', onServerAdd.bind(null, this));
-  this.service.on('disconnect', onServerLeave.bind(null, this));
-  this.service.on('reconnect', onServerReconnect.bind(null, this));
-};
-
-// ----------------- bind methods -------------------------
-
-var onServerAdd = function(module, record) {
-  logger.debug('masterwatcher receive add server event, with server: %j', record);
-  if(!record || record.type === 'client' || !record.serverType) {
-    return;
-  }
-  module.watchdog.addServer(record);
-};
-
-var onServerReconnect = function(module, record) {
-  logger.debug('masterwatcher receive reconnect server event, with server: %j', record);
-  if(!record || record.type === 'client' || !record.serverType) {
-    logger.warn('onServerReconnect receive wrong message: %j', record);
-    return;
-  }
-  module.watchdog.reconnectServer(record);
-};
-
-var onServerLeave = function(module, id, type) {
-  logger.debug('masterwatcher receive remove server event, with server: %s, type: %s', id, type);
-  if(!id) {
-    logger.warn('onServerLeave receive server id is empty.');
-    return;
-  }
-  if(type !== 'client') {
-    module.watchdog.removeServer(id);
-  }
-};
-
-// ----------------- module methods -------------------------
-
-Module.prototype.start = function(cb) {
-  utils.invokeCallback(cb);
-};
-
-Module.prototype.masterHandler = function(agent, msg, cb) {
-  if(!msg) {
-    logger.warn('masterwatcher receive empty message.');
-    return;
-  }
-  var func = masterMethods[msg.action];
-  if(!func) {
-    logger.info('masterwatcher unknown action: %j', msg.action);
-    return;
-  }
-  func(this, agent, msg, cb);
-};
-
-// ----------------- monitor request methods -------------------------
-
-var subscribe = function(module, agent, msg, cb) {
-  if(!msg) {
-    utils.invokeCallback(cb, new Error('masterwatcher subscribe empty message.'));
-    return;
-  }
-
-  module.watchdog.subscribe(msg.id);
-  utils.invokeCallback(cb, null, module.watchdog.query());
-};
-
-var unsubscribe = function(module, agent, msg, cb) {
-  if(!msg) {
-    utils.invokeCallback(cb, new Error('masterwatcher unsubscribe empty message.'));
-    return;
-  }
-  module.watchdog.unsubscribe(msg.id);
-  utils.invokeCallback(cb);
-};
-
-var query = function(module, agent, msg, cb) {
-  utils.invokeCallback(cb, null, module.watchdog.query());
-};
-
-var record = function(module, agent, msg) {
-  if(!msg) {
-    utils.invokeCallback(cb, new Error('masterwatcher record empty message.'));
-    return;
-  }
-  module.watchdog.record(msg.id);
-};
-
-var masterMethods = {
-  'subscribe': subscribe,
-  'unsubscribe': unsubscribe,
-  'query': query,
-  'record': record
-};
\ No newline at end of file
diff --git a/lib/modules/monitorwatcher.js b/lib/modules/monitorwatcher.js
deleted file mode 100644
index 3a17d3696..000000000
--- a/lib/modules/monitorwatcher.js
+++ /dev/null
@@ -1,131 +0,0 @@
-var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-var utils = require('../util/utils');
-var events = require('../util/events');
-var Constants = require('../util/constants');
-var util = require('util');
-
-module.exports = function(opts, consoleService) {
-  return new Module(opts, consoleService);
-};
-
-module.exports.moduleId = Constants.KEYWORDS.MONITOR_WATCHER;
-
-var Module = function(opts, consoleService) {
-  this.app = opts.app;
-  this.service = consoleService;
-  this.id = this.app.getServerId();
-
-  this.app.event.on(events.START_SERVER, finishStart.bind(null, this));
-};
-
-Module.prototype.start = function(cb) {
-  subscribeRequest(this, this.service.agent, this.id, cb);
-};
-
-Module.prototype.monitorHandler = function(agent, msg, cb) {
-  if(!msg || !msg.action) {
-    return;
-  }
-  var func = monitorMethods[msg.action];
-  if(!func) {
-    logger.info('monitorwatcher unknown action: %j', msg.action);
-    return;
-  }
-  func(this, agent, msg, cb);
-};
-
-// ----------------- monitor start method -------------------------
-
-var subscribeRequest = function(self, agent, id, cb) {
-  var msg = {action: 'subscribe', id: id};
-  agent.request(Constants.KEYWORDS.MASTER_WATCHER, msg, function(err, servers) {
-    if(err) {
-      logger.error('subscribeRequest request to master with error: %j', err.stack);
-      utils.invokeCallback(cb, err);
-    }
-    var res = [];
-    for(var id in servers) {
-      res.push(servers[id]);
-    }
-    addServers(self, res);
-    utils.invokeCallback(cb);
-  });
-};
-
-// ----------------- monitor request methods -------------------------
-
-var addServer = function(self, agent, msg, cb) {
-  logger.debug('[%s] receive addServer signal: %j', self.app.serverId, msg);
-  if(!msg || !msg.server) {
-    logger.warn('monitorwatcher addServer receive empty message: %j', msg);
-    utils.invokeCallback(cb, Constants.SIGNAL.FAIL);
-    return;
-  }
-  addServers(self, [msg.server]);
-  utils.invokeCallback(cb, Constants.SIGNAL.OK);
-};
-
-var removeServer = function(self, agent, msg, cb) {
-  logger.debug('%s receive removeServer signal: %j', self.app.serverId, msg);
-  if(!msg || !msg.id) {
-    logger.warn('monitorwatcher removeServer receive empty message: %j', msg);
-    utils.invokeCallback(cb, Constants.SIGNAL.FAIL);
-    return;
-  }
-  removeServers(self, [msg.id]);
-  utils.invokeCallback(cb, Constants.SIGNAL.OK);
-};
-
-var replaceServer = function(self, agent, msg, cb) {
-  logger.debug('%s receive replaceServer signal: %j', self.app.serverId, msg);
-  if(!msg || !msg.servers) {
-    logger.warn('monitorwatcher replaceServer receive empty message: %j', msg);
-    utils.invokeCallback(cb, Constants.SIGNAL.FAIL);
-    return;
-  }
-  replaceServers(self, msg.servers);
-  utils.invokeCallback(cb, Constants.SIGNAL.OK);
-};
-
-var startOver = function(self, agent, msg, cb) {
-  var fun = self.app.lifecycleCbs[Constants.LIFECYCLE.AFTER_STARTALL];
-  if(!!fun) {
-    fun.call(null, self.app);
-  }
-  self.app.event.emit(events.START_ALL);
-  utils.invokeCallback(cb, Constants.SIGNAL.OK);
-};
-
-// ----------------- common methods -------------------------
-
-var addServers = function(self, servers) {
-  if(!servers || !servers.length) {
-    return;
-  }
-  self.app.addServers(servers);
-};
-
-var removeServers = function(self, ids) {
-  if(!ids || !ids.length) {
-    return;
-  }
-  self.app.removeServers(ids);
-};
-
-var replaceServers = function(self, servers) {
-  self.app.replaceServers(servers);
-};
-
-// ----------------- bind methods -------------------------
-
-var finishStart = function(self, id) {
-  var msg = {action: 'record', id: id};
-  self.service.agent.notify(Constants.KEYWORDS.MASTER_WATCHER, msg);
-};
-
-var monitorMethods = {
-  'addServer': addServer,
-  'removeServer': removeServer,
-  'replaceServer': replaceServer,
-  'startOver': startOver
-};
diff --git a/lib/monitor/cmd.js b/lib/monitor/cmd.js
new file mode 100644
index 000000000..3634739ab
--- /dev/null
+++ b/lib/monitor/cmd.js
@@ -0,0 +1,36 @@
+var logger = require('pomelo-logger').getLogger('pomelo', __filename);
+
+var Command = module.exports;
+
+Command.init = function(client, event, data) {
+	logger.debug('server: %s receive command, with event: %j, with data: %j', client.app.serverId, event, data);
+	if(event.type !== 3) {
+		logger.info('event ignore.');
+		return;
+	}
+	if(!data) {
+		logger.warn('server: %s command data is null.', client.app.serverId);
+		return;
+	}
+	data = JSON.parse(data);
+	switch(data.command) {
+		case 1:
+			stop(client);
+			break;
+		case 2:
+			kill(client);
+			break;
+		default:
+			break;
+	}
+};
+
+var stop = function(client) {
+	logger.info('server : %s is stopped', client.app.serverId);
+	client.app.stop();
+};
+
+var kill = function(client) {
+	logger.info('server: %s is forced stopped.', client.app.serverId);
+	process.exit(0);
+};
\ No newline at end of file
diff --git a/lib/monitor/monitor.js b/lib/monitor/monitor.js
index 6d178e2b3..cda31dc9a 100644
--- a/lib/monitor/monitor.js
+++ b/lib/monitor/monitor.js
@@ -1,84 +1,82 @@
-/**
- * Component for monitor.
- * Load and start monitor client.
- */
-var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-var admin = require('pomelo-admin');
-var moduleUtil = require('../util/moduleUtil');
+var zkClient = require('./zkClient');
 var utils = require('../util/utils');
-var Constants = require('../util/constants');
+var constants = require('../util/constants');
+var countDownLatch = require('../util/countDownLatch');
+var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 
 var Monitor = function(app, opts) {
-  opts = opts || {};
-  this.app = app;
-  this.serverInfo = app.getCurServer();
-  this.masterInfo = app.getMaster();
-  this.modules = [];
-  this.closeWatcher = opts.closeWatcher;
-
-  this.monitorConsole = admin.createMonitorConsole({
-    id: this.serverInfo.id,
-    type: this.app.getServerType(),
-    host: this.masterInfo.host,
-    port: this.masterInfo.port,
-    info: this.serverInfo,
-    env: this.app.get(Constants.RESERVED.ENV),
-    authServer: app.get('adminAuthServerMonitor') // auth server function
-  });
+	opts = opts || {};
+	this.app = app;
+	this.serverInfo = app.getCurServer();
 };
 
 module.exports = Monitor;
 
 Monitor.prototype.start = function(cb) {
-  moduleUtil.registerDefaultModules(false, this.app, this.closeWatcher);
-  this.startConsole(cb);
-};
+	var self = this;
 
-Monitor.prototype.startConsole = function(cb) {
-  moduleUtil.loadModules(this, this.monitorConsole);
+	var monitor = new zkClient(this.app, function() {
+		logger.debug('server %s monitor start', self.app.serverId);
+		getAndWatchCluster(self.app, monitor);
+		utils.invokeCallback(cb);
+	});
 
-  var self = this;
-  this.monitorConsole.start(function(err) {
-    if (err) {
-      utils.invokeCallback(cb, err);
-      return;
-    }
-    moduleUtil.startModules(self.modules, function(err) {
-      utils.invokeCallback(cb, err);
-      return;
-    });
-  });
-
-  this.monitorConsole.on('error', function(err) {
-    if(!!err) {
-      logger.error('monitorConsole encounters with error: %j', err.stack);
-      return;
-    }
-  });
+	this.monitor = monitor;
 };
 
 Monitor.prototype.stop = function(cb) {
-  this.monitorConsole.stop();
-  this.modules = [];
-  process.nextTick(function() {
-    utils.invokeCallback(cb);
-  });
+	this.monitor.close();
+	process.nextTick(function() {
+		utils.invokeCallback(cb);
+	});
+};
+
+var getClusterInfo = function(app, zk, servers) {
+	var success = true;
+	var results = {};
+	if(!servers.length)	{
+		logger.error('get servers data is null.');
+		return;
+	}
+	
+	var latch = countDownLatch.createCountDownLatch(servers.length, {timeout: constants.TIME.TIME_WAIT_COUNTDOWN}, function() {
+		if(!success) {
+			logger.error('get all children data failed, with serverId: %s', app.serverId);
+			return;
+		}
+		logger.info('cluster servers information: %j', results);
+		app.replaceServers(results);
+	});
+
+	for(var i = 0; i < servers.length; i++) {
+		(function(index) {
+			if(utils.startsWith(servers[index], 'info::')) {
+				zk.getData(zk.path + '/' + servers[index], null, function(err, data) {
+					if(!!err)	{
+						logger.error('%s get data failed for server %s, with err: %j', app.serverId, servers[index], err.stack);
+						latch.done();
+						success = false;
+						return;
+					}
+					var serverInfo = JSON.parse(data);
+					results[serverInfo.id] = serverInfo;
+					latch.done();
+				});
+			} else {
+				latch.done();
+			}
+		})(i);
+	}
 };
 
-// monitor reconnect to master
-Monitor.prototype.reconnect = function(masterInfo) {
-  var self = this;
-  this.stop(function() {
-    self.monitorConsole = admin.createMonitorConsole({
-      id: self.serverInfo.id,
-      type: self.app.getServerType(),
-      host: masterInfo.host,
-      port: masterInfo.port,
-      info: self.serverInfo,
-      env: self.app.get(Constants.RESERVED.ENV)
-    });
-    self.startConsole(function() {
-      logger.info('restart modules for server : %j finish.', self.app.serverId);
-    });
-  });
+var getAndWatchCluster = function(app, zk) {
+	logger.debug('watch server: %s, with path: %s', app.serverId, zk.nodePath);
+	zk.getChildren(getAndWatchCluster.bind(null, app, zk), function(err, children) {
+		if(!!err)	{
+			logger.error('get children failed when watch server, with err: %j', err.stack);
+			return;
+		}
+		logger.debug('cluster children: %j', children);
+		getClusterInfo(app, zk, children);
+	});
 };
\ No newline at end of file
diff --git a/lib/monitor/zkClient.js b/lib/monitor/zkClient.js
new file mode 100644
index 000000000..c013c3d0d
--- /dev/null
+++ b/lib/monitor/zkClient.js
@@ -0,0 +1,193 @@
+var async = require('async');
+var crypto = require('crypto');
+var zookeeper = require('node-zookeeper-client');
+var commander = require('./cmd');
+var constants = require('../util/constants');
+var utils = require('../util/utils');
+var CreateMode = zookeeper.CreateMode;
+var logger = require('pomelo-logger').getLogger('pomelo', __filename);
+
+function ZKClient(app, cb) {
+  var self = this;
+
+  this.app = app;
+  zkConfig = app.zookeeper;
+  this.path = zkConfig.path || constants.RESERVED.DEFAULT_ROOT;
+  this.username = zkConfig.username || '';
+  this.password = zkConfig.password || '';
+  this.timeout = zkConfig.timeout || constants.TIME.DEFAULT_ZK_TIMEOUT;
+  this.setACL = zkConfig.setACL;
+  this.retries = zkConfig.retries || constants.RETRY.CONNECT_RETRY;
+  this.spinDelay = zkConfig.spinDelay || constants.TIME.DEFAULT_SPIN_DELAY;
+  this.reconnectTimes = zkConfig.reconnectTimes || constants.RETRY.RECONNECT_RETRY;
+  this.nodePath = this.path + '/info::' + app.serverId;
+  this.cmdPath = this.path + '/cmd::' + app.serverId;
+  this.authentication = this.username + ':' + this.password;
+
+  var shaDigest = crypto.createHash('sha1').update(this.authentication).digest('base64');
+  this.acls = [
+  new zookeeper.ACL(
+    zookeeper.Permission.ALL,
+    new zookeeper.Id('digest', this.username + ':' + shaDigest)
+    )
+  ];
+
+  this.client = zookeeper.createClient(zkConfig.servers, {sessionTimeout: this.timeout, retries: this.retries, spinDelay: this.spinDelay});
+
+  var cbTimer = setTimeout(function() {
+    utils.invokeCallback(cb, new Error(self.app.serverId + ' cannot connect to zookeeper.'));
+  }, constants.TIME.DEFAULT_ZK_CONNECT_TIMEOUT);
+
+  this.client.once('connected', function() {
+    logger.info('%s connect zookeeper successfully.', self.app.serverId);
+    self.client.addAuthInfo('digest', new Buffer(self.authentication));
+    if(self.setACL) {
+      self.client.setACL(self.path, self.acls, -1, function(err, stat) {
+        if(!!err) {
+          logger.error('failed to set ACL: %j', err.stack);
+          clearTimeout(cbTimer);
+          throw err;
+        }
+        clearTimeout(cbTimer);
+        registerZK(self, cb);
+        logger.info('ACL is set to: %j', self.acls);
+      });
+    } else {
+      clearTimeout(cbTimer);
+      registerZK(self, cb);
+    }
+  });
+
+  this.client.on('disconnected', function() {
+    logger.error('%s disconnect with zookeeper server.', self.app.serverId);
+    reconnect(self);
+  });
+
+  this.client.connect();
+};
+
+module.exports = ZKClient;
+
+ZKClient.prototype.close = function() {
+  this.client.close();
+};
+
+ZKClient.prototype.getData = function(path, watcher, cb) {
+  this.client.getData(path, watcher, function(err, data) {
+    if(!!err) {
+      utils.invokeCallback(cb, err);
+      return;
+    }
+    utils.invokeCallback(cb, null, data == null ? null: data.toString());
+  });
+};
+
+ZKClient.prototype.getChildren = function(fun, cb) {
+  var self = this;
+  this.client.getChildren(this.path, fun, function(err, children, stats) {
+    if(!!err) {
+      utils.invokeCallback(cb, err);
+      return;
+    }
+    utils.invokeCallback(cb, null, children);
+  });
+};
+
+var registerZK = function(zk, cb) {
+  var serverInfo = zk.app.getCurServer();
+  serverInfo.pid = process.pid;
+  var buffer = new Buffer(JSON.stringify(serverInfo));
+
+  async.series([
+    function(callback) {
+      createAllNode(zk, buffer, CreateMode.EPHEMERAL, function(err) {
+        if(!!err) {
+          logger.error('create server node %s failed, with err : %j ', zk.nodePath, err.stack);
+          utils.invokeCallback(callback, err);
+          return;
+        }
+        utils.invokeCallback(callback);
+      });
+    },
+    function(callback) {
+      zk.getData(zk.cmdPath, watchCommand.bind(zk), function(err, data) {
+        logger.debug('cmd data: %j', data);
+        utils.invokeCallback(callback);
+      });
+    }
+    ],
+    function(err, rs) {
+      utils.invokeCallback(cb, err);
+    });
+};
+
+var createAllNode = function(zk, value, mode, cb) {
+  async.series([
+    function(callback) {
+      logger.debug('ceate data path');
+      createNode(zk.client, zk.nodePath, value, mode, callback);
+    },
+    function(callback) {
+      logger.debug('ceate command path');
+      createNode(zk.client, zk.cmdPath, null, mode, callback);
+    }
+    ],
+  function(err, rs) {
+    logger.debug('create all node with callback');
+    utils.invokeCallback(cb, err);
+  });
+};
+
+var createNode = function(client, path, value, mode, cb) {
+  logger.debug('create node with path: %s', path);
+  client.create(path, value, mode, function(err, result) {
+    logger.debug('create node with result: %s', result);
+    utils.invokeCallback(cb, err);
+  });
+};
+
+var watchCommand = function(event) {
+  var self = this;
+  this.getData(this.cmdPath, watchCommand.bind(self), function(err, data) {
+    commander.init(self, event, data);
+  });
+};
+
+var reconnect = function(self) {
+  var self = this;
+  var count = 0;
+  var retry = true;
+  var retries = this.reconnectTimes;
+  async.whilst(
+    function () {
+      return count <= retries && retry;
+    },
+    function (next) {
+      count += 1;
+      self.connectZK(function(err) {
+        if(!!err) {
+          logger.error(self.app.serverId + ' reconnect fail with count: %s.' + count);
+          setTimeout(
+            next,
+            count * 1000 * 5
+            );
+        } else {
+          self.registerZK(function(err) {
+            if(!!err) {
+              logger.error(self.app.serverId + ' registerZK fail with count: %s.' + count);
+              setTimeout(
+                next,
+                count * 1000 * 5
+                );
+            } else {
+              retry = false;
+            }
+          });
+        }
+      });
+    },
+    function (error) {
+
+    }
+    );
+};
\ No newline at end of file
diff --git a/lib/util/appUtil.js b/lib/util/appUtil.js
index 497e5b5a9..8eb0ca6b6 100644
--- a/lib/util/appUtil.js
+++ b/lib/util/appUtil.js
@@ -4,7 +4,6 @@ var utils = require('./utils');
 var path = require('path');
 var fs = require('fs');
 var Constants = require('./constants');
-var starter = require('../master/starter');
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 
 /**
@@ -13,49 +12,26 @@ var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 module.exports.defaultConfiguration = function(app) {
   var args = parseArgs(process.argv);
   setupEnv(app, args);
-  loadMaster(app);
+  loadZK(app);
   loadServers(app);
   processArgs(app, args);
   configLogger(app);
   loadLifecycle(app);
 };
 
-/**
- * Start servers by type.
- */
-module.exports.startByType = function(app, cb) {
-  if(!!app.startId) {
-    if(app.startId === Constants.RESERVED.MASTER) {
-      utils.invokeCallback(cb);
-    } else {
-      starter.runServers(app);
-    }
-  } else {
-    if(!!app.type && app.type !== Constants.RESERVED.ALL && app.type !== Constants.RESERVED.MASTER) {
-      starter.runServers(app);
-    } else {
-      utils.invokeCallback(cb);
-    }
-  }
-};
-
 /**
  * Load default components for application.
  */
-module.exports.loadDefaultComponents = function(app) {
+ module.exports.loadDefaultComponents = function(app) {
   var pomelo = require('../pomelo');
   // load system default components
-  if (app.serverType === Constants.RESERVED.MASTER) {
-    app.load(pomelo.master, app.get('masterConfig'));
-  } else {
-    app.load(pomelo.proxy, app.get('proxyConfig'));
-    if (app.getCurServer().port) {
-      app.load(pomelo.remote, app.get('remoteConfig'));
-    }
-    if (app.isFrontend()) {
-      app.load(pomelo.connection, app.get('connectionConfig'));
-      app.load(pomelo.connector, app.get('connectorConfig'));
-      app.load(pomelo.session, app.get('sessionConfig'));
+  if (app.getCurServer().port) {
+    app.load(pomelo.remote, app.get('remoteConfig'));
+  }
+  if (app.isFrontend()) {
+    app.load(pomelo.connection, app.get('connectionConfig'));
+    app.load(pomelo.connector, app.get('connectorConfig'));
+    app.load(pomelo.session, app.get('sessionConfig'));
       // compatible for schedulerConfig
       if(app.get('schedulerConfig')) {
         app.load(pomelo.pushScheduler, app.get('schedulerConfig'));
@@ -63,12 +39,12 @@ module.exports.loadDefaultComponents = function(app) {
         app.load(pomelo.pushScheduler, app.get('pushSchedulerConfig'));
       }
     }
+    app.load(pomelo.proxy, app.get('proxyConfig'));
     app.load(pomelo.backendSession, app.get('backendSessionConfig'));
     app.load(pomelo.channel, app.get('channelConfig'));
     app.load(pomelo.server, app.get('serverConfig'));
-  }
-  app.load(pomelo.monitor, app.get('monitorConfig'));
-};
+    app.load(pomelo.monitor, app.get('monitorConfig'));
+  };
 
 /**
  * Stop components.
@@ -150,41 +126,24 @@ var loadServers = function(app) {
 };
 
 /**
- * Load master info from config/master.json.
+ * Load zookeeper info from config/zookeeper.json.
  */
-var loadMaster = function(app) {
-  app.loadConfigBaseApp(Constants.RESERVED.MASTER, Constants.FILEPATH.MASTER);
-  app.master = app.get(Constants.RESERVED.MASTER);
+var loadZK = function(app) {
+  app.loadConfigBaseApp(Constants.RESERVED.ZK, Constants.FILEPATH.ZK);
+  app.zookeeper = app.get(Constants.RESERVED.ZK);
 };
 
 /**
  * Process server start command
  */
 var processArgs = function(app, args) {
-  var serverType = args.serverType || Constants.RESERVED.MASTER;
-  var serverId = args.id || app.getMaster().id;
-  var mode = args.mode || Constants.RESERVED.CLUSTER;
-  var masterha = args.masterha || 'false';
-  var type = args.type || Constants.RESERVED.ALL;
-  var startId = args.startId;
+  var serverType = args.serverType;
+  var serverId = args.id;
 
   app.set(Constants.RESERVED.MAIN, args.main, true);
   app.set(Constants.RESERVED.SERVER_TYPE, serverType, true);
   app.set(Constants.RESERVED.SERVER_ID, serverId, true);
-  app.set(Constants.RESERVED.MODE, mode, true);
-  app.set(Constants.RESERVED.TYPE, type, true);
-  if(!!startId) {
-    app.set(Constants.RESERVED.STARTID, startId, true);
-  }
-
-  if (masterha === 'true') {
-    app.master = args;
-    app.set(Constants.RESERVED.CURRENT_SERVER, args, true);
-  } else if (serverType !== Constants.RESERVED.MASTER) {
-    app.set(Constants.RESERVED.CURRENT_SERVER, args, true);
-  } else {
-    app.set(Constants.RESERVED.CURRENT_SERVER, app.getMaster(), true);
-  }
+  app.set(Constants.RESERVED.CURRENT_SERVER, args, true);
 };
 
 /**
@@ -259,4 +218,4 @@ var loadLifecycle = function(app) {
       logger.warn('lifecycle.js in %s is error format.', filePath);
     }
   }
-};
+};
\ No newline at end of file
diff --git a/lib/util/constants.js b/lib/util/constants.js
index 99987e45b..ffb71d799 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -15,7 +15,7 @@ module.exports = {
  },
 
   FILEPATH: {
-    MASTER: '/config/master.json',
+    ZK: '/config/zookeeper.json',
     SERVER: '/config/servers.json',
     CRON: '/config/crons.json',
     LOG: '/config/log4js.json',
@@ -40,7 +40,7 @@ module.exports = {
   RESERVED: {
     BASE: 'base',
     MAIN: 'main',
-    MASTER: 'master',
+    ZK: 'zookeeper',
     SERVERS: 'servers',
     ENV: 'env',
     CPU: 'cpu',
@@ -69,7 +69,8 @@ module.exports = {
     CLIENT: 'client',
     STARTID: 'startId',
     STOP_SERVERS: 'stop_servers',
-    SSH_CONFIG_PARAMS: 'ssh_config_params'
+    SSH_CONFIG_PARAMS: 'ssh_config_params',
+    DEFAULT_ROOT: '/pomelo-cluster'
   },
 
   COMMAND: {
@@ -107,6 +108,14 @@ module.exports = {
    TIME_WAIT_MAX_PING: 5 * 60 * 1000,
    DEFAULT_UDP_HEARTBEAT_TIME: 20 * 1000,
    DEFAULT_UDP_HEARTBEAT_TIMEOUT: 100 * 1000,
-   DEFAULT_MQTT_HEARTBEAT_TIMEOUT: 90 * 1000
+   DEFAULT_MQTT_HEARTBEAT_TIMEOUT: 90 * 1000,
+   DEFAULT_ZK_CONNECT_TIMEOUT: 15 * 1000,
+   DEFAULT_ZK_TIMEOUT: 5 * 1000,
+   DEFAULT_SPIN_DELAY: 1000
+ },
+
+ RETRY: {
+   CONNECT_RETRY: 3,
+   RECONNECT_RETRY: 3
  }
 };
\ No newline at end of file
diff --git a/lib/util/moduleUtil.js b/lib/util/moduleUtil.js
deleted file mode 100644
index 65c6510dd..000000000
--- a/lib/util/moduleUtil.js
+++ /dev/null
@@ -1,96 +0,0 @@
-var os = require('os');
-var admin = require('pomelo-admin');
-var utils = require('./utils');
-var Constants = require('./constants');
-var pathUtil = require('./pathUtil');
-var starter = require('../master/starter');
-var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-var pro = module.exports;
-
-/**
- * Load admin modules
- */
-pro.loadModules = function(self, consoleService) {
-  // load app register modules
-  var _modules = self.app.get(Constants.KEYWORDS.MODULE);
-
-  if(!_modules) {
-    return;
-  }
-
-  var modules = [];
-  for(var m in _modules){
-    modules.push(_modules[m]);
-  }
-  
-  var record, moduleId, module;
-  for(var i=0, l=modules.length; i<l; i++) {
-    record = modules[i];
-    if(typeof record.module === 'function') {
-      module = record.module(record.opts, consoleService);
-    } else {
-      module = record.module;
-    }
-
-    moduleId = record.moduleId || module.moduleId;
-
-    if(!moduleId) {
-      logger.warn('ignore an unknown module.');
-      continue;
-    }
-
-    consoleService.register(moduleId, module);
-    self.modules.push(module);
-  }
-};
-
-pro.startModules = function(modules, cb) {
-  // invoke the start lifecycle method of modules
-
-  if(!modules) {
-    return;
-  }
-  startModule(null, modules, 0, cb);
-};
-
-/**
- * Append the default system admin modules
- */
-pro.registerDefaultModules = function(isMaster, app, closeWatcher) {
-  if(!closeWatcher) {
-    if(isMaster) {
-      app.registerAdmin(require('../modules/masterwatcher'), {app: app});
-    } else {
-      app.registerAdmin(require('../modules/monitorwatcher'), {app: app});
-    }
-  }
-  app.registerAdmin(admin.modules.watchServer,{app:app});
-  app.registerAdmin(require('../modules/console'), {app: app, starter: starter});
-  if(app.enabled('systemMonitor')) {
-    if(os.platform() !== Constants.PLATFORM.WIN) {
-      app.registerAdmin(admin.modules.systemInfo);
-      app.registerAdmin(admin.modules.nodeInfo);
-    }
-    app.registerAdmin(admin.modules.monitorLog, {path: pathUtil.getLogPath(app.getBase())});
-    app.registerAdmin(admin.modules.scripts, {app:app, path: pathUtil.getScriptPath(app.getBase())});
-    if(os.platform() !== Constants.PLATFORM.WIN) {
-      app.registerAdmin(admin.modules.profiler);
-    }
-  }
-};
-
-var startModule = function(err, modules, index, cb) {
-  if(err || index >= modules.length) {
-    utils.invokeCallback(cb, err);
-    return;
-  }
-
-  var module = modules[index];
-  if(module && typeof module.start === 'function') {
-    module.start(function(err) {
-      startModule(err, modules, index + 1, cb);
-    });
-  } else {
-    startModule(err, modules, index + 1, cb);
-  }
-};
diff --git a/package.json b/package.json
index af27bb817..6e23961c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pomelo",
-  "version": "1.1.9",
+  "version": "2.0.0",
   "private": false,
   "homepage": "https://github.com/NetEase/pomelo",
   "repository": {
@@ -37,14 +37,14 @@
     "pomelo-loader": "0.0.6",
     "pomelo-rpc": "0.4.10",
     "pomelo-protocol": "0.1.6",
-    "pomelo-admin": "0.4.4",
     "pomelo-logger": "0.1.7",
     "pomelo-scheduler": "0.3.9",
     "ws": "0.4.25",
     "pomelo-protobuf": "0.4.0",
     "node-bignumber": "1.2.1",
     "commander": "2.0.0",
-    "mqtt": "0.3.9"
+    "mqtt": "0.3.9",
+    "node-zookeeper-client": "0.2.2"
   },
   "bin": {
     "pomelo": "./bin/pomelo"

From 5481f90ebb2886cc3b874451133404c14a53917e Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 7 Aug 2015 15:38:49 +0800
Subject: [PATCH 02/78] add command

---
 lib/monitor/cmd.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/monitor/cmd.js b/lib/monitor/cmd.js
index 3634739ab..91b3b7806 100644
--- a/lib/monitor/cmd.js
+++ b/lib/monitor/cmd.js
@@ -20,6 +20,15 @@ Command.init = function(client, event, data) {
 		case 2:
 			kill(client);
 			break;
+		case 3:
+			addCron(client, data);
+			break;
+		case 4:
+			removeCron(client, data);
+			break;
+		case 5:
+			addBlacklist(client, data);
+			break;
 		default:
 			break;
 	}
@@ -33,4 +42,19 @@ var stop = function(client) {
 var kill = function(client) {
 	logger.info('server: %s is forced stopped.', client.app.serverId);
 	process.exit(0);
+};
+
+var addCron = function(client, msg) {
+	client.app.addCrons([msg.cron]);
+};
+
+var removeCron = function(client, msg) {
+	client.app.removeCrons([msg.cron]);
+};
+
+var addBlacklist = function(client, msg) {
+	if(client.app.isFrontend()) {
+		var connector = client.app.components.__connector__;
+		connector.blacklist = connector.blacklist.concat(msg.blacklist);
+	}
 };
\ No newline at end of file

From a35d73d246145614fdbc17c4b9102ed622ec9422 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 7 Aug 2015 16:01:11 +0800
Subject: [PATCH 03/78] update constants

---
 lib/monitor/monitor.js  | 2 +-
 lib/monitor/zkClient.js | 4 ++--
 lib/util/constants.js   | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/monitor/monitor.js b/lib/monitor/monitor.js
index cda31dc9a..8f21d7879 100644
--- a/lib/monitor/monitor.js
+++ b/lib/monitor/monitor.js
@@ -50,7 +50,7 @@ var getClusterInfo = function(app, zk, servers) {
 
 	for(var i = 0; i < servers.length; i++) {
 		(function(index) {
-			if(utils.startsWith(servers[index], 'info::')) {
+			if(utils.startsWith(servers[index], constants.RESERVED.ZK_NODE_INFO)) {
 				zk.getData(zk.path + '/' + servers[index], null, function(err, data) {
 					if(!!err)	{
 						logger.error('%s get data failed for server %s, with err: %j', app.serverId, servers[index], err.stack);
diff --git a/lib/monitor/zkClient.js b/lib/monitor/zkClient.js
index c013c3d0d..a3e82aaab 100644
--- a/lib/monitor/zkClient.js
+++ b/lib/monitor/zkClient.js
@@ -20,8 +20,8 @@ function ZKClient(app, cb) {
   this.retries = zkConfig.retries || constants.RETRY.CONNECT_RETRY;
   this.spinDelay = zkConfig.spinDelay || constants.TIME.DEFAULT_SPIN_DELAY;
   this.reconnectTimes = zkConfig.reconnectTimes || constants.RETRY.RECONNECT_RETRY;
-  this.nodePath = this.path + '/info::' + app.serverId;
-  this.cmdPath = this.path + '/cmd::' + app.serverId;
+  this.nodePath = this.path + '/'  + constants.RESERVED.ZK_NODE_INFO + app.serverId;
+  this.cmdPath = this.path + '/' + constants.RESERVED.ZK_NODE_COMMAND + app.serverId;
   this.authentication = this.username + ':' + this.password;
 
   var shaDigest = crypto.createHash('sha1').update(this.authentication).digest('base64');
diff --git a/lib/util/constants.js b/lib/util/constants.js
index ffb71d799..9aa55a108 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -70,7 +70,9 @@ module.exports = {
     STARTID: 'startId',
     STOP_SERVERS: 'stop_servers',
     SSH_CONFIG_PARAMS: 'ssh_config_params',
-    DEFAULT_ROOT: '/pomelo-cluster'
+    DEFAULT_ROOT: '/pomelo-cluster',
+    ZK_NODE_INFO: 'info::',
+    ZK_NODE_COMMAND: 'cmd::'
   },
 
   COMMAND: {

From 08a72f3a53c644afb72210622cfacda66d293cb0 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 7 Aug 2015 17:05:49 +0800
Subject: [PATCH 04/78] update node info prefix

---
 lib/monitor/monitor.js  | 2 +-
 lib/monitor/zkClient.js | 2 +-
 lib/util/constants.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/monitor/monitor.js b/lib/monitor/monitor.js
index 8f21d7879..fc707533a 100644
--- a/lib/monitor/monitor.js
+++ b/lib/monitor/monitor.js
@@ -50,7 +50,7 @@ var getClusterInfo = function(app, zk, servers) {
 
 	for(var i = 0; i < servers.length; i++) {
 		(function(index) {
-			if(utils.startsWith(servers[index], constants.RESERVED.ZK_NODE_INFO)) {
+			if(!utils.startsWith(servers[index], constants.RESERVED.ZK_NODE_COMMAND)) {
 				zk.getData(zk.path + '/' + servers[index], null, function(err, data) {
 					if(!!err)	{
 						logger.error('%s get data failed for server %s, with err: %j', app.serverId, servers[index], err.stack);
diff --git a/lib/monitor/zkClient.js b/lib/monitor/zkClient.js
index a3e82aaab..614bd4ee1 100644
--- a/lib/monitor/zkClient.js
+++ b/lib/monitor/zkClient.js
@@ -20,7 +20,7 @@ function ZKClient(app, cb) {
   this.retries = zkConfig.retries || constants.RETRY.CONNECT_RETRY;
   this.spinDelay = zkConfig.spinDelay || constants.TIME.DEFAULT_SPIN_DELAY;
   this.reconnectTimes = zkConfig.reconnectTimes || constants.RETRY.RECONNECT_RETRY;
-  this.nodePath = this.path + '/'  + constants.RESERVED.ZK_NODE_INFO + app.serverId;
+  this.nodePath = this.path + '/'  + app.serverType + constants.RESERVED.ZK_NODE_SEP + app.serverId;
   this.cmdPath = this.path + '/' + constants.RESERVED.ZK_NODE_COMMAND + app.serverId;
   this.authentication = this.username + ':' + this.password;
 
diff --git a/lib/util/constants.js b/lib/util/constants.js
index 9aa55a108..16a2c9135 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -71,7 +71,7 @@ module.exports = {
     STOP_SERVERS: 'stop_servers',
     SSH_CONFIG_PARAMS: 'ssh_config_params',
     DEFAULT_ROOT: '/pomelo-cluster',
-    ZK_NODE_INFO: 'info::',
+    ZK_NODE_SEP: '::',
     ZK_NODE_COMMAND: 'cmd::'
   },
 

From 338813f9c1bb5375f3d588c6b1f51a1ee5b4bf86 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 28 Aug 2015 14:16:12 +0800
Subject: [PATCH 05/78] update monitor

---
 lib/components/monitor.js                     |  11 +-
 lib/monitor/monitor.js                        |  82 ------------
 lib/{monitor => monitors/common}/cmd.js       |   5 +-
 .../zookeepermonitor.js}                      | 119 ++++++++++++++----
 lib/pomelo.js                                 |   6 +
 lib/util/appUtil.js                           |  14 +--
 lib/util/constants.js                         |   9 +-
 package.json                                  |   3 +-
 8 files changed, 120 insertions(+), 129 deletions(-)
 delete mode 100644 lib/monitor/monitor.js
 rename lib/{monitor => monitors/common}/cmd.js (88%)
 rename lib/{monitor/zkClient.js => monitors/zookeepermonitor.js} (57%)

diff --git a/lib/components/monitor.js b/lib/components/monitor.js
index 3f779687c..a60532f00 100644
--- a/lib/components/monitor.js
+++ b/lib/components/monitor.js
@@ -2,10 +2,7 @@
  * Component for monitor.
  * Load and start monitor client.
  */
-var Monitor = require('../monitor/monitor');
-
-
-
+var pomelo = require('../pomelo');
 /**
  * Component factory function
  *
@@ -17,7 +14,11 @@ module.exports = function(app, opts) {
 };
 
 var Component = function(app, opts) {
-  this.monitor = new Monitor(app, opts);
+  var monitor = opts.monitor;
+  if(!monitor) {
+    throw new Error('pomelo servers cannot start without monitor.');
+  }
+  return monitor(app, opts);
 };
 
 var pro = Component.prototype;
diff --git a/lib/monitor/monitor.js b/lib/monitor/monitor.js
deleted file mode 100644
index fc707533a..000000000
--- a/lib/monitor/monitor.js
+++ /dev/null
@@ -1,82 +0,0 @@
-var zkClient = require('./zkClient');
-var utils = require('../util/utils');
-var constants = require('../util/constants');
-var countDownLatch = require('../util/countDownLatch');
-var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-
-var Monitor = function(app, opts) {
-	opts = opts || {};
-	this.app = app;
-	this.serverInfo = app.getCurServer();
-};
-
-module.exports = Monitor;
-
-Monitor.prototype.start = function(cb) {
-	var self = this;
-
-	var monitor = new zkClient(this.app, function() {
-		logger.debug('server %s monitor start', self.app.serverId);
-		getAndWatchCluster(self.app, monitor);
-		utils.invokeCallback(cb);
-	});
-
-	this.monitor = monitor;
-};
-
-Monitor.prototype.stop = function(cb) {
-	this.monitor.close();
-	process.nextTick(function() {
-		utils.invokeCallback(cb);
-	});
-};
-
-var getClusterInfo = function(app, zk, servers) {
-	var success = true;
-	var results = {};
-	if(!servers.length)	{
-		logger.error('get servers data is null.');
-		return;
-	}
-	
-	var latch = countDownLatch.createCountDownLatch(servers.length, {timeout: constants.TIME.TIME_WAIT_COUNTDOWN}, function() {
-		if(!success) {
-			logger.error('get all children data failed, with serverId: %s', app.serverId);
-			return;
-		}
-		logger.info('cluster servers information: %j', results);
-		app.replaceServers(results);
-	});
-
-	for(var i = 0; i < servers.length; i++) {
-		(function(index) {
-			if(!utils.startsWith(servers[index], constants.RESERVED.ZK_NODE_COMMAND)) {
-				zk.getData(zk.path + '/' + servers[index], null, function(err, data) {
-					if(!!err)	{
-						logger.error('%s get data failed for server %s, with err: %j', app.serverId, servers[index], err.stack);
-						latch.done();
-						success = false;
-						return;
-					}
-					var serverInfo = JSON.parse(data);
-					results[serverInfo.id] = serverInfo;
-					latch.done();
-				});
-			} else {
-				latch.done();
-			}
-		})(i);
-	}
-};
-
-var getAndWatchCluster = function(app, zk) {
-	logger.debug('watch server: %s, with path: %s', app.serverId, zk.nodePath);
-	zk.getChildren(getAndWatchCluster.bind(null, app, zk), function(err, children) {
-		if(!!err)	{
-			logger.error('get children failed when watch server, with err: %j', err.stack);
-			return;
-		}
-		logger.debug('cluster children: %j', children);
-		getClusterInfo(app, zk, children);
-	});
-};
\ No newline at end of file
diff --git a/lib/monitor/cmd.js b/lib/monitors/common/cmd.js
similarity index 88%
rename from lib/monitor/cmd.js
rename to lib/monitors/common/cmd.js
index 91b3b7806..809050979 100644
--- a/lib/monitor/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -1,5 +1,5 @@
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
-
+var constants = require('../../util/constants');
 var Command = module.exports;
 
 Command.init = function(client, event, data) {
@@ -36,11 +36,12 @@ Command.init = function(client, event, data) {
 
 var stop = function(client) {
 	logger.info('server : %s is stopped', client.app.serverId);
+	client.app.set(constants.RESERVED.STOP_FLAG, true);
 	client.app.stop();
 };
 
 var kill = function(client) {
-	logger.info('server: %s is forced stopped.', client.app.serverId);
+	logger.info('server: %s is forced killed.', client.app.serverId);
 	process.exit(0);
 };
 
diff --git a/lib/monitor/zkClient.js b/lib/monitors/zookeepermonitor.js
similarity index 57%
rename from lib/monitor/zkClient.js
rename to lib/monitors/zookeepermonitor.js
index 614bd4ee1..dad999b25 100644
--- a/lib/monitor/zkClient.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -1,25 +1,28 @@
 var async = require('async');
 var crypto = require('crypto');
 var zookeeper = require('node-zookeeper-client');
-var commander = require('./cmd');
+var commander = require('./common/cmd');
 var constants = require('../util/constants');
 var utils = require('../util/utils');
+var countDownLatch = require('../util/countDownLatch');
 var CreateMode = zookeeper.CreateMode;
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 
-function ZKClient(app, cb) {
-  var self = this;
+var Monitor = function(app, opts) {
+  if (!(this instanceof Monitor)) {
+    return new Monitor(app, opts);
+  }
 
+  var self = this;
   this.app = app;
-  zkConfig = app.zookeeper;
-  this.path = zkConfig.path || constants.RESERVED.DEFAULT_ROOT;
-  this.username = zkConfig.username || '';
-  this.password = zkConfig.password || '';
-  this.timeout = zkConfig.timeout || constants.TIME.DEFAULT_ZK_TIMEOUT;
-  this.setACL = zkConfig.setACL;
-  this.retries = zkConfig.retries || constants.RETRY.CONNECT_RETRY;
-  this.spinDelay = zkConfig.spinDelay || constants.TIME.DEFAULT_SPIN_DELAY;
-  this.reconnectTimes = zkConfig.reconnectTimes || constants.RETRY.RECONNECT_RETRY;
+  this.path = opts.path || constants.RESERVED.DEFAULT_ROOT;
+  this.username = opts.username || '';
+  this.password = opts.password || '';
+  this.timeout = opts.timeout || constants.TIME.DEFAULT_ZK_TIMEOUT;
+  this.setACL = opts.setACL;
+  this.retries = opts.retries || constants.RETRY.CONNECT_RETRY;
+  this.spinDelay = opts.spinDelay || constants.TIME.DEFAULT_SPIN_DELAY;
+  this.reconnectTimes = opts.reconnectTimes || constants.RETRY.RECONNECT_RETRY;
   this.nodePath = this.path + '/'  + app.serverType + constants.RESERVED.ZK_NODE_SEP + app.serverId;
   this.cmdPath = this.path + '/' + constants.RESERVED.ZK_NODE_COMMAND + app.serverId;
   this.authentication = this.username + ':' + this.password;
@@ -32,7 +35,13 @@ function ZKClient(app, cb) {
     )
   ];
 
-  this.client = zookeeper.createClient(zkConfig.servers, {sessionTimeout: this.timeout, retries: this.retries, spinDelay: this.spinDelay});
+  this.client = zookeeper.createClient(opts.servers, {sessionTimeout: this.timeout, retries: this.retries, spinDelay: this.spinDelay});
+};
+
+module.exports = Monitor;
+
+Monitor.prototype.start = function(cb) {
+  var self = this;
 
   var cbTimer = setTimeout(function() {
     utils.invokeCallback(cb, new Error(self.app.serverId + ' cannot connect to zookeeper.'));
@@ -49,31 +58,39 @@ function ZKClient(app, cb) {
           throw err;
         }
         clearTimeout(cbTimer);
-        registerZK(self, cb);
+        registerZK(self, function() {
+          getAndWatchCluster(self);
+          utils.invokeCallback(cb);
+        });
         logger.info('ACL is set to: %j', self.acls);
       });
     } else {
       clearTimeout(cbTimer);
-      registerZK(self, cb);
+      registerZK(self, function() {
+        getAndWatchCluster(self);
+        utils.invokeCallback(cb);
+      });
     }
   });
 
   this.client.on('disconnected', function() {
     logger.error('%s disconnect with zookeeper server.', self.app.serverId);
-    reconnect(self);
+    if(!self.app.get(constants.RESERVED.STOP_FLAG)) {
+      reconnect(self);
+    } else {
+      logger.info('%s is forcely stopped by pomelo commander.', self.app.serverId);
+    }
   });
 
   this.client.connect();
 };
 
-module.exports = ZKClient;
-
-ZKClient.prototype.close = function() {
+Monitor.prototype.close = function() {
   this.client.close();
 };
 
-ZKClient.prototype.getData = function(path, watcher, cb) {
-  this.client.getData(path, watcher, function(err, data) {
+var getData = function(zk, path, watcher, cb) {
+  zk.client.getData(path, watcher, function(err, data) {
     if(!!err) {
       utils.invokeCallback(cb, err);
       return;
@@ -82,9 +99,20 @@ ZKClient.prototype.getData = function(path, watcher, cb) {
   });
 };
 
-ZKClient.prototype.getChildren = function(fun, cb) {
-  var self = this;
-  this.client.getChildren(this.path, fun, function(err, children, stats) {
+var getAndWatchCluster = function(self) {
+  logger.debug('watch server: %j, with path: %s', self.app.serverId, self.nodePath);
+  getChildren(self, getAndWatchCluster.bind(null, self), function(err, children) {
+    if(!!err) {
+      logger.error('get children failed when watch server, with err: %j', err.stack);
+      return;
+    }
+    logger.debug('cluster children: %j', children);
+    getClusterInfo(self.app, self, children);
+  });
+};
+
+var getChildren = function(zk, fun, cb) {
+  zk.client.getChildren(zk.path, fun, function(err, children, stats) {
     if(!!err) {
       utils.invokeCallback(cb, err);
       return;
@@ -110,7 +138,7 @@ var registerZK = function(zk, cb) {
       });
     },
     function(callback) {
-      zk.getData(zk.cmdPath, watchCommand.bind(zk), function(err, data) {
+      getData(zk, zk.cmdPath, watchCommand.bind(zk), function(err, data) {
         logger.debug('cmd data: %j', data);
         utils.invokeCallback(callback);
       });
@@ -148,12 +176,51 @@ var createNode = function(client, path, value, mode, cb) {
 
 var watchCommand = function(event) {
   var self = this;
-  this.getData(this.cmdPath, watchCommand.bind(self), function(err, data) {
+  getData(self, this.cmdPath, watchCommand.bind(self), function(err, data) {
     commander.init(self, event, data);
   });
 };
 
+var getClusterInfo = function(app, zk, servers) {
+  var success = true;
+  var results = {};
+  if(!servers.length) {
+    logger.error('get servers data is null.');
+    return;
+  }
+  
+  var latch = countDownLatch.createCountDownLatch(servers.length, {timeout: constants.TIME.TIME_WAIT_COUNTDOWN}, function() {
+    if(!success) {
+      logger.error('get all children data failed, with serverId: %s', app.serverId);
+      return;
+    }
+    logger.info('cluster servers information: %j', results);
+    app.replaceServers(results);
+  });
+
+  for(var i = 0; i < servers.length; i++) {
+    (function(index) {
+      if(!utils.startsWith(servers[index], constants.RESERVED.ZK_NODE_COMMAND)) {
+        getData(zk, zk.path + '/' + servers[index], null, function(err, data) {
+          if(!!err) {
+            logger.error('%s get data failed for server %s, with err: %j', app.serverId, servers[index], err.stack);
+            latch.done();
+            success = false;
+            return;
+          }
+          var serverInfo = JSON.parse(data);
+          results[serverInfo.id] = serverInfo;
+          latch.done();
+        });
+      } else {
+        latch.done();
+      }
+    })(i);
+  }
+};
+
 var reconnect = function(self) {
+  logger.info('%s server is reconnecting', self.app.serverId);
   var self = this;
   var count = 0;
   var retry = true;
diff --git a/lib/pomelo.js b/lib/pomelo.js
index b277e7b6c..231369b47 100644
--- a/lib/pomelo.js
+++ b/lib/pomelo.js
@@ -62,6 +62,12 @@ Pomelo.pushSchedulers = {};
 Pomelo.pushSchedulers.__defineGetter__('direct', load.bind(null, './pushSchedulers/direct'));
 Pomelo.pushSchedulers.__defineGetter__('buffer', load.bind(null, './pushSchedulers/buffer'));
 
+/**
+ * monitors
+ */
+Pomelo.monitors = {};
+Pomelo.monitors.__defineGetter__('zookeepermonitor', load.bind(null, './monitors/zookeepermonitor'));
+
 var self = this;
 
 /**
diff --git a/lib/util/appUtil.js b/lib/util/appUtil.js
index 8eb0ca6b6..90316a75f 100644
--- a/lib/util/appUtil.js
+++ b/lib/util/appUtil.js
@@ -3,6 +3,7 @@ var log = require('./log');
 var utils = require('./utils');
 var path = require('path');
 var fs = require('fs');
+var uuid = require('node-uuid');
 var Constants = require('./constants');
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 
@@ -12,7 +13,6 @@ var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 module.exports.defaultConfiguration = function(app) {
   var args = parseArgs(process.argv);
   setupEnv(app, args);
-  loadZK(app);
   loadServers(app);
   processArgs(app, args);
   configLogger(app);
@@ -125,21 +125,15 @@ var loadServers = function(app) {
   app.set(Constants.KEYWORDS.SERVER_MAP, serverMap);
 };
 
-/**
- * Load zookeeper info from config/zookeeper.json.
- */
-var loadZK = function(app) {
-  app.loadConfigBaseApp(Constants.RESERVED.ZK, Constants.FILEPATH.ZK);
-  app.zookeeper = app.get(Constants.RESERVED.ZK);
-};
-
 /**
  * Process server start command
  */
 var processArgs = function(app, args) {
   var serverType = args.serverType;
+  if(!args.id) {
+    args.id = uuid.v1();
+  }
   var serverId = args.id;
-
   app.set(Constants.RESERVED.MAIN, args.main, true);
   app.set(Constants.RESERVED.SERVER_TYPE, serverType, true);
   app.set(Constants.RESERVED.SERVER_ID, serverId, true);
diff --git a/lib/util/constants.js b/lib/util/constants.js
index 16a2c9135..28e3ff876 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -15,7 +15,7 @@ module.exports = {
  },
 
   FILEPATH: {
-    ZK: '/config/zookeeper.json',
+    MONITOR: '/config/monitorConfig.json',
     SERVER: '/config/servers.json',
     CRON: '/config/crons.json',
     LOG: '/config/log4js.json',
@@ -40,7 +40,7 @@ module.exports = {
   RESERVED: {
     BASE: 'base',
     MAIN: 'main',
-    ZK: 'zookeeper',
+    MONITOR: 'monitorConfig',
     SERVERS: 'servers',
     ENV: 'env',
     CPU: 'cpu',
@@ -72,7 +72,10 @@ module.exports = {
     SSH_CONFIG_PARAMS: 'ssh_config_params',
     DEFAULT_ROOT: '/pomelo-cluster',
     ZK_NODE_SEP: '::',
-    ZK_NODE_COMMAND: 'cmd::'
+    ZK_NODE_COMMAND: 'cmd::',
+    STOP_FLAG: 'stop_by_cmd',
+    ZK: 'zookeeper',
+    REDIS: 'redis'
   },
 
   COMMAND: {
diff --git a/package.json b/package.json
index 6e23961c9..8bfb730a9 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,8 @@
     "node-bignumber": "1.2.1",
     "commander": "2.0.0",
     "mqtt": "0.3.9",
-    "node-zookeeper-client": "0.2.2"
+    "node-zookeeper-client": "0.2.2",
+    "node-uuid": "1.4.3"
   },
   "bin": {
     "pomelo": "./bin/pomelo"

From a0a58be1b676b0bc46090dccd7e6417647fa6c89 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Sun, 6 Sep 2015 13:57:41 +0800
Subject: [PATCH 06/78] add component stop

---
 lib/monitors/zookeepermonitor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index dad999b25..339349536 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -85,7 +85,7 @@ Monitor.prototype.start = function(cb) {
   this.client.connect();
 };
 
-Monitor.prototype.close = function() {
+Monitor.prototype.stop = function() {
   this.client.close();
 };
 

From a30d8a93ff4321376393058f33c130c6c6992626 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Wed, 9 Sep 2015 17:58:58 +0800
Subject: [PATCH 07/78] add zookeeper reconnect

---
 lib/monitors/zookeepermonitor.js | 105 +++++++++++++++++++++----------
 lib/util/constants.js            |   2 +-
 2 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index 339349536..dc72cd9f2 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -8,13 +8,22 @@ var countDownLatch = require('../util/countDownLatch');
 var CreateMode = zookeeper.CreateMode;
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 
+var ZK_INIT = 0;
+var ZK_CONNECTING = 1;
+var ZK_CONNECTED = 2;
+var ZK_CONNECT_FAIL = 3;
+var ZK_RECONNECTING = 4;
+var ZK_END = 5;
+
 var Monitor = function(app, opts) {
   if (!(this instanceof Monitor)) {
     return new Monitor(app, opts);
   }
 
   var self = this;
+  this.state = ZK_INIT;
   this.app = app;
+  this.servers = opts.servers;
   this.path = opts.path || constants.RESERVED.DEFAULT_ROOT;
   this.username = opts.username || '';
   this.password = opts.password || '';
@@ -35,7 +44,7 @@ var Monitor = function(app, opts) {
     )
   ];
 
-  this.client = zookeeper.createClient(opts.servers, {sessionTimeout: this.timeout, retries: this.retries, spinDelay: this.spinDelay});
+  this.client = zookeeper.createClient(this.servers, {sessionTimeout: this.timeout, retries: this.retries, spinDelay: this.spinDelay});
 };
 
 module.exports = Monitor;
@@ -43,21 +52,24 @@ module.exports = Monitor;
 Monitor.prototype.start = function(cb) {
   var self = this;
 
-  var cbTimer = setTimeout(function() {
+  self.cbTimer = setTimeout(function() {
+    logger.info('connect to zookeeper timeout');
+    self.state = ZK_CONNECT_FAIL;
     utils.invokeCallback(cb, new Error(self.app.serverId + ' cannot connect to zookeeper.'));
   }, constants.TIME.DEFAULT_ZK_CONNECT_TIMEOUT);
 
   this.client.once('connected', function() {
     logger.info('%s connect zookeeper successfully.', self.app.serverId);
+    self.state = ZK_CONNECTED;
     self.client.addAuthInfo('digest', new Buffer(self.authentication));
     if(self.setACL) {
       self.client.setACL(self.path, self.acls, -1, function(err, stat) {
         if(!!err) {
           logger.error('failed to set ACL: %j', err.stack);
-          clearTimeout(cbTimer);
+          clearTimeout(self.cbTimer);
           throw err;
         }
-        clearTimeout(cbTimer);
+        clearTimeout(self.cbTimer);
         registerZK(self, function() {
           getAndWatchCluster(self);
           utils.invokeCallback(cb);
@@ -65,7 +77,7 @@ Monitor.prototype.start = function(cb) {
         logger.info('ACL is set to: %j', self.acls);
       });
     } else {
-      clearTimeout(cbTimer);
+      clearTimeout(self.cbTimer);
       registerZK(self, function() {
         getAndWatchCluster(self);
         utils.invokeCallback(cb);
@@ -73,15 +85,9 @@ Monitor.prototype.start = function(cb) {
     }
   });
 
-  this.client.on('disconnected', function() {
-    logger.error('%s disconnect with zookeeper server.', self.app.serverId);
-    if(!self.app.get(constants.RESERVED.STOP_FLAG)) {
-      reconnect(self);
-    } else {
-      logger.info('%s is forcely stopped by pomelo commander.', self.app.serverId);
-    }
-  });
+  disconnectHandle(self);
 
+  self.state = ZK_CONNECTING;
   this.client.connect();
 };
 
@@ -219,41 +225,76 @@ var getClusterInfo = function(app, zk, servers) {
   }
 };
 
+var disconnectHandle = function(self) {
+  self.client.on('disconnected', function() {
+      logger.error('%s disconnect with zookeeper server.', self.app.serverId);
+      if(!self.app.get(constants.RESERVED.STOP_FLAG)) {
+        reconnect(self);
+      } else {
+        logger.info('%s is forcely stopped by pomelo commander.', self.app.serverId);
+      }
+  });
+};
+
 var reconnect = function(self) {
+  if(self.state === ZK_CONNECTING || self.state === ZK_RECONNECTING) {
+    logger.warn('zookeeper client is in invalid state.');
+    return;
+  }
   logger.info('%s server is reconnecting', self.app.serverId);
-  var self = this;
+  self.state = ZK_RECONNECTING;
   var count = 0;
   var retry = true;
-  var retries = this.reconnectTimes;
+  var retries = self.reconnectTimes;
   async.whilst(
     function () {
       return count <= retries && retry;
     },
     function (next) {
       count += 1;
-      self.connectZK(function(err) {
-        if(!!err) {
-          logger.error(self.app.serverId + ' reconnect fail with count: %s.' + count);
-          setTimeout(
-            next,
-            count * 1000 * 5
-            );
-        } else {
-          self.registerZK(function(err) {
+      logger.debug('%s server is try to connect to zookeeper', self.app.serverId);
+      self.client.close();
+      self.client = zookeeper.createClient(self.servers, {sessionTimeout: self.timeout, retries: 0, spinDelay: self.spinDelay});
+
+      self.cbTimer = setTimeout(function() {
+        logger.info('reconnect to zookeeper timeout');
+        self.state = ZK_CONNECT_FAIL;
+        utils.invokeCallback(next);
+      }, constants.TIME.DEFAULT_ZK_CONNECT_TIMEOUT);
+
+      self.client.once('connected', function() {
+        logger.info('%s connect zookeeper successfully.', self.app.serverId);
+        self.state = ZK_CONNECTED;
+        self.client.addAuthInfo('digest', new Buffer(self.authentication));
+        if(self.setACL) {
+          self.client.setACL(self.path, self.acls, -1, function(err, stat) {
             if(!!err) {
-              logger.error(self.app.serverId + ' registerZK fail with count: %s.' + count);
-              setTimeout(
-                next,
-                count * 1000 * 5
-                );
-            } else {
-              retry = false;
+              logger.error('failed to set ACL: %j', err.stack);
+              clearTimeout(self.cbTimer);
+              throw err;
             }
+            clearTimeout(self.cbTimer);
+            registerZK(self, function() {
+              getAndWatchCluster(self);
+              disconnectHandle(self);
+              retry = false;
+            });
+            logger.info('ACL is set to: %j', self.acls);
+          });
+        } else {
+          clearTimeout(self.cbTimer);
+          registerZK(self, function() {
+            getAndWatchCluster(self);
+            disconnectHandle(self);
+            retry = false;
           });
         }
       });
+
+      self.state = ZK_RECONNECTING;
+      self.client.connect();
     },
-    function (error) {
+    function (err) {
 
     }
     );
diff --git a/lib/util/constants.js b/lib/util/constants.js
index 28e3ff876..0765926bc 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -121,6 +121,6 @@ module.exports = {
 
  RETRY: {
    CONNECT_RETRY: 3,
-   RECONNECT_RETRY: 3
+   RECONNECT_RETRY: 10000
  }
 };
\ No newline at end of file

From 4e777fb9729c2fbeda3315e42dfca7b26fba53b1 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <hzxuzhonghu@corp.netease.com>
Date: Thu, 24 Sep 2015 13:42:42 +0800
Subject: [PATCH 08/78] redis registry implemention

---
 lib/monitors/redisMonitor.js     | 75 ++++++++++++++++++++++++++++++++
 lib/monitors/zookeepermonitor.js |  1 -
 lib/pomelo.js                    |  1 +
 lib/util/constants.js            |  5 ++-
 package.json                     |  3 +-
 5 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 lib/monitors/redisMonitor.js

diff --git a/lib/monitors/redisMonitor.js b/lib/monitors/redisMonitor.js
new file mode 100644
index 000000000..3d37b8a58
--- /dev/null
+++ b/lib/monitors/redisMonitor.js
@@ -0,0 +1,75 @@
+var redis = require('redis');
+var constants = require('../util/constants');
+var utils = require('../util/utils');
+var logger = require('pomelo-logger').getLogger('pomelo', __filename);
+
+var Monitor = function(app, opts){
+    if(!(this instanceof Monitor)){
+        return new Monitor(app, opts);
+    }
+
+    this.app = app;
+    this.port = opts.port || 6379;
+    this.host = opts.host || '127.0.0.1';
+    this.password = opts.password || null;
+    this.redisOpts = opts.redisOpts || {};
+}
+
+module.exports = Monitor;
+
+Monitor.prototype.start = function(cb){
+    var self = this;
+    this.client = redis.createClient(this.port, this.host, this.redisOpts);
+
+    var cbTimer = setTimeout(function() {
+        utils.invokeCallback(cb, new Error(self.app.serverId + ' cannot connect to zookeeper.'));
+    }, constants.TIME.DEFAULT_REDIS_CONNECT_TIMEOUT);
+
+    this.client.once('connect', function(){
+        logger.info('%s connected to redis successfully !', self.app.serverId);
+        if(self.password){
+            self.client.auth(self.password);
+        }
+        clearTimeout(cbTimer);
+        self.timer = setInterval(getClusterInfo.bind(null, self.app, self.client, self.app.getCurServer()), constants.TIME.DEFAULT_REDIS_REG);
+        utils.invokeCallback(cb);
+
+    });
+
+    this.client.on('error', function(err){
+        logger.error('redis err:', err);
+    })
+}
+
+Monitor.prototype.close = function() {
+  this.client.end();
+  clearTimeout(this.timer);
+};
+
+var getClusterInfo = function(app, redis, serverInfo){
+    var results = {};
+    var key = 'pomelo-regist:' + serverInfo.env;
+    var args = [key, Date.now() + constants.TIME.DEFAULT_REDIS_EXPIRE, JSON.stringify(serverInfo)];
+    redis.zadd(args, function(err, res){
+        if(err){
+            logger.error('zadd %j err: %j', args, err);
+            return;
+        }
+
+        var query_args = [key, Date.now(), '+inf'];
+        redis.zrangebyscore(query_args, function(err, res){
+            if(err){
+                logger.error('zrangebyscore %j err: %j', query_args, err);
+                return;
+            }
+
+            for (var i = res.length - 1; i >= 0; i--) {
+                var server = JSON.parse(res[i]);
+                results[server.id] = server;
+            }
+
+            logger.info('cluster servers info: %j',results);
+            app.replaceServers(results);
+        });
+    });
+}
\ No newline at end of file
diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index dc72cd9f2..2661b9315 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -5,7 +5,6 @@ var commander = require('./common/cmd');
 var constants = require('../util/constants');
 var utils = require('../util/utils');
 var countDownLatch = require('../util/countDownLatch');
-var CreateMode = zookeeper.CreateMode;
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 
 var ZK_INIT = 0;
diff --git a/lib/pomelo.js b/lib/pomelo.js
index 231369b47..99fe9be4f 100644
--- a/lib/pomelo.js
+++ b/lib/pomelo.js
@@ -67,6 +67,7 @@ Pomelo.pushSchedulers.__defineGetter__('buffer', load.bind(null, './pushSchedule
  */
 Pomelo.monitors = {};
 Pomelo.monitors.__defineGetter__('zookeepermonitor', load.bind(null, './monitors/zookeepermonitor'));
+Pomelo.monitors.__defineGetter__('redisMonitor', load.bind(null, './monitors/redisMonitor'));
 
 var self = this;
 
diff --git a/lib/util/constants.js b/lib/util/constants.js
index 0765926bc..88b0a4bac 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -116,7 +116,10 @@ module.exports = {
    DEFAULT_MQTT_HEARTBEAT_TIMEOUT: 90 * 1000,
    DEFAULT_ZK_CONNECT_TIMEOUT: 15 * 1000,
    DEFAULT_ZK_TIMEOUT: 5 * 1000,
-   DEFAULT_SPIN_DELAY: 1000
+   DEFAULT_SPIN_DELAY: 1000,
+   DEFAULT_REDIS_CONNECT_TIMEOUT: 15 * 1000,
+   DEFAULT_REDIS_REG: 30*1000,
+   DEFAULT_REDIS_EXPIRE: 60*1000
  },
 
  RETRY: {
diff --git a/package.json b/package.json
index 8bfb730a9..ac8493e3a 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,8 @@
     "commander": "2.0.0",
     "mqtt": "0.3.9",
     "node-zookeeper-client": "0.2.2",
-    "node-uuid": "1.4.3"
+    "node-uuid": "1.4.3",
+    "redis": "2.0.1"
   },
   "bin": {
     "pomelo": "./bin/pomelo"

From c348a2c78a07b708d985c4cd18c13ede89f91f75 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <hzxuzhonghu@corp.netease.com>
Date: Fri, 25 Sep 2015 11:49:57 +0800
Subject: [PATCH 09/78] bug fix

---
 lib/monitors/redisMonitor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/monitors/redisMonitor.js b/lib/monitors/redisMonitor.js
index 3d37b8a58..2a14c2699 100644
--- a/lib/monitors/redisMonitor.js
+++ b/lib/monitors/redisMonitor.js
@@ -43,7 +43,7 @@ Monitor.prototype.start = function(cb){
 
 Monitor.prototype.close = function() {
   this.client.end();
-  clearTimeout(this.timer);
+  clearInterval(this.timer);
 };
 
 var getClusterInfo = function(app, redis, serverInfo){

From c9e42a6591b4c555289bec9a8b1691dd4f468ff5 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Tue, 29 Sep 2015 10:39:13 +0800
Subject: [PATCH 10/78] update command interface

---
 lib/monitors/common/cmd.js       | 8 ++------
 lib/monitors/zookeepermonitor.js | 6 +++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index 809050979..7e3a26f18 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -2,12 +2,8 @@ var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 var constants = require('../../util/constants');
 var Command = module.exports;
 
-Command.init = function(client, event, data) {
-	logger.debug('server: %s receive command, with event: %j, with data: %j', client.app.serverId, event, data);
-	if(event.type !== 3) {
-		logger.info('event ignore.');
-		return;
-	}
+Command.init = function(client, data) {
+	logger.debug('server: %s receive command, with data: %j', client.app.serverId, data);
 	if(!data) {
 		logger.warn('server: %s command data is null.', client.app.serverId);
 		return;
diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index dc72cd9f2..f9957a7c0 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -181,9 +181,13 @@ var createNode = function(client, path, value, mode, cb) {
 };
 
 var watchCommand = function(event) {
+  if(event.type !== 3) {
+    logger.debug('command event ignore.');
+    return;
+  }
   var self = this;
   getData(self, this.cmdPath, watchCommand.bind(self), function(err, data) {
-    commander.init(self, event, data);
+    commander.init(self, data);
   });
 };
 

From 2b6ff5f953f1150bdc805d38d4ca2a8cd88d331b Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Tue, 29 Sep 2015 11:04:45 +0800
Subject: [PATCH 11/78] add command support from redis_cli

---
 lib/monitors/redisMonitor.js | 29 ++++++++++++++++++++++++++++-
 lib/util/constants.js        |  4 ++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/lib/monitors/redisMonitor.js b/lib/monitors/redisMonitor.js
index 2a14c2699..9b6e92118 100644
--- a/lib/monitors/redisMonitor.js
+++ b/lib/monitors/redisMonitor.js
@@ -1,4 +1,5 @@
 var redis = require('redis');
+var commander = require('./common/cmd');
 var constants = require('../util/constants');
 var utils = require('../util/utils');
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
@@ -31,7 +32,7 @@ Monitor.prototype.start = function(cb){
             self.client.auth(self.password);
         }
         clearTimeout(cbTimer);
-        self.timer = setInterval(getClusterInfo.bind(null, self.app, self.client, self.app.getCurServer()), constants.TIME.DEFAULT_REDIS_REG);
+        self.timer = setInterval(watcherCluster2Command.bind(self), constants.TIME.DEFAULT_REDIS_REG);
         utils.invokeCallback(cb);
 
     });
@@ -46,6 +47,12 @@ Monitor.prototype.close = function() {
   clearInterval(this.timer);
 };
 
+var watcherCluster2Command = function(){
+    getClusterInfo(this.app, this.client, this.app.getCurServer());
+    getCommand(this, this.client, this.app.getCurServer());
+
+}
+
 var getClusterInfo = function(app, redis, serverInfo){
     var results = {};
     var key = 'pomelo-regist:' + serverInfo.env;
@@ -72,4 +79,24 @@ var getClusterInfo = function(app, redis, serverInfo){
             app.replaceServers(results);
         });
     });
+}
+
+var getCommand = function(self, redis, serverInfo){
+    var key = 'pomelo-regist:' + serverInfo.env + ':' + serverInfo.id;
+    redis.get(key, function(err, res){
+        if(err){
+            logger.error('get pomelo-regist cmd err %j', err);
+            return;
+        }
+
+        if(res){
+            logger.debug('get cmd: ',res);
+            commander.init(self, res);
+            redis.del(key, function(err){
+                if(err){
+                    logger.error('del command err %j', err);
+                }
+            });
+        }
+    });
 }
\ No newline at end of file
diff --git a/lib/util/constants.js b/lib/util/constants.js
index 88b0a4bac..f7f3f613b 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -118,8 +118,8 @@ module.exports = {
    DEFAULT_ZK_TIMEOUT: 5 * 1000,
    DEFAULT_SPIN_DELAY: 1000,
    DEFAULT_REDIS_CONNECT_TIMEOUT: 15 * 1000,
-   DEFAULT_REDIS_REG: 30*1000,
-   DEFAULT_REDIS_EXPIRE: 60*1000
+   DEFAULT_REDIS_REG: 15*1000,
+   DEFAULT_REDIS_EXPIRE: 25*1000
  },
 
  RETRY: {

From 50b07379f1836c1ded6c88a60cc065fc16ce1bab Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Tue, 29 Sep 2015 11:18:47 +0800
Subject: [PATCH 12/78] update command execute sequence, first delete cmd

---
 lib/monitors/redisMonitor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/monitors/redisMonitor.js b/lib/monitors/redisMonitor.js
index 9b6e92118..78c6f811a 100644
--- a/lib/monitors/redisMonitor.js
+++ b/lib/monitors/redisMonitor.js
@@ -91,10 +91,11 @@ var getCommand = function(self, redis, serverInfo){
 
         if(res){
             logger.debug('get cmd: ',res);
-            commander.init(self, res);
             redis.del(key, function(err){
                 if(err){
                     logger.error('del command err %j', err);
+                }else{
+                    commander.init(self, res);
                 }
             });
         }

From 8d2ae4479eaab1c8eb15143d02a74ba59a38a308 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Wed, 30 Sep 2015 18:29:54 +0800
Subject: [PATCH 13/78] code format keep consistent with pomelo

---
 lib/monitors/redisMonitor.js | 145 +++++++++++++++++------------------
 lib/pomelo.js                |   2 +-
 lib/util/constants.js        |   6 +-
 3 files changed, 74 insertions(+), 79 deletions(-)

diff --git a/lib/monitors/redisMonitor.js b/lib/monitors/redisMonitor.js
index 78c6f811a..a3eb7401a 100644
--- a/lib/monitors/redisMonitor.js
+++ b/lib/monitors/redisMonitor.js
@@ -4,42 +4,39 @@ var constants = require('../util/constants');
 var utils = require('../util/utils');
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 
-var Monitor = function(app, opts){
-    if(!(this instanceof Monitor)){
-        return new Monitor(app, opts);
-    }
-
-    this.app = app;
-    this.port = opts.port || 6379;
-    this.host = opts.host || '127.0.0.1';
-    this.password = opts.password || null;
-    this.redisOpts = opts.redisOpts || {};
+var Monitor = function(app, opts) {
+  if(!(this instanceof Monitor)) {
+    return new Monitor(app, opts);
+  }
+
+  this.app = app;
+  this.port = opts.port || 6379;
+  this.host = opts.host || '127.0.0.1';
+  this.period = opts.period || 15*1000;
+  this.expire = opts.expire || 25*1000;
+  this.password = opts.password || null;
+  this.redisOpts = opts.redisOpts || {};
 }
 
 module.exports = Monitor;
 
-Monitor.prototype.start = function(cb){
-    var self = this;
-    this.client = redis.createClient(this.port, this.host, this.redisOpts);
+Monitor.prototype.start = function(cb) {
+  var self = this;
+  this.client = redis.createClient(this.port, this.host, this.redisOpts);
 
-    var cbTimer = setTimeout(function() {
-        utils.invokeCallback(cb, new Error(self.app.serverId + ' cannot connect to zookeeper.'));
-    }, constants.TIME.DEFAULT_REDIS_CONNECT_TIMEOUT);
-
-    this.client.once('connect', function(){
-        logger.info('%s connected to redis successfully !', self.app.serverId);
-        if(self.password){
-            self.client.auth(self.password);
-        }
-        clearTimeout(cbTimer);
-        self.timer = setInterval(watcherCluster2Command.bind(self), constants.TIME.DEFAULT_REDIS_REG);
-        utils.invokeCallback(cb);
+  this.client.once('connect', function() {
+    logger.info('%s connected to redis successfully !', self.app.serverId);
+    if(self.password) {
+      self.client.auth(self.password);
+    }
+    self.timer = setInterval(watcherCluster2Command.bind(self), self.period);
+    utils.invokeCallback(cb);
 
-    });
+  });
 
-    this.client.on('error', function(err){
-        logger.error('redis err:', err);
-    })
+  this.client.on('error', function(err) {
+    logger.error('redis err:', err);
+  });
 }
 
 Monitor.prototype.close = function() {
@@ -47,57 +44,57 @@ Monitor.prototype.close = function() {
   clearInterval(this.timer);
 };
 
-var watcherCluster2Command = function(){
-    getClusterInfo(this.app, this.client, this.app.getCurServer());
-    getCommand(this, this.client, this.app.getCurServer());
-
+var watcherCluster2Command = function() {
+  getClusterInfo(this, this.app, this.client, this.app.getCurServer());
+  getCommand(this, this.client, this.app.getCurServer());
 }
 
-var getClusterInfo = function(app, redis, serverInfo){
-    var results = {};
-    var key = 'pomelo-regist:' + serverInfo.env;
-    var args = [key, Date.now() + constants.TIME.DEFAULT_REDIS_EXPIRE, JSON.stringify(serverInfo)];
-    redis.zadd(args, function(err, res){
-        if(err){
-            logger.error('zadd %j err: %j', args, err);
-            return;
-        }
+var getClusterInfo = function(self, app, redis, serverInfo) {
+  var results = {};
+  var key = constants.RESERVED.REDIS_REG_PREFIX + serverInfo.env;
+  var args = [key, Date.now() + self.expire, JSON.stringify(serverInfo)];
 
-        var query_args = [key, Date.now(), '+inf'];
-        redis.zrangebyscore(query_args, function(err, res){
-            if(err){
-                logger.error('zrangebyscore %j err: %j', query_args, err);
-                return;
-            }
-
-            for (var i = res.length - 1; i >= 0; i--) {
-                var server = JSON.parse(res[i]);
-                results[server.id] = server;
-            }
-
-            logger.info('cluster servers info: %j',results);
-            app.replaceServers(results);
-        });
+  redis.zadd(args, function(err, res) {
+    if(err) {
+      logger.error('zadd %j err: %j', args, err);
+      return;
+    }
+
+    var query_args = [key, Date.now(), '+inf'];
+    redis.zrangebyscore(query_args, function(err, res) {
+      if(err) {
+        logger.error('zrangebyscore %j err: %j', query_args, err);
+        return;
+      }
+
+      for (var i = res.length - 1; i >= 0; i--) {
+        var server = JSON.parse(res[i]);
+        results[server.id] = server;
+      }
+
+      logger.info('cluster servers info: %j',results);
+      app.replaceServers(results);
     });
+  });
 }
 
-var getCommand = function(self, redis, serverInfo){
-    var key = 'pomelo-regist:' + serverInfo.env + ':' + serverInfo.id;
-    redis.get(key, function(err, res){
-        if(err){
-            logger.error('get pomelo-regist cmd err %j', err);
-            return;
-        }
+var getCommand = function(self, redis, serverInfo) {
+  var key = constants.RESERVED.REDIS_REG_PREFIX + serverInfo.env + ':' + serverInfo.id;
+  redis.get(key, function(err, res) {
+    if(err) {
+      logger.error('get pomelo-regist cmd err %j', err);
+      return;
+    }
 
-        if(res){
-            logger.debug('get cmd: ',res);
-            redis.del(key, function(err){
-                if(err){
-                    logger.error('del command err %j', err);
-                }else{
-                    commander.init(self, res);
-                }
-            });
+    if(res) {
+      logger.debug('get cmd: ', res);
+      redis.del(key, function(err) {
+        if(err) {
+          logger.error('del command err %j', err);
+        }else {
+          commander.init(self, res);
         }
-    });
+      });
+    }
+  });
 }
\ No newline at end of file
diff --git a/lib/pomelo.js b/lib/pomelo.js
index 99fe9be4f..1867ba30c 100644
--- a/lib/pomelo.js
+++ b/lib/pomelo.js
@@ -67,7 +67,7 @@ Pomelo.pushSchedulers.__defineGetter__('buffer', load.bind(null, './pushSchedule
  */
 Pomelo.monitors = {};
 Pomelo.monitors.__defineGetter__('zookeepermonitor', load.bind(null, './monitors/zookeepermonitor'));
-Pomelo.monitors.__defineGetter__('redisMonitor', load.bind(null, './monitors/redisMonitor'));
+Pomelo.monitors.__defineGetter__('redismonitor', load.bind(null, './monitors/redismonitor'));
 
 var self = this;
 
diff --git a/lib/util/constants.js b/lib/util/constants.js
index f7f3f613b..571acc7ee 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -75,7 +75,8 @@ module.exports = {
     ZK_NODE_COMMAND: 'cmd::',
     STOP_FLAG: 'stop_by_cmd',
     ZK: 'zookeeper',
-    REDIS: 'redis'
+    REDIS: 'redis',
+    REDIS_REG_PREFIX: 'pomelo-regist:'
   },
 
   COMMAND: {
@@ -117,9 +118,6 @@ module.exports = {
    DEFAULT_ZK_CONNECT_TIMEOUT: 15 * 1000,
    DEFAULT_ZK_TIMEOUT: 5 * 1000,
    DEFAULT_SPIN_DELAY: 1000,
-   DEFAULT_REDIS_CONNECT_TIMEOUT: 15 * 1000,
-   DEFAULT_REDIS_REG: 15*1000,
-   DEFAULT_REDIS_EXPIRE: 25*1000
  },
 
  RETRY: {

From 9bc3caa1b0314620803bcbd579fc1a64a4806375 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Thu, 8 Oct 2015 16:36:44 +0800
Subject: [PATCH 14/78] update format

---
 lib/monitors/redisMonitor.js | 8 ++++----
 lib/util/constants.js        | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/monitors/redisMonitor.js b/lib/monitors/redisMonitor.js
index a3eb7401a..4a30a1802 100644
--- a/lib/monitors/redisMonitor.js
+++ b/lib/monitors/redisMonitor.js
@@ -10,10 +10,10 @@ var Monitor = function(app, opts) {
   }
 
   this.app = app;
-  this.port = opts.port || 6379;
-  this.host = opts.host || '127.0.0.1';
-  this.period = opts.period || 15*1000;
-  this.expire = opts.expire || 25*1000;
+  this.port = opts.port || constants.RESERVED.PORT;
+  this.host = opts.host || constants.RESERVED.HOST;
+  this.period = opts.period || constants.TIME.DEFAULT_REDIS_REG;
+  this.expire = opts.expire || constants.TIME.DEFAULT_REDIS_EXPIRE;
   this.password = opts.password || null;
   this.redisOpts = opts.redisOpts || {};
 }
diff --git a/lib/util/constants.js b/lib/util/constants.js
index 571acc7ee..54c987fec 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -76,7 +76,9 @@ module.exports = {
     STOP_FLAG: 'stop_by_cmd',
     ZK: 'zookeeper',
     REDIS: 'redis',
-    REDIS_REG_PREFIX: 'pomelo-regist:'
+    REDIS_REG_PREFIX: 'pomelo-regist:',
+    DEFAULT_REDIS_PORT: 6379,
+	DEFAULT_REDIS_HOST: '127.0.0.1'
   },
 
   COMMAND: {
@@ -118,6 +120,9 @@ module.exports = {
    DEFAULT_ZK_CONNECT_TIMEOUT: 15 * 1000,
    DEFAULT_ZK_TIMEOUT: 5 * 1000,
    DEFAULT_SPIN_DELAY: 1000,
+   DEFAULT_REDIS_CONNECT_TIMEOUT: 15 * 1000,
+   DEFAULT_REDIS_REG: 15*1000,
+   DEFAULT_REDIS_EXPIRE: 25*1000
  },
 
  RETRY: {

From 45bb62b010162a4f9613b4a7b243194d43deba22 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Thu, 8 Oct 2015 16:39:24 +0800
Subject: [PATCH 15/78] update format

---
 lib/monitors/{redisMonitor.js => redismonitor.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/monitors/{redisMonitor.js => redismonitor.js} (100%)

diff --git a/lib/monitors/redisMonitor.js b/lib/monitors/redismonitor.js
similarity index 100%
rename from lib/monitors/redisMonitor.js
rename to lib/monitors/redismonitor.js

From 085d7420504b4828ef9b55f9fd7c6cdc053b0f1a Mon Sep 17 00:00:00 2001
From: "zhangmin.name" <zhangmin@zhangmin.name>
Date: Fri, 9 Oct 2015 17:18:59 +0800
Subject: [PATCH 16/78] fix CreateMode not defined

---
 lib/monitors/zookeepermonitor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index e35fc0794..02e37b97c 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -133,7 +133,7 @@ var registerZK = function(zk, cb) {
 
   async.series([
     function(callback) {
-      createAllNode(zk, buffer, CreateMode.EPHEMERAL, function(err) {
+      createAllNode(zk, buffer, zookeeper.CreateMode.EPHEMERAL, function(err) {
         if(!!err) {
           logger.error('create server node %s failed, with err : %j ', zk.nodePath, err.stack);
           utils.invokeCallback(callback, err);

From 5d574e6908737d7307a20120cd3a491b8af13d8c Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Wed, 14 Oct 2015 14:13:34 +0800
Subject: [PATCH 17/78] remove unused code

---
 bin/pomelo         | 275 ---------------------------------------------
 lib/application.js |  34 ------
 2 files changed, 309 deletions(-)

diff --git a/bin/pomelo b/bin/pomelo
index 73b626964..9813dccdb 100755
--- a/bin/pomelo
+++ b/bin/pomelo
@@ -9,13 +9,10 @@ var fs = require('fs'),
   util = require('util'),
   cliff = require('cliff'),
   mkdirp = require('mkdirp'),
-  co = require('../lib/modules/console'),
   utils = require('../lib/util/utils'),
-  starter = require('../lib/master/starter'),
   exec = require('child_process').exec,
   spawn = require('child_process').spawn,
   version = require('../package.json').version,
-  adminClient = require('pomelo-admin').adminClient,
   constants = require('../lib/util/constants'),
   program = require('commander');
 
@@ -23,26 +20,14 @@ var fs = require('fs'),
  *  Constant Variables
  */
 var TIME_INIT = 1 * 1000;
-var TIME_KILL_WAIT = 5 * 1000;
-var KILL_CMD_LUX = 'kill -9 `ps -ef|grep node|awk \'{print $2}\'`';
-var KILL_CMD_WIN = 'taskkill /im node.exe /f';
 
 var CUR_DIR = process.cwd();
 var DEFAULT_GAME_SERVER_DIR = CUR_DIR;
-var DEFAULT_USERNAME = 'admin';
-var DEFAULT_PWD = 'admin';
-var DEFAULT_ENV = 'development';
-var DEFAULT_MASTER_HOST = '127.0.0.1';
-var DEFAULT_MASTER_PORT = 3005;
 
-var CONNECT_ERROR = 'Fail to connect to admin console server.';
 var FILEREAD_ERROR = 'Fail to read the file, please check if the application is started legally.';
 var CLOSEAPP_INFO = 'Closing the application......\nPlease wait......';
-var ADD_SERVER_INFO = 'Successfully add server.';
-var RESTART_SERVER_INFO = 'Successfully restart server.';
 var INIT_PROJ_NOTICE = '\nThe default admin user is: \n\n'+ '  username'.green + ': admin\n  ' + 'password'.green+ ': admin\n\nYou can configure admin users by editing adminUser.json later.\n ';
 var SCRIPT_NOT_FOUND = 'Fail to find an appropriate script to run,\nplease check the current work directory or the directory specified by option `--directory`.\n'.red;
-var MASTER_HA_NOT_FOUND = 'Fail to find an appropriate masterha config file, \nplease check the current work directory or the arguments passed to.\n'.red;
 var COMMAND_ERROR = 'Illegal command format. Use `pomelo --help` to get more info.\n'.red;
 var DAEMON_INFO = 'The application is running in the background now.\n';
 
@@ -54,86 +39,6 @@ program.command('init [path]')
     init(path || CUR_DIR);
   });
 
-program.command('start')
-  .description('start the application')
-  .option('-e, --env <env>', 'the used environment', DEFAULT_ENV)
-  .option('-D, --daemon', 'enable the daemon start')
-  .option('-d, --directory, <directory>', 'the code directory', DEFAULT_GAME_SERVER_DIR)
-  .option('-t, --type <server-type>,', 'start server type')
-  .option('-i, --id <server-id>', 'start server id')
-  .action(function(opts) {
-    start(opts);
-  });
-
-program.command('list')
-  .description('list the servers')
-  .option('-u, --username <username>', 'administration user name', DEFAULT_USERNAME)
-  .option('-p, --password <password>', 'administration password', DEFAULT_PWD)
-  .option('-h, --host <master-host>', 'master server host', DEFAULT_MASTER_HOST)
-  .option('-P, --port <master-port>', 'master server port', DEFAULT_MASTER_PORT)
-  .action(function(opts) {
-    list(opts);
-  });
-
-program.command('add')
-  .description('add a new server')
-  .option('-u, --username <username>', 'administration user name', DEFAULT_USERNAME)
-  .option('-p, --password <password>', 'administration password', DEFAULT_PWD)
-  .option('-h, --host <master-host>', 'master server host', DEFAULT_MASTER_HOST)
-  .option('-P, --port <master-port>', 'master server port', DEFAULT_MASTER_PORT)
-  .action(function() {
-    var args = [].slice.call(arguments, 0);
-    var opts = args[args.length - 1];
-    opts.args = args.slice(0, -1);
-    add(opts);
-  });
-
-program.command('stop')
-  .description('stop the servers, for multiple servers, use `pomelo stop server-id-1 server-id-2`')
-  .option('-u, --username <username>', 'administration user name', DEFAULT_USERNAME)
-  .option('-p, --password <password>', 'administration password', DEFAULT_PWD)
-  .option('-h, --host <master-host>', 'master server host', DEFAULT_MASTER_HOST)
-  .option('-P, --port <master-port>', 'master server port', DEFAULT_MASTER_PORT)
-  .action(function() {
-    var args = [].slice.call(arguments, 0);
-    var opts = args[args.length - 1];
-    opts.serverIds = args.slice(0, -1);
-    terminal('stop', opts);
-  });
-
-program.command('kill')
-  .description('kill the application')
-  .option('-u, --username <username>', 'administration user name', DEFAULT_USERNAME)
-  .option('-p, --password <password>', 'administration password', DEFAULT_PWD)
-  .option('-h, --host <master-host>', 'master server host', DEFAULT_MASTER_HOST)
-  .option('-P, --port <master-port>', 'master server port', DEFAULT_MASTER_PORT)
-  .option('-f, --force', 'using this option would kill all the node processes')
-  .action(function() {
-    var args = [].slice.call(arguments, 0);
-    var opts = args[args.length - 1];
-    opts.serverIds = args.slice(0, -1);
-    terminal('kill', opts);
-  });
-
-program.command('restart')
-  .description('restart the servers, for multiple servers, use `pomelo restart server-id-1 server-id-2`')
-  .option('-u, --username <username>', 'administration user name', DEFAULT_USERNAME)
-  .option('-p, --password <password>', 'administration password', DEFAULT_PWD)
-  .option('-h, --host <master-host>', 'master server host', DEFAULT_MASTER_HOST)
-  .option('-P, --port <master-port>', 'master server port', DEFAULT_MASTER_PORT)
-  .option('-t, --type <server-type>,', 'start server type')
-  .option('-i, --id <server-id>', 'start server id')
-  .action(function(opts) {
-    restart(opts);
-  });
-
-program.command('masterha')
-  .description('start all the slaves of the master')
-  .option('-d, --directory <directory>', 'the code directory', DEFAULT_GAME_SERVER_DIR)
-  .action(function(opts) {
-    startMasterha(opts);
-  });
-
 program.command('*')
   .action(function() {
     console.log(COMMAND_ERROR);
@@ -369,161 +274,6 @@ function start(opts) {
   }
 }
 
-/**
- * List pomelo processes.
- *
- * @param {Object} opts options for `list` operation
- */
-function list(opts) {
-  var id = 'pomelo_list_' + Date.now();
-  connectToMaster(id, opts, function(client) {
-    client.request(co.moduleId, {signal: 'list'}, function(err, data) {
-      if(err) {
-        console.error(err);
-      }
-      var servers = [];
-      for(var key in data.msg) {
-        servers.push(data.msg[key]);
-      }
-      var comparer = function(a, b) {
-        if (a.serverType < b.serverType) {
-          return -1;
-        } else if (a.serverType > b.serverType) {
-          return 1;
-        } else if (a.serverId < b.serverId) {
-          return -1;
-        } else if (a.serverId > b.serverId) {
-          return 1;
-        } else {
-          return 0;
-        }
-      };
-      servers.sort(comparer);
-      var rows = [];
-      rows.push(['serverId', 'serverType', 'pid', 'rss(M)', 'heapTotal(M)', 'heapUsed(M)', 'uptime(m)']);
-      servers.forEach(function(server) {
-        rows.push([server.serverId, server.serverType, server.pid, server.rss, server.heapTotal, server.heapUsed, server.uptime]);
-      });
-      console.log(cliff.stringifyRows(rows, ['red', 'blue', 'green', 'cyan', 'magenta', 'white', 'yellow']));
-      process.exit(0);
-    });
-  });
-}
-
-/**
- * Add server to application.
- *
- * @param {Object} opts options for `add` operation
- */
-function add(opts) {
-  var id = 'pomelo_add_' + Date.now();
-  connectToMaster(id, opts, function(client) {
-    client.request(co.moduleId, { signal: 'add', args: opts.args }, function(err) {
-      if(err) {
-        console.error(err);
-      }
-      else {
-        console.info(ADD_SERVER_INFO);
-      }
-      process.exit(0);
-    });
-  });
-}
-
-/**
- * Terminal application.
- *
- * @param {String} signal stop/kill
- * @param {Object} opts options for `stop/kill` operation
- */
-function terminal(signal, opts) {
-  console.info(CLOSEAPP_INFO);
-  // option force just for `kill`
-  if(opts.force) {
-    if (os.platform() === constants.PLATFORM.WIN) {
-      exec(KILL_CMD_WIN);
-    } else {
-      exec(KILL_CMD_LUX);
-    }
-    process.exit(1);
-    return;
-  }
-  var id = 'pomelo_terminal_' + Date.now();
-  connectToMaster(id, opts, function(client) {
-    client.request(co.moduleId, {
-      signal: signal, ids: opts.serverIds
-    }, function(err, msg) {
-      if(err) {
-        console.error(err);
-      }
-      if(signal === 'kill') {
-        if(msg.code === 'ok') {
-          console.log('All the servers have been terminated!');
-        } else {
-          console.log('There may be some servers remained:', msg.serverIds);
-        }
-      }
-      process.exit(0);
-    });
-  });
-}
-
-function restart(opts) {
-  var id = 'pomelo_restart_' + Date.now();
-  var serverIds = [];
-  var type = null;
-  if(!!opts.id) {
-    serverIds.push(opts.id);
-  }
-  if(!!opts.type) {
-    type = opts.type;
-  }
-  connectToMaster(id, opts, function(client) {
-    client.request(co.moduleId, { signal: 'restart', ids: serverIds, type: type}, function(err, fails) {
-      if(!!err) {
-        console.error(err);
-      } else if(!!fails.length) {
-        console.info('restart fails server ids: %j', fails);
-      } else {
-        console.info(RESTART_SERVER_INFO);
-      }
-      process.exit(0);
-    });
-  });
-}
-
-function connectToMaster(id, opts, cb) {
-  var client = new adminClient({username: opts.username, password: opts.password, md5: true});
-  client.connect(id, opts.host, opts.port, function(err) {
-    if(err) {
-      abort(CONNECT_ERROR + err.red);
-    }
-    if(typeof cb === 'function') {
-      cb(client);
-    }
-  });
-}
-
-/**
- * Start master slaves.
- *
- * @param {String} option for `startMasterha` operation
- */
-function startMasterha(opts) {
-  var configFile = path.join(opts.directory, constants.FILEPATH.MASTER_HA);
-  if(!fs.existsSync(configFile)) {
-    abort(MASTER_HA_NOT_FOUND);
-  }
-  var masterha = require(configFile).masterha;
-  for(var i=0; i<masterha.length; i++) {
-    var server = masterha[i];
-    server.mode = constants.RESERVED.STAND_ALONE;
-    server.masterha = 'true';
-    server.home = opts.directory;
-    runServer(server);
-  }
-}
-
 /**
  * Check if the given directory `path` is empty.
  *
@@ -653,29 +403,4 @@ function connectorType(cb) {
          break;
     }
   });
-}
-
-/**
- * Run server.
- * 
- * @param {Object} server server information
- */
-function runServer(server) {
-  var cmd, key;
-  var main = path.resolve(server.home, 'app.js');
-  if(utils.isLocal(server.host)) {
-    var options = [];
-    options.push(main);
-    for(key in server) {
-      options.push(util.format('%s=%s', key, server[key]));
-    }
-    starter.localrun(process.execPath, null, options);
-  } else {
-    cmd = util.format('cd "%s" && "%s"', server.home, process.execPath);
-    cmd += util.format(' "%s" ', main);
-    for(key in server) {
-      cmd += util.format(' %s=%s ', key, server[key]);
-    }
-    starter.sshrun(cmd, server.host);
-  }
 }
\ No newline at end of file
diff --git a/lib/application.js b/lib/application.js
index ae89dcf5d..7ef880336 100644
--- a/lib/application.js
+++ b/lib/application.js
@@ -590,40 +590,6 @@ if(!!realPath && !!reload) {
   return this;
 };
 
-/**
- * Register admin modules. Admin modules is the extends point of the monitor system.
- *
- * @param {String} module (optional) module id or provoided by module.moduleId
- * @param {Object} module module object or factory function for module
- * @param {Object} opts construct parameter for module
- * @memberOf Application
- */
- Application.registerAdmin = function(moduleId, module, opts) {
-  var modules = this.get(Constants.KEYWORDS.MODULE);
-  if(!modules) {
-    modules = {};
-    this.set(Constants.KEYWORDS.MODULE, modules);
-  }
-
-  if(typeof moduleId !== 'string') {
-    opts = module;
-    module = moduleId;
-    if(module) {
-      moduleId = module.moduleId;
-    }
-  }
-
-  if(!moduleId){
-    return;
-  }
-
-  modules[moduleId] = {
-    moduleId: moduleId,
-    module: module,
-    opts: opts
-  };
-};
-
 /**
  * Use plugin.
  *

From 46ad812a46af9d6084dfdadaae07c796f0f92c07 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Wed, 14 Oct 2015 17:03:30 +0800
Subject: [PATCH 18/78] fix bug for redis registry, in case env not provided

---
 lib/monitors/redismonitor.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index 4a30a1802..a0a776f1e 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -46,12 +46,12 @@ Monitor.prototype.close = function() {
 
 var watcherCluster2Command = function() {
   getClusterInfo(this, this.app, this.client, this.app.getCurServer());
-  getCommand(this, this.client, this.app.getCurServer());
+  getCommand(this, this.app, this.client, this.app.getCurServer());
 }
 
 var getClusterInfo = function(self, app, redis, serverInfo) {
   var results = {};
-  var key = constants.RESERVED.REDIS_REG_PREFIX + serverInfo.env;
+  var key = constants.RESERVED.REDIS_REG_PREFIX + app.env;
   var args = [key, Date.now() + self.expire, JSON.stringify(serverInfo)];
 
   redis.zadd(args, function(err, res) {
@@ -78,8 +78,8 @@ var getClusterInfo = function(self, app, redis, serverInfo) {
   });
 }
 
-var getCommand = function(self, redis, serverInfo) {
-  var key = constants.RESERVED.REDIS_REG_PREFIX + serverInfo.env + ':' + serverInfo.id;
+var getCommand = function(self, app, redis, serverInfo) {
+  var key = constants.RESERVED.REDIS_REG_PREFIX + app.env + ':' + serverInfo.id;
   redis.get(key, function(err, res) {
     if(err) {
       logger.error('get pomelo-regist cmd err %j', err);

From 3c4b3e6c8a12480a139c8fd354401ebd9e3f14b0 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Wed, 14 Oct 2015 18:46:08 +0800
Subject: [PATCH 19/78] redismonitor stop cmd

---
 lib/monitors/redismonitor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index a0a776f1e..c5f7dae06 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -39,7 +39,7 @@ Monitor.prototype.start = function(cb) {
   });
 }
 
-Monitor.prototype.close = function() {
+Monitor.prototype.stop = function() {
   this.client.end();
   clearInterval(this.timer);
 };

From 6776dc4659ac3825011029b43ec791c83bd5aa6f Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 16 Oct 2015 11:34:39 +0800
Subject: [PATCH 20/78] remove add&remove event

---
 lib/components/proxy.js | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/lib/components/proxy.js b/lib/components/proxy.js
index e1e78a2dd..70003247d 100644
--- a/lib/components/proxy.js
+++ b/lib/components/proxy.js
@@ -46,8 +46,6 @@ var Component = function(app, opts) {
   this.app = app;
   this.opts = opts;
   this.client = genRpcClient(this.app, opts);
-  this.app.event.on(events.ADD_SERVERS, this.addServers.bind(this));
-  this.app.event.on(events.REMOVE_SERVERS, this.removeServers.bind(this));
   this.app.event.on(events.REPLACE_SERVERS, this.replaceServers.bind(this));
 };
 
@@ -99,29 +97,6 @@ pro.afterStart = function(cb) {
   this.client.start(cb);
 };
 
-/**
- * Add remote server to the rpc client.
- *
- * @param {Array} servers server info list, {id, serverType, host, port}
- */
-pro.addServers = function(servers) {
-  if (!servers || !servers.length) {
-    return;
-  }
-
-  genProxies(this.client, this.app, servers);
-  this.client.addServers(servers);
-};
-
-/**
- * Remove remote server from the rpc client.
- *
- * @param  {Array} ids server id list
- */
-pro.removeServers = function(ids) {
-  this.client.removeServers(ids);
-};
-
 /**
  * Replace remote servers from the rpc client.
  *

From 9c69634487340cc0b47cd0eefcc0f496d72f7816 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <hzxuzhonghu@corp.netease.com>
Date: Tue, 20 Oct 2015 15:27:09 +0800
Subject: [PATCH 21/78] unit test and  jslint error fix

---
 gruntfile.js                          |  8 +++++---
 lib/application.js                    |  4 ++--
 lib/filters/handler/serial.js         |  2 +-
 lib/monitors/redismonitor.js          | 10 +++++-----
 lib/monitors/zookeepermonitor.js      |  5 +++--
 test/mock-base/app/mockApplication.js | 23 +++++++++++++++++++++++
 test/remote/channelRemote.js          | 10 +++++-----
 7 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100644 test/mock-base/app/mockApplication.js

diff --git a/gruntfile.js b/gruntfile.js
index 12fcaca07..e245953a4 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -6,8 +6,10 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-jshint');
 
-  var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
-  'test/remote/*.js', 'test/service/*.js', 'test/modules/*.js', 'test/util/*.js', 'test/*.js'];
+  //var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
+  //'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js', */'test/util/*.js', 'test/*.js'];
+  var src = [
+  'test/remote/*.js'];
 
   // Project configuration.
   grunt.initConfig({
@@ -41,4 +43,4 @@ module.exports = function(grunt) {
 
   // Default task.
   grunt.registerTask('default', ['clean', 'mochaTest', 'jshint']);
-};
\ No newline at end of file
+};
diff --git a/lib/application.js b/lib/application.js
index 7ef880336..05b490a40 100644
--- a/lib/application.js
+++ b/lib/application.js
@@ -285,7 +285,7 @@ var STATE_STOPED  = 4;  // app has stoped
 if(!!realPath && !!reload) {
   fs.watch(realPath, function (event, filename) {
     if(event === 'change') {
-      delete require.cache[require.resolve(realPath)]
+      delete require.cache[require.resolve(realPath)];
       self.loadConfigBaseApp(key, val);
     }
   });
@@ -874,4 +874,4 @@ var addFilter = function(app, type, filter) {
   app.set(type, filters);
 }
 filters.push(filter);
-};
\ No newline at end of file
+};
diff --git a/lib/filters/handler/serial.js b/lib/filters/handler/serial.js
index 8044721a3..02c3c56d3 100644
--- a/lib/filters/handler/serial.js
+++ b/lib/filters/handler/serial.js
@@ -9,7 +9,7 @@ module.exports = function(timeout) {
 };
 
 var Filter = function(timeout) {
-  this.timeout = timeout
+  this.timeout = timeout;
 };
 
 /**
diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index c5f7dae06..e2efe97f2 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -16,7 +16,7 @@ var Monitor = function(app, opts) {
   this.expire = opts.expire || constants.TIME.DEFAULT_REDIS_EXPIRE;
   this.password = opts.password || null;
   this.redisOpts = opts.redisOpts || {};
-}
+};
 
 module.exports = Monitor;
 
@@ -37,7 +37,7 @@ Monitor.prototype.start = function(cb) {
   this.client.on('error', function(err) {
     logger.error('redis err:', err);
   });
-}
+};
 
 Monitor.prototype.stop = function() {
   this.client.end();
@@ -47,7 +47,7 @@ Monitor.prototype.stop = function() {
 var watcherCluster2Command = function() {
   getClusterInfo(this, this.app, this.client, this.app.getCurServer());
   getCommand(this, this.app, this.client, this.app.getCurServer());
-}
+};
 
 var getClusterInfo = function(self, app, redis, serverInfo) {
   var results = {};
@@ -76,7 +76,7 @@ var getClusterInfo = function(self, app, redis, serverInfo) {
       app.replaceServers(results);
     });
   });
-}
+};
 
 var getCommand = function(self, app, redis, serverInfo) {
   var key = constants.RESERVED.REDIS_REG_PREFIX + app.env + ':' + serverInfo.id;
@@ -97,4 +97,4 @@ var getCommand = function(self, app, redis, serverInfo) {
       });
     }
   });
-}
\ No newline at end of file
+};
diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index 02e37b97c..6471ac882 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -100,7 +100,7 @@ var getData = function(zk, path, watcher, cb) {
       utils.invokeCallback(cb, err);
       return;
     }
-    utils.invokeCallback(cb, null, data == null ? null: data.toString());
+    utils.invokeCallback(cb, null, data === null ? null: data.toString());
   });
 };
 
@@ -208,6 +208,7 @@ var getClusterInfo = function(app, zk, servers) {
   });
 
   for(var i = 0; i < servers.length; i++) {
+     /*jshint -W083 */
     (function(index) {
       if(!utils.startsWith(servers[index], constants.RESERVED.ZK_NODE_COMMAND)) {
         getData(zk, zk.path + '/' + servers[index], null, function(err, data) {
@@ -301,4 +302,4 @@ var reconnect = function(self) {
 
     }
     );
-};
\ No newline at end of file
+};
diff --git a/test/mock-base/app/mockApplication.js b/test/mock-base/app/mockApplication.js
new file mode 100644
index 000000000..3a207a27b
--- /dev/null
+++ b/test/mock-base/app/mockApplication.js
@@ -0,0 +1,23 @@
+var Application = module.exports = {
+    components: { __pushScheduler__: {},
+                  __connector__: {},
+                },
+    settings: {}
+ };
+
+Application.set = function(setting, val, attach){
+  if (arguments.length === 1) {
+    return this.settings[setting];
+  }
+  this.settings[setting] = val;
+  if(attach) {
+    this[setting] = val;
+  }
+  return this;
+}
+
+Application.get = function(setting){
+  return this.settings[setting];
+}
+
+
diff --git a/test/remote/channelRemote.js b/test/remote/channelRemote.js
index c6002264d..3cce84632 100644
--- a/test/remote/channelRemote.js
+++ b/test/remote/channelRemote.js
@@ -1,11 +1,11 @@
 var should = require('should');
-var pomelo = require('../../');
+//var pomelo = require('../../');
 var remote = require('../../lib/common/remote/frontend/channelRemote');
 var SessionService = require('../../lib/common/service/sessionService');
 var ChannelService = require('../../lib/common/service/channelService');
 var countDownLatch = require('../../lib/util/countDownLatch');
 var MockChannelManager = require('../manager/mockChannelManager');
-
+var app = require('../mock-base/app/mockApplication.js');
 
 var mockBase = process.cwd() + '/test';
 
@@ -38,7 +38,7 @@ describe('channel remote test', function() {
         }
       }
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.components.__connector__ = {
         send: function(reqId, route, msg, recvs, opts, cb) {
           app.components.__pushScheduler__.schedule(reqId, route, msg, recvs, opts, cb);
@@ -92,7 +92,7 @@ describe('channel remote test', function() {
         }
       }
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.components.__connector__ = {
         send: function(reqId, route, msg, recvs, opts, cb) {
           app.components.__pushScheduler__.schedule(reqId, route, msg, recvs, opts, cb);
@@ -138,7 +138,7 @@ describe('channel remote test', function() {
         }
       }
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.components.__connector__ = {
         send: function(reqId, route, msg, recvs, opts, cb) {
           app.components.__pushScheduler__.schedule(reqId, route, msg, recvs, opts, cb);

From 3a9e7cbb351ac7c1ec8cf111bb0d4b117c24a009 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <hzxuzhonghu@corp.netease.com>
Date: Tue, 20 Oct 2015 16:35:48 +0800
Subject: [PATCH 22/78] fix unit test error

---
 gruntfile.js                          |  7 +++----
 test/mock-base/app/mockApplication.js | 27 +++++++++++++++++++++++++++
 test/service/channel.js               |  5 +++--
 test/service/channelService.js        | 19 ++++++++++++-------
 4 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/gruntfile.js b/gruntfile.js
index e245953a4..5caed94ac 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -6,10 +6,9 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-jshint');
 
-  //var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
-  //'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js', */'test/util/*.js', 'test/*.js'];
-  var src = [
-  'test/remote/*.js'];
+  var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
+  'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js',*/ 'test/util/*.js'/*, 'test/*.js'*/];
+
 
   // Project configuration.
   grunt.initConfig({
diff --git a/test/mock-base/app/mockApplication.js b/test/mock-base/app/mockApplication.js
index 3a207a27b..ef8d90893 100644
--- a/test/mock-base/app/mockApplication.js
+++ b/test/mock-base/app/mockApplication.js
@@ -20,4 +20,31 @@ Application.get = function(setting){
   return this.settings[setting];
 }
 
+Application.getServersByType = function(serverType) {
+  return this.serverTypeMaps[serverType];
+};
 
+Application.replaceServers = function(servers) {
+  if(!servers) {
+    return;
+  }
+
+  this.servers = servers;
+  this.serverTypeMaps = {};
+  this.serverTypes = [];
+  var serverArray = [];
+  for(var id in servers) {
+    var server = servers[id];
+    var serverType = server['serverType'];
+    var slist = this.serverTypeMaps[serverType];
+    if(!slist) {
+      this.serverTypeMaps[serverType] = slist = [];
+    }
+    this.serverTypeMaps[serverType].push(server);
+    // update global server type list
+    if(this.serverTypes.indexOf(serverType) < 0) {
+      this.serverTypes.push(serverType);
+    }
+    serverArray.push(server);
+  }
+};
diff --git a/test/service/channel.js b/test/service/channel.js
index 742b13a49..e31b37b59 100644
--- a/test/service/channel.js
+++ b/test/service/channel.js
@@ -1,6 +1,7 @@
 var should = require('should');
 var pomelo = require('../../');
 var ChannelService = require('../../lib/common/service/channelService');
+var app = require('../mock-base/app/mockApplication.js');
 
 var mockBase = process.cwd() + '/test';
 var channelName = 'test_channel';
@@ -130,7 +131,7 @@ describe('channel test', function() {
         cb();
       };
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.rpcInvoke = mockRpcInvoke;
       var channelService = new ChannelService(app);
 
@@ -157,4 +158,4 @@ describe('channel test', function() {
       });
     });
   });
-});
\ No newline at end of file
+});
diff --git a/test/service/channelService.js b/test/service/channelService.js
index 839eb4478..5eaf8e5ac 100644
--- a/test/service/channelService.js
+++ b/test/service/channelService.js
@@ -1,6 +1,7 @@
 var should = require('should');
-var pomelo = require('../../');
+//var pomelo = require('../../');
 var ChannelService = require('../../lib/common/service/channelService');
+var app = require('../mock-base/app/mockApplication.js');
 
 var channelName = 'test_channel';
 var mockBase = process.cwd() + '/test';
@@ -95,7 +96,7 @@ describe('channel manager test', function() {
         cb();
       };
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.rpcInvoke = mockRpcInvoke;
       var channelService = new ChannelService(app);
 
@@ -105,9 +106,13 @@ describe('channel manager test', function() {
       });
     });
 
+var channelName = 'test_channel';
+var mockBase = process.cwd() + '/test';
+var mockApp = {serverId: 'test-server-1'};
+
     it('should return an err if uids is empty', function(done) {
       var mockMsg = {key: 'some remote message'};
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       var channelService = new ChannelService(app);
 
       channelService.pushMessageByUids(mockMsg, null, function(err) {
@@ -138,7 +143,7 @@ describe('channel manager test', function() {
         cb(new Error('[TestMockError] mock rpc error'));
       };
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.rpcInvoke = mockRpcInvoke;
       var channelService = new ChannelService(app);
 
@@ -173,7 +178,7 @@ describe('channel manager test', function() {
         }
       };
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.rpcInvoke = mockRpcInvoke;
       var channelService = new ChannelService(app);
 
@@ -223,9 +228,9 @@ describe('channel manager test', function() {
         cb();
       };
 
-      var app = pomelo.createApp({base: mockBase});
+      //var app = pomelo.createApp({base: mockBase});
       app.rpcInvoke = mockRpcInvoke;
-      app.addServers(mockServers);
+      app.replaceServers(mockServers);
       var channelService = new ChannelService(app);
 
       channelService.broadcast(mockSType, mockRoute, mockMsg,

From b0c04f3e401f58a80feda746c58aa81be889200c Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Tue, 20 Oct 2015 16:51:26 +0800
Subject: [PATCH 23/78] use strict: update strict mode

---
 bin/pomelo                                  | 1 +
 index.js                                    | 1 +
 lib/application.js                          | 1 +
 lib/common/manager/appManager.js            | 1 +
 lib/common/manager/taskManager.js           | 1 +
 lib/common/remote/backend/msgRemote.js      | 1 +
 lib/common/remote/frontend/channelRemote.js | 1 +
 lib/common/remote/frontend/sessionRemote.js | 1 +
 lib/common/service/backendSessionService.js | 1 +
 lib/common/service/channelService.js        | 1 +
 lib/common/service/connectionService.js     | 1 +
 lib/common/service/filterService.js         | 1 +
 lib/common/service/handlerService.js        | 1 +
 lib/common/service/sessionService.js        | 1 +
 lib/components/backendSession.js            | 1 +
 lib/components/channel.js                   | 1 +
 lib/components/connection.js                | 1 +
 lib/components/connector.js                 | 1 +
 lib/components/dictionary.js                | 1 +
 lib/components/master.js                    | 1 +
 lib/components/monitor.js                   | 1 +
 lib/components/protobuf.js                  | 1 +
 lib/components/proxy.js                     | 1 +
 lib/components/pushScheduler.js             | 1 +
 lib/components/remote.js                    | 1 +
 lib/components/server.js                    | 1 +
 lib/components/session.js                   | 1 +
 lib/connectors/commands/handshake.js        | 1 +
 lib/connectors/commands/heartbeat.js        | 1 +
 lib/connectors/commands/kick.js             | 1 +
 lib/connectors/common/coder.js              | 1 +
 lib/connectors/common/handler.js            | 1 +
 lib/connectors/hybrid/switcher.js           | 1 +
 lib/connectors/hybrid/tcpprocessor.js       | 1 +
 lib/connectors/hybrid/tcpsocket.js          | 1 +
 lib/connectors/hybrid/wsprocessor.js        | 1 +
 lib/connectors/hybridconnector.js           | 1 +
 lib/connectors/hybridsocket.js              | 1 +
 lib/connectors/mqtt/generate.js             | 1 +
 lib/connectors/mqtt/mqttadaptor.js          | 1 +
 lib/connectors/mqtt/protocol.js             | 1 +
 lib/connectors/mqttconnector.js             | 1 +
 lib/connectors/mqttsocket.js                | 1 +
 lib/connectors/sioconnector.js              | 1 +
 lib/connectors/siosocket.js                 | 1 +
 lib/connectors/udpconnector.js              | 1 +
 lib/connectors/udpsocket.js                 | 1 +
 lib/filters/handler/serial.js               | 1 +
 lib/filters/handler/time.js                 | 1 +
 lib/filters/handler/timeout.js              | 1 +
 lib/filters/handler/toobusy.js              | 1 +
 lib/filters/rpc/rpcLog.js                   | 1 +
 lib/filters/rpc/toobusy.js                  | 1 +
 lib/index.js                                | 1 +
 lib/monitors/common/cmd.js                  | 1 +
 lib/monitors/redismonitor.js                | 1 +
 lib/monitors/zookeepermonitor.js            | 1 +
 lib/pomelo.js                               | 1 +
 lib/pushSchedulers/buffer.js                | 1 +
 lib/pushSchedulers/direct.js                | 1 +
 lib/server/server.js                        | 1 +
 lib/util/appUtil.js                         | 1 +
 lib/util/constants.js                       | 1 +
 lib/util/countDownLatch.js                  | 1 +
 lib/util/events.js                          | 1 +
 lib/util/log.js                             | 1 +
 lib/util/pathUtil.js                        | 1 +
 lib/util/utils.js                           | 1 +
 68 files changed, 68 insertions(+)

diff --git a/bin/pomelo b/bin/pomelo
index 9813dccdb..e41d3ac4d 100755
--- a/bin/pomelo
+++ b/bin/pomelo
@@ -1,3 +1,4 @@
+'use strict';
 #!/usr/bin/env node
 
 /**
diff --git a/index.js b/index.js
index f6ce1b74a..7fb4627b6 100644
--- a/index.js
+++ b/index.js
@@ -1 +1,2 @@
+'use strict';
 module.exports = require('./lib/pomelo');
\ No newline at end of file
diff --git a/lib/application.js b/lib/application.js
index 05b490a40..be1022a73 100644
--- a/lib/application.js
+++ b/lib/application.js
@@ -1,3 +1,4 @@
+"use strict";
 /*!
  * Pomelo -- proto
  * Copyright(c) 2012 xiechengchao <xiecc@163.com>
diff --git a/lib/common/manager/appManager.js b/lib/common/manager/appManager.js
index 5749f3763..0a6688523 100644
--- a/lib/common/manager/appManager.js
+++ b/lib/common/manager/appManager.js
@@ -1,3 +1,4 @@
+'use strict';
 var async = require('async');
 var utils = require('../../util/utils');
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
diff --git a/lib/common/manager/taskManager.js b/lib/common/manager/taskManager.js
index e65ead986..ed41ebe92 100644
--- a/lib/common/manager/taskManager.js
+++ b/lib/common/manager/taskManager.js
@@ -1,3 +1,4 @@
+'use strict';
 var sequeue = require('seq-queue');
 
 var manager = module.exports;
diff --git a/lib/common/remote/backend/msgRemote.js b/lib/common/remote/backend/msgRemote.js
index c4822d922..f26828449 100644
--- a/lib/common/remote/backend/msgRemote.js
+++ b/lib/common/remote/backend/msgRemote.js
@@ -1,3 +1,4 @@
+'use strict';
 var utils = require('../../../util/utils');
 var logger = require('pomelo-logger').getLogger('forward-log', __filename);
 /**
diff --git a/lib/common/remote/frontend/channelRemote.js b/lib/common/remote/frontend/channelRemote.js
index 333475fa4..d8e869a52 100644
--- a/lib/common/remote/frontend/channelRemote.js
+++ b/lib/common/remote/frontend/channelRemote.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Remote channel service for frontend server.
  * Receive push request from backend servers and push it to clients.
diff --git a/lib/common/remote/frontend/sessionRemote.js b/lib/common/remote/frontend/sessionRemote.js
index dcd5b9ec1..9f27333ed 100644
--- a/lib/common/remote/frontend/sessionRemote.js
+++ b/lib/common/remote/frontend/sessionRemote.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Remote session service for frontend server.
  * Set session info for backend servers.
diff --git a/lib/common/service/backendSessionService.js b/lib/common/service/backendSessionService.js
index 21f181805..4b61665cf 100644
--- a/lib/common/service/backendSessionService.js
+++ b/lib/common/service/backendSessionService.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * backend session service for backend session
  */
diff --git a/lib/common/service/channelService.js b/lib/common/service/channelService.js
index 98b71206f..6087b1ec0 100644
--- a/lib/common/service/channelService.js
+++ b/lib/common/service/channelService.js
@@ -1,3 +1,4 @@
+'use strict';
 var countDownLatch = require('../../util/countDownLatch');
 var utils = require('../../util/utils');
 var ChannelRemote = require('../remote/frontend/channelRemote');
diff --git a/lib/common/service/connectionService.js b/lib/common/service/connectionService.js
index ff7984cb1..a2ef2d23c 100644
--- a/lib/common/service/connectionService.js
+++ b/lib/common/service/connectionService.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * connection statistics service
  * record connection, login count and list
diff --git a/lib/common/service/filterService.js b/lib/common/service/filterService.js
index 1c65fa758..a8abdc81d 100644
--- a/lib/common/service/filterService.js
+++ b/lib/common/service/filterService.js
@@ -1,3 +1,4 @@
+'use strict';
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 
 /**
diff --git a/lib/common/service/handlerService.js b/lib/common/service/handlerService.js
index 671e12377..8e950e89a 100644
--- a/lib/common/service/handlerService.js
+++ b/lib/common/service/handlerService.js
@@ -1,3 +1,4 @@
+'use strict';
 var fs = require('fs');
 var utils = require('../../util/utils');
 var Loader = require('pomelo-loader');
diff --git a/lib/common/service/sessionService.js b/lib/common/service/sessionService.js
index d21acf7b1..6887e72a9 100644
--- a/lib/common/service/sessionService.js
+++ b/lib/common/service/sessionService.js
@@ -1,3 +1,4 @@
+'use strict';
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
diff --git a/lib/components/backendSession.js b/lib/components/backendSession.js
index 9e77d4105..3a07ba865 100644
--- a/lib/components/backendSession.js
+++ b/lib/components/backendSession.js
@@ -1,3 +1,4 @@
+'use strict';
 var BackendSessionService = require('../common/service/backendSessionService');
 
 module.exports = function(app) {
diff --git a/lib/components/channel.js b/lib/components/channel.js
index c76fdabd4..5e23f3270 100644
--- a/lib/components/channel.js
+++ b/lib/components/channel.js
@@ -1,3 +1,4 @@
+'use strict';
 var ChannelService = require('../common/service/channelService');
 
 module.exports = function(app, opts) {
diff --git a/lib/components/connection.js b/lib/components/connection.js
index 9a7112e6a..e16e72202 100644
--- a/lib/components/connection.js
+++ b/lib/components/connection.js
@@ -1,3 +1,4 @@
+'use strict';
 var ConnectionService = require('../common/service/connectionService');
 
 /**
diff --git a/lib/components/connector.js b/lib/components/connector.js
index f2906f54b..a61308b81 100644
--- a/lib/components/connector.js
+++ b/lib/components/connector.js
@@ -1,3 +1,4 @@
+'use strict';
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 var taskManager = require('../common/manager/taskManager');
 var pomelo = require('../pomelo');
diff --git a/lib/components/dictionary.js b/lib/components/dictionary.js
index 47e8e2844..abf56a6e7 100644
--- a/lib/components/dictionary.js
+++ b/lib/components/dictionary.js
@@ -1,3 +1,4 @@
+'use strict';
 var fs = require('fs');
 var path = require('path');
 var utils = require('../util/utils');
diff --git a/lib/components/master.js b/lib/components/master.js
index 355564426..466692e72 100644
--- a/lib/components/master.js
+++ b/lib/components/master.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Component for master.
  */
diff --git a/lib/components/monitor.js b/lib/components/monitor.js
index a60532f00..f55051d6d 100644
--- a/lib/components/monitor.js
+++ b/lib/components/monitor.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Component for monitor.
  * Load and start monitor client.
diff --git a/lib/components/protobuf.js b/lib/components/protobuf.js
index 47a4ca0c4..ad6fe8bec 100644
--- a/lib/components/protobuf.js
+++ b/lib/components/protobuf.js
@@ -1,3 +1,4 @@
+'use strict';
 var fs = require('fs');
 var path = require('path');
 var protobuf = require('pomelo-protobuf');
diff --git a/lib/components/proxy.js b/lib/components/proxy.js
index 70003247d..613e1f300 100644
--- a/lib/components/proxy.js
+++ b/lib/components/proxy.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Component for proxy.
  * Generate proxies for rpc client.
diff --git a/lib/components/pushScheduler.js b/lib/components/pushScheduler.js
index f9a147a41..d13e6e6c5 100644
--- a/lib/components/pushScheduler.js
+++ b/lib/components/pushScheduler.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Scheduler component to schedule message sending.
  */
diff --git a/lib/components/remote.js b/lib/components/remote.js
index 51931f962..f6ddd332c 100644
--- a/lib/components/remote.js
+++ b/lib/components/remote.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Component for remote service.
  * Load remote service and add to global context.
diff --git a/lib/components/server.js b/lib/components/server.js
index f903c4a40..8022a2437 100644
--- a/lib/components/server.js
+++ b/lib/components/server.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Component for server starup.
  */
diff --git a/lib/components/session.js b/lib/components/session.js
index d1879dbc5..c27631fa5 100644
--- a/lib/components/session.js
+++ b/lib/components/session.js
@@ -1,3 +1,4 @@
+'use strict';
 var SessionService = require('../common/service/sessionService');
 
 module.exports = function(app, opts) {
diff --git a/lib/connectors/commands/handshake.js b/lib/connectors/commands/handshake.js
index 18a5d3c7a..e575ba83f 100644
--- a/lib/connectors/commands/handshake.js
+++ b/lib/connectors/commands/handshake.js
@@ -1,3 +1,4 @@
+'use strict';
 var pomelo = require('../../pomelo');
 var Package = require('pomelo-protocol').Package;
 
diff --git a/lib/connectors/commands/heartbeat.js b/lib/connectors/commands/heartbeat.js
index 8789a892d..e5e88f979 100644
--- a/lib/connectors/commands/heartbeat.js
+++ b/lib/connectors/commands/heartbeat.js
@@ -1,3 +1,4 @@
+'use strict';
 var Package = require('pomelo-protocol').Package;
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 
diff --git a/lib/connectors/commands/kick.js b/lib/connectors/commands/kick.js
index 1d6f9c2e6..0b2d286f8 100644
--- a/lib/connectors/commands/kick.js
+++ b/lib/connectors/commands/kick.js
@@ -1,3 +1,4 @@
+'use strict';
 var Package = require('pomelo-protocol').Package;
 
 module.exports.handle = function(socket, reason) {
diff --git a/lib/connectors/common/coder.js b/lib/connectors/common/coder.js
index 1dffb2e00..7c4a750f1 100644
--- a/lib/connectors/common/coder.js
+++ b/lib/connectors/common/coder.js
@@ -1,3 +1,4 @@
+'use strict';
 var Message = require('pomelo-protocol').Message;
 var Constants = require('../../util/constants');
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
diff --git a/lib/connectors/common/handler.js b/lib/connectors/common/handler.js
index f077c0790..be5c53757 100644
--- a/lib/connectors/common/handler.js
+++ b/lib/connectors/common/handler.js
@@ -1,3 +1,4 @@
+'use strict';
 var protocol = require('pomelo-protocol');
 var Package = protocol.Package;
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
diff --git a/lib/connectors/hybrid/switcher.js b/lib/connectors/hybrid/switcher.js
index ec85d6cd7..314c65355 100644
--- a/lib/connectors/hybrid/switcher.js
+++ b/lib/connectors/hybrid/switcher.js
@@ -1,3 +1,4 @@
+'use strict';
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 var WSProcessor = require('./wsprocessor');
diff --git a/lib/connectors/hybrid/tcpprocessor.js b/lib/connectors/hybrid/tcpprocessor.js
index f9f738ce4..336e2445b 100644
--- a/lib/connectors/hybrid/tcpprocessor.js
+++ b/lib/connectors/hybrid/tcpprocessor.js
@@ -1,3 +1,4 @@
+'use strict';
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 var utils = require('../../util/utils');
diff --git a/lib/connectors/hybrid/tcpsocket.js b/lib/connectors/hybrid/tcpsocket.js
index bfcc9eb73..3420ff49f 100644
--- a/lib/connectors/hybrid/tcpsocket.js
+++ b/lib/connectors/hybrid/tcpsocket.js
@@ -1,3 +1,4 @@
+'use strict';
 var Stream = require('stream');
 var util = require('util');
 var protocol = require('pomelo-protocol');
diff --git a/lib/connectors/hybrid/wsprocessor.js b/lib/connectors/hybrid/wsprocessor.js
index 8fc91cedd..0b485373f 100644
--- a/lib/connectors/hybrid/wsprocessor.js
+++ b/lib/connectors/hybrid/wsprocessor.js
@@ -1,3 +1,4 @@
+'use strict';
 var HttpServer = require('http').Server;
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
diff --git a/lib/connectors/hybridconnector.js b/lib/connectors/hybridconnector.js
index 1a7229841..2127b3e3c 100644
--- a/lib/connectors/hybridconnector.js
+++ b/lib/connectors/hybridconnector.js
@@ -1,3 +1,4 @@
+'use strict';
 var net = require('net');
 var tls = require('tls');
 var util = require('util');
diff --git a/lib/connectors/hybridsocket.js b/lib/connectors/hybridsocket.js
index b6d81964a..4305791c5 100644
--- a/lib/connectors/hybridsocket.js
+++ b/lib/connectors/hybridsocket.js
@@ -1,3 +1,4 @@
+'use strict';
 var util = require('util');
 var EventEmitter = require('events').EventEmitter;
 var handler = require('./common/handler');
diff --git a/lib/connectors/mqtt/generate.js b/lib/connectors/mqtt/generate.js
index 94ccf22ea..a3250d90a 100644
--- a/lib/connectors/mqtt/generate.js
+++ b/lib/connectors/mqtt/generate.js
@@ -1,3 +1,4 @@
+'use strict';
 var protocol = require('./protocol');
 var crypto = require('crypto');
 
diff --git a/lib/connectors/mqtt/mqttadaptor.js b/lib/connectors/mqtt/mqttadaptor.js
index 89dd65180..7845663bf 100644
--- a/lib/connectors/mqtt/mqttadaptor.js
+++ b/lib/connectors/mqtt/mqttadaptor.js
@@ -1,3 +1,4 @@
+'use strict';
 var Adaptor = function(opts) {
   opts = opts || {};
   this.subReqs = {};
diff --git a/lib/connectors/mqtt/protocol.js b/lib/connectors/mqtt/protocol.js
index 6b5ae86a8..203831a41 100644
--- a/lib/connectors/mqtt/protocol.js
+++ b/lib/connectors/mqtt/protocol.js
@@ -1,3 +1,4 @@
+'use strict';
 /* Protocol - protocol constants */
 
 /* Command code => mnemonic */
diff --git a/lib/connectors/mqttconnector.js b/lib/connectors/mqttconnector.js
index b5c26e4fc..4d8350e19 100644
--- a/lib/connectors/mqttconnector.js
+++ b/lib/connectors/mqttconnector.js
@@ -1,3 +1,4 @@
+'use strict';
 var util = require('util');
 var EventEmitter = require('events').EventEmitter;
 var mqtt = require('mqtt');
diff --git a/lib/connectors/mqttsocket.js b/lib/connectors/mqttsocket.js
index 41698fd22..f15ce7190 100644
--- a/lib/connectors/mqttsocket.js
+++ b/lib/connectors/mqttsocket.js
@@ -1,3 +1,4 @@
+'use strict';
 var util = require('util');
 var EventEmitter = require('events').EventEmitter;
 
diff --git a/lib/connectors/sioconnector.js b/lib/connectors/sioconnector.js
index 4a760d36f..4a26dc41d 100644
--- a/lib/connectors/sioconnector.js
+++ b/lib/connectors/sioconnector.js
@@ -1,3 +1,4 @@
+'use strict';
 var util = require('util');
 var EventEmitter = require('events').EventEmitter;
 var sio = require('socket.io');
diff --git a/lib/connectors/siosocket.js b/lib/connectors/siosocket.js
index d95d3ea1d..70d41baa8 100644
--- a/lib/connectors/siosocket.js
+++ b/lib/connectors/siosocket.js
@@ -1,3 +1,4 @@
+'use strict';
 var util = require('util');
 var EventEmitter = require('events').EventEmitter;
 
diff --git a/lib/connectors/udpconnector.js b/lib/connectors/udpconnector.js
index 6ab99076a..ebe330dbb 100644
--- a/lib/connectors/udpconnector.js
+++ b/lib/connectors/udpconnector.js
@@ -1,3 +1,4 @@
+'use strict';
 var net = require('net');
 var util = require('util');
 var dgram = require("dgram");
diff --git a/lib/connectors/udpsocket.js b/lib/connectors/udpsocket.js
index 769f5ae8c..8e64d1386 100644
--- a/lib/connectors/udpsocket.js
+++ b/lib/connectors/udpsocket.js
@@ -1,3 +1,4 @@
+'use strict';
 var util = require('util');
 var handler = require('./common/handler');
 var protocol = require('pomelo-protocol');
diff --git a/lib/filters/handler/serial.js b/lib/filters/handler/serial.js
index 02c3c56d3..f443796e7 100644
--- a/lib/filters/handler/serial.js
+++ b/lib/filters/handler/serial.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Filter to keep request sequence.
  */
diff --git a/lib/filters/handler/time.js b/lib/filters/handler/time.js
index e4b8e4037..c8132ccb1 100644
--- a/lib/filters/handler/time.js
+++ b/lib/filters/handler/time.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Filter for statistics.
  * Record used time for each request.
diff --git a/lib/filters/handler/timeout.js b/lib/filters/handler/timeout.js
index a8c7a6d50..e9f9e3d92 100644
--- a/lib/filters/handler/timeout.js
+++ b/lib/filters/handler/timeout.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Filter for timeout.
  * Print a warn information when request timeout.
diff --git a/lib/filters/handler/toobusy.js b/lib/filters/handler/toobusy.js
index 8b243c72b..8c1fd3c5c 100644
--- a/lib/filters/handler/toobusy.js
+++ b/lib/filters/handler/toobusy.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Filter for toobusy.
  * if the process is toobusy, just skip the new request
diff --git a/lib/filters/rpc/rpcLog.js b/lib/filters/rpc/rpcLog.js
index 15b85e3d0..a370ac657 100644
--- a/lib/filters/rpc/rpcLog.js
+++ b/lib/filters/rpc/rpcLog.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Filter for rpc log.
  * Record used time for remote process call.
diff --git a/lib/filters/rpc/toobusy.js b/lib/filters/rpc/toobusy.js
index 9608b44d9..245cf25a9 100644
--- a/lib/filters/rpc/toobusy.js
+++ b/lib/filters/rpc/toobusy.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Filter for rpc log.
  * Reject rpc request when toobusy
diff --git a/lib/index.js b/lib/index.js
index d077a1038..dfac0a1cd 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1 +1,2 @@
+'use strict';
 module.exports = require('./pomelo');
\ No newline at end of file
diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index 7e3a26f18..b44ad2b35 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -1,3 +1,4 @@
+'use strict';
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 var constants = require('../../util/constants');
 var Command = module.exports;
diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index e2efe97f2..012c4194e 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -1,3 +1,4 @@
+'use strict';
 var redis = require('redis');
 var commander = require('./common/cmd');
 var constants = require('../util/constants');
diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index 6471ac882..bf37c339f 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -1,3 +1,4 @@
+'use strict';
 var async = require('async');
 var crypto = require('crypto');
 var zookeeper = require('node-zookeeper-client');
diff --git a/lib/pomelo.js b/lib/pomelo.js
index 1867ba30c..d1fc08605 100644
--- a/lib/pomelo.js
+++ b/lib/pomelo.js
@@ -1,3 +1,4 @@
+'use strict';
 /*!
  * Pomelo
  * Copyright(c) 2012 xiechengchao <xiecc@163.com>
diff --git a/lib/pushSchedulers/buffer.js b/lib/pushSchedulers/buffer.js
index 8f2187335..86fbdaf55 100644
--- a/lib/pushSchedulers/buffer.js
+++ b/lib/pushSchedulers/buffer.js
@@ -1,3 +1,4 @@
+'use strict';
 var utils = require('../util/utils');
 var DEFAULT_FLUSH_INTERVAL = 20;
 
diff --git a/lib/pushSchedulers/direct.js b/lib/pushSchedulers/direct.js
index 6f2dd72f0..701cc9629 100644
--- a/lib/pushSchedulers/direct.js
+++ b/lib/pushSchedulers/direct.js
@@ -1,3 +1,4 @@
+'use strict';
 var utils = require('../util/utils');
 
 var Service = function(app, opts) {
diff --git a/lib/server/server.js b/lib/server/server.js
index f58454d48..b43e2f3d2 100644
--- a/lib/server/server.js
+++ b/lib/server/server.js
@@ -1,3 +1,4 @@
+'use strict';
 /**
  * Implementation of server component.
  * Init and start server instance.
diff --git a/lib/util/appUtil.js b/lib/util/appUtil.js
index 90316a75f..40f314200 100644
--- a/lib/util/appUtil.js
+++ b/lib/util/appUtil.js
@@ -1,3 +1,4 @@
+'use strict';
 var async = require('async');
 var log = require('./log');
 var utils = require('./utils');
diff --git a/lib/util/constants.js b/lib/util/constants.js
index 54c987fec..bac17a297 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -1,3 +1,4 @@
+'use strict';
 module.exports = {
   KEYWORDS: {
     BEFORE_FILTER: '__befores__',
diff --git a/lib/util/countDownLatch.js b/lib/util/countDownLatch.js
index 101048db1..3ad2c45c7 100644
--- a/lib/util/countDownLatch.js
+++ b/lib/util/countDownLatch.js
@@ -1,3 +1,4 @@
+'use strict';
 var exp = module.exports;
 
 /**
diff --git a/lib/util/events.js b/lib/util/events.js
index 75ccc685a..1184fc350 100644
--- a/lib/util/events.js
+++ b/lib/util/events.js
@@ -1,3 +1,4 @@
+'use strict';
 module.exports = {
 	ADD_SERVERS: 'add_servers',
 	REMOVE_SERVERS: 'remove_servers',
diff --git a/lib/util/log.js b/lib/util/log.js
index 98706ec30..028b3f079 100644
--- a/lib/util/log.js
+++ b/lib/util/log.js
@@ -1,3 +1,4 @@
+'use strict';
 var logger = require('pomelo-logger');
 
 /**
diff --git a/lib/util/pathUtil.js b/lib/util/pathUtil.js
index 16a29e404..633b78d19 100644
--- a/lib/util/pathUtil.js
+++ b/lib/util/pathUtil.js
@@ -1,3 +1,4 @@
+'use strict';
 var fs = require('fs');
 var path = require('path');
 var Constants = require('./constants');
diff --git a/lib/util/utils.js b/lib/util/utils.js
index 943d94138..cf224cd5e 100644
--- a/lib/util/utils.js
+++ b/lib/util/utils.js
@@ -1,3 +1,4 @@
+'use strict';
 var os = require('os');
 var util = require('util');
 var exec = require('child_process').exec;

From ff26be75075e452b7619c7fd25feb319a9c7b2b7 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Tue, 20 Oct 2015 16:56:04 +0800
Subject: [PATCH 24/78] add default serverType

---
 lib/util/appUtil.js   | 2 +-
 lib/util/constants.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/util/appUtil.js b/lib/util/appUtil.js
index 40f314200..00b75af6b 100644
--- a/lib/util/appUtil.js
+++ b/lib/util/appUtil.js
@@ -130,11 +130,11 @@ var loadServers = function(app) {
  * Process server start command
  */
 var processArgs = function(app, args) {
-  var serverType = args.serverType;
   if(!args.id) {
     args.id = uuid.v1();
   }
   var serverId = args.id;
+  var serverType = args.serverType || Constants.RESERVED.DEFAULT_SERVERTYPE;
   app.set(Constants.RESERVED.MAIN, args.main, true);
   app.set(Constants.RESERVED.SERVER_TYPE, serverType, true);
   app.set(Constants.RESERVED.SERVER_ID, serverId, true);
diff --git a/lib/util/constants.js b/lib/util/constants.js
index bac17a297..2fbc066a2 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -79,7 +79,8 @@ module.exports = {
     REDIS: 'redis',
     REDIS_REG_PREFIX: 'pomelo-regist:',
     DEFAULT_REDIS_PORT: 6379,
-	DEFAULT_REDIS_HOST: '127.0.0.1'
+	  DEFAULT_REDIS_HOST: '127.0.0.1',
+    DEFAULT_SERVERTYPE: 'pomelo-server'
   },
 
   COMMAND: {

From 3c008bcd4c8baa0860ede0843b931f077a52b801 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Tue, 20 Oct 2015 17:06:18 +0800
Subject: [PATCH 25/78] update zkmonitor closure

---
 lib/monitors/zookeepermonitor.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index bf37c339f..a7b56feea 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -208,9 +208,8 @@ var getClusterInfo = function(app, zk, servers) {
     app.replaceServers(results);
   });
 
-  for(var i = 0; i < servers.length; i++) {
-     /*jshint -W083 */
-    (function(index) {
+  var getServerInfo = function(index) {
+    return  (function() {
       if(!utils.startsWith(servers[index], constants.RESERVED.ZK_NODE_COMMAND)) {
         getData(zk, zk.path + '/' + servers[index], null, function(err, data) {
           if(!!err) {
@@ -226,7 +225,11 @@ var getClusterInfo = function(app, zk, servers) {
       } else {
         latch.done();
       }
-    })(i);
+    })();
+  };
+
+  for(var i = 0; i < servers.length; i++) {
+    getServerInfo(i);
   }
 };
 

From 0670f8e107c5eacce938ed184dac44e0e5db66aa Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <hzxuzhonghu@corp.netease.com>
Date: Tue, 20 Oct 2015 17:48:46 +0800
Subject: [PATCH 26/78] fix lint warn

---
 gruntfile.js                   |  7 +++++--
 lib/connectors/udpconnector.js |  4 ++--
 lib/pomelo.js                  | 10 ++++------
 lib/util/constants.js          |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/gruntfile.js b/gruntfile.js
index 5caed94ac..908cea64a 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -7,7 +7,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
 
   var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
-  'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js',*/ 'test/util/*.js'/*, 'test/*.js'*/];
+  'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js',*/ 'test/util/*.js'/*, 'test/application.js'*/];
 
 
   // Project configuration.
@@ -36,7 +36,10 @@ module.exports = function(grunt) {
       }
     },
     jshint: {
-      all: ['lib/*']
+      all: ['lib/*'],
+      options: {
+                 node: true
+               }
     }
   });
 
diff --git a/lib/connectors/udpconnector.js b/lib/connectors/udpconnector.js
index ebe330dbb..5a5814190 100644
--- a/lib/connectors/udpconnector.js
+++ b/lib/connectors/udpconnector.js
@@ -75,7 +75,7 @@ Connector.prototype.start = function(cb) {
   });
 
   this.socket.on('error', function(err) {
-    logger.error('udp socket encounters with error: %j', err.stack);
+    //logger.error('udp socket encounters with error: %j', err.stack);
     return;
   });
 
@@ -95,4 +95,4 @@ Connector.prototype.stop = function(force, cb) {
 
 var genKey = function(peer) {
   return peer.address + ":" + peer.port;
-};
\ No newline at end of file
+};
diff --git a/lib/pomelo.js b/lib/pomelo.js
index d1fc08605..960aac640 100644
--- a/lib/pomelo.js
+++ b/lib/pomelo.js
@@ -70,8 +70,6 @@ Pomelo.monitors = {};
 Pomelo.monitors.__defineGetter__('zookeepermonitor', load.bind(null, './monitors/zookeepermonitor'));
 Pomelo.monitors.__defineGetter__('redismonitor', load.bind(null, './monitors/redismonitor'));
 
-var self = this;
-
 /**
  * Create an pomelo application.
  *
@@ -82,19 +80,19 @@ var self = this;
 Pomelo.createApp = function (opts) {
   var app = application;
   app.init(opts);
-  self.app = app;
+  Pomelo.app = app;
   return app;
 };
 
 /**
  * Get application
  */
-Object.defineProperty(Pomelo, 'app', {
+/*Object.defineProperty(Pomelo, 'app', {
   get:function () {
-    return self.app;
+    return abc.app;
   }
 });
-
+*/
 /**
  * Auto-load bundled components with getters.
  */
diff --git a/lib/util/constants.js b/lib/util/constants.js
index 2fbc066a2..d0945d402 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -79,7 +79,7 @@ module.exports = {
     REDIS: 'redis',
     REDIS_REG_PREFIX: 'pomelo-regist:',
     DEFAULT_REDIS_PORT: 6379,
-	  DEFAULT_REDIS_HOST: '127.0.0.1',
+	DEFAULT_REDIS_HOST: '127.0.0.1',
     DEFAULT_SERVERTYPE: 'pomelo-server'
   },
 
@@ -131,4 +131,4 @@ module.exports = {
    CONNECT_RETRY: 3,
    RECONNECT_RETRY: 10000
  }
-};
\ No newline at end of file
+};

From 871db3c3a49ea52e03b00bb5b9be4e008c723292 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <hzxuzhonghu@corp.netease.com>
Date: Tue, 20 Oct 2015 19:45:29 +0800
Subject: [PATCH 27/78] fix application ut error

---
 gruntfile.js        |   2 +-
 test/application.js | 156 ++------------------------------------------
 2 files changed, 7 insertions(+), 151 deletions(-)

diff --git a/gruntfile.js b/gruntfile.js
index 908cea64a..ea4eacf81 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -7,7 +7,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
 
   var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
-  'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js',*/ 'test/util/*.js'/*, 'test/application.js'*/];
+  'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js',*/ 'test/util/*.js', 'test/application.js'];
 
 
   // Project configuration.
diff --git a/test/application.js b/test/application.js
index dd41d2d55..5c026a661 100644
--- a/test/application.js
+++ b/test/application.js
@@ -76,6 +76,12 @@ describe('application test', function(){
       };
 
       app.init({base: mockBase});
+      app.set('monitorConfig',{
+                                monitor : pomelo.monitors.redismonitor,
+                                host: "127.0.0.1",
+                                port: "6379",
+                                redisOpts: {}
+                              });
       app.load(mockComponent);
       app.start(function(err) {
         should.not.exist(err);
@@ -410,156 +416,6 @@ describe('application test', function(){
       app.transaction('test', conditions, handlers);
     });
   });
-
-  describe('#add and remove servers', function() {
-    it('should add servers and emit event and fetch the new server info by get methods', function(done) {
-      var newServers = [
-        {id: 'connector-server-1', serverType: 'connecctor', host: '127.0.0.1', port: 1234, clientPort: 3000, frontend: true},
-        {id: 'area-server-1', serverType: 'area', host: '127.0.0.1', port: 2234}
-      ];
-      app.init({base: mockBase});
-      app.event.on(pomelo.events.ADD_SERVERS, function(servers) {
-        // check event args
-        newServers.should.eql(servers);
-
-        // check servers
-        var curServers = app.getServers();
-        should.exist(curServers);
-        var item, i, l;
-        for(i=0, l=newServers.length; i<l; i++) {
-          item = newServers[i];
-          item.should.eql(curServers[item.id]);
-        }
-
-        // check get server by id
-        for(i=0, l=newServers.length; i<l; i++) {
-          item = newServers[i];
-          item.should.eql(app.getServerById(item.id));
-        }
-
-        // check server types
-        var types = [];
-        for(i=0, l=newServers.length; i<l; i++) {
-          item = newServers[i];
-          if(types.indexOf(item.serverType) < 0) {
-            types.push(item.serverType);
-          }
-        }
-        var types2 = app.getServerTypes();
-        types.length.should.equal(types2.length);
-        for(i=0, l=types.length; i<l; i++) {
-          types2.should.include(types[i]);
-        }
-
-        // check server type list
-        var slist;
-        for(i=0, l=newServers.length; i<l; i++) {
-          item = newServers[i];
-          slist = app.getServersByType(item.serverType);
-          should.exist(slist);
-          contains(slist, item).should.be.true;
-        }
-
-        done();
-      });
-
-      app.addServers(newServers);
-    });
-
-    it('should remove server info and emit event', function(done) {
-      var newServers = [
-        {id: 'connector-server-1', serverType: 'connecctor', host: '127.0.0.1', port: 1234, clientPort: 3000, frontend: true},
-        {id: 'area-server-1', serverType: 'area', host: '127.0.0.1', port: 2234},
-        {id: 'path-server-1', serverType: 'path', host: '127.0.0.1', port: 2235}
-      ];
-      var destServers = [
-        {id: 'connector-server-1', serverType: 'connecctor', host: '127.0.0.1', port: 1234, clientPort: 3000, frontend: true},
-        {id: 'path-server-1', serverType: 'path', host: '127.0.0.1', port: 2235}
-      ];
-      var delIds = ['area-server-1'];
-      var addCount = 0;
-      var delCount = 0;
-
-      app.init({base: mockBase});
-      app.event.on(pomelo.events.ADD_SERVERS, function(servers) {
-        // check event args
-        newServers.should.eql(servers);
-        addCount++;
-      });
-
-      app.event.on(pomelo.events.REMOVE_SERVERS, function(ids) {
-        delIds.should.eql(ids);
-
-        // check servers
-        var curServers = app.getServers();
-        should.exist(curServers);
-        var item, i, l;
-        for(i=0, l=destServers.length; i<l; i++) {
-          item = destServers[i];
-          item.should.eql(curServers[item.id]);
-        }
-
-        // check get server by id
-        for(i=0, l=destServers.length; i<l; i++) {
-          item = destServers[i];
-          item.should.eql(app.getServerById(item.id));
-        }
-
-        // check server types
-        // NOTICE: server types would not clear when remove server from app
-        var types = [];
-        for(i=0, l=newServers.length; i<l; i++) {
-          item = newServers[i];
-          if(types.indexOf(item.serverType) < 0) {
-            types.push(item.serverType);
-          }
-        }
-        var types2 = app.getServerTypes();
-        types.length.should.equal(types2.length);
-        for(i=0, l=types.length; i<l; i++) {
-          types2.should.include(types[i]);
-        }
-
-        // check server type list
-        var slist;
-        for(i=0, l=destServers.length; i<l; i++) {
-          item = destServers[i];
-          slist = app.getServersByType(item.serverType);
-          should.exist(slist);
-          contains(slist, item).should.be.true;
-        }
-
-        done();
-      });
-
-      app.addServers(newServers);
-      app.removeServers(delIds);
-    });
-  });
-
-  describe('#beforeStopHook', function() {
-    it('should be called before application stopped.', function(done) {
-      var count = 0;
-      app.init({base: mockBase});
-      app.beforeStopHook(function() {
-        count++;
-      });
-      app.start(function(err) {
-        should.not.exist(err);
-      });
-
-      setTimeout(function() {
-        // wait for after start
-        app.stop(false);
-
-        setTimeout(function() {
-          // wait for stop
-          count.should.equal(1);
-          done();
-        }, WAIT_TIME);
-      }, WAIT_TIME);
-    });
-  });
   describe('#use', function() {
     it('should exist plugin component and event', function(done) {
       var plugin = {

From a5ef36fa3e565c669f11c393d6b3a8b61fa37676 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <hzxuzhonghu@corp.netease.com>
Date: Tue, 20 Oct 2015 19:47:32 +0800
Subject: [PATCH 28/78] ut update

---
 gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gruntfile.js b/gruntfile.js
index ea4eacf81..af537fd95 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -7,7 +7,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
 
   var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
-  'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js',*/ 'test/util/*.js', 'test/application.js'];
+  'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js',*/ 'test/util/*.js', 'test/*.js'];
 
 
   // Project configuration.

From 725c16a5982a7325e7ee8a9d619589762fbdd176 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <hzxuzhonghu@corp.netease.com>
Date: Wed, 21 Oct 2015 10:57:48 +0800
Subject: [PATCH 29/78] fix cmd.js ut and remove redis monitor component load

---
 gruntfile.js            |   2 +-
 test/application.js     |   4 +-
 test/modules/cmd.js     |  63 ++++++++++
 test/modules/console.js | 248 ----------------------------------------
 4 files changed, 66 insertions(+), 251 deletions(-)
 create mode 100644 test/modules/cmd.js
 delete mode 100644 test/modules/console.js

diff --git a/gruntfile.js b/gruntfile.js
index af537fd95..91246f503 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -7,7 +7,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
 
   var src = ['test/manager/taskManager.js', 'test/filters/*.js', 
-  'test/remote/*.js', 'test/service/*.js', /*'test/modules/*.js',*/ 'test/util/*.js', 'test/*.js'];
+  'test/remote/*.js', 'test/service/*.js', 'test/modules/*.js', 'test/util/*.js', 'test/*.js'];
 
 
   // Project configuration.
diff --git a/test/application.js b/test/application.js
index 5c026a661..f23698ab5 100644
--- a/test/application.js
+++ b/test/application.js
@@ -52,7 +52,7 @@ describe('application test', function(){
   });
 
   describe("#compoent", function() {
-    it('should load the component and fire their lifecircle callback by app.start, app.afterStart, app.stop', function(done) {
+    /*it('should load the component and fire their lifecircle callback by app.start, app.afterStart, app.stop', function(done) {
       var startCount = 0, afterStartCount = 0, stopCount = 0;
 
       var mockComponent = {
@@ -100,7 +100,7 @@ describe('application test', function(){
         }, WAIT_TIME);
       }, WAIT_TIME);
     });
-
+*/
     it('should access the component with a name by app.components.name after loaded', function() {
       var key1 = 'key1', comp1 = {content: 'some thing in comp1'};
       var comp2 = {name: 'key2', content: 'some thing in comp2'};
diff --git a/test/modules/cmd.js b/test/modules/cmd.js
new file mode 100644
index 000000000..4636e7ea5
--- /dev/null
+++ b/test/modules/cmd.js
@@ -0,0 +1,63 @@
+var should = require('should');
+var pomelo = require('../../');
+var commander = require('../../lib/monitors/common/cmd');
+
+describe('cmd test', function() {
+    describe('#cmd init', function() {
+        it('should execute the corresponding command with different cmd', function() {
+            var flag;
+            var rs;
+            var client = {
+                app: {
+                    components: {
+                        __connector__: {
+                            blacklist: []
+                        }
+                    },
+                    stop: function() {
+                        flag = true;
+                    },
+                    kill: function(value) {
+                        flag = value
+                    },
+                    addCrons: function(array) {
+                        rs = array;
+                    },
+                    removeCrons: function(array) {
+                        rs = array;
+                    },
+                    set: function(){},
+                    isFrontend: function(){return true}
+                }
+            };
+
+            var data = {command: 1};
+            commander.init(client, JSON.stringify(data));
+            flag.should.eql(true);
+/*
+            data = {command: 2};
+            commander.init(client, JSON.stringify(data));
+            flag.should.eql(true);
+*/
+            data = {command: 3, cron: {
+                                            type: 'chat',
+                                            id: 'chat-server-1'
+                                      }
+                   };
+            commander.init(client, JSON.stringify(data));
+            rs.length.should.eql(1);
+
+            data = {command: 4, cron: {
+                                            type: 'chat',
+                                            id: 'chat-server-1'
+                                      }
+                   };
+            commander.init(client, JSON.stringify(data));
+            rs.length.should.eql(1);
+
+            data = {command: 5, blacklist: ['127.0.0.1'] };
+            commander.init(client, JSON.stringify(data));
+            client.app.components.__connector__.blacklist.length.should.eql(1);
+        });
+    });
+});
diff --git a/test/modules/console.js b/test/modules/console.js
deleted file mode 100644
index d61acb5af..000000000
--- a/test/modules/console.js
+++ /dev/null
@@ -1,248 +0,0 @@
-var should = require('should');
-var pomelo = require('../../');
-var consoleModule = require('../../lib/modules/console');
-
-describe('console module test', function() {
-	describe('#monitorHandler', function() {
-		it('should execute the corresponding command with different signals', function() {
-			var flag;
-			var rs;
-			var opts = {
-				app: {
-					components: {
-						__connector__: {
-							blacklist: []
-						}
-					},
-					stop: function(value) {
-						flag = value;
-					},
-					addCrons: function(array) {
-						rs = array;
-					},
-					removeCrons: function(array) {
-						rs = array;
-					},
-					isFrontend: function() {
-						return true;
-					}
-				}
-			};
-			var module = new consoleModule(opts);
-			var agent1 = {
-				type: 'area'
-			};
-			var msg1 = {signal: 'stop'};
-			module.monitorHandler(agent1, msg1);
-			flag.should.eql(true);
-
-			var msg2 = {signal: 'list'};
-			var agent2 = {
-				type: 'chat',
-				id: 'chat-server-1'
-			};
-			module.monitorHandler(agent2, msg2, function(obj) {
-				obj.serverId.should.eql('chat-server-1');
-				obj.body.serverType.should.eql('chat');
-			});
-
-			var msg3 = {signal: 'addCron'};
-			module.monitorHandler(agent2, msg3, null);
-		 	rs.length.should.eql(1);
-
-		 	var msg4 = {signal: 'removeCron'};
-		 	module.monitorHandler(agent2, msg4, null);
-		 	rs.length.should.eql(1);
-
-		 	var msg5 = {signal: 'blacklist', blacklist: ['127.0.0.1']};
-		 	module.monitorHandler(agent1, msg5, null);
-		 	opts.app.components.__connector__.blacklist.length.should.eql(1);
-
-
-		});
-	});
-
-	describe('#clientHandler', function() {
-    var _exit;
-    var _setTimeout;
-    var exitCount = 0;
-
-    before(function(done) {
-      _exit = process.exit;
-      _setTimeout = setTimeout;
-      done();
-    });
-
-    after(function(done) {
-      process.exit = _exit;
-      setTimeout = _setTimeout;
-      done();
-    });
-
-		var opts = {
-				app: {
-					clusterSeq: {},
-					stop: function(value) {
-						return value;
-					},
-					getServerById: function() {
-						return {
-							host: '127.0.0.1'
-						};
-					},
-					getServers: function() {
-						return {
-							'chat-server-1': {
-
-							}
-						}
-					},
-					get: function(value) {
-						switch(value) {
-							case 'main':
-							  return __dirname + '/../../index.js';
-							case 'env':
-							  return 'dev';
-						}
-					},
-					set: function(value) {
-						return value;
-					},
-					getServersByType: function() {
-						return [{id: 'chat-server-1'}];
-					}
-				}
-			};
-		var module = new consoleModule(opts);
-		it('should execute kill command', function(done) {
-			var msg = {signal: 'kill'};
-      process.exit = function() {exitCount++;};
-      setTimeout = function(cb, timeout) {
-        if (timeout > 3000) {
-          timeout = 3000;
-        }
-        _setTimeout(cb, timeout);
-      };
-
-      var agent1 = {
-				request: function(recordId, moduleId, msg, cb) {
-					cb('chat-server-1');
-        },
-				idMap: {
-					'chat-server-1': {
-						type: 'chat',
-						id: 'chat-server-1'
-					}
-				}
-			};
-			module.clientHandler(agent1, msg, function(err, result) {
-        should.not.exist(err);
-        should.exist(result.code);
-			});
-
-      var agent2 = {
-				request: function(recordId, moduleId, msg, cb) {
-					cb(null);
-        },
-				idMap: {
-					'chat-server-1': {
-						type: 'chat',
-						id: 'chat-server-1'
-					}
-				}
-			};
-			module.clientHandler(agent2, msg, function(err, result) {
-        should.not.exist(err);
-        should.exist(result.code);
-        result.code.should.eql('remained');
-        done();
-			});
-		});
-
-		it('should execute stop command', function(done) {
-			var msg1 = {signal: 'stop', ids: ['chat-server-1']};
-			var msg2 = {signal: 'stop', ids:[]};
-			var agent = {
-				notifyById: function(serverId, moduleId, msg) {
-
-				},
-				notifyAll: function(moduleId, msg) {
-
-				}
-			};
-			module.clientHandler(agent, msg1, function(err, result) {
-				result.status.should.eql('part');
-			});
-
-			module.clientHandler(agent, msg2, function(err, result) {
-				result.status.should.eql('all');
-				done();
-			});
-		});
-
-		it('should execute list command', function() {
-			var msg = {signal: 'list'};
-			var agent = {
-				request: function(recordId, moduleId, msg, cb) {
-					cb({serverId: 'chat-server-1', body: {'server':{}}});
-				},
-				idMap: {
-					'chat-server-1': {
-						type: 'chat',
-						id: 'chat-server-1'
-					}
-				}
-			};
-			module.clientHandler(agent, msg, function(err, result) {
-				should.exist(result.msg);
-			});
-		});
-
-		it('should execute add command', function() {
-			var msg1 = {signal: 'add', args: ['host=127.0.0.1', 'port=88888', 'clusterCount=2']};
-			var msg2 = {signal: 'add', args: ['host=127.0.0.1', 'port=88888', 'id=chat-server-1', 'serverType=chat']};
-			var agent = {};
-			module.clientHandler(agent, msg1, function(err, result) {
-				should.not.exist(err);
-				result.length.should.eql(0);
-			});
-			module.clientHandler(agent, msg2, function(err, result) {
-				result.status.should.eql('ok');
-			});
-		});
-
-		it('should execute blacklist command', function() {
-			var msg1 = {signal: 'blacklist', args: ['127.0.0.1']};
-			var msg2 = {signal: 'blacklist', args: ['abc']};
-			var agent = {
-				notifyAll: function(moduleId, msg) {
-
-				}
-			};
-			module.clientHandler(agent, msg1, function(err, result) {
-				result.status.should.eql('ok');
-			});
-			module.clientHandler(agent, msg2, function(err, result) {
-				should.exist(err);
-			});
-		});
-
-		it('should execute restart command', function() {
-			var msg1 = {signal: 'restart', ids:['chat-server-1']};
-			var msg2 = {signal: 'restart', type:'chat', ids:[]};
-			var agent = {
-				request: function(recordId, moduleId, msg, cb) {
-					cb(null);
-				}
-			};
-			module.clientHandler(agent, msg1, function(err, result) {
-				should.exist(err);
-			});
-			module.clientHandler(agent, msg2, function(err, result) {
-				should.exist(err);
-			});
-
-		});
-
-	});
-});

From a98b5c607a0b257d735346179c5143b6935d39bf Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Wed, 21 Oct 2015 20:06:20 +0800
Subject: [PATCH 30/78] update socket.io version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ac8493e3a..0a574fcf3 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "server"
   ],
   "dependencies": {
-    "socket.io": "0.9.16",
+    "socket.io": "1.3.7",
     "async": "0.2.5",
     "seq-queue": "0.0.5",
     "crc": "0.2.0",

From f0ac4f30bc06a3e3fce70c0b3c7095caee7e6ffa Mon Sep 17 00:00:00 2001
From: "zhangmin.name" <zhangmin@zhangmin.name>
Date: Fri, 16 Oct 2015 20:28:35 +0800
Subject: [PATCH 31/78] implement monitors commands

---
 lib/monitors/common/cmd.js       | 112 ++++++++++++++++++++++++++++++-
 lib/monitors/zookeepermonitor.js |  71 +++++++++++++++++++-
 2 files changed, 181 insertions(+), 2 deletions(-)

diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index 7e3a26f18..004d1d71a 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -1,6 +1,8 @@
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
 var constants = require('../../util/constants');
 var Command = module.exports;
+var vm = require('vm');
+var util = require('util');
 
 Command.init = function(client, data) {
 	logger.debug('server: %s receive command, with data: %j', client.app.serverId, data);
@@ -25,6 +27,24 @@ Command.init = function(client, data) {
 		case 5:
 			addBlacklist(client, data);
 			break;
+		case 6:
+		    set(client, data);
+		    break;
+		case 7:
+			get(client, data);
+			break;
+		case 8:
+			enable(client, data);
+			break;
+		case 9:
+			disable(client, data);
+			break;
+		case 10:
+			run(client, data);
+			break;
+		case 11:
+			exec(client, data);
+			break;
 		default:
 			break;
 	}
@@ -42,16 +62,106 @@ var kill = function(client) {
 };
 
 var addCron = function(client, msg) {
+	logger.info('addCron %s to server %s', msg.cron, client.app.serverId);
 	client.app.addCrons([msg.cron]);
 };
 
 var removeCron = function(client, msg) {
+	logger.info('removeCron %s to server %s', msg.cron, client.app.serverId);
 	client.app.removeCrons([msg.cron]);
 };
 
 var addBlacklist = function(client, msg) {
 	if(client.app.isFrontend()) {
+		logger.info('addBlacklist %s to server %s', msg.blacklist, client.app.serverId);
 		var connector = client.app.components.__connector__;
 		connector.blacklist = connector.blacklist.concat(msg.blacklist);
 	}
-};
\ No newline at end of file
+};
+
+var set = function(client, msg) {
+	var key = msg.param['key'];
+	var value = msg.param['value'];
+	logger.info('set %s to value %s in server %s', key, value, client.app.serverId);
+	client.app.set(key, value);
+}
+
+var get = function(zk, msg) {
+	var value = zk.app.get(msg.param);
+	if (!checkJSON(value)) {
+		value = 'object';
+	}
+
+	logger.info('get %s the value is %s in server %s', msg.param, value, zk.app.serverId);
+	if (!value) value = 'undefined';
+	sendCommandResult(zk, value);
+}
+
+var enable = function(client, msg) {
+	logger.info('enable %s in server %s', msg.param, client.app.serverId);
+	client.app.enable(msg.param);
+}
+
+var disable = function(client, msg) {
+	logger.info('disable %s in server %s', msg.param, client.app.serverId);
+	client.app.disable(msg.param);
+}
+
+var run = function(zk, msg) {
+	var ctx = {
+			app: zk.app,
+			result: null
+	};
+	try {
+		vm.runInNewContext('result = ' + msg.param, ctx, 'myApp.vm');
+		logger.info('run %s in server %s with result %s', msg.param, zk.app.serverId, util.inspect(ctx.result));
+		sendCommandResult(zk, util.inspect(ctx.result));
+	} catch(e) {
+		logger.error('run %s in server %s with err %s', msg.param, zk.app.serverId, e.toString());
+		sendCommandResult(zk, e.toString());
+	}
+}
+
+var exec = function(zk, msg) {
+	var context = {
+        app: zk.app,
+        require: require,
+        os: require('os'),
+        fs: require('fs'),
+        process: process,
+        util: util
+    };
+    try {
+        vm.runInNewContext(msg.script, context);
+		logger.info('exec %s in server %s with result %s', msg.script, zk.app.serverId, context.result);
+        var result = context.result;
+        if (!result) {
+        	sendCommandResult(zk, "script result should be assigned to result value to script module context");
+        } else {
+        	sendCommandResult(zk, result.toString());
+        }
+    } catch (e) {
+		logger.error('exec %s in server %s with err %s', msg.script, zk.app.serverId, e.toString());
+        sendCommandResult(zk, e.toString())
+    }
+}
+
+function sendCommandResult(zk, result) {
+	var buffer = new Buffer(result);
+		zk.client.setData(zk.cmdPath, buffer, function(err, stat) {
+			if (err) {
+				logger.error('send result to zookeeper failed with err:%j', err);
+			}
+	});
+}
+function checkJSON(obj) {
+	if (!obj) {
+		return true;
+	}
+	try {
+		JSON.stringify(obj);
+	} catch (e) {
+		return false;
+	}
+	return true;
+}
\ No newline at end of file
diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index 02e37b97c..9032a4a5d 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -127,9 +127,78 @@ var getChildren = function(zk, fun, cb) {
 };
 
 var registerZK = function(zk, cb) {
+
+  var allInfo = {};
+
   var serverInfo = zk.app.getCurServer();
   serverInfo.pid = process.pid;
-  var buffer = new Buffer(JSON.stringify(serverInfo));
+  allInfo.serverInfo = serverInfo;
+  
+  var connectionInfo = {};
+  var connection = zk.app.components.__connection__;
+  connectionInfo.serverId = zk.app.serverId;
+  if (connection) {
+    connectionInfo.body = connection.getStatisticsInfo();
+    
+  }
+  connectionInfo.body = 'no connection';
+  allInfo.connectionInfo = connectionInfo;
+
+  allInfo.loginInfo = connectionInfo;
+  
+  var proxyInfo = {};
+  var __proxy__ = zk.app.components.__proxy__;
+  if (__proxy__ && __proxy__.client && __proxy__.client.proxies.user) {
+    var proxies = __proxy__.client.proxies.user;
+    var server = zk.app.getServerById(zk.app.serverId);
+    if (!server) {
+      cb('no server with this id ' + zk.app.serverId);
+    } else {
+      var type = server['serverType'];
+      var tmp = proxies[type];
+      proxyInfo[type] = {};
+      for (var _proxy in tmp) {
+        var r = tmp[_proxy];
+        proxyInfo[type][_proxy] = {};
+        for (var _rpc in r) {
+          if (typeof r[_rpc] === 'function') {
+            proxyInfo[type][_proxy][_rpc] = 'function';
+          }
+        }
+      }
+      allInfo.proxyInfo = proxyInfo;
+    }
+  } else {
+    allInfo.proxyInfo = 'no proxy loaded';
+  }
+
+  var handlerInfo = {};
+  var __server__ = zk.app.components.__server__;
+  if (__server__ && __server__.server && __server__.server.handlerService.handlers) {
+    var handles = __server__.server.handlerService.handlers;
+    var server = zk.app.getServerById(zk.app.serverId);
+    if (!server) {
+      cb('no server with this id ' + zk.app.serverId);
+    } else {
+      var type = server['serverType'];
+      var tmp = handles;
+      handlerInfo[type] = {};
+      for (var _p in tmp) {
+        var r = tmp[_p];
+        handlerInfo[type][_p] = {};
+        for (var _r in r) {
+          if (typeof r[_r] === 'function') {
+            handlerInfo[type][_p][_r] = 'function';
+          }
+        }
+      }
+      allInfo.handlerInfo = handlerInfo;
+    }
+  } else {
+    allInfo.handlerInfo = 'no handler loaded';
+  }
+
+  var buffer = new Buffer(JSON.stringify(allInfo));
 
   async.series([
     function(callback) {

From f570144cd10214135f60ba71f1ba9e788c35e915 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 23 Oct 2015 17:28:33 +0800
Subject: [PATCH 32/78] update for socket.io

---
 bin/pomelo                     | 5 +++--
 lib/connectors/sioconnector.js | 9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/bin/pomelo b/bin/pomelo
index e41d3ac4d..50ae73d9a 100755
--- a/bin/pomelo
+++ b/bin/pomelo
@@ -1,6 +1,7 @@
-'use strict';
 #!/usr/bin/env node
 
+"use strict";
+
 /**
  * Module dependencies.
  */
@@ -368,7 +369,7 @@ function copy(origin, target) {
  * @param {Function} fn
  */
 function mkdir(path, fn) {
-  mkdirp(path, 0755, function(err){
+  mkdirp(path, '0755', function(err){
     if(err) {
       throw err;
     }
diff --git a/lib/connectors/sioconnector.js b/lib/connectors/sioconnector.js
index 4a26dc41d..0df533d44 100644
--- a/lib/connectors/sioconnector.js
+++ b/lib/connectors/sioconnector.js
@@ -1,7 +1,7 @@
 'use strict';
 var util = require('util');
 var EventEmitter = require('events').EventEmitter;
-var sio = require('socket.io');
+var sio = require('socket.io')();
 var SioSocket = require('./siosocket');
 
 var PKG_ID_BYTES = 4;
@@ -23,7 +23,6 @@ var Connector = function(port, host, opts) {
   this.port = port;
   this.host = host;
   this.opts = opts;
-  this.heartbeats = opts.heartbeats || true;
   this.closeTimeout = opts.closeTimeout || 60;
   this.heartbeatTimeout = opts.heartbeatTimeout || 60;
   this.heartbeatInterval = opts.heartbeatInterval || 25;
@@ -40,20 +39,18 @@ Connector.prototype.start = function(cb) {
   var self = this;
   // issue https://github.com/NetEase/pomelo-cn/issues/174
   if(!!this.opts) {
+    console.error('opts: %j', this.opts);
     this.wsocket = sio.listen(this.port, this.opts);
   }
   else {
     this.wsocket = sio.listen(this.port, {
       transports: [
-      'websocket', 'htmlfile', 'xhr-polling', 'jsonp-polling', 'flashsocket'
+      'websocket', 'polling'
       ]
     });
   }
-  this.wsocket.set('close timeout', this.closeTimeout);
   this.wsocket.set('heartbeat timeout', this.heartbeatTimeout);
   this.wsocket.set('heartbeat interval', this.heartbeatInterval);
-  this.wsocket.set('heartbeats', this.heartbeats);
-  this.wsocket.set('log level', 1);
   this.wsocket.sockets.on('connection', function (socket) {
     var siosocket = new SioSocket(curId++, socket);
     self.emit('connection', siosocket);

From 677074e8e52ee707e2d02219ed72114683afdc69 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 23 Oct 2015 17:29:39 +0800
Subject: [PATCH 33/78] fix zkmonitor bug

---
 lib/monitors/zookeepermonitor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index 88aea2921..05f8c56b9 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -101,7 +101,7 @@ var getData = function(zk, path, watcher, cb) {
       utils.invokeCallback(cb, err);
       return;
     }
-    utils.invokeCallback(cb, null, data === null ? null: data.toString());
+    utils.invokeCallback(cb, null, data === null || data === undefined ? null: data.toString());
   });
 };
 

From c5710fddf30aa617ff1f665c5b03dd280394be35 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 23 Oct 2015 17:40:33 +0800
Subject: [PATCH 34/78] update socket.io template

---
 template/game-server/app.js                   |    9 +
 template/game-server/app.js.mqtt              |    9 +
 template/game-server/app.js.sio               |   13 +-
 template/game-server/app.js.sio.wss           |    9 +
 template/game-server/app.js.udp               |    9 +
 template/game-server/app.js.wss               |    9 +
 .../servers/connector/handler/entryHandler.js |    2 +-
 template/web-server/app.js                    |   35 +-
 template/web-server/package.json              |    3 +-
 template/web-server/public/css/base.css       |    8 +
 template/web-server/public/index.html         |  113 +-
 .../web-server/public/js/lib/pomeloclient.js  |  175 +-
 .../web-server/public/js/lib/socket.io.js     | 3791 +----------------
 13 files changed, 229 insertions(+), 3956 deletions(-)

diff --git a/template/game-server/app.js b/template/game-server/app.js
index 1a4e0e7d0..4e382d5cb 100644
--- a/template/game-server/app.js
+++ b/template/game-server/app.js
@@ -6,6 +6,15 @@ var pomelo = require('pomelo');
 var app = pomelo.createApp();
 app.set('name', '$');
 
+// configure monitor
+app.configure('production|development', function(){
+  app.set('monitorConfig',
+    {
+      monitor : pomelo.monitors.zookeepermonitor,
+      servers: "127.0.0.1:2181"
+    });
+});
+
 // app configuration
 app.configure('production|development', 'connector', function(){
   app.set('connectorConfig',
diff --git a/template/game-server/app.js.mqtt b/template/game-server/app.js.mqtt
index 2d1a6ccd8..4070ba2cc 100644
--- a/template/game-server/app.js.mqtt
+++ b/template/game-server/app.js.mqtt
@@ -6,6 +6,15 @@ var pomelo = require('pomelo');
 var app = pomelo.createApp();
 app.set('name', '$');
 
+// configure monitor
+app.configure('production|development', function(){
+  app.set('monitorConfig',
+    {
+      monitor : pomelo.monitors.zookeepermonitor,
+      servers: "127.0.0.1:2181"
+    });
+});
+
 // app configuration
 app.configure('production|development', 'connector', function(){
   app.set('connectorConfig',
diff --git a/template/game-server/app.js.sio b/template/game-server/app.js.sio
index fc3529771..b95c7009d 100644
--- a/template/game-server/app.js.sio
+++ b/template/game-server/app.js.sio
@@ -6,15 +6,22 @@ var pomelo = require('pomelo');
 var app = pomelo.createApp();
 app.set('name', '$');
 
+// configure monitor
+app.configure('production|development', function(){
+  app.set('monitorConfig',
+    {
+      monitor : pomelo.monitors.zookeepermonitor,
+      servers: "127.0.0.1:2181"
+    });
+});
+
 // app configuration
 app.configure('production|development', 'connector', function(){
   app.set('connectorConfig',
     {
       connector : pomelo.connectors.sioconnector,
-      //websocket, htmlfile, xhr-polling, jsonp-polling, flashsocket
+      //websocket, polling
       transports : ['websocket'],
-      heartbeats : true,
-      closeTimeout : 60,
       heartbeatTimeout : 60,
       heartbeatInterval : 25
     });
diff --git a/template/game-server/app.js.sio.wss b/template/game-server/app.js.sio.wss
index fb14c07d4..9b15d9708 100644
--- a/template/game-server/app.js.sio.wss
+++ b/template/game-server/app.js.sio.wss
@@ -7,6 +7,15 @@ var pomelo = require('pomelo');
 var app = pomelo.createApp();
 app.set('name', '$');
 
+// configure monitor
+app.configure('production|development', function(){
+  app.set('monitorConfig',
+    {
+      monitor : pomelo.monitors.zookeepermonitor,
+      servers: "127.0.0.1:2181"
+    });
+});
+
 // app configuration
 app.configure('production|development', function(){
   app.set('connectorConfig',
diff --git a/template/game-server/app.js.udp b/template/game-server/app.js.udp
index 99b2b3be6..59accb3ec 100644
--- a/template/game-server/app.js.udp
+++ b/template/game-server/app.js.udp
@@ -6,6 +6,15 @@ var pomelo = require('pomelo');
 var app = pomelo.createApp();
 app.set('name', '$');
 
+// configure monitor
+app.configure('production|development', function(){
+  app.set('monitorConfig',
+    {
+      monitor : pomelo.monitors.zookeepermonitor,
+      servers: "127.0.0.1:2181"
+    });
+});
+
 // app configuration
 app.configure('production|development', function(){
   app.set('connectorConfig',
diff --git a/template/game-server/app.js.wss b/template/game-server/app.js.wss
index 3fe713824..3b56fb7e0 100644
--- a/template/game-server/app.js.wss
+++ b/template/game-server/app.js.wss
@@ -7,6 +7,15 @@ var pomelo = require('pomelo');
 var app = pomelo.createApp();
 app.set('name', '$');
 
+// configure monitor
+app.configure('production|development', function(){
+  app.set('monitorConfig',
+    {
+      monitor : pomelo.monitors.zookeepermonitor,
+      servers: "127.0.0.1:2181"
+    });
+});
+
 // app configuration
 app.configure('production|development', 'connector', function(){
   app.set('connectorConfig',
diff --git a/template/game-server/app/servers/connector/handler/entryHandler.js b/template/game-server/app/servers/connector/handler/entryHandler.js
index adf36ea11..d529c6efd 100644
--- a/template/game-server/app/servers/connector/handler/entryHandler.js
+++ b/template/game-server/app/servers/connector/handler/entryHandler.js
@@ -15,7 +15,7 @@ var Handler = function(app) {
  * @return {Void}
  */
 Handler.prototype.entry = function(msg, session, next) {
-  next(null, {code: 200, msg: 'game server is ok.'});
+  next(null, {code: 200, msg: 'Welcome to pomelo 2.0.'});
 };
 
 /**
diff --git a/template/web-server/app.js b/template/web-server/app.js
index c33b80861..e25bbe937 100644
--- a/template/web-server/app.js
+++ b/template/web-server/app.js
@@ -1,27 +1,14 @@
-var express = require('express');
-var app = express.createServer();
+var app = require('express')();
+var serveStatic = require('serve-static');
 
-app.configure(function(){
-  app.use(express.methodOverride());
-  app.use(express.bodyParser());
-  app.use(app.router);
-  app.set('view engine', 'jade');
-  app.set('views', __dirname + '/public');
-  app.set('view options', {layout: false});
-  app.set('basepath',__dirname + '/public');
-});
-
-app.configure('development', function(){
-  app.use(express.static(__dirname + '/public'));
-  app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
-});
-
-app.configure('production', function(){
+var env = process.env.NODE_ENV || 'development';
+if ('development' === env) {
+  app.use(serveStatic(__dirname + '/public'));
+} else {
   var oneYear = 31557600000;
-  app.use(express.static(__dirname + '/public', { maxAge: oneYear }));
-  app.use(express.errorHandler());
-});
-
-console.log("Web server has started.\nPlease log on http://127.0.0.1:3001/index.html");
+  app.use(serveStatic(__dirname + '/public', { maxAge: oneYear }));
+}
 
-app.listen(3001);
+app.listen(3001, function() {
+  console.log("Web server has started.\nPlease log on http://127.0.0.1:3001/index.html");
+});
\ No newline at end of file
diff --git a/template/web-server/package.json b/template/web-server/package.json
index 7afd4cb6a..e3e776cde 100644
--- a/template/web-server/package.json
+++ b/template/web-server/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.1",
   "private": false,
   "dependencies": {
-    "express": "3.4.8"
+    "express": "4.10.2",
+    "serve-static": "1.10.0"
   }
 }
\ No newline at end of file
diff --git a/template/web-server/public/css/base.css b/template/web-server/public/css/base.css
index 17af8af8d..44aa308a9 100644
--- a/template/web-server/public/css/base.css
+++ b/template/web-server/public/css/base.css
@@ -50,6 +50,14 @@
   font-size: 15pt;
 }
 
+.g-result {
+  height: 100px;
+  margin-top: 30px;
+  text-align: center;
+  font-size: 18pt;
+  color: #FF0000;
+}
+
 .g-button {
   margin-top: 10px;
   text-align: center;
diff --git a/template/web-server/public/index.html b/template/web-server/public/index.html
index e815cc563..63f0d6fbd 100644
--- a/template/web-server/public/index.html
+++ b/template/web-server/public/index.html
@@ -1,57 +1,72 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8" />
-    <title>
-      Pomelo
-    </title>
-    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-    <meta http-equiv="content-style-type" content="text/css" />
-    <meta http-equiv="content-scripte-type" content="text/javascript" />
-    <meta name="author" content="netease" />
-    <meta name="version" content="1.0" />
-    <meta name="keywords" content="pomelo" />
-    <link type="text/css" rel="stylesheet" href="css/base.css" />
-    <script src="js/lib/build/build.js" type="text/javascript"></script>
-    <script type="text/javascript">
-      require('boot');
-    </script> 
-    <script type="text/javascript">
-      var pomelo = window.pomelo;
-      var host = "127.0.0.1";
-      var port = "3010";
-      function show() {
-        pomelo.init({
-          host: host,
-          port: port,
-          log: true
-        }, function() {
+<head>
+  <meta charset="utf-8" />
+  <title>
+    Pomelo
+  </title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+  <meta http-equiv="content-style-type" content="text/css" />
+  <meta http-equiv="content-scripte-type" content="text/javascript" />
+  <meta name="author" content="netease" />
+  <meta name="version" content="1.0" />
+  <meta name="keywords" content="pomelo" />
+  <link type="text/css" rel="stylesheet" href="css/base.css" />
+  <script src="js/lib/build/build.js" type="text/javascript"></script>
+  <script type="text/javascript">
+  require('boot');
+  </script> 
+  <script type="text/javascript">
+  var pomelo = window.pomelo;
+  var host = "127.0.0.1";
+  var port = "3010";
+  var connected = false;
+  var node, para;
+  function show() {
+    if(!connected) {
+      pomelo.init({
+        host: host,
+        port: port
+      }, function() {
         pomelo.request("connector.entryHandler.entry", "hello pomelo", function(data) {
-            alert(data.msg);
-          });
+          para = document.getElementById('result');
+          node = document.createTextNode(data.msg);
+          para.appendChild(node);
+          connected = true;
         });
-      }
-    </script>
-  </head>
-  <body>
-    <div class="g-doc">
-      <div class="g-banner" style="border:none">
-        <div class="logo">
-          <div class="img"></div>
-        </div>
+      });
+    } else {
+      para.removeChild(node);
+      pomelo.request("connector.entryHandler.entry", "hello pomelo", function(data) {
+        console.log(data.msg);
+        para.appendChild(node);
+      });
+    }
+  }
+  </script>
+</head>
+<body>
+  <div class="g-doc">
+    <div class="g-banner" style="border:none">
+      <div class="logo">
+        <div class="img"></div>
       </div>
-      <div class="g-background">
-        <div class="g-content">
-          Welcome to Pomelo
-        </div>
-      </div>
-      <div class="g-link">
-        Home:
-        <a href="https://github.com/NetEase/pomelo">https://github.com/NetEase/pomelo</a>
-      </div>
-      <div class="g-button">
-        <input id="test" type="button" value="Test Game Server" onclick="show()"/>
+    </div>
+    <div class="g-background">
+      <div class="g-content">
+        Welcome to Pomelo
       </div>
     </div>
-  </body>
+    <div class="g-link">
+      Home:
+      <a href="https://github.com/NetEase/pomelo">https://github.com/NetEase/pomelo</a>
+    </div>
+    <div class="g-result">
+      <p id='result'></p>
+    </div>
+    <div class="g-button">
+      <input id="test" type="button" value="Test Game Server" onclick="show()"/>
+    </div>
+  </div>
+</body>
 </html>
diff --git a/template/web-server/public/js/lib/pomeloclient.js b/template/web-server/public/js/lib/pomeloclient.js
index 792ae8522..f27d113e6 100644
--- a/template/web-server/public/js/lib/pomeloclient.js
+++ b/template/web-server/public/js/lib/pomeloclient.js
@@ -33,51 +33,51 @@
     // If there is no 'error' event listener then throw.
     if (type === 'error') {
       if (!this._events || !this._events.error ||
-          (isArray(this._events.error) && !this._events.error.length))
-        {
-          if (this.domain) {
-            var er = arguments[1];
-            er.domain_emitter = this;
-            er.domain = this.domain;
-            er.domain_thrown = false;
-            this.domain.emit('error', er);
-            return false;
-          }
+        (isArray(this._events.error) && !this._events.error.length))
+      {
+        if (this.domain) {
+          var er = arguments[1];
+          er.domain_emitter = this;
+          er.domain = this.domain;
+          er.domain_thrown = false;
+          this.domain.emit('error', er);
+          return false;
+        }
 
-          if (arguments[1] instanceof Error) {
+        if (arguments[1] instanceof Error) {
             throw arguments[1]; // Unhandled 'error' event
           } else {
             throw new Error("Uncaught, unspecified 'error' event.");
           }
           return false;
         }
-    }
+      }
 
-    if (!this._events) return false;
-    var handler = this._events[type];
-    if (!handler) return false;
+      if (!this._events) return false;
+      var handler = this._events[type];
+      if (!handler) return false;
 
-    if (typeof handler == 'function') {
-      if (this.domain) {
-        this.domain.enter();
-      }
-      switch (arguments.length) {
+      if (typeof handler == 'function') {
+        if (this.domain) {
+          this.domain.enter();
+        }
+        switch (arguments.length) {
         // fast cases
         case 1:
-          handler.call(this);
+        handler.call(this);
         break;
         case 2:
-          handler.call(this, arguments[1]);
+        handler.call(this, arguments[1]);
         break;
         case 3:
-          handler.call(this, arguments[1], arguments[2]);
+        handler.call(this, arguments[1], arguments[2]);
         break;
         // slower
         default:
-          var l = arguments.length;
+        var l = arguments.length;
         var args = new Array(l - 1);
         for (var i = 1; i < l; i++) args[i - 1] = arguments[i];
-        handler.apply(this, args);
+          handler.apply(this, args);
       }
       if (this.domain) {
         this.domain.exit();
@@ -92,7 +92,7 @@
       var args = new Array(l - 1);
       for (var i = 1; i < l; i++) args[i - 1] = arguments[i];
 
-      var listeners = handler.slice();
+        var listeners = handler.slice();
       for (var i = 0, l = listeners.length; i < l; i++) {
         listeners[i].apply(this, args);
       }
@@ -116,7 +116,7 @@
     // To avoid recursion in the case that type == "newListeners"! Before
     // adding it to the listeners, first emit "newListeners".
     this.emit('newListener', type, typeof listener.listener === 'function' ?
-              listener.listener : listener);
+      listener.listener : listener);
 
     if (!this._events[type]) {
       // Optimize the case of one listener. Don't need the extra array object.
@@ -144,9 +144,9 @@
       if (m && m > 0 && this._events[type].length > m) {
         this._events[type].warned = true;
         console.error('(node) warning: possible EventEmitter memory ' +
-                      'leak detected. %d listeners added. ' +
-                      'Use emitter.setMaxListeners() to increase limit.',
-        this._events[type].length);
+          'leak detected. %d listeners added. ' +
+          'Use emitter.setMaxListeners() to increase limit.',
+          this._events[type].length);
         console.trace();
       }
     }
@@ -187,22 +187,22 @@
       var position = -1;
       for (var i = 0, length = list.length; i < length; i++) {
         if (list[i] === listener ||
-            (list[i].listener && list[i].listener === listener))
-          {
-            position = i;
-            break;
-          }
+          (list[i].listener && list[i].listener === listener))
+        {
+          position = i;
+          break;
+        }
       }
 
       if (position < 0) return this;
       list.splice(position, 1);
     } else if (list === listener ||
-               (list.listener && list.listener === listener))
-      {
-        delete this._events[type];
-      }
+     (list.listener && list.listener === listener))
+    {
+      delete this._events[type];
+    }
 
-      return this;
+    return this;
   };
 
   EventEmitter.prototype.removeAllListeners = function(type) {
@@ -236,13 +236,13 @@
 (function (exports, global) {
 
   var Protocol = exports;
- 
+  
   var HEADER = 5;
 
   var Message = function(id,route,body){
-      this.id = id;
-      this.route = route;
-      this.body = body;
+    this.id = id;
+    this.route = route;
+    this.body = body;
   };
 
 /**
@@ -254,23 +254,23 @@
  * socketio current support string
  *
  */
-Protocol.encode = function(id,route,msg){
-    var msgStr = JSON.stringify(msg);
-    if (route.length>255) { throw new Error('route maxlength is overflow'); }
-    var byteArray = new Uint16Array(HEADER + route.length + msgStr.length);
-    var index = 0;
-    byteArray[index++] = (id>>24) & 0xFF;
-    byteArray[index++] = (id>>16) & 0xFF;
-    byteArray[index++] = (id>>8) & 0xFF;
-    byteArray[index++] = id & 0xFF;
-    byteArray[index++] = route.length & 0xFF;
-    for(var i = 0;i<route.length;i++){
-        byteArray[index++] = route.charCodeAt(i);
-    }
-    for (var i = 0; i < msgStr.length; i++) {
-        byteArray[index++] = msgStr.charCodeAt(i);
-    }
-    return bt2Str(byteArray,0,byteArray.length);
+ Protocol.encode = function(id,route,msg){
+  var msgStr = JSON.stringify(msg);
+  if (route.length>255) { throw new Error('route maxlength is overflow'); }
+  var byteArray = new Uint16Array(HEADER + route.length + msgStr.length);
+  var index = 0;
+  byteArray[index++] = (id>>24) & 0xFF;
+  byteArray[index++] = (id>>16) & 0xFF;
+  byteArray[index++] = (id>>8) & 0xFF;
+  byteArray[index++] = id & 0xFF;
+  byteArray[index++] = route.length & 0xFF;
+  for(var i = 0;i<route.length;i++){
+    byteArray[index++] = route.charCodeAt(i);
+  }
+  for (var i = 0; i < msgStr.length; i++) {
+    byteArray[index++] = msgStr.charCodeAt(i);
+  }
+  return bt2Str(byteArray,0,byteArray.length);
 };
 
 
@@ -282,26 +282,26 @@ Protocol.encode = function(id,route,msg){
  *msg String data
  *return Message Object
  */
-Protocol.decode = function(msg){
-    var idx, len = msg.length, arr = new Array( len );
-    for ( idx = 0 ; idx < len ; ++idx ) {
-        arr[idx] = msg.charCodeAt(idx);
-    }
-    var index = 0;
-    var buf = new Uint16Array(arr);
-    var id = ((buf[index++] <<24) | (buf[index++])  << 16  |  (buf[index++]) << 8 | buf[index++]) >>>0; 
-    var routeLen = buf[HEADER-1];
-    var route = bt2Str(buf,HEADER, routeLen+HEADER);
-    var body = bt2Str(buf,routeLen+HEADER,buf.length);  
-    return new Message(id,route,body);
+ Protocol.decode = function(msg){
+  var idx, len = msg.length, arr = new Array( len );
+  for ( idx = 0 ; idx < len ; ++idx ) {
+    arr[idx] = msg.charCodeAt(idx);
+  }
+  var index = 0;
+  var buf = new Uint16Array(arr);
+  var id = ((buf[index++] <<24) | (buf[index++])  << 16  |  (buf[index++]) << 8 | buf[index++]) >>>0; 
+  var routeLen = buf[HEADER-1];
+  var route = bt2Str(buf,HEADER, routeLen+HEADER);
+  var body = bt2Str(buf,routeLen+HEADER,buf.length);  
+  return new Message(id,route,body);
 };
 
 var bt2Str = function(byteArray,start,end) {
-    var result = "";
-    for(var i = start; i < byteArray.length && i<end; i++) {
-        result = result + String.fromCharCode(byteArray[i]);
-    };
-    return result;
+  var result = "";
+  for(var i = start; i < byteArray.length && i<end; i++) {
+    result = result + String.fromCharCode(byteArray[i]);
+  };
+  return result;
 }
 
 })('object' === typeof module ? module.exports : (this.Protocol = {}), this);
@@ -322,20 +322,15 @@ var bt2Str = function(byteArray,start,end) {
   var id = 1;
   var callbacks = {};
 
-  pomelo.init = function(params, cb){
+  pomelo.init = function(params, cb) {
     pomelo.params = params;
     params.debug = true;
     var host = params.host;
     var port = params.port;
 
-    var url = 'ws://' + host;
-    if(port) {
-      url +=  ':' + port;
-    }
-
-    socket = io.connect(url, {'force new connection': true, reconnect: false});
+    socket = io.connect('ws://' + host + ':' + port, {reconnection: false, transports: ['websocket']});
 
-    socket.on('connect', function(){
+    socket.on('connect', function() {
       console.log('[pomeloclient.init] websocket connected!');
       if (cb) {
         cb(socket);
@@ -391,9 +386,9 @@ var bt2Str = function(byteArray,start,end) {
       cb = arguments[2];
     }
     msg = filter(msg,route);
-  id++; 
-  callbacks[id] = cb;
-  var sg = Protocol.encode(id,route,msg);
+    id++; 
+    callbacks[id] = cb;
+    var sg = Protocol.encode(id,route,msg);
     socket.send(sg);
   };
 
@@ -432,7 +427,7 @@ var bt2Str = function(byteArray,start,end) {
           pomelo.emit(route,msg);
         }
       } else {
-          pomelo.emit(msg.body.route,msg.body);
+        pomelo.emit(msg.body.route,msg.body);
       }
     }
   };
diff --git a/template/web-server/public/js/lib/socket.io.js b/template/web-server/public/js/lib/socket.io.js
index f2c6a389d..bdd653c41 100644
--- a/template/web-server/public/js/lib/socket.io.js
+++ b/template/web-server/public/js/lib/socket.io.js
@@ -1,3788 +1,3 @@
-/*! Socket.IO.js build:0.9.6, development. Copyright(c) 2011 LearnBoost <dev@learnboost.com> MIT Licensed */
-
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, global) {
-
-  /**
-   * IO namespace.
-   *
-   * @namespace
-   */
-
-  var io = exports;
-
-  /**
-   * Socket.IO version
-   *
-   * @api public
-   */
-
-  io.version = '0.9.6';
-
-  /**
-   * Protocol implemented.
-   *
-   * @api public
-   */
-
-  io.protocol = 1;
-
-  /**
-   * Available transports, these will be populated with the available transports
-   *
-   * @api public
-   */
-
-  io.transports = [];
-
-  /**
-   * Keep track of jsonp callbacks.
-   *
-   * @api private
-   */
-
-  io.j = [];
-
-  /**
-   * Keep track of our io.Sockets
-   *
-   * @api private
-   */
-  io.sockets = {};
-
-
-  /**
-   * Manages connections to hosts.
-   *
-   * @param {String} uri
-   * @Param {Boolean} force creation of new socket (defaults to false)
-   * @api public
-   */
-
-  io.connect = function (host, details) {
-    var uri = io.util.parseUri(host)
-      , uuri
-      , socket;
-
-    if (global && global.location) {
-      uri.protocol = uri.protocol || global.location.protocol.slice(0, -1);
-      uri.host = uri.host || (global.document
-        ? global.document.domain : global.location.hostname);
-      uri.port = uri.port || global.location.port;
-    }
-
-    uuri = io.util.uniqueUri(uri);
-
-    var options = {
-        host: uri.host
-      , secure: 'https' == uri.protocol
-      , port: uri.port || ('https' == uri.protocol ? 443 : 80)
-      , query: uri.query || ''
-    };
-
-    io.util.merge(options, details);
-
-    if (options['force new connection'] || !io.sockets[uuri]) {
-      socket = new io.Socket(options);
-    }
-
-    if (!options['force new connection'] && socket) {
-      io.sockets[uuri] = socket;
-    }
-
-    socket = socket || io.sockets[uuri];
-
-    // if path is different from '' or /
-    return socket.of(uri.path.length > 1 ? uri.path : '');
-  };
-
-})('object' === typeof module ? module.exports : (this.io = {}), this);
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, global) {
-
-  /**
-   * Utilities namespace.
-   *
-   * @namespace
-   */
-
-  var util = exports.util = {};
-
-  /**
-   * Parses an URI
-   *
-   * @author Steven Levithan <stevenlevithan.com> (MIT license)
-   * @api public
-   */
-
-  var re = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/;
-
-  var parts = ['source', 'protocol', 'authority', 'userInfo', 'user', 'password',
-               'host', 'port', 'relative', 'path', 'directory', 'file', 'query',
-               'anchor'];
-
-  util.parseUri = function (str) {
-    var m = re.exec(str || '')
-      , uri = {}
-      , i = 14;
-
-    while (i--) {
-      uri[parts[i]] = m[i] || '';
-    }
-
-    return uri;
-  };
-
-  /**
-   * Produces a unique url that identifies a Socket.IO connection.
-   *
-   * @param {Object} uri
-   * @api public
-   */
-
-  util.uniqueUri = function (uri) {
-    var protocol = uri.protocol
-      , host = uri.host
-      , port = uri.port;
-
-    if ('document' in global) {
-      host = host || document.domain;
-      port = port || (protocol == 'https'
-        && document.location.protocol !== 'https:' ? 443 : document.location.port);
-    } else {
-      host = host || 'localhost';
-
-      if (!port && protocol == 'https') {
-        port = 443;
-      }
-    }
-
-    return (protocol || 'http') + '://' + host + ':' + (port || 80);
-  };
-
-  /**
-   * Mergest 2 query strings in to once unique query string
-   *
-   * @param {String} base
-   * @param {String} addition
-   * @api public
-   */
-
-  util.query = function (base, addition) {
-    var query = util.chunkQuery(base || '')
-      , components = [];
-
-    util.merge(query, util.chunkQuery(addition || ''));
-    for (var part in query) {
-      if (query.hasOwnProperty(part)) {
-        components.push(part + '=' + query[part]);
-      }
-    }
-
-    return components.length ? '?' + components.join('&') : '';
-  };
-
-  /**
-   * Transforms a querystring in to an object
-   *
-   * @param {String} qs
-   * @api public
-   */
-
-  util.chunkQuery = function (qs) {
-    var query = {}
-      , params = qs.split('&')
-      , i = 0
-      , l = params.length
-      , kv;
-
-    for (; i < l; ++i) {
-      kv = params[i].split('=');
-      if (kv[0]) {
-        query[kv[0]] = kv[1];
-      }
-    }
-
-    return query;
-  };
-
-  /**
-   * Executes the given function when the page is loaded.
-   *
-   *     io.util.load(function () { console.log('page loaded'); });
-   *
-   * @param {Function} fn
-   * @api public
-   */
-
-  var pageLoaded = false;
-
-  util.load = function (fn) {
-    if ('document' in global && document.readyState === 'complete' || pageLoaded) {
-      return fn();
-    }
-
-    util.on(global, 'load', fn, false);
-  };
-
-  /**
-   * Adds an event.
-   *
-   * @api private
-   */
-
-  util.on = function (element, event, fn, capture) {
-    if (element.attachEvent) {
-      element.attachEvent('on' + event, fn);
-    } else if (element.addEventListener) {
-      element.addEventListener(event, fn, capture);
-    }
-  };
-
-  /**
-   * Generates the correct `XMLHttpRequest` for regular and cross domain requests.
-   *
-   * @param {Boolean} [xdomain] Create a request that can be used cross domain.
-   * @returns {XMLHttpRequest|false} If we can create a XMLHttpRequest.
-   * @api private
-   */
-
-  util.request = function (xdomain) {
-
-    if (xdomain && 'undefined' != typeof XDomainRequest) {
-      return new XDomainRequest();
-    }
-
-    if ('undefined' != typeof XMLHttpRequest && (!xdomain || util.ua.hasCORS)) {
-      return new XMLHttpRequest();
-    }
-
-    if (!xdomain) {
-      try {
-        return new window[(['Active'].concat('Object').join('X'))]('Microsoft.XMLHTTP');
-      } catch(e) { }
-    }
-
-    return null;
-  };
-
-  /**
-   * XHR based transport constructor.
-   *
-   * @constructor
-   * @api public
-   */
-
-  /**
-   * Change the internal pageLoaded value.
-   */
-
-  if ('undefined' != typeof window) {
-    util.load(function () {
-      pageLoaded = true;
-    });
-  }
-
-  /**
-   * Defers a function to ensure a spinner is not displayed by the browser
-   *
-   * @param {Function} fn
-   * @api public
-   */
-
-  util.defer = function (fn) {
-    if (!util.ua.webkit || 'undefined' != typeof importScripts) {
-      return fn();
-    }
-
-    util.load(function () {
-      setTimeout(fn, 100);
-    });
-  };
-
-  /**
-   * Merges two objects.
-   *
-   * @api public
-   */
-  
-  util.merge = function merge (target, additional, deep, lastseen) {
-    var seen = lastseen || []
-      , depth = typeof deep == 'undefined' ? 2 : deep
-      , prop;
-
-    for (prop in additional) {
-      if (additional.hasOwnProperty(prop) && util.indexOf(seen, prop) < 0) {
-        if (typeof target[prop] !== 'object' || !depth) {
-          target[prop] = additional[prop];
-          seen.push(additional[prop]);
-        } else {
-          util.merge(target[prop], additional[prop], depth - 1, seen);
-        }
-      }
-    }
-
-    return target;
-  };
-
-  /**
-   * Merges prototypes from objects
-   *
-   * @api public
-   */
-  
-  util.mixin = function (ctor, ctor2) {
-    util.merge(ctor.prototype, ctor2.prototype);
-  };
-
-  /**
-   * Shortcut for prototypical and static inheritance.
-   *
-   * @api private
-   */
-
-  util.inherit = function (ctor, ctor2) {
-    function f() {};
-    f.prototype = ctor2.prototype;
-    ctor.prototype = new f;
-  };
-
-  /**
-   * Checks if the given object is an Array.
-   *
-   *     io.util.isArray([]); // true
-   *     io.util.isArray({}); // false
-   *
-   * @param Object obj
-   * @api public
-   */
-
-  util.isArray = Array.isArray || function (obj) {
-    return Object.prototype.toString.call(obj) === '[object Array]';
-  };
-
-  /**
-   * Intersects values of two arrays into a third
-   *
-   * @api public
-   */
-
-  util.intersect = function (arr, arr2) {
-    var ret = []
-      , longest = arr.length > arr2.length ? arr : arr2
-      , shortest = arr.length > arr2.length ? arr2 : arr;
-
-    for (var i = 0, l = shortest.length; i < l; i++) {
-      if (~util.indexOf(longest, shortest[i]))
-        ret.push(shortest[i]);
-    }
-
-    return ret;
-  }
-
-  /**
-   * Array indexOf compatibility.
-   *
-   * @see bit.ly/a5Dxa2
-   * @api public
-   */
-
-  util.indexOf = function (arr, o, i) {
-    
-    for (var j = arr.length, i = i < 0 ? i + j < 0 ? 0 : i + j : i || 0; 
-         i < j && arr[i] !== o; i++) {}
-
-    return j <= i ? -1 : i;
-  };
-
-  /**
-   * Converts enumerables to array.
-   *
-   * @api public
-   */
-
-  util.toArray = function (enu) {
-    var arr = [];
-
-    for (var i = 0, l = enu.length; i < l; i++)
-      arr.push(enu[i]);
-
-    return arr;
-  };
-
-  /**
-   * UA / engines detection namespace.
-   *
-   * @namespace
-   */
-
-  util.ua = {};
-
-  /**
-   * Whether the UA supports CORS for XHR.
-   *
-   * @api public
-   */
-
-  util.ua.hasCORS = 'undefined' != typeof XMLHttpRequest && (function () {
-    try {
-      var a = new XMLHttpRequest();
-    } catch (e) {
-      return false;
-    }
-
-    return a.withCredentials != undefined;
-  })();
-
-  /**
-   * Detect webkit.
-   *
-   * @api public
-   */
-
-  util.ua.webkit = 'undefined' != typeof navigator
-    && /webkit/i.test(navigator.userAgent);
-
-})('undefined' != typeof io ? io : module.exports, this);
-
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, io) {
-
-  /**
-   * Expose constructor.
-   */
-
-  exports.EventEmitter = EventEmitter;
-
-  /**
-   * Event emitter constructor.
-   *
-   * @api public.
-   */
-
-  function EventEmitter () {};
-
-  /**
-   * Adds a listener
-   *
-   * @api public
-   */
-
-  EventEmitter.prototype.on = function (name, fn) {
-    if (!this.$events) {
-      this.$events = {};
-    }
-
-    if (!this.$events[name]) {
-      this.$events[name] = fn;
-    } else if (io.util.isArray(this.$events[name])) {
-      this.$events[name].push(fn);
-    } else {
-      this.$events[name] = [this.$events[name], fn];
-    }
-
-    return this;
-  };
-
-  EventEmitter.prototype.addListener = EventEmitter.prototype.on;
-
-  /**
-   * Adds a volatile listener.
-   *
-   * @api public
-   */
-
-  EventEmitter.prototype.once = function (name, fn) {
-    var self = this;
-
-    function on () {
-      self.removeListener(name, on);
-      fn.apply(this, arguments);
-    };
-
-    on.listener = fn;
-    this.on(name, on);
-
-    return this;
-  };
-
-  /**
-   * Removes a listener.
-   *
-   * @api public
-   */
-
-  EventEmitter.prototype.removeListener = function (name, fn) {
-    if (this.$events && this.$events[name]) {
-      var list = this.$events[name];
-
-      if (io.util.isArray(list)) {
-        var pos = -1;
-
-        for (var i = 0, l = list.length; i < l; i++) {
-          if (list[i] === fn || (list[i].listener && list[i].listener === fn)) {
-            pos = i;
-            break;
-          }
-        }
-
-        if (pos < 0) {
-          return this;
-        }
-
-        list.splice(pos, 1);
-
-        if (!list.length) {
-          delete this.$events[name];
-        }
-      } else if (list === fn || (list.listener && list.listener === fn)) {
-        delete this.$events[name];
-      }
-    }
-
-    return this;
-  };
-
-  /**
-   * Removes all listeners for an event.
-   *
-   * @api public
-   */
-
-  EventEmitter.prototype.removeAllListeners = function (name) {
-    // TODO: enable this when node 0.5 is stable
-    //if (name === undefined) {
-      //this.$events = {};
-      //return this;
-    //}
-
-    if (this.$events && this.$events[name]) {
-      this.$events[name] = null;
-    }
-
-    return this;
-  };
-
-  /**
-   * Gets all listeners for a certain event.
-   *
-   * @api publci
-   */
-
-  EventEmitter.prototype.listeners = function (name) {
-    if (!this.$events) {
-      this.$events = {};
-    }
-
-    if (!this.$events[name]) {
-      this.$events[name] = [];
-    }
-
-    if (!io.util.isArray(this.$events[name])) {
-      this.$events[name] = [this.$events[name]];
-    }
-
-    return this.$events[name];
-  };
-
-  /**
-   * Emits an event.
-   *
-   * @api public
-   */
-
-  EventEmitter.prototype.emit = function (name) {
-    if (!this.$events) {
-      return false;
-    }
-
-    var handler = this.$events[name];
-
-    if (!handler) {
-      return false;
-    }
-
-    var args = Array.prototype.slice.call(arguments, 1);
-
-    if ('function' == typeof handler) {
-      handler.apply(this, args);
-    } else if (io.util.isArray(handler)) {
-      var listeners = handler.slice();
-
-      for (var i = 0, l = listeners.length; i < l; i++) {
-        listeners[i].apply(this, args);
-      }
-    } else {
-      return false;
-    }
-
-    return true;
-  };
-
-})(
-    'undefined' != typeof io ? io : module.exports
-  , 'undefined' != typeof io ? io : module.parent.exports
-);
-
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-/**
- * Based on JSON2 (http://www.JSON.org/js.html).
- */
-
-(function (exports, nativeJSON) {
-  "use strict";
-
-  // use native JSON if it's available
-  if (nativeJSON && nativeJSON.parse){
-    return exports.JSON = {
-      parse: nativeJSON.parse
-    , stringify: nativeJSON.stringify
-    }
-  }
-
-  var JSON = exports.JSON = {};
-
-  function f(n) {
-      // Format integers to have at least two digits.
-      return n < 10 ? '0' + n : n;
-  }
-
-  function date(d, key) {
-    return isFinite(d.valueOf()) ?
-        d.getUTCFullYear()     + '-' +
-        f(d.getUTCMonth() + 1) + '-' +
-        f(d.getUTCDate())      + 'T' +
-        f(d.getUTCHours())     + ':' +
-        f(d.getUTCMinutes())   + ':' +
-        f(d.getUTCSeconds())   + 'Z' : null;
-  };
-
-  var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-      escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-      gap,
-      indent,
-      meta = {    // table of character substitutions
-          '\b': '\\b',
-          '\t': '\\t',
-          '\n': '\\n',
-          '\f': '\\f',
-          '\r': '\\r',
-          '"' : '\\"',
-          '\\': '\\\\'
-      },
-      rep;
-
-
-  function quote(string) {
-
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can safely slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe escape
-// sequences.
-
-      escapable.lastIndex = 0;
-      return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
-          var c = meta[a];
-          return typeof c === 'string' ? c :
-              '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-      }) + '"' : '"' + string + '"';
-  }
-
-
-  function str(key, holder) {
-
-// Produce a string from holder[key].
-
-      var i,          // The loop counter.
-          k,          // The member key.
-          v,          // The member value.
-          length,
-          mind = gap,
-          partial,
-          value = holder[key];
-
-// If the value has a toJSON method, call it to obtain a replacement value.
-
-      if (value instanceof Date) {
-          value = date(key);
-      }
-
-// If we were called with a replacer function, then call the replacer to
-// obtain a replacement value.
-
-      if (typeof rep === 'function') {
-          value = rep.call(holder, key, value);
-      }
-
-// What happens next depends on the value's type.
-
-      switch (typeof value) {
-      case 'string':
-          return quote(value);
-
-      case 'number':
-
-// JSON numbers must be finite. Encode non-finite numbers as null.
-
-          return isFinite(value) ? String(value) : 'null';
-
-      case 'boolean':
-      case 'null':
-
-// If the value is a boolean or null, convert it to a string. Note:
-// typeof null does not produce 'null'. The case is included here in
-// the remote chance that this gets fixed someday.
-
-          return String(value);
-
-// If the type is 'object', we might be dealing with an object or an array or
-// null.
-
-      case 'object':
-
-// Due to a specification blunder in ECMAScript, typeof null is 'object',
-// so watch out for that case.
-
-          if (!value) {
-              return 'null';
-          }
-
-// Make an array to hold the partial results of stringifying this object value.
-
-          gap += indent;
-          partial = [];
-
-// Is the value an array?
-
-          if (Object.prototype.toString.apply(value) === '[object Array]') {
-
-// The value is an array. Stringify every element. Use null as a placeholder
-// for non-JSON values.
-
-              length = value.length;
-              for (i = 0; i < length; i += 1) {
-                  partial[i] = str(i, value) || 'null';
-              }
-
-// Join all of the elements together, separated with commas, and wrap them in
-// brackets.
-
-              v = partial.length === 0 ? '[]' : gap ?
-                  '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' :
-                  '[' + partial.join(',') + ']';
-              gap = mind;
-              return v;
-          }
-
-// If the replacer is an array, use it to select the members to be stringified.
-
-          if (rep && typeof rep === 'object') {
-              length = rep.length;
-              for (i = 0; i < length; i += 1) {
-                  if (typeof rep[i] === 'string') {
-                      k = rep[i];
-                      v = str(k, value);
-                      if (v) {
-                          partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                      }
-                  }
-              }
-          } else {
-
-// Otherwise, iterate through all of the keys in the object.
-
-              for (k in value) {
-                  if (Object.prototype.hasOwnProperty.call(value, k)) {
-                      v = str(k, value);
-                      if (v) {
-                          partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                      }
-                  }
-              }
-          }
-
-// Join all of the member texts together, separated with commas,
-// and wrap them in braces.
-
-          v = partial.length === 0 ? '{}' : gap ?
-              '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' :
-              '{' + partial.join(',') + '}';
-          gap = mind;
-          return v;
-      }
-  }
-
-// If the JSON object does not yet have a stringify method, give it one.
-
-  JSON.stringify = function (value, replacer, space) {
-
-// The stringify method takes a value and an optional replacer, and an optional
-// space parameter, and returns a JSON text. The replacer can be a function
-// that can replace values, or an array of strings that will select the keys.
-// A default replacer method can be provided. Use of the space parameter can
-// produce text that is more easily readable.
-
-      var i;
-      gap = '';
-      indent = '';
-
-// If the space parameter is a number, make an indent string containing that
-// many spaces.
-
-      if (typeof space === 'number') {
-          for (i = 0; i < space; i += 1) {
-              indent += ' ';
-          }
-
-// If the space parameter is a string, it will be used as the indent string.
-
-      } else if (typeof space === 'string') {
-          indent = space;
-      }
-
-// If there is a replacer, it must be a function or an array.
-// Otherwise, throw an error.
-
-      rep = replacer;
-      if (replacer && typeof replacer !== 'function' &&
-              (typeof replacer !== 'object' ||
-              typeof replacer.length !== 'number')) {
-          throw new Error('JSON.stringify');
-      }
-
-// Make a fake root object containing our value under the key of ''.
-// Return the result of stringifying the value.
-
-      return str('', {'': value});
-  };
-
-// If the JSON object does not yet have a parse method, give it one.
-
-  JSON.parse = function (text, reviver) {
-  // The parse method takes a text and an optional reviver function, and returns
-  // a JavaScript value if the text is a valid JSON text.
-
-      var j;
-
-      function walk(holder, key) {
-
-  // The walk method is used to recursively walk the resulting structure so
-  // that modifications can be made.
-
-          var k, v, value = holder[key];
-          if (value && typeof value === 'object') {
-              for (k in value) {
-                  if (Object.prototype.hasOwnProperty.call(value, k)) {
-                      v = walk(value, k);
-                      if (v !== undefined) {
-                          value[k] = v;
-                      } else {
-                          delete value[k];
-                      }
-                  }
-              }
-          }
-          return reviver.call(holder, key, value);
-      }
-
-
-  // Parsing happens in four stages. In the first stage, we replace certain
-  // Unicode characters with escape sequences. JavaScript handles many characters
-  // incorrectly, either silently deleting them, or treating them as line endings.
-
-      text = String(text);
-      cx.lastIndex = 0;
-      if (cx.test(text)) {
-          text = text.replace(cx, function (a) {
-              return '\\u' +
-                  ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-          });
-      }
-
-  // In the second stage, we run the text against regular expressions that look
-  // for non-JSON patterns. We are especially concerned with '()' and 'new'
-  // because they can cause invocation, and '=' because it can cause mutation.
-  // But just to be safe, we want to reject all unexpected forms.
-
-  // We split the second stage into 4 regexp operations in order to work around
-  // crippling inefficiencies in IE's and Safari's regexp engines. First we
-  // replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
-  // replace all simple value tokens with ']' characters. Third, we delete all
-  // open brackets that follow a colon or comma or that begin the text. Finally,
-  // we look to see that the remaining characters are only whitespace or ']' or
-  // ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
-
-      if (/^[\],:{}\s]*$/
-              .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
-                  .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
-                  .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-  // In the third stage we use the eval function to compile the text into a
-  // JavaScript structure. The '{' operator is subject to a syntactic ambiguity
-  // in JavaScript: it can begin a block or an object literal. We wrap the text
-  // in parens to eliminate the ambiguity.
-
-          j = eval('(' + text + ')');
-
-  // In the optional fourth stage, we recursively walk the new structure, passing
-  // each name/value pair to a reviver function for possible transformation.
-
-          return typeof reviver === 'function' ?
-              walk({'': j}, '') : j;
-      }
-
-  // If the text is not JSON parseable, then a SyntaxError is thrown.
-
-      throw new SyntaxError('JSON.parse');
-  };
-
-})(
-    'undefined' != typeof io ? io : module.exports
-  , typeof JSON !== 'undefined' ? JSON : undefined
-);
-
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, io) {
-
-  /**
-   * Parser namespace.
-   *
-   * @namespace
-   */
-
-  var parser = exports.parser = {};
-
-  /**
-   * Packet types.
-   */
-
-  var packets = parser.packets = [
-      'disconnect'
-    , 'connect'
-    , 'heartbeat'
-    , 'message'
-    , 'json'
-    , 'event'
-    , 'ack'
-    , 'error'
-    , 'noop'
-  ];
-
-  /**
-   * Errors reasons.
-   */
-
-  var reasons = parser.reasons = [
-      'transport not supported'
-    , 'client not handshaken'
-    , 'unauthorized'
-  ];
-
-  /**
-   * Errors advice.
-   */
-
-  var advice = parser.advice = [
-      'reconnect'
-  ];
-
-  /**
-   * Shortcuts.
-   */
-
-  var JSON = io.JSON
-    , indexOf = io.util.indexOf;
-
-  /**
-   * Encodes a packet.
-   *
-   * @api private
-   */
-
-  parser.encodePacket = function (packet) {
-    var type = indexOf(packets, packet.type)
-      , id = packet.id || ''
-      , endpoint = packet.endpoint || ''
-      , ack = packet.ack
-      , data = null;
-
-    switch (packet.type) {
-      case 'error':
-        var reason = packet.reason ? indexOf(reasons, packet.reason) : ''
-          , adv = packet.advice ? indexOf(advice, packet.advice) : '';
-
-        if (reason !== '' || adv !== '')
-          data = reason + (adv !== '' ? ('+' + adv) : '');
-
-        break;
-
-      case 'message':
-        if (packet.data !== '')
-          data = packet.data;
-        break;
-
-      case 'event':
-        var ev = { name: packet.name };
-
-        if (packet.args && packet.args.length) {
-          ev.args = packet.args;
-        }
-
-        data = JSON.stringify(ev);
-        break;
-
-      case 'json':
-        data = JSON.stringify(packet.data);
-        break;
-
-      case 'connect':
-        if (packet.qs)
-          data = packet.qs;
-        break;
-
-      case 'ack':
-        data = packet.ackId
-          + (packet.args && packet.args.length
-              ? '+' + JSON.stringify(packet.args) : '');
-        break;
-    }
-
-    // construct packet with required fragments
-    var encoded = [
-        type
-      , id + (ack == 'data' ? '+' : '')
-      , endpoint
-    ];
-
-    // data fragment is optional
-    if (data !== null && data !== undefined)
-      encoded.push(data);
-
-    return encoded.join(':');
-  };
-
-  /**
-   * Encodes multiple messages (payload).
-   *
-   * @param {Array} messages
-   * @api private
-   */
-
-  parser.encodePayload = function (packets) {
-    var decoded = '';
-
-    if (packets.length == 1)
-      return packets[0];
-
-    for (var i = 0, l = packets.length; i < l; i++) {
-      var packet = packets[i];
-      decoded += '\ufffd' + packet.length + '\ufffd' + packets[i];
-    }
-
-    return decoded;
-  };
-
-  /**
-   * Decodes a packet
-   *
-   * @api private
-   */
-
-  var regexp = /([^:]+):([0-9]+)?(\+)?:([^:]+)?:?([\s\S]*)?/;
-
-  parser.decodePacket = function (data) {
-    var pieces = data.match(regexp);
-
-    if (!pieces) return {};
-
-    var id = pieces[2] || ''
-      , data = pieces[5] || ''
-      , packet = {
-            type: packets[pieces[1]]
-          , endpoint: pieces[4] || ''
-        };
-
-    // whether we need to acknowledge the packet
-    if (id) {
-      packet.id = id;
-      if (pieces[3])
-        packet.ack = 'data';
-      else
-        packet.ack = true;
-    }
-
-    // handle different packet types
-    switch (packet.type) {
-      case 'error':
-        var pieces = data.split('+');
-        packet.reason = reasons[pieces[0]] || '';
-        packet.advice = advice[pieces[1]] || '';
-        break;
-
-      case 'message':
-        packet.data = data || '';
-        break;
-
-      case 'event':
-        try {
-          var opts = JSON.parse(data);
-          packet.name = opts.name;
-          packet.args = opts.args;
-        } catch (e) { }
-
-        packet.args = packet.args || [];
-        break;
-
-      case 'json':
-        try {
-          packet.data = JSON.parse(data);
-        } catch (e) { }
-        break;
-
-      case 'connect':
-        packet.qs = data || '';
-        break;
-
-      case 'ack':
-        var pieces = data.match(/^([0-9]+)(\+)?(.*)/);
-        if (pieces) {
-          packet.ackId = pieces[1];
-          packet.args = [];
-
-          if (pieces[3]) {
-            try {
-              packet.args = pieces[3] ? JSON.parse(pieces[3]) : [];
-            } catch (e) { }
-          }
-        }
-        break;
-
-      case 'disconnect':
-      case 'heartbeat':
-        break;
-    };
-
-    return packet;
-  };
-
-  /**
-   * Decodes data payload. Detects multiple messages
-   *
-   * @return {Array} messages
-   * @api public
-   */
-
-  parser.decodePayload = function (data) {
-    // IE doesn't like data[i] for unicode chars, charAt works fine
-    if (data.charAt(0) == '\ufffd') {
-      var ret = [];
-
-      for (var i = 1, length = ''; i < data.length; i++) {
-        if (data.charAt(i) == '\ufffd') {
-          ret.push(parser.decodePacket(data.substr(i + 1).substr(0, length)));
-          i += Number(length) + 1;
-          length = '';
-        } else {
-          length += data.charAt(i);
-        }
-      }
-
-      return ret;
-    } else {
-      return [parser.decodePacket(data)];
-    }
-  };
-
-})(
-    'undefined' != typeof io ? io : module.exports
-  , 'undefined' != typeof io ? io : module.parent.exports
-);
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, io) {
-
-  /**
-   * Expose constructor.
-   */
-
-  exports.Transport = Transport;
-
-  /**
-   * This is the transport template for all supported transport methods.
-   *
-   * @constructor
-   * @api public
-   */
-
-  function Transport (socket, sessid) {
-    this.socket = socket;
-    this.sessid = sessid;
-  };
-
-  /**
-   * Apply EventEmitter mixin.
-   */
-
-  io.util.mixin(Transport, io.EventEmitter);
-
-  /**
-   * Handles the response from the server. When a new response is received
-   * it will automatically update the timeout, decode the message and
-   * forwards the response to the onMessage function for further processing.
-   *
-   * @param {String} data Response from the server.
-   * @api private
-   */
-
-  Transport.prototype.onData = function (data) {
-    this.clearCloseTimeout();
-    
-    // If the connection in currently open (or in a reopening state) reset the close 
-    // timeout since we have just received data. This check is necessary so
-    // that we don't reset the timeout on an explicitly disconnected connection.
-    if (this.socket.connected || this.socket.connecting || this.socket.reconnecting) {
-      this.setCloseTimeout();
-    }
-
-    if (data !== '') {
-      // todo: we should only do decodePayload for xhr transports
-      var msgs = io.parser.decodePayload(data);
-
-      if (msgs && msgs.length) {
-        for (var i = 0, l = msgs.length; i < l; i++) {
-          this.onPacket(msgs[i]);
-        }
-      }
-    }
-
-    return this;
-  };
-
-  /**
-   * Handles packets.
-   *
-   * @api private
-   */
-
-  Transport.prototype.onPacket = function (packet) {
-    this.socket.setHeartbeatTimeout();
-
-    if (packet.type == 'heartbeat') {
-      return this.onHeartbeat();
-    }
-
-    if (packet.type == 'connect' && packet.endpoint == '') {
-      this.onConnect();
-    }
-
-    if (packet.type == 'error' && packet.advice == 'reconnect') {
-      this.open = false;
-    }
-
-    this.socket.onPacket(packet);
-
-    return this;
-  };
-
-  /**
-   * Sets close timeout
-   *
-   * @api private
-   */
-  
-  Transport.prototype.setCloseTimeout = function () {
-    if (!this.closeTimeout) {
-      var self = this;
-
-      this.closeTimeout = setTimeout(function () {
-        self.onDisconnect();
-      }, this.socket.closeTimeout);
-    }
-  };
-
-  /**
-   * Called when transport disconnects.
-   *
-   * @api private
-   */
-
-  Transport.prototype.onDisconnect = function () {
-    if (this.close && this.open) this.close();
-    this.clearTimeouts();
-    this.socket.onDisconnect();
-    return this;
-  };
-
-  /**
-   * Called when transport connects
-   *
-   * @api private
-   */
-
-  Transport.prototype.onConnect = function () {
-    this.socket.onConnect();
-    return this;
-  }
-
-  /**
-   * Clears close timeout
-   *
-   * @api private
-   */
-
-  Transport.prototype.clearCloseTimeout = function () {
-    if (this.closeTimeout) {
-      clearTimeout(this.closeTimeout);
-      this.closeTimeout = null;
-    }
-  };
-
-  /**
-   * Clear timeouts
-   *
-   * @api private
-   */
-
-  Transport.prototype.clearTimeouts = function () {
-    this.clearCloseTimeout();
-
-    if (this.reopenTimeout) {
-      clearTimeout(this.reopenTimeout);
-    }
-  };
-
-  /**
-   * Sends a packet
-   *
-   * @param {Object} packet object.
-   * @api private
-   */
-
-  Transport.prototype.packet = function (packet) {
-    this.send(io.parser.encodePacket(packet));
-  };
-
-  /**
-   * Send the received heartbeat message back to server. So the server
-   * knows we are still connected.
-   *
-   * @param {String} heartbeat Heartbeat response from the server.
-   * @api private
-   */
-
-  Transport.prototype.onHeartbeat = function (heartbeat) {
-    this.packet({ type: 'heartbeat' });
-  };
- 
-  /**
-   * Called when the transport opens.
-   *
-   * @api private
-   */
-
-  Transport.prototype.onOpen = function () {
-    this.open = true;
-    this.clearCloseTimeout();
-    this.socket.onOpen();
-  };
-
-  /**
-   * Notifies the base when the connection with the Socket.IO server
-   * has been disconnected.
-   *
-   * @api private
-   */
-
-  Transport.prototype.onClose = function () {
-    var self = this;
-
-    /* FIXME: reopen delay causing a infinit loop
-    this.reopenTimeout = setTimeout(function () {
-      self.open();
-    }, this.socket.options['reopen delay']);*/
-
-    this.open = false;
-    this.socket.onClose();
-    this.onDisconnect();
-  };
-
-  /**
-   * Generates a connection url based on the Socket.IO URL Protocol.
-   * See <https://github.com/learnboost/socket.io-node/> for more details.
-   *
-   * @returns {String} Connection url
-   * @api private
-   */
-
-  Transport.prototype.prepareUrl = function () {
-    var options = this.socket.options;
-
-    return this.scheme() + '://'
-      + options.host + ':' + options.port + '/'
-      + options.resource + '/' + io.protocol
-      + '/' + this.name + '/' + this.sessid;
-  };
-
-  /**
-   * Checks if the transport is ready to start a connection.
-   *
-   * @param {Socket} socket The socket instance that needs a transport
-   * @param {Function} fn The callback
-   * @api private
-   */
-
-  Transport.prototype.ready = function (socket, fn) {
-    fn.call(this);
-  };
-})(
-    'undefined' != typeof io ? io : module.exports
-  , 'undefined' != typeof io ? io : module.parent.exports
-);
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, io, global) {
-
-  /**
-   * Expose constructor.
-   */
-
-  exports.Socket = Socket;
-
-  /**
-   * Create a new `Socket.IO client` which can establish a persistent
-   * connection with a Socket.IO enabled server.
-   *
-   * @api public
-   */
-
-  function Socket (options) {
-    this.options = {
-        port: 80
-      , secure: false
-      , document: 'document' in global ? document : false
-      , resource: 'socket.io'
-      , transports: io.transports
-      , 'connect timeout': 10000
-      , 'try multiple transports': true
-      , 'reconnect': true
-      , 'reconnection delay': 500
-      , 'reconnection limit': Infinity
-      , 'reopen delay': 3000
-      , 'max reconnection attempts': 10
-      , 'sync disconnect on unload': true
-      , 'auto connect': true
-      , 'flash policy port': 10843
-    };
-
-    io.util.merge(this.options, options);
-
-    this.connected = false;
-    this.open = false;
-    this.connecting = false;
-    this.reconnecting = false;
-    this.namespaces = {};
-    this.buffer = [];
-    this.doBuffer = false;
-
-    if (this.options['sync disconnect on unload'] &&
-        (!this.isXDomain() || io.util.ua.hasCORS)) {
-      var self = this;
-
-      io.util.on(global, 'unload', function () {
-        self.disconnectSync();
-      }, false);
-    }
-
-    if (this.options['auto connect']) {
-      this.connect();
-    }
-};
-
-  /**
-   * Apply EventEmitter mixin.
-   */
-
-  io.util.mixin(Socket, io.EventEmitter);
-
-  /**
-   * Returns a namespace listener/emitter for this socket
-   *
-   * @api public
-   */
-
-  Socket.prototype.of = function (name) {
-    if (!this.namespaces[name]) {
-      this.namespaces[name] = new io.SocketNamespace(this, name);
-
-      if (name !== '') {
-        this.namespaces[name].packet({ type: 'connect' });
-      }
-    }
-
-    return this.namespaces[name];
-  };
-
-  /**
-   * Emits the given event to the Socket and all namespaces
-   *
-   * @api private
-   */
-
-  Socket.prototype.publish = function () {
-    this.emit.apply(this, arguments);
-
-    var nsp;
-
-    for (var i in this.namespaces) {
-      if (this.namespaces.hasOwnProperty(i)) {
-        nsp = this.of(i);
-        nsp.$emit.apply(nsp, arguments);
-      }
-    }
-  };
-
-  /**
-   * Performs the handshake
-   *
-   * @api private
-   */
-
-  function empty () { };
-
-  Socket.prototype.handshake = function (fn) {
-    var self = this
-      , options = this.options;
-
-    function complete (data) {
-      if (data instanceof Error) {
-        self.onError(data.message);
-      } else {
-        fn.apply(null, data.split(':'));
-      }
-    };
-
-    var url = [
-          'http' + (options.secure ? 's' : '') + ':/'
-        , options.host + ':' + options.port
-        , options.resource
-        , io.protocol
-        , io.util.query(this.options.query, 't=' + +new Date)
-      ].join('/');
-
-    if (this.isXDomain() && !io.util.ua.hasCORS) {
-      var insertAt = document.getElementsByTagName('script')[0]
-        , script = document.createElement('script');
-
-      script.src = url + '&jsonp=' + io.j.length;
-      insertAt.parentNode.insertBefore(script, insertAt);
-
-      io.j.push(function (data) {
-        complete(data);
-        script.parentNode.removeChild(script);
-      });
-    } else {
-      var xhr = io.util.request();
-
-      xhr.open('GET', url, true);
-      xhr.withCredentials = true;
-      xhr.onreadystatechange = function () {
-        if (xhr.readyState == 4) {
-          xhr.onreadystatechange = empty;
-
-          if (xhr.status == 200) {
-            complete(xhr.responseText);
-          } else {
-            !self.reconnecting && self.onError(xhr.responseText);
-          }
-        }
-      };
-      xhr.send(null);
-    }
-  };
-
-  /**
-   * Find an available transport based on the options supplied in the constructor.
-   *
-   * @api private
-   */
-
-  Socket.prototype.getTransport = function (override) {
-    var transports = override || this.transports, match;
-
-    for (var i = 0, transport; transport = transports[i]; i++) {
-      if (io.Transport[transport]
-        && io.Transport[transport].check(this)
-        && (!this.isXDomain() || io.Transport[transport].xdomainCheck())) {
-        return new io.Transport[transport](this, this.sessionid);
-      }
-    }
-
-    return null;
-  };
-
-  /**
-   * Connects to the server.
-   *
-   * @param {Function} [fn] Callback.
-   * @returns {io.Socket}
-   * @api public
-   */
-
-  Socket.prototype.connect = function (fn) {
-    if (this.connecting) {
-      return this;
-    }
-
-    var self = this;
-
-    this.handshake(function (sid, heartbeat, close, transports) {
-      self.sessionid = sid;
-      self.closeTimeout = close * 1000;
-      self.heartbeatTimeout = heartbeat * 1000;
-      self.transports = transports ? io.util.intersect(
-          transports.split(',')
-        , self.options.transports
-      ) : self.options.transports;
-
-      self.setHeartbeatTimeout();
-
-      function connect (transports){
-        if (self.transport) self.transport.clearTimeouts();
-
-        self.transport = self.getTransport(transports);
-        if (!self.transport) return self.publish('connect_failed');
-
-        // once the transport is ready
-        self.transport.ready(self, function () {
-          self.connecting = true;
-          self.publish('connecting', self.transport.name);
-          self.transport.open();
-
-          if (self.options['connect timeout']) {
-            self.connectTimeoutTimer = setTimeout(function () {
-              if (!self.connected) {
-                self.connecting = false;
-
-                if (self.options['try multiple transports']) {
-                  if (!self.remainingTransports) {
-                    self.remainingTransports = self.transports.slice(0);
-                  }
-
-                  var remaining = self.remainingTransports;
-
-                  while (remaining.length > 0 && remaining.splice(0,1)[0] !=
-                         self.transport.name) {}
-
-                    if (remaining.length){
-                      connect(remaining);
-                    } else {
-                      self.publish('connect_failed');
-                    }
-                }
-              }
-            }, self.options['connect timeout']);
-          }
-        });
-      }
-
-      connect(self.transports);
-
-      self.once('connect', function (){
-        clearTimeout(self.connectTimeoutTimer);
-
-        fn && typeof fn == 'function' && fn();
-      });
-    });
-
-    return this;
-  };
-
-  /**
-   * Clears and sets a new heartbeat timeout using the value given by the
-   * server during the handshake.
-   *
-   * @api private
-   */
-
-  Socket.prototype.setHeartbeatTimeout = function () {
-    clearTimeout(this.heartbeatTimeoutTimer);
-
-    var self = this;
-    this.heartbeatTimeoutTimer = setTimeout(function () {
-      self.transport.onClose();
-    }, this.heartbeatTimeout);
-  };
-
-  /**
-   * Sends a message.
-   *
-   * @param {Object} data packet.
-   * @returns {io.Socket}
-   * @api public
-   */
-
-  Socket.prototype.packet = function (data) {
-    if (this.connected && !this.doBuffer) {
-      this.transport.packet(data);
-    } else {
-      this.buffer.push(data);
-    }
-
-    return this;
-  };
-
-  /**
-   * Sets buffer state
-   *
-   * @api private
-   */
-
-  Socket.prototype.setBuffer = function (v) {
-    this.doBuffer = v;
-
-    if (!v && this.connected && this.buffer.length) {
-      this.transport.payload(this.buffer);
-      this.buffer = [];
-    }
-  };
-
-  /**
-   * Disconnect the established connect.
-   *
-   * @returns {io.Socket}
-   * @api public
-   */
-
-  Socket.prototype.disconnect = function () {
-    if (this.connected || this.connecting) {
-      if (this.open) {
-        this.of('').packet({ type: 'disconnect' });
-      }
-
-      // handle disconnection immediately
-      this.onDisconnect('booted');
-    }
-
-    return this;
-  };
-
-  /**
-   * Disconnects the socket with a sync XHR.
-   *
-   * @api private
-   */
-
-  Socket.prototype.disconnectSync = function () {
-    // ensure disconnection
-    var xhr = io.util.request()
-      , uri = this.resource + '/' + io.protocol + '/' + this.sessionid;
-
-    xhr.open('GET', uri, true);
-
-    // handle disconnection immediately
-    this.onDisconnect('booted');
-  };
-
-  /**
-   * Check if we need to use cross domain enabled transports. Cross domain would
-   * be a different port or different domain name.
-   *
-   * @returns {Boolean}
-   * @api private
-   */
-
-  Socket.prototype.isXDomain = function () {
-
-    var port = global.location.port ||
-      ('https:' == global.location.protocol ? 443 : 80);
-
-    return this.options.host !== global.location.hostname 
-      || this.options.port != port;
-  };
-
-  /**
-   * Called upon handshake.
-   *
-   * @api private
-   */
-
-  Socket.prototype.onConnect = function () {
-    if (!this.connected) {
-      this.connected = true;
-      this.connecting = false;
-      if (!this.doBuffer) {
-        // make sure to flush the buffer
-        this.setBuffer(false);
-      }
-      this.emit('connect');
-    }
-  };
-
-  /**
-   * Called when the transport opens
-   *
-   * @api private
-   */
-
-  Socket.prototype.onOpen = function () {
-    this.open = true;
-  };
-
-  /**
-   * Called when the transport closes.
-   *
-   * @api private
-   */
-
-  Socket.prototype.onClose = function () {
-    this.open = false;
-    clearTimeout(this.heartbeatTimeoutTimer);
-  };
-
-  /**
-   * Called when the transport first opens a connection
-   *
-   * @param text
-   */
-
-  Socket.prototype.onPacket = function (packet) {
-    this.of(packet.endpoint).onPacket(packet);
-  };
-
-  /**
-   * Handles an error.
-   *
-   * @api private
-   */
-
-  Socket.prototype.onError = function (err) {
-    if (err && err.advice) {
-      if (err.advice === 'reconnect' && (this.connected || this.connecting)) {
-        this.disconnect();
-        if (this.options.reconnect) {
-          this.reconnect();
-        }
-      }
-    }
-
-    this.publish('error', err && err.reason ? err.reason : err);
-  };
-
-  /**
-   * Called when the transport disconnects.
-   *
-   * @api private
-   */
-
-  Socket.prototype.onDisconnect = function (reason) {
-    var wasConnected = this.connected
-      , wasConnecting = this.connecting;
-
-    this.connected = false;
-    this.connecting = false;
-    this.open = false;
-
-    if (wasConnected || wasConnecting) {
-      this.transport.close();
-      this.transport.clearTimeouts();
-      if (wasConnected) {
-        this.publish('disconnect', reason);
-
-        if ('booted' != reason && this.options.reconnect && !this.reconnecting) {
-          this.reconnect();
-        }
-      }
-    }
-  };
-
-  /**
-   * Called upon reconnection.
-   *
-   * @api private
-   */
-
-  Socket.prototype.reconnect = function () {
-    this.reconnecting = true;
-    this.reconnectionAttempts = 0;
-    this.reconnectionDelay = this.options['reconnection delay'];
-
-    var self = this
-      , maxAttempts = this.options['max reconnection attempts']
-      , tryMultiple = this.options['try multiple transports']
-      , limit = this.options['reconnection limit'];
-
-    function reset () {
-      if (self.connected) {
-        for (var i in self.namespaces) {
-          if (self.namespaces.hasOwnProperty(i) && '' !== i) {
-              self.namespaces[i].packet({ type: 'connect' });
-          }
-        }
-        self.publish('reconnect', self.transport.name, self.reconnectionAttempts);
-      }
-
-      clearTimeout(self.reconnectionTimer);
-
-      self.removeListener('connect_failed', maybeReconnect);
-      self.removeListener('connect', maybeReconnect);
-
-      self.reconnecting = false;
-
-      delete self.reconnectionAttempts;
-      delete self.reconnectionDelay;
-      delete self.reconnectionTimer;
-      delete self.redoTransports;
-
-      self.options['try multiple transports'] = tryMultiple;
-    };
-
-    function maybeReconnect () {
-      if (!self.reconnecting) {
-        return;
-      }
-
-      if (self.connected) {
-        return reset();
-      };
-
-      if (self.connecting && self.reconnecting) {
-        return self.reconnectionTimer = setTimeout(maybeReconnect, 1000);
-      }
-
-      if (self.reconnectionAttempts++ >= maxAttempts) {
-        if (!self.redoTransports) {
-          self.on('connect_failed', maybeReconnect);
-          self.options['try multiple transports'] = true;
-          self.transport = self.getTransport();
-          self.redoTransports = true;
-          self.connect();
-        } else {
-          self.publish('reconnect_failed');
-          reset();
-        }
-      } else {
-        if (self.reconnectionDelay < limit) {
-          self.reconnectionDelay *= 2; // exponential back off
-        }
-
-        self.connect();
-        self.publish('reconnecting', self.reconnectionDelay, self.reconnectionAttempts);
-        self.reconnectionTimer = setTimeout(maybeReconnect, self.reconnectionDelay);
-      }
-    };
-
-    this.options['try multiple transports'] = false;
-    this.reconnectionTimer = setTimeout(maybeReconnect, this.reconnectionDelay);
-
-    this.on('connect', maybeReconnect);
-  };
-
-})(
-    'undefined' != typeof io ? io : module.exports
-  , 'undefined' != typeof io ? io : module.parent.exports
-  , this
-);
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, io) {
-
-  /**
-   * Expose constructor.
-   */
-
-  exports.SocketNamespace = SocketNamespace;
-
-  /**
-   * Socket namespace constructor.
-   *
-   * @constructor
-   * @api public
-   */
-
-  function SocketNamespace (socket, name) {
-    this.socket = socket;
-    this.name = name || '';
-    this.flags = {};
-    this.json = new Flag(this, 'json');
-    this.ackPackets = 0;
-    this.acks = {};
-  };
-
-  /**
-   * Apply EventEmitter mixin.
-   */
-
-  io.util.mixin(SocketNamespace, io.EventEmitter);
-
-  /**
-   * Copies emit since we override it
-   *
-   * @api private
-   */
-
-  SocketNamespace.prototype.$emit = io.EventEmitter.prototype.emit;
-
-  /**
-   * Creates a new namespace, by proxying the request to the socket. This
-   * allows us to use the synax as we do on the server.
-   *
-   * @api public
-   */
-
-  SocketNamespace.prototype.of = function () {
-    return this.socket.of.apply(this.socket, arguments);
-  };
-
-  /**
-   * Sends a packet.
-   *
-   * @api private
-   */
-
-  SocketNamespace.prototype.packet = function (packet) {
-    packet.endpoint = this.name;
-    this.socket.packet(packet);
-    this.flags = {};
-    return this;
-  };
-
-  /**
-   * Sends a message
-   *
-   * @api public
-   */
-
-  SocketNamespace.prototype.send = function (data, fn) {
-    var packet = {
-        type: this.flags.json ? 'json' : 'message'
-      , data: data
-    };
-
-    if ('function' == typeof fn) {
-      packet.id = ++this.ackPackets;
-      packet.ack = true;
-      this.acks[packet.id] = fn;
-    }
-
-    return this.packet(packet);
-  };
-
-  /**
-   * Emits an event
-   *
-   * @api public
-   */
-  
-  SocketNamespace.prototype.emit = function (name) {
-    var args = Array.prototype.slice.call(arguments, 1)
-      , lastArg = args[args.length - 1]
-      , packet = {
-            type: 'event'
-          , name: name
-        };
-
-    if ('function' == typeof lastArg) {
-      packet.id = ++this.ackPackets;
-      packet.ack = 'data';
-      this.acks[packet.id] = lastArg;
-      args = args.slice(0, args.length - 1);
-    }
-
-    packet.args = args;
-
-    return this.packet(packet);
-  };
-
-  /**
-   * Disconnects the namespace
-   *
-   * @api private
-   */
-
-  SocketNamespace.prototype.disconnect = function () {
-    if (this.name === '') {
-      this.socket.disconnect();
-    } else {
-      this.packet({ type: 'disconnect' });
-      this.$emit('disconnect');
-    }
-
-    return this;
-  };
-
-  /**
-   * Handles a packet
-   *
-   * @api private
-   */
-
-  SocketNamespace.prototype.onPacket = function (packet) {
-    var self = this;
-
-    function ack () {
-      self.packet({
-          type: 'ack'
-        , args: io.util.toArray(arguments)
-        , ackId: packet.id
-      });
-    };
-
-    switch (packet.type) {
-      case 'connect':
-        this.$emit('connect');
-        break;
-
-      case 'disconnect':
-        if (this.name === '') {
-          this.socket.onDisconnect(packet.reason || 'booted');
-        } else {
-          this.$emit('disconnect', packet.reason);
-        }
-        break;
-
-      case 'message':
-      case 'json':
-        var params = ['message', packet.data];
-
-        if (packet.ack == 'data') {
-          params.push(ack);
-        } else if (packet.ack) {
-          this.packet({ type: 'ack', ackId: packet.id });
-        }
-
-        this.$emit.apply(this, params);
-        break;
-
-      case 'event':
-        var params = [packet.name].concat(packet.args);
-
-        if (packet.ack == 'data')
-          params.push(ack);
-
-        this.$emit.apply(this, params);
-        break;
-
-      case 'ack':
-        if (this.acks[packet.ackId]) {
-          this.acks[packet.ackId].apply(this, packet.args);
-          delete this.acks[packet.ackId];
-        }
-        break;
-
-      case 'error':
-        if (packet.advice){
-          this.socket.onError(packet);
-        } else {
-          if (packet.reason == 'unauthorized') {
-            this.$emit('connect_failed', packet.reason);
-          } else {
-            this.$emit('error', packet.reason);
-          }
-        }
-        break;
-    }
-  };
-
-  /**
-   * Flag interface.
-   *
-   * @api private
-   */
-
-  function Flag (nsp, name) {
-    this.namespace = nsp;
-    this.name = name;
-  };
-
-  /**
-   * Send a message
-   *
-   * @api public
-   */
-
-  Flag.prototype.send = function () {
-    this.namespace.flags[this.name] = true;
-    this.namespace.send.apply(this.namespace, arguments);
-  };
-
-  /**
-   * Emit an event
-   *
-   * @api public
-   */
-
-  Flag.prototype.emit = function () {
-    this.namespace.flags[this.name] = true;
-    this.namespace.emit.apply(this.namespace, arguments);
-  };
-
-})(
-    'undefined' != typeof io ? io : module.exports
-  , 'undefined' != typeof io ? io : module.parent.exports
-);
-
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, io, global) {
-
-  /**
-   * Expose constructor.
-   */
-
-  exports.websocket = WS;
-
-  /**
-   * The WebSocket transport uses the HTML5 WebSocket API to establish an
-   * persistent connection with the Socket.IO server. This transport will also
-   * be inherited by the FlashSocket fallback as it provides a API compatible
-   * polyfill for the WebSockets.
-   *
-   * @constructor
-   * @extends {io.Transport}
-   * @api public
-   */
-
-  function WS (socket) {
-    io.Transport.apply(this, arguments);
-  };
-
-  /**
-   * Inherits from Transport.
-   */
-
-  io.util.inherit(WS, io.Transport);
-
-  /**
-   * Transport name
-   *
-   * @api public
-   */
-
-  WS.prototype.name = 'websocket';
-
-  /**
-   * Initializes a new `WebSocket` connection with the Socket.IO server. We attach
-   * all the appropriate listeners to handle the responses from the server.
-   *
-   * @returns {Transport}
-   * @api public
-   */
-
-  WS.prototype.open = function () {
-    var query = io.util.query(this.socket.options.query)
-      , self = this
-      , Socket
-
-
-    if (!Socket) {
-      Socket = global.MozWebSocket || global.WebSocket;
-    }
-
-    this.websocket = new Socket(this.prepareUrl() + query);
-
-    this.websocket.onopen = function () {
-      self.onOpen();
-      self.socket.setBuffer(false);
-    };
-    this.websocket.onmessage = function (ev) {
-      self.onData(ev.data);
-    };
-    this.websocket.onclose = function () {
-      self.onClose();
-      self.socket.setBuffer(true);
-    };
-    this.websocket.onerror = function (e) {
-      self.onError(e);
-    };
-
-    return this;
-  };
-
-  /**
-   * Send a message to the Socket.IO server. The message will automatically be
-   * encoded in the correct message format.
-   *
-   * @returns {Transport}
-   * @api public
-   */
-
-  WS.prototype.send = function (data) {
-    this.websocket.send(data);
-    return this;
-  };
-
-  /**
-   * Payload
-   *
-   * @api private
-   */
-
-  WS.prototype.payload = function (arr) {
-    for (var i = 0, l = arr.length; i < l; i++) {
-      this.packet(arr[i]);
-    }
-    return this;
-  };
-
-  /**
-   * Disconnect the established `WebSocket` connection.
-   *
-   * @returns {Transport}
-   * @api public
-   */
-
-  WS.prototype.close = function () {
-    this.websocket.close();
-    return this;
-  };
-
-  /**
-   * Handle the errors that `WebSocket` might be giving when we
-   * are attempting to connect or send messages.
-   *
-   * @param {Error} e The error.
-   * @api private
-   */
-
-  WS.prototype.onError = function (e) {
-    this.socket.onError(e);
-  };
-
-  /**
-   * Returns the appropriate scheme for the URI generation.
-   *
-   * @api private
-   */
-  WS.prototype.scheme = function () {
-    return this.socket.options.secure ? 'wss' : 'ws';
-  };
-
-  /**
-   * Checks if the browser has support for native `WebSockets` and that
-   * it's not the polyfill created for the FlashSocket transport.
-   *
-   * @return {Boolean}
-   * @api public
-   */
-
-  WS.check = function () {
-    return ('WebSocket' in global && !('__addTask' in WebSocket))
-          || 'MozWebSocket' in global;
-  };
-
-  /**
-   * Check if the `WebSocket` transport support cross domain communications.
-   *
-   * @returns {Boolean}
-   * @api public
-   */
-
-  WS.xdomainCheck = function () {
-    return true;
-  };
-
-  /**
-   * Add the transport to your public io.transports array.
-   *
-   * @api private
-   */
-
-  io.transports.push('websocket');
-
-})(
-    'undefined' != typeof io ? io.Transport : module.exports
-  , 'undefined' != typeof io ? io : module.parent.exports
-  , this
-);
-
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, io) {
-
-  /**
-   * Expose constructor.
-   */
-
-  exports.flashsocket = Flashsocket;
-
-  /**
-   * The FlashSocket transport. This is a API wrapper for the HTML5 WebSocket
-   * specification. It uses a .swf file to communicate with the server. If you want
-   * to serve the .swf file from a other server than where the Socket.IO script is
-   * coming from you need to use the insecure version of the .swf. More information
-   * about this can be found on the github page.
-   *
-   * @constructor
-   * @extends {io.Transport.websocket}
-   * @api public
-   */
-
-  function Flashsocket () {
-    io.Transport.websocket.apply(this, arguments);
-  };
-
-  /**
-   * Inherits from Transport.
-   */
-
-  io.util.inherit(Flashsocket, io.Transport.websocket);
-
-  /**
-   * Transport name
-   *
-   * @api public
-   */
-
-  Flashsocket.prototype.name = 'flashsocket';
-
-  /**
-   * Disconnect the established `FlashSocket` connection. This is done by adding a 
-   * new task to the FlashSocket. The rest will be handled off by the `WebSocket` 
-   * transport.
-   *
-   * @returns {Transport}
-   * @api public
-   */
-
-  Flashsocket.prototype.open = function () {
-    var self = this
-      , args = arguments;
-
-    WebSocket.__addTask(function () {
-      io.Transport.websocket.prototype.open.apply(self, args);
-    });
-    return this;
-  };
-  
-  /**
-   * Sends a message to the Socket.IO server. This is done by adding a new
-   * task to the FlashSocket. The rest will be handled off by the `WebSocket` 
-   * transport.
-   *
-   * @returns {Transport}
-   * @api public
-   */
-
-  Flashsocket.prototype.send = function () {
-    var self = this, args = arguments;
-    WebSocket.__addTask(function () {
-      io.Transport.websocket.prototype.send.apply(self, args);
-    });
-    return this;
-  };
-
-  /**
-   * Disconnects the established `FlashSocket` connection.
-   *
-   * @returns {Transport}
-   * @api public
-   */
-
-  Flashsocket.prototype.close = function () {
-    WebSocket.__tasks.length = 0;
-    io.Transport.websocket.prototype.close.call(this);
-    return this;
-  };
-
-  /**
-   * The WebSocket fall back needs to append the flash container to the body
-   * element, so we need to make sure we have access to it. Or defer the call
-   * until we are sure there is a body element.
-   *
-   * @param {Socket} socket The socket instance that needs a transport
-   * @param {Function} fn The callback
-   * @api private
-   */
-
-  Flashsocket.prototype.ready = function (socket, fn) {
-    function init () {
-      var options = socket.options
-        , port = options['flash policy port']
-        , path = [
-              'http' + (options.secure ? 's' : '') + ':/'
-            , options.host + ':' + options.port
-            , options.resource
-            , 'static/flashsocket'
-            , 'WebSocketMain' + (socket.isXDomain() ? 'Insecure' : '') + '.swf'
-          ];
-
-      // Only start downloading the swf file when the checked that this browser
-      // actually supports it
-      if (!Flashsocket.loaded) {
-        if (typeof WEB_SOCKET_SWF_LOCATION === 'undefined') {
-          // Set the correct file based on the XDomain settings
-          WEB_SOCKET_SWF_LOCATION = path.join('/');
-        }
-
-        if (port !== 843) {
-          WebSocket.loadFlashPolicyFile('xmlsocket://' + options.host + ':' + port);
-        }
-
-        WebSocket.__initialize();
-        Flashsocket.loaded = true;
-      }
-
-      fn.call(self);
-    }
-
-    var self = this;
-    if (document.body) return init();
-
-    io.util.load(init);
-  };
-
-  /**
-   * Check if the FlashSocket transport is supported as it requires that the Adobe
-   * Flash Player plug-in version `10.0.0` or greater is installed. And also check if
-   * the polyfill is correctly loaded.
-   *
-   * @returns {Boolean}
-   * @api public
-   */
-
-  Flashsocket.check = function () {
-    if (
-        typeof WebSocket == 'undefined'
-      || !('__initialize' in WebSocket) || !swfobject
-    ) return false;
-
-    return swfobject.getFlashPlayerVersion().major >= 10;
-  };
-
-  /**
-   * Check if the FlashSocket transport can be used as cross domain / cross origin 
-   * transport. Because we can't see which type (secure or insecure) of .swf is used
-   * we will just return true.
-   *
-   * @returns {Boolean}
-   * @api public
-   */
-
-  Flashsocket.xdomainCheck = function () {
-    return true;
-  };
-
-  /**
-   * Disable AUTO_INITIALIZATION
-   */
-
-  if (typeof window != 'undefined') {
-    WEB_SOCKET_DISABLE_AUTO_INITIALIZATION = true;
-  }
-
-  /**
-   * Add the transport to your public io.transports array.
-   *
-   * @api private
-   */
-
-  io.transports.push('flashsocket');
-})(
-    'undefined' != typeof io ? io.Transport : module.exports
-  , 'undefined' != typeof io ? io : module.parent.exports
-);
-/*	SWFObject v2.2 <http://code.google.com/p/swfobject/> 
-	is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
-*/
-if ('undefined' != typeof window) {
-var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O[(['Active'].concat('Object').join('X'))]!=D){try{var ad=new window[(['Active'].concat('Object').join('X'))](W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y<X;Y++){U[Y]()}}function K(X){if(J){X()}else{U[U.length]=X}}function s(Y){if(typeof O.addEventListener!=D){O.addEventListener("load",Y,false)}else{if(typeof j.addEventListener!=D){j.addEventListener("load",Y,false)}else{if(typeof O.attachEvent!=D){i(O,"onload",Y)}else{if(typeof O.onload=="function"){var X=O.onload;O.onload=function(){X();Y()}}else{O.onload=Y}}}}}function h(){if(T){V()}else{H()}}function V(){var X=j.getElementsByTagName("body")[0];var aa=C(r);aa.setAttribute("type",q);var Z=X.appendChild(aa);if(Z){var Y=0;(function(){if(typeof Z.GetVariable!=D){var ab=Z.GetVariable("$version");if(ab){ab=ab.split(" ")[1].split(",");M.pv=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}else{if(Y<10){Y++;setTimeout(arguments.callee,10);return}}X.removeChild(aa);Z=null;H()})()}else{H()}}function H(){var ag=o.length;if(ag>0){for(var af=0;af<ag;af++){var Y=o[af].id;var ab=o[af].callbackFn;var aa={success:false,id:Y};if(M.pv[0]>0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad<ac;ad++){if(X[ad].getAttribute("name").toLowerCase()!="movie"){ah[X[ad].getAttribute("name")]=X[ad].getAttribute("value")}}P(ai,ah,Y,ab)}else{p(ae);if(ab){ab(aa)}}}}}else{w(Y,true);if(ab){var Z=z(Y);if(Z&&typeof Z.SetVariable!=D){aa.success=true;aa.ref=Z}ab(aa)}}}}}function z(aa){var X=null;var Y=c(aa);if(Y&&Y.nodeName=="OBJECT"){if(typeof Y.SetVariable!=D){X=Y}else{var Z=Y.getElementsByTagName(r)[0];if(Z){X=Z}}}return X}function A(){return !a&&F("6.0.65")&&(M.win||M.mac)&&!(M.wk&&M.wk<312)}function P(aa,ab,X,Z){a=true;E=Z||null;B={success:false,id:X};var ae=c(X);if(ae){if(ae.nodeName=="OBJECT"){l=g(ae);Q=null}else{l=ae;Q=X}aa.id=R;if(typeof aa.width==D||(!/%$/.test(aa.width)&&parseInt(aa.width,10)<310)){aa.width="310"}if(typeof aa.height==D||(!/%$/.test(aa.height)&&parseInt(aa.height,10)<137)){aa.height="137"}j.title=j.title.slice(0,47)+" - Flash Player Installation";var ad=M.ie&&M.win?(['Active'].concat('').join('X')):"PlugIn",ac="MMredirectURL="+O.location.toString().replace(/&/g,"%26")+"&MMplayerType="+ad+"&MMdoctitle="+j.title;if(typeof ab.flashvars!=D){ab.flashvars+="&"+ac}else{ab.flashvars=ac}if(M.ie&&M.win&&ae.readyState!=4){var Y=C("div");X+="SWFObjectNew";Y.setAttribute("id",X);ae.parentNode.insertBefore(Y,ae);ae.style.display="none";(function(){if(ae.readyState==4){ae.parentNode.removeChild(ae)}else{setTimeout(arguments.callee,10)}})()}u(aa,ab,X)}}function p(Y){if(M.ie&&M.win&&Y.readyState!=4){var X=C("div");Y.parentNode.insertBefore(X,Y);X.parentNode.replaceChild(g(Y),X);Y.style.display="none";(function(){if(Y.readyState==4){Y.parentNode.removeChild(Y)}else{setTimeout(arguments.callee,10)}})()}else{Y.parentNode.replaceChild(g(Y),Y)}}function g(ab){var aa=C("div");if(M.win&&M.ie){aa.innerHTML=ab.innerHTML}else{var Y=ab.getElementsByTagName(r)[0];if(Y){var ad=Y.childNodes;if(ad){var X=ad.length;for(var Z=0;Z<X;Z++){if(!(ad[Z].nodeType==1&&ad[Z].nodeName=="PARAM")&&!(ad[Z].nodeType==8)){aa.appendChild(ad[Z].cloneNode(true))}}}}}return aa}function u(ai,ag,Y){var X,aa=c(Y);if(M.wk&&M.wk<312){return X}if(aa){if(typeof ai.id==D){ai.id=Y}if(M.ie&&M.win){var ah="";for(var ae in ai){if(ai[ae]!=Object.prototype[ae]){if(ae.toLowerCase()=="data"){ag.movie=ai[ae]}else{if(ae.toLowerCase()=="styleclass"){ah+=' class="'+ai[ae]+'"'}else{if(ae.toLowerCase()!="classid"){ah+=" "+ae+'="'+ai[ae]+'"'}}}}}var af="";for(var ad in ag){if(ag[ad]!=Object.prototype[ad]){af+='<param name="'+ad+'" value="'+ag[ad]+'" />'}}aa.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+ah+">"+af+"</object>";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab<ac;ab++){I[ab][0].detachEvent(I[ab][1],I[ab][2])}var Z=N.length;for(var aa=0;aa<Z;aa++){y(N[aa])}for(var Y in M){M[Y]=null}M=null;for(var X in swfobject){swfobject[X]=null}swfobject=null})}}();return{registerObject:function(ab,X,aa,Z){if(M.w3&&ab&&X){var Y={};Y.id=ab;Y.swfVersion=X;Y.expressInstall=aa;Y.callbackFn=Z;o[o.length]=Y;w(ab,false)}else{if(Z){Z({success:false,id:ab})}}},getObjectById:function(X){if(M.w3){return z(X)}},embedSWF:function(ab,ah,ae,ag,Y,aa,Z,ad,af,ac){var X={success:false,id:ah};if(M.w3&&!(M.wk&&M.wk<312)&&ab&&ah&&ae&&ag&&Y){w(ah,false);K(function(){ae+="";ag+="";var aj={};if(af&&typeof af===r){for(var al in af){aj[al]=af[al]}}aj.data=ab;aj.width=ae;aj.height=ag;var am={};if(ad&&typeof ad===r){for(var ak in ad){am[ak]=ad[ak]}}if(Z&&typeof Z===r){for(var ai in Z){if(typeof am.flashvars!=D){am.flashvars+="&"+ai+"="+Z[ai]}else{am.flashvars=ai+"="+Z[ai]}}}if(F(Y)){var an=u(aj,am,ah);if(aj.id==ah){w(ah,true)}X.success=true;X.ref=an}else{if(aa&&A()){aj.data=aa;P(aj,am,ah,ac);return}else{w(ah,true)}}if(ac){ac(X)}})}else{if(ac){ac(X)}}},switchOffAutoHideShow:function(){m=false},ua:M,getFlashPlayerVersion:function(){return{major:M.pv[0],minor:M.pv[1],release:M.pv[2]}},hasFlashPlayerVersion:F,createSWF:function(Z,Y,X){if(M.w3){return u(Z,Y,X)}else{return undefined}},showExpressInstall:function(Z,aa,X,Y){if(M.w3&&A()){P(Z,aa,X,Y)}},removeSWF:function(X){if(M.w3){y(X)}},createCSS:function(aa,Z,Y,X){if(M.w3){v(aa,Z,Y,X)}},addDomLoadEvent:K,addLoadEvent:s,getQueryParamValue:function(aa){var Z=j.location.search||j.location.hash;if(Z){if(/\?/.test(Z)){Z=Z.split("?")[1]}if(aa==null){return L(Z)}var Y=Z.split("&");for(var X=0;X<Y.length;X++){if(Y[X].substring(0,Y[X].indexOf("="))==aa){return L(Y[X].substring((Y[X].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(a){var X=c(R);if(X&&l){X.parentNode.replaceChild(l,X);if(Q){w(Q,true);if(M.ie&&M.win){l.style.display="block"}}if(E){E(B)}}a=false}}}}();
-}
-// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
-// License: New BSD License
-// Reference: http://dev.w3.org/html5/websockets/
-// Reference: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol
-
-(function() {
-  
-  if ('undefined' == typeof window || window.WebSocket) return;
-
-  var console = window.console;
-  if (!console || !console.log || !console.error) {
-    console = {log: function(){ }, error: function(){ }};
-  }
-  
-  if (!swfobject.hasFlashPlayerVersion("10.0.0")) {
-    console.error("Flash Player >= 10.0.0 is required.");
-    return;
-  }
-  if (location.protocol == "file:") {
-    console.error(
-      "WARNING: web-socket-js doesn't work in file:///... URL " +
-      "unless you set Flash Security Settings properly. " +
-      "Open the page via Web server i.e. http://...");
-  }
-
-  /**
-   * This class represents a faux web socket.
-   * @param {string} url
-   * @param {array or string} protocols
-   * @param {string} proxyHost
-   * @param {int} proxyPort
-   * @param {string} headers
-   */
-  WebSocket = function(url, protocols, proxyHost, proxyPort, headers) {
-    var self = this;
-    self.__id = WebSocket.__nextId++;
-    WebSocket.__instances[self.__id] = self;
-    self.readyState = WebSocket.CONNECTING;
-    self.bufferedAmount = 0;
-    self.__events = {};
-    if (!protocols) {
-      protocols = [];
-    } else if (typeof protocols == "string") {
-      protocols = [protocols];
-    }
-    // Uses setTimeout() to make sure __createFlash() runs after the caller sets ws.onopen etc.
-    // Otherwise, when onopen fires immediately, onopen is called before it is set.
-    setTimeout(function() {
-      WebSocket.__addTask(function() {
-        WebSocket.__flash.create(
-            self.__id, url, protocols, proxyHost || null, proxyPort || 0, headers || null);
-      });
-    }, 0);
-  };
-
-  /**
-   * Send data to the web socket.
-   * @param {string} data  The data to send to the socket.
-   * @return {boolean}  True for success, false for failure.
-   */
-  WebSocket.prototype.send = function(data) {
-    if (this.readyState == WebSocket.CONNECTING) {
-      throw "INVALID_STATE_ERR: Web Socket connection has not been established";
-    }
-    // We use encodeURIComponent() here, because FABridge doesn't work if
-    // the argument includes some characters. We don't use escape() here
-    // because of this:
-    // https://developer.mozilla.org/en/Core_JavaScript_1.5_Guide/Functions#escape_and_unescape_Functions
-    // But it looks decodeURIComponent(encodeURIComponent(s)) doesn't
-    // preserve all Unicode characters either e.g. "\uffff" in Firefox.
-    // Note by wtritch: Hopefully this will not be necessary using ExternalInterface.  Will require
-    // additional testing.
-    var result = WebSocket.__flash.send(this.__id, encodeURIComponent(data));
-    if (result < 0) { // success
-      return true;
-    } else {
-      this.bufferedAmount += result;
-      return false;
-    }
-  };
-
-  /**
-   * Close this web socket gracefully.
-   */
-  WebSocket.prototype.close = function() {
-    if (this.readyState == WebSocket.CLOSED || this.readyState == WebSocket.CLOSING) {
-      return;
-    }
-    this.readyState = WebSocket.CLOSING;
-    WebSocket.__flash.close(this.__id);
-  };
-
-  /**
-   * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
-   *
-   * @param {string} type
-   * @param {function} listener
-   * @param {boolean} useCapture
-   * @return void
-   */
-  WebSocket.prototype.addEventListener = function(type, listener, useCapture) {
-    if (!(type in this.__events)) {
-      this.__events[type] = [];
-    }
-    this.__events[type].push(listener);
-  };
-
-  /**
-   * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
-   *
-   * @param {string} type
-   * @param {function} listener
-   * @param {boolean} useCapture
-   * @return void
-   */
-  WebSocket.prototype.removeEventListener = function(type, listener, useCapture) {
-    if (!(type in this.__events)) return;
-    var events = this.__events[type];
-    for (var i = events.length - 1; i >= 0; --i) {
-      if (events[i] === listener) {
-        events.splice(i, 1);
-        break;
-      }
-    }
-  };
-
-  /**
-   * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
-   *
-   * @param {Event} event
-   * @return void
-   */
-  WebSocket.prototype.dispatchEvent = function(event) {
-    var events = this.__events[event.type] || [];
-    for (var i = 0; i < events.length; ++i) {
-      events[i](event);
-    }
-    var handler = this["on" + event.type];
-    if (handler) handler(event);
-  };
-
-  /**
-   * Handles an event from Flash.
-   * @param {Object} flashEvent
-   */
-  WebSocket.prototype.__handleEvent = function(flashEvent) {
-    if ("readyState" in flashEvent) {
-      this.readyState = flashEvent.readyState;
-    }
-    if ("protocol" in flashEvent) {
-      this.protocol = flashEvent.protocol;
-    }
-    
-    var jsEvent;
-    if (flashEvent.type == "open" || flashEvent.type == "error") {
-      jsEvent = this.__createSimpleEvent(flashEvent.type);
-    } else if (flashEvent.type == "close") {
-      // TODO implement jsEvent.wasClean
-      jsEvent = this.__createSimpleEvent("close");
-    } else if (flashEvent.type == "message") {
-      var data = decodeURIComponent(flashEvent.message);
-      jsEvent = this.__createMessageEvent("message", data);
-    } else {
-      throw "unknown event type: " + flashEvent.type;
-    }
-    
-    this.dispatchEvent(jsEvent);
-  };
-  
-  WebSocket.prototype.__createSimpleEvent = function(type) {
-    if (document.createEvent && window.Event) {
-      var event = document.createEvent("Event");
-      event.initEvent(type, false, false);
-      return event;
-    } else {
-      return {type: type, bubbles: false, cancelable: false};
-    }
-  };
-  
-  WebSocket.prototype.__createMessageEvent = function(type, data) {
-    if (document.createEvent && window.MessageEvent && !window.opera) {
-      var event = document.createEvent("MessageEvent");
-      event.initMessageEvent("message", false, false, data, null, null, window, null);
-      return event;
-    } else {
-      // IE and Opera, the latter one truncates the data parameter after any 0x00 bytes.
-      return {type: type, data: data, bubbles: false, cancelable: false};
-    }
-  };
-  
-  /**
-   * Define the WebSocket readyState enumeration.
-   */
-  WebSocket.CONNECTING = 0;
-  WebSocket.OPEN = 1;
-  WebSocket.CLOSING = 2;
-  WebSocket.CLOSED = 3;
-
-  WebSocket.__flash = null;
-  WebSocket.__instances = {};
-  WebSocket.__tasks = [];
-  WebSocket.__nextId = 0;
-  
-  /**
-   * Load a new flash security policy file.
-   * @param {string} url
-   */
-  WebSocket.loadFlashPolicyFile = function(url){
-    WebSocket.__addTask(function() {
-      WebSocket.__flash.loadManualPolicyFile(url);
-    });
-  };
-
-  /**
-   * Loads WebSocketMain.swf and creates WebSocketMain object in Flash.
-   */
-  WebSocket.__initialize = function() {
-    if (WebSocket.__flash) return;
-    
-    if (WebSocket.__swfLocation) {
-      // For backword compatibility.
-      window.WEB_SOCKET_SWF_LOCATION = WebSocket.__swfLocation;
-    }
-    if (!window.WEB_SOCKET_SWF_LOCATION) {
-      console.error("[WebSocket] set WEB_SOCKET_SWF_LOCATION to location of WebSocketMain.swf");
-      return;
-    }
-    var container = document.createElement("div");
-    container.id = "webSocketContainer";
-    // Hides Flash box. We cannot use display: none or visibility: hidden because it prevents
-    // Flash from loading at least in IE. So we move it out of the screen at (-100, -100).
-    // But this even doesn't work with Flash Lite (e.g. in Droid Incredible). So with Flash
-    // Lite, we put it at (0, 0). This shows 1x1 box visible at left-top corner but this is
-    // the best we can do as far as we know now.
-    container.style.position = "absolute";
-    if (WebSocket.__isFlashLite()) {
-      container.style.left = "0px";
-      container.style.top = "0px";
-    } else {
-      container.style.left = "-100px";
-      container.style.top = "-100px";
-    }
-    var holder = document.createElement("div");
-    holder.id = "webSocketFlash";
-    container.appendChild(holder);
-    document.body.appendChild(container);
-    // See this article for hasPriority:
-    // http://help.adobe.com/en_US/as3/mobile/WS4bebcd66a74275c36cfb8137124318eebc6-7ffd.html
-    swfobject.embedSWF(
-      WEB_SOCKET_SWF_LOCATION,
-      "webSocketFlash",
-      "1" /* width */,
-      "1" /* height */,
-      "10.0.0" /* SWF version */,
-      null,
-      null,
-      {hasPriority: true, swliveconnect : true, allowScriptAccess: "always"},
-      null,
-      function(e) {
-        if (!e.success) {
-          console.error("[WebSocket] swfobject.embedSWF failed");
-        }
-      });
-  };
-  
-  /**
-   * Called by Flash to notify JS that it's fully loaded and ready
-   * for communication.
-   */
-  WebSocket.__onFlashInitialized = function() {
-    // We need to set a timeout here to avoid round-trip calls
-    // to flash during the initialization process.
-    setTimeout(function() {
-      WebSocket.__flash = document.getElementById("webSocketFlash");
-      WebSocket.__flash.setCallerUrl(location.href);
-      WebSocket.__flash.setDebug(!!window.WEB_SOCKET_DEBUG);
-      for (var i = 0; i < WebSocket.__tasks.length; ++i) {
-        WebSocket.__tasks[i]();
-      }
-      WebSocket.__tasks = [];
-    }, 0);
-  };
-  
-  /**
-   * Called by Flash to notify WebSockets events are fired.
-   */
-  WebSocket.__onFlashEvent = function() {
-    setTimeout(function() {
-      try {
-        // Gets events using receiveEvents() instead of getting it from event object
-        // of Flash event. This is to make sure to keep message order.
-        // It seems sometimes Flash events don't arrive in the same order as they are sent.
-        var events = WebSocket.__flash.receiveEvents();
-        for (var i = 0; i < events.length; ++i) {
-          WebSocket.__instances[events[i].webSocketId].__handleEvent(events[i]);
-        }
-      } catch (e) {
-        console.error(e);
-      }
-    }, 0);
-    return true;
-  };
-  
-  // Called by Flash.
-  WebSocket.__log = function(message) {
-    console.log(decodeURIComponent(message));
-  };
-  
-  // Called by Flash.
-  WebSocket.__error = function(message) {
-    console.error(decodeURIComponent(message));
-  };
-  
-  WebSocket.__addTask = function(task) {
-    if (WebSocket.__flash) {
-      task();
-    } else {
-      WebSocket.__tasks.push(task);
-    }
-  };
-  
-  /**
-   * Test if the browser is running flash lite.
-   * @return {boolean} True if flash lite is running, false otherwise.
-   */
-  WebSocket.__isFlashLite = function() {
-    if (!window.navigator || !window.navigator.mimeTypes) {
-      return false;
-    }
-    var mimeType = window.navigator.mimeTypes["application/x-shockwave-flash"];
-    if (!mimeType || !mimeType.enabledPlugin || !mimeType.enabledPlugin.filename) {
-      return false;
-    }
-    return mimeType.enabledPlugin.filename.match(/flashlite/i) ? true : false;
-  };
-  
-  if (!window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION) {
-    if (window.addEventListener) {
-      window.addEventListener("load", function(){
-        WebSocket.__initialize();
-      }, false);
-    } else {
-      window.attachEvent("onload", function(){
-        WebSocket.__initialize();
-      });
-    }
-  }
-  
-})();
-
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, io, global) {
-
-  /**
-   * Expose constructor.
-   *
-   * @api public
-   */
-
-  exports.XHR = XHR;
-
-  /**
-   * XHR constructor
-   *
-   * @costructor
-   * @api public
-   */
-
-  function XHR (socket) {
-    if (!socket) return;
-
-    io.Transport.apply(this, arguments);
-    this.sendBuffer = [];
-  };
-
-  /**
-   * Inherits from Transport.
-   */
-
-  io.util.inherit(XHR, io.Transport);
-
-  /**
-   * Establish a connection
-   *
-   * @returns {Transport}
-   * @api public
-   */
-
-  XHR.prototype.open = function () {
-    this.socket.setBuffer(false);
-    this.onOpen();
-    this.get();
-
-    // we need to make sure the request succeeds since we have no indication
-    // whether the request opened or not until it succeeded.
-    this.setCloseTimeout();
-
-    return this;
-  };
-
-  /**
-   * Check if we need to send data to the Socket.IO server, if we have data in our
-   * buffer we encode it and forward it to the `post` method.
-   *
-   * @api private
-   */
-
-  XHR.prototype.payload = function (payload) {
-    var msgs = [];
-
-    for (var i = 0, l = payload.length; i < l; i++) {
-      msgs.push(io.parser.encodePacket(payload[i]));
-    }
-
-    this.send(io.parser.encodePayload(msgs));
-  };
-
-  /**
-   * Send data to the Socket.IO server.
-   *
-   * @param data The message
-   * @returns {Transport}
-   * @api public
-   */
-
-  XHR.prototype.send = function (data) {
-    this.post(data);
-    return this;
-  };
-
-  /**
-   * Posts a encoded message to the Socket.IO server.
-   *
-   * @param {String} data A encoded message.
-   * @api private
-   */
-
-  function empty () { };
-
-  XHR.prototype.post = function (data) {
-    var self = this;
-    this.socket.setBuffer(true);
-
-    function stateChange () {
-      if (this.readyState == 4) {
-        this.onreadystatechange = empty;
-        self.posting = false;
-
-        if (this.status == 200){
-          self.socket.setBuffer(false);
-        } else {
-          self.onClose();
-        }
-      }
-    }
-
-    function onload () {
-      this.onload = empty;
-      self.socket.setBuffer(false);
-    };
-
-    this.sendXHR = this.request('POST');
-
-    if (global.XDomainRequest && this.sendXHR instanceof XDomainRequest) {
-      this.sendXHR.onload = this.sendXHR.onerror = onload;
-    } else {
-      this.sendXHR.onreadystatechange = stateChange;
-    }
-
-    this.sendXHR.send(data);
-  };
-
-  /**
-   * Disconnects the established `XHR` connection.
-   *
-   * @returns {Transport}
-   * @api public
-   */
-
-  XHR.prototype.close = function () {
-    this.onClose();
-    return this;
-  };
-
-  /**
-   * Generates a configured XHR request
-   *
-   * @param {String} url The url that needs to be requested.
-   * @param {String} method The method the request should use.
-   * @returns {XMLHttpRequest}
-   * @api private
-   */
-
-  XHR.prototype.request = function (method) {
-    var req = io.util.request(this.socket.isXDomain())
-      , query = io.util.query(this.socket.options.query, 't=' + +new Date);
-
-    req.open(method || 'GET', this.prepareUrl() + query, true);
-
-    if (method == 'POST') {
-      try {
-        if (req.setRequestHeader) {
-          req.setRequestHeader('Content-type', 'text/plain;charset=UTF-8');
-        } else {
-          // XDomainRequest
-          req.contentType = 'text/plain';
-        }
-      } catch (e) {}
-    }
-
-    return req;
-  };
-
-  /**
-   * Returns the scheme to use for the transport URLs.
-   *
-   * @api private
-   */
-
-  XHR.prototype.scheme = function () {
-    return this.socket.options.secure ? 'https' : 'http';
-  };
-
-  /**
-   * Check if the XHR transports are supported
-   *
-   * @param {Boolean} xdomain Check if we support cross domain requests.
-   * @returns {Boolean}
-   * @api public
-   */
-
-  XHR.check = function (socket, xdomain) {
-    try {
-      var request = io.util.request(xdomain),
-          usesXDomReq = (global.XDomainRequest && request instanceof XDomainRequest),
-          socketProtocol = (socket && socket.options && socket.options.secure ? 'https:' : 'http:'),
-          isXProtocol = (socketProtocol != global.location.protocol);
-      if (request && !(usesXDomReq && isXProtocol)) {
-        return true;
-      }
-    } catch(e) {}
-
-    return false;
-  };
-
-  /**
-   * Check if the XHR transport supports cross domain requests.
-   *
-   * @returns {Boolean}
-   * @api public
-   */
-
-  XHR.xdomainCheck = function () {
-    return XHR.check(null, true);
-  };
-
-})(
-    'undefined' != typeof io ? io.Transport : module.exports
-  , 'undefined' != typeof io ? io : module.parent.exports
-  , this
-);
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, io) {
-
-  /**
-   * Expose constructor.
-   */
-
-  exports.htmlfile = HTMLFile;
-
-  /**
-   * The HTMLFile transport creates a `forever iframe` based transport
-   * for Internet Explorer. Regular forever iframe implementations will 
-   * continuously trigger the browsers buzy indicators. If the forever iframe
-   * is created inside a `htmlfile` these indicators will not be trigged.
-   *
-   * @constructor
-   * @extends {io.Transport.XHR}
-   * @api public
-   */
-
-  function HTMLFile (socket) {
-    io.Transport.XHR.apply(this, arguments);
-  };
-
-  /**
-   * Inherits from XHR transport.
-   */
-
-  io.util.inherit(HTMLFile, io.Transport.XHR);
-
-  /**
-   * Transport name
-   *
-   * @api public
-   */
-
-  HTMLFile.prototype.name = 'htmlfile';
-
-  /**
-   * Creates a new Ac...eX `htmlfile` with a forever loading iframe
-   * that can be used to listen to messages. Inside the generated
-   * `htmlfile` a reference will be made to the HTMLFile transport.
-   *
-   * @api private
-   */
-
-  HTMLFile.prototype.get = function () {
-    this.doc = new window[(['Active'].concat('Object').join('X'))]('htmlfile');
-    this.doc.open();
-    this.doc.write('<html></html>');
-    this.doc.close();
-    this.doc.parentWindow.s = this;
-
-    var iframeC = this.doc.createElement('div');
-    iframeC.className = 'socketio';
-
-    this.doc.body.appendChild(iframeC);
-    this.iframe = this.doc.createElement('iframe');
-
-    iframeC.appendChild(this.iframe);
-
-    var self = this
-      , query = io.util.query(this.socket.options.query, 't='+ +new Date);
-
-    this.iframe.src = this.prepareUrl() + query;
-
-    io.util.on(window, 'unload', function () {
-      self.destroy();
-    });
-  };
-
-  /**
-   * The Socket.IO server will write script tags inside the forever
-   * iframe, this function will be used as callback for the incoming
-   * information.
-   *
-   * @param {String} data The message
-   * @param {document} doc Reference to the context
-   * @api private
-   */
-
-  HTMLFile.prototype._ = function (data, doc) {
-    this.onData(data);
-    try {
-      var script = doc.getElementsByTagName('script')[0];
-      script.parentNode.removeChild(script);
-    } catch (e) { }
-  };
-
-  /**
-   * Destroy the established connection, iframe and `htmlfile`.
-   * And calls the `CollectGarbage` function of Internet Explorer
-   * to release the memory.
-   *
-   * @api private
-   */
-
-  HTMLFile.prototype.destroy = function () {
-    if (this.iframe){
-      try {
-        this.iframe.src = 'about:blank';
-      } catch(e){}
-
-      this.doc = null;
-      this.iframe.parentNode.removeChild(this.iframe);
-      this.iframe = null;
-
-      CollectGarbage();
-    }
-  };
-
-  /**
-   * Disconnects the established connection.
-   *
-   * @returns {Transport} Chaining.
-   * @api public
-   */
-
-  HTMLFile.prototype.close = function () {
-    this.destroy();
-    return io.Transport.XHR.prototype.close.call(this);
-  };
-
-  /**
-   * Checks if the browser supports this transport. The browser
-   * must have an `Ac...eXObject` implementation.
-   *
-   * @return {Boolean}
-   * @api public
-   */
-
-  HTMLFile.check = function () {
-    if (typeof window != "undefined" && (['Active'].concat('Object').join('X')) in window){
-      try {
-        var a = new window[(['Active'].concat('Object').join('X'))]('htmlfile');
-        return a && io.Transport.XHR.check();
-      } catch(e){}
-    }
-    return false;
-  };
-
-  /**
-   * Check if cross domain requests are supported.
-   *
-   * @returns {Boolean}
-   * @api public
-   */
-
-  HTMLFile.xdomainCheck = function () {
-    // we can probably do handling for sub-domains, we should
-    // test that it's cross domain but a subdomain here
-    return false;
-  };
-
-  /**
-   * Add the transport to your public io.transports array.
-   *
-   * @api private
-   */
-
-  io.transports.push('htmlfile');
-
-})(
-    'undefined' != typeof io ? io.Transport : module.exports
-  , 'undefined' != typeof io ? io : module.parent.exports
-);
-
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, io, global) {
-
-  /**
-   * Expose constructor.
-   */
-
-  exports['xhr-polling'] = XHRPolling;
-
-  /**
-   * The XHR-polling transport uses long polling XHR requests to create a
-   * "persistent" connection with the server.
-   *
-   * @constructor
-   * @api public
-   */
-
-  function XHRPolling () {
-    io.Transport.XHR.apply(this, arguments);
-  };
-
-  /**
-   * Inherits from XHR transport.
-   */
-
-  io.util.inherit(XHRPolling, io.Transport.XHR);
-
-  /**
-   * Merge the properties from XHR transport
-   */
-
-  io.util.merge(XHRPolling, io.Transport.XHR);
-
-  /**
-   * Transport name
-   *
-   * @api public
-   */
-
-  XHRPolling.prototype.name = 'xhr-polling';
-
-  /** 
-   * Establish a connection, for iPhone and Android this will be done once the page
-   * is loaded.
-   *
-   * @returns {Transport} Chaining.
-   * @api public
-   */
-
-  XHRPolling.prototype.open = function () {
-    var self = this;
-
-    io.Transport.XHR.prototype.open.call(self);
-    return false;
-  };
-
-  /**
-   * Starts a XHR request to wait for incoming messages.
-   *
-   * @api private
-   */
-
-  function empty () {};
-
-  XHRPolling.prototype.get = function () {
-    if (!this.open) return;
-
-    var self = this;
-
-    function stateChange () {
-      if (this.readyState == 4) {
-        this.onreadystatechange = empty;
-
-        if (this.status == 200) {
-          self.onData(this.responseText);
-          self.get();
-        } else {
-          self.onClose();
-        }
-      }
-    };
-
-    function onload () {
-      this.onload = empty;
-      this.onerror = empty;
-      self.onData(this.responseText);
-      self.get();
-    };
-
-    function onerror () {
-      self.onClose();
-    };
-
-    this.xhr = this.request();
-
-    if (global.XDomainRequest && this.xhr instanceof XDomainRequest) {
-      this.xhr.onload = onload;
-      this.xhr.onerror = onerror;
-    } else {
-      this.xhr.onreadystatechange = stateChange;
-    }
-
-    this.xhr.send(null);
-  };
-
-  /**
-   * Handle the unclean close behavior.
-   *
-   * @api private
-   */
-
-  XHRPolling.prototype.onClose = function () {
-    io.Transport.XHR.prototype.onClose.call(this);
-
-    if (this.xhr) {
-      this.xhr.onreadystatechange = this.xhr.onload = this.xhr.onerror = empty;
-      try {
-        this.xhr.abort();
-      } catch(e){}
-      this.xhr = null;
-    }
-  };
-
-  /**
-   * Webkit based browsers show a infinit spinner when you start a XHR request
-   * before the browsers onload event is called so we need to defer opening of
-   * the transport until the onload event is called. Wrapping the cb in our
-   * defer method solve this.
-   *
-   * @param {Socket} socket The socket instance that needs a transport
-   * @param {Function} fn The callback
-   * @api private
-   */
-
-  XHRPolling.prototype.ready = function (socket, fn) {
-    var self = this;
-
-    io.util.defer(function () {
-      fn.call(self);
-    });
-  };
-
-  /**
-   * Add the transport to your public io.transports array.
-   *
-   * @api private
-   */
-
-  io.transports.push('xhr-polling');
-
-})(
-    'undefined' != typeof io ? io.Transport : module.exports
-  , 'undefined' != typeof io ? io : module.parent.exports
-  , this
-);
-
-/**
- * socket.io
- * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
- * MIT Licensed
- */
-
-(function (exports, io, global) {
-  /**
-   * There is a way to hide the loading indicator in Firefox. If you create and
-   * remove a iframe it will stop showing the current loading indicator.
-   * Unfortunately we can't feature detect that and UA sniffing is evil.
-   *
-   * @api private
-   */
-
-  var indicator = global.document && "MozAppearance" in
-    global.document.documentElement.style;
-
-  /**
-   * Expose constructor.
-   */
-
-  exports['jsonp-polling'] = JSONPPolling;
-
-  /**
-   * The JSONP transport creates an persistent connection by dynamically
-   * inserting a script tag in the page. This script tag will receive the
-   * information of the Socket.IO server. When new information is received
-   * it creates a new script tag for the new data stream.
-   *
-   * @constructor
-   * @extends {io.Transport.xhr-polling}
-   * @api public
-   */
-
-  function JSONPPolling (socket) {
-    io.Transport['xhr-polling'].apply(this, arguments);
-
-    this.index = io.j.length;
-
-    var self = this;
-
-    io.j.push(function (msg) {
-      self._(msg);
-    });
-  };
-
-  /**
-   * Inherits from XHR polling transport.
-   */
-
-  io.util.inherit(JSONPPolling, io.Transport['xhr-polling']);
-
-  /**
-   * Transport name
-   *
-   * @api public
-   */
-
-  JSONPPolling.prototype.name = 'jsonp-polling';
-
-  /**
-   * Posts a encoded message to the Socket.IO server using an iframe.
-   * The iframe is used because script tags can create POST based requests.
-   * The iframe is positioned outside of the view so the user does not
-   * notice it's existence.
-   *
-   * @param {String} data A encoded message.
-   * @api private
-   */
-
-  JSONPPolling.prototype.post = function (data) {
-    var self = this
-      , query = io.util.query(
-             this.socket.options.query
-          , 't='+ (+new Date) + '&i=' + this.index
-        );
-
-    if (!this.form) {
-      var form = document.createElement('form')
-        , area = document.createElement('textarea')
-        , id = this.iframeId = 'socketio_iframe_' + this.index
-        , iframe;
-
-      form.className = 'socketio';
-      form.style.position = 'absolute';
-      form.style.top = '0px';
-      form.style.left = '0px';
-      form.style.display = 'none';
-      form.target = id;
-      form.method = 'POST';
-      form.setAttribute('accept-charset', 'utf-8');
-      area.name = 'd';
-      form.appendChild(area);
-      document.body.appendChild(form);
-
-      this.form = form;
-      this.area = area;
-    }
-
-    this.form.action = this.prepareUrl() + query;
-
-    function complete () {
-      initIframe();
-      self.socket.setBuffer(false);
-    };
-
-    function initIframe () {
-      if (self.iframe) {
-        self.form.removeChild(self.iframe);
-      }
-
-      try {
-        // ie6 dynamic iframes with target="" support (thanks Chris Lambacher)
-        iframe = document.createElement('<iframe name="'+ self.iframeId +'">');
-      } catch (e) {
-        iframe = document.createElement('iframe');
-        iframe.name = self.iframeId;
-      }
-
-      iframe.id = self.iframeId;
-
-      self.form.appendChild(iframe);
-      self.iframe = iframe;
-    };
-
-    initIframe();
-
-    // we temporarily stringify until we figure out how to prevent
-    // browsers from turning `\n` into `\r\n` in form inputs
-    this.area.value = io.JSON.stringify(data);
-
-    try {
-      this.form.submit();
-    } catch(e) {}
-
-    if (this.iframe.attachEvent) {
-      iframe.onreadystatechange = function () {
-        if (self.iframe.readyState == 'complete') {
-          complete();
-        }
-      };
-    } else {
-      this.iframe.onload = complete;
-    }
-
-    this.socket.setBuffer(true);
-  };
-  
-  /**
-   * Creates a new JSONP poll that can be used to listen
-   * for messages from the Socket.IO server.
-   *
-   * @api private
-   */
-
-  JSONPPolling.prototype.get = function () {
-    var self = this
-      , script = document.createElement('script')
-      , query = io.util.query(
-             this.socket.options.query
-          , 't='+ (+new Date) + '&i=' + this.index
-        );
-
-    if (this.script) {
-      this.script.parentNode.removeChild(this.script);
-      this.script = null;
-    }
-
-    script.async = true;
-    script.src = this.prepareUrl() + query;
-    script.onerror = function () {
-      self.onClose();
-    };
-
-    var insertAt = document.getElementsByTagName('script')[0]
-    insertAt.parentNode.insertBefore(script, insertAt);
-    this.script = script;
-
-    if (indicator) {
-      setTimeout(function () {
-        var iframe = document.createElement('iframe');
-        document.body.appendChild(iframe);
-        document.body.removeChild(iframe);
-      }, 100);
-    }
-  };
-
-  /**
-   * Callback function for the incoming message stream from the Socket.IO server.
-   *
-   * @param {String} data The message
-   * @api private
-   */
-
-  JSONPPolling.prototype._ = function (msg) {
-    this.onData(msg);
-    if (this.open) {
-      this.get();
-    }
-    return this;
-  };
-
-  /**
-   * The indicator hack only works after onload
-   *
-   * @param {Socket} socket The socket instance that needs a transport
-   * @param {Function} fn The callback
-   * @api private
-   */
-
-  JSONPPolling.prototype.ready = function (socket, fn) {
-    var self = this;
-    if (!indicator) return fn.call(this);
-
-    io.util.load(function () {
-      fn.call(self);
-    });
-  };
-
-  /**
-   * Checks if browser supports this transport.
-   *
-   * @return {Boolean}
-   * @api public
-   */
-
-  JSONPPolling.check = function () {
-    return 'document' in global;
-  };
-
-  /**
-   * Check if cross domain requests are supported
-   *
-   * @returns {Boolean}
-   * @api public
-   */
-
-  JSONPPolling.xdomainCheck = function () {
-    return true;
-  };
-
-  /**
-   * Add the transport to your public io.transports array.
-   *
-   * @api private
-   */
-
-  io.transports.push('jsonp-polling');
-
-})(
-    'undefined' != typeof io ? io.Transport : module.exports
-  , 'undefined' != typeof io ? io : module.parent.exports
-  , this
-);
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.io=e()}}(function(){var define,module,exports;return function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}({1:[function(_dereq_,module,exports){module.exports=_dereq_("./lib/")},{"./lib/":2}],2:[function(_dereq_,module,exports){var url=_dereq_("./url");var parser=_dereq_("socket.io-parser");var Manager=_dereq_("./manager");var debug=_dereq_("debug")("socket.io-client");module.exports=exports=lookup;var cache=exports.managers={};function lookup(uri,opts){if(typeof uri=="object"){opts=uri;uri=undefined}opts=opts||{};var parsed=url(uri);var source=parsed.source;var id=parsed.id;var io;if(opts.forceNew||opts["force new connection"]||false===opts.multiplex){debug("ignoring socket cache for %s",source);io=Manager(source,opts)}else{if(!cache[id]){debug("new io instance for %s",source);cache[id]=Manager(source,opts)}io=cache[id]}return io.socket(parsed.path)}exports.protocol=parser.protocol;exports.connect=lookup;exports.Manager=_dereq_("./manager");exports.Socket=_dereq_("./socket")},{"./manager":3,"./socket":5,"./url":6,debug:10,"socket.io-parser":44}],3:[function(_dereq_,module,exports){var url=_dereq_("./url");var eio=_dereq_("engine.io-client");var Socket=_dereq_("./socket");var Emitter=_dereq_("component-emitter");var parser=_dereq_("socket.io-parser");var on=_dereq_("./on");var bind=_dereq_("component-bind");var object=_dereq_("object-component");var debug=_dereq_("debug")("socket.io-client:manager");var indexOf=_dereq_("indexof");var Backoff=_dereq_("backo2");module.exports=Manager;function Manager(uri,opts){if(!(this instanceof Manager))return new Manager(uri,opts);if(uri&&"object"==typeof uri){opts=uri;uri=undefined}opts=opts||{};opts.path=opts.path||"/socket.io";this.nsps={};this.subs=[];this.opts=opts;this.reconnection(opts.reconnection!==false);this.reconnectionAttempts(opts.reconnectionAttempts||Infinity);this.reconnectionDelay(opts.reconnectionDelay||1e3);this.reconnectionDelayMax(opts.reconnectionDelayMax||5e3);this.randomizationFactor(opts.randomizationFactor||.5);this.backoff=new Backoff({min:this.reconnectionDelay(),max:this.reconnectionDelayMax(),jitter:this.randomizationFactor()});this.timeout(null==opts.timeout?2e4:opts.timeout);this.readyState="closed";this.uri=uri;this.connected=[];this.encoding=false;this.packetBuffer=[];this.encoder=new parser.Encoder;this.decoder=new parser.Decoder;this.autoConnect=opts.autoConnect!==false;if(this.autoConnect)this.open()}Manager.prototype.emitAll=function(){this.emit.apply(this,arguments);for(var nsp in this.nsps){this.nsps[nsp].emit.apply(this.nsps[nsp],arguments)}};Manager.prototype.updateSocketIds=function(){for(var nsp in this.nsps){this.nsps[nsp].id=this.engine.id}};Emitter(Manager.prototype);Manager.prototype.reconnection=function(v){if(!arguments.length)return this._reconnection;this._reconnection=!!v;return this};Manager.prototype.reconnectionAttempts=function(v){if(!arguments.length)return this._reconnectionAttempts;this._reconnectionAttempts=v;return this};Manager.prototype.reconnectionDelay=function(v){if(!arguments.length)return this._reconnectionDelay;this._reconnectionDelay=v;this.backoff&&this.backoff.setMin(v);return this};Manager.prototype.randomizationFactor=function(v){if(!arguments.length)return this._randomizationFactor;this._randomizationFactor=v;this.backoff&&this.backoff.setJitter(v);return this};Manager.prototype.reconnectionDelayMax=function(v){if(!arguments.length)return this._reconnectionDelayMax;this._reconnectionDelayMax=v;this.backoff&&this.backoff.setMax(v);return this};Manager.prototype.timeout=function(v){if(!arguments.length)return this._timeout;this._timeout=v;return this};Manager.prototype.maybeReconnectOnOpen=function(){if(!this.reconnecting&&this._reconnection&&this.backoff.attempts===0){this.reconnect()}};Manager.prototype.open=Manager.prototype.connect=function(fn){debug("readyState %s",this.readyState);if(~this.readyState.indexOf("open"))return this;debug("opening %s",this.uri);this.engine=eio(this.uri,this.opts);var socket=this.engine;var self=this;this.readyState="opening";this.skipReconnect=false;var openSub=on(socket,"open",function(){self.onopen();fn&&fn()});var errorSub=on(socket,"error",function(data){debug("connect_error");self.cleanup();self.readyState="closed";self.emitAll("connect_error",data);if(fn){var err=new Error("Connection error");err.data=data;fn(err)}else{self.maybeReconnectOnOpen()}});if(false!==this._timeout){var timeout=this._timeout;debug("connect attempt will timeout after %d",timeout);var timer=setTimeout(function(){debug("connect attempt timed out after %d",timeout);openSub.destroy();socket.close();socket.emit("error","timeout");self.emitAll("connect_timeout",timeout)},timeout);this.subs.push({destroy:function(){clearTimeout(timer)}})}this.subs.push(openSub);this.subs.push(errorSub);return this};Manager.prototype.onopen=function(){debug("open");this.cleanup();this.readyState="open";this.emit("open");var socket=this.engine;this.subs.push(on(socket,"data",bind(this,"ondata")));this.subs.push(on(this.decoder,"decoded",bind(this,"ondecoded")));this.subs.push(on(socket,"error",bind(this,"onerror")));this.subs.push(on(socket,"close",bind(this,"onclose")))};Manager.prototype.ondata=function(data){this.decoder.add(data)};Manager.prototype.ondecoded=function(packet){this.emit("packet",packet)};Manager.prototype.onerror=function(err){debug("error",err);this.emitAll("error",err)};Manager.prototype.socket=function(nsp){var socket=this.nsps[nsp];if(!socket){socket=new Socket(this,nsp);this.nsps[nsp]=socket;var self=this;socket.on("connect",function(){socket.id=self.engine.id;if(!~indexOf(self.connected,socket)){self.connected.push(socket)}})}return socket};Manager.prototype.destroy=function(socket){var index=indexOf(this.connected,socket);if(~index)this.connected.splice(index,1);if(this.connected.length)return;this.close()};Manager.prototype.packet=function(packet){debug("writing packet %j",packet);var self=this;if(!self.encoding){self.encoding=true;this.encoder.encode(packet,function(encodedPackets){for(var i=0;i<encodedPackets.length;i++){self.engine.write(encodedPackets[i])}self.encoding=false;self.processPacketQueue()})}else{self.packetBuffer.push(packet)}};Manager.prototype.processPacketQueue=function(){if(this.packetBuffer.length>0&&!this.encoding){var pack=this.packetBuffer.shift();this.packet(pack)}};Manager.prototype.cleanup=function(){var sub;while(sub=this.subs.shift())sub.destroy();this.packetBuffer=[];this.encoding=false;this.decoder.destroy()};Manager.prototype.close=Manager.prototype.disconnect=function(){this.skipReconnect=true;this.backoff.reset();this.readyState="closed";this.engine&&this.engine.close()};Manager.prototype.onclose=function(reason){debug("close");this.cleanup();this.backoff.reset();this.readyState="closed";this.emit("close",reason);if(this._reconnection&&!this.skipReconnect){this.reconnect()}};Manager.prototype.reconnect=function(){if(this.reconnecting||this.skipReconnect)return this;var self=this;if(this.backoff.attempts>=this._reconnectionAttempts){debug("reconnect failed");this.backoff.reset();this.emitAll("reconnect_failed");this.reconnecting=false}else{var delay=this.backoff.duration();debug("will wait %dms before reconnect attempt",delay);this.reconnecting=true;var timer=setTimeout(function(){if(self.skipReconnect)return;debug("attempting reconnect");self.emitAll("reconnect_attempt",self.backoff.attempts);self.emitAll("reconnecting",self.backoff.attempts);if(self.skipReconnect)return;self.open(function(err){if(err){debug("reconnect attempt error");self.reconnecting=false;self.reconnect();self.emitAll("reconnect_error",err.data)}else{debug("reconnect success");self.onreconnect()}})},delay);this.subs.push({destroy:function(){clearTimeout(timer)}})}};Manager.prototype.onreconnect=function(){var attempt=this.backoff.attempts;this.reconnecting=false;this.backoff.reset();this.updateSocketIds();this.emitAll("reconnect",attempt)}},{"./on":4,"./socket":5,"./url":6,backo2:7,"component-bind":8,"component-emitter":9,debug:10,"engine.io-client":11,indexof:40,"object-component":41,"socket.io-parser":44}],4:[function(_dereq_,module,exports){module.exports=on;function on(obj,ev,fn){obj.on(ev,fn);return{destroy:function(){obj.removeListener(ev,fn)}}}},{}],5:[function(_dereq_,module,exports){var parser=_dereq_("socket.io-parser");var Emitter=_dereq_("component-emitter");var toArray=_dereq_("to-array");var on=_dereq_("./on");var bind=_dereq_("component-bind");var debug=_dereq_("debug")("socket.io-client:socket");var hasBin=_dereq_("has-binary");module.exports=exports=Socket;var events={connect:1,connect_error:1,connect_timeout:1,disconnect:1,error:1,reconnect:1,reconnect_attempt:1,reconnect_failed:1,reconnect_error:1,reconnecting:1};var emit=Emitter.prototype.emit;function Socket(io,nsp){this.io=io;this.nsp=nsp;this.json=this;this.ids=0;this.acks={};if(this.io.autoConnect)this.open();this.receiveBuffer=[];this.sendBuffer=[];this.connected=false;this.disconnected=true}Emitter(Socket.prototype);Socket.prototype.subEvents=function(){if(this.subs)return;var io=this.io;this.subs=[on(io,"open",bind(this,"onopen")),on(io,"packet",bind(this,"onpacket")),on(io,"close",bind(this,"onclose"))]};Socket.prototype.open=Socket.prototype.connect=function(){if(this.connected)return this;this.subEvents();this.io.open();if("open"==this.io.readyState)this.onopen();return this};Socket.prototype.send=function(){var args=toArray(arguments);args.unshift("message");this.emit.apply(this,args);return this};Socket.prototype.emit=function(ev){if(events.hasOwnProperty(ev)){emit.apply(this,arguments);return this}var args=toArray(arguments);var parserType=parser.EVENT;if(hasBin(args)){parserType=parser.BINARY_EVENT}var packet={type:parserType,data:args};if("function"==typeof args[args.length-1]){debug("emitting packet with ack id %d",this.ids);this.acks[this.ids]=args.pop();packet.id=this.ids++}if(this.connected){this.packet(packet)}else{this.sendBuffer.push(packet)}return this};Socket.prototype.packet=function(packet){packet.nsp=this.nsp;this.io.packet(packet)};Socket.prototype.onopen=function(){debug("transport is open - connecting");if("/"!=this.nsp){this.packet({type:parser.CONNECT})}};Socket.prototype.onclose=function(reason){debug("close (%s)",reason);this.connected=false;this.disconnected=true;delete this.id;this.emit("disconnect",reason)};Socket.prototype.onpacket=function(packet){if(packet.nsp!=this.nsp)return;switch(packet.type){case parser.CONNECT:this.onconnect();break;case parser.EVENT:this.onevent(packet);break;case parser.BINARY_EVENT:this.onevent(packet);break;case parser.ACK:this.onack(packet);break;case parser.BINARY_ACK:this.onack(packet);break;case parser.DISCONNECT:this.ondisconnect();break;case parser.ERROR:this.emit("error",packet.data);break}};Socket.prototype.onevent=function(packet){var args=packet.data||[];debug("emitting event %j",args);if(null!=packet.id){debug("attaching ack callback to event");args.push(this.ack(packet.id))}if(this.connected){emit.apply(this,args)}else{this.receiveBuffer.push(args)}};Socket.prototype.ack=function(id){var self=this;var sent=false;return function(){if(sent)return;sent=true;var args=toArray(arguments);debug("sending ack %j",args);var type=hasBin(args)?parser.BINARY_ACK:parser.ACK;self.packet({type:type,id:id,data:args})}};Socket.prototype.onack=function(packet){debug("calling ack %s with %j",packet.id,packet.data);var fn=this.acks[packet.id];fn.apply(this,packet.data);delete this.acks[packet.id]};Socket.prototype.onconnect=function(){this.connected=true;this.disconnected=false;this.emit("connect");this.emitBuffered()};Socket.prototype.emitBuffered=function(){var i;for(i=0;i<this.receiveBuffer.length;i++){emit.apply(this,this.receiveBuffer[i])}this.receiveBuffer=[];for(i=0;i<this.sendBuffer.length;i++){this.packet(this.sendBuffer[i])}this.sendBuffer=[]};Socket.prototype.ondisconnect=function(){debug("server disconnect (%s)",this.nsp);this.destroy();this.onclose("io server disconnect")};Socket.prototype.destroy=function(){if(this.subs){for(var i=0;i<this.subs.length;i++){this.subs[i].destroy()}this.subs=null}this.io.destroy(this)};Socket.prototype.close=Socket.prototype.disconnect=function(){if(this.connected){debug("performing disconnect (%s)",this.nsp);this.packet({type:parser.DISCONNECT})}this.destroy();if(this.connected){this.onclose("io client disconnect")}return this}},{"./on":4,"component-bind":8,"component-emitter":9,debug:10,"has-binary":36,"socket.io-parser":44,"to-array":48}],6:[function(_dereq_,module,exports){(function(global){var parseuri=_dereq_("parseuri");var debug=_dereq_("debug")("socket.io-client:url");module.exports=url;function url(uri,loc){var obj=uri;var loc=loc||global.location;if(null==uri)uri=loc.protocol+"//"+loc.host;if("string"==typeof uri){if("/"==uri.charAt(0)){if("/"==uri.charAt(1)){uri=loc.protocol+uri}else{uri=loc.hostname+uri}}if(!/^(https?|wss?):\/\//.test(uri)){debug("protocol-less url %s",uri);if("undefined"!=typeof loc){uri=loc.protocol+"//"+uri}else{uri="https://"+uri}}debug("parse %s",uri);obj=parseuri(uri)}if(!obj.port){if(/^(http|ws)$/.test(obj.protocol)){obj.port="80"}else if(/^(http|ws)s$/.test(obj.protocol)){obj.port="443"}}obj.path=obj.path||"/";obj.id=obj.protocol+"://"+obj.host+":"+obj.port;obj.href=obj.protocol+"://"+obj.host+(loc&&loc.port==obj.port?"":":"+obj.port);return obj}}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{debug:10,parseuri:42}],7:[function(_dereq_,module,exports){module.exports=Backoff;function Backoff(opts){opts=opts||{};this.ms=opts.min||100;this.max=opts.max||1e4;this.factor=opts.factor||2;this.jitter=opts.jitter>0&&opts.jitter<=1?opts.jitter:0;this.attempts=0}Backoff.prototype.duration=function(){var ms=this.ms*Math.pow(this.factor,this.attempts++);if(this.jitter){var rand=Math.random();var deviation=Math.floor(rand*this.jitter*ms);ms=(Math.floor(rand*10)&1)==0?ms-deviation:ms+deviation}return Math.min(ms,this.max)|0};Backoff.prototype.reset=function(){this.attempts=0};Backoff.prototype.setMin=function(min){this.ms=min};Backoff.prototype.setMax=function(max){this.max=max};Backoff.prototype.setJitter=function(jitter){this.jitter=jitter}},{}],8:[function(_dereq_,module,exports){var slice=[].slice;module.exports=function(obj,fn){if("string"==typeof fn)fn=obj[fn];if("function"!=typeof fn)throw new Error("bind() requires a function");var args=slice.call(arguments,2);return function(){return fn.apply(obj,args.concat(slice.call(arguments)))}}},{}],9:[function(_dereq_,module,exports){module.exports=Emitter;function Emitter(obj){if(obj)return mixin(obj)}function mixin(obj){for(var key in Emitter.prototype){obj[key]=Emitter.prototype[key]}return obj}Emitter.prototype.on=Emitter.prototype.addEventListener=function(event,fn){this._callbacks=this._callbacks||{};(this._callbacks[event]=this._callbacks[event]||[]).push(fn);return this};Emitter.prototype.once=function(event,fn){var self=this;this._callbacks=this._callbacks||{};function on(){self.off(event,on);fn.apply(this,arguments)}on.fn=fn;this.on(event,on);return this};Emitter.prototype.off=Emitter.prototype.removeListener=Emitter.prototype.removeAllListeners=Emitter.prototype.removeEventListener=function(event,fn){this._callbacks=this._callbacks||{};if(0==arguments.length){this._callbacks={};return this}var callbacks=this._callbacks[event];if(!callbacks)return this;if(1==arguments.length){delete this._callbacks[event];return this}var cb;for(var i=0;i<callbacks.length;i++){cb=callbacks[i];if(cb===fn||cb.fn===fn){callbacks.splice(i,1);break}}return this};Emitter.prototype.emit=function(event){this._callbacks=this._callbacks||{};var args=[].slice.call(arguments,1),callbacks=this._callbacks[event];if(callbacks){callbacks=callbacks.slice(0);for(var i=0,len=callbacks.length;i<len;++i){callbacks[i].apply(this,args)}}return this};Emitter.prototype.listeners=function(event){this._callbacks=this._callbacks||{};return this._callbacks[event]||[]};Emitter.prototype.hasListeners=function(event){return!!this.listeners(event).length}},{}],10:[function(_dereq_,module,exports){module.exports=debug;function debug(name){if(!debug.enabled(name))return function(){};return function(fmt){fmt=coerce(fmt);var curr=new Date;var ms=curr-(debug[name]||curr);debug[name]=curr;fmt=name+" "+fmt+" +"+debug.humanize(ms);window.console&&console.log&&Function.prototype.apply.call(console.log,console,arguments)}}debug.names=[];debug.skips=[];debug.enable=function(name){try{localStorage.debug=name}catch(e){}var split=(name||"").split(/[\s,]+/),len=split.length;for(var i=0;i<len;i++){name=split[i].replace("*",".*?");if(name[0]==="-"){debug.skips.push(new RegExp("^"+name.substr(1)+"$"))}else{debug.names.push(new RegExp("^"+name+"$"))}}};debug.disable=function(){debug.enable("")};debug.humanize=function(ms){var sec=1e3,min=60*1e3,hour=60*min;if(ms>=hour)return(ms/hour).toFixed(1)+"h";if(ms>=min)return(ms/min).toFixed(1)+"m";if(ms>=sec)return(ms/sec|0)+"s";return ms+"ms"};debug.enabled=function(name){for(var i=0,len=debug.skips.length;i<len;i++){if(debug.skips[i].test(name)){return false}}for(var i=0,len=debug.names.length;i<len;i++){if(debug.names[i].test(name)){return true}}return false};function coerce(val){if(val instanceof Error)return val.stack||val.message;return val}try{if(window.localStorage)debug.enable(localStorage.debug)}catch(e){}},{}],11:[function(_dereq_,module,exports){module.exports=_dereq_("./lib/")},{"./lib/":12}],12:[function(_dereq_,module,exports){module.exports=_dereq_("./socket");module.exports.parser=_dereq_("engine.io-parser")},{"./socket":13,"engine.io-parser":25}],13:[function(_dereq_,module,exports){(function(global){var transports=_dereq_("./transports");var Emitter=_dereq_("component-emitter");var debug=_dereq_("debug")("engine.io-client:socket");var index=_dereq_("indexof");var parser=_dereq_("engine.io-parser");var parseuri=_dereq_("parseuri");var parsejson=_dereq_("parsejson");var parseqs=_dereq_("parseqs");module.exports=Socket;function noop(){}function Socket(uri,opts){if(!(this instanceof Socket))return new Socket(uri,opts);opts=opts||{};if(uri&&"object"==typeof uri){opts=uri;uri=null}if(uri){uri=parseuri(uri);opts.host=uri.host;opts.secure=uri.protocol=="https"||uri.protocol=="wss";opts.port=uri.port;if(uri.query)opts.query=uri.query}this.secure=null!=opts.secure?opts.secure:global.location&&"https:"==location.protocol;if(opts.host){var pieces=opts.host.split(":");opts.hostname=pieces.shift();if(pieces.length){opts.port=pieces.pop()}else if(!opts.port){opts.port=this.secure?"443":"80"}}this.agent=opts.agent||false;this.hostname=opts.hostname||(global.location?location.hostname:"localhost");this.port=opts.port||(global.location&&location.port?location.port:this.secure?443:80);this.query=opts.query||{};if("string"==typeof this.query)this.query=parseqs.decode(this.query);this.upgrade=false!==opts.upgrade;this.path=(opts.path||"/engine.io").replace(/\/$/,"")+"/";this.forceJSONP=!!opts.forceJSONP;this.jsonp=false!==opts.jsonp;this.forceBase64=!!opts.forceBase64;this.enablesXDR=!!opts.enablesXDR;this.timestampParam=opts.timestampParam||"t";this.timestampRequests=opts.timestampRequests;this.transports=opts.transports||["polling","websocket"];this.readyState="";this.writeBuffer=[];this.callbackBuffer=[];this.policyPort=opts.policyPort||843;this.rememberUpgrade=opts.rememberUpgrade||false;this.binaryType=null;this.onlyBinaryUpgrades=opts.onlyBinaryUpgrades;this.pfx=opts.pfx||null;this.key=opts.key||null;this.passphrase=opts.passphrase||null;this.cert=opts.cert||null;this.ca=opts.ca||null;this.ciphers=opts.ciphers||null;this.rejectUnauthorized=opts.rejectUnauthorized||null;this.open()}Socket.priorWebsocketSuccess=false;Emitter(Socket.prototype);Socket.protocol=parser.protocol;Socket.Socket=Socket;Socket.Transport=_dereq_("./transport");Socket.transports=_dereq_("./transports");Socket.parser=_dereq_("engine.io-parser");Socket.prototype.createTransport=function(name){debug('creating transport "%s"',name);var query=clone(this.query);query.EIO=parser.protocol;query.transport=name;if(this.id)query.sid=this.id;var transport=new transports[name]({agent:this.agent,hostname:this.hostname,port:this.port,secure:this.secure,path:this.path,query:query,forceJSONP:this.forceJSONP,jsonp:this.jsonp,forceBase64:this.forceBase64,enablesXDR:this.enablesXDR,timestampRequests:this.timestampRequests,timestampParam:this.timestampParam,policyPort:this.policyPort,socket:this,pfx:this.pfx,key:this.key,passphrase:this.passphrase,cert:this.cert,ca:this.ca,ciphers:this.ciphers,rejectUnauthorized:this.rejectUnauthorized});return transport};function clone(obj){var o={};for(var i in obj){if(obj.hasOwnProperty(i)){o[i]=obj[i]}}return o}Socket.prototype.open=function(){var transport;if(this.rememberUpgrade&&Socket.priorWebsocketSuccess&&this.transports.indexOf("websocket")!=-1){transport="websocket"}else if(0==this.transports.length){var self=this;setTimeout(function(){self.emit("error","No transports available")},0);return}else{transport=this.transports[0]}this.readyState="opening";var transport;try{transport=this.createTransport(transport)}catch(e){this.transports.shift();this.open();return}transport.open();this.setTransport(transport)};Socket.prototype.setTransport=function(transport){debug("setting transport %s",transport.name);var self=this;if(this.transport){debug("clearing existing transport %s",this.transport.name);this.transport.removeAllListeners()}this.transport=transport;transport.on("drain",function(){self.onDrain()}).on("packet",function(packet){self.onPacket(packet)}).on("error",function(e){self.onError(e)}).on("close",function(){self.onClose("transport close")})};Socket.prototype.probe=function(name){debug('probing transport "%s"',name);var transport=this.createTransport(name,{probe:1}),failed=false,self=this;Socket.priorWebsocketSuccess=false;function onTransportOpen(){if(self.onlyBinaryUpgrades){var upgradeLosesBinary=!this.supportsBinary&&self.transport.supportsBinary;failed=failed||upgradeLosesBinary}if(failed)return;debug('probe transport "%s" opened',name);transport.send([{type:"ping",data:"probe"}]);transport.once("packet",function(msg){if(failed)return;if("pong"==msg.type&&"probe"==msg.data){debug('probe transport "%s" pong',name);self.upgrading=true;self.emit("upgrading",transport);if(!transport)return;Socket.priorWebsocketSuccess="websocket"==transport.name;debug('pausing current transport "%s"',self.transport.name);self.transport.pause(function(){if(failed)return;if("closed"==self.readyState)return;debug("changing transport and sending upgrade packet");cleanup();self.setTransport(transport);transport.send([{type:"upgrade"}]);self.emit("upgrade",transport);transport=null;self.upgrading=false;self.flush()})}else{debug('probe transport "%s" failed',name);var err=new Error("probe error");err.transport=transport.name;self.emit("upgradeError",err)}})}function freezeTransport(){if(failed)return;failed=true;cleanup();transport.close();transport=null}function onerror(err){var error=new Error("probe error: "+err);error.transport=transport.name;freezeTransport();debug('probe transport "%s" failed because of error: %s',name,err);self.emit("upgradeError",error)}function onTransportClose(){onerror("transport closed")}function onclose(){onerror("socket closed")}function onupgrade(to){if(transport&&to.name!=transport.name){debug('"%s" works - aborting "%s"',to.name,transport.name);freezeTransport()}}function cleanup(){transport.removeListener("open",onTransportOpen);transport.removeListener("error",onerror);transport.removeListener("close",onTransportClose);self.removeListener("close",onclose);self.removeListener("upgrading",onupgrade)}transport.once("open",onTransportOpen);transport.once("error",onerror);transport.once("close",onTransportClose);this.once("close",onclose);this.once("upgrading",onupgrade);transport.open()};Socket.prototype.onOpen=function(){debug("socket open");this.readyState="open";Socket.priorWebsocketSuccess="websocket"==this.transport.name;this.emit("open");this.flush();if("open"==this.readyState&&this.upgrade&&this.transport.pause){debug("starting upgrade probes");for(var i=0,l=this.upgrades.length;i<l;i++){this.probe(this.upgrades[i])}}};Socket.prototype.onPacket=function(packet){if("opening"==this.readyState||"open"==this.readyState){debug('socket receive: type "%s", data "%s"',packet.type,packet.data);this.emit("packet",packet);this.emit("heartbeat");switch(packet.type){case"open":this.onHandshake(parsejson(packet.data));break;case"pong":this.setPing();break;case"error":var err=new Error("server error");err.code=packet.data;this.emit("error",err);break;case"message":this.emit("data",packet.data);this.emit("message",packet.data);break}}else{debug('packet received with socket readyState "%s"',this.readyState)}};Socket.prototype.onHandshake=function(data){this.emit("handshake",data);this.id=data.sid;this.transport.query.sid=data.sid;this.upgrades=this.filterUpgrades(data.upgrades);this.pingInterval=data.pingInterval;this.pingTimeout=data.pingTimeout;this.onOpen();if("closed"==this.readyState)return;this.setPing();this.removeListener("heartbeat",this.onHeartbeat);this.on("heartbeat",this.onHeartbeat)};Socket.prototype.onHeartbeat=function(timeout){clearTimeout(this.pingTimeoutTimer);var self=this;self.pingTimeoutTimer=setTimeout(function(){if("closed"==self.readyState)return;self.onClose("ping timeout")},timeout||self.pingInterval+self.pingTimeout)};Socket.prototype.setPing=function(){var self=this;clearTimeout(self.pingIntervalTimer);self.pingIntervalTimer=setTimeout(function(){debug("writing ping packet - expecting pong within %sms",self.pingTimeout);self.ping();self.onHeartbeat(self.pingTimeout)},self.pingInterval)};Socket.prototype.ping=function(){this.sendPacket("ping")};Socket.prototype.onDrain=function(){for(var i=0;i<this.prevBufferLen;i++){if(this.callbackBuffer[i]){this.callbackBuffer[i]()}}this.writeBuffer.splice(0,this.prevBufferLen);this.callbackBuffer.splice(0,this.prevBufferLen);this.prevBufferLen=0;if(this.writeBuffer.length==0){this.emit("drain")}else{this.flush()}};Socket.prototype.flush=function(){if("closed"!=this.readyState&&this.transport.writable&&!this.upgrading&&this.writeBuffer.length){debug("flushing %d packets in socket",this.writeBuffer.length);this.transport.send(this.writeBuffer);this.prevBufferLen=this.writeBuffer.length;this.emit("flush")}};Socket.prototype.write=Socket.prototype.send=function(msg,fn){this.sendPacket("message",msg,fn);return this};Socket.prototype.sendPacket=function(type,data,fn){if("closing"==this.readyState||"closed"==this.readyState){return}var packet={type:type,data:data};this.emit("packetCreate",packet);this.writeBuffer.push(packet);this.callbackBuffer.push(fn);this.flush()};Socket.prototype.close=function(){if("opening"==this.readyState||"open"==this.readyState){this.readyState="closing";var self=this;function close(){self.onClose("forced close");debug("socket closing - telling transport to close");self.transport.close()}function cleanupAndClose(){self.removeListener("upgrade",cleanupAndClose);self.removeListener("upgradeError",cleanupAndClose);close()}function waitForUpgrade(){self.once("upgrade",cleanupAndClose);self.once("upgradeError",cleanupAndClose)}if(this.writeBuffer.length){this.once("drain",function(){if(this.upgrading){waitForUpgrade()}else{close()}})}else if(this.upgrading){waitForUpgrade()}else{close()}}return this};Socket.prototype.onError=function(err){debug("socket error %j",err);Socket.priorWebsocketSuccess=false;this.emit("error",err);this.onClose("transport error",err)};Socket.prototype.onClose=function(reason,desc){if("opening"==this.readyState||"open"==this.readyState||"closing"==this.readyState){debug('socket close with reason: "%s"',reason);var self=this;clearTimeout(this.pingIntervalTimer);clearTimeout(this.pingTimeoutTimer);setTimeout(function(){self.writeBuffer=[];self.callbackBuffer=[];self.prevBufferLen=0},0);this.transport.removeAllListeners("close");this.transport.close();this.transport.removeAllListeners();this.readyState="closed";this.id=null;this.emit("close",reason,desc)}};Socket.prototype.filterUpgrades=function(upgrades){var filteredUpgrades=[];for(var i=0,j=upgrades.length;i<j;i++){if(~index(this.transports,upgrades[i]))filteredUpgrades.push(upgrades[i])}return filteredUpgrades}}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{"./transport":14,"./transports":15,"component-emitter":9,debug:22,"engine.io-parser":25,indexof:40,parsejson:32,parseqs:33,parseuri:34}],14:[function(_dereq_,module,exports){var parser=_dereq_("engine.io-parser");var Emitter=_dereq_("component-emitter");module.exports=Transport;function Transport(opts){this.path=opts.path;this.hostname=opts.hostname;this.port=opts.port;this.secure=opts.secure;this.query=opts.query;this.timestampParam=opts.timestampParam;this.timestampRequests=opts.timestampRequests;this.readyState="";this.agent=opts.agent||false;this.socket=opts.socket;this.enablesXDR=opts.enablesXDR;this.pfx=opts.pfx;this.key=opts.key;this.passphrase=opts.passphrase;this.cert=opts.cert;this.ca=opts.ca;this.ciphers=opts.ciphers;this.rejectUnauthorized=opts.rejectUnauthorized}Emitter(Transport.prototype);Transport.timestamps=0;Transport.prototype.onError=function(msg,desc){var err=new Error(msg);err.type="TransportError";err.description=desc;this.emit("error",err);return this};Transport.prototype.open=function(){if("closed"==this.readyState||""==this.readyState){this.readyState="opening";this.doOpen()}return this};Transport.prototype.close=function(){if("opening"==this.readyState||"open"==this.readyState){this.doClose();this.onClose()}return this};Transport.prototype.send=function(packets){if("open"==this.readyState){this.write(packets)}else{throw new Error("Transport not open")}};Transport.prototype.onOpen=function(){this.readyState="open";this.writable=true;this.emit("open")};Transport.prototype.onData=function(data){var packet=parser.decodePacket(data,this.socket.binaryType);this.onPacket(packet)};Transport.prototype.onPacket=function(packet){this.emit("packet",packet)};Transport.prototype.onClose=function(){this.readyState="closed";this.emit("close")}},{"component-emitter":9,"engine.io-parser":25}],15:[function(_dereq_,module,exports){(function(global){var XMLHttpRequest=_dereq_("xmlhttprequest");var XHR=_dereq_("./polling-xhr");var JSONP=_dereq_("./polling-jsonp");var websocket=_dereq_("./websocket");exports.polling=polling;exports.websocket=websocket;function polling(opts){var xhr;var xd=false;var xs=false;var jsonp=false!==opts.jsonp;if(global.location){var isSSL="https:"==location.protocol;var port=location.port;if(!port){port=isSSL?443:80}xd=opts.hostname!=location.hostname||port!=opts.port;xs=opts.secure!=isSSL}opts.xdomain=xd;opts.xscheme=xs;xhr=new XMLHttpRequest(opts);if("open"in xhr&&!opts.forceJSONP){return new XHR(opts)}else{if(!jsonp)throw new Error("JSONP disabled");return new JSONP(opts)}}}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{"./polling-jsonp":16,"./polling-xhr":17,"./websocket":19,xmlhttprequest:20}],16:[function(_dereq_,module,exports){(function(global){var Polling=_dereq_("./polling");var inherit=_dereq_("component-inherit");module.exports=JSONPPolling;var rNewline=/\n/g;var rEscapedNewline=/\\n/g;var callbacks;var index=0;function empty(){}function JSONPPolling(opts){Polling.call(this,opts);
+this.query=this.query||{};if(!callbacks){if(!global.___eio)global.___eio=[];callbacks=global.___eio}this.index=callbacks.length;var self=this;callbacks.push(function(msg){self.onData(msg)});this.query.j=this.index;if(global.document&&global.addEventListener){global.addEventListener("beforeunload",function(){if(self.script)self.script.onerror=empty},false)}}inherit(JSONPPolling,Polling);JSONPPolling.prototype.supportsBinary=false;JSONPPolling.prototype.doClose=function(){if(this.script){this.script.parentNode.removeChild(this.script);this.script=null}if(this.form){this.form.parentNode.removeChild(this.form);this.form=null;this.iframe=null}Polling.prototype.doClose.call(this)};JSONPPolling.prototype.doPoll=function(){var self=this;var script=document.createElement("script");if(this.script){this.script.parentNode.removeChild(this.script);this.script=null}script.async=true;script.src=this.uri();script.onerror=function(e){self.onError("jsonp poll error",e)};var insertAt=document.getElementsByTagName("script")[0];insertAt.parentNode.insertBefore(script,insertAt);this.script=script;var isUAgecko="undefined"!=typeof navigator&&/gecko/i.test(navigator.userAgent);if(isUAgecko){setTimeout(function(){var iframe=document.createElement("iframe");document.body.appendChild(iframe);document.body.removeChild(iframe)},100)}};JSONPPolling.prototype.doWrite=function(data,fn){var self=this;if(!this.form){var form=document.createElement("form");var area=document.createElement("textarea");var id=this.iframeId="eio_iframe_"+this.index;var iframe;form.className="socketio";form.style.position="absolute";form.style.top="-1000px";form.style.left="-1000px";form.target=id;form.method="POST";form.setAttribute("accept-charset","utf-8");area.name="d";form.appendChild(area);document.body.appendChild(form);this.form=form;this.area=area}this.form.action=this.uri();function complete(){initIframe();fn()}function initIframe(){if(self.iframe){try{self.form.removeChild(self.iframe)}catch(e){self.onError("jsonp polling iframe removal error",e)}}try{var html='<iframe src="javascript:0" name="'+self.iframeId+'">';iframe=document.createElement(html)}catch(e){iframe=document.createElement("iframe");iframe.name=self.iframeId;iframe.src="javascript:0"}iframe.id=self.iframeId;self.form.appendChild(iframe);self.iframe=iframe}initIframe();data=data.replace(rEscapedNewline,"\\\n");this.area.value=data.replace(rNewline,"\\n");try{this.form.submit()}catch(e){}if(this.iframe.attachEvent){this.iframe.onreadystatechange=function(){if(self.iframe.readyState=="complete"){complete()}}}else{this.iframe.onload=complete}}}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{"./polling":18,"component-inherit":21}],17:[function(_dereq_,module,exports){(function(global){var XMLHttpRequest=_dereq_("xmlhttprequest");var Polling=_dereq_("./polling");var Emitter=_dereq_("component-emitter");var inherit=_dereq_("component-inherit");var debug=_dereq_("debug")("engine.io-client:polling-xhr");module.exports=XHR;module.exports.Request=Request;function empty(){}function XHR(opts){Polling.call(this,opts);if(global.location){var isSSL="https:"==location.protocol;var port=location.port;if(!port){port=isSSL?443:80}this.xd=opts.hostname!=global.location.hostname||port!=opts.port;this.xs=opts.secure!=isSSL}}inherit(XHR,Polling);XHR.prototype.supportsBinary=true;XHR.prototype.request=function(opts){opts=opts||{};opts.uri=this.uri();opts.xd=this.xd;opts.xs=this.xs;opts.agent=this.agent||false;opts.supportsBinary=this.supportsBinary;opts.enablesXDR=this.enablesXDR;opts.pfx=this.pfx;opts.key=this.key;opts.passphrase=this.passphrase;opts.cert=this.cert;opts.ca=this.ca;opts.ciphers=this.ciphers;opts.rejectUnauthorized=this.rejectUnauthorized;return new Request(opts)};XHR.prototype.doWrite=function(data,fn){var isBinary=typeof data!=="string"&&data!==undefined;var req=this.request({method:"POST",data:data,isBinary:isBinary});var self=this;req.on("success",fn);req.on("error",function(err){self.onError("xhr post error",err)});this.sendXhr=req};XHR.prototype.doPoll=function(){debug("xhr poll");var req=this.request();var self=this;req.on("data",function(data){self.onData(data)});req.on("error",function(err){self.onError("xhr poll error",err)});this.pollXhr=req};function Request(opts){this.method=opts.method||"GET";this.uri=opts.uri;this.xd=!!opts.xd;this.xs=!!opts.xs;this.async=false!==opts.async;this.data=undefined!=opts.data?opts.data:null;this.agent=opts.agent;this.isBinary=opts.isBinary;this.supportsBinary=opts.supportsBinary;this.enablesXDR=opts.enablesXDR;this.pfx=opts.pfx;this.key=opts.key;this.passphrase=opts.passphrase;this.cert=opts.cert;this.ca=opts.ca;this.ciphers=opts.ciphers;this.rejectUnauthorized=opts.rejectUnauthorized;this.create()}Emitter(Request.prototype);Request.prototype.create=function(){var opts={agent:this.agent,xdomain:this.xd,xscheme:this.xs,enablesXDR:this.enablesXDR};opts.pfx=this.pfx;opts.key=this.key;opts.passphrase=this.passphrase;opts.cert=this.cert;opts.ca=this.ca;opts.ciphers=this.ciphers;opts.rejectUnauthorized=this.rejectUnauthorized;var xhr=this.xhr=new XMLHttpRequest(opts);var self=this;try{debug("xhr open %s: %s",this.method,this.uri);xhr.open(this.method,this.uri,this.async);if(this.supportsBinary){xhr.responseType="arraybuffer"}if("POST"==this.method){try{if(this.isBinary){xhr.setRequestHeader("Content-type","application/octet-stream")}else{xhr.setRequestHeader("Content-type","text/plain;charset=UTF-8")}}catch(e){}}if("withCredentials"in xhr){xhr.withCredentials=true}if(this.hasXDR()){xhr.onload=function(){self.onLoad()};xhr.onerror=function(){self.onError(xhr.responseText)}}else{xhr.onreadystatechange=function(){if(4!=xhr.readyState)return;if(200==xhr.status||1223==xhr.status){self.onLoad()}else{setTimeout(function(){self.onError(xhr.status)},0)}}}debug("xhr data %s",this.data);xhr.send(this.data)}catch(e){setTimeout(function(){self.onError(e)},0);return}if(global.document){this.index=Request.requestsCount++;Request.requests[this.index]=this}};Request.prototype.onSuccess=function(){this.emit("success");this.cleanup()};Request.prototype.onData=function(data){this.emit("data",data);this.onSuccess()};Request.prototype.onError=function(err){this.emit("error",err);this.cleanup(true)};Request.prototype.cleanup=function(fromError){if("undefined"==typeof this.xhr||null===this.xhr){return}if(this.hasXDR()){this.xhr.onload=this.xhr.onerror=empty}else{this.xhr.onreadystatechange=empty}if(fromError){try{this.xhr.abort()}catch(e){}}if(global.document){delete Request.requests[this.index]}this.xhr=null};Request.prototype.onLoad=function(){var data;try{var contentType;try{contentType=this.xhr.getResponseHeader("Content-Type").split(";")[0]}catch(e){}if(contentType==="application/octet-stream"){data=this.xhr.response}else{if(!this.supportsBinary){data=this.xhr.responseText}else{data="ok"}}}catch(e){this.onError(e)}if(null!=data){this.onData(data)}};Request.prototype.hasXDR=function(){return"undefined"!==typeof global.XDomainRequest&&!this.xs&&this.enablesXDR};Request.prototype.abort=function(){this.cleanup()};if(global.document){Request.requestsCount=0;Request.requests={};if(global.attachEvent){global.attachEvent("onunload",unloadHandler)}else if(global.addEventListener){global.addEventListener("beforeunload",unloadHandler,false)}}function unloadHandler(){for(var i in Request.requests){if(Request.requests.hasOwnProperty(i)){Request.requests[i].abort()}}}}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{"./polling":18,"component-emitter":9,"component-inherit":21,debug:22,xmlhttprequest:20}],18:[function(_dereq_,module,exports){var Transport=_dereq_("../transport");var parseqs=_dereq_("parseqs");var parser=_dereq_("engine.io-parser");var inherit=_dereq_("component-inherit");var debug=_dereq_("debug")("engine.io-client:polling");module.exports=Polling;var hasXHR2=function(){var XMLHttpRequest=_dereq_("xmlhttprequest");var xhr=new XMLHttpRequest({xdomain:false});return null!=xhr.responseType}();function Polling(opts){var forceBase64=opts&&opts.forceBase64;if(!hasXHR2||forceBase64){this.supportsBinary=false}Transport.call(this,opts)}inherit(Polling,Transport);Polling.prototype.name="polling";Polling.prototype.doOpen=function(){this.poll()};Polling.prototype.pause=function(onPause){var pending=0;var self=this;this.readyState="pausing";function pause(){debug("paused");self.readyState="paused";onPause()}if(this.polling||!this.writable){var total=0;if(this.polling){debug("we are currently polling - waiting to pause");total++;this.once("pollComplete",function(){debug("pre-pause polling complete");--total||pause()})}if(!this.writable){debug("we are currently writing - waiting to pause");total++;this.once("drain",function(){debug("pre-pause writing complete");--total||pause()})}}else{pause()}};Polling.prototype.poll=function(){debug("polling");this.polling=true;this.doPoll();this.emit("poll")};Polling.prototype.onData=function(data){var self=this;debug("polling got data %s",data);var callback=function(packet,index,total){if("opening"==self.readyState){self.onOpen()}if("close"==packet.type){self.onClose();return false}self.onPacket(packet)};parser.decodePayload(data,this.socket.binaryType,callback);if("closed"!=this.readyState){this.polling=false;this.emit("pollComplete");if("open"==this.readyState){this.poll()}else{debug('ignoring poll - transport state "%s"',this.readyState)}}};Polling.prototype.doClose=function(){var self=this;function close(){debug("writing close packet");self.write([{type:"close"}])}if("open"==this.readyState){debug("transport open - closing");close()}else{debug("transport not open - deferring close");this.once("open",close)}};Polling.prototype.write=function(packets){var self=this;this.writable=false;var callbackfn=function(){self.writable=true;self.emit("drain")};var self=this;parser.encodePayload(packets,this.supportsBinary,function(data){self.doWrite(data,callbackfn)})};Polling.prototype.uri=function(){var query=this.query||{};var schema=this.secure?"https":"http";var port="";if(false!==this.timestampRequests){query[this.timestampParam]=+new Date+"-"+Transport.timestamps++}if(!this.supportsBinary&&!query.sid){query.b64=1}query=parseqs.encode(query);if(this.port&&("https"==schema&&this.port!=443||"http"==schema&&this.port!=80)){port=":"+this.port}if(query.length){query="?"+query}return schema+"://"+this.hostname+port+this.path+query}},{"../transport":14,"component-inherit":21,debug:22,"engine.io-parser":25,parseqs:33,xmlhttprequest:20}],19:[function(_dereq_,module,exports){var Transport=_dereq_("../transport");var parser=_dereq_("engine.io-parser");var parseqs=_dereq_("parseqs");var inherit=_dereq_("component-inherit");var debug=_dereq_("debug")("engine.io-client:websocket");var WebSocket=_dereq_("ws");module.exports=WS;function WS(opts){var forceBase64=opts&&opts.forceBase64;if(forceBase64){this.supportsBinary=false}Transport.call(this,opts)}inherit(WS,Transport);WS.prototype.name="websocket";WS.prototype.supportsBinary=true;WS.prototype.doOpen=function(){if(!this.check()){return}var self=this;var uri=this.uri();var protocols=void 0;var opts={agent:this.agent};opts.pfx=this.pfx;opts.key=this.key;opts.passphrase=this.passphrase;opts.cert=this.cert;opts.ca=this.ca;opts.ciphers=this.ciphers;opts.rejectUnauthorized=this.rejectUnauthorized;this.ws=new WebSocket(uri,protocols,opts);if(this.ws.binaryType===undefined){this.supportsBinary=false}this.ws.binaryType="arraybuffer";this.addEventListeners()};WS.prototype.addEventListeners=function(){var self=this;this.ws.onopen=function(){self.onOpen()};this.ws.onclose=function(){self.onClose()};this.ws.onmessage=function(ev){self.onData(ev.data)};this.ws.onerror=function(e){self.onError("websocket error",e)}};if("undefined"!=typeof navigator&&/iPad|iPhone|iPod/i.test(navigator.userAgent)){WS.prototype.onData=function(data){var self=this;setTimeout(function(){Transport.prototype.onData.call(self,data)},0)}}WS.prototype.write=function(packets){var self=this;this.writable=false;for(var i=0,l=packets.length;i<l;i++){parser.encodePacket(packets[i],this.supportsBinary,function(data){try{self.ws.send(data)}catch(e){debug("websocket closed before onclose event")}})}function ondrain(){self.writable=true;self.emit("drain")}setTimeout(ondrain,0)};WS.prototype.onClose=function(){Transport.prototype.onClose.call(this)};WS.prototype.doClose=function(){if(typeof this.ws!=="undefined"){this.ws.close()}};WS.prototype.uri=function(){var query=this.query||{};var schema=this.secure?"wss":"ws";var port="";if(this.port&&("wss"==schema&&this.port!=443||"ws"==schema&&this.port!=80)){port=":"+this.port}if(this.timestampRequests){query[this.timestampParam]=+new Date}if(!this.supportsBinary){query.b64=1}query=parseqs.encode(query);if(query.length){query="?"+query}return schema+"://"+this.hostname+port+this.path+query};WS.prototype.check=function(){return!!WebSocket&&!("__initialize"in WebSocket&&this.name===WS.prototype.name)}},{"../transport":14,"component-inherit":21,debug:22,"engine.io-parser":25,parseqs:33,ws:35}],20:[function(_dereq_,module,exports){var hasCORS=_dereq_("has-cors");module.exports=function(opts){var xdomain=opts.xdomain;var xscheme=opts.xscheme;var enablesXDR=opts.enablesXDR;try{if("undefined"!=typeof XMLHttpRequest&&(!xdomain||hasCORS)){return new XMLHttpRequest}}catch(e){}try{if("undefined"!=typeof XDomainRequest&&!xscheme&&enablesXDR){return new XDomainRequest}}catch(e){}if(!xdomain){try{return new ActiveXObject("Microsoft.XMLHTTP")}catch(e){}}}},{"has-cors":38}],21:[function(_dereq_,module,exports){module.exports=function(a,b){var fn=function(){};fn.prototype=b.prototype;a.prototype=new fn;a.prototype.constructor=a}},{}],22:[function(_dereq_,module,exports){exports=module.exports=_dereq_("./debug");exports.log=log;exports.formatArgs=formatArgs;exports.save=save;exports.load=load;exports.useColors=useColors;exports.colors=["lightseagreen","forestgreen","goldenrod","dodgerblue","darkorchid","crimson"];function useColors(){return"WebkitAppearance"in document.documentElement.style||window.console&&(console.firebug||console.exception&&console.table)||navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)&&parseInt(RegExp.$1,10)>=31}exports.formatters.j=function(v){return JSON.stringify(v)};function formatArgs(){var args=arguments;var useColors=this.useColors;args[0]=(useColors?"%c":"")+this.namespace+(useColors?" %c":" ")+args[0]+(useColors?"%c ":" ")+"+"+exports.humanize(this.diff);if(!useColors)return args;var c="color: "+this.color;args=[args[0],c,"color: inherit"].concat(Array.prototype.slice.call(args,1));var index=0;var lastC=0;args[0].replace(/%[a-z%]/g,function(match){if("%%"===match)return;index++;if("%c"===match){lastC=index}});args.splice(lastC,0,c);return args}function log(){return"object"==typeof console&&"function"==typeof console.log&&Function.prototype.apply.call(console.log,console,arguments)}function save(namespaces){try{if(null==namespaces){localStorage.removeItem("debug")}else{localStorage.debug=namespaces}}catch(e){}}function load(){var r;try{r=localStorage.debug}catch(e){}return r}exports.enable(load())},{"./debug":23}],23:[function(_dereq_,module,exports){exports=module.exports=debug;exports.coerce=coerce;exports.disable=disable;exports.enable=enable;exports.enabled=enabled;exports.humanize=_dereq_("ms");exports.names=[];exports.skips=[];exports.formatters={};var prevColor=0;var prevTime;function selectColor(){return exports.colors[prevColor++%exports.colors.length]}function debug(namespace){function disabled(){}disabled.enabled=false;function enabled(){var self=enabled;var curr=+new Date;var ms=curr-(prevTime||curr);self.diff=ms;self.prev=prevTime;self.curr=curr;prevTime=curr;if(null==self.useColors)self.useColors=exports.useColors();if(null==self.color&&self.useColors)self.color=selectColor();var args=Array.prototype.slice.call(arguments);args[0]=exports.coerce(args[0]);if("string"!==typeof args[0]){args=["%o"].concat(args)}var index=0;args[0]=args[0].replace(/%([a-z%])/g,function(match,format){if(match==="%%")return match;index++;var formatter=exports.formatters[format];if("function"===typeof formatter){var val=args[index];match=formatter.call(self,val);args.splice(index,1);index--}return match});if("function"===typeof exports.formatArgs){args=exports.formatArgs.apply(self,args)}var logFn=enabled.log||exports.log||console.log.bind(console);logFn.apply(self,args)}enabled.enabled=true;var fn=exports.enabled(namespace)?enabled:disabled;fn.namespace=namespace;return fn}function enable(namespaces){exports.save(namespaces);var split=(namespaces||"").split(/[\s,]+/);var len=split.length;for(var i=0;i<len;i++){if(!split[i])continue;namespaces=split[i].replace(/\*/g,".*?");if(namespaces[0]==="-"){exports.skips.push(new RegExp("^"+namespaces.substr(1)+"$"))}else{exports.names.push(new RegExp("^"+namespaces+"$"))}}}function disable(){exports.enable("")}function enabled(name){var i,len;for(i=0,len=exports.skips.length;i<len;i++){if(exports.skips[i].test(name)){return false}}for(i=0,len=exports.names.length;i<len;i++){if(exports.names[i].test(name)){return true}}return false}function coerce(val){if(val instanceof Error)return val.stack||val.message;return val}},{ms:24}],24:[function(_dereq_,module,exports){var s=1e3;var m=s*60;var h=m*60;var d=h*24;var y=d*365.25;module.exports=function(val,options){options=options||{};if("string"==typeof val)return parse(val);return options.long?long(val):short(val)};function parse(str){var match=/^((?:\d+)?\.?\d+) *(ms|seconds?|s|minutes?|m|hours?|h|days?|d|years?|y)?$/i.exec(str);if(!match)return;var n=parseFloat(match[1]);var type=(match[2]||"ms").toLowerCase();switch(type){case"years":case"year":case"y":return n*y;case"days":case"day":case"d":return n*d;case"hours":case"hour":case"h":return n*h;case"minutes":case"minute":case"m":return n*m;case"seconds":case"second":case"s":return n*s;case"ms":return n}}function short(ms){if(ms>=d)return Math.round(ms/d)+"d";if(ms>=h)return Math.round(ms/h)+"h";if(ms>=m)return Math.round(ms/m)+"m";if(ms>=s)return Math.round(ms/s)+"s";return ms+"ms"}function long(ms){return plural(ms,d,"day")||plural(ms,h,"hour")||plural(ms,m,"minute")||plural(ms,s,"second")||ms+" ms"}function plural(ms,n,name){if(ms<n)return;if(ms<n*1.5)return Math.floor(ms/n)+" "+name;return Math.ceil(ms/n)+" "+name+"s"}},{}],25:[function(_dereq_,module,exports){(function(global){var keys=_dereq_("./keys");var hasBinary=_dereq_("has-binary");var sliceBuffer=_dereq_("arraybuffer.slice");var base64encoder=_dereq_("base64-arraybuffer");var after=_dereq_("after");var utf8=_dereq_("utf8");var isAndroid=navigator.userAgent.match(/Android/i);var isPhantomJS=/PhantomJS/i.test(navigator.userAgent);var dontSendBlobs=isAndroid||isPhantomJS;exports.protocol=3;var packets=exports.packets={open:0,close:1,ping:2,pong:3,message:4,upgrade:5,noop:6};var packetslist=keys(packets);var err={type:"error",data:"parser error"};var Blob=_dereq_("blob");exports.encodePacket=function(packet,supportsBinary,utf8encode,callback){if("function"==typeof supportsBinary){callback=supportsBinary;supportsBinary=false}if("function"==typeof utf8encode){callback=utf8encode;utf8encode=null}var data=packet.data===undefined?undefined:packet.data.buffer||packet.data;if(global.ArrayBuffer&&data instanceof ArrayBuffer){return encodeArrayBuffer(packet,supportsBinary,callback)}else if(Blob&&data instanceof global.Blob){return encodeBlob(packet,supportsBinary,callback)}if(data&&data.base64){return encodeBase64Object(packet,callback)}var encoded=packets[packet.type];if(undefined!==packet.data){encoded+=utf8encode?utf8.encode(String(packet.data)):String(packet.data)}return callback(""+encoded)};function encodeBase64Object(packet,callback){var message="b"+exports.packets[packet.type]+packet.data.data;return callback(message)}function encodeArrayBuffer(packet,supportsBinary,callback){if(!supportsBinary){return exports.encodeBase64Packet(packet,callback)}var data=packet.data;var contentArray=new Uint8Array(data);var resultBuffer=new Uint8Array(1+data.byteLength);resultBuffer[0]=packets[packet.type];for(var i=0;i<contentArray.length;i++){resultBuffer[i+1]=contentArray[i]}return callback(resultBuffer.buffer)}function encodeBlobAsArrayBuffer(packet,supportsBinary,callback){if(!supportsBinary){return exports.encodeBase64Packet(packet,callback)}var fr=new FileReader;fr.onload=function(){packet.data=fr.result;exports.encodePacket(packet,supportsBinary,true,callback)};return fr.readAsArrayBuffer(packet.data)}function encodeBlob(packet,supportsBinary,callback){if(!supportsBinary){return exports.encodeBase64Packet(packet,callback)}if(dontSendBlobs){return encodeBlobAsArrayBuffer(packet,supportsBinary,callback)}var length=new Uint8Array(1);length[0]=packets[packet.type];var blob=new Blob([length.buffer,packet.data]);return callback(blob)}exports.encodeBase64Packet=function(packet,callback){var message="b"+exports.packets[packet.type];if(Blob&&packet.data instanceof Blob){var fr=new FileReader;fr.onload=function(){var b64=fr.result.split(",")[1];callback(message+b64)};return fr.readAsDataURL(packet.data)}var b64data;try{b64data=String.fromCharCode.apply(null,new Uint8Array(packet.data))}catch(e){var typed=new Uint8Array(packet.data);var basic=new Array(typed.length);for(var i=0;i<typed.length;i++){basic[i]=typed[i]}b64data=String.fromCharCode.apply(null,basic)}message+=global.btoa(b64data);return callback(message)};exports.decodePacket=function(data,binaryType,utf8decode){if(typeof data=="string"||data===undefined){if(data.charAt(0)=="b"){return exports.decodeBase64Packet(data.substr(1),binaryType)}if(utf8decode){try{data=utf8.decode(data)}catch(e){return err}}var type=data.charAt(0);if(Number(type)!=type||!packetslist[type]){return err}if(data.length>1){return{type:packetslist[type],data:data.substring(1)}}else{return{type:packetslist[type]}}}var asArray=new Uint8Array(data);var type=asArray[0];var rest=sliceBuffer(data,1);if(Blob&&binaryType==="blob"){rest=new Blob([rest])}return{type:packetslist[type],data:rest}};exports.decodeBase64Packet=function(msg,binaryType){var type=packetslist[msg.charAt(0)];if(!global.ArrayBuffer){return{type:type,data:{base64:true,data:msg.substr(1)}}}var data=base64encoder.decode(msg.substr(1));if(binaryType==="blob"&&Blob){data=new Blob([data])}return{type:type,data:data}};exports.encodePayload=function(packets,supportsBinary,callback){if(typeof supportsBinary=="function"){callback=supportsBinary;supportsBinary=null}var isBinary=hasBinary(packets);if(supportsBinary&&isBinary){if(Blob&&!dontSendBlobs){return exports.encodePayloadAsBlob(packets,callback)}return exports.encodePayloadAsArrayBuffer(packets,callback)}if(!packets.length){return callback("0:")}function setLengthHeader(message){return message.length+":"+message}function encodeOne(packet,doneCallback){exports.encodePacket(packet,!isBinary?false:supportsBinary,true,function(message){doneCallback(null,setLengthHeader(message))})}map(packets,encodeOne,function(err,results){return callback(results.join(""))})};function map(ary,each,done){var result=new Array(ary.length);var next=after(ary.length,done);var eachWithIndex=function(i,el,cb){each(el,function(error,msg){result[i]=msg;cb(error,result)})};for(var i=0;i<ary.length;i++){eachWithIndex(i,ary[i],next)}}exports.decodePayload=function(data,binaryType,callback){if(typeof data!="string"){return exports.decodePayloadAsBinary(data,binaryType,callback)}if(typeof binaryType==="function"){callback=binaryType;binaryType=null}var packet;if(data==""){return callback(err,0,1)}var length="",n,msg;for(var i=0,l=data.length;i<l;i++){var chr=data.charAt(i);if(":"!=chr){length+=chr}else{if(""==length||length!=(n=Number(length))){return callback(err,0,1)}msg=data.substr(i+1,n);if(length!=msg.length){return callback(err,0,1)}if(msg.length){packet=exports.decodePacket(msg,binaryType,true);if(err.type==packet.type&&err.data==packet.data){return callback(err,0,1)}var ret=callback(packet,i+n,l);if(false===ret)return}i+=n;length=""}}if(length!=""){return callback(err,0,1)}};exports.encodePayloadAsArrayBuffer=function(packets,callback){if(!packets.length){return callback(new ArrayBuffer(0))}function encodeOne(packet,doneCallback){exports.encodePacket(packet,true,true,function(data){return doneCallback(null,data)})}map(packets,encodeOne,function(err,encodedPackets){var totalLength=encodedPackets.reduce(function(acc,p){var len;if(typeof p==="string"){len=p.length}else{len=p.byteLength}return acc+len.toString().length+len+2},0);var resultArray=new Uint8Array(totalLength);var bufferIndex=0;encodedPackets.forEach(function(p){var isString=typeof p==="string";var ab=p;if(isString){var view=new Uint8Array(p.length);for(var i=0;i<p.length;i++){view[i]=p.charCodeAt(i)}ab=view.buffer}if(isString){resultArray[bufferIndex++]=0}else{resultArray[bufferIndex++]=1}var lenStr=ab.byteLength.toString();for(var i=0;i<lenStr.length;i++){resultArray[bufferIndex++]=parseInt(lenStr[i])}resultArray[bufferIndex++]=255;var view=new Uint8Array(ab);for(var i=0;i<view.length;i++){resultArray[bufferIndex++]=view[i]}});return callback(resultArray.buffer)})};exports.encodePayloadAsBlob=function(packets,callback){function encodeOne(packet,doneCallback){exports.encodePacket(packet,true,true,function(encoded){var binaryIdentifier=new Uint8Array(1);binaryIdentifier[0]=1;if(typeof encoded==="string"){var view=new Uint8Array(encoded.length);for(var i=0;i<encoded.length;i++){view[i]=encoded.charCodeAt(i)}encoded=view.buffer;binaryIdentifier[0]=0}var len=encoded instanceof ArrayBuffer?encoded.byteLength:encoded.size;var lenStr=len.toString();var lengthAry=new Uint8Array(lenStr.length+1);for(var i=0;i<lenStr.length;i++){lengthAry[i]=parseInt(lenStr[i])}lengthAry[lenStr.length]=255;if(Blob){var blob=new Blob([binaryIdentifier.buffer,lengthAry.buffer,encoded]);doneCallback(null,blob)}})}map(packets,encodeOne,function(err,results){return callback(new Blob(results))})};exports.decodePayloadAsBinary=function(data,binaryType,callback){if(typeof binaryType==="function"){callback=binaryType;binaryType=null}var bufferTail=data;var buffers=[];var numberTooLong=false;while(bufferTail.byteLength>0){var tailArray=new Uint8Array(bufferTail);var isString=tailArray[0]===0;var msgLength="";for(var i=1;;i++){if(tailArray[i]==255)break;if(msgLength.length>310){numberTooLong=true;break}msgLength+=tailArray[i]}if(numberTooLong)return callback(err,0,1);bufferTail=sliceBuffer(bufferTail,2+msgLength.length);msgLength=parseInt(msgLength);var msg=sliceBuffer(bufferTail,0,msgLength);if(isString){try{msg=String.fromCharCode.apply(null,new Uint8Array(msg))}catch(e){var typed=new Uint8Array(msg);msg="";for(var i=0;i<typed.length;i++){msg+=String.fromCharCode(typed[i])}}}buffers.push(msg);bufferTail=sliceBuffer(bufferTail,msgLength)}var total=buffers.length;buffers.forEach(function(buffer,i){callback(exports.decodePacket(buffer,binaryType,true),i,total)})}}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{"./keys":26,after:27,"arraybuffer.slice":28,"base64-arraybuffer":29,blob:30,"has-binary":36,utf8:31}],26:[function(_dereq_,module,exports){module.exports=Object.keys||function keys(obj){var arr=[];var has=Object.prototype.hasOwnProperty;for(var i in obj){if(has.call(obj,i)){arr.push(i)}}return arr}},{}],27:[function(_dereq_,module,exports){module.exports=after;function after(count,callback,err_cb){var bail=false;err_cb=err_cb||noop;proxy.count=count;return count===0?callback():proxy;function proxy(err,result){if(proxy.count<=0){throw new Error("after called too many times")}--proxy.count;if(err){bail=true;callback(err);callback=err_cb}else if(proxy.count===0&&!bail){callback(null,result)}}}function noop(){}},{}],28:[function(_dereq_,module,exports){module.exports=function(arraybuffer,start,end){var bytes=arraybuffer.byteLength;start=start||0;end=end||bytes;if(arraybuffer.slice){return arraybuffer.slice(start,end)}if(start<0){start+=bytes}if(end<0){end+=bytes}if(end>bytes){end=bytes}if(start>=bytes||start>=end||bytes===0){return new ArrayBuffer(0)}var abv=new Uint8Array(arraybuffer);var result=new Uint8Array(end-start);for(var i=start,ii=0;i<end;i++,ii++){result[ii]=abv[i]}return result.buffer}},{}],29:[function(_dereq_,module,exports){(function(chars){"use strict";exports.encode=function(arraybuffer){var bytes=new Uint8Array(arraybuffer),i,len=bytes.length,base64="";for(i=0;i<len;i+=3){base64+=chars[bytes[i]>>2];base64+=chars[(bytes[i]&3)<<4|bytes[i+1]>>4];base64+=chars[(bytes[i+1]&15)<<2|bytes[i+2]>>6];base64+=chars[bytes[i+2]&63]}if(len%3===2){base64=base64.substring(0,base64.length-1)+"="}else if(len%3===1){base64=base64.substring(0,base64.length-2)+"=="}return base64};exports.decode=function(base64){var bufferLength=base64.length*.75,len=base64.length,i,p=0,encoded1,encoded2,encoded3,encoded4;if(base64[base64.length-1]==="="){bufferLength--;if(base64[base64.length-2]==="="){bufferLength--}}var arraybuffer=new ArrayBuffer(bufferLength),bytes=new Uint8Array(arraybuffer);for(i=0;i<len;i+=4){encoded1=chars.indexOf(base64[i]);encoded2=chars.indexOf(base64[i+1]);encoded3=chars.indexOf(base64[i+2]);encoded4=chars.indexOf(base64[i+3]);bytes[p++]=encoded1<<2|encoded2>>4;bytes[p++]=(encoded2&15)<<4|encoded3>>2;bytes[p++]=(encoded3&3)<<6|encoded4&63}return arraybuffer}})("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/")},{}],30:[function(_dereq_,module,exports){(function(global){var BlobBuilder=global.BlobBuilder||global.WebKitBlobBuilder||global.MSBlobBuilder||global.MozBlobBuilder;var blobSupported=function(){try{var a=new Blob(["hi"]);return a.size===2}catch(e){return false}}();var blobSupportsArrayBufferView=blobSupported&&function(){try{var b=new Blob([new Uint8Array([1,2])]);return b.size===2}catch(e){return false}}();var blobBuilderSupported=BlobBuilder&&BlobBuilder.prototype.append&&BlobBuilder.prototype.getBlob;function mapArrayBufferViews(ary){for(var i=0;i<ary.length;i++){var chunk=ary[i];if(chunk.buffer instanceof ArrayBuffer){var buf=chunk.buffer;if(chunk.byteLength!==buf.byteLength){var copy=new Uint8Array(chunk.byteLength);copy.set(new Uint8Array(buf,chunk.byteOffset,chunk.byteLength));buf=copy.buffer}ary[i]=buf}}}function BlobBuilderConstructor(ary,options){options=options||{};var bb=new BlobBuilder;mapArrayBufferViews(ary);for(var i=0;i<ary.length;i++){bb.append(ary[i])}return options.type?bb.getBlob(options.type):bb.getBlob()}function BlobConstructor(ary,options){mapArrayBufferViews(ary);return new Blob(ary,options||{})}module.exports=function(){if(blobSupported){return blobSupportsArrayBufferView?global.Blob:BlobConstructor}else if(blobBuilderSupported){return BlobBuilderConstructor}else{return undefined}}()}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{}],31:[function(_dereq_,module,exports){(function(global){(function(root){var freeExports=typeof exports=="object"&&exports;var freeModule=typeof module=="object"&&module&&module.exports==freeExports&&module;var freeGlobal=typeof global=="object"&&global;if(freeGlobal.global===freeGlobal||freeGlobal.window===freeGlobal){root=freeGlobal}var stringFromCharCode=String.fromCharCode;function ucs2decode(string){var output=[];var counter=0;var length=string.length;var value;var extra;while(counter<length){value=string.charCodeAt(counter++);if(value>=55296&&value<=56319&&counter<length){extra=string.charCodeAt(counter++);if((extra&64512)==56320){output.push(((value&1023)<<10)+(extra&1023)+65536)}else{output.push(value);counter--}}else{output.push(value)}}return output}function ucs2encode(array){var length=array.length;var index=-1;var value;var output="";while(++index<length){value=array[index];if(value>65535){value-=65536;output+=stringFromCharCode(value>>>10&1023|55296);value=56320|value&1023}output+=stringFromCharCode(value)}return output}function checkScalarValue(codePoint){if(codePoint>=55296&&codePoint<=57343){throw Error("Lone surrogate U+"+codePoint.toString(16).toUpperCase()+" is not a scalar value")
+}}function createByte(codePoint,shift){return stringFromCharCode(codePoint>>shift&63|128)}function encodeCodePoint(codePoint){if((codePoint&4294967168)==0){return stringFromCharCode(codePoint)}var symbol="";if((codePoint&4294965248)==0){symbol=stringFromCharCode(codePoint>>6&31|192)}else if((codePoint&4294901760)==0){checkScalarValue(codePoint);symbol=stringFromCharCode(codePoint>>12&15|224);symbol+=createByte(codePoint,6)}else if((codePoint&4292870144)==0){symbol=stringFromCharCode(codePoint>>18&7|240);symbol+=createByte(codePoint,12);symbol+=createByte(codePoint,6)}symbol+=stringFromCharCode(codePoint&63|128);return symbol}function utf8encode(string){var codePoints=ucs2decode(string);var length=codePoints.length;var index=-1;var codePoint;var byteString="";while(++index<length){codePoint=codePoints[index];byteString+=encodeCodePoint(codePoint)}return byteString}function readContinuationByte(){if(byteIndex>=byteCount){throw Error("Invalid byte index")}var continuationByte=byteArray[byteIndex]&255;byteIndex++;if((continuationByte&192)==128){return continuationByte&63}throw Error("Invalid continuation byte")}function decodeSymbol(){var byte1;var byte2;var byte3;var byte4;var codePoint;if(byteIndex>byteCount){throw Error("Invalid byte index")}if(byteIndex==byteCount){return false}byte1=byteArray[byteIndex]&255;byteIndex++;if((byte1&128)==0){return byte1}if((byte1&224)==192){var byte2=readContinuationByte();codePoint=(byte1&31)<<6|byte2;if(codePoint>=128){return codePoint}else{throw Error("Invalid continuation byte")}}if((byte1&240)==224){byte2=readContinuationByte();byte3=readContinuationByte();codePoint=(byte1&15)<<12|byte2<<6|byte3;if(codePoint>=2048){checkScalarValue(codePoint);return codePoint}else{throw Error("Invalid continuation byte")}}if((byte1&248)==240){byte2=readContinuationByte();byte3=readContinuationByte();byte4=readContinuationByte();codePoint=(byte1&15)<<18|byte2<<12|byte3<<6|byte4;if(codePoint>=65536&&codePoint<=1114111){return codePoint}}throw Error("Invalid UTF-8 detected")}var byteArray;var byteCount;var byteIndex;function utf8decode(byteString){byteArray=ucs2decode(byteString);byteCount=byteArray.length;byteIndex=0;var codePoints=[];var tmp;while((tmp=decodeSymbol())!==false){codePoints.push(tmp)}return ucs2encode(codePoints)}var utf8={version:"2.0.0",encode:utf8encode,decode:utf8decode};if(typeof define=="function"&&typeof define.amd=="object"&&define.amd){define(function(){return utf8})}else if(freeExports&&!freeExports.nodeType){if(freeModule){freeModule.exports=utf8}else{var object={};var hasOwnProperty=object.hasOwnProperty;for(var key in utf8){hasOwnProperty.call(utf8,key)&&(freeExports[key]=utf8[key])}}}else{root.utf8=utf8}})(this)}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{}],32:[function(_dereq_,module,exports){(function(global){var rvalidchars=/^[\],:{}\s]*$/;var rvalidescape=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g;var rvalidtokens=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g;var rvalidbraces=/(?:^|:|,)(?:\s*\[)+/g;var rtrimLeft=/^\s+/;var rtrimRight=/\s+$/;module.exports=function parsejson(data){if("string"!=typeof data||!data){return null}data=data.replace(rtrimLeft,"").replace(rtrimRight,"");if(global.JSON&&JSON.parse){return JSON.parse(data)}if(rvalidchars.test(data.replace(rvalidescape,"@").replace(rvalidtokens,"]").replace(rvalidbraces,""))){return new Function("return "+data)()}}}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{}],33:[function(_dereq_,module,exports){exports.encode=function(obj){var str="";for(var i in obj){if(obj.hasOwnProperty(i)){if(str.length)str+="&";str+=encodeURIComponent(i)+"="+encodeURIComponent(obj[i])}}return str};exports.decode=function(qs){var qry={};var pairs=qs.split("&");for(var i=0,l=pairs.length;i<l;i++){var pair=pairs[i].split("=");qry[decodeURIComponent(pair[0])]=decodeURIComponent(pair[1])}return qry}},{}],34:[function(_dereq_,module,exports){var re=/^(?:(?![^:@]+:[^:@\/]*@)(http|https|ws|wss):\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?((?:[a-f0-9]{0,4}:){2,7}[a-f0-9]{0,4}|[^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/;var parts=["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"];module.exports=function parseuri(str){var src=str,b=str.indexOf("["),e=str.indexOf("]");if(b!=-1&&e!=-1){str=str.substring(0,b)+str.substring(b,e).replace(/:/g,";")+str.substring(e,str.length)}var m=re.exec(str||""),uri={},i=14;while(i--){uri[parts[i]]=m[i]||""}if(b!=-1&&e!=-1){uri.source=src;uri.host=uri.host.substring(1,uri.host.length-1).replace(/;/g,":");uri.authority=uri.authority.replace("[","").replace("]","").replace(/;/g,":");uri.ipv6uri=true}return uri}},{}],35:[function(_dereq_,module,exports){var global=function(){return this}();var WebSocket=global.WebSocket||global.MozWebSocket;module.exports=WebSocket?ws:null;function ws(uri,protocols,opts){var instance;if(protocols){instance=new WebSocket(uri,protocols)}else{instance=new WebSocket(uri)}return instance}if(WebSocket)ws.prototype=WebSocket.prototype},{}],36:[function(_dereq_,module,exports){(function(global){var isArray=_dereq_("isarray");module.exports=hasBinary;function hasBinary(data){function _hasBinary(obj){if(!obj)return false;if(global.Buffer&&global.Buffer.isBuffer(obj)||global.ArrayBuffer&&obj instanceof ArrayBuffer||global.Blob&&obj instanceof Blob||global.File&&obj instanceof File){return true}if(isArray(obj)){for(var i=0;i<obj.length;i++){if(_hasBinary(obj[i])){return true}}}else if(obj&&"object"==typeof obj){if(obj.toJSON){obj=obj.toJSON()}for(var key in obj){if(Object.prototype.hasOwnProperty.call(obj,key)&&_hasBinary(obj[key])){return true}}}return false}return _hasBinary(data)}}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{isarray:37}],37:[function(_dereq_,module,exports){module.exports=Array.isArray||function(arr){return Object.prototype.toString.call(arr)=="[object Array]"}},{}],38:[function(_dereq_,module,exports){var global=_dereq_("global");try{module.exports="XMLHttpRequest"in global&&"withCredentials"in new global.XMLHttpRequest}catch(err){module.exports=false}},{global:39}],39:[function(_dereq_,module,exports){module.exports=function(){return this}()},{}],40:[function(_dereq_,module,exports){var indexOf=[].indexOf;module.exports=function(arr,obj){if(indexOf)return arr.indexOf(obj);for(var i=0;i<arr.length;++i){if(arr[i]===obj)return i}return-1}},{}],41:[function(_dereq_,module,exports){var has=Object.prototype.hasOwnProperty;exports.keys=Object.keys||function(obj){var keys=[];for(var key in obj){if(has.call(obj,key)){keys.push(key)}}return keys};exports.values=function(obj){var vals=[];for(var key in obj){if(has.call(obj,key)){vals.push(obj[key])}}return vals};exports.merge=function(a,b){for(var key in b){if(has.call(b,key)){a[key]=b[key]}}return a};exports.length=function(obj){return exports.keys(obj).length};exports.isEmpty=function(obj){return 0==exports.length(obj)}},{}],42:[function(_dereq_,module,exports){var re=/^(?:(?![^:@]+:[^:@\/]*@)(http|https|ws|wss):\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?((?:[a-f0-9]{0,4}:){2,7}[a-f0-9]{0,4}|[^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/;var parts=["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"];module.exports=function parseuri(str){var m=re.exec(str||""),uri={},i=14;while(i--){uri[parts[i]]=m[i]||""}return uri}},{}],43:[function(_dereq_,module,exports){(function(global){var isArray=_dereq_("isarray");var isBuf=_dereq_("./is-buffer");exports.deconstructPacket=function(packet){var buffers=[];var packetData=packet.data;function _deconstructPacket(data){if(!data)return data;if(isBuf(data)){var placeholder={_placeholder:true,num:buffers.length};buffers.push(data);return placeholder}else if(isArray(data)){var newData=new Array(data.length);for(var i=0;i<data.length;i++){newData[i]=_deconstructPacket(data[i])}return newData}else if("object"==typeof data&&!(data instanceof Date)){var newData={};for(var key in data){newData[key]=_deconstructPacket(data[key])}return newData}return data}var pack=packet;pack.data=_deconstructPacket(packetData);pack.attachments=buffers.length;return{packet:pack,buffers:buffers}};exports.reconstructPacket=function(packet,buffers){var curPlaceHolder=0;function _reconstructPacket(data){if(data&&data._placeholder){var buf=buffers[data.num];return buf}else if(isArray(data)){for(var i=0;i<data.length;i++){data[i]=_reconstructPacket(data[i])}return data}else if(data&&"object"==typeof data){for(var key in data){data[key]=_reconstructPacket(data[key])}return data}return data}packet.data=_reconstructPacket(packet.data);packet.attachments=undefined;return packet};exports.removeBlobs=function(data,callback){function _removeBlobs(obj,curKey,containingObject){if(!obj)return obj;if(global.Blob&&obj instanceof Blob||global.File&&obj instanceof File){pendingBlobs++;var fileReader=new FileReader;fileReader.onload=function(){if(containingObject){containingObject[curKey]=this.result}else{bloblessData=this.result}if(!--pendingBlobs){callback(bloblessData)}};fileReader.readAsArrayBuffer(obj)}else if(isArray(obj)){for(var i=0;i<obj.length;i++){_removeBlobs(obj[i],i,obj)}}else if(obj&&"object"==typeof obj&&!isBuf(obj)){for(var key in obj){_removeBlobs(obj[key],key,obj)}}}var pendingBlobs=0;var bloblessData=data;_removeBlobs(bloblessData);if(!pendingBlobs){callback(bloblessData)}}}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{"./is-buffer":45,isarray:46}],44:[function(_dereq_,module,exports){var debug=_dereq_("debug")("socket.io-parser");var json=_dereq_("json3");var isArray=_dereq_("isarray");var Emitter=_dereq_("component-emitter");var binary=_dereq_("./binary");var isBuf=_dereq_("./is-buffer");exports.protocol=4;exports.types=["CONNECT","DISCONNECT","EVENT","BINARY_EVENT","ACK","BINARY_ACK","ERROR"];exports.CONNECT=0;exports.DISCONNECT=1;exports.EVENT=2;exports.ACK=3;exports.ERROR=4;exports.BINARY_EVENT=5;exports.BINARY_ACK=6;exports.Encoder=Encoder;exports.Decoder=Decoder;function Encoder(){}Encoder.prototype.encode=function(obj,callback){debug("encoding packet %j",obj);if(exports.BINARY_EVENT==obj.type||exports.BINARY_ACK==obj.type){encodeAsBinary(obj,callback)}else{var encoding=encodeAsString(obj);callback([encoding])}};function encodeAsString(obj){var str="";var nsp=false;str+=obj.type;if(exports.BINARY_EVENT==obj.type||exports.BINARY_ACK==obj.type){str+=obj.attachments;str+="-"}if(obj.nsp&&"/"!=obj.nsp){nsp=true;str+=obj.nsp}if(null!=obj.id){if(nsp){str+=",";nsp=false}str+=obj.id}if(null!=obj.data){if(nsp)str+=",";str+=json.stringify(obj.data)}debug("encoded %j as %s",obj,str);return str}function encodeAsBinary(obj,callback){function writeEncoding(bloblessData){var deconstruction=binary.deconstructPacket(bloblessData);var pack=encodeAsString(deconstruction.packet);var buffers=deconstruction.buffers;buffers.unshift(pack);callback(buffers)}binary.removeBlobs(obj,writeEncoding)}function Decoder(){this.reconstructor=null}Emitter(Decoder.prototype);Decoder.prototype.add=function(obj){var packet;if("string"==typeof obj){packet=decodeString(obj);if(exports.BINARY_EVENT==packet.type||exports.BINARY_ACK==packet.type){this.reconstructor=new BinaryReconstructor(packet);if(this.reconstructor.reconPack.attachments===0){this.emit("decoded",packet)}}else{this.emit("decoded",packet)}}else if(isBuf(obj)||obj.base64){if(!this.reconstructor){throw new Error("got binary data when not reconstructing a packet")}else{packet=this.reconstructor.takeBinaryData(obj);if(packet){this.reconstructor=null;this.emit("decoded",packet)}}}else{throw new Error("Unknown type: "+obj)}};function decodeString(str){var p={};var i=0;p.type=Number(str.charAt(0));if(null==exports.types[p.type])return error();if(exports.BINARY_EVENT==p.type||exports.BINARY_ACK==p.type){var buf="";while(str.charAt(++i)!="-"){buf+=str.charAt(i);if(i==str.length)break}if(buf!=Number(buf)||str.charAt(i)!="-"){throw new Error("Illegal attachments")}p.attachments=Number(buf)}if("/"==str.charAt(i+1)){p.nsp="";while(++i){var c=str.charAt(i);if(","==c)break;p.nsp+=c;if(i==str.length)break}}else{p.nsp="/"}var next=str.charAt(i+1);if(""!==next&&Number(next)==next){p.id="";while(++i){var c=str.charAt(i);if(null==c||Number(c)!=c){--i;break}p.id+=str.charAt(i);if(i==str.length)break}p.id=Number(p.id)}if(str.charAt(++i)){try{p.data=json.parse(str.substr(i))}catch(e){return error()}}debug("decoded %s as %j",str,p);return p}Decoder.prototype.destroy=function(){if(this.reconstructor){this.reconstructor.finishedReconstruction()}};function BinaryReconstructor(packet){this.reconPack=packet;this.buffers=[]}BinaryReconstructor.prototype.takeBinaryData=function(binData){this.buffers.push(binData);if(this.buffers.length==this.reconPack.attachments){var packet=binary.reconstructPacket(this.reconPack,this.buffers);this.finishedReconstruction();return packet}return null};BinaryReconstructor.prototype.finishedReconstruction=function(){this.reconPack=null;this.buffers=[]};function error(data){return{type:exports.ERROR,data:"parser error"}}},{"./binary":43,"./is-buffer":45,"component-emitter":9,debug:10,isarray:46,json3:47}],45:[function(_dereq_,module,exports){(function(global){module.exports=isBuf;function isBuf(obj){return global.Buffer&&global.Buffer.isBuffer(obj)||global.ArrayBuffer&&obj instanceof ArrayBuffer}}).call(this,typeof self!=="undefined"?self:typeof window!=="undefined"?window:{})},{}],46:[function(_dereq_,module,exports){module.exports=_dereq_(37)},{}],47:[function(_dereq_,module,exports){(function(window){var getClass={}.toString,isProperty,forEach,undef;var isLoader=typeof define==="function"&&define.amd;var nativeJSON=typeof JSON=="object"&&JSON;var JSON3=typeof exports=="object"&&exports&&!exports.nodeType&&exports;if(JSON3&&nativeJSON){JSON3.stringify=nativeJSON.stringify;JSON3.parse=nativeJSON.parse}else{JSON3=window.JSON=nativeJSON||{}}var isExtended=new Date(-0xc782b5b800cec);try{isExtended=isExtended.getUTCFullYear()==-109252&&isExtended.getUTCMonth()===0&&isExtended.getUTCDate()===1&&isExtended.getUTCHours()==10&&isExtended.getUTCMinutes()==37&&isExtended.getUTCSeconds()==6&&isExtended.getUTCMilliseconds()==708}catch(exception){}function has(name){if(has[name]!==undef){return has[name]}var isSupported;if(name=="bug-string-char-index"){isSupported="a"[0]!="a"}else if(name=="json"){isSupported=has("json-stringify")&&has("json-parse")}else{var value,serialized='{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';if(name=="json-stringify"){var stringify=JSON3.stringify,stringifySupported=typeof stringify=="function"&&isExtended;if(stringifySupported){(value=function(){return 1}).toJSON=value;try{stringifySupported=stringify(0)==="0"&&stringify(new Number)==="0"&&stringify(new String)=='""'&&stringify(getClass)===undef&&stringify(undef)===undef&&stringify()===undef&&stringify(value)==="1"&&stringify([value])=="[1]"&&stringify([undef])=="[null]"&&stringify(null)=="null"&&stringify([undef,getClass,null])=="[null,null,null]"&&stringify({a:[value,true,false,null,"\x00\b\n\f\r "]})==serialized&&stringify(null,value)==="1"&&stringify([1,2],null,1)=="[\n 1,\n 2\n]"&&stringify(new Date(-864e13))=='"-271821-04-20T00:00:00.000Z"'&&stringify(new Date(864e13))=='"+275760-09-13T00:00:00.000Z"'&&stringify(new Date(-621987552e5))=='"-000001-01-01T00:00:00.000Z"'&&stringify(new Date(-1))=='"1969-12-31T23:59:59.999Z"'}catch(exception){stringifySupported=false}}isSupported=stringifySupported}if(name=="json-parse"){var parse=JSON3.parse;if(typeof parse=="function"){try{if(parse("0")===0&&!parse(false)){value=parse(serialized);var parseSupported=value["a"].length==5&&value["a"][0]===1;if(parseSupported){try{parseSupported=!parse('"  "')}catch(exception){}if(parseSupported){try{parseSupported=parse("01")!==1}catch(exception){}}if(parseSupported){try{parseSupported=parse("1.")!==1}catch(exception){}}}}}catch(exception){parseSupported=false}}isSupported=parseSupported}}return has[name]=!!isSupported}if(!has("json")){var functionClass="[object Function]";var dateClass="[object Date]";var numberClass="[object Number]";var stringClass="[object String]";var arrayClass="[object Array]";var booleanClass="[object Boolean]";var charIndexBuggy=has("bug-string-char-index");if(!isExtended){var floor=Math.floor;var Months=[0,31,59,90,120,151,181,212,243,273,304,334];var getDay=function(year,month){return Months[month]+365*(year-1970)+floor((year-1969+(month=+(month>1)))/4)-floor((year-1901+month)/100)+floor((year-1601+month)/400)}}if(!(isProperty={}.hasOwnProperty)){isProperty=function(property){var members={},constructor;if((members.__proto__=null,members.__proto__={toString:1},members).toString!=getClass){isProperty=function(property){var original=this.__proto__,result=property in(this.__proto__=null,this);this.__proto__=original;return result}}else{constructor=members.constructor;isProperty=function(property){var parent=(this.constructor||constructor).prototype;return property in this&&!(property in parent&&this[property]===parent[property])}}members=null;return isProperty.call(this,property)}}var PrimitiveTypes={"boolean":1,number:1,string:1,undefined:1};var isHostType=function(object,property){var type=typeof object[property];return type=="object"?!!object[property]:!PrimitiveTypes[type]};forEach=function(object,callback){var size=0,Properties,members,property;(Properties=function(){this.valueOf=0}).prototype.valueOf=0;members=new Properties;for(property in members){if(isProperty.call(members,property)){size++}}Properties=members=null;if(!size){members=["valueOf","toString","toLocaleString","propertyIsEnumerable","isPrototypeOf","hasOwnProperty","constructor"];forEach=function(object,callback){var isFunction=getClass.call(object)==functionClass,property,length;var hasProperty=!isFunction&&typeof object.constructor!="function"&&isHostType(object,"hasOwnProperty")?object.hasOwnProperty:isProperty;for(property in object){if(!(isFunction&&property=="prototype")&&hasProperty.call(object,property)){callback(property)}}for(length=members.length;property=members[--length];hasProperty.call(object,property)&&callback(property));}}else if(size==2){forEach=function(object,callback){var members={},isFunction=getClass.call(object)==functionClass,property;for(property in object){if(!(isFunction&&property=="prototype")&&!isProperty.call(members,property)&&(members[property]=1)&&isProperty.call(object,property)){callback(property)}}}}else{forEach=function(object,callback){var isFunction=getClass.call(object)==functionClass,property,isConstructor;for(property in object){if(!(isFunction&&property=="prototype")&&isProperty.call(object,property)&&!(isConstructor=property==="constructor")){callback(property)}}if(isConstructor||isProperty.call(object,property="constructor")){callback(property)}}}return forEach(object,callback)};if(!has("json-stringify")){var Escapes={92:"\\\\",34:'\\"',8:"\\b",12:"\\f",10:"\\n",13:"\\r",9:"\\t"};var leadingZeroes="000000";var toPaddedString=function(width,value){return(leadingZeroes+(value||0)).slice(-width)};var unicodePrefix="\\u00";var quote=function(value){var result='"',index=0,length=value.length,isLarge=length>10&&charIndexBuggy,symbols;if(isLarge){symbols=value.split("")}for(;index<length;index++){var charCode=value.charCodeAt(index);switch(charCode){case 8:case 9:case 10:case 12:case 13:case 34:case 92:result+=Escapes[charCode];break;default:if(charCode<32){result+=unicodePrefix+toPaddedString(2,charCode.toString(16));break}result+=isLarge?symbols[index]:charIndexBuggy?value.charAt(index):value[index]}}return result+'"'};var serialize=function(property,object,callback,properties,whitespace,indentation,stack){var value,className,year,month,date,time,hours,minutes,seconds,milliseconds,results,element,index,length,prefix,result;try{value=object[property]}catch(exception){}if(typeof value=="object"&&value){className=getClass.call(value);if(className==dateClass&&!isProperty.call(value,"toJSON")){if(value>-1/0&&value<1/0){if(getDay){date=floor(value/864e5);for(year=floor(date/365.2425)+1970-1;getDay(year+1,0)<=date;year++);for(month=floor((date-getDay(year,0))/30.42);getDay(year,month+1)<=date;month++);date=1+date-getDay(year,month);time=(value%864e5+864e5)%864e5;hours=floor(time/36e5)%24;minutes=floor(time/6e4)%60;seconds=floor(time/1e3)%60;milliseconds=time%1e3}else{year=value.getUTCFullYear();month=value.getUTCMonth();date=value.getUTCDate();hours=value.getUTCHours();minutes=value.getUTCMinutes();seconds=value.getUTCSeconds();milliseconds=value.getUTCMilliseconds()}value=(year<=0||year>=1e4?(year<0?"-":"+")+toPaddedString(6,year<0?-year:year):toPaddedString(4,year))+"-"+toPaddedString(2,month+1)+"-"+toPaddedString(2,date)+"T"+toPaddedString(2,hours)+":"+toPaddedString(2,minutes)+":"+toPaddedString(2,seconds)+"."+toPaddedString(3,milliseconds)+"Z"}else{value=null}}else if(typeof value.toJSON=="function"&&(className!=numberClass&&className!=stringClass&&className!=arrayClass||isProperty.call(value,"toJSON"))){value=value.toJSON(property)}}if(callback){value=callback.call(object,property,value)}if(value===null){return"null"}className=getClass.call(value);if(className==booleanClass){return""+value}else if(className==numberClass){return value>-1/0&&value<1/0?""+value:"null"}else if(className==stringClass){return quote(""+value)}if(typeof value=="object"){for(length=stack.length;length--;){if(stack[length]===value){throw TypeError()}}stack.push(value);results=[];prefix=indentation;indentation+=whitespace;if(className==arrayClass){for(index=0,length=value.length;index<length;index++){element=serialize(index,value,callback,properties,whitespace,indentation,stack);results.push(element===undef?"null":element)}result=results.length?whitespace?"[\n"+indentation+results.join(",\n"+indentation)+"\n"+prefix+"]":"["+results.join(",")+"]":"[]"}else{forEach(properties||value,function(property){var element=serialize(property,value,callback,properties,whitespace,indentation,stack);if(element!==undef){results.push(quote(property)+":"+(whitespace?" ":"")+element)}});result=results.length?whitespace?"{\n"+indentation+results.join(",\n"+indentation)+"\n"+prefix+"}":"{"+results.join(",")+"}":"{}"}stack.pop();return result}};JSON3.stringify=function(source,filter,width){var whitespace,callback,properties,className;if(typeof filter=="function"||typeof filter=="object"&&filter){if((className=getClass.call(filter))==functionClass){callback=filter}else if(className==arrayClass){properties={};for(var index=0,length=filter.length,value;index<length;value=filter[index++],(className=getClass.call(value),className==stringClass||className==numberClass)&&(properties[value]=1));}}if(width){if((className=getClass.call(width))==numberClass){if((width-=width%1)>0){for(whitespace="",width>10&&(width=10);whitespace.length<width;whitespace+=" ");}}else if(className==stringClass){whitespace=width.length<=10?width:width.slice(0,10)}}return serialize("",(value={},value[""]=source,value),callback,properties,whitespace,"",[])}}if(!has("json-parse")){var fromCharCode=String.fromCharCode;var Unescapes={92:"\\",34:'"',47:"/",98:"\b",116:"  ",110:"\n",102:"\f",114:"\r"};var Index,Source;var abort=function(){Index=Source=null;throw SyntaxError()};var lex=function(){var source=Source,length=source.length,value,begin,position,isSigned,charCode;while(Index<length){charCode=source.charCodeAt(Index);switch(charCode){case 9:case 10:case 13:case 32:Index++;break;case 123:case 125:case 91:case 93:case 58:case 44:value=charIndexBuggy?source.charAt(Index):source[Index];Index++;return value;case 34:for(value="@",Index++;Index<length;){charCode=source.charCodeAt(Index);if(charCode<32){abort()}else if(charCode==92){charCode=source.charCodeAt(++Index);switch(charCode){case 92:case 34:case 47:case 98:case 116:case 110:case 102:case 114:value+=Unescapes[charCode];Index++;break;case 117:begin=++Index;for(position=Index+4;Index<position;Index++){charCode=source.charCodeAt(Index);if(!(charCode>=48&&charCode<=57||charCode>=97&&charCode<=102||charCode>=65&&charCode<=70)){abort()}}value+=fromCharCode("0x"+source.slice(begin,Index));break;default:abort()}}else{if(charCode==34){break}charCode=source.charCodeAt(Index);begin=Index;while(charCode>=32&&charCode!=92&&charCode!=34){charCode=source.charCodeAt(++Index)}value+=source.slice(begin,Index)}}if(source.charCodeAt(Index)==34){Index++;return value}abort();default:begin=Index;if(charCode==45){isSigned=true;charCode=source.charCodeAt(++Index)}if(charCode>=48&&charCode<=57){if(charCode==48&&(charCode=source.charCodeAt(Index+1),charCode>=48&&charCode<=57)){abort()}isSigned=false;for(;Index<length&&(charCode=source.charCodeAt(Index),charCode>=48&&charCode<=57);Index++);if(source.charCodeAt(Index)==46){position=++Index;for(;position<length&&(charCode=source.charCodeAt(position),charCode>=48&&charCode<=57);position++);if(position==Index){abort()}Index=position}charCode=source.charCodeAt(Index);if(charCode==101||charCode==69){charCode=source.charCodeAt(++Index);if(charCode==43||charCode==45){Index++}for(position=Index;position<length&&(charCode=source.charCodeAt(position),charCode>=48&&charCode<=57);position++);if(position==Index){abort()}Index=position}return+source.slice(begin,Index)}if(isSigned){abort()}if(source.slice(Index,Index+4)=="true"){Index+=4;return true}else if(source.slice(Index,Index+5)=="false"){Index+=5;return false}else if(source.slice(Index,Index+4)=="null"){Index+=4;return null}abort()}}return"$"};var get=function(value){var results,hasMembers;if(value=="$"){abort()}if(typeof value=="string"){if((charIndexBuggy?value.charAt(0):value[0])=="@"){return value.slice(1)}if(value=="["){results=[];for(;;hasMembers||(hasMembers=true)){value=lex();if(value=="]"){break}if(hasMembers){if(value==","){value=lex();if(value=="]"){abort()}}else{abort()}}if(value==","){abort()}results.push(get(value))}return results}else if(value=="{"){results={};for(;;hasMembers||(hasMembers=true)){value=lex();if(value=="}"){break}if(hasMembers){if(value==","){value=lex();if(value=="}"){abort()}}else{abort()}}if(value==","||typeof value!="string"||(charIndexBuggy?value.charAt(0):value[0])!="@"||lex()!=":"){abort()}results[value.slice(1)]=get(lex())}return results}abort()}return value};var update=function(source,property,callback){var element=walk(source,property,callback);if(element===undef){delete source[property]}else{source[property]=element}};var walk=function(source,property,callback){var value=source[property],length;if(typeof value=="object"&&value){if(getClass.call(value)==arrayClass){for(length=value.length;length--;){update(value,length,callback)}}else{forEach(value,function(property){update(value,property,callback)})}}return callback.call(source,property,value)};JSON3.parse=function(source,callback){var result,value;Index=0;Source=""+source;result=get(lex());if(lex()!="$"){abort()}Index=Source=null;return callback&&getClass.call(callback)==functionClass?walk((value={},value[""]=result,value),"",callback):result}}}if(isLoader){define(function(){return JSON3})}})(this)},{}],48:[function(_dereq_,module,exports){module.exports=toArray;function toArray(list,index){var array=[];index=index||0;for(var i=index||0;i<list.length;i++){array[i-index]=list[i]}return array}},{}]},{},[1])(1)});
\ No newline at end of file

From db2e354206020345f8708a316261cb935e5dc344 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Mon, 26 Oct 2015 15:40:54 +0800
Subject: [PATCH 35/78] update sioconnector template

---
 template/web-server/public/index.html     | 115 ++++++++++-----------
 template/web-server/public/index.html.sio | 116 ++++++++++++----------
 2 files changed, 115 insertions(+), 116 deletions(-)

diff --git a/template/web-server/public/index.html b/template/web-server/public/index.html
index 63f0d6fbd..1ef1e4a93 100644
--- a/template/web-server/public/index.html
+++ b/template/web-server/public/index.html
@@ -1,72 +1,57 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <meta charset="utf-8" />
-  <title>
-    Pomelo
-  </title>
-  <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-  <meta http-equiv="content-style-type" content="text/css" />
-  <meta http-equiv="content-scripte-type" content="text/javascript" />
-  <meta name="author" content="netease" />
-  <meta name="version" content="1.0" />
-  <meta name="keywords" content="pomelo" />
-  <link type="text/css" rel="stylesheet" href="css/base.css" />
-  <script src="js/lib/build/build.js" type="text/javascript"></script>
-  <script type="text/javascript">
-  require('boot');
-  </script> 
-  <script type="text/javascript">
-  var pomelo = window.pomelo;
-  var host = "127.0.0.1";
-  var port = "3010";
-  var connected = false;
-  var node, para;
-  function show() {
-    if(!connected) {
-      pomelo.init({
-        host: host,
-        port: port
-      }, function() {
+  <head>
+    <meta charset="utf-8" />
+    <title>
+      Pomelo
+    </title>
+    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+    <meta http-equiv="content-style-type" content="text/css" />
+    <meta http-equiv="content-scripte-type" content="text/javascript" />
+    <meta name="author" content="netease" />
+    <meta name="version" content="1.0" />
+    <meta name="keywords" content="pomelo" />
+    <link type="text/css" rel="stylesheet" href="css/base.css" />
+    <script src="js/lib/build/build.js" type="text/javascript"></script>
+    <script type="text/javascript">
+      require('boot');
+    </script> 
+    <script type="text/javascript">
+      var pomelo = window.pomelo;
+      var host = "127.0.0.1";
+      var port = "3010";
+      function show() {
+        pomelo.init({
+          host: host,
+          port: port,
+          log: true
+        }, function() {
         pomelo.request("connector.entryHandler.entry", "hello pomelo", function(data) {
-          para = document.getElementById('result');
-          node = document.createTextNode(data.msg);
-          para.appendChild(node);
-          connected = true;
+            alert(data.msg);
+          });
         });
-      });
-    } else {
-      para.removeChild(node);
-      pomelo.request("connector.entryHandler.entry", "hello pomelo", function(data) {
-        console.log(data.msg);
-        para.appendChild(node);
-      });
-    }
-  }
-  </script>
-</head>
-<body>
-  <div class="g-doc">
-    <div class="g-banner" style="border:none">
-      <div class="logo">
-        <div class="img"></div>
+      }
+    </script>
+  </head>
+  <body>
+    <div class="g-doc">
+      <div class="g-banner" style="border:none">
+        <div class="logo">
+          <div class="img"></div>
+        </div>
       </div>
-    </div>
-    <div class="g-background">
-      <div class="g-content">
-        Welcome to Pomelo
+      <div class="g-background">
+        <div class="g-content">
+          Welcome to Pomelo
+        </div>
+      </div>
+      <div class="g-link">
+        Home:
+        <a href="https://github.com/NetEase/pomelo">https://github.com/NetEase/pomelo</a>
+      </div>
+      <div class="g-button">
+        <input id="test" type="button" value="Test Game Server" onclick="show()"/>
       </div>
     </div>
-    <div class="g-link">
-      Home:
-      <a href="https://github.com/NetEase/pomelo">https://github.com/NetEase/pomelo</a>
-    </div>
-    <div class="g-result">
-      <p id='result'></p>
-    </div>
-    <div class="g-button">
-      <input id="test" type="button" value="Test Game Server" onclick="show()"/>
-    </div>
-  </div>
-</body>
-</html>
+  </body>
+</html>
\ No newline at end of file
diff --git a/template/web-server/public/index.html.sio b/template/web-server/public/index.html.sio
index f33ae290e..f35dc6059 100644
--- a/template/web-server/public/index.html.sio
+++ b/template/web-server/public/index.html.sio
@@ -1,58 +1,72 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8" />
-    <title>
-      Pomelo
-    </title>
-    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-    <meta http-equiv="content-style-type" content="text/css" />
-    <meta http-equiv="content-scripte-type" content="text/javascript" />
-    <meta name="author" content="netease" />
-    <meta name="version" content="1.0" />
-    <meta name="keywords" content="pomelo" />
-    <link type="text/css" rel="stylesheet" href="css/base.css" />
-    <script src="js/lib/socket.io.js">
-    </script>
-    <script src="js/lib/pomeloclient.js">
-    </script>
-    <script type="text/javascript">
-      var pomelo = window.pomelo;
-      var host = "127.0.0.1";
-      var port = "3010";
-      function show() {
-        pomelo.init({
-          host: host,
-          port: port,
-          log: true
-        }, function() {
+<head>
+  <meta charset="utf-8" />
+  <title>
+    Pomelo
+  </title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+  <meta http-equiv="content-style-type" content="text/css" />
+  <meta http-equiv="content-scripte-type" content="text/javascript" />
+  <meta name="author" content="netease" />
+  <meta name="version" content="1.0" />
+  <meta name="keywords" content="pomelo" />
+  <link type="text/css" rel="stylesheet" href="css/base.css" />
+  <script src="js/lib/socket.io.js">
+  </script>
+  <script src="js/lib/pomeloclient.js">
+  </script>
+  <script type="text/javascript">
+  var pomelo = window.pomelo;
+  var host = "127.0.0.1";
+  var port = "3010";
+  var connected = false;
+  var node, para;
+  function show() {
+    if(!connected) {
+      pomelo.init({
+        host: host,
+        port: port
+      }, function() {
         pomelo.request("connector.entryHandler.entry", "hello pomelo", function(data) {
-            alert(data.msg);
-          });
+          para = document.getElementById('result');
+          node = document.createTextNode(data.msg);
+          para.appendChild(node);
+          connected = true;
         });
-      }
-    </script>
- 
-  </head>
-  <body>
-    <div class="g-doc">
-      <div class="g-banner" style="border:none">
-        <div class="logo">
-          <div class="img"></div>
-        </div>
+      });
+    } else {
+      para.removeChild(node);
+      pomelo.request("connector.entryHandler.entry", "hello pomelo", function(data) {
+        console.log(data.msg);
+        para.appendChild(node);
+      });
+    }
+  }
+  </script>
+</head>
+<body>
+  <div class="g-doc">
+    <div class="g-banner" style="border:none">
+      <div class="logo">
+        <div class="img"></div>
       </div>
-      <div class="g-background">
-        <div class="g-content">
-          Welcome to Pomelo
-        </div>
-      </div>
-      <div class="g-link">
-        Home:
-        <a href="https://github.com/NetEase/pomelo">https://github.com/NetEase/pomelo</a>
-      </div>
-      <div class="g-button">
-        <input id="test" type="button" value="Test Game Server" onclick="show()"/>
+    </div>
+    <div class="g-background">
+      <div class="g-content">
+        Welcome to Pomelo
       </div>
     </div>
-  </body>
-</html>
+    <div class="g-link">
+      Home:
+      <a href="https://github.com/NetEase/pomelo">https://github.com/NetEase/pomelo</a>
+    </div>
+    <div class="g-result">
+      <p id='result'></p>
+    </div>
+    <div class="g-button">
+      <input id="test" type="button" value="Test Game Server" onclick="show()"/>
+    </div>
+  </div>
+</body>
+</html>
\ No newline at end of file

From 51dceab969df89222f2370f84bded42e2d082184 Mon Sep 17 00:00:00 2001
From: "zhangmin.name" <zhangmin@zhangmin.name>
Date: Tue, 27 Oct 2015 16:26:45 +0800
Subject: [PATCH 36/78] refine zkmonitor code

---
 lib/connectors/sioconnector.js   |   2 +-
 lib/monitors/common/cmd.js       |  40 +++++----
 lib/monitors/zookeepermonitor.js | 150 ++++++++++++++++++++++++-------
 3 files changed, 141 insertions(+), 51 deletions(-)

diff --git a/lib/connectors/sioconnector.js b/lib/connectors/sioconnector.js
index 0df533d44..7b1957b6d 100644
--- a/lib/connectors/sioconnector.js
+++ b/lib/connectors/sioconnector.js
@@ -1,7 +1,7 @@
 'use strict';
 var util = require('util');
 var EventEmitter = require('events').EventEmitter;
-var sio = require('socket.io')();
+var sio = require('socket.io');
 var SioSocket = require('./siosocket');
 
 var PKG_ID_BYTES = 4;
diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index 7ecb7a0fc..7f8204cc3 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -13,40 +13,41 @@ Command.init = function(client, data) {
 	}
 	data = JSON.parse(data);
 	switch(data.command) {
-		case 1:
+		case 'stop':
 			stop(client);
 			break;
-		case 2:
+		case 'kill':
 			kill(client);
 			break;
-		case 3:
+		case 'addCron':
 			addCron(client, data);
 			break;
-		case 4:
+		case 'removeCron':
 			removeCron(client, data);
 			break;
-		case 5:
+		case 'blacklist':
 			addBlacklist(client, data);
 			break;
-		case 6:
+		case 'set':
 		    set(client, data);
 		    break;
-		case 7:
+		case 'get':
 			get(client, data);
 			break;
-		case 8:
+		case 'enable':
 			enable(client, data);
 			break;
-		case 9:
+		case 'disable':
 			disable(client, data);
 			break;
-		case 10:
+		case 'run':
 			run(client, data);
 			break;
-		case 11:
+		case 'exec':
 			exec(client, data);
 			break;
 		default:
+			logger.debug('server: %s receive unknown command, with data: %j', client.app.serverId, data);
 			break;
 	}
 };
@@ -85,7 +86,7 @@ var set = function(client, msg) {
 	var value = msg.param['value'];
 	logger.info('set %s to value %s in server %s', key, value, client.app.serverId);
 	client.app.set(key, value);
-}
+};
 
 var get = function(zk, msg) {
 	var value = zk.app.get(msg.param);
@@ -96,17 +97,17 @@ var get = function(zk, msg) {
 	logger.info('get %s the value is %s in server %s', msg.param, value, zk.app.serverId);
 	if (!value) value = 'undefined';
 	sendCommandResult(zk, value);
-}
+};
 
 var enable = function(client, msg) {
 	logger.info('enable %s in server %s', msg.param, client.app.serverId);
 	client.app.enable(msg.param);
-}
+};
 
 var disable = function(client, msg) {
 	logger.info('disable %s in server %s', msg.param, client.app.serverId);
 	client.app.disable(msg.param);
-}
+};
 
 var run = function(zk, msg) {
 	var ctx = {
@@ -121,7 +122,7 @@ var run = function(zk, msg) {
 		logger.error('run %s in server %s with err %s', msg.param, zk.app.serverId, e.toString());
 		sendCommandResult(zk, e.toString());
 	}
-}
+};
 
 var exec = function(zk, msg) {
 	var context = {
@@ -145,7 +146,7 @@ var exec = function(zk, msg) {
 		logger.error('exec %s in server %s with err %s', msg.script, zk.app.serverId, e.toString());
         sendCommandResult(zk, e.toString())
     }
-}
+};
 
 function sendCommandResult(zk, result) {
 	var buffer = new Buffer(result);
@@ -154,7 +155,8 @@ function sendCommandResult(zk, result) {
 				logger.error('send result to zookeeper failed with err:%j', err);
 			}
 	});
-}
+};
+
 function checkJSON(obj) {
 	if (!obj) {
 		return true;
@@ -165,4 +167,4 @@ function checkJSON(obj) {
 		return false;
 	}
 	return true;
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index 05f8c56b9..eff0e9b4f 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -131,10 +131,48 @@ var registerZK = function(zk, cb) {
 
   var allInfo = {};
 
+  allInfo.serverInfo = getServerInfo(zk);
+  allInfo.connectionInfo = getConnectionInfo(zk);
+  allInfo.loginInfo = allInfo.connectionInfo;
+  allInfo.proxyInfo = getProxyInfo(zk);
+  allInfo.handlerInfo = getHandlerInfo(zk);
+  allInfo.settingInfo = getSettingInfo(zk);
+  allInfo.componentInfo = getComponentInfo(zk);
+  allInfo.statusInfo = getStatusInfo(zk);
+  allInfo.moduleInfo = getModuleInfo(zk);
+
+  var buffer = new Buffer(JSON.stringify(allInfo));
+
+  async.series([
+    function(callback) {
+      createAllNode(zk, buffer, zookeeper.CreateMode.EPHEMERAL, function(err) {
+        if(!!err) {
+          logger.error('create server node %s failed, with err : %j ', zk.nodePath, err.stack);
+          utils.invokeCallback(callback, err);
+          return;
+        }
+        utils.invokeCallback(callback);
+      });
+    },
+    function(callback) {
+      getData(zk, zk.cmdPath, watchCommand.bind(zk), function(err, data) {
+        logger.debug('cmd data: %j', data);
+        utils.invokeCallback(callback);
+      });
+    }
+    ],
+    function(err, rs) {
+      utils.invokeCallback(cb, err);
+    });
+};
+
+var getServerInfo = function(zk) {
   var serverInfo = zk.app.getCurServer();
   serverInfo.pid = process.pid;
-  allInfo.serverInfo = serverInfo;
-  
+  return serverInfo;
+};
+
+var getConnectionInfo = function(zk) {
   var connectionInfo = {};
   var connection = zk.app.components.__connection__;
   connectionInfo.serverId = zk.app.serverId;
@@ -143,10 +181,10 @@ var registerZK = function(zk, cb) {
     
   }
   connectionInfo.body = 'no connection';
-  allInfo.connectionInfo = connectionInfo;
+  return connectionInfo;
+};
 
-  allInfo.loginInfo = connectionInfo;
-  
+var getProxyInfo = function(zk) {
   var proxyInfo = {};
   var __proxy__ = zk.app.components.__proxy__;
   if (__proxy__ && __proxy__.client && __proxy__.client.proxies.user) {
@@ -167,12 +205,14 @@ var registerZK = function(zk, cb) {
           }
         }
       }
-      allInfo.proxyInfo = proxyInfo;
     }
   } else {
-    allInfo.proxyInfo = 'no proxy loaded';
+    proxyInfo = 'no proxy loaded';
   }
+  return proxyInfo;
+};
 
+var getHandlerInfo = function(zk) {
   var handlerInfo = {};
   var __server__ = zk.app.components.__server__;
   if (__server__ && __server__.server && __server__.server.handlerService.handlers) {
@@ -193,36 +233,83 @@ var registerZK = function(zk, cb) {
           }
         }
       }
-      allInfo.handlerInfo = handlerInfo;
     }
   } else {
-    allInfo.handlerInfo = 'no handler loaded';
+    handlerInfo = 'no handler loaded';
   }
+  return handlerInfo;
+};
 
-  var buffer = new Buffer(JSON.stringify(allInfo));
+var getComponentInfo = function(zk) {
+    var _components = zk.app.components;
+    var res = {};
+    for (var key in _components) {
+      var name = getComponentName(key);
+      res[name] = clone(name, zk.app.get(name + 'Config'))
+    }
+    return res;
+};
 
-  async.series([
-    function(callback) {
-      createAllNode(zk, buffer, zookeeper.CreateMode.EPHEMERAL, function(err) {
-        if(!!err) {
-          logger.error('create server node %s failed, with err : %j ', zk.nodePath, err.stack);
-          utils.invokeCallback(callback, err);
-          return;
-        }
-        utils.invokeCallback(callback);
-      });
-    },
-    function(callback) {
-      getData(zk, zk.cmdPath, watchCommand.bind(zk), function(err, data) {
-        logger.debug('cmd data: %j', data);
-        utils.invokeCallback(callback);
-      });
+var getSettingInfo = function(zk) {
+    var _settings = zk.app.settings;
+    var res = {};
+    for (var key in _settings) {
+      if (key.match(/^__\w+__$/) || key.match(/\w+Config$/)) {
+        continue;
+      }
+      if (!checkJSON(_settings[key])) {
+        res[key] = 'Object';
+        continue;
+      }
+      res[key] = _settings[key];
     }
-    ],
-    function(err, rs) {
-      utils.invokeCallback(cb, err);
-    });
+    return res;
+};
+
+var getStatusInfo = function(zk) {
+    var statusInfo = {};
+    return statusInfo;
+};
+
+var getModuleInfo = function(zk) {
+    var moduleInfo = {};
+    return moduleInfo;
 };
+function clone(param, obj) {
+  var result = {};
+  var flag = 1;
+  for (var key in obj) {
+    if (typeof obj[key] === 'function' || typeof obj[key] === 'object') {
+      continue;
+    }
+    flag = 0;
+    result[key] = obj[key];
+  }
+  if (flag) {
+    // return 'no ' + param + 'Config info';
+  }
+  return result;
+}
+
+function getComponentName(c) {
+  var t = c.match(/^__(\w+)__$/);
+  if (t) {
+    t = t[1];
+  }
+  return t;
+}
+
+function checkJSON(obj) {
+  if (!obj) {
+    return true;
+  }
+  try {
+    JSON.stringify(obj);
+  } catch (e) {
+    return false;
+  }
+  return true;
+}
 
 var createAllNode = function(zk, value, mode, cb) {
   async.series([
@@ -287,7 +374,8 @@ var getClusterInfo = function(app, zk, servers) {
             success = false;
             return;
           }
-          var serverInfo = JSON.parse(data);
+          var allInfo = JSON.parse(data);
+          var serverInfo = allInfo.serverInfo;
           results[serverInfo.id] = serverInfo;
           latch.done();
         });

From 39a1f8034511d182047e7b2fe896b70ac86685db Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Fri, 30 Oct 2015 16:03:13 +0800
Subject: [PATCH 37/78] redis-registry cmd support

---
 lib/monitors/redismonitor.js | 10 ++++++++++
 lib/util/constants.js        |  1 +
 2 files changed, 11 insertions(+)

diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index 012c4194e..7d22fd992 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -45,6 +45,16 @@ Monitor.prototype.stop = function() {
   clearInterval(this.timer);
 };
 
+Monitor.prototype.sendCommandResult = function(result) {
+  //send result to redis, key:
+  var key = constants.RESERVED.REDIS_REG_RES_PREFIX + app.env + ':' + serverInfo.id;
+  this.client.set(key, result, function(err){
+    if(err){
+      logger.error('set %j err: %j', key, err);
+    }
+  });
+};
+
 var watcherCluster2Command = function() {
   getClusterInfo(this, this.app, this.client, this.app.getCurServer());
   getCommand(this, this.app, this.client, this.app.getCurServer());
diff --git a/lib/util/constants.js b/lib/util/constants.js
index d0945d402..26667a68e 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -78,6 +78,7 @@ module.exports = {
     ZK: 'zookeeper',
     REDIS: 'redis',
     REDIS_REG_PREFIX: 'pomelo-regist:',
+    REDIS_REG_PREFIX: 'pomelo-regist-result:',
     DEFAULT_REDIS_PORT: 6379,
 	DEFAULT_REDIS_HOST: '127.0.0.1',
     DEFAULT_SERVERTYPE: 'pomelo-server'

From 8a4fbefc2a8368449811780454c72d16c71b333c Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Fri, 30 Oct 2015 16:22:57 +0800
Subject: [PATCH 38/78] send result move out cmd.js

---
 lib/monitors/common/cmd.js | 43 +++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index 7f8204cc3..e7b9e67a6 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -88,15 +88,15 @@ var set = function(client, msg) {
 	client.app.set(key, value);
 };
 
-var get = function(zk, msg) {
-	var value = zk.app.get(msg.param);
+var get = function(client, msg) {
+	var value = client.app.get(msg.param);
 	if (!checkJSON(value)) {
 		value = 'object';
 	}
 
-	logger.info('get %s the value is %s in server %s', msg.param, value, zk.app.serverId);
+	logger.info('get %s the value is %s in server %s', msg.param, value, client.app.serverId);
 	if (!value) value = 'undefined';
-	sendCommandResult(zk, value);
+	client.sendCommandResult(value);
 };
 
 var enable = function(client, msg) {
@@ -109,24 +109,24 @@ var disable = function(client, msg) {
 	client.app.disable(msg.param);
 };
 
-var run = function(zk, msg) {
+var run = function(client, msg) {
 	var ctx = {
-			app: zk.app,
+			app: client.app,
 			result: null
 	};
 	try {
 		vm.runInNewContext('result = ' + msg.param, ctx, 'myApp.vm');
-		logger.info('run %s in server %s with result %s', msg.param, zk.app.serverId, util.inspect(ctx.result));
-		sendCommandResult(zk, util.inspect(ctx.result));
+		logger.info('run %s in server %s with result %s', msg.param, client.app.serverId, util.inspect(ctx.result));
+		client.sendCommandResult(util.inspect(ctx.result));
 	} catch(e) {
-		logger.error('run %s in server %s with err %s', msg.param, zk.app.serverId, e.toString());
-		sendCommandResult(zk, e.toString());
+		logger.error('run %s in server %s with err %s', msg.param, client.app.serverId, e.toString());
+		client.sendCommandResult(e.toString());
 	}
 };
 
-var exec = function(zk, msg) {
+var exec = function(client, msg) {
 	var context = {
-        app: zk.app,
+        app: client.app,
         require: require,
         os: require('os'),
         fs: require('fs'),
@@ -135,28 +135,19 @@ var exec = function(zk, msg) {
     };
     try {
         vm.runInNewContext(msg.script, context);
-		logger.info('exec %s in server %s with result %s', msg.script, zk.app.serverId, context.result);
+		logger.info('exec %s in server %s with result %s', msg.script, client.app.serverId, context.result);
         var result = context.result;
         if (!result) {
-        	sendCommandResult(zk, "script result should be assigned to result value to script module context");
+        	client.sendCommandResult("script result should be assigned to result value to script module context");
         } else {
-        	sendCommandResult(zk, result.toString());
+        	client.sendCommandResult(result.toString());
         }
     } catch (e) {
-		logger.error('exec %s in server %s with err %s', msg.script, zk.app.serverId, e.toString());
-        sendCommandResult(zk, e.toString())
+		logger.error('exec %s in server %s with err %s', msg.script, client.app.serverId, e.toString());
+        client.sendCommandResult(e.toString())
     }
 };
 
-function sendCommandResult(zk, result) {
-	var buffer = new Buffer(result);
-		zk.client.setData(zk.cmdPath, buffer, function(err, stat) {
-			if (err) {
-				logger.error('send result to zookeeper failed with err:%j', err);
-			}
-	});
-};
-
 function checkJSON(obj) {
 	if (!obj) {
 		return true;

From f16de8a56d5a708605c19cae1a24f7a06b070c58 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Fri, 30 Oct 2015 16:34:56 +0800
Subject: [PATCH 39/78] fix bug

---
 lib/util/constants.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util/constants.js b/lib/util/constants.js
index 26667a68e..9ca5a0b85 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -78,9 +78,9 @@ module.exports = {
     ZK: 'zookeeper',
     REDIS: 'redis',
     REDIS_REG_PREFIX: 'pomelo-regist:',
-    REDIS_REG_PREFIX: 'pomelo-regist-result:',
+    REDIS_REG_RES_PREFIX: 'pomelo-regist-result:',
     DEFAULT_REDIS_PORT: 6379,
-	DEFAULT_REDIS_HOST: '127.0.0.1',
+	  DEFAULT_REDIS_HOST: '127.0.0.1',
     DEFAULT_SERVERTYPE: 'pomelo-server'
   },
 

From fae94b78efb29bf6ddde8c6f8175712c8ac4e4eb Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 30 Oct 2015 17:12:23 +0800
Subject: [PATCH 40/78] update monitor component error

---
 lib/components/monitor.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/components/monitor.js b/lib/components/monitor.js
index f55051d6d..714343e9d 100644
--- a/lib/components/monitor.js
+++ b/lib/components/monitor.js
@@ -15,10 +15,10 @@ module.exports = function(app, opts) {
 };
 
 var Component = function(app, opts) {
-  var monitor = opts.monitor;
-  if(!monitor) {
-    throw new Error('pomelo servers cannot start without monitor.');
+	if(!opts || !opts.monitor) {
+    throw new Error('pomelo 2.0 cannot start without monitor, you can choose zookeeper or redis as monitor server.');
   }
+  var monitor = opts.monitor;
   return monitor(app, opts);
 };
 

From 33e80494e222ea124e4791b15b0ee476a042a442 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Fri, 30 Oct 2015 17:34:30 +0800
Subject: [PATCH 41/78] fix bug

---
 lib/monitors/redismonitor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index 7d22fd992..cd5f6d825 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -47,7 +47,7 @@ Monitor.prototype.stop = function() {
 
 Monitor.prototype.sendCommandResult = function(result) {
   //send result to redis, key:
-  var key = constants.RESERVED.REDIS_REG_RES_PREFIX + app.env + ':' + serverInfo.id;
+  var key = constants.RESERVED.REDIS_REG_RES_PREFIX + this.app.env + ':' + this.app.getCurServer().id;
   this.client.set(key, result, function(err){
     if(err){
       logger.error('set %j err: %j', key, err);

From 229381ea75a36936203f503bdaa4c66913d73f72 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Mon, 2 Nov 2015 14:06:57 +0800
Subject: [PATCH 42/78] add default zk root node

---
 lib/monitors/zookeepermonitor.js | 28 ++++++++++++++++++++++++----
 lib/util/appUtil.js              |  5 +----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index eff0e9b4f..5e184f8b7 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -50,8 +50,9 @@ var Monitor = function(app, opts) {
 module.exports = Monitor;
 
 Monitor.prototype.start = function(cb) {
+  logger.info('try to start monitor server');
+  
   var self = this;
-
   self.cbTimer = setTimeout(function() {
     logger.info('connect to zookeeper timeout');
     self.state = ZK_CONNECT_FAIL;
@@ -127,6 +128,21 @@ var getChildren = function(zk, fun, cb) {
   });
 };
 
+var createDefaultRoot = function(zk, path, cb) {
+  console.error('!!! ' + path);
+  zk.client.exists(path, function(err, stat) {
+    if(!!err) {
+      logger.error('zk check default root with error: %j', err);
+      utils.invokeCallback(err);
+    }
+    if(!!stat) {
+      utils.invokeCallback(cb);
+    } else {
+      createNode(zk.client, path, null, zookeeper.CreateMode.PERSISTENT, cb);
+    }
+  });
+};
+
 var registerZK = function(zk, cb) {
 
   var allInfo = {};
@@ -144,6 +160,9 @@ var registerZK = function(zk, cb) {
   var buffer = new Buffer(JSON.stringify(allInfo));
 
   async.series([
+    function(callback) {
+      createDefaultRoot(zk, zk.path, callback);
+    },
     function(callback) {
       createAllNode(zk, buffer, zookeeper.CreateMode.EPHEMERAL, function(err) {
         if(!!err) {
@@ -275,6 +294,7 @@ var getModuleInfo = function(zk) {
     var moduleInfo = {};
     return moduleInfo;
 };
+
 function clone(param, obj) {
   var result = {};
   var flag = 1;
@@ -289,7 +309,7 @@ function clone(param, obj) {
     // return 'no ' + param + 'Config info';
   }
   return result;
-}
+};
 
 function getComponentName(c) {
   var t = c.match(/^__(\w+)__$/);
@@ -297,7 +317,7 @@ function getComponentName(c) {
     t = t[1];
   }
   return t;
-}
+};
 
 function checkJSON(obj) {
   if (!obj) {
@@ -309,7 +329,7 @@ function checkJSON(obj) {
     return false;
   }
   return true;
-}
+};
 
 var createAllNode = function(zk, value, mode, cb) {
   async.series([
diff --git a/lib/util/appUtil.js b/lib/util/appUtil.js
index 00b75af6b..a74302ba9 100644
--- a/lib/util/appUtil.js
+++ b/lib/util/appUtil.js
@@ -130,10 +130,7 @@ var loadServers = function(app) {
  * Process server start command
  */
 var processArgs = function(app, args) {
-  if(!args.id) {
-    args.id = uuid.v1();
-  }
-  var serverId = args.id;
+  var serverId = args.id || uuid.v1();
   var serverType = args.serverType || Constants.RESERVED.DEFAULT_SERVERTYPE;
   app.set(Constants.RESERVED.MAIN, args.main, true);
   app.set(Constants.RESERVED.SERVER_TYPE, serverType, true);

From d4357e49d30fa8010fdbef9702120df251552ccf Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Mon, 2 Nov 2015 14:18:34 +0800
Subject: [PATCH 43/78] remove unused log

---
 lib/monitors/zookeepermonitor.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index 5e184f8b7..d0fc7c797 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -129,7 +129,6 @@ var getChildren = function(zk, fun, cb) {
 };
 
 var createDefaultRoot = function(zk, path, cb) {
-  console.error('!!! ' + path);
   zk.client.exists(path, function(err, stat) {
     if(!!err) {
       logger.error('zk check default root with error: %j', err);

From 85482610db3f8ef1278941221c112435f93a3aad Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Mon, 2 Nov 2015 15:04:44 +0800
Subject: [PATCH 44/78] fix server id bug

---
 lib/monitors/zookeepermonitor.js | 2 +-
 lib/util/appUtil.js              | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index d0fc7c797..69239d344 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -395,7 +395,7 @@ var getClusterInfo = function(app, zk, servers) {
           }
           var allInfo = JSON.parse(data);
           var serverInfo = allInfo.serverInfo;
-          results[serverInfo.id] = serverInfo;
+          results[serverInfo.serverId] = serverInfo;
           latch.done();
         });
       } else {
diff --git a/lib/util/appUtil.js b/lib/util/appUtil.js
index a74302ba9..91245ccd6 100644
--- a/lib/util/appUtil.js
+++ b/lib/util/appUtil.js
@@ -130,12 +130,16 @@ var loadServers = function(app) {
  * Process server start command
  */
 var processArgs = function(app, args) {
+  var server = args || {};
   var serverId = args.id || uuid.v1();
   var serverType = args.serverType || Constants.RESERVED.DEFAULT_SERVERTYPE;
+  server.serverId = serverId;
+  server.serverType = serverType;
+
   app.set(Constants.RESERVED.MAIN, args.main, true);
   app.set(Constants.RESERVED.SERVER_TYPE, serverType, true);
   app.set(Constants.RESERVED.SERVER_ID, serverId, true);
-  app.set(Constants.RESERVED.CURRENT_SERVER, args, true);
+  app.set(Constants.RESERVED.CURRENT_SERVER, server, true);
 };
 
 /**

From f084ed1fc79af230a187ec99b7fea9bf87840f4c Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Mon, 2 Nov 2015 15:36:29 +0800
Subject: [PATCH 45/78] ugrade ws to 0.8.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0a574fcf3..a2b9b53d3 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "pomelo-protocol": "0.1.6",
     "pomelo-logger": "0.1.7",
     "pomelo-scheduler": "0.3.9",
-    "ws": "0.4.25",
+    "ws": "0.8.0",
     "pomelo-protobuf": "0.4.0",
     "node-bignumber": "1.2.1",
     "commander": "2.0.0",

From f5dda62a58ec66b87aebf88a9088d6200dacc5ee Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Mon, 2 Nov 2015 15:56:45 +0800
Subject: [PATCH 46/78] update server id config in curServer

---
 lib/connectors/sioconnector.js | 1 -
 lib/util/appUtil.js            | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/connectors/sioconnector.js b/lib/connectors/sioconnector.js
index 7b1957b6d..7ac991d1f 100644
--- a/lib/connectors/sioconnector.js
+++ b/lib/connectors/sioconnector.js
@@ -39,7 +39,6 @@ Connector.prototype.start = function(cb) {
   var self = this;
   // issue https://github.com/NetEase/pomelo-cn/issues/174
   if(!!this.opts) {
-    console.error('opts: %j', this.opts);
     this.wsocket = sio.listen(this.port, this.opts);
   }
   else {
diff --git a/lib/util/appUtil.js b/lib/util/appUtil.js
index 91245ccd6..2e39d31a7 100644
--- a/lib/util/appUtil.js
+++ b/lib/util/appUtil.js
@@ -134,6 +134,7 @@ var processArgs = function(app, args) {
   var serverId = args.id || uuid.v1();
   var serverType = args.serverType || Constants.RESERVED.DEFAULT_SERVERTYPE;
   server.serverId = serverId;
+  server.id = serverId;
   server.serverType = serverType;
 
   app.set(Constants.RESERVED.MAIN, args.main, true);

From d345d5e7b23c7a0af26248df5b33f65e8d2df3bb Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Tue, 3 Nov 2015 10:08:53 +0800
Subject: [PATCH 47/78] support show cmd

---
 lib/monitors/common/cmd.js | 389 ++++++++++++++++++++++++++-----------
 1 file changed, 280 insertions(+), 109 deletions(-)

diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index e7b9e67a6..f8ba9c91e 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -6,156 +6,327 @@ var vm = require('vm');
 var util = require('util');
 
 Command.init = function(client, data) {
-	logger.debug('server: %s receive command, with data: %j', client.app.serverId, data);
-	if(!data) {
-		logger.warn('server: %s command data is null.', client.app.serverId);
-		return;
+  logger.debug('server: %s receive command, with data: %j', client.app.serverId, data);
+  if(!data) {
+	  logger.warn('server: %s command data is null.', client.app.serverId);
+	  return;
 	}
 	data = JSON.parse(data);
 	switch(data.command) {
-		case 'stop':
-			stop(client);
-			break;
-		case 'kill':
-			kill(client);
-			break;
-		case 'addCron':
-			addCron(client, data);
-			break;
-		case 'removeCron':
-			removeCron(client, data);
-			break;
-		case 'blacklist':
-			addBlacklist(client, data);
-			break;
-		case 'set':
-		    set(client, data);
-		    break;
-		case 'get':
-			get(client, data);
-			break;
-		case 'enable':
-			enable(client, data);
-			break;
-		case 'disable':
-			disable(client, data);
-			break;
-		case 'run':
-			run(client, data);
-			break;
-		case 'exec':
-			exec(client, data);
-			break;
-		default:
-			logger.debug('server: %s receive unknown command, with data: %j', client.app.serverId, data);
-			break;
-	}
+    case 'stop':
+      stop(client);
+      break;
+    case 'kill':
+      kill(client);
+      break;
+    case 'addCron':
+      addCron(client, data);
+      break;
+    case 'removeCron':
+      removeCron(client, data);
+      break;
+    case 'blacklist':
+      addBlacklist(client, data);
+      break;
+    case 'set':
+      set(client, data);
+      break;
+    case 'get':
+      get(client, data);
+      break;
+    case 'enable':
+      enable(client, data);
+      break;
+    case 'disable':
+      disable(client, data);
+      break;
+    case 'run':
+      run(client, data);
+      break;
+    case 'exec':
+      exec(client, data);
+      break;
+    case 'show':
+      show(client, data);
+      break;
+    default:
+      logger.debug('server: %s receive unknown command, with data: %j', client.app.serverId, data);
+      break;
+}
 };
 
 var stop = function(client) {
-	logger.info('server : %s is stopped', client.app.serverId);
-	client.app.set(constants.RESERVED.STOP_FLAG, true);
-	client.app.stop();
+  logger.info('server : %s is stopped', client.app.serverId);
+  client.app.set(constants.RESERVED.STOP_FLAG, true);
+  client.app.stop();
 };
 
 var kill = function(client) {
-	logger.info('server: %s is forced killed.', client.app.serverId);
-	process.exit(0);
+  logger.info('server: %s is forced killed.', client.app.serverId);
+  process.exit(0);
 };
 
 var addCron = function(client, msg) {
-	logger.info('addCron %s to server %s', msg.cron, client.app.serverId);
-	client.app.addCrons([msg.cron]);
+  logger.info('addCron %s to server %s', msg.cron, client.app.serverId);
+  client.app.addCrons([msg.cron]);
 };
 
 var removeCron = function(client, msg) {
-	logger.info('removeCron %s to server %s', msg.cron, client.app.serverId);
-	client.app.removeCrons([msg.cron]);
+  logger.info('removeCron %s to server %s', msg.cron, client.app.serverId);
+  client.app.removeCrons([msg.cron]);
 };
 
 var addBlacklist = function(client, msg) {
-	if(client.app.isFrontend()) {
-		logger.info('addBlacklist %s to server %s', msg.blacklist, client.app.serverId);
-		var connector = client.app.components.__connector__;
-		connector.blacklist = connector.blacklist.concat(msg.blacklist);
-	}
+  if(client.app.isFrontend()) {
+    logger.info('addBlacklist %s to server %s', msg.blacklist, client.app.serverId);
+    var connector = client.app.components.__connector__;
+    connector.blacklist = connector.blacklist.concat(msg.blacklist);
+  }
 };
 
 var set = function(client, msg) {
-	var key = msg.param['key'];
-	var value = msg.param['value'];
-	logger.info('set %s to value %s in server %s', key, value, client.app.serverId);
-	client.app.set(key, value);
+  var key = msg.param['key'];
+  var value = msg.param['value'];
+  logger.info('set %s to value %s in server %s', key, value, client.app.serverId);
+  client.app.set(key, value);
 };
 
 var get = function(client, msg) {
-	var value = client.app.get(msg.param);
-	if (!checkJSON(value)) {
+  var value = client.app.get(msg.param);
+  if (!checkJSON(value)) {
 		value = 'object';
-	}
+  }
 
-	logger.info('get %s the value is %s in server %s', msg.param, value, client.app.serverId);
-	if (!value) value = 'undefined';
-	client.sendCommandResult(value);
+  logger.info('get %s the value is %s in server %s', msg.param, value, client.app.serverId);
+  if (!value) value = 'undefined';
+  client.sendCommandResult(value);
 };
 
 var enable = function(client, msg) {
-	logger.info('enable %s in server %s', msg.param, client.app.serverId);
-	client.app.enable(msg.param);
+  logger.info('enable %s in server %s', msg.param, client.app.serverId);
+  client.app.enable(msg.param);
 };
 
 var disable = function(client, msg) {
-	logger.info('disable %s in server %s', msg.param, client.app.serverId);
-	client.app.disable(msg.param);
+  logger.info('disable %s in server %s', msg.param, client.app.serverId);
+  client.app.disable(msg.param);
 };
 
 var run = function(client, msg) {
-	var ctx = {
-			app: client.app,
-			result: null
-	};
-	try {
-		vm.runInNewContext('result = ' + msg.param, ctx, 'myApp.vm');
-		logger.info('run %s in server %s with result %s', msg.param, client.app.serverId, util.inspect(ctx.result));
-		client.sendCommandResult(util.inspect(ctx.result));
-	} catch(e) {
-		logger.error('run %s in server %s with err %s', msg.param, client.app.serverId, e.toString());
-		client.sendCommandResult(e.toString());
-	}
+  var ctx = {
+    app: client.app,
+    result: null
+  };
+  try {
+    vm.runInNewContext('result = ' + msg.param, ctx, 'myApp.vm');
+    logger.info('run %s in server %s with result %s', msg.param, client.app.serverId, util.inspect(ctx.result));
+    client.sendCommandResult(util.inspect(ctx.result));
+  } catch(e) {
+    logger.error('run %s in server %s with err %s', msg.param, client.app.serverId, e.toString());
+    client.sendCommandResult(e.toString());
+  }
 };
 
 var exec = function(client, msg) {
-	var context = {
-        app: client.app,
-        require: require,
-        os: require('os'),
-        fs: require('fs'),
-        process: process,
-        util: util
-    };
-    try {
-        vm.runInNewContext(msg.script, context);
-		logger.info('exec %s in server %s with result %s', msg.script, client.app.serverId, context.result);
-        var result = context.result;
-        if (!result) {
-        	client.sendCommandResult("script result should be assigned to result value to script module context");
-        } else {
-        	client.sendCommandResult(result.toString());
+  var context = {
+    app: client.app,
+    require: require,
+    os: require('os'),
+    fs: require('fs'),
+    process: process,
+    util: util
+  };
+  try {
+    vm.runInNewContext(msg.script, context);
+    logger.info('exec %s in server %s with result %s', msg.script, client.app.serverId, context.result);
+    var result = context.result;
+    if (!result) {
+      client.sendCommandResult("script result should be assigned to result value to script module context");
+    } else {
+      client.sendCommandResult(result.toString());
+    }
+  } catch (e) {
+    logger.error('exec %s in server %s with err %s', msg.script, client.app.serverId, e.toString());
+    client.sendCommandResult(e.toString())
+  }
+};
+
+var show = function(client, msg) {
+  var result;
+  switch(msg.param) {
+    case 'connections':
+      result = getConnectionInfo(client);
+      break;
+    case 'logins':
+      result = getLoginInfo(client);
+      break;
+    case 'modules':
+      result = getModuleInfo(client);
+      break;
+    case 'status':
+      result = getStatusInfo(client);
+      break;
+    case 'proxy':
+      result = getProxyInfo(client);
+      break;
+    case 'handler':
+      result = getHandlerInfo(client);
+      break;
+    case 'components':
+      result = getComponentInfo(client);
+      break;
+    case 'settings':
+      result = getSettingInfo(client);
+      break;
+    default:
+      result = {};
+      break;
+  }
+  client.sendCommandResult(JSON.stringify(result));
+}
+
+var getConnectionInfo = function(client) {
+  var connectionInfo = {};
+  var connection = client.app.components.__connection__;
+  connectionInfo.serverId = client.app.serverId;
+  
+  if (connection) {
+    connectionInfo.connectionInfo = connection.getStatisticsInfo();
+  }
+  connectionInfo.connectionInfo = 'no connection';
+  return {serverId : connectionInfo};
+};
+
+var getProxyInfo = function(client) {
+  var proxyInfo = {};
+  var __proxy__ = client.app.components.__proxy__;
+  if (__proxy__ && __proxy__.client && __proxy__.client.proxies.user) {
+    var proxies = __proxy__.client.proxies.user;
+    var server = client.app.getServerById(client.app.serverId);
+    if (!server) {
+      cb('no server with this id ' + client.app.serverId);
+    } else {
+      var type = server['serverType'];
+      var tmp = proxies[type];
+      proxyInfo[type] = {};
+      for (var _proxy in tmp) {
+        var r = tmp[_proxy];
+        proxyInfo[type][_proxy] = {};
+        for (var _rpc in r) {
+          if (typeof r[_rpc] === 'function') {
+            proxyInfo[type][_proxy][_rpc] = 'function';
+          }
+        }
+      }
+    }
+  } else {
+    proxyInfo = 'no proxy loaded';
+  }
+  return {proxyInfo: proxyInfo};
+};
+
+var getHandlerInfo = function(client) {
+  var handlerInfo = {};
+  var __server__ = client.app.components.__server__;
+  if (__server__ && __server__.server && __server__.server.handlerService.handlers) {
+    var handles = __server__.server.handlerService.handlers;
+    var server = client.app.getServerById(client.app.serverId);
+    if (!server) {
+      cb('no server with this id ' + client.app.serverId);
+    } else {
+      var type = server['serverType'];
+      var tmp = handles;
+      handlerInfo[type] = {};
+      for (var _p in tmp) {
+        var r = tmp[_p];
+        handlerInfo[type][_p] = {};
+        for (var _r in r) {
+          if (typeof r[_r] === 'function') {
+            handlerInfo[type][_p][_r] = 'function';
+          }
         }
-    } catch (e) {
-		logger.error('exec %s in server %s with err %s', msg.script, client.app.serverId, e.toString());
-        client.sendCommandResult(e.toString())
+      }
+    }
+  } else {
+    handlerInfo = 'no handler loaded';
+  }
+  return {handlerInfo: handlerInfo};
+};
+
+var getComponentInfo = function(client) {
+  var _components = client.app.components;
+  var res = {};
+  for (var key in _components) {
+    var name = getComponentName(key);
+    res[name] = clone(name, client.app.get(name + 'Config'))
+  }
+  return {componentInfo: res};
+};
+
+var getSettingInfo = function(client) {
+  var _settings = client.app.settings;
+  var res = {};
+  for (var key in _settings) {
+    if (key.match(/^__\w+__$/) || key.match(/\w+Config$/)) {
+      continue;
+    }
+    if (!checkJSON(_settings[key])) {
+      res[key] = 'Object';
+      continue;
     }
+    res[key] = _settings[key];
+  }
+  return {settingInfo: res};
+};
+
+var getStatusInfo = function(client) {
+  var statusInfo = {};
+  return {statusInfo: statusInfo};
+};
+
+var getLoginInfo = function(client) {
+  var loginInfo = {};
+  return {loginInfo: loginInfo};
 };
 
+var getModuleInfo = function(client) {
+  var moduleInfo = {};
+  return {moduleInfo: moduleInfo};
+};
+
+
+function clone(param, obj) {
+  var result = {};
+  var flag = 1;
+  for (var key in obj) {
+    if (typeof obj[key] === 'function' || typeof obj[key] === 'object') {
+      continue;
+    }
+    flag = 0;
+    result[key] = obj[key];
+  }
+  if (flag) {
+    // return 'no ' + param + 'Config info';
+  }
+  return result;
+}
+
+function getComponentName(c) {
+  var t = c.match(/^__(\w+)__$/);
+  if (t) {
+    t = t[1];
+  }
+  return t;
+}
+
 function checkJSON(obj) {
-	if (!obj) {
-		return true;
-	}
-	try {
-		JSON.stringify(obj);
-	} catch (e) {
-		return false;
-	}
-	return true;
+  if (!obj) {
+    return true;
+  }
+  try {
+    JSON.stringify(obj);
+  } catch (e) {
+    return false;
+  }
+  return true;
 };
\ No newline at end of file

From 87c0d4159774a5e33e360e03d4a6d27d2d797a7b Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Tue, 3 Nov 2015 15:32:57 +0800
Subject: [PATCH 48/78] replace node-redis with ioredis to support redis
 cluster

---
 lib/monitors/redismonitor.js | 7 +++----
 lib/util/constants.js        | 2 --
 package.json                 | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index cd5f6d825..6523686a4 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -1,5 +1,5 @@
 'use strict';
-var redis = require('redis');
+var Redis = require('ioredis');
 var commander = require('./common/cmd');
 var constants = require('../util/constants');
 var utils = require('../util/utils');
@@ -11,8 +11,7 @@ var Monitor = function(app, opts) {
   }
 
   this.app = app;
-  this.port = opts.port || constants.RESERVED.PORT;
-  this.host = opts.host || constants.RESERVED.HOST;
+  this.redisNodes = opts.redisNodes || [];
   this.period = opts.period || constants.TIME.DEFAULT_REDIS_REG;
   this.expire = opts.expire || constants.TIME.DEFAULT_REDIS_EXPIRE;
   this.password = opts.password || null;
@@ -23,7 +22,7 @@ module.exports = Monitor;
 
 Monitor.prototype.start = function(cb) {
   var self = this;
-  this.client = redis.createClient(this.port, this.host, this.redisOpts);
+  this.client = new Redis.Cluster(this.redisNodes, this.redisOpts);
 
   this.client.once('connect', function() {
     logger.info('%s connected to redis successfully !', self.app.serverId);
diff --git a/lib/util/constants.js b/lib/util/constants.js
index 9ca5a0b85..7f21fd87c 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -79,8 +79,6 @@ module.exports = {
     REDIS: 'redis',
     REDIS_REG_PREFIX: 'pomelo-regist:',
     REDIS_REG_RES_PREFIX: 'pomelo-regist-result:',
-    DEFAULT_REDIS_PORT: 6379,
-	  DEFAULT_REDIS_HOST: '127.0.0.1',
     DEFAULT_SERVERTYPE: 'pomelo-server'
   },
 
diff --git a/package.json b/package.json
index a2b9b53d3..9f3e69a86 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "mqtt": "0.3.9",
     "node-zookeeper-client": "0.2.2",
     "node-uuid": "1.4.3",
-    "redis": "2.0.1"
+    "ioredis": "1.10.0"
   },
   "bin": {
     "pomelo": "./bin/pomelo"

From a46fb5fa202ecc1d98b3df4b28784f09e7cac278 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <hzxuzhonghu@corp.netease.com>
Date: Tue, 3 Nov 2015 17:28:37 +0800
Subject: [PATCH 49/78] fix jshint error

---
 gruntfile.js                     |  3 ++-
 lib/monitors/common/cmd.js       | 24 ++++++++++++------------
 lib/monitors/zookeepermonitor.js | 13 +++++++------
 lib/pomelo.js                    |  1 +
 test/modules/cmd.js              |  8 ++++----
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/gruntfile.js b/gruntfile.js
index 91246f503..e00da13ab 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -38,7 +38,8 @@ module.exports = function(grunt) {
     jshint: {
       all: ['lib/*'],
       options: {
-                 node: true
+                 node: true,
+                 sub: true
                }
     }
   });
diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index f8ba9c91e..5a1a1b08e 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -8,11 +8,11 @@ var util = require('util');
 Command.init = function(client, data) {
   logger.debug('server: %s receive command, with data: %j', client.app.serverId, data);
   if(!data) {
-	  logger.warn('server: %s command data is null.', client.app.serverId);
-	  return;
-	}
-	data = JSON.parse(data);
-	switch(data.command) {
+    logger.warn('server: %s command data is null.', client.app.serverId);
+    return;
+  }
+  data = JSON.parse(data);
+  switch(data.command) {
     case 'stop':
       stop(client);
       break;
@@ -94,7 +94,7 @@ var set = function(client, msg) {
 var get = function(client, msg) {
   var value = client.app.get(msg.param);
   if (!checkJSON(value)) {
-		value = 'object';
+        value = 'object';
   }
 
   logger.info('get %s the value is %s in server %s', msg.param, value, client.app.serverId);
@@ -147,7 +147,7 @@ var exec = function(client, msg) {
     }
   } catch (e) {
     logger.error('exec %s in server %s with err %s', msg.script, client.app.serverId, e.toString());
-    client.sendCommandResult(e.toString())
+    client.sendCommandResult(e.toString());
   }
 };
 
@@ -183,7 +183,7 @@ var show = function(client, msg) {
       break;
   }
   client.sendCommandResult(JSON.stringify(result));
-}
+};
 
 var getConnectionInfo = function(client) {
   var connectionInfo = {};
@@ -204,7 +204,7 @@ var getProxyInfo = function(client) {
     var proxies = __proxy__.client.proxies.user;
     var server = client.app.getServerById(client.app.serverId);
     if (!server) {
-      cb('no server with this id ' + client.app.serverId);
+      logger.error('no server with this id ' + client.app.serverId);
     } else {
       var type = server['serverType'];
       var tmp = proxies[type];
@@ -232,7 +232,7 @@ var getHandlerInfo = function(client) {
     var handles = __server__.server.handlerService.handlers;
     var server = client.app.getServerById(client.app.serverId);
     if (!server) {
-      cb('no server with this id ' + client.app.serverId);
+      logger.error('no server with this id ' + client.app.serverId);
     } else {
       var type = server['serverType'];
       var tmp = handles;
@@ -258,7 +258,7 @@ var getComponentInfo = function(client) {
   var res = {};
   for (var key in _components) {
     var name = getComponentName(key);
-    res[name] = clone(name, client.app.get(name + 'Config'))
+    res[name] = clone(name, client.app.get(name + 'Config'));
   }
   return {componentInfo: res};
 };
@@ -329,4 +329,4 @@ function checkJSON(obj) {
     return false;
   }
   return true;
-};
\ No newline at end of file
+}
diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index 69239d344..509ae9b4a 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -209,7 +209,7 @@ var getProxyInfo = function(zk) {
     var proxies = __proxy__.client.proxies.user;
     var server = zk.app.getServerById(zk.app.serverId);
     if (!server) {
-      cb('no server with this id ' + zk.app.serverId);
+      logger.error('no server with this id ' + zk.app.serverId);
     } else {
       var type = server['serverType'];
       var tmp = proxies[type];
@@ -237,7 +237,7 @@ var getHandlerInfo = function(zk) {
     var handles = __server__.server.handlerService.handlers;
     var server = zk.app.getServerById(zk.app.serverId);
     if (!server) {
-      cb('no server with this id ' + zk.app.serverId);
+      logger.error('no server with this id ' + zk.app.serverId);
     } else {
       var type = server['serverType'];
       var tmp = handles;
@@ -263,7 +263,7 @@ var getComponentInfo = function(zk) {
     var res = {};
     for (var key in _components) {
       var name = getComponentName(key);
-      res[name] = clone(name, zk.app.get(name + 'Config'))
+      res[name] = clone(name, zk.app.get(name + 'Config'));
     }
     return res;
 };
@@ -308,7 +308,7 @@ function clone(param, obj) {
     // return 'no ' + param + 'Config info';
   }
   return result;
-};
+}
 
 function getComponentName(c) {
   var t = c.match(/^__(\w+)__$/);
@@ -316,7 +316,7 @@ function getComponentName(c) {
     t = t[1];
   }
   return t;
-};
+}
 
 function checkJSON(obj) {
   if (!obj) {
@@ -328,7 +328,7 @@ function checkJSON(obj) {
     return false;
   }
   return true;
-};
+}
 
 var createAllNode = function(zk, value, mode, cb) {
   async.series([
@@ -483,3 +483,4 @@ var reconnect = function(self) {
     }
     );
 };
+
diff --git a/lib/pomelo.js b/lib/pomelo.js
index 960aac640..d8c6fe773 100644
--- a/lib/pomelo.js
+++ b/lib/pomelo.js
@@ -79,6 +79,7 @@ Pomelo.monitors.__defineGetter__('redismonitor', load.bind(null, './monitors/red
  */
 Pomelo.createApp = function (opts) {
   var app = application;
+  console.log('--------',application);
   app.init(opts);
   Pomelo.app = app;
   return app;
diff --git a/test/modules/cmd.js b/test/modules/cmd.js
index 4636e7ea5..28333270f 100644
--- a/test/modules/cmd.js
+++ b/test/modules/cmd.js
@@ -31,7 +31,7 @@ describe('cmd test', function() {
                 }
             };
 
-            var data = {command: 1};
+            var data = {command: 'stop'};
             commander.init(client, JSON.stringify(data));
             flag.should.eql(true);
 /*
@@ -39,7 +39,7 @@ describe('cmd test', function() {
             commander.init(client, JSON.stringify(data));
             flag.should.eql(true);
 */
-            data = {command: 3, cron: {
+            data = {command: 'addCron', cron: {
                                             type: 'chat',
                                             id: 'chat-server-1'
                                       }
@@ -47,7 +47,7 @@ describe('cmd test', function() {
             commander.init(client, JSON.stringify(data));
             rs.length.should.eql(1);
 
-            data = {command: 4, cron: {
+            data = {command: 'removeCron', cron: {
                                             type: 'chat',
                                             id: 'chat-server-1'
                                       }
@@ -55,7 +55,7 @@ describe('cmd test', function() {
             commander.init(client, JSON.stringify(data));
             rs.length.should.eql(1);
 
-            data = {command: 5, blacklist: ['127.0.0.1'] };
+            data = {command: 'blacklist', blacklist: ['127.0.0.1'] };
             commander.init(client, JSON.stringify(data));
             client.app.components.__connector__.blacklist.length.should.eql(1);
         });

From ca7bda7ade317b8e6237654fbf901494f3f2905f Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Tue, 3 Nov 2015 17:44:22 +0800
Subject: [PATCH 50/78] update ws template

---
 template/web-server/public/index.html | 113 +++++++++++++++-----------
 1 file changed, 64 insertions(+), 49 deletions(-)

diff --git a/template/web-server/public/index.html b/template/web-server/public/index.html
index 1ef1e4a93..c91cbedb4 100644
--- a/template/web-server/public/index.html
+++ b/template/web-server/public/index.html
@@ -1,57 +1,72 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8" />
-    <title>
-      Pomelo
-    </title>
-    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-    <meta http-equiv="content-style-type" content="text/css" />
-    <meta http-equiv="content-scripte-type" content="text/javascript" />
-    <meta name="author" content="netease" />
-    <meta name="version" content="1.0" />
-    <meta name="keywords" content="pomelo" />
-    <link type="text/css" rel="stylesheet" href="css/base.css" />
-    <script src="js/lib/build/build.js" type="text/javascript"></script>
-    <script type="text/javascript">
-      require('boot');
-    </script> 
-    <script type="text/javascript">
-      var pomelo = window.pomelo;
-      var host = "127.0.0.1";
-      var port = "3010";
-      function show() {
-        pomelo.init({
-          host: host,
-          port: port,
-          log: true
-        }, function() {
+<head>
+  <meta charset="utf-8" />
+  <title>
+    Pomelo
+  </title>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+  <meta http-equiv="content-style-type" content="text/css" />
+  <meta http-equiv="content-scripte-type" content="text/javascript" />
+  <meta name="author" content="netease" />
+  <meta name="version" content="1.0" />
+  <meta name="keywords" content="pomelo" />
+  <link type="text/css" rel="stylesheet" href="css/base.css" />
+  <script src="js/lib/build/build.js" type="text/javascript"></script>
+  <script type="text/javascript">
+  require('boot');
+  </script> 
+  <script type="text/javascript">
+  var pomelo = window.pomelo;
+  var host = "127.0.0.1";
+  var port = "3010";
+  var connected = false;
+  var node, para;
+  function show() {
+    if(!connected) {
+      pomelo.init({
+        host: host,
+        port: port
+      }, function() {
         pomelo.request("connector.entryHandler.entry", "hello pomelo", function(data) {
-            alert(data.msg);
-          });
+          para = document.getElementById('result');
+          node = document.createTextNode(data.msg);
+          para.appendChild(node);
+          connected = true;
         });
-      }
-    </script>
-  </head>
-  <body>
-    <div class="g-doc">
-      <div class="g-banner" style="border:none">
-        <div class="logo">
-          <div class="img"></div>
-        </div>
+      });
+    } else {
+      para.removeChild(node);
+      pomelo.request("connector.entryHandler.entry", "hello pomelo", function(data) {
+        console.log(data.msg);
+        para.appendChild(node);
+      });
+    }
+  }
+  </script>
+</head>
+<body>
+  <div class="g-doc">
+    <div class="g-banner" style="border:none">
+      <div class="logo">
+        <div class="img"></div>
       </div>
-      <div class="g-background">
-        <div class="g-content">
-          Welcome to Pomelo
-        </div>
-      </div>
-      <div class="g-link">
-        Home:
-        <a href="https://github.com/NetEase/pomelo">https://github.com/NetEase/pomelo</a>
-      </div>
-      <div class="g-button">
-        <input id="test" type="button" value="Test Game Server" onclick="show()"/>
+    </div>
+    <div class="g-background">
+      <div class="g-content">
+        Welcome to Pomelo
       </div>
     </div>
-  </body>
+    <div class="g-link">
+      Home:
+      <a href="https://github.com/NetEase/pomelo">https://github.com/NetEase/pomelo</a>
+    </div>
+    <div class="g-result">
+      <p id='result'></p>
+    </div>
+    <div class="g-button">
+      <input id="test" type="button" value="Test Game Server" onclick="show()"/>
+    </div>
+  </div>
+</body>
 </html>
\ No newline at end of file

From 9761d9d63da2bc50875eade8f18c12a3b0630897 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Wed, 4 Nov 2015 11:37:51 +0800
Subject: [PATCH 51/78] remove unused log

---
 lib/pomelo.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/pomelo.js b/lib/pomelo.js
index d8c6fe773..960aac640 100644
--- a/lib/pomelo.js
+++ b/lib/pomelo.js
@@ -79,7 +79,6 @@ Pomelo.monitors.__defineGetter__('redismonitor', load.bind(null, './monitors/red
  */
 Pomelo.createApp = function (opts) {
   var app = application;
-  console.log('--------',application);
   app.init(opts);
   Pomelo.app = app;
   return app;

From d19f467161d306d4176ac33dc57dc483e9a4e98f Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Wed, 4 Nov 2015 11:42:07 +0800
Subject: [PATCH 52/78] remove unused files

---
 template/game-server/config/adminServer.json |  5 -----
 template/game-server/config/adminUser.json   | 22 --------------------
 template/game-server/config/master.json      |  8 -------
 3 files changed, 35 deletions(-)
 delete mode 100644 template/game-server/config/adminServer.json
 delete mode 100644 template/game-server/config/adminUser.json
 delete mode 100644 template/game-server/config/master.json

diff --git a/template/game-server/config/adminServer.json b/template/game-server/config/adminServer.json
deleted file mode 100644
index 4b0e27e16..000000000
--- a/template/game-server/config/adminServer.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[{
-    "type": "connector",
-    "token": "agarxhqb98rpajloaxn34ga8xrunpagkjwlaw3ruxnpaagl29w4rxn"
-}
-]
\ No newline at end of file
diff --git a/template/game-server/config/adminUser.json b/template/game-server/config/adminUser.json
deleted file mode 100644
index ff97f8523..000000000
--- a/template/game-server/config/adminUser.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "id": "user-1",
-    "username": "admin",
-    "password": "admin",
-    "level": 1
-  },
-  
-  {
-    "id": "user-2",
-    "username": "monitor",
-    "password": "monitor",
-    "level": 2
-  },
-
-  {
-    "id": "user-3",
-    "username": "test",
-    "password": "test",
-    "level": 2
-  }
-]
diff --git a/template/game-server/config/master.json b/template/game-server/config/master.json
deleted file mode 100644
index 592be40dc..000000000
--- a/template/game-server/config/master.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "development": {
-    "id": "master-server-1", "host": "127.0.0.1", "port": 3005
-  },
-  "production": {
-    "id": "master-server-1", "host": "127.0.0.1", "port": 3005
-  }
-}

From f1907bc253526af4f8207044d5be9f26d5de4604 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Wed, 4 Nov 2015 14:31:40 +0800
Subject: [PATCH 53/78] update https template

---
 template/web-server/app.js       |  2 +-
 template/web-server/app.js.https | 36 ++++++++++----------------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/template/web-server/app.js b/template/web-server/app.js
index e25bbe937..2312da911 100644
--- a/template/web-server/app.js
+++ b/template/web-server/app.js
@@ -10,5 +10,5 @@ if ('development' === env) {
 }
 
 app.listen(3001, function() {
-  console.log("Web server has started.\nPlease log on http://127.0.0.1:3001/index.html");
+  console.log("Web server has started.\nPlease log on http://127.0.0.1:3001");
 });
\ No newline at end of file
diff --git a/template/web-server/app.js.https b/template/web-server/app.js.https
index 8c975eb9a..b13ef1352 100644
--- a/template/web-server/app.js.https
+++ b/template/web-server/app.js.https
@@ -1,5 +1,6 @@
-var https = require('https');
 var express = require('express');
+var https = require('https');
+var app = express();
 
 var fs = require('fs');
 
@@ -8,31 +9,16 @@ var options = {
   cert: fs.readFileSync('../shared/server.crt')
 };
 
-var app = express();
+var serveStatic = require('serve-static');
 
-app.configure(function(){
-  app.use(express.methodOverride());
-  app.use(express.bodyParser());
-  app.use(app.router);
-  app.set('view engine', 'jade');
-  app.set('views', __dirname + '/public');
-  app.set('view options', {layout: false});
-  app.set('basepath',__dirname + '/public');
-});
-
-app.configure('development', function(){
-  app.use(express.static(__dirname + '/public'));
-  app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
-});
-
-app.configure('production', function(){
+var env = process.env.NODE_ENV || 'development';
+if ('development' === env) {
+  app.use(serveStatic(__dirname + '/public'));
+} else {
   var oneYear = 31557600000;
-  app.use(express.static(__dirname + '/public', { maxAge: oneYear }));
-  app.use(express.errorHandler());
-});
-
-console.log("Web server has started.\nPlease log on http://127.0.0.1:3001/index.html");
+  app.use(serveStatic(__dirname + '/public', { maxAge: oneYear }));
+}
 
-var httpsServer = https.createServer(options, app);
+https.createServer(options, app).listen(3001);
 
-httpsServer.listen(3001);
\ No newline at end of file
+console.log("Web server has started.\nPlease log on https://127.0.0.1:3001");
\ No newline at end of file

From 09f9e391a776e14e74f8f2fcfa0e8099a2804b01 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Wed, 4 Nov 2015 15:44:07 +0800
Subject: [PATCH 54/78] redis register immediately after redisMonitor loaded

---
 lib/monitors/redismonitor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index 6523686a4..eb1b0f5b0 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -29,6 +29,7 @@ Monitor.prototype.start = function(cb) {
     if(self.password) {
       self.client.auth(self.password);
     }
+    watcherCluster2Command.call(self);
     self.timer = setInterval(watcherCluster2Command.bind(self), self.period);
     utils.invokeCallback(cb);
 

From 5c464fccfbb0b85b3d9502d5d6a60d31b2276bda Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Wed, 4 Nov 2015 16:27:27 +0800
Subject: [PATCH 55/78] update socket.io wss

---
 template/game-server/app.js.sio.wss                   | 2 ++
 template/web-server/public/js/lib/pomeloclient.js.wss | 7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/template/game-server/app.js.sio.wss b/template/game-server/app.js.sio.wss
index 9b15d9708..288c1ffca 100644
--- a/template/game-server/app.js.sio.wss
+++ b/template/game-server/app.js.sio.wss
@@ -21,6 +21,8 @@ app.configure('production|development', function(){
   app.set('connectorConfig',
     {
       connector : pomelo.connectors.sioconnector,
+      //websocket, polling
+      transports : ['websocket'],
       key: fs.readFileSync('../shared/server.key'),
   		cert: fs.readFileSync('../shared/server.crt')
     });
diff --git a/template/web-server/public/js/lib/pomeloclient.js.wss b/template/web-server/public/js/lib/pomeloclient.js.wss
index 9385c0f4c..6bf59fee7 100644
--- a/template/web-server/public/js/lib/pomeloclient.js.wss
+++ b/template/web-server/public/js/lib/pomeloclient.js.wss
@@ -328,12 +328,7 @@ var bt2Str = function(byteArray,start,end) {
     var host = params.host;
     var port = params.port;
 
-    var url = 'https://' + host;
-    if(port) {
-      url +=  ':' + port;
-    }
-
-    socket = io.connect(url, {'force new connection': true, reconnect: false});
+    socket = io.connect('wss://' + host + ':' + port, {reconnection: false, transports: ['websocket']});
 
     socket.on('connect', function(){
       console.log('[pomeloclient.init] websocket connected!');

From 3854216416e2e88087103d8a92ec589477eb4579 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Wed, 4 Nov 2015 17:50:57 +0800
Subject: [PATCH 56/78] update sio connector parameter

---
 lib/connectors/sioconnector.js | 4 ++--
 template/game-server/start.sh  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 template/game-server/start.sh

diff --git a/lib/connectors/sioconnector.js b/lib/connectors/sioconnector.js
index 7ac991d1f..6746c8895 100644
--- a/lib/connectors/sioconnector.js
+++ b/lib/connectors/sioconnector.js
@@ -48,8 +48,8 @@ Connector.prototype.start = function(cb) {
       ]
     });
   }
-  this.wsocket.set('heartbeat timeout', this.heartbeatTimeout);
-  this.wsocket.set('heartbeat interval', this.heartbeatInterval);
+  this.wsocket.set('heartbeat timeout', this.heartbeatTimeout * 1000);
+  this.wsocket.set('heartbeat interval', this.heartbeatInterval * 1000);
   this.wsocket.sockets.on('connection', function (socket) {
     var siosocket = new SioSocket(curId++, socket);
     self.emit('connection', siosocket);
diff --git a/template/game-server/start.sh b/template/game-server/start.sh
new file mode 100644
index 000000000..1dde1fe72
--- /dev/null
+++ b/template/game-server/start.sh
@@ -0,0 +1 @@
+node app.js host=127.0.0.1 port=3150 clientPort=3010 frontend=true serverType=connector >/dev/null 2>&1 &
\ No newline at end of file

From 0f696c69d6692430b93ea1d25e670c89f0a4d334 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Wed, 4 Nov 2015 18:36:32 +0800
Subject: [PATCH 57/78] support 3 kind redis: single node & sentinel & cluster

---
 lib/monitors/redismonitor.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index eb1b0f5b0..7a684eec6 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -11,6 +11,8 @@ var Monitor = function(app, opts) {
   }
 
   this.app = app;
+  this.mode = opts.mode || 'singleNode';
+  this.name = opts.name || null;
   this.redisNodes = opts.redisNodes || [];
   this.period = opts.period || constants.TIME.DEFAULT_REDIS_REG;
   this.expire = opts.expire || constants.TIME.DEFAULT_REDIS_EXPIRE;
@@ -22,7 +24,16 @@ module.exports = Monitor;
 
 Monitor.prototype.start = function(cb) {
   var self = this;
-  this.client = new Redis.Cluster(this.redisNodes, this.redisOpts);
+  if(this.mode === 'single') {
+    this.client = new Redis(this.redisNodes.port, this.redisNodes.host, this.redisOpts);
+  } else if(this.mode === 'sentinel') {
+    this.client = new Redis({
+      sentinels: this.redisNodes,
+      name: this.name
+    }, this.redisOpts);
+  } else {
+    this.client = new Redis.Cluster(this.redisNodes, this.redisOpts);
+  }
 
   this.client.once('connect', function() {
     logger.info('%s connected to redis successfully !', self.app.serverId);

From dac91d873ecf488c412ae59e90312ee0d474db24 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Thu, 5 Nov 2015 15:20:31 +0800
Subject: [PATCH 58/78] upgrade pomelo-rpc to 1.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9f3e69a86..409dc763d 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "cliff": "0.1.8",
     "mkdirp": "0.3.3",
     "pomelo-loader": "0.0.6",
-    "pomelo-rpc": "0.4.10",
+    "pomelo-rpc": "1.0.0",
     "pomelo-protocol": "0.1.6",
     "pomelo-logger": "0.1.7",
     "pomelo-scheduler": "0.3.9",

From c4bb09fe2abea514d22df5a477a26f190d153ae6 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Thu, 5 Nov 2015 16:10:16 +0800
Subject: [PATCH 59/78] update redis config parameters

---
 lib/util/constants.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util/constants.js b/lib/util/constants.js
index 7f21fd87c..e0122cf13 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -122,8 +122,8 @@ module.exports = {
    DEFAULT_ZK_TIMEOUT: 5 * 1000,
    DEFAULT_SPIN_DELAY: 1000,
    DEFAULT_REDIS_CONNECT_TIMEOUT: 15 * 1000,
-   DEFAULT_REDIS_REG: 15*1000,
-   DEFAULT_REDIS_EXPIRE: 25*1000
+   DEFAULT_REDIS_REG: 5 * 1000,
+   DEFAULT_REDIS_EXPIRE: 15 * 1000
  },
 
  RETRY: {

From 87441358f47865cdba26e07056fda84d21a7c5c0 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Thu, 5 Nov 2015 17:30:34 +0800
Subject: [PATCH 60/78] modify default redis mode to single

---
 lib/monitors/redismonitor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index 7a684eec6..e7052f542 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -11,7 +11,7 @@ var Monitor = function(app, opts) {
   }
 
   this.app = app;
-  this.mode = opts.mode || 'singleNode';
+  this.mode = opts.mode || 'single';
   this.name = opts.name || null;
   this.redisNodes = opts.redisNodes || [];
   this.period = opts.period || constants.TIME.DEFAULT_REDIS_REG;

From c1ec58d087a048656a5df0e2fed08ea5a1b349a7 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 6 Nov 2015 11:10:02 +0800
Subject: [PATCH 61/78] remove unused show commands

---
 lib/monitors/common/cmd.js | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index 5a1a1b08e..8115ac37a 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -157,15 +157,6 @@ var show = function(client, msg) {
     case 'connections':
       result = getConnectionInfo(client);
       break;
-    case 'logins':
-      result = getLoginInfo(client);
-      break;
-    case 'modules':
-      result = getModuleInfo(client);
-      break;
-    case 'status':
-      result = getStatusInfo(client);
-      break;
     case 'proxy':
       result = getProxyInfo(client);
       break;
@@ -279,22 +270,6 @@ var getSettingInfo = function(client) {
   return {settingInfo: res};
 };
 
-var getStatusInfo = function(client) {
-  var statusInfo = {};
-  return {statusInfo: statusInfo};
-};
-
-var getLoginInfo = function(client) {
-  var loginInfo = {};
-  return {loginInfo: loginInfo};
-};
-
-var getModuleInfo = function(client) {
-  var moduleInfo = {};
-  return {moduleInfo: moduleInfo};
-};
-
-
 function clone(param, obj) {
   var result = {};
   var flag = 1;
@@ -309,7 +284,7 @@ function clone(param, obj) {
     // return 'no ' + param + 'Config info';
   }
   return result;
-}
+};
 
 function getComponentName(c) {
   var t = c.match(/^__(\w+)__$/);
@@ -317,7 +292,7 @@ function getComponentName(c) {
     t = t[1];
   }
   return t;
-}
+};
 
 function checkJSON(obj) {
   if (!obj) {
@@ -329,4 +304,4 @@ function checkJSON(obj) {
     return false;
   }
   return true;
-}
+};
\ No newline at end of file

From 46ca2c80cefd8cb714d91723b0f8384bcf350581 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Fri, 6 Nov 2015 14:53:54 +0800
Subject: [PATCH 62/78] support pre_load serverInfo and other info

---
 lib/monitors/common/cmd.js   | 44 ++++++++++++------------------------
 lib/monitors/redismonitor.js | 14 +++++++++---
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index 8115ac37a..e3985ab3f 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -47,7 +47,7 @@ Command.init = function(client, data) {
       exec(client, data);
       break;
     case 'show':
-      show(client, data);
+      show(client);
       break;
     default:
       logger.debug('server: %s receive unknown command, with data: %j', client.app.serverId, data);
@@ -151,29 +151,15 @@ var exec = function(client, msg) {
   }
 };
 
-var show = function(client, msg) {
-  var result;
-  switch(msg.param) {
-    case 'connections':
-      result = getConnectionInfo(client);
-      break;
-    case 'proxy':
-      result = getProxyInfo(client);
-      break;
-    case 'handler':
-      result = getHandlerInfo(client);
-      break;
-    case 'components':
-      result = getComponentInfo(client);
-      break;
-    case 'settings':
-      result = getSettingInfo(client);
-      break;
-    default:
-      result = {};
-      break;
-  }
-  client.sendCommandResult(JSON.stringify(result));
+var show = function(client) {
+  var result = {};
+  result.connectionInfo = getConnectionInfo(client);
+  result.proxyInfo = getProxyInfo(client);
+  result.handlerInfo = getHandlerInfo(client);
+  result.componentInfo = getComponentInfo(client);
+  result.settingInfo = getSettingInfo(client);
+
+  client.sendCommandResult(JSON.stringify(result), 'show');
 };
 
 var getConnectionInfo = function(client) {
@@ -185,7 +171,7 @@ var getConnectionInfo = function(client) {
     connectionInfo.connectionInfo = connection.getStatisticsInfo();
   }
   connectionInfo.connectionInfo = 'no connection';
-  return {serverId : connectionInfo};
+  return connectionInfo;
 };
 
 var getProxyInfo = function(client) {
@@ -213,7 +199,7 @@ var getProxyInfo = function(client) {
   } else {
     proxyInfo = 'no proxy loaded';
   }
-  return {proxyInfo: proxyInfo};
+  return proxyInfo;
 };
 
 var getHandlerInfo = function(client) {
@@ -241,7 +227,7 @@ var getHandlerInfo = function(client) {
   } else {
     handlerInfo = 'no handler loaded';
   }
-  return {handlerInfo: handlerInfo};
+  return handlerInfo;
 };
 
 var getComponentInfo = function(client) {
@@ -251,7 +237,7 @@ var getComponentInfo = function(client) {
     var name = getComponentName(key);
     res[name] = clone(name, client.app.get(name + 'Config'));
   }
-  return {componentInfo: res};
+  return res;
 };
 
 var getSettingInfo = function(client) {
@@ -267,7 +253,7 @@ var getSettingInfo = function(client) {
     }
     res[key] = _settings[key];
   }
-  return {settingInfo: res};
+  return res;
 };
 
 function clone(param, obj) {
diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index e7052f542..e0284cbd1 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -56,9 +56,16 @@ Monitor.prototype.stop = function() {
   clearInterval(this.timer);
 };
 
-Monitor.prototype.sendCommandResult = function(result) {
-  //send result to redis, key:
-  var key = constants.RESERVED.REDIS_REG_RES_PREFIX + this.app.env + ':' + this.app.getCurServer().id;
+Monitor.prototype.sendCommandResult = function(result, type) {
+  var key;
+  if(!type){
+    //send result to redis, key:
+    key = constants.RESERVED.REDIS_REG_RES_PREFIX + this.app.env + ':' + this.app.getCurServer().id;
+  } else {
+    //send show info to redis, key:
+    key = constants.RESERVED.REDIS_REG_RES_PREFIX + this.app.env + ':' + this.app.getCurServer().id + ':' + type;
+  }
+
   this.client.set(key, result, function(err){
     if(err){
       logger.error('set %j err: %j', key, err);
@@ -74,6 +81,7 @@ var watcherCluster2Command = function() {
 var getClusterInfo = function(self, app, redis, serverInfo) {
   var results = {};
   var key = constants.RESERVED.REDIS_REG_PREFIX + app.env;
+  serverInfo.pid = process.pid;
   var args = [key, Date.now() + self.expire, JSON.stringify(serverInfo)];
 
   redis.zadd(args, function(err, res) {

From b36876a80ded8e94fd1a98369464ea22c976f496 Mon Sep 17 00:00:00 2001
From: "zhangmin.name" <zhangmin@zhangmin.name>
Date: Fri, 6 Nov 2015 15:47:47 +0800
Subject: [PATCH 63/78] fix zookeepermonitor show command

---
 lib/monitors/common/cmd.js       |   4 +-
 lib/monitors/zookeepermonitor.js | 168 +++----------------------------
 2 files changed, 15 insertions(+), 157 deletions(-)

diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index e3985ab3f..a5b6b35ef 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -160,6 +160,7 @@ var show = function(client) {
   result.settingInfo = getSettingInfo(client);
 
   client.sendCommandResult(JSON.stringify(result), 'show');
+  logger.info('show %s in server %s with result:%s', msg.param, client.app.serverId, JSON.stringify(result));
 };
 
 var getConnectionInfo = function(client) {
@@ -169,8 +170,9 @@ var getConnectionInfo = function(client) {
   
   if (connection) {
     connectionInfo.connectionInfo = connection.getStatisticsInfo();
+  } else {
+    connectionInfo.connectionInfo = 'no connection';
   }
-  connectionInfo.connectionInfo = 'no connection';
   return connectionInfo;
 };
 
diff --git a/lib/monitors/zookeepermonitor.js b/lib/monitors/zookeepermonitor.js
index 509ae9b4a..1b6978e22 100644
--- a/lib/monitors/zookeepermonitor.js
+++ b/lib/monitors/zookeepermonitor.js
@@ -96,6 +96,15 @@ Monitor.prototype.stop = function() {
   this.client.close();
 };
 
+Monitor.prototype.sendCommandResult = function(result, type) {
+  var buffer = new Buffer(result);
+  this.client.setData(this.cmdPath, buffer, function(err, stat) {
+      if (err) {
+        logger.error('send result to zookeeper failed with err:%j', err);
+      }
+  });
+};
+
 var getData = function(zk, path, watcher, cb) {
   zk.client.getData(path, watcher, function(err, data) {
     if(!!err) {
@@ -145,16 +154,9 @@ var createDefaultRoot = function(zk, path, cb) {
 var registerZK = function(zk, cb) {
 
   var allInfo = {};
-
-  allInfo.serverInfo = getServerInfo(zk);
-  allInfo.connectionInfo = getConnectionInfo(zk);
-  allInfo.loginInfo = allInfo.connectionInfo;
-  allInfo.proxyInfo = getProxyInfo(zk);
-  allInfo.handlerInfo = getHandlerInfo(zk);
-  allInfo.settingInfo = getSettingInfo(zk);
-  allInfo.componentInfo = getComponentInfo(zk);
-  allInfo.statusInfo = getStatusInfo(zk);
-  allInfo.moduleInfo = getModuleInfo(zk);
+  var serverInfo = zk.app.getCurServer();
+  serverInfo.pid = process.pid;
+  allInfo.serverInfo = serverInfo;
 
   var buffer = new Buffer(JSON.stringify(allInfo));
 
@@ -184,152 +186,6 @@ var registerZK = function(zk, cb) {
     });
 };
 
-var getServerInfo = function(zk) {
-  var serverInfo = zk.app.getCurServer();
-  serverInfo.pid = process.pid;
-  return serverInfo;
-};
-
-var getConnectionInfo = function(zk) {
-  var connectionInfo = {};
-  var connection = zk.app.components.__connection__;
-  connectionInfo.serverId = zk.app.serverId;
-  if (connection) {
-    connectionInfo.body = connection.getStatisticsInfo();
-    
-  }
-  connectionInfo.body = 'no connection';
-  return connectionInfo;
-};
-
-var getProxyInfo = function(zk) {
-  var proxyInfo = {};
-  var __proxy__ = zk.app.components.__proxy__;
-  if (__proxy__ && __proxy__.client && __proxy__.client.proxies.user) {
-    var proxies = __proxy__.client.proxies.user;
-    var server = zk.app.getServerById(zk.app.serverId);
-    if (!server) {
-      logger.error('no server with this id ' + zk.app.serverId);
-    } else {
-      var type = server['serverType'];
-      var tmp = proxies[type];
-      proxyInfo[type] = {};
-      for (var _proxy in tmp) {
-        var r = tmp[_proxy];
-        proxyInfo[type][_proxy] = {};
-        for (var _rpc in r) {
-          if (typeof r[_rpc] === 'function') {
-            proxyInfo[type][_proxy][_rpc] = 'function';
-          }
-        }
-      }
-    }
-  } else {
-    proxyInfo = 'no proxy loaded';
-  }
-  return proxyInfo;
-};
-
-var getHandlerInfo = function(zk) {
-  var handlerInfo = {};
-  var __server__ = zk.app.components.__server__;
-  if (__server__ && __server__.server && __server__.server.handlerService.handlers) {
-    var handles = __server__.server.handlerService.handlers;
-    var server = zk.app.getServerById(zk.app.serverId);
-    if (!server) {
-      logger.error('no server with this id ' + zk.app.serverId);
-    } else {
-      var type = server['serverType'];
-      var tmp = handles;
-      handlerInfo[type] = {};
-      for (var _p in tmp) {
-        var r = tmp[_p];
-        handlerInfo[type][_p] = {};
-        for (var _r in r) {
-          if (typeof r[_r] === 'function') {
-            handlerInfo[type][_p][_r] = 'function';
-          }
-        }
-      }
-    }
-  } else {
-    handlerInfo = 'no handler loaded';
-  }
-  return handlerInfo;
-};
-
-var getComponentInfo = function(zk) {
-    var _components = zk.app.components;
-    var res = {};
-    for (var key in _components) {
-      var name = getComponentName(key);
-      res[name] = clone(name, zk.app.get(name + 'Config'));
-    }
-    return res;
-};
-
-var getSettingInfo = function(zk) {
-    var _settings = zk.app.settings;
-    var res = {};
-    for (var key in _settings) {
-      if (key.match(/^__\w+__$/) || key.match(/\w+Config$/)) {
-        continue;
-      }
-      if (!checkJSON(_settings[key])) {
-        res[key] = 'Object';
-        continue;
-      }
-      res[key] = _settings[key];
-    }
-    return res;
-};
-
-var getStatusInfo = function(zk) {
-    var statusInfo = {};
-    return statusInfo;
-};
-
-var getModuleInfo = function(zk) {
-    var moduleInfo = {};
-    return moduleInfo;
-};
-
-function clone(param, obj) {
-  var result = {};
-  var flag = 1;
-  for (var key in obj) {
-    if (typeof obj[key] === 'function' || typeof obj[key] === 'object') {
-      continue;
-    }
-    flag = 0;
-    result[key] = obj[key];
-  }
-  if (flag) {
-    // return 'no ' + param + 'Config info';
-  }
-  return result;
-}
-
-function getComponentName(c) {
-  var t = c.match(/^__(\w+)__$/);
-  if (t) {
-    t = t[1];
-  }
-  return t;
-}
-
-function checkJSON(obj) {
-  if (!obj) {
-    return true;
-  }
-  try {
-    JSON.stringify(obj);
-  } catch (e) {
-    return false;
-  }
-  return true;
-}
-
 var createAllNode = function(zk, value, mode, cb) {
   async.series([
     function(callback) {

From 5e02666cd3a6f861a0d3da0e50bb599257b92053 Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Fri, 6 Nov 2015 17:05:11 +0800
Subject: [PATCH 64/78] bug fix

---
 lib/monitors/common/cmd.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index e3985ab3f..3b14daa4a 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -169,8 +169,9 @@ var getConnectionInfo = function(client) {
   
   if (connection) {
     connectionInfo.connectionInfo = connection.getStatisticsInfo();
+  } else {
+    connectionInfo.connectionInfo = 'no connection';
   }
-  connectionInfo.connectionInfo = 'no connection';
   return connectionInfo;
 };
 

From a122152f516a40e920584ca49b88ecc036c9633d Mon Sep 17 00:00:00 2001
From: hzxuzhonghu <zhhxu2011@163.com>
Date: Fri, 6 Nov 2015 17:11:04 +0800
Subject: [PATCH 65/78] remove log info

---
 lib/monitors/common/cmd.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index a5b6b35ef..3b14daa4a 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -160,7 +160,6 @@ var show = function(client) {
   result.settingInfo = getSettingInfo(client);
 
   client.sendCommandResult(JSON.stringify(result), 'show');
-  logger.info('show %s in server %s with result:%s', msg.param, client.app.serverId, JSON.stringify(result));
 };
 
 var getConnectionInfo = function(client) {

From 609588a016b4e089bd6d06e42c28d7a4f48fe1ba Mon Sep 17 00:00:00 2001
From: "zhangmin.name" <zhangmin@zhangmin.name>
Date: Tue, 10 Nov 2015 14:59:40 +0800
Subject: [PATCH 66/78] fix get handler info

---
 lib/monitors/common/cmd.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/monitors/common/cmd.js b/lib/monitors/common/cmd.js
index 3b14daa4a..19a732801 100644
--- a/lib/monitors/common/cmd.js
+++ b/lib/monitors/common/cmd.js
@@ -206,8 +206,8 @@ var getProxyInfo = function(client) {
 var getHandlerInfo = function(client) {
   var handlerInfo = {};
   var __server__ = client.app.components.__server__;
-  if (__server__ && __server__.server && __server__.server.handlerService.handlers) {
-    var handles = __server__.server.handlerService.handlers;
+  if (__server__ && __server__.server && __server__.server.handlerService.handlerMap) {
+    var handles = __server__.server.handlerService.handlerMap;
     var server = client.app.getServerById(client.app.serverId);
     if (!server) {
       logger.error('no server with this id ' + client.app.serverId);
@@ -219,8 +219,11 @@ var getHandlerInfo = function(client) {
         var r = tmp[_p];
         handlerInfo[type][_p] = {};
         for (var _r in r) {
-          if (typeof r[_r] === 'function') {
-            handlerInfo[type][_p][_r] = 'function';
+          var g = r[_r];
+          for(var _g in g) {
+            if (typeof g[_g] === 'function') {
+              handlerInfo[type][_p][_g] = 'function';
+            }
           }
         }
       }

From 0cef773d35d4789e50c57df913fd22ff74705fc3 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Thu, 3 Dec 2015 11:30:09 +0800
Subject: [PATCH 67/78] upgrade pomelo-rpc to 1.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 409dc763d..d35898e23 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "cliff": "0.1.8",
     "mkdirp": "0.3.3",
     "pomelo-loader": "0.0.6",
-    "pomelo-rpc": "1.0.0",
+    "pomelo-rpc": "1.0.1",
     "pomelo-protocol": "0.1.6",
     "pomelo-logger": "0.1.7",
     "pomelo-scheduler": "0.3.9",

From 4b0ffd29de9518d59d012718823e28fd3278e8c5 Mon Sep 17 00:00:00 2001
From: "zhangmin.name" <hzzhangmin15@corp.netease.com>
Date: Wed, 9 Dec 2015 14:48:13 +0800
Subject: [PATCH 68/78] remove redisMonitor's cluster mode

---
 lib/monitors/redismonitor.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index e0284cbd1..02bb6ea8d 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -26,13 +26,12 @@ Monitor.prototype.start = function(cb) {
   var self = this;
   if(this.mode === 'single') {
     this.client = new Redis(this.redisNodes.port, this.redisNodes.host, this.redisOpts);
-  } else if(this.mode === 'sentinel') {
+  } else {
     this.client = new Redis({
-      sentinels: this.redisNodes,
+      sentinels: this.redisNodes.hosts,
+      password: this.password,
       name: this.name
     }, this.redisOpts);
-  } else {
-    this.client = new Redis.Cluster(this.redisNodes, this.redisOpts);
   }
 
   this.client.once('connect', function() {

From 23481e695beddbd82b34f7d9d058fb126e4f5471 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Mon, 21 Dec 2015 10:16:06 +0800
Subject: [PATCH 69/78] upgrade pomelo-rpc to 1.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d35898e23..81ca067b0 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "cliff": "0.1.8",
     "mkdirp": "0.3.3",
     "pomelo-loader": "0.0.6",
-    "pomelo-rpc": "1.0.1",
+    "pomelo-rpc": "1.0.2",
     "pomelo-protocol": "0.1.6",
     "pomelo-logger": "0.1.7",
     "pomelo-scheduler": "0.3.9",

From 737b4bc8f3abac9e69943e09b0a6cfc22b16b26b Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Thu, 7 Jan 2016 10:59:16 +0800
Subject: [PATCH 70/78] upgrade pomelo-loader to 0.0.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 81ca067b0..7060f21a5 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "crc": "0.2.0",
     "cliff": "0.1.8",
     "mkdirp": "0.3.3",
-    "pomelo-loader": "0.0.6",
+    "pomelo-loader": "0.0.7",
     "pomelo-rpc": "1.0.2",
     "pomelo-protocol": "0.1.6",
     "pomelo-logger": "0.1.7",

From 64686b788dd4c9a8bc32d7576da648fca8516e74 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 8 Jan 2016 20:13:25 +0800
Subject: [PATCH 71/78] remove clear proxy

---
 lib/components/proxy.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/components/proxy.js b/lib/components/proxy.js
index 613e1f300..dc57eba37 100644
--- a/lib/components/proxy.js
+++ b/lib/components/proxy.js
@@ -109,7 +109,6 @@ pro.replaceServers = function(servers) {
   }
 
   // update proxies
-  this.client.proxies = {};
   genProxies(this.client, this.app, servers);
 
   this.client.replaceServers(servers);

From 52061fd61882f790c96372097e1d45a4b1ad4883 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Thu, 14 Jan 2016 10:20:32 +0800
Subject: [PATCH 72/78] upgrade to 2.0.0-pre

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7060f21a5..8dbe7245e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pomelo",
-  "version": "2.0.0",
+  "version": "2.0.0-pre",
   "private": false,
   "homepage": "https://github.com/NetEase/pomelo",
   "repository": {

From 993fd3f32e5d0a54eb2231bac7bfaa2520fe5271 Mon Sep 17 00:00:00 2001
From: "zhangmin.name" <zhangmin@zhangmin.name>
Date: Fri, 18 Mar 2016 10:33:03 +0800
Subject: [PATCH 73/78] add redis ping to redesmonitor

---
 lib/monitors/redismonitor.js | 103 ++++++++++++++++++++++++++++++++++-
 lib/util/constants.js        |   4 +-
 package.json                 |   3 +-
 3 files changed, 105 insertions(+), 5 deletions(-)

diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index 02bb6ea8d..2c8723fce 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -4,6 +4,7 @@ var commander = require('./common/cmd');
 var constants = require('../util/constants');
 var utils = require('../util/utils');
 var logger = require('pomelo-logger').getLogger('pomelo', __filename);
+var redisMonitor = require('redis');
 
 var Monitor = function(app, opts) {
   if(!(this instanceof Monitor)) {
@@ -34,24 +35,42 @@ Monitor.prototype.start = function(cb) {
     }, this.redisOpts);
   }
 
-  this.client.once('connect', function() {
+  this.client.on('connect', function() {
     logger.info('%s connected to redis successfully !', self.app.serverId);
     if(self.password) {
       self.client.auth(self.password);
     }
     watcherCluster2Command.call(self);
     self.timer = setInterval(watcherCluster2Command.bind(self), self.period);
+
+    if(self.mode === 'multiple') {
+      clearPingTimer(self, function() {
+        getMaster(self, self.redisNodes);
+      });
+    }
+
     utils.invokeCallback(cb);
 
   });
 
-  this.client.on('error', function(err) {
-    logger.error('redis err:', err);
+  this.client.on('error', function(error) {
+      logger.error("[redisMonitor] server has errors with redis server, with error: %j", error);
+  });
+
+  this.client.on('close', function() {
+    logger.error("[redisMonitor] server has been closed with redis server.");
+  });
+
+  this.client.on('end', function() {
+     logger.error("[redisMonitor] server is over and without reconnection.");
   });
 };
 
 Monitor.prototype.stop = function() {
   this.client.end();
+  if (!!this.pingRedis) {
+    this.pingRedis.end();
+  }
   clearInterval(this.timer);
 };
 
@@ -127,3 +146,81 @@ var getCommand = function(self, app, redis, serverInfo) {
     }
   });
 };
+
+var getMaster = function(self, redisNodes) {
+  logger.info("[redisMonitor] get master");
+  var redis = self.client;
+  var clients = redisNodes.redis;
+  for(var i=0; i<clients.length; i++) {
+    (function(index) {
+      logger.info("[redisMonitor] get master with index: %s, port: %s, host: %s", index, clients[index].port, clients[index].host);
+      var client = redisMonitor.createClient(clients[index].port, clients[index].host, {auth_pass: redisNodes.password});
+      client.on('connect', function() {
+        logger.info("[redisMonitor] connect redis host: %s port: %s successfully.", clients[index].host, clients[index].port);
+        client.info('replication', function(err, info) {
+          if (!!err) {
+            logger.error("[redisMonitor] get redis info error with host: %s port: %s", clients[index].host, clients[index].port);
+          }
+          var obj = {};
+          var lines = info.toString().split("\r\n");
+          lines.forEach(function(line) {
+            var parts = line.split(':');
+            if (parts[1]) {
+              obj[parts[0]] = parts[1];
+            }
+          });
+          if(obj.role == 'master') {
+            self.pingRedis = client;
+            self.pingtimer = setInterval(function() {
+              logger.info("[redisMonitor] ping redis with host: %s port: %s", clients[index].host, clients[index].port);
+              ping(self, client, redis);
+            }, constants.TIME.DEFAULT_REDIS_PING);
+          } else {
+            client.end();
+            client = null;
+          }
+        });
+      });
+      client.on('error', function() {
+        logger.error('[redisMonitor] monitor redis connect error');
+        client.end();
+        client = null;
+      });
+    })(i);
+  }
+};
+
+var ping = function(self, client, rds) {
+  var timeout = setTimeout(function() {
+    logger.error('[redisMonitor] ping redis timeout');
+    clearInterval(self.pingtimer);
+    if(self.pingtimer) {
+      logger.info('[redisMonitor] clear pingtimer timeout');
+      client.end();
+      client = null;
+      self.pingtimer = null;
+      rds.end();
+      rds = null;
+      self.start(function() {});
+    }
+  }, constants.TIME.DEFAULT_REDIS_PING_TIMEOUT);
+  client.ping(function(err) {
+    clearTimeout(timeout);
+    if (!!err) {
+      logger.error('[redisMonitor] redis ping error');
+    }
+    logger.info('[redisMonitor] ping');
+  });
+};
+
+var clearPingTimer = function(self, cb) {
+  logger.info('[redisMonitor] clear ping timer');
+  clearInterval(self.pingtimer);
+  var client = self.pingRedis;
+  if(!!client) {
+    client.end();
+    client = null;
+    self.pingtimer = null;
+  }
+  utils.invokeCallback(cb);
+};
diff --git a/lib/util/constants.js b/lib/util/constants.js
index e0122cf13..25e05ff86 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -123,7 +123,9 @@ module.exports = {
    DEFAULT_SPIN_DELAY: 1000,
    DEFAULT_REDIS_CONNECT_TIMEOUT: 15 * 1000,
    DEFAULT_REDIS_REG: 5 * 1000,
-   DEFAULT_REDIS_EXPIRE: 15 * 1000
+   DEFAULT_REDIS_EXPIRE: 15 * 1000,
+   DEFAULT_REDIS_PING_TIMEOUT: 15 * 1000,
+   DEFAULT_REDIS_PING: 60 * 1000
  },
 
  RETRY: {
diff --git a/package.json b/package.json
index 7060f21a5..f686338b6 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,8 @@
     "mqtt": "0.3.9",
     "node-zookeeper-client": "0.2.2",
     "node-uuid": "1.4.3",
-    "ioredis": "1.10.0"
+    "ioredis": "1.10.0",
+	"redis": "0.12.1"
   },
   "bin": {
     "pomelo": "./bin/pomelo"

From 59488b51f5cf2c849370d2ad9fc85fdba6b15782 Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Fri, 8 Jan 2016 20:13:25 +0800
Subject: [PATCH 74/78] remove clear proxy

---
 lib/components/proxy.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/components/proxy.js b/lib/components/proxy.js
index 613e1f300..dc57eba37 100644
--- a/lib/components/proxy.js
+++ b/lib/components/proxy.js
@@ -109,7 +109,6 @@ pro.replaceServers = function(servers) {
   }
 
   // update proxies
-  this.client.proxies = {};
   genProxies(this.client, this.app, servers);
 
   this.client.replaceServers(servers);

From b88f8584d965d59cd56a2274b6a77393d25b612f Mon Sep 17 00:00:00 2001
From: py8765 <pengyang633@126.com>
Date: Thu, 14 Jan 2016 10:20:32 +0800
Subject: [PATCH 75/78] upgrade to 2.0.0-pre

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f686338b6..ec75929dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pomelo",
-  "version": "2.0.0",
+  "version": "2.0.0-pre",
   "private": false,
   "homepage": "https://github.com/NetEase/pomelo",
   "repository": {

From 0d5ad0fc9c8d6e37066982846e8900139cedac7e Mon Sep 17 00:00:00 2001
From: "zhangmin.name" <zhangmin@zhangmin.name>
Date: Tue, 26 Apr 2016 10:38:21 +0800
Subject: [PATCH 76/78] upgrade to 2.0.0, update pomelo-rpc to 1.0.3

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ec75929dc..dfbd15c3f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pomelo",
-  "version": "2.0.0-pre",
+  "version": "2.0.0",
   "private": false,
   "homepage": "https://github.com/NetEase/pomelo",
   "repository": {
@@ -35,7 +35,7 @@
     "cliff": "0.1.8",
     "mkdirp": "0.3.3",
     "pomelo-loader": "0.0.7",
-    "pomelo-rpc": "1.0.2",
+    "pomelo-rpc": "1.0.3",
     "pomelo-protocol": "0.1.6",
     "pomelo-logger": "0.1.7",
     "pomelo-scheduler": "0.3.9",

From dfd665d85f18cbb74ecd7a647cad2eac9c3071cf Mon Sep 17 00:00:00 2001
From: Andre Hahn <andre.hahn@tfgco.com>
Date: Wed, 29 Jun 2016 19:37:14 -0300
Subject: [PATCH 77/78] Fixed a bug in redismonitor that crashed the app

When the redis client disconnected and reconnected it tried to start
the app again and listen to the port already in use.

The fix ensures the connect callback is called just once to avoid
this bug.
---
 lib/monitors/redismonitor.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/monitors/redismonitor.js b/lib/monitors/redismonitor.js
index 2c8723fce..8d78ae286 100644
--- a/lib/monitors/redismonitor.js
+++ b/lib/monitors/redismonitor.js
@@ -25,6 +25,7 @@ module.exports = Monitor;
 
 Monitor.prototype.start = function(cb) {
   var self = this;
+  self.started = false;
   if(this.mode === 'single') {
     this.client = new Redis(this.redisNodes.port, this.redisNodes.host, this.redisOpts);
   } else {
@@ -41,7 +42,6 @@ Monitor.prototype.start = function(cb) {
       self.client.auth(self.password);
     }
     watcherCluster2Command.call(self);
-    self.timer = setInterval(watcherCluster2Command.bind(self), self.period);
 
     if(self.mode === 'multiple') {
       clearPingTimer(self, function() {
@@ -49,8 +49,11 @@ Monitor.prototype.start = function(cb) {
       });
     }
 
-    utils.invokeCallback(cb);
-
+    if(!self.started) {
+      self.started = true;
+      self.timer = setInterval(watcherCluster2Command.bind(self), self.period);
+      utils.invokeCallback(cb);
+    }
   });
 
   this.client.on('error', function(error) {

From de16fe94d0db376ef13a4c6a116fd974591f962e Mon Sep 17 00:00:00 2001
From: Michael Mac-Vicar <mmacvicar@gmail.com>
Date: Wed, 16 Nov 2016 00:16:31 -0200
Subject: [PATCH 78/78] Adds an alternative lighter redis monitor

---
 lib/monitors/redismonitorlight.js | 283 ++++++++++++++++++++++++++++++
 lib/pomelo.js                     |   7 +-
 lib/util/constants.js             |   2 +
 3 files changed, 289 insertions(+), 3 deletions(-)
 create mode 100644 lib/monitors/redismonitorlight.js

diff --git a/lib/monitors/redismonitorlight.js b/lib/monitors/redismonitorlight.js
new file mode 100644
index 000000000..6a50685cd
--- /dev/null
+++ b/lib/monitors/redismonitorlight.js
@@ -0,0 +1,283 @@
+'use strict';
+var Redis = require('ioredis');
+var commander = require('./common/cmd');
+var constants = require('../util/constants');
+var utils = require('../util/utils');
+var logger = require('pomelo-logger').getLogger('pomelo', __filename);
+var redisMonitor = require('redis');
+
+var Monitor = function(app, opts) {
+  if(!(this instanceof Monitor)) {
+    return new Monitor(app, opts);
+  }
+
+  this.app = app;
+  this.mode = opts.mode || 'single';
+  this.name = opts.name || null;
+  this.redisNodes = opts.redisNodes || [];
+  this.period = opts.period || constants.TIME.DEFAULT_REDIS_REG;
+  this.updateInfoPeriod = opts.updateInfoPeriod || constants.TIME.DEFAULT_REDIS_REG_UPDATE_INFO;
+  this.updateInfoExpire = opts.updateInfoExpire || 3.0*constants.TIME.DEFAULT_REDIS_REG_UPDATE_INFO;
+  this.maxServerInfoBatch = opts.maxServerInfoBatch;
+  this.expire = opts.expire || constants.TIME.DEFAULT_REDIS_EXPIRE;
+  this.password = opts.password || null;
+  this.redisOpts = opts.redisOpts || {};
+  this.lastResults = {}
+};
+
+module.exports = Monitor;
+
+Monitor.prototype.start = function(cb) {
+  var self = this;
+  self.started = false;
+  if(this.mode === 'single') {
+    this.client = new Redis(this.redisNodes.port, this.redisNodes.host, this.redisOpts);
+  } else {
+    this.client = new Redis({
+      sentinels: this.redisNodes.hosts,
+      password: this.password,
+      name: this.name
+    }, this.redisOpts);
+  }
+
+  this.client.on('connect', function() {
+    logger.info('%s connected to redis successfully !', self.app.serverId);
+    if(self.password) {
+      self.client.auth(self.password);
+    }
+    // Initial registration and fetch other servers
+    watcherUpdateServerInfo.call(self);
+    watcherCluster2Command.call(self);
+
+    if(self.mode === 'multiple') {
+      clearPingTimer(self, function() {
+        getMaster(self, self.redisNodes);
+      });
+    }
+
+    if(!self.started) {
+      self.started = true;
+      self.updateInfoTimer = setInterval(watcherUpdateServerInfo.bind(self), self.updateInfoPeriod);
+      self.timer = setInterval(watcherCluster2Command.bind(self), self.period);
+      utils.invokeCallback(cb);
+    }
+  });
+
+  this.client.on('error', function(error) {
+      logger.error("[redisMonitor] server has errors with redis server, with error: %j", error);
+  });
+
+  this.client.on('close', function() {
+    logger.error("[redisMonitor] server has been closed with redis server.");
+  });
+
+  this.client.on('end', function() {
+     logger.error("[redisMonitor] server is over and without reconnection.");
+  });
+};
+
+Monitor.prototype.stop = function() {
+  this.client.end();
+  if (!!this.pingRedis) {
+    this.pingRedis.end();
+  }
+  clearInterval(this.timer);
+};
+
+Monitor.prototype.sendCommandResult = function(result, type) {
+  var key;
+  if(!type){
+    //send result to redis, key:
+    key = constants.RESERVED.REDIS_REG_RES_PREFIX + this.app.env + ':' + this.app.getCurServer().id;
+  } else {
+    //send show info to redis, key:
+    key = constants.RESERVED.REDIS_REG_RES_PREFIX + this.app.env + ':' + this.app.getCurServer().id + ':' + type;
+  }
+
+  this.client.set(key, result, function(err){
+    if(err){
+      logger.error('set %j err: %j', key, err);
+    }
+  });
+};
+
+var watcherUpdateServerInfo = function() {
+  updateServerInfo(this, this.app, this.client, this.app.getCurServer());
+};
+
+var watcherCluster2Command = function() {
+  getClusterInfo(this, this.app, this.client, this.app.getCurServer());
+  getCommand(this, this.app, this.client, this.app.getCurServer());
+};
+
+var getClusterInfo = function(self, app, redis, serverInfo) {
+  var results = {};
+  var key = constants.RESERVED.REDIS_REG_PREFIX + app.env;
+  serverInfo.pid = process.pid;
+  var args = [key, Date.now() + self.expire, serverInfo.id];
+
+  redis.zadd(args, function(err, res) {
+    if(err) {
+      logger.error('zadd %j err: %j', args, err);
+      return;
+    }
+
+    var query_args = [key, Date.now(), '+inf'];
+    redis.zrangebyscore(query_args, function(err, res) {
+      if(err) {
+        logger.error('zrangebyscore %j err: %j', query_args, err);
+        return;
+      }
+      var missingServersKeys = [];
+      for (var i = res.length - 1; i >= 0; i--) {
+        // fetch any missing server
+        var serverId = res[i];
+        var lastServerInfo = self.lastResults[serverId]
+        if (lastServerInfo) {
+          results[serverId] = lastServerInfo;
+        }
+        else {
+          missingServersKeys.push(constants.RESERVED.REDIS_REG_SERVER_PREFIX + app.env + ":" +serverId);
+        }
+      }
+      if (missingServersKeys.length > 0) {
+        // fetch missing servers info first
+        if (self.maxServerInfoBatch) {
+          missingServersKeys = missingServersKeys.slice(0, self.maxServerInfoBatch);
+        }
+        redis.mget(missingServersKeys, function(err, res) {
+          if(err) {
+            logger.error('mget %j err: %j', query_args, err);
+            return;
+          }
+          for (var i = res.length - 1; i >= 0; i--) {
+            if (res[i]) {
+              var server = JSON.parse(res[i]);
+              results[server.id] = server;
+            }
+          }
+          logger.debug('cluster servers info: %j',results);
+          self.lastResults = results;
+          app.replaceServers(results);
+        });
+      }
+      else {
+        logger.debug('cluster servers info: %j',results);
+        self.lastResults = results;
+        app.replaceServers(results);
+      }
+    });
+  });
+};
+
+var updateServerInfo = function(self, app, redis, serverInfo) {
+  var key = constants.RESERVED.REDIS_REG_SERVER_PREFIX + app.env + ":" +serverInfo.id;
+  serverInfo.pid = process.pid;
+  var args = [key, self.updateInfoExpire, JSON.stringify(serverInfo)];
+  redis.setex(args, function(err, res) {
+    if(err) {
+      logger.error('setex %j err: %j', args, err);
+      return;
+    }
+    logger.debug('updated server info');
+  });
+}
+
+var getCommand = function(self, app, redis, serverInfo) {
+  var key = constants.RESERVED.REDIS_REG_PREFIX + app.env + ':' + serverInfo.id;
+  redis.get(key, function(err, res) {
+    if(err) {
+      logger.error('get pomelo-regist cmd err %j', err);
+      return;
+    }
+
+    if(res) {
+      logger.debug('get cmd: ', res);
+      redis.del(key, function(err) {
+        if(err) {
+          logger.error('del command err %j', err);
+        }else {
+          commander.init(self, res);
+        }
+      });
+    }
+  });
+};
+
+var getMaster = function(self, redisNodes) {
+  logger.info("[redisMonitor] get master");
+  var redis = self.client;
+  var clients = redisNodes.redis;
+  for(var i=0; i<clients.length; i++) {
+    (function(index) {
+      logger.info("[redisMonitor] get master with index: %s, port: %s, host: %s", index, clients[index].port, clients[index].host);
+      var client = redisMonitor.createClient(clients[index].port, clients[index].host, {auth_pass: redisNodes.password});
+      client.on('connect', function() {
+        logger.info("[redisMonitor] connect redis host: %s port: %s successfully.", clients[index].host, clients[index].port);
+        client.info('replication', function(err, info) {
+          if (!!err) {
+            logger.error("[redisMonitor] get redis info error with host: %s port: %s", clients[index].host, clients[index].port);
+          }
+          var obj = {};
+          var lines = info.toString().split("\r\n");
+          lines.forEach(function(line) {
+            var parts = line.split(':');
+            if (parts[1]) {
+              obj[parts[0]] = parts[1];
+            }
+          });
+          if(obj.role == 'master') {
+            self.pingRedis = client;
+            self.pingtimer = setInterval(function() {
+              logger.info("[redisMonitor] ping redis with host: %s port: %s", clients[index].host, clients[index].port);
+              ping(self, client, redis);
+            }, constants.TIME.DEFAULT_REDIS_PING);
+          } else {
+            client.end();
+            client = null;
+          }
+        });
+      });
+      client.on('error', function() {
+        logger.error('[redisMonitor] monitor redis connect error');
+        client.end();
+        client = null;
+      });
+    })(i);
+  }
+};
+
+var ping = function(self, client, rds) {
+  var timeout = setTimeout(function() {
+    logger.error('[redisMonitor] ping redis timeout');
+    clearInterval(self.pingtimer);
+    if(self.pingtimer) {
+      logger.info('[redisMonitor] clear pingtimer timeout');
+      client.end();
+      client = null;
+      self.pingtimer = null;
+      rds.end();
+      rds = null;
+      self.start(function() {});
+    }
+  }, constants.TIME.DEFAULT_REDIS_PING_TIMEOUT);
+  client.ping(function(err) {
+    clearTimeout(timeout);
+    if (!!err) {
+      logger.error('[redisMonitor] redis ping error');
+    }
+    logger.info('[redisMonitor] ping');
+  });
+};
+
+var clearPingTimer = function(self, cb) {
+  logger.info('[redisMonitor] clear ping timer');
+  clearInterval(self.pingtimer);
+  var client = self.pingRedis;
+  if(!!client) {
+    client.end();
+    client = null;
+    self.pingtimer = null;
+  }
+  utils.invokeCallback(cb);
+};
diff --git a/lib/pomelo.js b/lib/pomelo.js
index 960aac640..ee0cc172d 100644
--- a/lib/pomelo.js
+++ b/lib/pomelo.js
@@ -69,6 +69,7 @@ Pomelo.pushSchedulers.__defineGetter__('buffer', load.bind(null, './pushSchedule
 Pomelo.monitors = {};
 Pomelo.monitors.__defineGetter__('zookeepermonitor', load.bind(null, './monitors/zookeepermonitor'));
 Pomelo.monitors.__defineGetter__('redismonitor', load.bind(null, './monitors/redismonitor'));
+Pomelo.monitors.__defineGetter__('redismonitorlight', load.bind(null, './monitors/redismonitorlight'));
 
 /**
  * Create an pomelo application.
@@ -102,7 +103,7 @@ fs.readdirSync(__dirname + '/components').forEach(function (filename) {
   }
   var name = path.basename(filename, '.js');
   var _load = load.bind(null, './components/', name);
-  
+
   Pomelo.components.__defineGetter__(name, _load);
   Pomelo.__defineGetter__(name, _load);
 });
@@ -113,7 +114,7 @@ fs.readdirSync(__dirname + '/filters/handler').forEach(function (filename) {
   }
   var name = path.basename(filename, '.js');
   var _load = load.bind(null, './filters/handler/', name);
-  
+
   Pomelo.filters.__defineGetter__(name, _load);
   Pomelo.__defineGetter__(name, _load);
 });
@@ -124,7 +125,7 @@ fs.readdirSync(__dirname + '/filters/rpc').forEach(function (filename) {
   }
   var name = path.basename(filename, '.js');
   var _load = load.bind(null, './filters/rpc/', name);
-  
+
   Pomelo.rpcFilters.__defineGetter__(name, _load);
 });
 
diff --git a/lib/util/constants.js b/lib/util/constants.js
index 25e05ff86..9a7646193 100644
--- a/lib/util/constants.js
+++ b/lib/util/constants.js
@@ -79,6 +79,7 @@ module.exports = {
     REDIS: 'redis',
     REDIS_REG_PREFIX: 'pomelo-regist:',
     REDIS_REG_RES_PREFIX: 'pomelo-regist-result:',
+    REDIS_REG_SERVER_PREFIX: 'pomelo-server:',
     DEFAULT_SERVERTYPE: 'pomelo-server'
   },
 
@@ -123,6 +124,7 @@ module.exports = {
    DEFAULT_SPIN_DELAY: 1000,
    DEFAULT_REDIS_CONNECT_TIMEOUT: 15 * 1000,
    DEFAULT_REDIS_REG: 5 * 1000,
+   DEFAULT_REDIS_REG_UPDATE_INFO: 600 * 1000,
    DEFAULT_REDIS_EXPIRE: 15 * 1000,
    DEFAULT_REDIS_PING_TIMEOUT: 15 * 1000,
    DEFAULT_REDIS_PING: 60 * 1000