Merge branch 'release/0.0.4'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@treblle/sails",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Sails hook for Treblle",
   "main": "index.js",
   "sails": {
@@ -36,7 +36,7 @@
     "sails": ">=1"
   },
   "dependencies": {
-    "@treblle/utils": "^0.1.9"
+    "@treblle/utils": "^0.1.10"
   },
   "devDependencies": {
     "husky": "^8.0.3",

private/treblle-middleware.js

@@ -4,6 +4,7 @@ const {
   generateTrebllePayload,
   getRequestDuration,
   sendPayloadToTreblle,
+  getResponsePayload,
 } = require('@treblle/utils')
 
 const { version: sdkVersion } = require('../package.json')
@@ -38,33 +39,11 @@ module.exports = function treblleMiddleware(req, res, next) {
 
     const protocol = `${req.protocol}/${req.httpVersion}`
 
-    let originalResponseBody = res._treblleResponsebody
-    let maskedResponseBody
-    try {
-      if (Buffer.isBuffer(res.payload)) {
-        originalResponseBody = originalResponseBody.toString('utf8')
-      }
-      if (typeof originalResponseBody === 'string') {
-        let parsedResponseBody = JSON.parse(originalResponseBody)
-        maskedResponseBody = maskSensitiveValues(
-          parsedResponseBody,
-          fieldsToMask
-        )
-      } else if (typeof originalResponseBody === 'object') {
-        maskedResponseBody = maskSensitiveValues(
-          originalResponseBody,
-          fieldsToMask
-        )
-      }
-    } catch (error) {
-      // if we can't parse the body we'll leave it empty and set an error
-      errors.push({
-        source: 'onShutdown',
-        type: 'INVALID_JSON',
-        message: 'Invalid JSON format',
-        file: null,
-        line: null,
-      })
+    const { payload: maskedResponseBody, error: invalidResponseBodyError } =
+      getResponsePayload(res._treblleResponsebody, fieldsToMask)
+
+    if (invalidResponseBodyError) {
+      errors.push(invalidResponseBodyError)
     }
 
     // Treblle Payload