bogeychan
diff --git a/‎examples/deno/main.ts‎
Lines changed: 1 addition & 3 deletions b/‎examples/deno/main.ts‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎src/env/deno/deno-types.d.ts‎
Lines changed: 13 additions & 37 deletions b/‎src/env/deno/deno-types.d.ts‎
Lines changed: 13 additions & 37 deletions
diff --git a/‎src/env/deno/server.ts‎
Lines changed: 11 additions & 9 deletions b/‎src/env/deno/server.ts‎
Lines changed: 11 additions & 9 deletions
diff --git a/‎src/env/deno/std/README.md‎
Lines changed: 0 additions & 27 deletions b/‎src/env/deno/std/README.md‎
Lines changed: 0 additions & 27 deletions
diff --git a/‎src/env/deno/std/delay.ts‎
Lines changed: 0 additions & 67 deletions b/‎src/env/deno/std/delay.ts‎
Lines changed: 0 additions & 67 deletions
@@ -17,7 +17,7 @@ import { swagger } from '@elysiajs/swagger';
 const key = Deno.readTextFileSync('../../keys/localhost-key.pem');
 const cert = Deno.readTextFileSync('../../keys/localhost.pem');
 
-const app = new Elysia()
+new Elysia()
   .use(cookie())
   .use(swagger())
   .get('/', () => ({ hello: 'Deno👋' }))
@@ -33,5 +33,3 @@ const app = new Elysia()
   })
   .listen({ key, cert, port: 8443 });
 
-console.log(`Listening on https://localhost:${app.server!.port}`);
-
@@ -1,63 +1,39 @@
 declare namespace Deno {
   interface Server {
-    [Symbol.asyncIterator](): AsyncGenerator<Conn>;
     close(): void;
   }
 
-  interface Conn extends Closer {
-    localAddr: Addr;
-    remoteAddr: Addr;
-  }
-
-  interface NetAddr {
-    port: number;
-  }
-
-  interface Listener extends Closer {
-    accept(): Promise<Conn>;
-    addr: Addr;
-  }
-
   interface Closer {
     close(): void;
   }
 
-  interface HttpConn extends Conn {
-    nextRequest(): Promise<RequestEvent>;
-    [Symbol.asyncIterator](): AsyncGenerator<RequestEvent>;
-  }
-
-  interface RequestEvent {
-    request: Request;
-    respondWith(response: Response): Promise<void>;
-  }
-
-  type ListenOptions = { port: number; hostname: string; transport: 'tcp' };
+  type ServeOptions = {
+    port?: number;
+    hostname?: string;
+    onError?: (error: unknown) => Response | Promise<Response>;
+  };
 
-  type ListenTlsOptions = ListenOptions & {
+  type ServeTlsOptions = ServeOptions & {
     key: string;
     cert: string;
-    alpnProtocols?: string[];
   };
 
-  interface Addr {}
-}
-
-interface Http {
-  new (message: string): Error;
+  type ServeHandler = (request: Request) => Response | Promise<Response>;
 }
 
 const Deno: {
-  // https://deno.land/api@v1.33.4?s=Deno.listenTls
-  listenTls(options: Deno.ListenTlsOptions): Deno.Listener;
-  listen(options: Deno.ListenOptions): Deno.Listener;
-  serveHttp(connection: Deno.Conn): Deno.HttpConn;
   env: {
     get(name: string): string | undefined;
   };
   readFileSync(path: string | URL): Uint8Array; // https://deno.land/api@v1.33.1?s=Deno.readFileSync
   readTextFileSync(path: string): string;
 
+  // https://deno.land/api@v1.35.0?s=Deno.serve
+  serve(
+    options: Deno.ServeOptions | Deno.ServeTlsOptions,
+    handler: Deno.ServeHandler
+  ): Deno.Server;
+
   errors: {
     BadResource;
     InvalidData;
 
@@ -10,7 +10,6 @@ import type {
 
 import { ensureDefaults } from '../../config.js';
 
-import { Server } from './std/server.js';
 import { handleError } from '../error.js';
 
 const ElysiaBun: TElysiaBun = {
@@ -22,12 +21,19 @@ const ElysiaBun: TElysiaBun = {
       options.development = Deno.env.get('NODE_ENV') !== 'production';
     }
 
-    const denoServer = new Server({
+    const serveOptions: Deno.ServeOptions = {
       hostname,
       port,
-      handler: (request) => server.fetch(request),
       onError: (error) => handleError(options, server, error)
-    });
+    };
+
+    if (key && cert) {
+      const serveTlsOptions = serveOptions as Deno.ServeTlsOptions;
+      serveTlsOptions.key = key;
+      serveTlsOptions.cert = cert;
+    }
+
+    let denoServer: Deno.Server;
 
     const server: TElysiaServer = {
       id: '',
@@ -56,11 +62,7 @@ const ElysiaBun: TElysiaBun = {
       }
     };
 
-    if (key && cert) {
-      void denoServer.listenAndServeTls(cert, key);
-    } else {
-      void denoServer.listenAndServe();
-    }
+    denoServer = Deno.serve(serveOptions, (request) => server.fetch(request));
 
     return server as TBunServer;
   },