diff --git a/src/app.ts b/src/app.ts index 52eb1ede..6cf832f8 100644 --- a/src/app.ts +++ b/src/app.ts @@ -103,10 +103,8 @@ export function createAppEventHandler(stack: Stack, options: AppOptions) { const spacing = options.debug ? 2 : undefined; return eventHandler(async (event) => { // Keep original incoming url accessable - (event.node.req as { originalUrl?: string }).originalUrl = - (event.node.req as { originalUrl?: string }).originalUrl || - event.node.req.url || - "/"; + event.node.req.originalUrl = + event.node.req.originalUrl || event.node.req.url || "/"; // Keep a copy of incoming url const _reqPath = event._path || event.node.req.url || "/"; diff --git a/src/event/event.ts b/src/event/event.ts index 42362857..a848677a 100644 --- a/src/event/event.ts +++ b/src/event/event.ts @@ -18,7 +18,7 @@ const PayloadMethods: Set = new Set([ ]); export interface NodeEventContext { - req: NodeIncomingMessage; + req: NodeIncomingMessage & { originalUrl?: string }; res: NodeServerResponse; } @@ -49,11 +49,7 @@ export class H3Event< } get _originalPath() { - return ( - (this.node.req as { originalUrl?: string }).originalUrl || - this.node.req.url || - "/" - ); + return this.node.req.originalUrl || this.node.req.url || "/"; } get _hasBody() { diff --git a/src/utils/route.ts b/src/utils/route.ts index e5ecc254..cf93cf9b 100644 --- a/src/utils/route.ts +++ b/src/utils/route.ts @@ -11,10 +11,8 @@ export function useBase(base: string, handler: EventHandler): EventHandler { return eventHandler(async (event) => { // Keep original incoming url accessable - (event.node.req as { originalUrl?: string }).originalUrl = - (event.node.req as { originalUrl?: string }).originalUrl || - event.node.req.url || - "/"; + event.node.req.originalUrl = + event.node.req.originalUrl || event.node.req.url || "/"; const _path = event._path || event.node.req.url || "/";