npm - @fastify/static - Versions diffs - 7.0.1 → 7.0.3 - Mend

@fastify/static 7.0.1 → 7.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (69) hide show

package/.eslintrc.json +0 -0
package/.gitattributes +0 -0
package/.github/dependabot.yml +0 -0
package/.github/stale.yml +0 -0
package/.github/workflows/ci.yml +0 -0
package/.taprc +0 -0
package/LICENSE +0 -0
package/README.md +0 -0
package/example/public/.hidden/sample.json +0 -0
package/example/public/images/sample.jpg +0 -0
package/example/public/index.css +0 -0
package/example/public/index.html +0 -0
package/example/public/index.js +0 -0
package/example/public2/test.css +0 -0
package/example/public2/test.html +0 -0
package/example/server-compress.js +0 -0
package/example/server-dir-list.js +0 -0
package/example/server-hidden-file.js +0 -0
package/example/server.js +0 -0
package/index.js +9 -3
package/lib/dirList.js +0 -0
package/package.json +4 -4
package/test/content-type/binary +0 -0
package/test/content-type/binary.br +0 -0
package/test/content-type/index.css +0 -0
package/test/content-type/index.css.br +0 -0
package/test/content-type/index.html +0 -0
package/test/content-type/index.html.br +0 -0
package/test/content-type/sample.jpg +0 -0
package/test/content-type/test.txt +0 -0
package/test/content-type/test.txt.br +0 -0
package/test/content-type.test.js +0 -0
package/test/dir-list.test.js +0 -0
package/test/static/.example +0 -0
package/test/static/a .md +0 -0
package/test/static/deep/path/for/test/index.html +0 -0
package/test/static/deep/path/for/test/purpose/foo.html +0 -0
package/test/static/foo.html +0 -0
package/test/static/foobar.html +0 -0
package/test/static/index.css +0 -0
package/test/static/index.html +0 -0
package/test/static/shallow/sample.jpg +0 -0
package/test/static-dotfiles/.aaa +0 -0
package/test/static-dotfiles/dir/index.html +0 -0
package/test/static-dotfiles/test.txt +0 -0
package/test/static-encode/[...]/a .md +0 -0
package/test/static-hidden/.hidden/sample.json +0 -0
package/test/static-pre-compressed/all-three.html +0 -0
package/test/static-pre-compressed/all-three.html.br +0 -0
package/test/static-pre-compressed/all-three.html.gz +0 -0
package/test/static-pre-compressed/dir/index.html +0 -0
package/test/static-pre-compressed/dir/index.html.br +0 -0
package/test/static-pre-compressed/dir-gz/index.html +5 -0
package/test/static-pre-compressed/dir-gz/index.html.gz +0 -0
package/test/static-pre-compressed/empty/.gitkeep +0 -0
package/test/static-pre-compressed/gzip-only.html +0 -0
package/test/static-pre-compressed/gzip-only.html.gz +0 -0
package/test/static-pre-compressed/index.html +0 -0
package/test/static-pre-compressed/index.html.br +0 -0
package/test/static-pre-compressed/sample.jpg +0 -0
package/test/static-pre-compressed/sample.jpg.br +0 -0
package/test/static-pre-compressed/uncompressed.html +0 -0
package/test/static-symbolic-link/origin/subdir/subdir/index.html +0 -0
package/test/static.test.js +71 -5
package/test/static2/bar.html +0 -0
package/test/static2/index.html +0 -0
package/tsconfig.eslint.json +0 -0
package/types/index.d.ts +0 -0
package/types/index.test-d.ts +0 -0

package/.eslintrc.json CHANGED Viewed

File without changes

package/.gitattributes CHANGED Viewed

File without changes

package/.github/dependabot.yml CHANGED Viewed

File without changes

package/.github/stale.yml CHANGED Viewed

File without changes

package/.github/workflows/ci.yml CHANGED Viewed

File without changes

package/.taprc CHANGED Viewed

File without changes

package/LICENSE CHANGED Viewed

File without changes

package/README.md CHANGED Viewed

File without changes

package/example/public/.hidden/sample.json CHANGED Viewed

File without changes

package/example/public/images/sample.jpg CHANGED Viewed

File without changes

package/example/public/index.css CHANGED Viewed

File without changes

package/example/public/index.html CHANGED Viewed

File without changes

package/example/public/index.js CHANGED Viewed

File without changes

package/example/public2/test.css CHANGED Viewed

File without changes

package/example/public2/test.html CHANGED Viewed

File without changes

package/example/server-compress.js CHANGED Viewed

File without changes

package/example/server-dir-list.js CHANGED Viewed

File without changes

package/example/server-hidden-file.js CHANGED Viewed

File without changes

package/example/server.js CHANGED Viewed

File without changes

package/index.js CHANGED Viewed

