full req/res log prints encoded body

featurist · Apr 11, 2019 · 20e6243 · 20e6243
1 parent e19479f
commit 20e6243
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/middleware/formServer.js b/middleware/formServer.js
@@ -3,7 +3,7 @@ var isStream = require('../isStream')
 var setBodyToString = require('../setBodyToString')
 var setHeaderTo = require('../setHeaderTo')
 var shouldParseAs = require('../shouldParseAs')
-var streamToString = require('../streamToString')
+var readBodyAsString = require('../readBodyAsString')
 var querystringLite = require('../querystring-lite')
 
 module.exports = middleware('form', function (request, next) {
@@ -15,9 +15,9 @@ module.exports = middleware('form', function (request, next) {
 
   return next().then(function (response) {
     if (shouldParseAs(response, 'form', request)) {
-      return streamToString(response.body).then(function (body) {
+      return readBodyAsString(response).then(function () {
         var querystring = request.options.qs || querystringLite
-        response.body = querystring.parse(body)
+        response.body = querystring.parse(response.stringBody)
         return response
       })
     } else {

diff --git a/middleware/jsonServer.js b/middleware/jsonServer.js
@@ -3,7 +3,7 @@ var isStream = require('../isStream')
 var setBodyToString = require('../setBodyToString')
 var setHeaderTo = require('../setHeaderTo')
 var shouldParseAs = require('../shouldParseAs')
-var streamToString = require('../streamToString')
+var readBodyAsString = require('../readBodyAsString')
 
 module.exports = middleware('json', function (request, next) {
   if (request.body instanceof Object && !isStream(request.body)) {
@@ -15,8 +15,8 @@ module.exports = middleware('json', function (request, next) {
 
   return next().then(function (response) {
     if (shouldParseAs(response, 'json', request)) {
-      return streamToString(response.body).then(function (jsonString) {
-        response.body = JSON.parse(jsonString, request.options.jsonReviver)
+      return readBodyAsString(response).then(function () {
+        response.body = JSON.parse(response.stringBody, request.options.jsonReviver)
         return response
       })
     } else {

diff --git a/middleware/log.js b/middleware/log.js
@@ -11,8 +11,6 @@ function logResponse (response) {
 }
 
 module.exports = middleware('log', function (request, next) {
-  request.logBody = request.body
-
   var promise = next()
 
   if (debugResponse.enabled) {

diff --git a/middleware/prepareForLogging.js b/middleware/prepareForLogging.js
@@ -1,12 +1,11 @@
 var obfuscateUrlPassword = require('../obfuscateUrlPassword')
-var isStream = require('../isStream')
 
 module.exports = function prepareForLogging (r) {
   return removeUndefined({
     method: r.method,
     url: r.url && obfuscateUrlPassword(r.url),
-    headers: obfuscateHeaders(r.headers),
-    body: isStream(r.logBody) ? '[Stream]' : r.logBody,
+    headers: r.headers && obfuscateHeaders(r.headers),
+    body: r.stringBody !== undefined ? r.stringBody : r.body ? '[Stream]' : undefined,
     statusCode: r.statusCode,
     statusText: r.statusText
   })

diff --git a/middleware/textServer.js b/middleware/textServer.js
@@ -2,7 +2,7 @@ var middleware = require('./middleware')
 var setBodyToString = require('../setBodyToString')
 var setHeaderTo = require('../setHeaderTo')
 var shouldParseAs = require('../shouldParseAs')
-var streamToString = require('../streamToString')
+var readBodyAsString = require('../readBodyAsString')
 
 module.exports = middleware('text', function (request, next) {
   if (typeof request.body === 'string') {
@@ -12,8 +12,8 @@ module.exports = middleware('text', function (request, next) {
 
   return next().then(function (response) {
     if (shouldParseAs(response, 'text', request)) {
-      return streamToString(response.body).then(function (body) {
-        response.body = body
+      return readBodyAsString(response).then(function () {
+        response.body = response.stringBody
         return response
       })
     } else {

diff --git a/readBodyAsString.js b/readBodyAsString.js
@@ -0,0 +1,7 @@
+var streamToString = require('./streamToString')
+
+module.exports = function (r) {
+  return streamToString(r.body).then(function (string) {
+    r.stringBody = string
+  })
+}
diff --git a/setBodyToString.js b/setBodyToString.js
@@ -3,4 +3,5 @@ var stringToStream = require('./stringToStream')
 module.exports = function (r, s) {
   r.body = stringToStream(s)
   r.headers['content-length'] = Buffer.byteLength(s, 'utf-8')
+  r.stringBody = s
 }