srvx 0.9.7 → 0.9.8

package/README.md

@@ -60,6 +60,7 @@ $ bunx --bun srvx
 | `jsx`            | [examples/jsx](https://github.com/h3js/srvx/tree/main/examples/jsx/)                       | `npx giget gh:h3js/srvx/examples/jsx srvx-jsx`                       |
 | `node-handler`   | [examples/node-handler](https://github.com/h3js/srvx/tree/main/examples/node-handler/)     | `npx giget gh:h3js/srvx/examples/node-handler srvx-node-handler`     |
 | `service-worker` | [examples/service-worker](https://github.com/h3js/srvx/tree/main/examples/service-worker/) | `npx giget gh:h3js/srvx/examples/service-worker srvx-service-worker` |
+| `tracing`        | [examples/tracing](https://github.com/h3js/srvx/tree/main/examples/tracing/)               | `npx giget gh:h3js/srvx/examples/tracing srvx-tracing`               |
 | `websocket`      | [examples/websocket](https://github.com/h3js/srvx/tree/main/examples/websocket/)           | `npx giget gh:h3js/srvx/examples/websocket srvx-websocket`           |
 
 <!-- /automd -->

package/dist/_chunks/{_plugins-ZJvYKoy9.mjs → _plugins.mjs}

@@ -1,4 +1,4 @@
-import { i as gray, s as red } from "./_color-Kmne9cay.mjs";
+import { i as gray, s as red } from "./_color.mjs";
 
 //#region src/_middleware.ts
 function wrapFetch(server) {

package/dist/_chunks/{_url-COjYRiX5.mjs → _url.mjs}

@@ -1,4 +1,4 @@
-import { t as lazyInherit } from "./_inherit-D99WuBbX.mjs";
+import { t as lazyInherit } from "./_inherit.mjs";
 
 //#region src/_url.ts
 /**

package/dist/_chunks/{call-BLKVUMn3.mjs → call.mjs}

@@ -1,4 +1,4 @@
-import { t as lazyInherit } from "./_inherit-D99WuBbX.mjs";
+import { t as lazyInherit } from "./_inherit.mjs";
 
 //#region src/adapters/_node/response.ts
 /**

package/dist/_chunks/call2.mjs

@@ -0,0 +1,3 @@
+import { t as callNodeHandler } from "./call.mjs";
+
+export { callNodeHandler };

package/dist/adapters/bun.d.mts

@@ -1,5 +1,5 @@
-import { f as Server, h as ServerOptions, t as BunFetchHandler } from "../_chunks/types-CpzLEZLT.mjs";
-import { t as FastURL } from "../_chunks/_url-C-JHG430.mjs";
+import { f as Server, h as ServerOptions, t as BunFetchHandler } from "../_chunks/types.mjs";
+import { t as FastURL } from "../_chunks/_url.mjs";
 import * as bun from "bun";
 
 //#region src/adapters/bun.d.ts

package/dist/adapters/bun.mjs

@@ -1,8 +1,6 @@
-import "../_chunks/_color-Kmne9cay.mjs";
-import "../_chunks/_inherit-D99WuBbX.mjs";
-import { t as FastURL } from "../_chunks/_url-COjYRiX5.mjs";
-import { a as resolveTLSOptions, i as resolvePortAndHost, n as fmtURL, r as printListening, t as createWaitUntil } from "../_chunks/_utils-CIBojyNO.mjs";
-import { n as gracefulShutdownPlugin, r as wrapFetch } from "../_chunks/_plugins-ZJvYKoy9.mjs";
+import { t as FastURL } from "../_chunks/_url.mjs";
+import { a as resolveTLSOptions, i as resolvePortAndHost, n as fmtURL, r as printListening, t as createWaitUntil } from "../_chunks/_utils.mjs";
+import { n as gracefulShutdownPlugin, r as wrapFetch } from "../_chunks/_plugins.mjs";
 
 //#region src/adapters/bun.ts
 const FastResponse = Response;

package/dist/adapters/cloudflare.d.mts

@@ -1,4 +1,4 @@
-import { f as Server, h as ServerOptions } from "../_chunks/types-CpzLEZLT.mjs";
+import { f as Server, h as ServerOptions } from "../_chunks/types.mjs";
 import * as CF from "@cloudflare/workers-types";
 
 //#region src/adapters/cloudflare.d.ts

package/dist/adapters/cloudflare.mjs

@@ -1,5 +1,4 @@
-import "../_chunks/_color-Kmne9cay.mjs";
-import { r as wrapFetch, t as errorPlugin } from "../_chunks/_plugins-ZJvYKoy9.mjs";
+import { r as wrapFetch, t as errorPlugin } from "../_chunks/_plugins.mjs";
 
 //#region src/adapters/cloudflare.ts
 const FastURL = URL;

package/dist/adapters/deno.d.mts

@@ -1,5 +1,5 @@
-import { f as Server, h as ServerOptions, r as DenoFetchHandler } from "../_chunks/types-CpzLEZLT.mjs";
-import { t as FastURL } from "../_chunks/_url-C-JHG430.mjs";
+import { f as Server, h as ServerOptions, r as DenoFetchHandler } from "../_chunks/types.mjs";
+import { t as FastURL } from "../_chunks/_url.mjs";
 
 //#region src/adapters/deno.d.ts
 declare const FastResponse: typeof globalThis.Response;

package/dist/adapters/deno.mjs

@@ -1,8 +1,6 @@
-import "../_chunks/_color-Kmne9cay.mjs";
-import "../_chunks/_inherit-D99WuBbX.mjs";
-import { t as FastURL } from "../_chunks/_url-COjYRiX5.mjs";
-import { a as resolveTLSOptions, i as resolvePortAndHost, n as fmtURL, r as printListening, t as createWaitUntil } from "../_chunks/_utils-CIBojyNO.mjs";
-import { n as gracefulShutdownPlugin, r as wrapFetch } from "../_chunks/_plugins-ZJvYKoy9.mjs";
+import { t as FastURL } from "../_chunks/_url.mjs";
+import { a as resolveTLSOptions, i as resolvePortAndHost, n as fmtURL, r as printListening, t as createWaitUntil } from "../_chunks/_utils.mjs";
+import { n as gracefulShutdownPlugin, r as wrapFetch } from "../_chunks/_plugins.mjs";
 
 //#region src/adapters/deno.ts
 const FastResponse = Response;

package/dist/adapters/generic.d.mts

@@ -1,4 +1,4 @@
-import { f as Server, h as ServerOptions } from "../_chunks/types-CpzLEZLT.mjs";
+import { f as Server, h as ServerOptions } from "../_chunks/types.mjs";
 
 //#region src/adapters/generic.d.ts
 declare const FastURL: typeof globalThis.URL;

package/dist/adapters/generic.mjs

@@ -1,6 +1,5 @@
-import "../_chunks/_color-Kmne9cay.mjs";
-import { t as createWaitUntil } from "../_chunks/_utils-CIBojyNO.mjs";
-import { r as wrapFetch, t as errorPlugin } from "../_chunks/_plugins-ZJvYKoy9.mjs";
+import { t as createWaitUntil } from "../_chunks/_utils.mjs";
+import { r as wrapFetch, t as errorPlugin } from "../_chunks/_plugins.mjs";
 
 //#region src/adapters/generic.ts
 const FastURL = URL;

package/dist/adapters/node.d.mts

@@ -1,5 +1,5 @@
-import { _ as ServerRequest, d as NodeServerResponse, f as Server, h as ServerOptions, l as NodeHttpHandler, s as FetchHandler, u as NodeServerRequest } from "../_chunks/types-CpzLEZLT.mjs";
-import { t as FastURL } from "../_chunks/_url-C-JHG430.mjs";
+import { _ as ServerRequest, d as NodeServerResponse, f as Server, h as ServerOptions, l as NodeHttpHandler, s as FetchHandler, u as NodeServerRequest } from "../_chunks/types.mjs";
+import { t as FastURL } from "../_chunks/_url.mjs";
 import { Readable } from "node:stream";
 
 //#region src/adapters/_node/request.d.ts
@@ -67,4 +67,4 @@ declare function toFetchHandler(handler: NodeHttpHandler & AdapterMeta): FetchHa
 //#region src/adapters/node.d.ts
 declare function serve(options: ServerOptions): Server;
 //#endregion
-export { NodeResponse as FastResponse, NodeResponse, FastURL, NodeRequest, fetchNodeHandler, sendNodeResponse, serve, toFetchHandler, toNodeHandler };
+export { type AdapterMeta, NodeResponse as FastResponse, NodeResponse, FastURL, NodeRequest, fetchNodeHandler, sendNodeResponse, serve, toFetchHandler, toNodeHandler };

package/dist/adapters/node.mjs

@@ -1,9 +1,8 @@
-import "../_chunks/_color-Kmne9cay.mjs";
-import { t as lazyInherit } from "../_chunks/_inherit-D99WuBbX.mjs";
-import { t as FastURL } from "../_chunks/_url-COjYRiX5.mjs";
-import { a as resolveTLSOptions, i as resolvePortAndHost, n as fmtURL, r as printListening, t as createWaitUntil } from "../_chunks/_utils-CIBojyNO.mjs";
-import { n as gracefulShutdownPlugin, r as wrapFetch, t as errorPlugin } from "../_chunks/_plugins-ZJvYKoy9.mjs";
-import { n as NodeResponse, t as callNodeHandler } from "../_chunks/call-BLKVUMn3.mjs";
+import { t as lazyInherit } from "../_chunks/_inherit.mjs";
+import { t as FastURL } from "../_chunks/_url.mjs";
+import { a as resolveTLSOptions, i as resolvePortAndHost, n as fmtURL, r as printListening, t as createWaitUntil } from "../_chunks/_utils.mjs";
+import { n as gracefulShutdownPlugin, r as wrapFetch, t as errorPlugin } from "../_chunks/_plugins.mjs";
+import { n as NodeResponse, t as callNodeHandler } from "../_chunks/call.mjs";
 import nodeHTTP, { IncomingMessage, ServerResponse } from "node:http";
 import { Duplex, Readable } from "node:stream";
 import nodeHTTPS from "node:https";
@@ -221,12 +220,18 @@ const NodeRequest = /* @__PURE__ */ (() => {
 		get _abortController() {
 			if (!this.#abortController) {
 				this.#abortController = new AbortController();
-				const req = this.#req;
-				const abort = (err) => {
-					this.#abortController?.abort?.(err);
-				};
+				const { req, res } = this.runtime.node;
+				const abortController = this.#abortController;
+				const abort = (err) => abortController.abort?.(err);
 				req.once("error", abort);
-				req.once("end", abort);
+				if (res) res.once("close", () => {
+					const reqError = req.errored;
+					if (reqError) abort(reqError);
+					else if (!res.writableEnded) abort();
+				});
+				else req.once("close", () => {
+					if (!req.complete) abort();
+				});
 			}
 			return this.#abortController;
 		}

package/dist/adapters/service-worker.d.mts

@@ -1,4 +1,4 @@
-import { _ as ServerRequest, f as Server, h as ServerOptions } from "../_chunks/types-CpzLEZLT.mjs";
+import { _ as ServerRequest, f as Server, h as ServerOptions } from "../_chunks/types.mjs";
 
 //#region src/adapters/service-worker.d.ts
 declare const FastURL: typeof globalThis.URL;

package/dist/adapters/service-worker.mjs

@@ -1,5 +1,4 @@
-import "../_chunks/_color-Kmne9cay.mjs";
-import { r as wrapFetch, t as errorPlugin } from "../_chunks/_plugins-ZJvYKoy9.mjs";
+import { r as wrapFetch, t as errorPlugin } from "../_chunks/_plugins.mjs";
 
 //#region src/adapters/service-worker.ts
 const FastURL = URL;

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { a as green, c as url, i as gray, l as yellow, n as bold, o as magenta, r as cyan, s as red } from "./_chunks/_color-Kmne9cay.mjs";
+import { a as green, c as url, i as gray, l as yellow, n as bold, o as magenta, r as cyan, s as red } from "./_chunks/_color.mjs";
 import { parseArgs } from "node:util";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import * as nodeHTTP$1 from "node:http";
@@ -135,7 +135,7 @@ async function loadEntry(opts) {
 			const nodeHandler = listenHandler || (typeof mod.default === "function" ? mod.default : void 0);
 			if (nodeHandler) {
 				_legacyNode = true;
-				const { callNodeHandler } = await import("./_chunks/call-BlEaeO5P.mjs");
+				const { callNodeHandler } = await import("./_chunks/call2.mjs");
 				fetchHandler = (webReq) => callNodeHandler(nodeHandler, webReq);
 			}
 		}

package/dist/log.d.mts

@@ -1,4 +1,4 @@
-import { m as ServerMiddleware } from "./_chunks/types-CpzLEZLT.mjs";
+import { m as ServerMiddleware } from "./_chunks/types.mjs";
 
 //#region src/log.d.ts
 interface LogOptions {}

package/dist/log.mjs

@@ -1,4 +1,4 @@
-import { a as green, i as gray, l as yellow, n as bold, s as red, t as blue } from "./_chunks/_color-Kmne9cay.mjs";
+import { a as green, i as gray, l as yellow, n as bold, s as red, t as blue } from "./_chunks/_color.mjs";
 
 //#region src/log.ts
 const statusColors = {

package/dist/static.d.mts

@@ -1,4 +1,4 @@
-import { m as ServerMiddleware } from "./_chunks/types-CpzLEZLT.mjs";
+import { m as ServerMiddleware } from "./_chunks/types.mjs";
 
 //#region src/static.d.ts
 interface ServeStaticOptions {

package/dist/static.mjs

@@ -1,5 +1,4 @@
-import "./_chunks/_inherit-D99WuBbX.mjs";
-import { t as FastURL } from "./_chunks/_url-COjYRiX5.mjs";
+import { t as FastURL } from "./_chunks/_url.mjs";
 import { extname, join, resolve } from "node:path";
 import { createReadStream } from "node:fs";
 import { readFile, stat } from "node:fs/promises";

package/dist/tracing.d.mts

@@ -0,0 +1,42 @@
+import { _ as ServerRequest, f as Server, g as ServerPlugin, m as ServerMiddleware } from "./_chunks/types.mjs";
+
+//#region src/tracing.d.ts
+
+/**
+* @experimental Channel names, event types and config options may change in future releases.
+*/
+type RequestEvent = {
+  server: Server;
+  request: ServerRequest;
+  middleware?: {
+    index: number;
+    handler: ServerMiddleware;
+  };
+};
+/**
+*
+* @experimental Channel names, event types and config options may change in future releases.
+*
+* Tracing plugin that adds diagnostics channel tracing to middleware and fetch handlers.
+*
+* This plugin wraps all middleware and the fetch handler with tracing instrumentation,
+* allowing you to subscribe to `srvx.fetch` and `srvx.middleware` tracing channels.
+*
+* @example
+* ```ts
+* import { serve } from "srvx";
+* import { tracingPlugin } from "srvx/tracing";
+*
+* const server = serve({
+*   fetch: (req) => new Response("OK"),
+*   middleware: [myMiddleware],
+*   plugins: [tracingPlugin()],
+* });
+* ```
+*/
+declare function tracingPlugin(opts?: {
+  middleware?: boolean;
+  fetch?: boolean;
+}): ServerPlugin;
+//#endregion
+export { RequestEvent, tracingPlugin };

package/dist/tracing.mjs

@@ -0,0 +1,58 @@
+//#region src/tracing.ts
+/**
+*
+* @experimental Channel names, event types and config options may change in future releases.
+*
+* Tracing plugin that adds diagnostics channel tracing to middleware and fetch handlers.
+*
+* This plugin wraps all middleware and the fetch handler with tracing instrumentation,
+* allowing you to subscribe to `srvx.fetch` and `srvx.middleware` tracing channels.
+*
+* @example
+* ```ts
+* import { serve } from "srvx";
+* import { tracingPlugin } from "srvx/tracing";
+*
+* const server = serve({
+*   fetch: (req) => new Response("OK"),
+*   middleware: [myMiddleware],
+*   plugins: [tracingPlugin()],
+* });
+* ```
+*/
+function tracingPlugin(opts = {}) {
+	return (server) => {
+		const { tracingChannel } = globalThis.process?.getBuiltinModule?.("node:diagnostics_channel") || {};
+		if (!tracingChannel) return;
+		if (opts.fetch !== false) {
+			const fetchChannel = tracingChannel("srvx.fetch");
+			const originalFetch = server.options.fetch;
+			server.options.fetch = (request) => {
+				return fetchChannel.tracePromise(async () => await originalFetch(request), {
+					request,
+					server
+				});
+			};
+		}
+		if (opts.middleware !== false) {
+			const middlewareChannel = tracingChannel("srvx.middleware");
+			const wrappedMiddleware = server.options.middleware.map((handler, index) => {
+				const middleware = Object.freeze({
+					index,
+					handler
+				});
+				return (request, next) => {
+					return middlewareChannel.tracePromise(async () => await handler(request, next), {
+						request,
+						server,
+						middleware
+					});
+				};
+			});
+			server.options.middleware.splice(0, server.options.middleware.length, ...wrappedMiddleware);
+		}
+	};
+}
+
+//#endregion
+export { tracingPlugin };

package/dist/types.d.mts

@@ -1,2 +1,2 @@
-import { _ as ServerRequest, a as FastResponse, b as serve, c as NodeHTTPMiddleware, d as NodeServerResponse, f as Server, g as ServerPlugin, h as ServerOptions, i as ErrorHandler, l as NodeHttpHandler, m as ServerMiddleware, n as CloudflareFetchHandler, o as FastURL, p as ServerHandler, r as DenoFetchHandler, s as FetchHandler, t as BunFetchHandler, u as NodeServerRequest, v as ServerRequestContext, y as ServerRuntimeContext } from "./_chunks/types-CpzLEZLT.mjs";
+import { _ as ServerRequest, a as FastResponse, b as serve, c as NodeHTTPMiddleware, d as NodeServerResponse, f as Server, g as ServerPlugin, h as ServerOptions, i as ErrorHandler, l as NodeHttpHandler, m as ServerMiddleware, n as CloudflareFetchHandler, o as FastURL, p as ServerHandler, r as DenoFetchHandler, s as FetchHandler, t as BunFetchHandler, u as NodeServerRequest, v as ServerRequestContext, y as ServerRuntimeContext } from "./_chunks/types.mjs";
 export { BunFetchHandler, CloudflareFetchHandler, DenoFetchHandler, ErrorHandler, FastResponse, FastURL, FetchHandler, NodeHTTPMiddleware, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerHandler, ServerMiddleware, ServerOptions, ServerPlugin, ServerRequest, ServerRequestContext, ServerRuntimeContext, serve };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "homepage": "https://srvx.h3.dev",
   "repository": "h3js/srvx",
@@ -17,6 +17,7 @@
     "./cli": "./dist/cli.mjs",
     "./static": "./dist/static.mjs",
     "./log": "./dist/log.mjs",
+    "./tracing": "./dist/tracing.mjs",
     ".": {
       "types": "./dist/types.d.mts",
       "deno": "./dist/adapters/deno.mjs",
@@ -58,38 +59,38 @@
     "srvx": "link:."
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20251128.0",
-    "@hono/node-server": "^1.19.6",
+    "@cloudflare/workers-types": "^4.20251210.0",
+    "@hono/node-server": "^1.19.7",
     "@mitata/counters": "^0.0.8",
     "@mjackson/node-fetch-server": "^0.7.0",
-    "@types/bun": "^1.3.3",
+    "@types/bun": "^1.3.4",
     "@types/deno": "^2.5.0",
-    "@types/express": "^5.0.5",
-    "@types/node": "^24.10.1",
+    "@types/express": "^5.0.6",
+    "@types/node": "^25.0.0",
     "@types/node-forge": "^1.3.14",
-    "@types/serviceworker": "^0.0.167",
-    "@vitest/coverage-v8": "^4.0.14",
+    "@types/serviceworker": "^0.0.168",
+    "@vitest/coverage-v8": "^4.0.15",
     "@whatwg-node/server": "^0.10.17",
     "automd": "^0.4.2",
     "changelogen": "^0.6.2",
     "eslint": "^9.39.1",
     "eslint-config-unjs": "^0.5.0",
-    "execa": "^9.6.0",
-    "express": "^5.1.0",
+    "execa": "^9.6.1",
+    "express": "^5.2.1",
     "fastify": "^5.6.2",
     "get-port-please": "^3.2.0",
     "mdbox": "^0.1.1",
     "mitata": "^1.0.34",
-    "node-forge": "^1.3.2",
-    "obuild": "^0.4.3",
-    "prettier": "^3.7.1",
-    "srvx-release": "npm:srvx@^0.9.6",
+    "node-forge": "^1.3.3",
+    "obuild": "^0.4.7",
+    "prettier": "^3.7.4",
+    "srvx-release": "npm:srvx@^0.9.7",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
     "undici": "^7.16.0",
-    "vitest": "4.0.9"
+    "vitest": "^4.0.15"
   },
-  "packageManager": "pnpm@10.24.0",
+  "packageManager": "pnpm@10.25.0",
   "engines": {
     "node": ">=20.16.0"
   }

package/dist/_chunks/call-BlEaeO5P.mjs

@@ -1,4 +0,0 @@
-import "./_inherit-D99WuBbX.mjs";
-import { t as callNodeHandler } from "./call-BLKVUMn3.mjs";
-
-export { callNodeHandler };