rename .req and .res for node http interfaces

Author: shuding

packages/next/build/webpack/loaders/next-serverless-loader/api-handler.ts

@@ -50,8 +50,8 @@ export function getApiHandler(ctx: ServerlessHandlerCtx) {
       }
 
       await apiResolver(
-        req.req,
-        res.res,
+        req.originalRequest,
+        res.originalResponse,
         Object.assign({}, parsedUrl.query, params),
         await pageModule,
         encodedPreviewProps,

packages/next/server/base-http.ts

@@ -37,7 +37,7 @@ export class NodeNextRequest extends BaseNextRequest<Readable> {
 
   [NEXT_REQUEST_META]: RequestMeta
 
-  get req() {
+  get originalRequest() {
     // Need to mimic these changes to the original req object for places where we use it:
     // render.tsx, api/ssg requests
     this._req[NEXT_REQUEST_META] = this[NEXT_REQUEST_META]
@@ -138,7 +138,7 @@ export class NodeNextResponse extends BaseNextResponse<Writable> {
 
   public [SYMBOL_CLEARED_COOKIES]?: boolean
 
-  get res() {
+  get originalResponse() {
     if (SYMBOL_CLEARED_COOKIES in this) {
       this._res[SYMBOL_CLEARED_COOKIES] = this[SYMBOL_CLEARED_COOKIES]
     }

packages/next/server/dev/next-dev-server.ts

@@ -485,7 +485,7 @@ export default class DevServer extends Server {
   private setupWebSocketHandler(server?: HTTPServer, _req?: NodeNextRequest) {
     if (!this.addedUpgradeListener) {
       this.addedUpgradeListener = true
-      server = server || (_req?.req.socket as any)?.server
+      server = server || (_req?.originalRequest.socket as any)?.server
 
       if (!server) {
         // this is very unlikely to happen but show an error in case
@@ -578,8 +578,8 @@ export default class DevServer extends Server {
     }
 
     const { finished = false } = await this.hotReloader!.run(
-      req.req,
-      res.res,
+      req.originalRequest,
+      res.originalResponse,
       parsedUrl
     )
 

packages/next/server/next-server.ts

@@ -221,8 +221,8 @@ export default class NextNodeServer extends BaseServer {
     }
   ): Promise<void> {
     return sendRenderResult({
-      req: req.req,
-      res: res.res,
+      req: req.originalRequest,
+      res: res.originalResponse,
       ...options,
     })
   }
@@ -232,15 +232,15 @@ export default class NextNodeServer extends BaseServer {
     res: NodeNextResponse,
     path: string
   ): Promise<void> {
-    return serveStatic(req.req, res.res, path)
+    return serveStatic(req.originalRequest, res.originalResponse, path)
   }
 
   protected handleCompression(
     req: NodeNextRequest,
     res: NodeNextResponse
   ): void {
     if (this.compression) {
-      this.compression(req.req, res.res, () => {})
+      this.compression(req.originalRequest, res.originalResponse, () => {})
     }
   }
 
@@ -279,7 +279,7 @@ export default class NextNodeServer extends BaseServer {
           proxyReject(err)
         }
       })
-      proxy.web(req.req, res.res)
+      proxy.web(req.originalRequest, res.originalResponse)
     })
 
     return {
@@ -310,8 +310,8 @@ export default class NextNodeServer extends BaseServer {
     }
 
     await apiResolver(
-      req.req,
-      res.res,
+      req.originalRequest,
+      res.originalResponse,
       query,
       pageModule,
       this.renderOpts.previewProps,
@@ -329,11 +329,17 @@ export default class NextNodeServer extends BaseServer {
     query: NextParsedUrlQuery,
     renderOpts: RenderOpts
   ): Promise<RenderResult | null> {
-    return renderToHTML(req.req, res.res, pathname, query, renderOpts)
+    return renderToHTML(
+      req.originalRequest,
+      res.originalResponse,
+      pathname,
+      query,
+      renderOpts
+    )
   }
 
   protected streamResponseChunk(res: NodeNextResponse, chunk: any) {
-    res.res.write(chunk)
+    res.originalResponse.write(chunk)
   }
 
   protected async imageOptimizer(
@@ -345,8 +351,8 @@ export default class NextNodeServer extends BaseServer {
       require('./image-optimizer') as typeof import('./image-optimizer')
 
     return imageOptimizer(
-      req.req,
-      res.res,
+      req.originalRequest,
+      res.originalResponse,
       parsedUrl,
       this.nextConfig,
       this.distDir,