fix(ext/http): Deno.Server should not be thenable (denoland#20723)

Otherwise you can not return `Deno.Server` from async functions. Co-authored-by: Yoshiya Hinosawa <[email protected]> Co-authored-by: Bartek Iwańczuk <[email protected]>
howqw · Oct 9, 2023 · ae81065 · ae81065
1 parent 35f028d
commit ae81065
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/cli/tests/unit/serve_test.ts b/cli/tests/unit/serve_test.ts
@@ -3717,6 +3717,17 @@ async function curlRequestWithStdErr(args: string[]) {
  return [new TextDecoder().decode(stdout), new TextDecoder().decode(stderr)];
 }
 
+Deno.test("Deno.Server is not thenable", async () => {
+ // deno-lint-ignore require-await
+ async function serveTest() {
+ const server = Deno.serve({ port: servePort }, (_) => new Response(""));
+ assert(!("then" in server));
+ return server;
+ }
+ const server = await serveTest();
+ await server.shutdown();
+});
+
 Deno.test(
  {
  ignore: Deno.build.os === "windows",

diff --git a/ext/http/00_serve.js b/ext/http/00_serve.js
@@ -38,7 +38,6 @@ import { listen, listenOptionApiName, TcpConn } from "ext:deno_net/01_net.js";
 import { listenTls } from "ext:deno_net/02_tls.js";
 const {
  ArrayPrototypePush,
- Error,
  ObjectHasOwn,
  ObjectPrototypeIsPrototypeOf,
  PromisePrototypeCatch,
@@ -700,11 +699,6 @@ function serveHttpOn(context, callback) {
  context.closed = true;
  }
  },
- then() {
- throw new Error(
- "Deno.serve no longer returns a promise. await server.finished instead of server.",
- );
- },
  ref() {
  ref = true;
  if (currentPromise) {