@pbvision/fastify-firestore-service 0.0.7 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pbvision/fastify-firestore-service",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Web Framework using Fastify and Firestore ORM",
   "license": "Apache-2.0",
   "type": "module",

package/src/make-app.js

@@ -1,9 +1,9 @@
-import Ajv from 'ajv/dist/2020'
+import Ajv from 'ajv/dist/2020.js'
 import fastify from 'fastify'
 import { v4 as uuidv4 } from 'uuid'
 
 import ComponentRegistrar from './component-registrar.js'
-import makeLogger from './make-logger.js'
+import { makePinoLoggerOptions } from './make-logger.js'
 import compressPlugin from './plugins/compress.js'
 import contentParserPlugin from './plugins/content-parser.js'
 import cookiePlugin from './plugins/cookie.js'
@@ -157,10 +157,10 @@ export default async function makeService (params = {}) {
     coerceTypes: new Ajv({ ...ajvParams, coerceTypes: true }),
     noCoerceTypes: new Ajv({ ...ajvParams, coerceTypes: false })
   }
+  const logger = makePinoLoggerOptions(logging.customizePinoOpts)
   const app = fastify({
-    ignoreTrailingSlash: true,
-    disableRequestLogging: false,
-    logger: makeLogger(logging.customizePinoOpts),
+    disableRequestLogging: true,
+    logger,
     genReqId: () => `${fastifyServerId}-${++requestCount}`
   })
     .setValidatorCompiler(({ httpPart, schema }) => {
@@ -174,6 +174,26 @@ export default async function makeService (params = {}) {
         ? ({ value, error: validate.errors })
         : ({ value })
     })
+    .addHook('onResponse', (req, reply, done) => {
+      let objToLog = {}
+      try {
+        objToLog = logger.serializers.res(reply.raw)
+        Object.assign(objToLog, logger.serializers.req(req))
+        // istanbul ignore else
+        if (latencyTracker.header) {
+          // latency in milliseconds
+          objToLog.latency = reply.getHeader(latencyTracker.header)
+        }
+      } catch (err) /* istanbul ignore next */ {
+        // crashes in onResponse() aren't reported or caught unless we do this
+        if (typeof objToLog !== 'object') {
+          objToLog = {}
+        }
+        objToLog.failedToLog = JSON.stringify(err)
+      }
+      req.log.info(objToLog)
+      done()
+    })
 
   const registrar = new RegistrarCls(app, service)
 

package/src/make-logger.js

@@ -1,4 +1,4 @@
-export default function makeCustomLogger (customizeOpts) {
+export function makePinoLoggerOptions (customizeOpts) {
   function serializeReq (req) {
     const q = req.query
     // istanbul ignore else
@@ -21,9 +21,7 @@ export default function makeCustomLogger (customizeOpts) {
     level: 'debug',
     serializers: {
       req: serializeReq,
-      res: res => {
-        return { status: res.statusCode, req: serializeReq(res.request) }
-      }
+      res: res => ({ status: res.statusCode })
     }
   })
   return options

package/src/plugins/latency-tracker.js

@@ -27,17 +27,6 @@ export default fp(function (fastify, options, next) {
     return payload
   })
 
-  fastify.addHook('onResponse', (req, reply, done) => {
-    // if errored, then it was already logged
-    if (!reply.raw.logged) {
-      req.log.info({
-        req,
-        status: reply.raw.statusCode,
-        latency: reply.getHeader(header)
-      })
-    }
-    done()
-  })
   next()
 }, {
   fastify: '>=3.x',