@@ -111,8 +111,13 @@ async function fastifyStatic (fastify, opts) {
       throw new Error('"wildcard" option must be a boolean')
     }
     if (opts.wildcard === undefined || opts.wildcard === true) {
-      fastify.get(prefix + '*', { ...routeOpts, exposeHeadRoute: true }, (req, reply) => {
-        pumpSendToReply(req, reply, '/' + req.params['*'], sendOptions.root)
+      fastify.route({
+        ...routeOpts,
+        method: ['HEAD', 'GET'],
+        path: prefix + '*',
+        handler (req, reply) {
+          pumpSendToReply(req, reply, '/' + req.params['*'], sendOptions.root)
+        }
       })
       if (opts.redirect === true && prefix !== opts.prefix) {
         fastify.get(opts.prefix, routeOpts, (req, reply) => {
@@ -174,6 +179,7 @@ async function fastifyStatic (fastify, opts) {
     pumpOptions,
     checkedEncodings
   ) {
+    const pathnameOrig = pathname
     const options = Object.assign({}, sendOptions, pumpOptions)
     if (rootPath) {
@@ -346,7 +352,7 @@ async function fastifyStatic (fastify, opts) {
           return pumpSendToReply(
             request,
             reply,
-            pathname,
+            pathnameOrig,
             rootPath,
             rootPathOffset,
             undefined,

package/lib/dirList.js CHANGED Viewed

File without changes

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/static",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "description": "Plugin for serving static files as fast as possible.",
   "main": "index.js",
   "type": "commonjs",
@@ -42,8 +42,8 @@
     "@fastify/compress": "^7.0.0",
     "@fastify/pre-commit": "^2.0.2",
     "@types/node": "^20.1.0",
-    "@typescript-eslint/eslint-plugin": "^6.3.0",
-    "@typescript-eslint/parser": "^6.3.0",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
     "concat-stream": "^2.0.0",
     "coveralls": "^3.0.4",
     "eslint-plugin-typescript": "^0.14.0",
@@ -55,7 +55,7 @@
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",
     "tap": "^16.0.0",
-    "tsd": "^0.30.0",
+    "tsd": "^0.31.0",
     "typescript": "^5.1.6"
   },
   "tsd": {

package/test/content-type/binary CHANGED Viewed

File without changes

package/test/content-type/binary.br CHANGED Viewed

File without changes

package/test/content-type/index.css CHANGED Viewed

File without changes

package/test/content-type/index.css.br CHANGED Viewed

File without changes

package/test/content-type/index.html CHANGED Viewed

File without changes

package/test/content-type/index.html.br CHANGED Viewed

File without changes

package/test/content-type/sample.jpg CHANGED Viewed

File without changes

package/test/content-type/test.txt CHANGED Viewed

File without changes

package/test/content-type/test.txt.br CHANGED Viewed

File without changes

package/test/content-type.test.js CHANGED Viewed

File without changes

package/test/dir-list.test.js CHANGED Viewed

File without changes

package/test/static/.example CHANGED Viewed

File without changes

package/test/static/a .md CHANGED Viewed

File without changes

package/test/static/deep/path/for/test/index.html CHANGED Viewed

File without changes

package/test/static/deep/path/for/test/purpose/foo.html CHANGED Viewed

File without changes

package/test/static/foo.html CHANGED Viewed

File without changes

package/test/static/foobar.html CHANGED Viewed

File without changes

package/test/static/index.css CHANGED Viewed

File without changes

package/test/static/index.html CHANGED Viewed

File without changes

package/test/static/shallow/sample.jpg CHANGED Viewed

File without changes

package/test/static-dotfiles/.aaa CHANGED Viewed

File without changes

package/test/static-dotfiles/dir/index.html CHANGED Viewed

File without changes

package/test/static-dotfiles/test.txt CHANGED Viewed

File without changes

package/test/static-encode/[...]/a .md CHANGED Viewed

File without changes

package/test/static-hidden/.hidden/sample.json CHANGED Viewed

File without changes

package/test/static-pre-compressed/all-three.html CHANGED Viewed

File without changes

package/test/static-pre-compressed/all-three.html.br CHANGED Viewed

File without changes

package/test/static-pre-compressed/all-three.html.gz CHANGED Viewed

File without changes

package/test/static-pre-compressed/dir/index.html CHANGED Viewed

File without changes

package/test/static-pre-compressed/dir/index.html.br CHANGED Viewed

File without changes

package/test/static-pre-compressed/dir-gz/index.html ADDED Viewed

@@ -0,0 +1,5 @@
+<html>
+  <body>
+    dir-gz index
+  </body>
+</html>

package/test/static-pre-compressed/dir-gz/index.html.gz ADDED Viewed

Binary file

package/test/static-pre-compressed/empty/.gitkeep CHANGED Viewed

File without changes

package/test/static-pre-compressed/gzip-only.html CHANGED Viewed

File without changes

package/test/static-pre-compressed/gzip-only.html.gz CHANGED Viewed

File without changes

package/test/static-pre-compressed/index.html CHANGED Viewed

File without changes

package/test/static-pre-compressed/index.html.br CHANGED Viewed

File without changes

package/test/static-pre-compressed/sample.jpg CHANGED Viewed

File without changes

package/test/static-pre-compressed/sample.jpg.br CHANGED Viewed

File without changes

package/test/static-pre-compressed/uncompressed.html CHANGED Viewed

File without changes

package/test/static-symbolic-link/origin/subdir/subdir/index.html CHANGED Viewed

File without changes

package/test/static.test.js CHANGED Viewed

@@ -46,6 +46,9 @@ const indexBr = fs.readFileSync(
 const dirIndexBr = fs.readFileSync(
   './test/static-pre-compressed/dir/index.html.br'
 )
+const dirIndexGz = fs.readFileSync(
+  './test/static-pre-compressed/dir-gz/index.html.gz'
+)
 const uncompressedStatic = fs
   .readFileSync('./test/static-pre-compressed/uncompressed.html')
   .toString('utf8')
@@ -1737,7 +1740,7 @@ t.test('with fastify-compress', t => {
   })
 })
 t.test('register /static/ with schemaHide true', t => {
-  t.plan(4)
+  t.plan(3)
   const pluginOptions = {
     root: path.join(__dirname, '/static'),
@@ -1777,7 +1780,7 @@ t.test('register /static/ with schemaHide true', t => {
 })
 t.test('register /static/ with schemaHide false', t => {
-  t.plan(4)
+  t.plan(3)
   const pluginOptions = {
     root: path.join(__dirname, '/static'),
@@ -1817,7 +1820,7 @@ t.test('register /static/ with schemaHide false', t => {
 })
 t.test('register /static/ without schemaHide', t => {
-  t.plan(4)
+  t.plan(3)
   const pluginOptions = {
     root: path.join(__dirname, '/static'),
@@ -2954,7 +2957,7 @@ t.test('inject support', async (t) => {
 })
 t.test('routes should use custom errorHandler premature stream close', t => {
-  t.plan(4)
+  t.plan(3)
   const pluginOptions = {
     root: path.join(__dirname, '/static'),
@@ -2989,7 +2992,7 @@ t.test('routes should use custom errorHandler premature stream close', t => {
 })
 t.test('routes should fallback to default errorHandler', t => {
-  t.plan(4)
+  t.plan(3)
   const pluginOptions = {
     root: path.join(__dirname, '/static'),
@@ -3496,6 +3499,35 @@ t.test(
   }
 )
+t.test(
+  'will serve precompressed gzip index in subdir',
+  async (t) => {
+    const pluginOptions = {
+      root: path.join(__dirname, '/static-pre-compressed'),
+      preCompressed: true
+    }
+    const fastify = Fastify()
+    fastify.register(fastifyStatic, pluginOptions)
+    t.teardown(fastify.close.bind(fastify))
+    const response = await fastify.inject({
+      method: 'GET',
+      url: '/dir-gz',
+      headers: {
+        'accept-encoding': 'gzip, deflate, br'
+      }
+    })
+    genericResponseChecks(t, response)
+    t.equal(response.headers['content-encoding'], 'gzip')
+    t.equal(response.statusCode, 200)
+    t.same(response.rawPayload, dirIndexGz)
+    t.end()
+  }
+)
 t.test(
   'will serve precompressed index with alternative index option',
   async (t) => {
@@ -3930,3 +3962,37 @@ t.test(
     t.same(response2.body, aContent)
   }
 )
+t.test('content-length in head route should not return zero when using wildcard', t => {
+  t.plan(6)
+  const pluginOptions = {
+    root: path.join(__dirname, '/static')
+  }
+  const fastify = Fastify()
+  fastify.register(fastifyStatic, pluginOptions)
+  t.teardown(fastify.close.bind(fastify))
+  fastify.listen({ port: 0 }, err => {
+    t.error(err)
+    fastify.server.unref()
+    const file = fs.readFileSync(path.join(__dirname, '/static/index.html'))
+    const contentLength = Buffer.byteLength(file).toString()
+    simple.concat({
+      method: 'HEAD',
+      url: 'http://localhost:' + fastify.server.address().port + '/index.html',
+      followRedirect: false
+    }, (err, response, body) => {
+      t.error(err)
+      t.equal(response.statusCode, 200)
+      t.equal(response.headers['content-type'], 'text/html; charset=UTF-8')
+      t.equal(response.headers['content-length'], contentLength)
+      t.equal(body.toString(), '')
+    })
+  })
+})

package/test/static2/bar.html CHANGED Viewed

File without changes

package/test/static2/index.html CHANGED Viewed

File without changes

package/tsconfig.eslint.json CHANGED Viewed

File without changes

package/types/index.d.ts CHANGED Viewed

File without changes

package/types/index.test-d.ts CHANGED Viewed

File without changes