refactor: Improve compatibility with standard Request object

usualoma · usualoma · commit a9c3cd2357f9 · 2023-11-22T06:48:01.000+09:00
diff --git a/src/listener.ts b/src/listener.ts
@@ -3,7 +3,7 @@ import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2'
 import type { FetchCallback } from './types'
 import './globals'
 import { cacheKey } from './response'
-import { requestPrototype } from './request'
+import { newRequest } from './request'
 import { writeFromReadableStream, buildOutgoingHttpHeaders } from './utils'
 
 const regBuffer = /^no$/i
@@ -108,10 +108,7 @@ export const getRequestListener = (fetchCallback: FetchCallback) => {
 
     // `fetchCallback()` requests a Request object, but global.Request is expensive to generate,
     // so generate a pseudo Request object with only the minimum required information.
-    const req = Object.create(requestPrototype)
-    req.method = incoming.method || 'GET'
-    req.url = `http://${incoming.headers.host}${incoming.url}`
-    req.incoming = incoming
+    const req = newRequest(incoming)
 
     try {
       res = fetchCallback(req) as Response | Promise<Response>
diff --git a/src/request.ts b/src/request.ts
@@ -32,10 +32,19 @@ const newRequestFromIncoming = (
 
 const getRequestCache = Symbol('getRequestCache')
 const requestCache = Symbol('requestCache')
+const incomingKey = Symbol('incomingKey')
+
+const requestPrototype: Record<string | symbol, any> = {
+  get method() {
+    return this[incomingKey].method || 'GET'
+  },
+
+  get url() {
+    return `http://${this[incomingKey].headers.host}${this[incomingKey].url}`
+  },
 
-export const requestPrototype: Record<string | symbol, any> = {
   [getRequestCache]() {
-    return (this[requestCache] ||= newRequestFromIncoming(this.method, this.url, this.incoming))
+    return (this[requestCache] ||= newRequestFromIncoming(this.method, this.url, this[incomingKey]))
   },
 }
 ;[
@@ -65,3 +74,10 @@ export const requestPrototype: Record<string | symbol, any> = {
     },
   })
 })
+Object.setPrototypeOf(requestPrototype, global.Request.prototype)
+
+export const newRequest = (incoming: IncomingMessage | Http2ServerRequest) => {
+  const req = Object.create(requestPrototype)
+  req[incomingKey] = incoming
+  return req
+};
diff --git a/test/request.test.ts b/test/request.test.ts
@@ -0,0 +1,20 @@
+import { IncomingMessage } from 'node:http'
+import { newRequest } from '../src/request'
+
+describe('Request', () => {
+  it('Compatibility with standard Request object', async () => {
+    const req = newRequest({
+      method: 'GET',
+      url: '/',
+      headers: {
+        host: 'localhost',
+      },
+      rawHeaders: ['host', 'localhost'],
+    } as IncomingMessage)
+
+    expect(req).toBeInstanceOf(global.Request)
+    expect(req.method).toBe('GET')
+    expect(req.url).toBe('http://localhost/')
+    expect(req.headers.get('host')).toBe('localhost')
+  })
+})
