fix(jsx-renderer): don't overwrite headers if stream is true (#2363)

* fix(jsx-renderer): dont overwrite headers if stream is `true` * denoify
honojs · Mar 16, 2024 · dd7561a · dd7561a
1 parent 72f8650
commit dd7561a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 18 deletions.
diff --git a/deno_dist/middleware/jsx-renderer/index.ts b/deno_dist/middleware/jsx-renderer/index.ts
@@ -45,15 +45,15 @@ const createRenderer =
     )}`
 
     if (options?.stream) {
-      return c.body(renderToReadableStream(body), {
-        headers:
-          options.stream === true
-            ? {
-                'Transfer-Encoding': 'chunked',
-                'Content-Type': 'text/html; charset=UTF-8',
-              }
-            : options.stream,
-      })
+      if (options.stream === true) {
+        c.header('Transfer-Encoding', 'chunked')
+        c.header('Content-Type', 'text/html; charset=UTF-8')
+      } else {
+        for (const [key, value] of Object.entries(options.stream)) {
+          c.header(key, value)
+        }
+      }
+      return c.body(renderToReadableStream(body))
     } else {
       return c.html(body)
     }

diff --git a/src/middleware/jsx-renderer/index.test.tsx b/src/middleware/jsx-renderer/index.test.tsx
@@ -314,6 +314,23 @@ d.replaceWith(c.content)
     ])
   })
 
+  it('Should return as streaming content with headers added in a handler', async () => {
+    const app = new Hono()
+    app.use(jsxRenderer(async ({ children }) => <div>{children}</div>, { stream: true }))
+    app.get('/', (c) => {
+      c.header('X-Message-Set', 'Hello')
+      c.header('X-Message-Append', 'Hello', { append: true })
+      return c.render('Hi', { title: 'Hi' })
+    })
+    const res = await app.request('/')
+    expect(res.status).toBe(200)
+    expect(res.headers.get('Transfer-Encoding')).toBe('chunked')
+    expect(res.headers.get('Content-Type')).toBe('text/html; charset=UTF-8')
+    expect(res.headers.get('X-Message-Set')).toBe('Hello')
+    expect(res.headers.get('X-Message-Append')).toBe('Hello')
+    expect(await res.text()).toBe('<!DOCTYPE html><div>Hi</div>')
+  })
+
   it('Env', async () => {
     type JSXRendererEnv = {
       Variables: {

diff --git a/src/middleware/jsx-renderer/index.ts b/src/middleware/jsx-renderer/index.ts
@@ -45,15 +45,15 @@ const createRenderer =
     )}`
 
     if (options?.stream) {
-      return c.body(renderToReadableStream(body), {
-        headers:
-          options.stream === true
-            ? {
-                'Transfer-Encoding': 'chunked',
-                'Content-Type': 'text/html; charset=UTF-8',
-              }
-            : options.stream,
-      })
+      if (options.stream === true) {
+        c.header('Transfer-Encoding', 'chunked')
+        c.header('Content-Type', 'text/html; charset=UTF-8')
+      } else {
+        for (const [key, value] of Object.entries(options.stream)) {
+          c.header(key, value)
+        }
+      }
+      return c.body(renderToReadableStream(body))
     } else {
       return c.html(body)
     }