Handle everything at start of request lifecyle (#23)

Author: jsumners

plugin.js

@@ -39,13 +39,13 @@ function etagHandleRequest (req, res, next) {
   })
 }
 
-function etagOnSend (fastifyRequest, fastifyReply, payload, next) {
-  const etag = fastifyReply.getHeader('etag')
-  if (!etag || !fastifyReply._etagLife) return next()
+function etagOnSend (req, res, payload, next) {
+  const etag = res.getHeader('etag')
+  if (!etag || !res._etagLife) return next()
   this.cache.set(
     { id: etag, segment: this.cacheSegment },
     true,
-    fastifyReply._etagLife,
+    res._etagLife,
     next
   )
 }
@@ -67,8 +67,8 @@ function fastifyCachingPlugin (instance, options, next) {
       value = `${_options.privacy}, max-age=${_options.expiresIn}`
     }
 
-    instance.addHook('preHandler', (fastifyReq, fastifyReply, next) => {
-      fastifyReply.header('Cache-control', value)
+    instance.addHook('onRequest', (req, res, next) => {
+      res.header('Cache-control', value)
       next()
     })
   }
@@ -81,6 +81,7 @@ function fastifyCachingPlugin (instance, options, next) {
   instance.addHook('onRequest', etagHandleRequest)
   instance.addHook('onSend', etagOnSend)
 
+  instance[Symbol.for('fastify-caching.registered')] = true
   next()
 }
 

test/cache.test.js

@@ -18,9 +18,22 @@ test('cache property gets added to instance', (t) => {
 })
 
 test('cache is usable', (t) => {
-  t.plan(1)
+  t.plan(3)
   const instance = fastify()
-  instance.register(plugin)
+  instance
+    .register((i, o, n) => {
+      i.addHook('onRequest', function (req, reply, done) {
+        t.notOk(i[Symbol.for('fastify-caching.registered')])
+        done()
+      })
+      n()
+    })
+    .register(plugin)
+
+  instance.addHook('preParsing', function (req, reply, done) {
+    t.is(this[Symbol.for('fastify-caching.registered')], true)
+    done()
+  })
 
   instance.get('/one', (req, reply) => {
     instance.cache.set('one', { one: true }, 100, (err) => {