feat!: migrate to h3 v2

Author: pi0

package.json

@@ -76,7 +76,7 @@
     "fs-extra": "^11.3.0",
     "globby": "^14.1.0",
     "gzip-size": "^7.0.0",
-    "h3": "^1.15.1",
+    "h3": "npm:[email protected]",
     "hookable": "^5.5.3",
     "httpxy": "^0.1.7",
     "ioredis": "^5.6.0",
@@ -88,7 +88,6 @@
     "magicast": "^0.3.5",
     "mime": "^4.0.6",
     "mlly": "^1.7.4",
-    "node-mock-http": "^1.0.0",
     "ofetch": "^1.4.1",
     "ohash": "^2.0.11",
     "openapi-typescript": "^7.6.1",
@@ -104,6 +103,7 @@
     "serve-placeholder": "^2.0.2",
     "serve-static": "^1.16.2",
     "source-map": "^0.7.4",
+    "srvx": "^0.2.5",
     "std-env": "^3.8.1",
     "ufo": "^1.5.4",
     "ultrahtml": "^1.5.3",

pnpm-lock.yaml

@@ -4,7 +4,7 @@ import { globby } from "globby";
 import { resolve } from "pathe";
 
 const nightlyPackages = {
-  h3: "h3-nightly",
+  // h3: "h3-nightly",
 } as Record<string, string>;
 
 async function loadPackage(dir: string) {

scripts/bump-nightly.ts

@@ -96,7 +96,7 @@ function getNitroImportsPreset(): Preset[] {
     },
     {
       from: "nitro/runtime/internal/context",
-      imports: ["useEvent"],
+      imports: ["useRequest"],
     },
     {
       from: "nitro/runtime/internal/task",

src/core/config/resolvers/imports.ts

@@ -1,12 +1,12 @@
 import type { TLSSocket } from "node:tls";
 import type { ProxyServerOptions, ProxyServer } from "httpxy";
 import type { H3Event } from "h3";
-
 import { createProxyServer } from "httpxy";
+import { fromNodeHandler } from "h3";
 
 export type HTTPProxy = {
   proxy: ProxyServer;
-  handleEvent: (event: H3Event, opts?: ProxyServerOptions) => Promise<void>;
+  handleEvent: (event: H3Event, opts?: ProxyServerOptions) => any;
 };
 
 export function createHTTPProxy(defaults: ProxyServerOptions = {}): HTTPProxy {
@@ -31,19 +31,11 @@ export function createHTTPProxy(defaults: ProxyServerOptions = {}): HTTPProxy {
     }
   });
 
-  const handleEvent = async (event: H3Event, opts: ProxyServerOptions = {}) => {
-    try {
-      event._handled = true;
-      await proxy.web(event.node.req, event.node.res, opts);
-    } catch (error: any) {
-      if (error?.code !== "ECONNRESET") {
-        throw error;
-      }
-    }
-  };
-
   return {
     proxy,
-    handleEvent,
+    handleEvent(event, opts) {
+      const handler = fromNodeHandler((req, res) => proxy.web(req, res, opts));
+      return handler(event);
+    },
   };
 }

src/core/dev-server/proxy.ts

@@ -2,17 +2,12 @@ import type { IncomingMessage, OutgoingMessage } from "node:http";
 import type { Duplex } from "node:stream";
 import type { GetPortInput } from "get-port-please";
 import type { FSWatcher } from "chokidar";
-import type { App } from "h3";
+import type { H3 } from "h3";
 import type { Listener, ListenOptions } from "listhen";
 import { NodeDevWorker, type DevWorker, type WorkerAddress } from "./worker";
 import type { Nitro, NitroBuildInfo, NitroDevServer } from "nitro/types";
