update node server for middlewares

ragokan · Sep 27, 2024 · 2922dd7 · 2922dd7
1 parent 322e93c
commit 2922dd7
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## [0.0.30] - 2024-09-27
+
+- Update "createNodeServer" to use static routes and handlers, such as openapi
+
 ## [0.0.29] - 2024-09-27
 
 - Add "createNodeServer" wrapper for NodeJS environments

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "0.0.29",
-  "useNx": true
-}
+	"$schema": "node_modules/lerna/schemas/lerna-schema.json",
+	"version": "0.0.29",
+	"useNx": true
+}
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -23,14 +23,7 @@
 			"types": "./dist/index.d.ts"
 		}
 	},
-	"keywords": [
-		"bunicorn",
-		"client",
-		"fast",
-		"edge",
-		"bun",
-		"node"
-	],
+	"keywords": ["bunicorn", "client", "fast", "edge", "bun", "node"],
 	"devDependencies": {
 		"@bunicorn/server": "workspace:*"
 	},

diff --git a/packages/openapi/package.json b/packages/openapi/package.json
@@ -24,11 +24,7 @@
 			"types": "./dist/index.d.ts"
 		}
 	},
-	"keywords": [
-		"bunicorn",
-		"bun",
-		"openapi"
-	],
+	"keywords": ["bunicorn", "bun", "openapi"],
 	"homepage": "https://github.com/ragokan/bunicorn",
 	"author": "ragokan",
 	"license": "MIT",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -56,15 +56,7 @@
 			"types": "./dist/app/createNodeServer.d.ts"
 		}
 	},
-	"keywords": [
-		"bunicorn",
-		"server",
-		"fast",
-		"edge",
-		"bun",
-		"deno",
-		"node"
-	],
+	"keywords": ["bunicorn", "server", "fast", "edge", "bun", "deno", "node"],
 	"peerDependencies": {
 		"valibot": "^0.41.0",
 		"zod": "^3.23.8"

diff --git a/packages/server/src/app/createNodeServer.ts b/packages/server/src/app/createNodeServer.ts
@@ -1,6 +1,10 @@
 import type { IncomingMessage, ServerResponse } from "node:http";
+import { createServer } from "node:http";
 import type { Readable } from "node:stream";
-import type { BunicornApp } from "./index.ts";
+import { Router } from "../router/base.ts";
+import type { Route } from "../router/route.ts";
+import type { BasePath, BunicornResponse } from "../router/types.ts";
+import { BunicornApp } from "./index.ts";
 
 // Convert Node.js Readable to Web API ReadableStream
 function nodeReadableToWebReadableStream(
@@ -68,19 +72,30 @@ async function webToNodeResponse(
 	nodeResponse.end();
 }
 
-export default async function createNodeServer(
-	handleRequest: BunicornApp<any>["handleRequest"],
-) {
+export default function createNodeServer(app: BunicornApp<any>) {
+	// Wrapper for static routes
+	const router = new Router();
+	const routes: Route[] = [];
+	for (const [path, response] of Object.entries(app.staticRoutes)) {
+		const route = router.get(
+			path as BasePath,
+			() => response as BunicornResponse<any>,
+		);
+		routes.push(route);
+	}
+	app.addRoutes(routes);
+
 	// NodeJS HTTP Server
-	const { createServer } = await import("node:http");
 	const server = createServer(async (req, res) => {
 		// Call the handleRequest function
 		try {
 			const webRequest = nodeToWebRequest(req);
-			const webResponse = await handleRequest(webRequest);
+			const webResponse = await app.handleRequest(webRequest);
 			await webToNodeResponse(webResponse, res);
 		} catch (error) {
-			console.error("Error handling request:", error);
+			if (error instanceof Error) {
+				BunicornApp.onGlobalError(error);
+			}
 			res.statusCode = 500;
 			res.end("Internal Server Error");
 		}

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -23,12 +23,7 @@
 			"types": "./dist/index.d.ts"
 		}
 	},
-	"keywords": [
-		"bunicorn",
-		"bun",
-		"utils",
-		"utility"
-	],
+	"keywords": ["bunicorn", "bun", "utils", "utility"],
 	"homepage": "https://github.com/ragokan/bunicorn",
 	"author": "ragokan",
 	"license": "MIT",