refactor: minor

hi-ogawa · Oct 5, 2024 · 327753f · 327753f
1 parent 13d0a0f
commit 327753f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 26 deletions.
diff --git a/examples/child-process/src/lib/vite/runtime/bun.js b/examples/child-process/src/lib/vite/runtime/bun.js
@@ -37,12 +37,20 @@ async function main() {
    * @returns {Promise<Response>}
    */
   async function handler(request) {
-    const headers = request.headers;
-    // @ts-ignore
-    const meta = JSON.parse(headers.get("x-vite-meta"));
-    headers.delete("x-vite-meta");
-    const mod = await runner.import(meta.entry);
-    return mod.default(new Request(meta.url, { ...request, headers }));
+    try {
+      const headers = request.headers;
+      // @ts-ignore
+      const meta = JSON.parse(headers.get("x-vite-meta"));
+      headers.delete("x-vite-meta");
+      const mod = await runner.import(meta.entry);
+      return mod.default(new Request(meta.url, { ...request, headers }));
+    } catch (e) {
+      console.error(e);
+      const message =
+        "[bun runner error]\n" +
+        (e instanceof Error ? `${e.stack ?? e.message}` : "");
+      return new Response(message, { status: 500 });
+    }
   }
 
   const server = Bun.serve({ port: 0, fetch: handler });

diff --git a/examples/child-process/src/lib/vite/runtime/node.js b/examples/child-process/src/lib/vite/runtime/node.js
@@ -35,28 +35,31 @@ async function main() {
     new ESModulesEvaluator(),
   );
 
-  const listener = webToNodeHandler(async (request) => {
-    const headers = request.headers;
-    // @ts-ignore
-    const meta = JSON.parse(headers.get("x-vite-meta"));
-    headers.delete("x-vite-meta");
-    const mod = await runner.import(meta.entry);
-    return mod.default(new Request(meta.url, { ...request, headers }));
-  });
+  /**
+   * @param {Request} request
+   * @returns {Promise<Response>}
+   */
+  async function handler(request) {
+    try {
+      const headers = request.headers;
+      // @ts-ignore
+      const meta = JSON.parse(headers.get("x-vite-meta"));
+      headers.delete("x-vite-meta");
+      const mod = await runner.import(meta.entry);
+      return mod.default(new Request(meta.url, { ...request, headers }));
+    } catch (e) {
+      console.error(e);
+      const message =
+        "[node runner error]\n" +
+        (e instanceof Error ? `${e.stack ?? e.message}` : "");
+      return new Response(message, { status: 500 });
+    }
+  }
+
+  const listener = webToNodeHandler(handler);
 
   const server = http.createServer((req, res) => {
-    listener(req, res, (e) => {
-      if (e) {
-        console.error(e);
-        res.statusCode = 500;
-        res.end(
-          "[runner error]\n" +
-            (e instanceof Error ? `${e.stack ?? e.message}` : ""),
-        );
-      } else {
-        res.statusCode = 404;
-      }
-    });
+    listener(req, res, (e) => console.error(e));
   });
 
   server.listen(async () => {