@fastify/static 6.7.0 → 6.9.0

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
@@ -237,7 +240,7 @@ async function fastifyStatic (fastify, opts) {
             reply,
             pathname,
             rootPath,
-            undefined,
+            rootPathOffset,
             undefined,
             checkedEncodings
           )
@@ -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) {
@@ -447,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.7.0",
+  "version": "6.9.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",

package/test/static.test.js

@@ -3646,3 +3646,60 @@ t.test('should serve files into hidden dir without wildcard option', (t) => {
     })
   })
 })
+
+t.test(
+  'will serve pre-compressed files with .gzip if multi-root',
+  async (t) => {
+    const pluginOptions = {
+      root: [path.join(__dirname, '/static-pre-compressed'), path.join(__dirname, '/static')],
+      preCompressed: true
+    }
+
+    const fastify = Fastify()
+
+    fastify.register(fastifyStatic, pluginOptions)
+    t.teardown(fastify.close.bind(fastify))
+
+    const response = await fastify.inject({
+      method: 'GET',
+      url: 'all-three.html',
+      headers: {
+        'accept-encoding': '*, *'
+      }
+    })
+
+    genericResponseChecks(t, response)
+    t.equal(response.headers['content-encoding'], 'gzip')
+    t.equal(response.statusCode, 200)
+    t.same(response.rawPayload, allThreeGzip)
+    t.end()
+  }
+)
+
+t.test(
+  'will still serve un-compressed files with multi-root and preCompressed as true',
+  async (t) => {
+    const pluginOptions = {
+      root: [path.join(__dirname, '/static-pre-compressed'), path.join(__dirname, '/static')],
+      preCompressed: true
+    }
+
+    const fastify = Fastify()
+
+    fastify.register(fastifyStatic, pluginOptions)
+    t.teardown(fastify.close.bind(fastify))
+
+    const response = await fastify.inject({
+      method: 'GET',
+      url: 'foobar.html',
+      headers: {
+        'accept-encoding': '*, *'
+      }
+    })
+
+    genericResponseChecks(t, response)
+    t.equal(response.statusCode, 200)
+    t.same(response.body, foobarContent)
+    t.end()
+  }
+)