Merge branch 'main' into next

Author: SaltyAom

src/adapter/bun/handler.ts

@@ -37,7 +37,10 @@ export const mapResponse = (
 				return new Response(JSON.stringify(response), set as any)
 
 			case 'ElysiaFile':
-				return handleFile((response as ElysiaFile).value as File)
+				return handleFile(
+					(response as ElysiaFile).value as File,
+					set as any
+				)
 
 			case 'File':
 				return handleFile(response as File, set as any)

src/adapter/utils.ts

@@ -159,6 +159,7 @@ export const createStreamHandler =
 			| IteratorResult<unknown>
 			| undefined
 
+		if (set) handleSet(set)
 		if (init instanceof Promise) init = await init
 
 		// Generator or ReadableStream is returned from a generator function

test/response/stream.test.ts

@@ -96,6 +96,31 @@ describe('Stream', () => {
 		expect(response).toBe('ab')
 	})
 
+	it('include multiple set-cookie headers in streamed response', async () => {
+		const app = new Elysia().get('/', async function* (context) {
+			context.cookie['cookie1'].set({
+				value: 'value1'
+			})
+			context.cookie['cookie2'].set({
+				value: 'value2'
+			})
+
+			yield sse({ event: 'test', data: { count: 1 } })
+			yield sse({ event: 'test', data: { count: 2 } })
+		})
+
+		const response = await app.handle(req('/'))
+
+		const cookieHeaders = response.headers.getSetCookie()
+		expect(cookieHeaders).toHaveLength(2)
+		expect(cookieHeaders.some((h) => h.includes('cookie1=value1'))).toBe(
+			true
+		)
+		expect(cookieHeaders.some((h) => h.includes('cookie2=value2'))).toBe(
+			true
+		)
+	})
+
 	it('mutate set before yield is called', async () => {
 		const expected = ['a', 'b', 'c']