@fastify/static 6.6.0 → 6.7.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2018 Fastify
+Copyright (c) 2017-2023 Fastify
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/index.js

@@ -4,7 +4,7 @@ const path = require('path')
 const statSync = require('fs').statSync
 const { PassThrough } = require('readable-stream')
 const glob = require('glob')
-const send = require('send')
+const send = require('@fastify/send')
 const contentDisposition = require('content-disposition')
 const fp = require('fastify-plugin')
 const util = require('util')
@@ -349,13 +349,8 @@ async function fastifyStatic (fastify, opts) {
             continue
           }
           routes.add(route)
-          fastify.head(route, routeOpts, function (req, reply) {
-            pumpSendToReply(req, reply, '/' + file, rootPath)
-          })
 
-          fastify.get(route, routeOpts, function (req, reply) {
-            pumpSendToReply(req, reply, '/' + file, rootPath)
-          })
+          setUpHeadAndGet(fastify, routeOpts, route, '/' + file, rootPath)
 
           const key = path.posix.basename(route)
           if (indexes.includes(key) && !indexDirs.has(key)) {
@@ -367,28 +362,34 @@ async function fastifyStatic (fastify, opts) {
       for (const [dirname, rootPath] of indexDirs.entries()) {
         const pathname = dirname + (dirname.endsWith('/') ? '' : '/')
         const file = '/' + pathname.replace(prefix, '')
-
-        fastify.head(pathname, routeOpts, function (req, reply) {
-          pumpSendToReply(req, reply, file, rootPath)
-        })
-
-        fastify.get(pathname, routeOpts, function (req, reply) {
-          pumpSendToReply(req, reply, file, rootPath)
-        })
+        setUpHeadAndGet(fastify, routeOpts, pathname, file, rootPath)
 
         if (opts.redirect === true) {
-          fastify.head(pathname.replace(/\/$/, ''), routeOpts, function (req, reply) {
-            pumpSendToReply(req, reply, file.replace(/\/$/, ''), rootPath)
-          })
-          fastify.get(pathname.replace(/\/$/, ''), routeOpts, function (req, reply) {
-            pumpSendToReply(req, reply, file.replace(/\/$/, ''), rootPath)
-          })
+          setUpHeadAndGet(fastify, routeOpts, pathname.replace(/\/$/, ''), file.replace(/\/$/, ''), rootPath)
         }
       }
     }
   }
-}
 
+  function setUpHeadAndGet (fastify, routeOpts, route, file, rootPath) {
+    const toSetUp = {
+      ...routeOpts,
+      method: ['HEAD', 'GET'],
+      url: route,
+      handler: serveFileHandler
+    }
+    toSetUp.config = toSetUp.config || {}
+    toSetUp.config.file = file
+    toSetUp.config.rootPath = rootPath
+    fastify.route(toSetUp)
+  }
+
+  function serveFileHandler (req, reply) {
+    const file = req.routeConfig.file
+    const rootPath = req.routeConfig.rootPath
+    pumpSendToReply(req, reply, file, rootPath)
+  }
+}
 function checkRootPathForErrors (fastify, rootPath) {
   if (rootPath === undefined) {
     throw new Error('"root" option is required')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/static",
-  "version": "6.6.0",
+  "version": "6.7.0",
   "description": "Plugin for serving static files as fast as possible.",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -35,7 +35,7 @@
     "glob": "^8.0.1",
     "p-limit": "^3.1.0",
     "readable-stream": "^4.0.0",
-    "send": "^0.18.0"
+    "@fastify/send": "^1.0.0"
   },
   "devDependencies": {
     "@fastify/compress": "^6.0.0",
@@ -54,7 +54,7 @@
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",
     "tap": "^16.0.0",
-    "tsd": "^0.24.1"
+    "tsd": "^0.25.0"
   },
   "tsd": {
     "directory": "test/types"

package/test/static.test.js

@@ -1336,7 +1336,7 @@ t.test('send options', (t) => {
   }
   const fastify = Fastify({ logger: false })
   const fastifyStatic = require('proxyquire')('../', {
-    send: function sendStub (req, pathName, options) {
+    '@fastify/send': function sendStub (req, pathName, options) {
       t.equal(pathName, '/index.html')
       t.equal(options.root, path.join(__dirname, '/static'))
       t.equal(options.acceptRanges, 'acceptRanges')