fix: support tuple headers in responseViaCache

usualoma · usualoma · commit 46ebb313c620 · 2026-03-01T10:14:32.000+09:00
diff --git a/src/listener.ts b/src/listener.ts
@@ -77,6 +77,10 @@ const responseViaCache = async (
   } else if (header instanceof Headers) {
     hasContentLength = header.has('content-length')
     header = buildOutgoingHttpHeaders(header)
+  } else if (Array.isArray(header)) {
+    const headerObj = new Headers(header)
+    hasContentLength = headerObj.has('content-length')
+    header = buildOutgoingHttpHeaders(headerObj)
   } else {
     for (const key in header) {
       if (key.length === 14 && key.toLowerCase() === 'content-length') {
diff --git a/src/response.ts b/src/response.ts
@@ -10,7 +10,7 @@ export const cacheKey = Symbol('cache')
 export type InternalCache = [
   number,
   string | ReadableStream,
-  Record<string, string> | Headers | OutgoingHttpHeaders | undefined,
+  Record<string, string> | [string, string][] | Headers | OutgoingHttpHeaders | undefined,
 ]
 interface LightResponse {
   [responseCache]?: globalThis.Response
diff --git a/test/server.test.ts b/test/server.test.ts
@@ -254,6 +254,25 @@ describe('various response body types', () => {
         })
         return response
       })
+      app.get('/text-with-content-length-array', () => {
+        const response = new Response('Hello Hono!', {
+          headers: [
+            ['content-type', 'text/plain'],
+            ['content-length', '00011'],
+          ],
+        })
+        return response
+      })
+      app.get('/text-with-set-cookie-array', () => {
+        const response = new Response('Hello Hono!', {
+          headers: [
+            ['content-type', 'text/plain'],
+            ['set-cookie', 'a=1'],
+            ['set-cookie', 'b=2'],
+          ],
+        })
+        return response
+      })
 
       app.use('/etag/*', etag())
       app.get('/etag/buffer', () => {
@@ -400,6 +419,22 @@ describe('various response body types', () => {
       expect(res.text).toBe('Hello Hono!')
     })
 
+    it('Should return 200 response - GET /text-with-content-length-array', async () => {
+      const res = await request(server).get('/text-with-content-length-array')
+      expect(res.status).toBe(200)
+      expect(res.headers['content-type']).toMatch('text/plain')
+      expect(res.headers['content-length']).toBe('00011')
+      expect(res.text).toBe('Hello Hono!')
+    })
+
+    it('Should return 200 response - GET /text-with-set-cookie-array', async () => {
+      const res = await request(server).get('/text-with-set-cookie-array')
+      expect(res.status).toBe(200)
+      expect(res.headers['content-type']).toMatch('text/plain')
+      expect(res.headers['set-cookie']).toEqual(['a=1', 'b=2'])
+      expect(res.text).toBe('Hello Hono!')
+    })
+
     it('Should return 200 response - GET /etag/buffer', async () => {
       const res = await request(server).get('/etag/buffer')
       expect(res.status).toBe(200)

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export const cacheKey = Symbol('cache')`
`10`	`10`	`export type InternalCache = [`
`11`	`11`	`number,`
`12`	`12`	`string \| ReadableStream,`
`13`		`- Record<string, string> \| Headers \| OutgoingHttpHeaders \| undefined,`
	`13`	`+ Record<string, string> \| [string, string][] \| Headers \| OutgoingHttpHeaders \| undefined,`
`14`	`14`	`]`
`15`	`15`	`interface LightResponse {`
`16`	`16`	`[responseCache]?: globalThis.Response`