Skip to content

Commit 6c87d87

Browse files
committedJul 31, 2023
refactor: type event.node.req.originalUrl
1 parent e155950 commit 6c87d87

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed
 

‎src/app.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,8 @@ export function createAppEventHandler(stack: Stack, options: AppOptions) {
103103
const spacing = options.debug ? 2 : undefined;
104104
return eventHandler(async (event) => {
105105
// Keep original incoming url accessable
106-
(event.node.req as { originalUrl?: string }).originalUrl =
107-
(event.node.req as { originalUrl?: string }).originalUrl ||
108-
event.node.req.url ||
109-
"/";
106+
event.node.req.originalUrl =
107+
event.node.req.originalUrl || event.node.req.url || "/";
110108

111109
// Keep a copy of incoming url
112110
const _reqPath = event._path || event.node.req.url || "/";

‎src/event/event.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const PayloadMethods: Set<HTTPMethod> = new Set([
1818
]);
1919

2020
export interface NodeEventContext {
21-
req: NodeIncomingMessage;
21+
req: NodeIncomingMessage & { originalUrl?: string };
2222
res: NodeServerResponse;
2323
}
2424

@@ -49,11 +49,7 @@ export class H3Event<
4949
}
5050

5151
get _originalPath() {
52-
return (
53-
(this.node.req as { originalUrl?: string }).originalUrl ||
54-
this.node.req.url ||
55-
"/"
56-
);
52+
return this.node.req.originalUrl || this.node.req.url || "/";
5753
}
5854

5955
get _hasBody() {

‎src/utils/route.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ export function useBase(base: string, handler: EventHandler): EventHandler {
1111

1212
return eventHandler(async (event) => {
1313
// Keep original incoming url accessable
14-
(event.node.req as { originalUrl?: string }).originalUrl =
15-
(event.node.req as { originalUrl?: string }).originalUrl ||
16-
event.node.req.url ||
17-
"/";
14+
event.node.req.originalUrl =
15+
event.node.req.originalUrl || event.node.req.url || "/";
1816

1917
const _path = event._path || event.node.req.url || "/";
2018

0 commit comments

Comments
 (0)
Please sign in to comment.