Merge pull request #48 from jimmiehansson/feature/express-additional-…

…values

Add logic and tests to complement PR #25

lib/req.js

@@ -22,6 +22,16 @@ const pinoReqProto = Object.create({}, {
     writable: true,
     value: ''
   },
+  query: {
+    enumerable: true,
+    writable: true,
+    value: ''
+  },
+  params: {
+    enumerable: true,
+    writable: true,
+    value: ''
+  },
   headers: {
     enumerable: true,
     writable: true,
@@ -61,6 +71,8 @@ function reqSerializer (req) {
   // req.originalUrl is for expressjs compat.
   if (req.originalUrl) {
     _req.url = req.originalUrl
+    _req.query = req.query
+    _req.params = req.params
   } else {
     // req.url.path is  for hapi compat.
     _req.url = req.path || (req.url ? (req.url.path || req.url) : undefined)

test/req.test.js

@@ -352,3 +352,43 @@ test('req.remotePort will be obtained from request info.remotePort if available'
     res.end()
   }
 })
+
+test('req.query is available', function (t) {
+  t.plan(1)
+
+  const server = http.createServer(handler)
+  server.unref()
+  server.listen(0, () => {
+    http.get(server.address(), () => {})
+  })
+
+  t.tearDown(() => server.close())
+
+  function handler (req, res) {
+    req.originalUrl = '/test'
+    req.query = '/foo?bar=foobar&bar=foo'
+    const serialized = serializers.reqSerializer(req)
+    t.is(serialized.query, '/foo?bar=foobar&bar=foo')
+    res.end()
+  }
+})
+
+test('req.params is available', function (t) {
+  t.plan(1)
+
+  const server = http.createServer(handler)
+  server.unref()
+  server.listen(0, () => {
+    http.get(server.address(), () => {})
+  })
+
+  t.tearDown(() => server.close())
+
+  function handler (req, res) {
+    req.originalUrl = '/test'
+    req.params = '/foo/bar'
+    const serialized = serializers.reqSerializer(req)
+    t.is(serialized.params, '/foo/bar')
+    res.end()
+  }
+})