refactor(capturer): support requestHeader and requestBody

Author: huangyoukun

bin/tsw/runtime/capturer.js

@@ -112,7 +112,8 @@ process.nextTick(function() {
                     clientPort: localPort || '',
                     serverIp: remoteAddress || opt.host,
                     serverPort: remotePort || opt.port,
-                    requestRaw: httpUtil.getClientRequestHeaderStr(request) + (request._body.toString('UTF-8') || ''),
+                    requestHeader: httpUtil.getClientRequestHeaderStr(request),
+                    requestBody: request._body ? request._body.toString('base64') : '',
                     responseHeader: httpUtil.getClientResponseHeaderStr(response, bodySize),
                     responseBody: (buffer.toString('base64')) || '',
                     timestamps: {

bin/tsw/util/auto-report/download.js

@@ -417,10 +417,14 @@ const downloadHaz = function (request, response, opt) {
     });
 
     viewData.forEach(function(tmp, i) {
+        if (tmp.requestHeader) {
+            tmp.requestRaw = Buffer.concat([
+                Buffer.from(tmp.curr.requestHeader || '', 'utf-8'),
+                Buffer.from(tmp.curr.requestBody || '', 'base64')
+            ]).toString('UTF-8');
+        }
 
         hazJson.log.entries.push(initRequestHar(tmp));
-
-
     });
     const buf = Buffer.from(JSON.stringify(hazJson), 'UTF-8');
     gzipResponse.write(buf);
@@ -511,7 +515,8 @@ const download = function(request, response, opt) {
                 clientPort: '',
                 serverIp: '',
                 serverPort: '',
-                requestRaw: 'GET log/' + logSNKey + ' HTTP/1.1\r\n\r\n',
+                requestHeader: 'GET log/' + logSNKey + ' HTTP/1.1\r\n\r\n',
+                requestBody: '',
                 responseHeader: 'HTTP/1.1 200 OK\r\nContent-Type: text/plain; charset=UTF-8\r\nConnection: close\r\n\r\n',
                 responseBody: Buffer.from(tmp.curr.logText || '', 'UTF-8').toString('base64'),
                 timestamps: tmp.curr.timestamps
@@ -539,8 +544,19 @@ const download = function(request, response, opt) {
     });
 
     viewData.forEach(function(tmp, i) {
+        let requestRaw;
+
+        if (tmp.curr.requestHeader) {
+            requestRaw = Buffer.concat([
+                Buffer.from(tmp.curr.requestHeader || '', 'utf-8'),
+                Buffer.from(tmp.curr.requestBody || '', 'base64')
+            ]);
+        } else {
+            requestRaw = tmp.curr.requestRaw || '';
+        }
+
         archiver.append(
-            tmp.curr.requestRaw || '',
+            requestRaw,
             {
                 name: 'raw/' + (tmp.curr.sid) + '_c.txt'
             }

bin/tsw/util/auto-report/logReport.js

@@ -187,9 +187,22 @@ module.exports = function(req, res) {
             req.REQUEST.body = format.formatBuffer(req.REQUEST.body);
         }
 
+        let requestBodyText = req.REQUEST.body;
+
+        if (!requestBodyText) {
+            if (req._body) {
+                requestBodyText = req._body.toString('UTF-8');
+            }
+        }
+
+        // limit 64KB
+        if (requestBodyText && requestBodyText.length >= 64 * 1024) {
+            requestBodyText = `[Large than 64KB]: ${requestBodyText.length}`;
+        }
+
         logger.debug('\n${headers}${body}\r\nresponse ${statusCode} ${resHeaders}', {
             headers: httpUtil.getRequestHeaderStr(req),
-            body: req.REQUEST.body || (req._body && req._body.toString('UTF-8') || ''),
+            body: requestBodyText,
             statusCode: res.statusCode,
             resHeaders: JSON.stringify(res._headers, null, 2)
         });
@@ -218,7 +231,8 @@ module.exports = function(req, res) {
                     clientPort: req.socket && req.socket.remotePort,
                     serverIp: serverInfo.intranetIp,
                     serverPort: config.httpPort,
-                    requestRaw: httpUtil.getRequestHeaderStr(req) + (req._body && req._body.toString('UTF-8') || ''),
+                    requestHeader: httpUtil.getRequestHeaderStr(req),
+                    requestBody: req._body ? req._body.toString('base64') : '',
                     responseHeader: httpUtil.getResponseHeaderStr(res),
                     responseBody: res._body ? res._body.toString('base64') : '',
                     logText: logText,