fix: ServerhandlerInfo type for newer Deno versions

denoland · May 2, 2024 · 0fefc50 · 0fefc50
1 parent bc75101
commit 0fefc50
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/server/boot.ts b/src/server/boot.ts
@@ -79,15 +79,18 @@ async function bootServer(
     // @ts-ignore Ignore type error when type checking with Deno versions
     await Deno.serve(
       opts,
-      (r, { remoteAddr }) =>
-        handler(r, {
-          remoteAddr,
-          localAddr: {
-            transport: "tcp",
-            hostname: opts.hostname ?? "localhost",
-            port: opts.port,
-          } as Deno.NetAddr,
-        }),
+      (r, info) =>
+        handler(
+          r,
+          {
+            ...info,
+            localAddr: {
+              transport: "tcp",
+              hostname: opts.hostname ?? "localhost",
+              port: opts.port,
+            } as Deno.NetAddr,
+          },
+        ),
     ).finished;
   } else {
     // @ts-ignore Deprecated std serve way

diff --git a/src/server/context.ts b/src/server/context.ts
@@ -46,7 +46,9 @@ import { withBase } from "./router.ts";
 import { PARTIAL_SEARCH_PARAM } from "../constants.ts";
 import TailwindErrorPage from "./tailwind_aot_error_page.tsx";
 
-const DEFAULT_CONN_INFO: ServeHandlerInfo = {
+// TODO: Completed type clashes in older Deno versions
+// deno-lint-ignore no-explicit-any
+const DEFAULT_CONN_INFO: any = {
   localAddr: { transport: "tcp", hostname: "localhost", port: 8080 },
   remoteAddr: { transport: "tcp", hostname: "localhost", port: 1234 },
 };

diff --git a/src/server/types.ts b/src/server/types.ts
@@ -251,13 +251,12 @@ export interface RouteConfig {
 
 export interface RenderOptions extends ResponseInit {}
 
-export type ServeHandlerInfo = {
+export type ServeHandlerInfo = Deno.ServeHandlerInfo & {
   /**
    * Backwards compatible with std/server
    * @deprecated
    */
   localAddr?: Deno.NetAddr;
-  remoteAddr: Deno.NetAddr;
 };
 
 export type ServeHandler = (