Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion lib/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ exports = module.exports = internals.Request = class {

this.raw.res.on('close', internals.event.bind(this.raw.res, this._eventContext, 'close'));
this.raw.req.on('error', internals.event.bind(this.raw.req, this._eventContext, 'error'));
this.raw.req.on('aborted', internals.event.bind(this.raw.req, this._eventContext, 'abort'));
this.raw.req.on('close', internals.aborted.bind(this.raw.req, this._eventContext, this.raw.res));
this.raw.res.once('close', internals.closed.bind(this.raw.res, this));
}

Expand Down Expand Up @@ -713,6 +713,19 @@ internals.closed = function (request) {
request._closed = true;
};


internals.aborted = function (eventContext, res) {

// The 'aborted' event on IncomingMessage was deprecated in Node.js v17 and removed in v24.
// Use the 'close' event on the request socket instead, guarded by a check that the response
// has not already been written (to distinguish a client abort from a normal connection close).

if (!res.writableEnded) {
internals.event(eventContext, 'abort');
}
};


internals.event = function ({ request }, event, err) {

if (!request) {
Expand Down
50 changes: 50 additions & 0 deletions test/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,56 @@ describe('Request', () => {
testComplete: false
});
});

it('returns false after client closes connection before response is sent', { retry: true }, async (flags) => {

// Regression test: IncomingMessage 'aborted' event was removed in Node.js v24.
// Verify that an early client disconnect still causes active() to return false.

const handlerTeam = new Teamwork.Team();

const server = Hapi.server();
flags.onCleanup = () => server.stop();

let client;

server.route({
method: 'GET',
path: '/',
options: {
handler: async (request) => {

// Drop the connection from the client side
client.destroy();

// Poll until the server-side close propagates
const deadline = Date.now() + 2000;
while (request.active() && Date.now() < deadline) {
await Hoek.wait(10);
}

handlerTeam.attend({ active: request.active() });
return null;
}
}
});

await server.start();

await new Promise((resolve) => {

client = Net.connect(server.info.port, () => {

client.write('GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n');
resolve();
});

client.on('error', Hoek.ignore);
});

const result = await handlerTeam.work;
expect(result.active).to.be.false();
});
});

describe('_execute()', () => {
Expand Down