mirror of
https://github.com/denoland/deno.git
synced 2024-11-21 15:04:11 -05:00
fix(ext/http): Throwing Error if the return value of Deno.serve handler is not a Response class (#21099)
--------- Co-authored-by: Matt Mastracci <matthew@mastracci.com>
This commit is contained in:
parent
7978bc5d1b
commit
e4593873a9
2 changed files with 80 additions and 1 deletions
|
@ -3805,3 +3805,70 @@ Deno.test(
|
|||
await server.finished;
|
||||
},
|
||||
);
|
||||
|
||||
// serve Handler must return Response class or promise that resolves Response class
|
||||
Deno.test(
|
||||
{ permissions: { net: true, run: true } },
|
||||
async function handleServeCallbackReturn() {
|
||||
const d = deferred();
|
||||
const listeningPromise = deferred();
|
||||
const ac = new AbortController();
|
||||
|
||||
const server = Deno.serve(
|
||||
{
|
||||
port: servePort,
|
||||
onListen: onListen(listeningPromise),
|
||||
signal: ac.signal,
|
||||
onError: (error) => {
|
||||
assert(error instanceof TypeError);
|
||||
assert(
|
||||
error.message ===
|
||||
"Return value from serve handler must be a response or a promise resolving to a response",
|
||||
);
|
||||
d.resolve();
|
||||
return new Response("Customized Internal Error from onError");
|
||||
},
|
||||
},
|
||||
() => {
|
||||
// Trick the typechecker
|
||||
return <Response> <unknown> undefined;
|
||||
},
|
||||
);
|
||||
await listeningPromise;
|
||||
const respText = await curlRequest([`http://localhost:${servePort}`]);
|
||||
await d;
|
||||
ac.abort();
|
||||
await server.finished;
|
||||
assert(respText === "Customized Internal Error from onError");
|
||||
},
|
||||
);
|
||||
|
||||
// onError Handler must return Response class or promise that resolves Response class
|
||||
Deno.test(
|
||||
{ permissions: { net: true, run: true } },
|
||||
async function handleServeErrorCallbackReturn() {
|
||||
const listeningPromise = deferred();
|
||||
const ac = new AbortController();
|
||||
|
||||
const server = Deno.serve(
|
||||
{
|
||||
port: servePort,
|
||||
onListen: onListen(listeningPromise),
|
||||
signal: ac.signal,
|
||||
onError: () => {
|
||||
// Trick the typechecker
|
||||
return <Response> <unknown> undefined;
|
||||
},
|
||||
},
|
||||
() => {
|
||||
// Trick the typechecker
|
||||
return <Response> <unknown> undefined;
|
||||
},
|
||||
);
|
||||
await listeningPromise;
|
||||
const respText = await curlRequest([`http://localhost:${servePort}`]);
|
||||
ac.abort();
|
||||
await server.finished;
|
||||
assert(respText === "Internal Server Error");
|
||||
},
|
||||
);
|
||||
|
|
|
@ -10,6 +10,7 @@ import { Event } from "ext:deno_web/02_event.js";
|
|||
import {
|
||||
fromInnerResponse,
|
||||
newInnerResponse,
|
||||
ResponsePrototype,
|
||||
toInnerResponse,
|
||||
} from "ext:deno_fetch/23_response.js";
|
||||
import { fromInnerRequest, toInnerRequest } from "ext:deno_fetch/23_request.js";
|
||||
|
@ -449,15 +450,26 @@ function mapToCallback(context, callback, onError) {
|
|||
fromInnerRequest(innerRequest, signal, "immutable"),
|
||||
new ServeHandlerInfo(innerRequest),
|
||||
);
|
||||
|
||||
// Throwing Error if the handler return value is not a Response class
|
||||
if (!ObjectPrototypeIsPrototypeOf(ResponsePrototype, response)) {
|
||||
throw TypeError(
|
||||
"Return value from serve handler must be a response or a promise resolving to a response",
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
try {
|
||||
response = await onError(error);
|
||||
if (!ObjectPrototypeIsPrototypeOf(ResponsePrototype, response)) {
|
||||
throw TypeError(
|
||||
"Return value from onError handler must be a response or a promise resolving to a response",
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Exception in onError while handling exception", error);
|
||||
response = internalServerError();
|
||||
}
|
||||
}
|
||||
|
||||
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.
|
||||
|
|
Loading…
Reference in a new issue