Skip to content

refactor: simplify code and improve tests #2159

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

Merged
merged 1 commit into from
Sep 4, 2025
Merged

refactor: simplify code and improve tests #2159

Show file tree
Hide file tree
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
18 changes: 8 additions & 10 deletions src/middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,16 +172,16 @@ function wrapper(context) {
}

/**
* @param {NodeJS.ErrnoException} err ann error
* @param {string} message an error message
* @param {number} status status
* @param {Partial<SendErrorOptions<Request, Response>>=} options options
* @returns {Promise<void>}
*/
async function sendError(err, status, options) {
async function sendError(message, status, options) {
if (forwardError) {
const error =
/** @type {Error & { statusCode: number }} */
(new Error(err.message));
(new Error(message));
error.statusCode = status;

await goNext(error);
Expand Down Expand Up @@ -252,12 +252,12 @@ function wrapper(context) {
case "ENAMETOOLONG":
case "ENOENT":
case "ENOTDIR":
await sendError(error, 404, {
await sendError(error.message, 404, {
modifyResponseData: context.options.modifyResponseData,
});
break;
default:
await sendError(error, 500, {
await sendError(error.message, 500, {
modifyResponseData: context.options.modifyResponseData,
});
break;
Expand Down Expand Up @@ -512,9 +512,7 @@ function wrapper(context) {
}

await sendError(
extra.errorCode === 400
? new Error("Bad Request")
: new Error("Forbidden"),
extra.errorCode === 400 ? "Bad Request" : "Forbidden",
extra.errorCode,
{
modifyResponseData: context.options.modifyResponseData,
Expand Down Expand Up @@ -708,7 +706,7 @@ function wrapper(context) {
// Conditional GET support
if (isConditionalGET()) {
if (isPreconditionFailure()) {
await sendError(new Error("Precondition Failed"), 412, {
await sendError("Precondition Failed", 412, {
modifyResponseData: context.options.modifyResponseData,
});
return;
Expand Down Expand Up @@ -760,7 +758,7 @@ function wrapper(context) {
getValueContentRangeHeader("bytes", size),
);

await sendError(new Error("Range Not Satisfiable"), 416, {
await sendError("Range Not Satisfiable", 416, {
headers: {
"Content-Range": getResponseHeader(res, "Content-Range"),
},
Expand Down
Loading
Loading