Skip to content

fix: do not call the next middleware for 304 response #2155

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 2, 2025
Merged

fix: do not call the next middleware for 304 response #2155

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
9 changes: 8 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,8 @@ function honoWrapper(compiler, options) {
body = data;
};

let isFinished = false;

/**
* @param {(string | Buffer)=} data data
*/
Expand All @@ -618,6 +620,9 @@ function honoWrapper(compiler, options) {
}

body = isDataExist ? data : null;
isFinished = true;

resolve();
};

devMiddleware(req, res, (err) => {
Expand All @@ -626,7 +631,9 @@ function honoWrapper(compiler, options) {
return;
}

resolve();
if (!isFinished) {
resolve();
}
});
},
);
Expand Down
1 change: 0 additions & 1 deletion src/middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,6 @@ function wrapper(context) {
removeResponseHeader(res, "Content-Type");

finish(res);
await goNext();
return;
}
}
Expand Down
199 changes: 198 additions & 1 deletion test/middleware.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ describe.each([
let server;
let req;

describe("aPI", () => {
describe("API", () => {
let compiler;

describe("constructor", () => {
Expand Down Expand Up @@ -5354,6 +5354,106 @@ describe.each([
});
});

describe("should work and generate etag with other middlewares", () => {
beforeAll(async () => {
const compiler = getCompiler(webpackConfig);

let isFirstRequest = true;

[server, req, instance] = await frameworkFactory(
name,
framework,
compiler,
{
etag: "weak",
},
{
setupMiddlewares: (middlewares) => {
if (name === "koa") {
middlewares.push(async (ctx, next) => {
await next();

if (!isFirstRequest) {
ctx.status = 500;
ctx.body = "shouldn't get there";
}

isFirstRequest = false;
});
} else if (name === "hapi") {
middlewares.push({
plugin: {
name: "myPlugin",
version: "1.0.0",
register(innerServer) {
innerServer.ext("onRequest", () => {
if (!isFirstRequest) {
throw new Error("shouldn't get there");
}

isFirstRequest = false;
});
},
},
});
} else if (name === "hono") {
middlewares.push(async (c, next) => {
await next();

if (!isFirstRequest) {
throw new Error("shouldn't get there");
}

isFirstRequest = false;
});
} else {
middlewares.push(async (req, res, next) => {
if (!isFirstRequest) {
next(new Error("shouldn't get there"));
return;
}

isFirstRequest = false;

next();
});
}

return middlewares;
},
},
);
});

afterAll(async () => {
await close(server, instance);
});

it('should return the "304" code for the "GET" request to the bundle file with etag and "if-none-match" header with additional middlewares', async () => {
const response1 = await req.get("/bundle.js");

expect(response1.statusCode).toBe(200);
expect(response1.headers.etag).toBeDefined();
expect(response1.headers.etag.startsWith("W/")).toBe(true);

const response2 = await req
.get("/bundle.js")
.set("if-none-match", response1.headers.etag);

expect(response2.statusCode).toBe(304);
expect(response2.headers.etag).toBeDefined();
expect(response2.headers.etag.startsWith("W/")).toBe(true);

const response3 = await req
.get("/bundle.js")
.set("if-none-match", response1.headers.etag);

expect(response3.statusCode).toBe(304);
expect(response3.headers.etag).toBeDefined();
expect(response3.headers.etag.startsWith("W/")).toBe(true);
});
});

describe("should work and generate strong etag without createReadStream", () => {
beforeEach(async () => {
const compiler = getCompiler(webpackConfig);
Expand Down Expand Up @@ -5593,6 +5693,103 @@ describe.each([
expect(response2.headers.etag).toBeDefined();
});
});

describe("should work and generate etag with other middlewares", () => {
beforeAll(async () => {
const compiler = getCompiler(webpackConfig);

let isFirstRequest = true;

[server, req, instance] = await frameworkFactory(
name,
framework,
compiler,
{
lastModified: true,
},
{
setupMiddlewares: (middlewares) => {
if (name === "koa") {
middlewares.push(async (ctx, next) => {
await next();

if (!isFirstRequest) {
ctx.status = 500;
ctx.body = "shouldn't get there";
}

isFirstRequest = false;
});
} else if (name === "hapi") {
middlewares.push({
plugin: {
name: "myPlugin",
version: "1.0.0",
register(innerServer) {
innerServer.ext("onRequest", () => {
if (!isFirstRequest) {
throw new Error("shouldn't get there");
}

isFirstRequest = false;
});
},
},
});
} else if (name === "hono") {
middlewares.push(async (c, next) => {
await next();

if (!isFirstRequest) {
throw new Error("shouldn't get there");
}

isFirstRequest = false;
});
} else {
middlewares.push(async (req, res, next) => {
if (!isFirstRequest) {
next(new Error("shouldn't get there"));
return;
}

isFirstRequest = false;

next();
});
}

return middlewares;
},
},
);
});

afterAll(async () => {
await close(server, instance);
});

it('should return the "304" code for the "GET" request to the bundle file with lastModified and "if-modified-since" header with additional middlewares', async () => {
const response1 = await req.get("/bundle.js");

expect(response1.statusCode).toBe(200);
expect(response1.headers["last-modified"]).toBeDefined();

const response2 = await req
.get("/bundle.js")
.set("if-modified-since", response1.headers["last-modified"]);

expect(response2.statusCode).toBe(304);
expect(response2.headers["last-modified"]).toBeDefined();

const response3 = await req
.get("/bundle.js")
.set("if-modified-since", response2.headers["last-modified"]);

expect(response3.statusCode).toBe(304);
expect(response3.headers["last-modified"]).toBeDefined();
});
});
});

describe("cacheControl", () => {
Expand Down
Loading