Skip to content

Use fs.promises, serve static files, skip extensionless paths #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Use fs.promises, serve static files, skip extensionless paths #771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions packages/evershop/src/lib/middlewares/publicStatic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,29 @@ export default async function publicStatic(request, response, next) {
// Get the request path
const { path } = request;
try {
// If no file extension, skip to next middleware early
if (!path.includes('.')) {
throw new Error('No file extension');
return next();
}
// Asynchoronously check if the path is a file and exists in the public folder
const test = await fs.stat(join(CONSTANTS.ROOTPATH, 'public', path));
if (test.isFile()) {

// Use promises API instead of callback-based fs.stat
const { promises: fsp } = fs;
const filePath = join(CONSTANTS.ROOTPATH, 'public', path);
const stat = await fsp.stat(filePath);

if (stat.isFile()) {
// If it is a file, serve it
staticMiddleware(join(CONSTANTS.ROOTPATH, 'public'))(
return staticMiddleware(join(CONSTANTS.ROOTPATH, 'public'))(
request,
response,
next
);
}

// Not a file, continue
return next();
} catch (e) {
// If the path is not a file or does not exist in the public folder, call next
next();
return next();
}
}