-import {
-  createApp,
-  createError,
-  eventHandler,
-  fromNodeMiddleware,
-  toNodeListener,
-} from "h3";
+import { createH3, createError, eventHandler, fromNodeHandler } from "h3";
+import { toNodeHandler } from "srvx/node";
 import {
   default as devErrorHandler,
   defaultHandler as devErrorHandlerInternal,
@@ -53,7 +48,7 @@ let workerIdCtr = 0;
 class DevServer {
   nitro: Nitro;
   workerDir: string;
-  app: App;
+  app: H3;
   listeners: Listener[] = [];
   reloadPromise?: Promise<void>;
   watcher?: FSWatcher;
@@ -106,7 +101,10 @@ class DevServer {
   }
 
   async listen(port: GetPortInput, opts?: Partial<ListenOptions>) {
-    const listener = await listhen(toNodeListener(this.app), { port, ...opts });
+    const listener = await listhen(toNodeHandler(this.app.fetch), {
+      port,
+      ...opts,
+    });
     this.listeners.push(listener);
     listener.server.on("upgrade", (req, sock, head) =>
       this.handleUpgrade(req, sock, head)
@@ -193,7 +191,8 @@ class DevServer {
 
   createApp() {
     // Init h3 app
-    const app = createApp({
+    const app = createH3({
+      debug: true,
       onError: async (error, event) => {
         const errorHandler =
           this.nitro.options.devErrorHandler || devErrorHandler;
@@ -210,17 +209,18 @@ class DevServer {
     }
 
     // Debugging endpoint to view vfs
-    app.use("/_vfs", createVFSHandler(this.nitro));
+    app.get("/_vfs", createVFSHandler(this.nitro));
 
     // Serve asset dirs
     for (const asset of this.nitro.options.publicAssets) {
       const url = joinURL(
         this.nitro.options.runtimeConfig.app.baseURL,
-        asset.baseURL || "/"
+        asset.baseURL || "/",
+        "**"
       );
-      app.use(url, fromNodeMiddleware(serveStatic(asset.dir)));
+      app.use(url, fromNodeHandler(serveStatic(asset.dir)));
       if (!asset.fallthrough) {
-        app.use(url, fromNodeMiddleware(servePlaceholder()));
+        app.use(url, fromNodeHandler(servePlaceholder()));
       }
     }
 

src/core/dev-server/server.ts

@@ -1,4 +1,4 @@
-import { createError, eventHandler, getRequestHeader, getRequestIP } from "h3";
+import { createError, eventHandler, getRequestIP } from "h3";
 import type { Nitro } from "nitro/types";
 
 export function createVFSHandler(nitro: Nitro) {
@@ -20,7 +20,7 @@ export function createVFSHandler(nitro: Nitro) {
     const url = event.path || "";
     const isJson =
       url.endsWith(".json") ||
-      getRequestHeader(event, "accept")?.includes("application/json");
+      event.headers.get("accept")?.includes("application/json");
     const id = decodeURIComponent(url.replace(/^(\.json)?\/?/, "") || "");
 
     if (id && !(id in vfsEntries)) {

src/core/dev-server/vfs.ts

@@ -1,13 +1,3 @@
-import type { AppOptions, H3Event } from "h3";
-import type {
-  CaptureError,
-  NitroConfig,
-  NitroOpenAPIConfig,
-  NitroRouteConfig,
-  RenderResponse,
-  RenderContext,
-} from "nitro/types";
-
 // Core
 export { createNitro } from "./nitro";
 

src/core/index.ts

@@ -52,9 +52,6 @@ export async function createNitro(
     createDebugger(nitro.hooks, { tag: "nitro" });
     nitro.options.plugins.push(join(runtimeDir, "internal/debug"));
   }
-  if (nitro.options.timing) {
-    nitro.options.plugins.push(join(runtimeDir, "internal/timing"));
-  }
 
   // Logger
   if (nitro.options.logLevel !== undefined) {

src/core/nitro.ts

@@ -9,14 +9,9 @@ import { Server } from "node:http";
 import { join } from "node:path";
 import nodeCrypto from "node:crypto";
 import { parentPort, threadId } from "node:worker_threads";
+import { defineEventHandler, getRouterParam } from "h3";
 import wsAdapter from "crossws/adapters/node";
-import {
-  defineEventHandler,
-  getQuery,
-  getRouterParam,
-  readBody,
-  toNodeListener,
-} from "h3";
+import { toNodeHandler } from "srvx/node";
 
 // globalThis.crypto support for Node.js 18
 if (!globalThis.crypto) {
@@ -37,7 +32,7 @@ parentPort?.on("message", (msg) => {
 
 const nitroApp = useNitroApp();
 
-const server = new Server(toNodeListener(nitroApp.h3App));
+const server = new Server(toNodeHandler(nitroApp.h3App.fetch));
 let listener: Server | undefined;
 
 listen()
@@ -55,7 +50,7 @@ if (import.meta._websocket) {
 }
 
 // Register tasks handlers
-nitroApp.router.get(
+nitroApp.h3App.get(
   "/_nitro/tasks",
   defineEventHandler(async (event) => {
     const _tasks = await Promise.all(
@@ -70,15 +65,19 @@ nitroApp.router.get(
     };
   })
 );
-nitroApp.router.use(
+
+nitroApp.h3App.use(
   "/_nitro/tasks/:name",
   defineEventHandler(async (event) => {
     const name = getRouterParam(event, "name") as string;
+    const body = (await event.request.json().catch(() => ({}))) as Record<
+      string,
+      unknown
+    >;
+    const query = Object.entries(event.query);
     const payload = {
-      ...getQuery(event),
-      ...(await readBody(event)
-        .then((r) => r?.payload)
-        .catch(() => ({}))),
+      ...query,
+      ...body,
     };
     return await runTask(name, { payload });
   })

src/presets/_nitro/runtime/nitro-dev.ts

@@ -2,11 +2,11 @@ import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
 
 import { Server } from "node:http";
-import { toNodeListener } from "h3";
+import { toNodeHandler } from "srvx/node";
 
 const nitroApp = useNitroApp();
 
-const server = new Server(toNodeListener(nitroApp.h3App));
+const server = new Server(toNodeHandler(nitroApp.h3App.fetch));
 
 // @ts-ignore
 server.listen(3000, (err) => {

src/presets/aws-amplify/runtime/aws-amplify.ts

@@ -2,7 +2,7 @@ import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
 
 import { onRequest } from "firebase-functions/v2/https";
-import { toNodeListener } from "h3";
+import { toNodeHandler } from "srvx/node";
 
 const nitroApp = useNitroApp();
 
@@ -15,5 +15,5 @@ export const __firebaseServerFunctionName__ = onRequest(
     invoker: "public",
     ...firebaseConfig.httpsOptions,
   },
-  toNodeListener(nitroApp.h3App)
+  toNodeHandler(nitroApp.h3App.fetch)
 );