fix: file not found errors when the root has a trailing slash #436

gurgunday · 2024-02-07T00:14:04Z

It currently does not handle a root with a trailing slash correctly

gurgunday · 2024-02-07T00:19:18Z

~~Have no idea how to test this...~~

It's not working in production, which runs on Linux, and I don't have a Linux machine right now

index.js

climba03003

I would like to see a test before merging.

If it is not available, you should try to provide comparison on the result between v8 and v10 of glob.
Nested with at least 4 level folder structure would be great.

gurgunday · 2024-02-07T08:51:13Z

~~I really don’t know where the issue is since linux tests are passing too…~~

I’ll try to see if I can do something about it

gurgunday · 2024-02-07T09:19:17Z

Alright, I got the issue, will send a test now

Eomm · 2024-02-07T14:08:01Z

index.js

-        const files = await glob(`${posixRootPath}/${globPattern}`, { follow: true, nodir: true, dot: opts.serveDotFiles })
+      for (let rootPath of roots) {
+        rootPath = rootPath.split(path.win32.sep).join(path.posix.sep)
+        !rootPath.endsWith('/') && (rootPath += '/')


Suggested change

!rootPath.endsWith('/') && (rootPath += '/')

if(!rootPath.endsWith(path.posix.sep)){

rootPath += path.posix.sep

}

Istanbul complains

gurgunday · 2024-02-07T18:56:11Z

I really need to make this release, so my apologies for merging without an approval, please do let me know of your feedback and I'll make a second PR addressing them

Uzlopak

retrospective indemnity approval

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@fastify/static](https://togithub.com/fastify/fastify-static) | [`6.12.0` -> `7.0.1`](https://renovatebot.com/diffs/npm/@fastify%2fstatic/6.12.0/7.0.1) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@fastify%2fstatic/7.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@fastify%2fstatic/7.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@fastify%2fstatic/6.12.0/7.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@fastify%2fstatic/6.12.0/7.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>fastify/fastify-static (@fastify/static)</summary> ### [`v7.0.1`](https://togithub.com/fastify/fastify-static/releases/tag/v7.0.1) [Compare Source](https://togithub.com/fastify/fastify-static/compare/v7.0.0...v7.0.1) #### What's Changed - build(deps-dev): bump [@fastify/compress](https://togithub.com/fastify/compress) from 6.5.0 to 7.0.0 by [@dependabot](https://togithub.com/dependabot) in [fastify/fastify-static#433 - Optimize `dirList` by [@gurgunday](https://togithub.com/gurgunday) in [fastify/fastify-static#435 - fix: file not found errors when the root has a trailing slash by [@gurgunday](https://togithub.com/gurgunday) in [fastify/fastify-static#436 **Full Changelog**: fastify/fastify-static@v7.0.0...v7.0.1 ### [`v7.0.0`](https://togithub.com/fastify/fastify-static/releases/tag/v7.0.0) [Compare Source](https://togithub.com/fastify/fastify-static/compare/v6.12.0...v7.0.0) #### What's Changed - build(deps-dev): bump tsd from 0.29.0 to 0.30.0 by [@dependabot](https://togithub.com/dependabot) in [fastify/fastify-static#424 - docs(readme): replace `fastify.io` links with `fastify.dev` by [@Fdawgs](https://togithub.com/Fdawgs) in [fastify/fastify-static#425 - docs(readme): replace `fastify.io` links with `fastify.dev` by [@Fdawgs](https://togithub.com/Fdawgs) in [fastify/fastify-static#426 - chore(package): fix repository url by [@Fdawgs](https://togithub.com/Fdawgs) in [fastify/fastify-static#429 - chore: improve types for `setHeaders` option by [@EvanHahn](https://togithub.com/EvanHahn) in [fastify/fastify-static#428 - Upgrade glob to v10 by [@gurgunday](https://togithub.com/gurgunday) in [fastify/fastify-static#406 #### New Contributors - [@EvanHahn](https://togithub.com/EvanHahn) made their first contribution in [fastify/fastify-static#428 **Full Changelog**: fastify/fastify-static@v6.12.0...v7.0.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "on sunday" in timezone Asia/Shanghai, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/PKUHPC/SCOW).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

gurgunday added 4 commits February 7, 2024 00:43

fix not found

e9b7b16

fix not found

9bfbe5d

fix not found

df1a5e6

fix not found

204ed48

gurgunday requested a review from a team February 7, 2024 00:14

gurgunday changed the title ~~fix: file not found~~ fix: file not found on wildcard: false Feb 7, 2024

gurgunday changed the title ~~fix: file not found on wildcard: false~~ fix: file not found errors with wildcard: false Feb 7, 2024

climba03003 reviewed Feb 7, 2024

View reviewed changes

index.js Outdated Show resolved Hide resolved

gurgunday added 2 commits February 7, 2024 07:06

revert change left out from the other rbanch

9bbd0e2

revert change left out from the other rbanch

d07e1d1

gurgunday requested a review from climba03003 February 7, 2024 06:16

gurgunday added bug Confirmed bug bugfix Issue or PR that should land as semver patch labels Feb 7, 2024

gurgunday requested a review from a team February 7, 2024 07:06

climba03003 reviewed Feb 7, 2024

View reviewed changes

test

051a006

gurgunday requested review from climba03003 and a team February 7, 2024 09:33

gurgunday changed the title ~~fix: file not found errors with wildcard: false~~ fix: file not found errors when the root has a trailing slash Feb 7, 2024

use one handler for GET and HEAD

5a851f0

Eomm reviewed Feb 7, 2024

View reviewed changes

gurgunday merged commit 6c66465 into fastify:master Feb 7, 2024
19 checks passed

gurgunday deleted the fix branch February 7, 2024 18:56

Uzlopak reviewed Feb 8, 2024

View reviewed changes

climba03003 mentioned this pull request Apr 3, 2024

HTTP HEAD can not get the content-length(always 0) #447

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: file not found errors when the root has a trailing slash #436

fix: file not found errors when the root has a trailing slash #436

gurgunday commented Feb 7, 2024 •

edited

gurgunday commented Feb 7, 2024 •

edited

climba03003 left a comment •

edited

gurgunday commented Feb 7, 2024 •

edited

gurgunday commented Feb 7, 2024

Eomm Feb 7, 2024

gurgunday Feb 7, 2024

gurgunday commented Feb 7, 2024 •

edited

Uzlopak left a comment •

edited

-        !rootPath.endsWith('/') && (rootPath += '/')
+        if(!rootPath.endsWith(path.posix.sep)){
+          rootPath += path.posix.sep
+        }

fix: file not found errors when the root has a trailing slash #436

fix: file not found errors when the root has a trailing slash #436

Conversation

gurgunday commented Feb 7, 2024 • edited

gurgunday commented Feb 7, 2024 • edited

climba03003 left a comment • edited

Choose a reason for hiding this comment

gurgunday commented Feb 7, 2024 • edited

gurgunday commented Feb 7, 2024

Eomm Feb 7, 2024

Choose a reason for hiding this comment

gurgunday Feb 7, 2024

Choose a reason for hiding this comment

gurgunday commented Feb 7, 2024 • edited

Uzlopak left a comment • edited

Choose a reason for hiding this comment

gurgunday commented Feb 7, 2024 •

edited

gurgunday commented Feb 7, 2024 •

edited

climba03003 left a comment •

edited

gurgunday commented Feb 7, 2024 •

edited

gurgunday commented Feb 7, 2024 •

edited

Uzlopak left a comment •

edited