From 16da155f3145fab58b8bafc6e36fbc4b1260bd97 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 5 Mar 2014 07:25:35 -0500 Subject: [PATCH] feature(pipe) add getBody --- lib/server/pipe.js | 19 +++++++++++++++++++ lib/server/rest.js | 22 ++-------------------- lib/server/rest/fs/put.js | 15 +-------------- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/lib/server/pipe.js b/lib/server/pipe.js index bbd1638e..09908a07 100644 --- a/lib/server/pipe.js +++ b/lib/server/pipe.js @@ -16,6 +16,8 @@ Util = main.util, zlib = main.zlib; + exports.getBody = getBody; + exports.create = function(pParams) { var lZlib, lError, lMsg, lRead, lWrite, lIsFsWrite, p = pParams; @@ -62,4 +64,21 @@ } }; + /** + * get body of readStream + * + * @param readStream + * @param callback + */ + function getBody(readStream, callback) { + var body = ''; + + readStream.on('data', function(chunk) { + body += chunk; + }); + + readStream.on('end', function() { + Util.exec(callback, body); + }); + } })(); diff --git a/lib/server/rest.js b/lib/server/rest.js index 684d7b93..1c6dd2ea 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -108,7 +108,7 @@ break; case 'PUT': - getBody(p.request, function(pBody) { + pipe.getBody(p.request, function(pBody) { p.body = pBody; onPUT(p); }); @@ -157,7 +157,7 @@ break; case 'DELETE': - getBody(p.request, function(body) { + pipe.getBody(p.request, function(body) { var files = Util.parseJSON(body); onDelete(p.name, files, query, function(error, callback) { @@ -311,24 +311,6 @@ return ret; } - /** - * get body of url query - * - * @param req - * @param callback - */ - function getBody(req, callback) { - var body = ''; - - req.on('data', function(chunk) { - body += chunk.toString(); - }); - - req.on('end', function() { - Util.exec(callback, body); - }); - } - function sendMsg(pParams, pMsg, pName, pStatus) { var msg = CloudFunc.formatMsg(pMsg, pName, pStatus); sendResponse(pParams, msg); diff --git a/lib/server/rest/fs/put.js b/lib/server/rest/fs/put.js index 76c0270e..8a0977da 100644 --- a/lib/server/rest/fs/put.js +++ b/lib/server/rest/fs/put.js @@ -46,7 +46,7 @@ break; case 'patch': - getBody(readStream, function(patch) { + pipe.getBody(readStream, function(patch) { fs.readFile(name, 'utf8', read); function read(error, data) { @@ -80,17 +80,4 @@ break; } } - - function getBody(req, callback) { - var body = ''; - - req.on('data', function(chunk) { - body += chunk + ''; - }); - - req.on('end', function() { - Util.exec(callback, body); - }); - } - })();