From 3b86ca97d3448e503d7a6f787fa2eef1120d13cc Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Mon, 10 Feb 2014 06:44:00 -0500
Subject: [PATCH] refactor(cloudcmd) route add to express middleware

---
 cloudcmd.js   | 37 ++++++++++++++++++++++---------------
 lib/server.js |  5 +++--
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/cloudcmd.js b/cloudcmd.js
index 331f5207..a318dbe4 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -197,27 +197,34 @@
     /**
      * routing of server queries
      */
-    function route(pParams) {
-        var lRet = main.checkParams(pParams);
+    function route(request, response, callback) {
+        var ret, name, params, isAuth, isFS;
         
-        if (lRet) {
-            var p = pParams;
+        if (request && response) {
+            name    = main.getPathName(request);
+            isAuth  = Util.strCmp(name, ['/auth', '/auth/github']);
+            isFS    = Util.strCmp(name, '/') || Util.isContainStrAtBegin(name, FS);
             
-            if ( Util.strCmp(p.name, ['/auth', '/auth/github']) ) {
-                Util.log('* Routing' +
-                    '-> ' + p.name);
+            params  = {
+                request     : request,
+                response    : response,
+                name        : name
+            };
+            
+            if (isAuth) {
+                Util.log('* Routing' + '-> ' + name);
                 
-                pParams.name    = main.HTMLDIR + p.name + '.html';
-                lRet            = main.sendFile( pParams );
+                params.name = main.HTMLDIR + name + '.html';
+                main.sendFile(params);
+            } else if (isFS)
+                sendContent(params);
+            else {
+                ret = false;
+                Util.exec(callback);
             }
-            else if ( Util.isContainStrAtBegin(p.name, FS) || Util.strCmp( p.name, '/') )
-                lRet = sendContent( pParams );
-            
-            else
-                lRet = false;
         }
         
-        return lRet;
+        return ret;
     }
     
     function sendContent(pParams) {
diff --git a/lib/server.js b/lib/server.js
index ef43426e..3286edee 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -99,6 +99,7 @@
             lHTTPServer = function() {
                 expressApp  = express.getApp([
                     Rest,
+                    Route,
                     join,
                     controller
                 ]);
@@ -182,8 +183,8 @@
         if (lConfig.rest && !expressApp)
             lRet = Util.exec(Rest, pReq, pRes);
         
-        if (!lRet && Route)
-            lRet = Util.exec(Route, data);
+        if (!lRet && !expressApp)
+            lRet = Util.exec(Route, pReq, pRes);
         
         if (!lRet && !expressApp)
             lRet = join(pReq, pRes);