fix: tag server constructors

application.test.ts

@@ -29,7 +29,7 @@ import type {
   ServerRequest,
   ServeTlsOptions,
 } from "./types.ts";
-import { isNode } from "./util.ts";
+import { createPromiseWithResolvers, isNode } from "./util.ts";
 
 let optionsStack: Array<ListenOptions | ListenOptionsTls> = [];
 let serverClosed = false;
@@ -1122,3 +1122,26 @@ Deno.test({
     teardown();
   },
 });
+
+Deno.test({
+  name: "Application load correct default server",
+  ignore: isNode(), // this just hangs on node, because we can't close down
+  sanitizeOps: false,
+  sanitizeResources: false,
+  fn() {
+    const app = new Application();
+    const { promise, resolve, reject } = createPromiseWithResolvers<void>();
+    app.addEventListener("listen", ({ serverType }) => {
+      try {
+        assertEquals(serverType, isNode() ? "node" : "native");
+      } catch (e) {
+        reject(e);
+      }
+      resolve();
+    });
+    app.use((_ctx) => {});
+    app.listen();
+    teardown();
+    return promise;
+  },
+});

application.ts

@@ -115,7 +115,7 @@ interface ApplicationListenEventInit extends EventInit {
   listener: Listener;
   port: number;
   secure: boolean;
-  serverType: "native" | "custom";
+  serverType: "native" | "node" | "custom";
 }
 
 type ApplicationListenEventListenerOrEventListenerObject =
@@ -282,7 +282,7 @@ export class ApplicationListenEvent extends Event {
   listener: Listener;
   port: number;
   secure: boolean;
-  serverType: "native" | "custom";
+  serverType: "native" | "node" | "custom";
 
   constructor(eventInitDict: ApplicationListenEventInit) {
     super("listen", eventInitDict);
@@ -653,9 +653,7 @@ export class Application<AS extends State = Record<string, any>>
       }, { once: true });
     }
     const { secure = false } = options;
-    const serverType = DefaultServerCtor && server instanceof DefaultServerCtor
-      ? "native"
-      : "custom";
+    const serverType = this.#serverConstructor.type ?? "custom";
     const listener = await server.listen();
     const { hostname, port } = listener.addr;
     this.dispatchEvent(

http_server_native.ts

@@ -103,4 +103,6 @@ export class Server<AS extends State = Record<string, any>>
     }
     return this.#stream[Symbol.asyncIterator]();
   }
+
+  static type: "native" = "native";
 }

http_server_node.ts

@@ -187,4 +187,6 @@ export class Server implements OakServer<NodeRequest> {
   [Symbol.asyncIterator](): AsyncIterableIterator<NodeRequest> {
     return this.#requestStream[Symbol.asyncIterator]();
   }
+
+  static type: "node" = "node";
 }

types.ts

@@ -33,6 +33,7 @@ export interface ServerConstructor<T extends ServerRequest> {
     options: Omit<ServeOptions | ServeTlsOptions, "signal">,
   ): OakServer<T>;
   prototype: OakServer<T>;
+  type?: "native" | "node";
 }
 
 export type Data = string | number[] | ArrayBuffer | Uint8Array;