🎉 feat: ponyfill for node 18, probably

Author: SaltyAom

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.2.2 - 27 Dec 2024
+Bug fix:
+- Set minimum Elysia version to 1.2.7
+- Response doesn't reconcile when handler return `Response` is used with `mapResponse`
+- [#11](https://github.com/elysiajs/node/pull/11) `Content-Length` with `UTF-8` 2-byte characters
+- Ponyfill for `fs.openAsBlob` and `Promise.withResolve`
+
 # 1.2.1 - 25 Dec 2024
 Change:
 - Set minimum Elysia version to 1.2.3

build.ts

@@ -16,15 +16,15 @@ await Promise.all([
     build({
         outDir: 'dist',
         format: 'esm',
-        target: 'node20',
+        target: 'node18',
         cjsInterop: false,
         ...tsupConfig
     }),
     // ? tsup cjs
     build({
         outDir: 'dist/cjs',
         format: 'cjs',
-        target: 'node20',
+        target: 'node18',
         // dts: true,
         ...tsupConfig
     })

bun.lockb

@@ -1,14 +1,16 @@
 import { Elysia, file } from 'elysia'
+import { cors } from '@elysiajs/cors'
 import { node } from '../src'
 
 const plugin = async () => new Elysia().get('/async', () => 'ok')
 
 const app = new Elysia({
-	adapter: node()
+	// adapter: node()
 })
-.get('/image', () => file('test/kyuukurarin.mp4'))
+	.use(cors())
+	.get('/image', () => file('test/kyuukurarin.mp4'))
 	.post('/', ({ body }) => body, {
 		type: 'json'
 	})
-	.get('/', 'ok')
+	.get('/', () => 'ok')
 	.listen(3000)

example/index.ts

@@ -1,6 +1,6 @@
 {
 	"name": "@elysiajs/node",
-	"version": "1.2.1",
+	"version": "1.2.2",
 	"description": "Plugin for Elysia for retreiving Bearer token",
 	"license": "MIT",
 	"scripts": {
@@ -15,7 +15,7 @@
 		"ws": "^8.18.0"
 	},
 	"peerDependencies": {
-		"elysia": ">= 1.2.3",
+		"elysia": ">= 1.2.7",
 		"bufferutil": ">= 4.0.1",
 		"formidable": ">= 3.5.2",
 		"ws": ">= 8.18.0"
@@ -26,10 +26,11 @@
 		}
 	},
 	"devDependencies": {
+		"@elysiajs/cors": "^1.2.0",
 		"@types/formidable": "^3.4.5",
 		"@types/node": "^22.10.2",
 		"@types/ws": "^8.5.13",
-		"elysia": "1.2.3",
+		"elysia": "1.2.7",
 		"eslint": "9.17.0",
 		"light-my-request": "^6.4.0",
 		"tsup": "^8.3.5",

package.json

@@ -359,7 +359,7 @@ export const mapResponse = (
 			return [response, set as any]
 
 		case 'Response':
-			mergeResponseWithSetHeaders(response as Response, set)
+			response = mergeResponseWithSetHeaders(response as Response, set)
 
 			if (
 				(response as Response).headers.get('transfer-encoding') ===
@@ -417,7 +417,10 @@ export const mapResponse = (
 
 		default:
 			if (response instanceof Response) {
-				mergeResponseWithSetHeaders(response as Response, set)
+				response = mergeResponseWithSetHeaders(
+					response as Response,
+					set
+				)
 
 				return [
 					responseToValue(
@@ -604,7 +607,7 @@ export const mapEarlyResponse = (
 			return [response, set as any]
 
 		case 'Response':
-			mergeResponseWithSetHeaders(response as Response, set)
+			response = mergeResponseWithSetHeaders(response as Response, set)
 
 			if (
 				(response as Response).headers.get('transfer-encoding') ===
@@ -662,7 +665,10 @@ export const mapEarlyResponse = (
 
 		default:
 			if (response instanceof Response) {
-				mergeResponseWithSetHeaders(response as Response, set)
+				response = mergeResponseWithSetHeaders(
+					response as Response,
+					set
+				)
 
 				return [
 					responseToValue(response, res, set as SetResponse),

src/handler.ts

@@ -19,7 +19,7 @@ import { mapResponse, mapEarlyResponse, mapCompactResponse } from './handler'
 
 import { attachWebSocket } from './ws'
 import { WebStandardAdapter } from 'elysia/adapter/web-standard'
-import { readFileToWebStandardFile, unwrapArrayIfSingle } from './utils'
+import { readFileToWebStandardFile, unwrapArrayIfSingle, withResolvers } from './utils'
 
 export const ElysiaNodeContext = Symbol('ElysiaNodeContext')
 
@@ -332,7 +332,7 @@ export const node = () => {
 				app.fetch = webStandardApp.fetch
 
 				const { promise: serverInfo, resolve: setServerInfo } =
-					Promise.withResolvers<Server>()
+					withResolvers<Server>()
 
 				// @ts-expect-error closest possible type
 				app.server = serverInfo
@@ -369,7 +369,7 @@ export const node = () => {
 							// @ts-expect-error
 							get pendingRequests() {
 								const { promise, resolve, reject } =
-									Promise.withResolvers<number>()
+									withResolvers<number>()
 
 								server.getConnections((error, total) => {
 									if (error) reject(error)

src/index.ts

@@ -1,4 +1,14 @@
-import { openAsBlob } from 'fs'
+import fs from 'fs'
+
+export const withResolvers = <T>() => {
+	let resolve: (value: T | PromiseLike<T>) => void
+	let reject: (reason?: unknown) => void
+	const promise = new Promise<T>((res, rej) => {
+		resolve = res
+		reject = rej
+	})
+	return { promise, resolve: resolve!, reject: reject! }
+}
 
 export const unwrapArrayIfSingle = <T extends unknown[]>(
 	x: T
@@ -23,39 +33,39 @@ export const readFileToWebStandardFile = (
 	for (let i = 0; i < files.length; i++)
 		buffers.push(
 			new Promise<File>((resolve, reject) => {
-				// if (openAsBlob)
-				resolve(
-					openAsBlob(files[i].filepath).then(
-						(blob) =>
-							new File([blob], files[i].originalFilename, {
-								type: files[i].mimetype,
-								lastModified:
-									files[i].lastModifiedDate.getTime()
-							})
+				if (fs.openAsBlob)
+					resolve(
+						fs.openAsBlob(files[i].filepath).then(
+							(blob) =>
+								new File([blob], files[i].originalFilename, {
+									type: files[i].mimetype,
+									lastModified:
+										files[i].lastModifiedDate.getTime()
+								})
+						)
+					)
+				else {
+					const buffer = Array<any>()
+					const stream = fs.createReadStream(files[i].filepath)
+
+					stream.on('data', (chunk) => buffer.push(chunk))
+					stream.on('end', () =>
+						resolve(
+							new File(
+								[new Blob([Buffer.concat(buffer)])],
+								files[i].originalFilename,
+								{
+									type: files[i].mimetype,
+									lastModified:
+										files[i].lastModifiedDate.getTime()
+								}
+							)
+						)
+					)
+					stream.on('error', (err) =>
+						reject(`error converting stream - ${err}`)
 					)
-				)
-				// else {
-				// 	const buffer = Array<any>()
-				// 	const stream = createReadStream(files[i].filepath)
-
-				// 	stream.on('data', (chunk) => buffer.push(chunk))
-				// 	stream.on('end', () =>
-				// 		resolve(
-				// 			new File(
-				// 				[new Blob([Buffer.concat(buffer)])],
-				// 				files[i].originalFilename,
-				// 				{
-				// 					type: files[i].mimetype,
-				// 					lastModified:
-				// 						files[i].lastModifiedDate.getTime()
-				// 				}
-				// 			)
-				// 		)
-				// 	)
-				// 	stream.on('error', (err) =>
-				// 		reject(`error converting stream - ${err}`)
-				// 	)
-				// }
+				}
 			})
 		)