@rhythmjs/router 0.0.9 → 0.0.11

package/dist/rhythm-router.js

@@ -1,90 +1,92 @@
-import { createNode, insertRoute, joinPath, lookupRoute } from "./radix-tree.js";
+// @bun
+// src/rhythm-router.ts
 import { compose } from "@rhythmjs/rhythm/compose";
-//#region src/rhythm-router.ts
-var RhythmRouter = class {
-	#options;
-	#entries = [];
-	constructor(options = {}) {
-		this.#options = options;
-	}
-	get #prefix() {
-		return this.#options.prefix ?? "";
-	}
-	get entries() {
-		return [...this.#entries];
-	}
-	use(fn) {
-		if (typeof fn !== "function") throw new TypeError("middleware must be a function!");
-		this.#entries.push({
-			kind: "middleware",
-			fn
-		});
-		return this;
-	}
-	#route(method, path, handlers) {
-		this.#entries.push({
-			kind: "route",
-			method,
-			path: joinPath(this.#prefix, path),
-			handlers
-		});
-		return this;
-	}
-	get(path, ...handlers) {
-		return this.#route("GET", path, handlers);
-	}
-	post(path, ...handlers) {
-		return this.#route("POST", path, handlers);
-	}
-	put(path, ...handlers) {
-		return this.#route("PUT", path, handlers);
-	}
-	patch(path, ...handlers) {
-		return this.#route("PATCH", path, handlers);
-	}
-	delete(path, ...handlers) {
-		return this.#route("DELETE", path, handlers);
-	}
-	#compile() {
-		const dispatchFor = (tree) => {
-			return async (ctx, next) => {
-				const match = lookupRoute(tree, ctx.request.method, new URL(ctx.request.url).pathname);
-				if (!match) {
-					await next();
-					return;
-				}
-				await match.payload({
-					...ctx,
-					params: match.params
-				}, next);
-			};
-		};
-		const stack = [];
-		let i = 0;
-		while (i < this.#entries.length) {
-			const entry = this.#entries[i];
-			if (entry.kind === "middleware") {
-				stack.push(entry.fn);
-				i++;
-				continue;
-			}
-			const tree = createNode();
-			while (i < this.#entries.length) {
-				const route = this.#entries[i];
-				if (route.kind !== "route") break;
-				insertRoute(tree, route.method, route.path, compose(route.handlers));
-				i++;
-			}
-			stack.push(dispatchFor(tree));
-		}
-		return compose(stack);
-	}
-	middleware() {
-		const fn = this.#compile();
-		return async (ctx, next) => {
-			await fn(ctx, next);
-		};
-	}
+import { addRoute, createRouter, findRoute } from "rou3";
+function joinPath(prefix, path) {
+  if (!prefix)
+    return path;
+  const trimmedPrefix = prefix.endsWith("/") ? prefix.slice(0, -1) : prefix;
+  const normalizedPath = path.startsWith("/") ? path : `/${path}`;
+  return `${trimmedPrefix}${normalizedPath}`;
+}
+
+class RhythmRouter {
+  #options;
+  #entries = [];
+  constructor(options = {}) {
+    this.#options = options;
+  }
+  get #prefix() {
+    return this.#options.prefix ?? "";
+  }
+  get entries() {
+    return [...this.#entries];
+  }
+  use(fn) {
+    if (typeof fn !== "function")
+      throw new TypeError("middleware must be a function!");
+    this.#entries.push({ kind: "middleware", fn });
+    return this;
+  }
+  #route(method, path, handlers) {
+    this.#entries.push({ kind: "route", method, path: joinPath(this.#prefix, path), handlers });
+    return this;
+  }
+  get(path, ...handlers) {
+    return this.#route("GET", path, handlers);
+  }
+  post(path, ...handlers) {
+    return this.#route("POST", path, handlers);
+  }
+  put(path, ...handlers) {
+    return this.#route("PUT", path, handlers);
+  }
+  patch(path, ...handlers) {
+    return this.#route("PATCH", path, handlers);
+  }
+  delete(path, ...handlers) {
+    return this.#route("DELETE", path, handlers);
+  }
+  #compile() {
+    const dispatchFor = (tree) => {
+      return async (ctx, next) => {
+        const match = findRoute(tree, ctx.request.method, new URL(ctx.request.url).pathname);
+        if (!match) {
+          await next();
+          return;
+        }
+        await match.data({ ...ctx, params: match.params ?? {} }, next);
+      };
+    };
+    const stack = [];
+    let i = 0;
+    while (i < this.#entries.length) {
+      const entry = this.#entries[i];
+      if (entry.kind === "middleware") {
+        stack.push(entry.fn);
+        i++;
+        continue;
+      }
+      const tree = createRouter();
+      while (i < this.#entries.length) {
+        const route = this.#entries[i];
+        if (route.kind !== "route")
+          break;
+        addRoute(tree, route.method, route.path, compose(route.handlers));
+        i++;
+      }
+      stack.push(dispatchFor(tree));
+    }
+    return compose(stack);
+  }
+  middleware() {
+    const fn = this.#compile();
+    return async (ctx, next) => {
+      await fn(ctx, next);
+    };
+  }
+}
+export {
+  RhythmRouter,
+  joinPath
 };
