@rhythmjs/router 0.0.20 → 0.0.22

package/README.md

@@ -2,7 +2,7 @@
 
 The HTTP layer of Rhythm, the Bun-native backend framework: web-standard (`Request`/`Response`) routing on top of the `@rhythmjs/rhythm` kernel, served on `Bun.serve`. `RhythmRouter` matches routes with [rou3](https://github.com/h3js/rou3), the router that powers h3 (a static segment always wins over a `:param` segment, regardless of registration order).
 
-Route patterns follow rou3's conventions: `:name` params (`:name?` optional, `:id(\\d+)` regex-constrained), `*` for one unnamed segment (captured as `params["0"]`), and `**` for the rest of the path (`params._`, or `params.name` with `**:name`). Param values are URI-decoded; a malformed escape does not match.
+Route patterns follow rou3's conventions: `:name` params (`:name?` optional, `:id(\\d+)` regex-constrained), `*` for an unnamed wildcard (captured as `params["0"]`; with the installed rou3 it spans several segments, so use `:name` for exactly one segment), and `**` for the rest of the path (`params._`, or `params.name` with `**:name`). Param values are URI-decoded; a malformed escape does not match.
 
 `RhythmRouter` is a `Pipeline`, like `Rhythm`: it has request-time `use()` middleware and routes, but no startup phase. Startup work (`register`, `decorate`, `include`) belongs to the `Rhythm` app that mounts it with `mount(router)`.
 
@@ -118,4 +118,8 @@ Directory routes (`{ dir }`, path must end in `/*`) come with content types, `La
 
 ### WebSockets
 
-[`@rhythmjs/ws`](https://github.com/rhythmjs/ws) plugs into the same hand-wired `fetch`: its `upgrade()` returns `null` synchronously for non-websocket requests, so it composes as `ws.upgrade(request, srv) ?? handler(request)`, with `websocket: ws.websocket` on the same `Bun.serve` call.
+[`@rhythmjs/ws`](https://github.com/rhythmjs/ws) is a pipeline like the router: mount it beside your routers with `mount(ws)`, and pass `websocket` to the same `Bun.serve` call. Its routes call Bun's `ctx.server.upgrade()`, which is why the fetch handler must be given the server (`fetch: toFetchHandler(app)`).
+
+```ts
+Bun.serve({ fetch: toFetchHandler(new Rhythm().use(mount(router)).use(mount(ws))), websocket });
+```

package/dist/path.js

@@ -1,4 +1,8 @@
 // @bun
+import {
+  pathnameOf
+} from "./rhythm-router-t7qys9ar.js";
+
 // src/path.ts
 import { addRoute, createRouter, findRoute } from "rou3";
 function pathIs(pattern) {
@@ -6,7 +10,7 @@ function pathIs(pattern) {
     throw new TypeError(`path must start with "/", got "${pattern}"`);
   const router = createRouter();
   addRoute(router, "", pattern, true);
-  return (ctx) => findRoute(router, ctx.request.method, new URL(ctx.request.url).pathname) !== undefined;
+  return (ctx) => findRoute(router, ctx.request.method, pathnameOf(ctx.request.url)) !== undefined;
 }
 export {
   pathIs

package/dist/pathname.d.ts

@@ -0,0 +1 @@
+export declare function pathnameOf(url: string): string;

package/dist/rhythm-router-t7qys9ar.js

@@ -0,0 +1,20 @@
+// @bun
+// src/pathname.ts
+var NEEDS_PARSING = /[\\\u0000- \u007f-\uFFFF"<>^`{|}]|\/\.|%2e/i;
+function pathnameOf(url) {
+  const authority = url.indexOf("://") + 3;
+  const start = url.indexOf("/", authority);
+  if (authority < 3 || start === -1)
+    return new URL(url).pathname;
+  let end = url.length;
+  const query = url.indexOf("?", start);
+  if (query !== -1)
+    end = query;
+  const hash = url.indexOf("#", start);
+  if (hash !== -1 && hash < end)
+    end = hash;
+  const pathname = url.slice(start, end);
+  return NEEDS_PARSING.test(pathname) ? new URL(url).pathname : pathname;
+}
+
+export { pathnameOf };

package/dist/rhythm-router.js

@@ -1,4 +1,8 @@
 // @bun
+import {
+  pathnameOf
+} from "./rhythm-router-t7qys9ar.js";
+
 // src/rhythm-router.ts
 import { addRoute, createRouter, findRoute } from "rou3";
 import {
@@ -7,9 +11,12 @@ import {
 } from "@rhythmjs/rhythm";
 function decodeParams(params) {
   const decoded = {};
+  if (!params)
+    return decoded;
   try {
-    for (const [key, value] of Object.entries(params ?? {})) {
-      decoded[key] = decodeURIComponent(value);
+    for (const key in params) {
+      const value = params[key];
+      decoded[key] = value.includes("%") ? decodeURIComponent(value) : value;
     }
   } catch {
     return;
@@ -42,18 +49,21 @@ class RhythmRouter extends Pipeline {
   }
   callback() {
     const run = this.chain();
-    return async (input) => {
+    return (input) => {
       const ctx = input;
-      const match = this.#match(ctx);
-      if (!match)
-        return ctx;
-      Object.assign(ctx, { params: match.params });
-      await run(ctx, () => match.route(ctx));
-      return ctx;
+      try {
+        const match = this.#match(ctx);
+        if (!match)
+          return Promise.resolve(ctx);
+        Object.assign(ctx, { params: match.params });
+        return run(ctx, () => match.route(ctx)).then(() => ctx);
+      } catch (error) {
+        return Promise.reject(error);
+      }
     };
   }
   #match(ctx) {
-    const found = findRoute(this.#routes, ctx.request.method, new URL(ctx.request.url).pathname);
+    const found = findRoute(this.#routes, ctx.request.method, pathnameOf(ctx.request.url));
     if (!found)
       return;
     const params = decodeParams(found.params);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhythmjs/router",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "Bun-native HTTP router for Rhythm: RhythmRouter plus a fetch handler for Bun.serve, matching with rou3.",
   "homepage": "https://rhythm.js.org/router",
   "license": "ISC",
@@ -36,8 +36,16 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "clean": "rm -rf dist",
+    "prebuild": "bun run clean",
+    "build": "bun build src/rhythm-router.ts src/context.ts src/fetch.ts src/path.ts --outdir dist --root src --format esm --target bun --packages external --splitting && tsc -p tsconfig.build.json",
+    "prepublishOnly": "bun run typecheck && bun test && bun run build",
+    "typecheck": "tsc --noEmit",
+    "test": "bun test"
+  },
   "dependencies": {
-    "@rhythmjs/rhythm": "0.0.20",
+    "@rhythmjs/rhythm": "workspace:*",
     "rou3": "^1.0.0"
   },
   "devDependencies": {
@@ -47,10 +55,5 @@
   },
   "engines": {
     "bun": ">=1.2.0"
-  },
-  "scripts": {
-    "build": "rm -rf dist && bun build src/rhythm-router.ts src/context.ts src/fetch.ts src/path.ts --outdir dist --root src --format esm --target bun --packages external --splitting && tsc -p tsconfig.build.json",
-    "typecheck": "tsc --noEmit",
-    "test": "bun test"
   }
-}
+}