diff --git a/cloudcmd.js b/cloudcmd.js index 5916ef57..7c36d156 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -253,10 +253,12 @@ else main.sendFile(p); else - sendError(pParams, pError); + main.sendError(pParams, pError); }); } + + return lRet; } function processCommanderContent(pParams){ @@ -287,28 +289,16 @@ main.sendResponse(p); } else - sendError(pParams, pError); + main.sendError(pParams, pError); }); } } else - sendError(pParams, pError); + main.sendError(pParams, pError); }); } } - function sendError(pParams, pError){ - var lRet = Util.checkObjTrue(pParams, - ['name', 'data', 'request', 'response']); - - if(lRet){ - var p = pParams; - p.status = main.FILE_NOT_FOUND; - p.data = pError; - main.sendResponse(p); - } - } - function noJSTMPRedirection(pParams){ var MOVED_PERMANENTLY = 301, lPath = Util.removeStr(pParams.name, 'no-js/'); diff --git a/lib/server/main.js b/lib/server/main.js index 06e7a379..b5a77c01 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -58,6 +58,7 @@ exports.isGZIP = isGZIP, exports.sendFile = sendFile, exports.sendResponse = sendResponse, + exports.sendError = sendError, /* compitability with old versions of node */ exports.fs.exists = exports.fs.exists || exports.path.exists, @@ -288,7 +289,19 @@ } } - /** + function sendError(pParams, pError){ + var lRet = Util.checkObjTrue(pParams, + ['name', 'data', 'request', 'response']); + + if(lRet){ + var p = pParams; + p.status = FILE_NOT_FOUND; + p.data = pError; + sendResponse(p); + } + } + + /** * Функция получает сжатые данные * @param pHeader - заголовок файла * @pName diff --git a/lib/server/rest.js b/lib/server/rest.js index 366f7096..1092fb55 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -115,14 +115,15 @@ lMethod = pParams.method; switch(lMethod){ case 'GET': - var lINDEX = main.INDEX, - lName = main.minify.allowed.html ? - main.minify.getName(lINDEX) : lINDEX; - - lResult = main.commander.sendContent({ - request : pParams.request, - response : pParams.response, - index : lName + var lName = pParams.request.url; + lResult = main.commander.getDirContent(lName, function(pError, pData){ + if(!pError){ + pParams.name = lName; + pParams.data = Util.stringifyJSON(pData); + main.sendResponse(pParams); + } + else + main.sendError(pParams, pError); }); break;