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

Otherwise you can not return `Deno.Server` from async functions.
denoland · Sep 28, 2023 · 8564d36 · 8564d36
1 parent 35fad4d
commit 8564d36
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
@@ -3715,3 +3715,14 @@ async function curlRequestWithStdErr(args: string[]) {
   assert(success);
   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 });
+    assert(!("then" in server));
+    return server;
+  }
+  const server = await serveTest();
+  server.close();
+});
diff --git a/ext/http/00_serve.js b/ext/http/00_serve.js
@@ -38,7 +38,6 @@ import { listen, TcpConn } from "ext:deno_net/01_net.js";
 import { listenTls } from "ext:deno_net/02_tls.js";
 const {
   ArrayPrototypePush,
-  Error,
   ObjectPrototypeIsPrototypeOf,
   PromisePrototypeCatch,
   Symbol,
@@ -664,11 +663,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) {