🎉 feat: 1.4.4

Author: SaltyAom

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.4.4 - 9 Feb 2025
+Bug fix:
+- [#55](https://github.com/elysiajs/node/pull/55) allow node cluster mode as default
+- createResponseHandler with more precision headers merging
+- simplify ws hook
+
 # 1.4.3 - 5 Jan 2025
 Bug fix:
 - [#54](https://github.com/elysiajs/node/issues/54) update srvx to 0.10.0

bun.lock

@@ -1,6 +1,6 @@
 {
 	"name": "@elysiajs/node",
-	"version": "1.4.3",
+	"version": "1.4.4",
 	"description": "Elysia adapter to run Elysia on Node.js",
 	"license": "MIT",
 	"scripts": {
@@ -13,7 +13,7 @@
 	},
 	"dependencies": {
 		"crossws": "^0.4.1",
-		"srvx": "^0.10.0"
+		"srvx": "^0.11.2"
 	},
 	"peerDependencies": {
 		"elysia": ">= 1.4.0"

package.json

@@ -15,10 +15,8 @@ import { WebStandardAdapter } from 'elysia/adapter/web-standard'
 import type { Server } from 'elysia/universal'
 import { isNumericString, randomId } from 'elysia/utils'
 
-import { defineHooks } from 'crossws'
 import { serve } from 'crossws/server'
 
-import type { ServerWebSocket } from 'elysia/ws/bun'
 import { createWebSocketAdapter, type NodeWebSocketContext } from './ws'
 
 import {
@@ -50,71 +48,20 @@ export const node = () => {
 					options = parseInt(options)
 				}
 
-				const websocket = defineHooks({
-					async upgrade(request) {
-						// @ts-ignore
-						const id = (request.wsId = randomId())
-
-						const response = await app.handle(request)
-
-						const context = ws.context[id]
-						if (!context) return response
-
-						return {
-							context: context as any,
-							headers: context.data.set.headers as any
-						}
-					},
-					open(ws) {
-						const context =
-							ws.context as any as NodeWebSocketContext
-
-						context.open(ws)
-					},
-					message(ws, message) {
-						const context =
-							ws.context as any as NodeWebSocketContext
-
-						// ws is parsed in context.open
-						context.message(
-							ws as any as ServerWebSocket,
-							message.text()
-						)
-					},
-					close(ws, detail) {
-						const context =
-							ws.context as any as NodeWebSocketContext
-
-						context.close(
-							// ws is parsed in context.open
-							ws as any as ServerWebSocket,
-							detail.code!,
-							detail.reason!
-						)
-					},
-					error(ws, error) {
-						const context =
-							ws.context as any as NodeWebSocketContext
-
-						// ws is parsed in context.open
-						context.error?.(ws as any as ServerWebSocket, error)
-					}
-				})
-
 				const serverOptions: Parameters<typeof serve>[0] =
 					typeof options === 'number'
-						? {
+						? ({
 								port: options,
 								silent: true,
-								websocket,
+								websocket: ws.createConfig(app),
 								fetch: app.fetch,
 								reusePort: true
-							}
+							} as any)
 						: {
 								reusePort: true,
 								...options,
 								silent: true,
-								websocket,
+								websocket: ws.createConfig(app),
 								fetch: app.fetch
 							}
 
@@ -149,13 +96,15 @@ export const node = () => {
 							resolve(total)
 						})
 
-						return promise
+						return promise as any
 					},
 					get pendingWebSockets() {
 						return 0
 					},
-					port,
-					publish() {},
+					port: port as any,
+					publish() {
+						return 0
+					},
 					ref() {
 						nodeServer?.ref()
 					},
@@ -165,14 +114,16 @@ export const node = () => {
 					reload() {
 						nodeServer?.close()
 						server = serve(serverOptions)
+
+						return serverInfo
 					},
 					requestIP() {
 						throw new Error(
 							"This adapter doesn't support Bun requestIP method"
 						)
 					},
 					stop() {
-						server.close()
+						return server.close()
 					},
 					upgrade() {
 						throw new Error(
@@ -185,6 +136,7 @@ export const node = () => {
 					[Symbol.dispose]() {
 						server.close()
 					},
+					// @ts-ignore
 					raw: server
 				} satisfies Server
 

src/index.ts

@@ -1,7 +1,7 @@
 import { FastResponse as Response } from 'srvx'
 import type { ReadStream } from 'fs'
 
-import { isNotEmpty } from 'elysia/utils'
+import { isNotEmpty, StatusMap } from 'elysia/utils'
 import type { Context } from 'elysia/context'
 import {
 	createStreamHandler,
@@ -84,17 +84,57 @@ interface CreateHandlerParameter {
 	mapCompactResponse(response: unknown, request?: Request): Response
 }
 
+// Merge header by allocating a new one
+// In Bun, response.headers can be mutable
+// while in Node and Cloudflare Worker is not
+// default to creating a new one instead
+export function mergeHeaders(
+	responseHeaders: Headers,
+	setHeaders: Context['set']['headers']
+) {
+	// @ts-ignore
+	const headers = new Headers(Object.fromEntries(responseHeaders.entries()))
+
+	// Merge headers: Response headers take precedence, set.headers fill in non-conflicting ones
+	if (setHeaders instanceof Headers)
+		// @ts-ignore
+		for (const key of setHeaders.keys()) {
+			if (key === 'set-cookie') {
+				if (headers.has('set-cookie')) continue
+
+				for (const cookie of setHeaders.getSetCookie())
+					headers.append('set-cookie', cookie)
+			} else if (!responseHeaders.has(key))
+				headers.set(key, setHeaders?.get(key) ?? '')
+		}
+	else
+		for (const key in setHeaders)
+			if (key === 'set-cookie')
+				headers.append(key, setHeaders[key] as any)
+			else if (!responseHeaders.has(key))
+				headers.set(key, setHeaders[key] as any)
+
+	return headers
+}
+
+export function mergeStatus(
+	responseStatus: number,
+	setStatus: Context['set']['status']
+) {
+	if (typeof setStatus === 'string') setStatus = StatusMap[setStatus]
+
+	if (responseStatus === 200) return setStatus
+
+	return responseStatus
+}
+
 export const createResponseHandler = (handler: CreateHandlerParameter) => {
 	const handleStream = createStreamHandler(handler)
 
 	return (response: Response, set: Context['set'], request?: Request) => {
 		const newResponse = new Response(response.body, {
-			headers: Object.assign(
-				// @ts-ignore
-				Object.fromEntries(response.headers.entries()),
-				set.headers
-			),
-			status: response.status ?? set.status
+			headers: mergeHeaders(response.headers, set.headers),
+			status: mergeStatus(response.status, set.status)
 		})
 
 		if (
@@ -105,7 +145,9 @@ export const createResponseHandler = (handler: CreateHandlerParameter) => {
 			return handleStream(
 				streamResponse(newResponse as Response),
 				responseToSetHeaders(newResponse as Response, set),
-				request
+				request,
+				// @ts-ignore
+				true // don't auto-format SSE for pre-formatted Response
 			) as any
 
 		return newResponse

src/utils.ts

@@ -1,4 +1,4 @@
-import { Peer, WSError } from 'crossws'
+import { defineHooks, Peer, WSError } from 'crossws'
 import {
 	Context,
 	getSchemaValidator,
@@ -249,5 +249,51 @@ export function createWebSocketAdapter() {
 		)
 	}
 
-	return { handler, context: store }
+	function createConfig(app: AnyElysia) {
+		return defineHooks({
+			async upgrade(request) {
+				// @ts-ignore
+				const id = (request.wsId = randomId())
+
+				const response = await app.handle(request)
+
+				const context = store[id]
+				if (!context) return response
+
+				return {
+					context: context as any,
+					headers: context.data.set.headers as any
+				}
+			},
+			open(ws) {
+				const context = ws.context as any as NodeWebSocketContext
+
+				context.open(ws)
+			},
+			message(ws, message) {
+				const context = ws.context as any as NodeWebSocketContext
+
+				// ws is parsed in context.open
+				context.message(ws as any as ServerWebSocket, message.text())
+			},
+			close(ws, detail) {
+				const context = ws.context as any as NodeWebSocketContext
+
+				context.close(
+					// ws is parsed in context.open
+					ws as any as ServerWebSocket,
+					detail.code!,
+					detail.reason!
+				)
+			},
+			error(ws, error) {
+				const context = ws.context as any as NodeWebSocketContext
+
+				// ws is parsed in context.open
+				context.error?.(ws as any as ServerWebSocket, error)
+			}
+		})
+	}
+
+	return { handler, createConfig, context: store }
 }