From 9a0d59d95df29202080cf40a6e0bda52ca7fa6a8 Mon Sep 17 00:00:00 2001 From: Marvin Hagemeister Date: Wed, 10 Jul 2024 12:01:08 +0200 Subject: [PATCH] fix(node/http): don't send destroyed requests (#24498) Make sure that already destroyed requests are not actually sent. This error was discovered in jsdom's test suite. --- ext/node/polyfills/http.ts | 5 +++++ tests/unit_node/http_test.ts | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/ext/node/polyfills/http.ts b/ext/node/polyfills/http.ts index 0ef245902d..51d228d4eb 100644 --- a/ext/node/polyfills/http.ts +++ b/ext/node/polyfills/http.ts @@ -765,6 +765,9 @@ class ClientRequest extends OutgoingMessage { // deno-lint-ignore no-explicit-any end(chunk?: any, encoding?: any, cb?: any): this { + // Do nothing if request is already destroyed. + if (this.destroyed) return this; + if (typeof chunk === "function") { cb = chunk; chunk = null; @@ -797,6 +800,8 @@ class ClientRequest extends OutgoingMessage { // } })(); + + return this; } abort() { diff --git a/tests/unit_node/http_test.ts b/tests/unit_node/http_test.ts index 71043d9851..9a37722c78 100644 --- a/tests/unit_node/http_test.ts +++ b/tests/unit_node/http_test.ts @@ -1003,6 +1003,24 @@ Deno.test( }, ); +Deno.test( + "[node/http] destroyed requests should not be sent", + async () => { + let receivedRequest = false; + const server = Deno.serve(() => { + receivedRequest = true; + return new Response(null); + }); + const request = http.request(`http://localhost:${server.addr.port}/`); + request.destroy(); + request.end("hello"); + + await new Promise((r) => setTimeout(r, 500)); + assertEquals(receivedRequest, false); + await server.shutdown(); + }, +); + Deno.test("[node/http] node:http exports globalAgent", async () => { const http = await import("node:http"); assert(