Prevented duplicate "request completed" logs (#63)

Co-authored-by: Manuel Spigolon <[email protected]>
fastify · Mar 20, 2022 · 6ce56ac · 6ce56ac
1 parent b107a7c
commit 6ce56ac
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 13 deletions.
diff --git a/lib/classic/index.js b/lib/classic/index.js
@@ -21,13 +21,13 @@ function plugin(fastify, opts, next) {
 
   if (disposeOnClose) {
     fastify.addHook('onClose', (instance, done) => {
-      return diContainer.dispose().then(done, done)
+      diContainer.dispose().then(done, done)
     })
   }
 
   if (disposeOnResponse) {
     fastify.addHook('onResponse', (request, reply, done) => {
-      return request.diScope.dispose().then(done, done)
+      request.diScope.dispose().then(done, done)
     })
   }
 

diff --git a/lib/fastifyAwilixPlugin.js b/lib/fastifyAwilixPlugin.js
@@ -19,13 +19,13 @@ function plugin(fastify, opts, next) {
 
   if (disposeOnClose) {
     fastify.addHook('onClose', (instance, done) => {
-      return diContainer.dispose().then(done)
+      diContainer.dispose().then(done, done)
     })
   }
 
   if (disposeOnResponse) {
     fastify.addHook('onResponse', (request, reply, done) => {
-      return request.diScope.dispose().then(done)
+      request.diScope.dispose().then(done, done)
     })
   }
 

diff --git a/test/fastifyAwilixPlugin.dispose.spec.js b/test/fastifyAwilixPlugin.dispose.spec.js
@@ -40,17 +40,17 @@ describe('fastifyAwilixPlugin', () => {
 
   variations.forEach((variation) => {
     describe(variation.name, () => {
-      describe('dispose singletons', () => {
-        const endpoint = async (req, res) => {
-          const userRepository = app.diContainer.resolve('userRepository')
-          storedUserRepository = userRepository
-          expect(userRepository.disposeCounter).toEqual(0)
+      const endpoint = async (req, res) => {
+        const userRepository = app.diContainer.resolve('userRepository')
+        storedUserRepository = userRepository
+        expect(userRepository.disposeCounter).toEqual(0)
 
-          res.send({
-            status: 'OK',
-          })
-        }
+        res.send({
+          status: 'OK',
+        })
+      }
 
+      describe('dispose singletons', () => {
         const endpointWithScope = async (req, res) => {
           const userRepository = req.diScope.resolve('userRepository')
           const userRepositoryScoped = req.diScope.resolve('userRepositoryScoped')
@@ -172,6 +172,60 @@ describe('fastifyAwilixPlugin', () => {
           expect(storedUserRepository.disposeCounter).toEqual(1)
         })
       })
+
+      describe('response logging', () => {
+        it('should only produce one "request completed" log with dispose settings enabled', async () => {
+          let requestCompletedLogCount = 0
+          jest.spyOn(process.stdout, 'write').mockImplementation((data) => {
+            const log = JSON.parse(data)
+            if (log.msg === 'request completed') requestCompletedLogCount += 1
+            return true
+          })
+
+          app = fastify({ logger: true })
+          app.register(variation.plugin, { disposeOnClose: true, disposeOnResponse: true })
+          variation.container.register({
+            userRepository: asClass(UserRepository, {
+              lifetime: Lifetime.SINGLETON,
+              dispose: (service) => service.dispose(),
+            }),
+          })
+
+          app.post('/', endpoint)
+          await app.ready()
+
+          await app.inject().post('/').end()
+
+          await app.close()
+          expect(requestCompletedLogCount).toEqual(1)
+        })
+
+        it('should only produce one "request completed" log with dispose settings disabled', async () => {
+          let requestCompletedLogCount = 0
+          jest.spyOn(process.stdout, 'write').mockImplementation((data) => {
+            const log = JSON.parse(data)
+            if (log.msg === 'request completed') requestCompletedLogCount += 1
+            return true
+          })
+
+          app = fastify({ logger: true })
+          app.register(variation.plugin, { disposeOnClose: false, disposeOnResponse: false })
+          variation.container.register({
+            userRepository: asClass(UserRepository, {
+              lifetime: Lifetime.SINGLETON,
+              dispose: (service) => service.dispose(),
+            }),
+          })
+
+          app.post('/', endpoint)
+          await app.ready()
+
+          await app.inject().post('/').end()
+
+          await app.close()
+          expect(requestCompletedLogCount).toEqual(1)
+        })
+      })
     })
   })
 })