@fastify/static 8.1.0 → 8.1.1

package/.github/workflows/ci.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
      - main
-     - master
      - next
      - 'v*'
     paths-ignore:

package/README.md

@@ -1,6 +1,6 @@
 # @fastify/static
 
-[![CI](https://github.com/fastify/fastify-static/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/fastify/fastify-static/actions/workflows/ci.yml)
+[![CI](https://github.com/fastify/fastify-static/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/fastify/fastify-static/actions/workflows/ci.yml)
 [![NPM version](https://img.shields.io/npm/v/@fastify/static.svg?style=flat)](https://www.npmjs.com/package/@fastify/static)
 [![neostandard javascript style](https://img.shields.io/badge/code_style-neostandard-brightgreen?style=flat)](https://github.com/neostandard/neostandard)
 

package/index.js

@@ -290,17 +290,19 @@ async function fastifyStatic (fastify, opts) {
         if (metadata.error.code === 'ENOENT') {
         // when preCompress is enabled and the path is a directory without a trailing slash
           if (opts.preCompressed && encoding) {
-            const indexPathname = findIndexFile(pathname, options.root, options.index)
-            if (indexPathname) {
-              return pumpSendToReply(
-                request,
-                reply,
-                pathname + '/',
-                rootPath,
-                undefined,
-                undefined,
-                checkedEncodings
-              )
+            if (opts.redirect !== true) {
+              const indexPathname = findIndexFile(pathname, options.root, options.index)
+              if (indexPathname) {
+                return pumpSendToReply(
+                  request,
+                  reply,
+                  pathname + '/',
+                  rootPath,
+                  undefined,
+                  undefined,
+                  checkedEncodings
+                )
+              }
             }
           }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/static",
-  "version": "8.1.0",
+  "version": "8.1.1",
   "description": "Plugin for serving static files as fast as possible.",
   "main": "index.js",
   "type": "commonjs",

package/test/static-pre-compressed/baz.json

@@ -0,0 +1,3 @@
+{
+  "baz": "baz"
+}

package/test/static.test.js

@@ -2952,6 +2952,34 @@ test(
   }
 )
 
+test(
+  'will redirect to preCompressed index without trailing slash when redirect is true',
+  async (t) => {
+    const pluginOptions = {
+      root: path.join(__dirname, '/static-pre-compressed'),
+      prefix: '/static-pre-compressed/',
+      preCompressed: true,
+      redirect: true,
+    }
+
+    const fastify = Fastify()
+
+    fastify.register(fastifyStatic, pluginOptions)
+    t.after(() => fastify.close())
+
+    const response = await fastify.inject({
+      method: 'GET',
+      url: '/static-pre-compressed/dir',
+      headers: {
+        'accept-encoding': 'gzip, deflate, br'
+      }
+    })
+
+    t.assert.deepStrictEqual(response.statusCode, 301)
+    t.assert.deepStrictEqual(response.headers.location, '/static-pre-compressed/dir/')
+  }
+)
+
 test(
   'will serve precompressed gzip index in subdir',
   async (t) => {
@@ -3038,6 +3066,34 @@ test(
   }
 )
 
+test(
+  'will not redirect but serve a file if preCompressed but no compressed file exists and redirect is true',
+  async (t) => {
+    const pluginOptions = {
+      root: path.join(__dirname, '/static-pre-compressed'),
+      prefix: '/static-pre-compressed/',
+      preCompressed: true,
+      redirect: true
+    }
+
+    const fastify = Fastify()
+
+    fastify.register(fastifyStatic, pluginOptions)
+    t.after(() => fastify.close())
+
+    const response = await fastify.inject({
+      method: 'GET',
+      url: '/static-pre-compressed/baz.json',
+      headers: {
+        'accept-encoding': '*'
+      }
+    })
+
+    t.assert.deepStrictEqual(response.statusCode, 200)
+    t.assert.deepStrictEqual(response.headers['content-type'], 'application/json; charset=utf-8')
+  }
+)
+
 test(
   'nonexistent index with precompressed option',
   async (t) => {