@fastify/static 6.6.1 → 6.8.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

@@ -27,6 +27,10 @@ async function fastifyStatic (fastify, opts) {
     throw invalidDirListOpts
   }
 
+  if (opts.dotfiles === undefined) {
+    opts.dotfiles = 'allow'
+  }
+
   const sendOptions = {
     root: opts.root,
     acceptRanges: opts.acceptRanges,
@@ -37,8 +41,7 @@ async function fastifyStatic (fastify, opts) {
     immutable: opts.immutable,
     index: opts.index,
     lastModified: opts.lastModified,
-    maxAge: opts.maxAge,
-    serveDotFiles: opts.serveDotFiles ?? false
+    maxAge: opts.maxAge
   }
 
   const allowedPath = opts.allowedPath
@@ -337,7 +340,7 @@ async function fastifyStatic (fastify, opts) {
       const winSeparatorRegex = new RegExp(`\\${path.win32.sep}`, 'g')
 
       for (const rootPath of Array.isArray(sendOptions.root) ? sendOptions.root : [sendOptions.root]) {
-        const files = await globPromise(path.join(rootPath, globPattern).replace(winSeparatorRegex, path.posix.sep), { nodir: true, dot: sendOptions.serveDotFiles })
+        const files = await globPromise(path.join(rootPath, globPattern).replace(winSeparatorRegex, path.posix.sep), { nodir: true, dot: opts.serveDotFiles })
         const indexes = typeof opts.index === 'undefined' ? ['index.html'] : [].concat(opts.index)
 
         for (let file of files) {
@@ -349,13 +352,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 +365,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')
@@ -446,12 +450,12 @@ function checkPath (fastify, rootPath) {
 const supportedEncodings = ['br', 'gzip', 'deflate']
 
 function getContentType (path) {
-  const type = send.mime.lookup(path)
-  const charset = send.mime.charsets.lookup(type)
-  if (!charset) {
+  const type = send.mime.getType(path)
+
+  if (!send.isUtf8MimeType(type)) {
     return type
   }
-  return `${type}; charset=${charset}`
+  return `${type}; charset=UTF-8`
 }
 
 function findIndexFile (pathname, root, indexFiles = ['index.html']) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/static",
-  "version": "6.6.1",
+  "version": "6.8.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",
-    "@fastify/send": "^1.0.0"
+    "@fastify/send": "^2.0.0"
   },
   "devDependencies": {
     "@fastify/compress": "^6.0.0",