fix(ext/http): require genuine Response returned from Deno.serve

ext/http/00_serve.ts

@@ -54,11 +54,10 @@ import { InnerBody } from "ext:deno_fetch/22_body.js";
 import { Event } from "ext:deno_web/02_event.js";
 import {
   fromInnerResponse,
+  InnerResponse,
   newInnerResponse,
-  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.
@@ -564,6 +556,7 @@ function mapToCallback(context, callback, onError) {
     // 500 error.
     let innerRequest;
     let response;
+    let innerResponse: InnerResponse | undefined;
     try {
       innerRequest = new InnerRequest(req, context);
       const request = fromInnerRequest(innerRequest, "immutable");
@@ -575,8 +568,8 @@ function mapToCallback(context, callback, onError) {
 
       response = await callback(request, new ServeHandlerInfo(innerRequest));
 
-      // Throwing Error if the handler return value is not a Response class
-      if (!ObjectPrototypeIsPrototypeOf(ResponsePrototype, response)) {
+      innerResponse = toInnerResponse(response);
+      if (innerResponse === undefined) {
         throw new TypeError(
           "Return value from serve handler must be a response or a promise resolving to a response",
         );
@@ -596,9 +589,23 @@ function mapToCallback(context, callback, onError) {
     } catch (error) {
       try {
         response = await onError(error);
-        if (!ObjectPrototypeIsPrototypeOf(ResponsePrototype, response)) {
+
+        innerResponse = toInnerResponse(response);
+        if (innerResponse === undefined) {
+          throw new TypeError(
+            "Return value from the onError handler must be a response or a promise resolving to a response",
+          );
+        }
+
+        if (response.type === "error") {
           throw new TypeError(
-            "Return value from onError handler must be a response or a promise resolving to a response",
+            "Return value from the onError handler must not be an error response (like Response.error())",
+          );
+        }
+
+        if (response.bodyUsed) {
+          throw new TypeError(
+            "The body of the Response returned from the onError handler has already been consumed",
           );
         }
       } catch (error) {
@@ -611,14 +618,14 @@ function mapToCallback(context, callback, onError) {
           error,
         );
         response = internalServerError();
+        innerResponse = toInnerResponse(response);
       }
     }
 
     if (span) {
       updateSpanFromResponse(span, response);
     }
 
-    const inner = toInnerResponse(response);
     if (innerRequest?.[_upgraded]) {
       // We're done here as the connection has been upgraded during the callback and no longer requires servicing.
       if (response !== UPGRADE_RESPONSE_SENTINEL) {
@@ -640,19 +647,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 = innerResponse.status;
+    const headers = innerResponse.headerList;
     if (headers && headers.length > 0) {
       if (headers.length == 1) {
         op_http_set_response_header(req, headers[0][0], headers[0][1]);
@@ -661,7 +657,7 @@ function mapToCallback(context, callback, onError) {
       }
     }
 
-    fastSyncResponseOrStream(req, body, status, innerRequest);
+    fastSyncResponseOrStream(req, innerResponse.body, status, innerRequest);
   };
 
   if (TRACING_ENABLED) {

ext/node/polyfills/http.ts

@@ -67,6 +67,7 @@ import {
 import { getTimerDuration } from "ext:deno_node/internal/timers.mjs";
 import { serve, upgradeHttpRaw } from "ext:deno_http/00_serve.ts";
 import { headersEntries } from "ext:deno_fetch/20_headers.js";
+import { Response } from "ext:deno_fetch/23_response.js";
 import {
   builtinTracer,
   ContextManager,