-//#endregion
-export { RhythmRouter };

package/dist/serve.d.ts

@@ -1,9 +1,31 @@
-import { t as RhythmHttpContext } from "./context-ChHlG-q0.js";
-import { ErrorHandler, Server, ServerMiddleware, ServerOptions, ServerPlugin } from "srvx";
-import { Rhythm } from "@rhythmjs/rhythm";
-//#region src/serve.d.ts
-export type RhythmServeOptions = Omit<ServerOptions, "fetch">;
+import type { Rhythm } from "@rhythmjs/rhythm";
+import type { RhythmHttpContext } from "./context";
+import { type StaticMiddlewareOptions } from "./static";
+export type { StaticMiddlewareOptions };
+export type Server = Bun.Server<unknown>;
+export type ErrorHandler = (error: unknown) => Response | Promise<Response>;
+export type ServeMiddleware = (request: Request, next: () => Promise<Response>) => Response | Promise<Response>;
+export type UpgradeHandler = (request: Request, server: Server) => Response | undefined | null | Promise<Response | undefined> | null;
+export interface RhythmServeOptions {
+    port?: number;
+    hostname?: string;
+    unix?: string;
+    reusePort?: boolean;
+    idleTimeout?: number;
+    development?: boolean;
+    maxRequestBodySize?: number;
+    tls?: Bun.TLSOptions;
+    error?: ErrorHandler;
+    middleware?: ServeMiddleware[];
+    static?: StaticMiddlewareOptions | StaticMiddlewareOptions[];
+    /** Bun websocket behavior; pair with `upgrade` to accept connections. */
+    websocket?: Bun.WebSocketHandler<never>;
+    /**
+     * Called for websocket upgrade requests — `RhythmWs.upgrade` fits directly.
+     * A Response rejects, undefined means `server.upgrade()` succeeded, and
+     * null falls through to the HTTP app.
+     */
+    upgrade?: UpgradeHandler;
+}
 export declare const errorToResponse: ErrorHandler;
 export declare function serve<TContext extends RhythmHttpContext, TProviders extends object = {}>(app: Rhythm<RhythmHttpContext, TContext, TProviders>, options?: RhythmServeOptions): Server;
-//#endregion
-export type { ErrorHandler, Server, ServerMiddleware, ServerPlugin };

package/dist/serve.js

