🔧 fix: check if body is not locked

Author: SaltyAom

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.5 - 1 Feb 2025
+Bug fix:
+- [#23](https://github.com/elysiajs/node/issues/23) Response body object should not be disturbed or locked
+
 # 1.2.4 - 1 Feb 2025
 Change:
 - Support Elysia 1.2.11

bun.lock

@@ -13,7 +13,7 @@
         "@types/formidable": "^3.4.5",
         "@types/node": "^22.10.2",
         "@types/ws": "^8.5.13",
-        "elysia": "1.2.10",
+        "elysia": "^1.2.11",
         "eslint": "9.17.0",
         "light-my-request": "^6.4.0",
         "tsup": "^8.3.5",
@@ -24,12 +24,11 @@
       "peerDependencies": {
         "bufferutil": ">= 4.0.1",
         "elysia": ">= 1.2.7",
-        "bufferutil": ">= 4.0.1",
-        "elysia": ">= 1.2.7",
+        "formidable": ">= 3.5.2",
+        "ws": ">= 8.18.0",
       },
       "optionalPeers": [
         "bufferutil",
-        "bufferutil",
       ],
     },
   },

example/c.ts

@@ -1,18 +1,43 @@
 import { Elysia, t } from 'elysia'
-import { node } from '../src'
-import cors from '@elysiajs/cors'
+import { ElysiaNodeContext, node } from '../src'
 
-const app = new Elysia({ adapter: node() })
-	.use((app) =>
-		app
-			.derive({ as: 'global' }, async ({ cookie }) => {})
-			.onAfterHandle({ as: 'global' }, async ({ response }) => {
-				console.log('onAfterHandle', response)
-				// await commitSession();
-				return response
+const app = new Elysia({
+	adapter: node()
+})
+	.onError(({ request }) => {
+		return
+	})
+	.post(
+		'/',
+		({ body }) => {
+			console.log({ body })
+
+			return 'OK'
+		},
+		{
+			body: t.Object({
+				test: t.String()
 			})
+		}
 	)
-	.get('/', () => 'Hello World')
 	.listen(3000)
 
-console.log(app._handle)
+// console.log(app._handle.toString())
+// console.log(app.routes[0].compile().toString())
+// console.log(app.handleError.toString())
+
+const main = async () => {
+	const res = await fetch('http://localhost:3000/', {
+		method: 'POST',
+		headers: {
+			'Content-Type': 'application/json'
+		},
+		body: JSON.stringify({ bad: '' })
+	})
+
+	console.log('status', res.status)
+
+	// app.stop(true)
+}
+
+main()

package.json

@@ -31,7 +31,7 @@
 		"@types/formidable": "^3.4.5",
 		"@types/node": "^22.10.2",
 		"@types/ws": "^8.5.13",
-		"elysia": "1.2.10",
+		"elysia": "^1.2.11",
 		"eslint": "9.17.0",
 		"light-my-request": "^6.4.0",
 		"tsup": "^8.3.5",

src/index.ts

@@ -41,14 +41,17 @@ export const nodeRequestToWebstand = (
 	abortController?: AbortController
 ) => {
 	let _signal: AbortSignal
+	let _body: unknown
 
 	return new Request(getUrl(req), {
 		method: req.method,
 		headers: req.headers as Record<string, string>,
 		get body() {
 			if (req.method === 'GET' || req.method === 'HEAD') return null
+			if (_body !== undefined) return _body
+			if (req.readable) return (_body = Readable.toWeb(req) as any)
 
-			return Readable.toWeb(req) as any
+			return null
 		},
 		get signal() {
 			if (_signal) return _signal
@@ -76,16 +79,20 @@ export const node = () => {
 			mapCompactResponse
 		},
 		composeHandler: {
-			// declare(inference) {
-			// 	if (inference.request)
-			// 		return (
-			// 			`Object.defineProperty(c,'request',{` +
-			// 			`get(){` +
-			// 			`return nodeRequestToWebstand(c[ElysiaNodeContext].req)` +
-			// 			`}` +
-			// 			`})\n`
-			// 		)
-			// },
+			declare(inference) {
+				if (inference.request || inference.request)
+					return (
+						`if(!('request' in c)){` +
+						`let _request\n` +
+						`Object.defineProperty(c,'request',{` +
+						`get(){` +
+						`if(_request)return _request\n` +
+						`return _request=nodeRequestToWebstand(c[ElysiaNodeContext].req)` +
+						`}` +
+						`})` +
+						'}\n'
+					)
+			},
 			mapResponseContext: 'c[ElysiaNodeContext].res',
 			headers: `c.headers=c[ElysiaNodeContext].req.headers\n`,
 			inject: {
@@ -208,12 +215,12 @@ export const node = () => {
 				fnLiteral += `let _request\n` + `const c={`
 
 				// @ts-ignore protected
-				if (app.inference.request || app.inference.cookie)
-					fnLiteral +=
-						`get request(){` +
-						`if(_request)return _request\n` +
-						`return _request = nodeRequestToWebstand(r)` +
-						`},`
+				// if (app.inference.request || app.inference.cookie)
+				// 	fnLiteral +=
+				// 		`get request(){` +
+				// 		`if(_request)return _request\n` +
+				// 		`return _request = nodeRequestToWebstand(r)` +
+				// 		`},`
 
 				fnLiteral +=
 					`store,` +
@@ -348,10 +355,10 @@ export const node = () => {
 					typeof options === 'number'
 						? options
 						: {
-							...options,
-							// @ts-ignore
-							host: options?.hostname
-						},
+								...options,
+								// @ts-ignore
+								host: options?.hostname
+							},
 					() => {
 						const address = server.address()
 						const hostname =
@@ -408,10 +415,10 @@ export const node = () => {
 									typeof options === 'number'
 										? options
 										: {
-											...options,
-											// @ts-ignore
-											host: options?.hostname
-										}
+												...options,
+												// @ts-ignore
+												host: options?.hostname
+											}
 								)
 							},
 							requestIP() {
@@ -447,10 +454,10 @@ export const node = () => {
 									typeof options === 'object'
 										? (options as any)
 										: {
-											port: options
-										}
+												port: options
+											}
 								)
-							} catch { }
+							} catch {}
 						})
 					}
 				)