From b99befe1b11b18573319711b23be7421721ea039 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Thu, 24 Sep 2015 04:23:44 -0400
Subject: [PATCH] feature(server) remove extra layer to express

---
 lib/server.js         | 13 +++++++------
 lib/server/express.js | 29 -----------------------------
 2 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 lib/server/express.js

diff --git a/lib/server.js b/lib/server.js
index a845eb7b..1ffa7b52 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -9,7 +9,9 @@
         cloudcmd            = require(DIR_LIB + 'cloudcmd'),
         exit                = require(DIR_SERVER + 'exit'),
         config              = require(DIR_SERVER + 'config'),
-        express             = require(DIR_SERVER + 'express'),
+        express             = require('express'),
+        tryRequire          = require('tryrequire'),
+        logger              = tryRequire('morgan'),
         io                  = require('socket.io');
     
     /**
@@ -27,11 +29,7 @@
                         config('ip')                ||
                         '0.0.0.0',
             
-            app      = express.getApp({
-                auth    : config('auth'),
-                username: config('username'),
-                password: config('password')
-            });
+            app      = express();
         
         server          = http.createServer(app);
         
@@ -40,6 +38,9 @@
             socket: io.listen(server)
         }));
         
+        if (logger)
+            app.use(logger('dev'));
+        
         if (port <= 0 || port > 65535)
             exit('cloudcmd --port: %s', 'port number could be 1..65535');
         
diff --git a/lib/server/express.js b/lib/server/express.js
deleted file mode 100644
index 94ff573a..00000000
--- a/lib/server/express.js
+++ /dev/null
@@ -1,29 +0,0 @@
-(function() {
-    'use strict';
-    
-    var DIR                 = __dirname + '/../../',
-        DIR_LIB             = DIR + 'lib/',
-        
-        Util                = require(DIR_LIB + 'util'),
-        
-        tryRequire          = require('tryrequire'),
-        
-        express             = require('express'),
-        logger              = tryRequire('morgan'),
-        
-        app                 = express();
-    
-    exports.getApp          = function(middleware) {
-        var isArray = Util.type.array(middleware);
-        
-        if (logger)
-            app.use(logger('dev'));
-        
-        if (isArray)
-            middleware.forEach(function(middle) {
-                app.use(middle);
-            });
-        
-        return app;
-    };
-})();