Revert "fix(ext/node): work correctly with wrapper Response objects, use correct rawHeaders structure (#29056)"

This reverts commit 0557466.

Author: lucacasonato

ext/http/00_serve.ts

@@ -58,7 +58,6 @@ import {
   ResponsePrototype,
   toInnerResponse,
 } from "ext:deno_fetch/23_response.js";
-import { headerListFromHeaders } from "ext:deno_fetch/20_headers.js";
 import {
   abortRequest,
   fromInnerRequest,
@@ -501,15 +500,8 @@ function fastSyncResponseOrStream(
     return;
   }
 
-  let stream;
-  let body;
-  if (respBody.streamOrStatic) {
-    stream = respBody.streamOrStatic;
-    body = stream.body;
-  } else {
-    stream = respBody;
-    body = respBody;
-  }
+  const stream = respBody.streamOrStatic;
+  const body = stream.body;
   if (body !== undefined) {
     // We ensure the response has not been consumed yet in the caller of this
     // function.
@@ -640,19 +632,8 @@ function mapToCallback(context, callback, onError) {
       return;
     }
 
-    let status;
-    let headers;
-    let body;
-    if (inner) {
-      status = inner.status;
-      headers = inner.headerList;
-      body = inner.body;
-    } else {
-      status = response.status;
-      headers = headerListFromHeaders(response.headers);
-      body = response.body;
-    }
-
+    const status = inner.status;
+    const headers = inner.headerList;
     if (headers && headers.length > 0) {
       if (headers.length == 1) {
         op_http_set_response_header(req, headers[0][0], headers[0][1]);
@@ -661,7 +642,7 @@ function mapToCallback(context, callback, onError) {
       }
     }
 
-    fastSyncResponseOrStream(req, body, status, innerRequest);
+    fastSyncResponseOrStream(req, inner.body, status, innerRequest);
   };
 
   if (TRACING_ENABLED) {

ext/node/polyfills/http.ts

@@ -1780,8 +1780,6 @@ Object.defineProperty(ServerResponse.prototype, "connection", {
   ),
 });
 
-const kRawHeaders = Symbol("rawHeaders");
-
 // TODO(@AaronO): optimize
 export class IncomingMessageForServer extends NodeReadable {
   #headers: Record<string, string>;
@@ -1821,7 +1819,7 @@ export class IncomingMessageForServer extends NodeReadable {
     this.method = "";
     this.socket = socket;
     this.upgrade = null;
-    this[kRawHeaders] = [];
+    this.rawHeaders = [];
     socket?.on("error", (e) => {
       if (this.listenerCount("error") > 0) {
         this.emit("error", e);
@@ -1844,7 +1842,7 @@ export class IncomingMessageForServer extends NodeReadable {
   get headers() {
     if (!this.#headers) {
       this.#headers = {};
-      const entries = headersEntries(this[kRawHeaders]);
+      const entries = headersEntries(this.rawHeaders);
       for (let i = 0; i < entries.length; i++) {
         const entry = entries[i];
         this.#headers[entry[0]] = entry[1];
@@ -1857,16 +1855,6 @@ export class IncomingMessageForServer extends NodeReadable {
     this.#headers = val;
   }
 
-  get rawHeaders() {
-    const entries = headersEntries(this[kRawHeaders]);
-    const out = new Array(entries.length * 2);
-    for (let i = 0; i < entries.length; i++) {
-      out[i * 2] = entries[i][0];
-      out[i * 2 + 1] = entries[i][1];
-    }
-    return out;
-  }
-
   // connection is deprecated, but still tested in unit test.
   get connection() {
     return this.socket;
@@ -1971,7 +1959,7 @@ export class ServerImpl extends EventEmitter {
       req.upgrade =
         request.headers.get("connection")?.toLowerCase().includes("upgrade") &&
         request.headers.get("upgrade");
-      req[kRawHeaders] = request.headers;
+      req.rawHeaders = request.headers;
 
       if (req.upgrade && this.listenerCount("upgrade") > 0) {
         const { conn, response } = upgradeHttpRaw(request);

tests/specs/node/wrapped_http_response/__test__.jsonc

@@ -2041,42 +2041,3 @@ Deno.test("[node/http] 'close' event is emitted on ServerResponse object when th
   await new Promise((resolve) => server.close(resolve));
   assert(responseCloseEmitted);
 });
-
-Deno.test("[node/http] rawHeaders are in flattened format", async () => {
-  const getHeader = (req: IncomingMessage, name: string) => {
-    const idx = req.rawHeaders.indexOf(name);
-    if (idx < 0) {
-      throw new Error(`Header ${name} not found`);
-    }
-    return [name, req.rawHeaders[idx + 1]];
-  };
-  const { promise, resolve } = Promise.withResolvers<void>();
-  const server = http.createServer((req, res) => {
-    resolve();
-    // TODO(nathanwhit): the raw headers should not be lowercased, they should be
-    // exactly as they appeared in the request
-    assertEquals(getHeader(req, "content-type"), [
-      "content-type",
-      "text/plain",
-    ]);
-    assertEquals(getHeader(req, "set-cookie"), [
-      "set-cookie",
-      "foo=bar",
-    ]);
-    res.end();
-  });
-
-  server.listen(0, async () => {
-    const { port } = server.address() as { port: number };
-    const response = await fetch(`http://localhost:${port}`, {
-      headers: {
-        "Set-Cookie": "foo=bar",
-        "Content-Type": "text/plain",
-      },
-    });
-    await response.body?.cancel();
-  });
-
-  await promise;
-  await new Promise((resolve) => server.close(resolve));
-});