BREAKING(unstable): remove "Deno.serve(handler, options)" overload

cli/bench/http/deno_flash_hono_router.js

@@ -7,4 +7,4 @@ const [hostname, port] = addr.split(":");
 const app = new Hono();
 app.get("/", (c) => c.text("Hello, World!"));
 
-Deno.serve(app.fetch, { port: Number(port), hostname });
+Deno.serve({ port: Number(port), hostname }, app.fetch);

cli/tests/unit/serve_test.ts

@@ -160,19 +160,19 @@ Deno.test({ permissions: { net: true } }, async function httpServerOverload2() {
   const promise = deferred();
   const listeningPromise = deferred();
 
-  const server = Deno.serve(async (request) => {
+  const server = Deno.serve({
+    port: 4501,
+    signal: ac.signal,
+    onListen: onListen(listeningPromise),
+    onError: createOnErrorCb(ac),
+  }, async (request) => {
     // FIXME(bartlomieju):
     // make sure that request can be inspected
     console.log(request);
     assertEquals(new URL(request.url).href, "http://127.0.0.1:4501/");
     assertEquals(await request.text(), "");
     promise.resolve();
     return new Response("Hello World", { headers: { "foo": "bar" } });
-  }, {
-    port: 4501,
-    signal: ac.signal,
-    onListen: onListen(listeningPromise),
-    onError: createOnErrorCb(ac),
   });
 
   await listeningPromise;
@@ -2158,10 +2158,7 @@ Deno.test(
     const ac = new AbortController();
     const promise = deferred();
     let count = 0;
-    const server = Deno.serve(() => {
-      count++;
-      return new Response(`hello world ${count}`);
-    }, {
+    const server = Deno.serve({
       async onListen() {
         const res1 = await fetch("http://localhost:9000/");
         assertEquals(await res1.text(), "hello world 1");
@@ -2173,6 +2170,9 @@ Deno.test(
         ac.abort();
       },
       signal: ac.signal,
+    }, () => {
+      count++;
+      return new Response(`hello world ${count}`);
     });
 
     await promise;
@@ -2226,7 +2226,16 @@ Deno.test(
   async function testIssue16567() {
     const ac = new AbortController();
     const promise = deferred();
-    const server = Deno.serve(() =>
+    const server = Deno.serve({
+      async onListen() {
+        const res1 = await fetch("http://localhost:9000/");
+        assertEquals((await res1.text()).length, 40 * 50_000);
+
+        promise.resolve();
+        ac.abort();
+      },
+      signal: ac.signal,
+    }, () =>
       new Response(
         new ReadableStream({
           start(c) {
@@ -2237,16 +2246,7 @@ Deno.test(
             c.close();
           },
         }),
-      ), {
-      async onListen() {
-        const res1 = await fetch("http://localhost:9000/");
-        assertEquals((await res1.text()).length, 40 * 50_000);
-
-        promise.resolve();
-        ac.abort();
-      },
-      signal: ac.signal,
-    });
+      ));
 
     await promise;
     await server;

cli/tests/unit_node/async_hooks_test.ts

@@ -41,7 +41,10 @@ Deno.test(async function bar() {
   let differentScopeDone = false;
   const als = new AsyncLocalStorage();
   const ac = new AbortController();
-  const server = Deno.serve(() => {
+  const server = Deno.serve({
+    signal: ac.signal,
+    port: 4000,
+  }, () => {
     const differentScope = als.run(123, () =>
       AsyncResource.bind(() => {
         differentScopeDone = true;
@@ -54,9 +57,6 @@ Deno.test(async function bar() {
       await new Promise((res) => setTimeout(res, 10));
       return new Response(als.getStore() as string); // "Hello World"
     });
-  }, {
-    signal: ac.signal,
-    port: 4000,
   });
 
   const res = await fetch("http://localhost:4000");

cli/tsc/dts/lib.deno.unstable.d.ts

@@ -1354,10 +1354,7 @@ declare namespace Deno {
    *
    * @category HTTP Server
    */
-  export function serve(
-    handler: ServeHandler,
-    options?: ServeOptions | ServeTlsOptions,
-  ): Promise<void>;
+  export function serve(handler: ServeHandler): Promise<void>;
   /** **UNSTABLE**: New API, yet to be vetted.
    *
    * Serves HTTP requests with the given handler.

ext/http/01_http.js

@@ -624,10 +624,9 @@ async function serve(arg1, arg2) {
   let handler = undefined;
   if (typeof arg1 === "function") {
     handler = arg1;
-    options = arg2;
   } else if (typeof arg2 === "function") {
-    handler = arg2;
     options = arg1;
+    handler = arg2;
   } else {
     options = arg1;
   }