@@ -1,21 +1,67 @@
-import { toFetchHandler } from "./fetch.js";
-import { serve as serve$1 } from "srvx";
-//#region src/serve.ts
-const errorToResponse = (error) => {
-	const status = error.status ?? error.statusCode ?? 500;
-	const message = status >= 500 ? "Internal Server Error" : error instanceof Error ? error.message : String(error);
-	if (status >= 500) console.error(error);
-	return new Response(message, {
-		status,
-		headers: { "content-type": "text/plain; charset=utf-8" }
-	});
+// @bun
+import"./rhythm-router-yj4ffyyg.js";
+import {
+  toFetchHandler2
+} from "./rhythm-router-88dtq5mx.js";
+import {
+  staticMiddleware2
+} from "./rhythm-router-n08cmxbj.js";
+
+// src/serve.ts
+var errorToResponse = (error) => {
+  const status = error.status ?? error.statusCode ?? 500;
+  const message = status >= 500 ? "Internal Server Error" : error instanceof Error ? error.message : String(error);
+  if (status >= 500)
+    console.error(error);
+  return new Response(message, {
+    status,
+    headers: { "content-type": "text/plain; charset=utf-8" }
+  });
 };
 function serve(app, options = {}) {
-	return serve$1({
-		error: errorToResponse,
-		...options,
-		fetch: toFetchHandler(app)
-	});
+  const {
+    static: staticOptions,
+    middleware = [],
+    error = errorToResponse,
+    websocket,
+    upgrade,
+    ...bunOptions
+  } = options;
+  const assets = staticOptions === undefined ? [] : [staticOptions].flat().map(staticMiddleware2);
+  const chain = [...middleware, ...assets];
+  const handler = toFetchHandler2(app);
+  const dispatch = (request) => {
+    let index = -1;
+    const next = async (step) => {
+      if (step <= index)
+        throw new Error("next() called multiple times");
+      index = step;
+      return step < chain.length ? chain[step](request, () => next(step + 1)) : handler(request);
+    };
+    return next(0);
+  };
+  return Bun.serve({
+    ...bunOptions,
+    ...websocket === undefined ? {} : { websocket },
+    async fetch(request, server) {
+      try {
+        Object.defineProperty(request, "ip", {
+          configurable: true,
+          get: () => server.requestIP(request)?.address
+        });
+        if (upgrade !== undefined && request.headers.get("upgrade")?.toLowerCase() === "websocket") {
+          const result = await upgrade(request, server);
+          if (result !== null)
+            return result;
+        }
+        return await dispatch(request);
+      } catch (thrown) {
+        return error(thrown);
+      }
+    }
+  });
 }
-//#endregion
-export { errorToResponse, serve };
+export {
+  errorToResponse,
+  serve
+};

package/dist/static.d.ts

@@ -0,0 +1,10 @@
+import type { ServeMiddleware } from "./serve";
+export interface StaticMiddlewareOptions {
+    dir: string;
+    prefix?: string;
+    index?: string;
+    maxAge?: number;
+    immutable?: boolean;
+    etag?: boolean;
+}
+export declare function staticMiddleware(options: StaticMiddlewareOptions): ServeMiddleware;

package/dist/static.js

@@ -0,0 +1,7 @@
+// @bun
+import {
+  staticMiddleware2
+} from "./rhythm-router-n08cmxbj.js";
+export {
+  staticMiddleware2 as staticMiddleware
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rhythmjs/router",
-  "version": "0.0.9",
-  "description": "Radix-tree HTTP router for the Rhythm middleware kernel, with Bun, Node, and Deno adapters.",
+  "version": "0.0.11",
+  "description": "Bun-native HTTP router for the Rhythm middleware kernel, matching with rou3 and serving with Bun.serve.",
   "homepage": "https://rhythm.js.org/router",
   "license": "ISC",
   "repository": {
@@ -19,10 +19,6 @@
       "types": "./dist/rhythm-router.d.ts",
       "default": "./dist/rhythm-router.js"
     },
-    "./radix-tree": {
-      "types": "./dist/radix-tree.d.ts",
-      "default": "./dist/radix-tree.js"
-    },
     "./context": {
       "types": "./dist/context.d.ts",
       "default": "./dist/context.js"
@@ -35,37 +31,9 @@
       "types": "./dist/serve.d.ts",
       "default": "./dist/serve.js"
     },
-    "./adapters/node": {
-      "types": "./dist/adapters/node.d.ts",
-      "default": "./dist/adapters/node.js"
-    },
-    "./adapters/bun": {
-      "types": "./dist/adapters/bun.d.ts",
-      "default": "./dist/adapters/bun.js"
-    },
-    "./adapters/deno": {
-      "types": "./dist/adapters/deno.d.ts",
-      "default": "./dist/adapters/deno.js"
-    },
-    "./adapters/vercel": {
-      "types": "./dist/adapters/vercel.d.ts",
-      "default": "./dist/adapters/vercel.js"
-    },
-    "./adapters/netlify": {
-      "types": "./dist/adapters/netlify.d.ts",
-      "default": "./dist/adapters/netlify.js"
-    },
-    "./adapters/cloudflare": {
-      "types": "./dist/adapters/cloudflare.d.ts",
-      "default": "./dist/adapters/cloudflare.js"
-    },
-    "./adapters/aws-lambda": {
-      "types": "./dist/adapters/aws-lambda.d.ts",
-      "default": "./dist/adapters/aws-lambda.js"
-    },
-    "./adapters/service-worker": {
-      "types": "./dist/adapters/service-worker.d.ts",
-      "default": "./dist/adapters/service-worker.js"
+    "./static": {
+      "types": "./dist/static.d.ts",
+      "default": "./dist/static.js"
     },
     "./adapters/context": {
       "types": "./dist/context.d.ts",
@@ -77,15 +45,20 @@
     "access": "public"
   },
   "dependencies": {
-    "srvx": "^1.0.5",
-    "@rhythmjs/rhythm": "0.0.9"
+    "rou3": "^0.11.0",
+    "@rhythmjs/rhythm": "0.0.11"
   },
   "devDependencies": {
+    "@types/bun": "^1.2.0",
     "@types/node": "^26.6.3",
-    "typescript": "^7.0.2",
-    "vite-plus": "^1.0.0"
+    "typescript": "^7.0.2"
   },
   "engines": {
-    "node": ">=20.19.0"
+    "bun": ">=1.2.0"
+  },
+  "scripts": {
+    "build": "bun build src/rhythm-router.ts src/context.ts src/fetch.ts src/serve.ts src/static.ts --outdir dist --root src --format esm --target bun --packages external --splitting && tsc -p tsconfig.build.json",
+    "typecheck": "tsc --noEmit",
+    "test": "bun test"
   }
 }

package/dist/adapters/aws-lambda.d.ts

@@ -1,8 +0,0 @@
-import { t as RhythmHttpContext } from "../context-ChHlG-q0.js";
-import { t as AdapterOptions } from "../base--TyruAfY.js";
-import { AWSLambdaHandler } from "srvx/aws-lambda";
-import { Rhythm } from "@rhythmjs/rhythm";
-//#region src/adapters/aws-lambda.d.ts
-export declare function handle<TContext extends RhythmHttpContext, TProviders extends object = {}>(app: Rhythm<RhythmHttpContext, TContext, TProviders>, options?: AdapterOptions): AWSLambdaHandler;
-//#endregion
-export type { AWSLambdaHandler, AdapterOptions };

package/dist/adapters/aws-lambda.js

@@ -1,9 +0,0 @@
-import { t as createFetchAdapter } from "../base-B8GEu3z4.js";
-import { toLambdaHandler } from "srvx/aws-lambda";
-//#region src/adapters/aws-lambda.ts
-const fetchHandle = createFetchAdapter();
-function handle(app, options = {}) {
-	return toLambdaHandler({ fetch: fetchHandle(app, options) });
-}
-//#endregion
-export { handle };

package/dist/adapters/bun.d.ts

@@ -1,5 +0,0 @@
-import { n as FetchAdapter, t as AdapterOptions } from "../base--TyruAfY.js";
-//#region src/adapters/bun.d.ts
-export declare const handle: FetchAdapter;
-//#endregion
-export type { AdapterOptions };

package/dist/adapters/bun.js

@@ -1,5 +0,0 @@
-import { t as createFetchAdapter } from "../base-B8GEu3z4.js";
-//#region src/adapters/bun.ts
-const handle = createFetchAdapter();
-//#endregion
-export { handle };

package/dist/adapters/cloudflare.d.ts

@@ -1,5 +0,0 @@
-import { n as FetchAdapter, t as AdapterOptions } from "../base--TyruAfY.js";
-//#region src/adapters/cloudflare.d.ts
-export declare const handle: FetchAdapter<[env?: unknown, context?: unknown]>;
-//#endregion
-export type { AdapterOptions };

package/dist/adapters/cloudflare.js

@@ -1,13 +0,0 @@
-import { n as setRuntime, t as createFetchAdapter } from "../base-B8GEu3z4.js";
-//#region src/adapters/cloudflare.ts
-const handle = createFetchAdapter((request, env, context) => {
-	if (env !== void 0 || context !== void 0) setRuntime(request, {
-		name: "cloudflare",
-		cloudflare: {
-			env,
-			context
-		}
-	});
-});
-//#endregion
-export { handle };

package/dist/adapters/deno.d.ts

@@ -1,5 +0,0 @@
-import { n as FetchAdapter, t as AdapterOptions } from "../base--TyruAfY.js";
-//#region src/adapters/deno.d.ts
-export declare const handle: FetchAdapter;
-//#endregion
-export type { AdapterOptions };

package/dist/adapters/deno.js

@@ -1,5 +0,0 @@
-import { t as createFetchAdapter } from "../base-B8GEu3z4.js";
-//#region src/adapters/deno.ts
-const handle = createFetchAdapter();
-//#endregion
-export { handle };

package/dist/adapters/netlify.d.ts

@@ -1,5 +0,0 @@
-import { n as FetchAdapter, t as AdapterOptions } from "../base--TyruAfY.js";
-//#region src/adapters/netlify.d.ts
-export declare const handle: FetchAdapter<[context?: unknown]>;
-//#endregion
-export type { AdapterOptions };

package/dist/adapters/netlify.js

@@ -1,10 +0,0 @@
-import { n as setRuntime, t as createFetchAdapter } from "../base-B8GEu3z4.js";
-//#region src/adapters/netlify.ts
-const handle = createFetchAdapter((request, context) => {
-	if (context !== void 0) setRuntime(request, {
-		name: "netlify",
-		netlify: { context }
-	});
-});
-//#endregion
-export { handle };

package/dist/adapters/node.d.ts

@@ -1,11 +0,0 @@
-import { t as RhythmHttpContext } from "../context-ChHlG-q0.js";
-import { t as AdapterOptions } from "../base--TyruAfY.js";
-import { NodeHttp1Handler, NodeHttp2Handler } from "srvx";
-import { Rhythm } from "@rhythmjs/rhythm";
-//#region src/adapters/node.d.ts
-export interface NodeHandlerOptions extends AdapterOptions {
-  maxRequestBodySize?: number;
-}
-export type NodeHandler = NodeHttp1Handler & NodeHttp2Handler;
-export declare function getRequestListener<TContext extends RhythmHttpContext, TProviders extends object = {}>(app: Rhythm<RhythmHttpContext, TContext, TProviders>, options?: NodeHandlerOptions): NodeHandler;
-//#endregion

package/dist/adapters/node.js

@@ -1,9 +0,0 @@
-import { t as createFetchAdapter } from "../base-B8GEu3z4.js";
-import { toNodeHandler } from "srvx/node";
-//#region src/adapters/node.ts
-const fetchHandle = createFetchAdapter();
-function getRequestListener(app, options = {}) {
-	return toNodeHandler(fetchHandle(app, options), options);
-}
-//#endregion
-export { getRequestListener };

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

@@ -1,11 +0,0 @@
-import { t as RhythmHttpContext } from "../context-ChHlG-q0.js";
-import { t as AdapterOptions } from "../base--TyruAfY.js";
-import { Rhythm } from "@rhythmjs/rhythm";
-//#region src/adapters/service-worker.d.ts
-interface FetchEventLike {
-  readonly request: Request;
-  respondWith(response: Response | Promise<Response>): void;
-}
-export declare function handle<TContext extends RhythmHttpContext, TProviders extends object = {}>(app: Rhythm<RhythmHttpContext, TContext, TProviders>, options?: AdapterOptions): (event: FetchEventLike) => void;
-//#endregion
-export type { AdapterOptions };

package/dist/adapters/service-worker.js

@@ -1,11 +0,0 @@
-import { t as createFetchAdapter } from "../base-B8GEu3z4.js";
-//#region src/adapters/service-worker.ts
-const fetchHandle = createFetchAdapter();
-function handle(app, options = {}) {
-	const handler = fetchHandle(app, options);
-	return (event) => {
-		event.respondWith(handler(event.request));
-	};
-}
-//#endregion
-export { handle };

package/dist/adapters/vercel.d.ts

@@ -1,5 +0,0 @@
-import { n as FetchAdapter, t as AdapterOptions } from "../base--TyruAfY.js";
-//#region src/adapters/vercel.d.ts
-export declare const handle: FetchAdapter;
-//#endregion
-export type { AdapterOptions };

package/dist/adapters/vercel.js

@@ -1,5 +0,0 @@
-import { t as createFetchAdapter } from "../base-B8GEu3z4.js";
-//#region src/adapters/vercel.ts
-const handle = createFetchAdapter();
-//#endregion
-export { handle };

package/dist/base--TyruAfY.d.ts

@@ -1,10 +0,0 @@
-import { t as RhythmHttpContext } from "./context-ChHlG-q0.js";
-import { ErrorHandler, ServerRuntimeContext } from "srvx";
-import { Rhythm } from "@rhythmjs/rhythm";
-//#region src/adapters/base.d.ts
-interface AdapterOptions {
-  onError?: ErrorHandler;
-}
-type FetchAdapter<TExtra extends unknown[] = []> = <TContext extends RhythmHttpContext, TProviders extends object = {}>(app: Rhythm<RhythmHttpContext, TContext, TProviders>, options?: AdapterOptions) => (request: Request, ...extra: TExtra) => Promise<Response>;
-//#endregion
-export { FetchAdapter as n, AdapterOptions as t };

package/dist/base-B8GEu3z4.js

@@ -1,25 +0,0 @@
-import { toFetchHandler } from "./fetch.js";
-import { errorToResponse } from "./serve.js";
-//#region src/adapters/base.ts
-function setRuntime(request, runtime) {
-	Object.defineProperty(request, "runtime", {
-		value: runtime,
-		configurable: true
-	});
-}
-function createFetchAdapter(enrich) {
-	return (app, options = {}) => {
-		const handler = toFetchHandler(app);
-		const onError = options.onError ?? errorToResponse;
-		return async (request, ...extra) => {
-			try {
-				enrich?.(request, ...extra);
-				return await handler(request);
-			} catch (error) {
-				return onError(error);
-			}
-		};
-	};
-}
-//#endregion
-export { setRuntime as n, createFetchAdapter as t };

package/dist/context-ChHlG-q0.d.ts

@@ -1,24 +0,0 @@
-import { ServerRuntimeContext } from "srvx";
-//#region src/context.d.ts
-type RhythmRuntime = ServerRuntimeContext;
-declare function getRuntime(request: Request): RhythmRuntime | undefined;
-type RhythmResponseBody = string | ArrayBuffer | Uint8Array | Blob | FormData | URLSearchParams | ReadableStream<Uint8Array> | null;
-declare class RhythmResponse {
-  status: number;
-  statusText: string | undefined;
-  headers: Headers;
-  body: RhythmResponseBody;
-}
-interface RhythmHttpContext {
-  readonly request: Request;
-  readonly response: RhythmResponse;
-  json(data: unknown, status?: number): void;
-  text(body: string, status?: number): void;
-  html(body: string, status?: number): void;
-  error(status: number, message?: string): void;
-  redirect(url: string, status?: number): void;
-}
-declare function createHttpContext(request: Request): RhythmHttpContext;
-declare function toResponse(response: RhythmResponse): Response;
-//#endregion
-export { createHttpContext as a, RhythmRuntime as i, RhythmResponse as n, getRuntime as o, RhythmResponseBody as r, toResponse as s, RhythmHttpContext as t };

package/dist/radix-tree.d.ts

@@ -1,18 +0,0 @@
-//#region src/radix-tree.d.ts
-export declare class TreeNode<TMethod extends string = string, TPayload = unknown> {
-  path: string;
-  indices: string;
-  children: TreeNode<TMethod, TPayload>[];
-  paramChild: TreeNode<TMethod, TPayload> | null;
-  paramName: string;
-  wildcardChild: TreeNode<TMethod, TPayload> | null;
-  methods: Map<TMethod, TPayload> | null;
-}
-export declare function createNode<TMethod extends string = string, TPayload = unknown>(): TreeNode<TMethod, TPayload>;
-export declare function insertRoute<TMethod extends string, TPayload>(root: TreeNode<TMethod, TPayload>, method: TMethod, path: string, payload: TPayload): void;
-export declare function lookupRoute<TMethod extends string, TPayload>(root: TreeNode<TMethod, TPayload>, method: string, pathname: string): {
-  payload: TPayload;
-  params: Record<string, string>;
-} | null;
-export declare function joinPath(prefix: string, path: string): string;
-//#endregion