feat: remove getInternalBody function

Author: usualoma

src/listener.ts

@@ -6,7 +6,7 @@ import {
   Request as LightweightRequest,
   toRequestError,
 } from './request'
-import { cacheKey, getInternalBody, Response as LightweightResponse } from './response'
+import { cacheKey, Response as LightweightResponse } from './response'
 import type { InternalCache } from './response'
 import type { CustomErrorHandler, FetchCallback, HttpBindings } from './types'
 import { writeFromReadableStream, buildOutgoingHttpHeaders } from './utils'
@@ -93,28 +93,6 @@ const responseViaResponseObject = async (
 
   const resHeaderRecord: OutgoingHttpHeaders = buildOutgoingHttpHeaders(res.headers)
 
-  const internalBody = getInternalBody(res as Response)
-  if (internalBody) {
-    const { length, source, stream } = internalBody
-    if (source instanceof Uint8Array && source.byteLength !== length) {
-      // maybe `source` is detached, so we should send via res.body
-    } else {
-      // send via internal raw data
-      if (length) {
-        resHeaderRecord['content-length'] = length
-      }
-      outgoing.writeHead(res.status, resHeaderRecord)
-      if (typeof source === 'string' || source instanceof Uint8Array) {
-        outgoing.end(source)
-      } else if (source instanceof Blob) {
-        outgoing.end(new Uint8Array(await source.arrayBuffer()))
-      } else {
-        await writeFromReadableStream(stream, outgoing)
-      }
-      return
-    }
-  }
-
   if (res.body) {
     /**
      * If content-encoding is set, we assume that the response should be not decoded.

src/response.ts

@@ -3,12 +3,6 @@
 
 import type { OutgoingHttpHeaders } from 'node:http'
 
-interface InternalBody {
-  source: string | Uint8Array | FormData | Blob | null
-  stream: ReadableStream
-  length: number | null
-}
-
 const responseCache = Symbol('responseCache')
 const getResponseCache = Symbol('getResponseCache')
 export const cacheKey = Symbol('cache')
@@ -97,26 +91,3 @@ export class Response {
 })
 Object.setPrototypeOf(Response, GlobalResponse)
 Object.setPrototypeOf(Response.prototype, GlobalResponse.prototype)
-
-const stateKey = Reflect.ownKeys(new GlobalResponse()).find(
-  (k) => typeof k === 'symbol' && k.toString() === 'Symbol(state)'
-) as symbol | undefined
-if (!stateKey) {
-  console.warn('Failed to find Response internal state key')
-}
-
-export function getInternalBody(
-  response: Response | globalThis.Response
-): InternalBody | undefined {
-  if (!stateKey) {
-    return
-  }
-
-  if (response instanceof Response) {
-    response = (response as any)[getResponseCache]()
-  }
-
-  const state = (response as any)[stateKey] as { body?: InternalBody } | undefined
-
-  return (state && state.body) || undefined
-}

test/server.test.ts

@@ -107,7 +107,7 @@ describe('Basic', () => {
   })
 })
 
-describe('via internal body', () => {
+describe('via response body', () => {
   const app = new Hono()
   app.use('*', async (c, next) => {
     await next()
@@ -173,15 +173,15 @@ describe('via internal body', () => {
     const res = await request(server).get('/uint8array')
     expect(res.status).toBe(200)
     expect(res.headers['content-type']).toMatch('application/octet-stream')
-    expect(res.headers['content-length']).toMatch('3')
+    expect(res.headers['content-length']).toBeUndefined()
     expect(res.body).toEqual(Buffer.from([1, 2, 3]))
   })
 
   it('Should return 200 response - GET /blob', async () => {
     const res = await request(server).get('/blob')
     expect(res.status).toBe(200)
     expect(res.headers['content-type']).toMatch('application/octet-stream')
-    expect(res.headers['content-length']).toMatch('3')
+    expect(res.headers['content-length']).toBeUndefined()
     expect(res.body).toEqual(Buffer.from([1, 2, 3]))
   })