fix(event): normalize event.path

unjs · May 15, 2023 · 981c89f · 981c89f
1 parent aadec3d
commit 981c89f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/event/event.ts b/src/event/event.ts
@@ -1,6 +1,11 @@
 import type { H3EventContext } from "../types";
 import type { NodeIncomingMessage, NodeServerResponse } from "../node";
-import { MIMES, sanitizeStatusCode, sanitizeStatusMessage } from "../utils";
+import {
+  MIMES,
+  sanitizeStatusCode,
+  sanitizeStatusMessage,
+  getRequestPath,
+} from "../utils";
 import { H3Response } from "./response";
 
 export interface NodeEventContext {
@@ -18,7 +23,7 @@ export class H3Event implements Pick<FetchEvent, "respondWith"> {
   }
 
   get path() {
-    return this.req.url;
+    return getRequestPath(this);
   }
 
   /** @deprecated Please use `event.node.req` instead. **/

diff --git a/src/utils/request.ts b/src/utils/request.ts
@@ -113,8 +113,8 @@ export function getRequestProtocol(
 
 const DOUBLE_SLASH_RE = /[/\\]{2,}/g;
 
-export function getRequestPath(event: H3Event) {
-  const path = (event.path || "/").replace(DOUBLE_SLASH_RE, "/");
+export function getRequestPath(event: H3Event): string {
+  const path = (event.node.req.url || "/").replace(DOUBLE_SLASH_RE, "/");
   return path;
 }