princejs 2.1.4 → 2.1.6

package/Readme.md

@@ -20,23 +20,24 @@ Built by a 13-year-old Nigerian developer. Among the top three in performance.
 
 Benchmarked with `oha -c 100 -z 30s` on Windows 10:
 
-| Framework | Req/s | Total |
-|-----------|------:|------:|
-| Elysia | 25,312 | 759k |
-| Hono | 22,124 | 664k |
-| **PrinceJS** | **21,748** | **653k** |
-| Express | 9,325 | 280k |
+| Framework | Avg Req/s | Peak Req/s |
+|-----------|----------:|-----------:|
+| Elysia | 27,606 | 27,834 |
+| **PrinceJS** | **17,985** | **18,507** |
+| Hono | 17,914 | 18,826 |
+| Fastify | 15,519 | 16,434 |
+| Express | 13,138 | 13,458 |
 
-> PrinceJS is **2.3× faster than Express** and sits comfortably in the top 3 — at just **4.4kB gzipped**.
+> PrinceJS is **2.3× faster than Express**, matches Hono head-to-head, and sits at just **5.1kB gzipped** — loads in ~101ms on a slow 3G connection.
 
 ---
 
 ## 🚀 Quick Start
 
 ```bash
-npm install princejs
 bun add princejs
-yarn add princejs
+# or
+npm install princejs
 ```
 
 ```ts
@@ -49,7 +50,7 @@ app.use(cors());
 app.use(logger());
 
 app.get("/", () => ({ message: "Hello PrinceJS!" }));
-app.get("/users/:id", (req) => ({ id: req.params.id }));
+app.get("/users/:id", (req) => ({ id: req.params?.id }));
 
 app.listen(3000);
 ```
@@ -60,24 +61,17 @@ app.listen(3000);
 
 | Feature | Import |
 |---------|--------|
-| Routing | `princejs` |
-| Middleware (CORS, Logger, Rate Limit, Auth, JWT) | `princejs/middleware` |
-| Zod Validation | `princejs/middleware` |
-| **Cookies & IP Detection** | `princejs` |
-| File Uploads | `princejs/helpers` |
-| WebSockets | `princejs` |
-| Server-Sent Events | `princejs/helpers` |
-| Sessions | `princejs/middleware` |
-| Response Compression | `princejs/middleware` |
-| In-memory Cache | `princejs/helpers` |
+| Routing, WebSockets, OpenAPI, Plugins, Lifecycle Hooks, Cookies, IP | `princejs` |
+| CORS, Logger, JWT, Auth, Rate Limit, Validate, Compress, Session, API Key | `princejs/middleware` |
+| File Uploads, SSE, In-memory Cache | `princejs/helpers` |
 | Cron Scheduler | `princejs/scheduler` |
-| **OpenAPI + Scalar Docs** | `princejs` |
 | JSX / SSR | `princejs/jsx` |
 | SQLite Database | `princejs/db` |
-| Plugin System | `princejs` |
 | End-to-End Type Safety | `princejs/client` |
-| Deploy Adapters | `princejs/vercel` · `princejs/cloudflare` · `princejs/deno` · `princejs/node` |
-| Lifecycle Hooks | `princejs` | 
+| Vercel Edge adapter | `princejs/vercel` |
+| Cloudflare Workers adapter | `princejs/cloudflare` |
+| Deno Deploy adapter | `princejs/deno` |
+| Node.js / Express adapter | `princejs/node` |
 
 ---
 
@@ -85,31 +79,35 @@ app.listen(3000);
 
 ### Reading Cookies
 
-Cookies are automatically parsed from the request:
+Cookies are automatically parsed and available on every request:
 
 ```ts
+import { prince } from "princejs";
+
+const app = prince();
+
 app.get("/profile", (req) => ({
   sessionId: req.cookies?.sessionId,
   theme: req.cookies?.theme,
-  allCookies: req.cookies // Record<string, string>
+  allCookies: req.cookies, // Record<string, string>
 }));
 ```
 
 ### Setting Cookies
 
-Use the response builder to set cookies with full control:
+Use the response builder for full cookie control:
 
 ```ts
-app.get("/login", (req) => 
+app.get("/login", (req) =>
   app.response()
     .status(200)
     .json({ ok: true })
     .cookie("sessionId", "abc123", {
-      maxAge: 3600,        // 1 hour
+      maxAge: 3600,       // 1 hour
       path: "/",
-      httpOnly: true,      // not accessible from JS
-      secure: true,        // HTTPS only
-      sameSite: "Strict"   // CSRF protection
+      httpOnly: true,     // not accessible from JS
+      secure: true,       // HTTPS only
+      sameSite: "Strict", // CSRF protection
     })
 );
 
@@ -123,39 +121,30 @@ app.response()
 
 ### Client IP Detection
 
-Automatically detect client IP from request headers:
-
 ```ts
 app.get("/api/data", (req) => ({
   clientIp: req.ip,
-  data: [...]
+  data: [],
 }));
 ```
 
 **Supported headers** (in priority order):
-- `X-Forwarded-For` — Load balancers, proxies (first IP in list)
+- `X-Forwarded-For` — load balancers, proxies (first IP in list)
 - `X-Real-IP` — Nginx, Apache reverse proxy
 - `CF-Connecting-IP` — Cloudflare
-- `X-Client-IP` — Other proxy services
-- Fallback — `127.0.0.1` (localhost)
-
-**Use cases:**
-- 🔒 Rate limiting per IP
-- 📊 Geolocation analytics
-- 🚨 IP-based access control
-- 👥 User tracking & fraud detection
+- `X-Client-IP` — other proxy services
+- Fallback — `127.0.0.1`
 
 ```ts
-// Rate limit by IP
+// IP-based rate limiting
 app.use((req, next) => {
-  const ip = req.ip;
-  const count = ipTracker.getCount(ip) || 0;
+  const count = ipTracker.getCount(req.ip) || 0;
   if (count > 100) return new Response("Too many requests", { status: 429 });
-  ipTracker.increment(ip);
+  ipTracker.increment(req.ip);
   return next();
 });
 
-// IP-based security
+// IP allowlist
 app.post("/admin", (req) => {
   if (!ALLOWED_IPS.includes(req.ip!)) {
     return new Response("Forbidden", { status: 403 });
@@ -168,7 +157,7 @@ app.post("/admin", (req) => {
 
 ## 📖 OpenAPI + Scalar Docs ✨
 
-Auto-generate an OpenAPI 3.0 spec and serve a beautiful [Scalar](https://scalar.com) UI — all from a single `app.openapi()` call. Routes, validation, and docs stay in sync automatically.
+Auto-generate an OpenAPI 3.0 spec and serve a beautiful [Scalar](https://scalar.com) UI — all from a single `app.openapi()` call.
 
 ```ts
 import { prince } from "princejs";
@@ -203,16 +192,16 @@ app.listen(3000);
 `api.route()` does three things at once:
 
 - ✅ Registers the route on PrinceJS
-- ✅ Auto-wires `validate(schema.body)` — no separate import needed
+- ✅ Auto-wires body validation — no separate middleware needed
 - ✅ Writes the full OpenAPI spec entry
 
-| `schema` key | Runtime | Scalar Docs |
+| `schema` key | Runtime effect | Scalar docs |
 |---|---|---|
-| `body` | ✅ Validates request | ✅ requestBody model |
+| `body` | ✅ Validates & rejects bad requests | ✅ requestBody model |
 | `query` | — | ✅ Typed query params |
 | `response` | — | ✅ 200 response model |
 
-> Routes on `app.get()` / `app.post()` stay private — never appear in docs.
+> Routes on `app.get()` / `app.post()` stay private — they never appear in the docs.
 
 **Themes:** `default` · `moon` · `purple` · `solarized` · `bluePlanet` · `deepSpace` · `saturn` · `kepler` · `mars`
 
@@ -220,8 +209,6 @@ app.listen(3000);
 
 ## 🔌 Plugin System
 
-Share bundles of routes and middleware as reusable plugins:
-
 ```ts
 import { prince, type PrincePlugin } from "princejs";
 
@@ -241,66 +228,53 @@ const usersPlugin: PrincePlugin<{ prefix?: string }> = (app, opts) => {
 
 const app = prince();
 app.plugin(usersPlugin, { prefix: "/api" });
+app.listen(3000);
 ```
 
 ---
 
 ## 🎣 Lifecycle Hooks
 
-React to key moments in request processing with lifecycle hooks:
-
 ```ts
 import { prince } from "princejs";
 
 const app = prince();
 
-// Called for every incoming request
 app.onRequest((req) => {
-  console.log(`📥 Request received: ${req.method} ${req.url}`);
+  (req as any).startTime = Date.now();
 });
 
-// Called before handler execution
 app.onBeforeHandle((req, path, method) => {
-  console.log(`🔍 About to handle: ${method} ${path}`);
-  (req as any).startTime = Date.now();
+  console.log(`🔍 ${method} ${path}`);
 });
 
-// Called after successful handler execution
 app.onAfterHandle((req, res, path, method) => {
-  const duration = Date.now() - (req as any).startTime;
-  console.log(`✅ Response: ${method} ${path} ${res.status} (${duration}ms)`);
+  const ms = Date.now() - (req as any).startTime;
+  console.log(`✅ ${method} ${path} ${res.status} (${ms}ms)`);
 });
 
-// Called when handler throws an error
 app.onError((err, req, path, method) => {
-  console.error(`❌ Error in ${method} ${path}:`, err.message);
-  // Send alert, log to monitoring service, etc.
+  console.error(`❌ ${method} ${path}:`, err.message);
 });
 
 app.get("/users", () => ({ users: [] }));
+app.listen(3000);
 ```
 
-**Hook execution order:**
-1. `onRequest` — early for request-wide setup
-2. `onBeforeHandle` — just before route handler runs
+**Execution order:**
+1. `onRequest` — runs before routing, good for setup
+2. `onBeforeHandle` — just before the handler
 3. Handler executes
-4. `onAfterHandle` — after success (on error, skipped)
-5. `onError` — only if handler throws (skips onAfterHandle)
-
-**Use cases:**
-- 📊 Metrics & observability
-- 🔍 Request inspection & debugging
-- ⏱️ Timing & performance monitoring
-- 🚨 Error tracking & alerting  
-- 🔐 Security audits & compliance logging
+4. `onAfterHandle` — after success (skipped on error)
+5. `onError` — only when handler throws
 
 ---
 
 ## 🔒 End-to-End Type Safety
 
-Define a contract once — your client gets full TypeScript autocompletion automatically:
-
 ```ts
+import { createClient, type PrinceApiContract } from "princejs/client";
+
 type ApiContract = {
   "GET /users/:id": {
     params: { id: string };
@@ -312,12 +286,13 @@ type ApiContract = {
   };
 };
 
-import { createClient } from "princejs/client";
-
 const client = createClient<ApiContract>("http://localhost:3000");
 
 const user = await client.get("/users/:id", { params: { id: "42" } });
 console.log(user.name); // typed as string ✅
+
+const created = await client.post("/users", { body: { name: "Alice" } });
+console.log(created.id); // typed as string ✅
 ```
 
 ---
@@ -342,20 +317,19 @@ import { toDeno } from "princejs/deno";
 Deno.serve(toDeno(app));
 ```
 
-**Node Adapter** - `server.ts`
+**Node.js** — `server.ts`
 ```ts
 import { createServer } from "http";
 import { toNode, toExpress } from "princejs/node";
+import express from "express";
 
 const app = prince();
-app.get("/", () => ({ message: "Hello from Node!" }));
+app.get("/", () => ({ message: "Hello!" }));
 
-// Native Node.js http
-const server = createServer(toNode(app));
-server.listen(3000);
+// Native Node http
+createServer(toNode(app)).listen(3000);
 
-// Or with Express
-import express from "express";
+// Or drop into Express
 const expressApp = express();
 expressApp.all("*", toExpress(app));
 expressApp.listen(3000);
@@ -367,102 +341,102 @@ expressApp.listen(3000);
 
 ```ts
 import { prince } from "princejs";
-import { cors, logger, rateLimit, auth, apiKey, jwt, session, compress, serve } from "princejs/middleware";
-import { validate } from "princejs/validation";
+import {
+  cors,
+  logger,
+  rateLimit,
+  auth,
+  apiKey,
+  jwt,
+  signJWT,
+  session,
+  compress,
+  validate,
+} from "princejs/middleware";
 import { cache, upload, sse } from "princejs/helpers";
 import { cron } from "princejs/scheduler";
 import { Html, Head, Body, H1, P, render } from "princejs/jsx";
 import { db } from "princejs/db";
 import { z } from "zod";
 
-const app = prince(true);
-
-// ==========================================
-// LIFECYCLE HOOKS - Timing & Observability
-// ==========================================
-app.onRequest((req) => {
-  (req as any).startTime = Date.now();
-});
-
-app.onBeforeHandle((req, path, method) => {
-  console.log(`🔍 Handling: ${method} ${path}`);
-});
+const SECRET = new TextEncoder().encode("your-secret");
+const app = prince();
 
+// ── Lifecycle hooks ───────────────────────────────────────
+app.onRequest((req) => { (req as any).t = Date.now(); });
 app.onAfterHandle((req, res, path, method) => {
-  const duration = Date.now() - (req as any).startTime;
-  console.log(`✅ ${method} ${path} → ${res.status} (${duration}ms)`);
+  console.log(`✅ ${method} ${path} ${res.status} (${Date.now() - (req as any).t}ms)`);
 });
-
 app.onError((err, req, path, method) => {
-  console.error(`❌ ${method} ${path} failed:`, err.message);
+  console.error(`❌ ${method} ${path}:`, err.message);
 });
 
-// ==========================================
-// GLOBAL MIDDLEWARE
-// ==========================================
+// ── Global middleware ─────────────────────────────────────
 app.use(cors());
 app.use(logger());
-app.use(rateLimit({ max: 100, window: 60 }));
-app.use(serve({ root: "./public" }));
-app.use(jwt(key));
-app.use(session({ secret: "key" }));
+app.use(rateLimit(100, 60));
+app.use(jwt(SECRET));
+app.use(session({ secret: "session-secret" }));
 app.use(compress());
 
-// ==========================================
-// ROUTES
-// ==========================================
+// ── JSX SSR ───────────────────────────────────────────────
+const Page = () => Html(Head("Home"), Body(H1("Hello World"), P("Welcome!")));
+app.get("/", () => render(Page()));
 
-// JSX
-const Page = () => Html(Head("Test Page"), Body(H1("Hello World"), P("This is a test")));
-app.get("/jsx", () => render(Page()));
-
-// Cookies & IP Detection
-app.post("/login", (req) => 
+// ── Cookies & IP ──────────────────────────────────────────
+app.post("/login", (req) =>
   app.response()
     .json({ ok: true, ip: req.ip })
-    .cookie("sessionId", "user_123", { 
-      httpOnly: true, 
-      secure: true,
-      sameSite: "Strict",
-      maxAge: 86400 // 24 hours
+    .cookie("sessionId", "user_123", {
+      httpOnly: true, secure: true, sameSite: "Strict", maxAge: 86400,
     })
 );
-
 app.get("/profile", (req) => ({
   sessionId: req.cookies?.sessionId,
   clientIp: req.ip,
 }));
 
-// Database
-const users = db.sqlite("./db.sqlite", "CREATE TABLE users...");
+// ── Database ──────────────────────────────────────────────
+const users = db.sqlite("./app.sqlite", `
+  CREATE TABLE IF NOT EXISTS users (id TEXT PRIMARY KEY, name TEXT NOT NULL)
+`);
 app.get("/users", () => users.query("SELECT * FROM users"));
 
-// WebSockets
+// ── WebSockets ────────────────────────────────────────────
 app.ws("/chat", {
-  open: (ws) => ws.send("Welcome!"),
+  open:    (ws) => ws.send("Welcome!"),
   message: (ws, msg) => ws.send(`Echo: ${msg}`),
+  close:   (ws) => console.log("disconnected"),
 });
 
-// Auth
+// ── Auth & API keys ───────────────────────────────────────
 app.get("/protected", auth(), (req) => ({ user: req.user }));
-app.get("/api", apiKey({ keys: ["key_123"] }), (req) => ({ ok: true }));
-
-// Helpers
-app.get("/data", cache(60)(() => ({ time: Date.now() })));
-app.post("/upload", upload(), (req) => ({ files: Object.keys(req.files || {}) }));
-app.get("/events", sse(), (req) => {
-  setInterval(() => req.sseSend({ time: Date.now() }), 1000);
+app.get("/api", apiKey({ keys: ["key_123"] }), () => ({ ok: true }));
+
+// ── Helpers ───────────────────────────────────────────────
+app.get("/cached",  cache(60)(() => ({ time: Date.now() })));
+app.post("/upload", upload());
+app.get("/events",  sse(), (req) => {
+  let i = 0;
+  const id = setInterval(() => {
+    req.sseSend({ count: i++ });
+    if (i >= 10) clearInterval(id);
+  }, 1000);
 });
 
-// ==========================================
-// CRON JOBS
-// ==========================================
-cron("*/1 * * * *", () => console.log("PrinceJS heartbeat"));
+// ── Validation ────────────────────────────────────────────
+app.post(
+  "/items",
+  validate(z.object({ name: z.string().min(1), price: z.number().positive() })),
+  (req) => ({ created: req.parsedBody })
+);
+
+// ── Cron ──────────────────────────────────────────────────
+cron("* * * * *", () => console.log("💓 heartbeat"));
 
-// ==========================================
-// OPENAPI + SCALAR DOCS
-// ==========================================
+// ── OpenAPI + Scalar ──────────────────────────────────────
 const api = app.openapi({ title: "PrinceJS App", version: "1.0.0" }, "/docs");
+
 api.route("GET", "/items", {
   summary: "List items",
   tags: ["items"],
@@ -472,6 +446,15 @@ api.route("GET", "/items", {
   },
 }, () => [{ id: "1", name: "Widget" }]);
 
+api.route("POST", "/items", {
+  summary: "Create item",
+  tags: ["items"],
+  schema: {
+    body:     z.object({ name: z.string().min(1), price: z.number().positive() }),
+    response: z.object({ id: z.string(), name: z.string() }),
+  },
+}, (req) => ({ id: crypto.randomUUID(), name: req.parsedBody.name }));
+
 app.listen(3000);
 ```
 
@@ -483,8 +466,6 @@ app.listen(3000);
 bun add princejs
 # or
 npm install princejs
-# or
-yarn add princejs
 ```
 
 ---
@@ -511,7 +492,7 @@ bun test
 
 <div align="center">
 
-**PrinceJS: Small in size. Giant in capability. 👑**
+**PrinceJS: 5.1kB. Hono-speed. Everything included. 👑**
 
 *Built with ❤️ in Nigeria*
 

package/dist/prince.d.ts

@@ -75,6 +75,7 @@ export declare class Prince {
     private router;
     private staticRoutes;
     private staticMiddlewares;
+    private staticComposed;
     private routeCache;
     private onRequestHooks;
     private onBeforeHandleHooks;
@@ -111,8 +112,10 @@ export declare class Prince {
     private add;
     private buildRouter;
     private insertRoute;
+    private composeMW;
     private findRoute;
-    private matchPath;
+    private composeRouterMiddlewares;
+    private composeStaticMiddlewares;
     private matchRoute;
     private parseBody;
     private executeHandler;

package/dist/prince.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prince.d.ts","sourceRoot":"","sources":["../src/prince.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prince.d.ts","sourceRoot":"","sources":["../src/prince.ts"],"names":[],"mappings":"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"}

package/dist/prince.js

@@ -177,27 +177,50 @@ function parseCookies(cookieHeader) {
   const cookies = {};
   if (!cookieHeader)
     return cookies;
-  cookieHeader.split(";").forEach((pair) => {
-    const [name, ...value] = pair.split("=");
-    if (name)
-      cookies[decodeURIComponent(name.trim())] = decodeURIComponent((value.join("=") || "").trim());
-  });
+  const len = cookieHeader.length;
+  let i = 0;
+  while (i < len) {
+    while (i < len && cookieHeader.charCodeAt(i) === 32)
+      i++;
+    const eqIdx = cookieHeader.indexOf("=", i);
+    if (eqIdx === -1)
+      break;
+    const semIdx = cookieHeader.indexOf(";", eqIdx);
+    const end = semIdx === -1 ? len : semIdx;
+    const name = cookieHeader.slice(i, eqIdx).trimEnd();
+    const val = cookieHeader.slice(eqIdx + 1, end).trim();
+    if (name) {
+      try {
+        cookies[decodeURIComponent(name)] = decodeURIComponent(val);
+      } catch {
+        cookies[name] = val;
+      }
+    }
+    i = end + 1;
+  }
   return cookies;
 }
+function extractPathname(url) {
+  const slashSlash = url.indexOf("//");
+  if (slashSlash === -1)
+    return "/";
+  const pathStart = url.indexOf("/", slashSlash + 2);
+  if (pathStart === -1)
+    return "/";
+  const qIdx = url.indexOf("?", pathStart);
+  return qIdx === -1 ? url.slice(pathStart) : url.slice(pathStart, qIdx);
+}
+function extractSearch(url) {
+  const qIdx = url.indexOf("?");
+  return qIdx === -1 ? "" : url.slice(qIdx + 1);
+}
 function detectIP(req) {
   const forwarded = req.headers.get("x-forwarded-for");
-  if (forwarded)
-    return forwarded.split(",")[0].trim();
-  const realIp = req.headers.get("x-real-ip");
-  if (realIp)
-    return realIp;
-  const cfIp = req.headers.get("cf-connecting-ip");
-  if (cfIp)
-    return cfIp;
-  const clientIp = req.headers.get("x-client-ip");
-  if (clientIp)
-    return clientIp;
-  return "127.0.0.1";
+  if (forwarded) {
+    const comma = forwarded.indexOf(",");
+    return comma === -1 ? forwarded.trim() : forwarded.slice(0, comma).trim();
+  }
+  return req.headers.get("x-real-ip") ?? req.headers.get("cf-connecting-ip") ?? req.headers.get("x-client-ip") ?? "127.0.0.1";
 }
 function zodToJsonSchema(schema) {
   const d = schema._def;
@@ -353,6 +376,7 @@ class Prince {
   router = null;
   staticRoutes = new Map;
   staticMiddlewares = new Map;
+  staticComposed = new Map;
   routeCache = new Map;
   onRequestHooks = [];
   onBeforeHandleHooks = [];
@@ -363,6 +387,9 @@ class Prince {
   }
   use(mw) {
     this.middlewares.push(mw);
+    this.routeCache.clear();
+    this.staticComposed.clear();
+    this.router = null;
     return this;
   }
   plugin(plugin, options) {
@@ -448,6 +475,8 @@ class Prince {
       pattern: "",
       handlers: {},
       middlewares: {},
+      composedMiddlewares: {},
+      allowedMethods: new Set,
       children: []
     };
     for (const route of this.rawRoutes) {
@@ -476,6 +505,8 @@ class Prince {
           pattern: part,
           handlers: {},
           middlewares: {},
+          composedMiddlewares: {},
+          allowedMethods: new Set,
           children: []
         };
         if (part.startsWith(":")) {
@@ -490,76 +521,71 @@ class Prince {
       }
     }
     currentNode.handlers[route.method] = route.handler;
+    currentNode.allowedMethods.add(route.method);
     if (route.middlewares.length > 0) {
       currentNode.middlewares[route.method] = route.middlewares;
     }
   }
+  composeMW(routeMW) {
+    if (this.middlewares.length === 0)
+      return routeMW;
+    if (routeMW.length === 0)
+      return this.middlewares;
+    return [...this.middlewares, ...routeMW];
+  }
   findRoute(method, pathname) {
     const cacheKey = `${method}:${pathname}`;
     if (this.routeCache.has(cacheKey)) {
       return this.routeCache.get(cacheKey);
     }
-    const staticKey = `${method}:${pathname}`;
-    const staticHandler = this.staticRoutes.get(staticKey);
+    const staticHandler = this.staticRoutes.get(cacheKey);
     if (staticHandler) {
-      const result2 = {
-        handler: staticHandler,
-        params: {},
-        middlewares: this.staticMiddlewares.get(staticKey) || []
-      };
+      const composed = this.staticComposed.get(cacheKey) ?? this.composeMW(this.staticMiddlewares.get(cacheKey) ?? []);
+      const result2 = { handler: staticHandler, params: {}, middlewares: composed };
       this.routeCache.set(cacheKey, result2);
       return result2;
     }
+    if (this.staticRoutes.size > 0) {
+      const methods = ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"];
+      const allowed = methods.filter((m) => m !== method && this.staticRoutes.has(`${m}:${pathname}`));
+      if (allowed.length > 0) {
+        const r = { handler: null, params: {}, middlewares: [], allowedMethods: allowed };
+        this.routeCache.set(cacheKey, r);
+        return r;
+      }
+    }
     const segments = pathname === "/" ? [""] : pathname.split("/").slice(1);
     const result = this.matchRoute(this.buildRouter(), segments, method);
-    if (result) {
-      this.routeCache.set(cacheKey, result);
-      return result;
-    }
-    const allowedMethods = new Set;
-    for (const route of this.rawRoutes) {
-      if (this.matchPath(route.path, pathname)) {
-        allowedMethods.add(route.method);
-      }
+    this.routeCache.set(cacheKey, result);
+    return result;
+  }
+  composeRouterMiddlewares(node) {
+    for (const method of Object.keys(node.handlers)) {
+      const routeMW = node.middlewares[method] ?? [];
+      node.composedMiddlewares[method] = this.middlewares.length === 0 ? routeMW : routeMW.length === 0 ? this.middlewares : [...this.middlewares, ...routeMW];
     }
-    if (allowedMethods.size > 0) {
-      const methodNotAllowed = {
-        handler: null,
-        params: {},
-        middlewares: [],
-        allowedMethods: Array.from(allowedMethods)
-      };
-      this.routeCache.set(cacheKey, methodNotAllowed);
-      return methodNotAllowed;
+    for (const child of node.children) {
+      this.composeRouterMiddlewares(child);
     }
-    this.routeCache.set(cacheKey, null);
-    return null;
   }
-  matchPath(routePath, requestPath) {
-    const routeParts = routePath === "/" ? [""] : routePath.split("/").slice(1);
-    const requestParts = requestPath === "/" ? [""] : requestPath.split("/").slice(1);
-    if (routeParts.length !== requestParts.length) {
-      if (routeParts.includes("**"))
-        return true;
-      return false;
+  composeStaticMiddlewares() {
+    this.staticComposed.clear();
+    for (const [key, handler] of this.staticRoutes) {
+      const routeMW = this.staticMiddlewares.get(key) ?? [];
+      this.staticComposed.set(key, this.middlewares.length === 0 ? routeMW : routeMW.length === 0 ? this.middlewares : [...this.middlewares, ...routeMW]);
     }
-    for (let i = 0;i < routeParts.length; i++) {
-      const routePart = routeParts[i];
-      const requestPart = requestParts[i];
-      if (routePart.startsWith(":") || routePart === "*" || routePart === "**") {
-        continue;
-      }
-      if (routePart !== requestPart) {
-        return false;
-      }
-    }
-    return true;
   }
   matchRoute(node, segments, method, params = {}, index = 0) {
     if (index === segments.length) {
       const handler = node.handlers[method];
-      const middlewares = node.middlewares[method] || [];
-      return handler ? { handler, params, middlewares } : null;
+      if (handler) {
+        const middlewares = node.composedMiddlewares[method] ?? this.composeMW(node.middlewares[method] ?? []);
+        return { handler, params, middlewares };
+      }
+      if (node.allowedMethods.size > 0) {
+        return { handler: null, params, middlewares: [], allowedMethods: [...node.allowedMethods] };
+      }
+      return null;
     }
     const segment = segments[index];
     for (const child of node.children) {
@@ -573,11 +599,15 @@ class Prince {
     }
     for (const child of node.children) {
       if (child.paramName) {
+        const saved = params[child.paramName];
         params[child.paramName] = segment;
         const result = this.matchRoute(child, segments, method, params, index + 1);
         if (result)
           return result;
-        delete params[child.paramName];
+        if (saved === undefined)
+          delete params[child.paramName];
+        else
+          params[child.paramName] = saved;
       }
     }
     for (const child of node.children) {
@@ -590,39 +620,32 @@ class Prince {
     for (const child of node.children) {
       if (child.isCatchAll) {
         const handler = child.handlers[method];
-        const middlewares = child.middlewares[method] || [];
         if (handler) {
+          const middlewares = child.composedMiddlewares[method] ?? this.composeMW(child.middlewares[method] ?? []);
           return { handler, params, middlewares };
         }
+        if (child.allowedMethods.size > 0) {
+          return { handler: null, params, middlewares: [], allowedMethods: [...child.allowedMethods] };
+        }
       }
     }
     return null;
   }
   async parseBody(req) {
     const ct = req.headers.get("content-type") || "";
-    const clonedReq = req.clone();
     try {
       if (ct.includes("application/json")) {
-        return await clonedReq.json();
+        return await req.json();
       }
       if (ct.includes("application/x-www-form-urlencoded")) {
-        const text = await clonedReq.text();
+        const text = await req.text();
         return Object.fromEntries(new URLSearchParams(text));
       }
       if (ct.startsWith("multipart/form-data")) {
-        const fd = await clonedReq.formData();
-        const files = {};
-        const fields = {};
-        for (const [k, v] of fd.entries()) {
-          if (v instanceof File)
-            files[k] = v;
-          else
-            fields[k] = v;
-        }
-        return { files, fields };
+        return null;
       }
       if (ct.startsWith("text/")) {
-        return await clonedReq.text();
+        return await req.text();
       }
     } catch (error) {
       console.error("Body parsing error:", error);
@@ -630,11 +653,31 @@ class Prince {
     }
     return null;
   }
-  async executeHandler(req, handler, params, query, routeMiddlewares, method, pathname) {
+  async executeHandler(req, handler, params, search, routeMiddlewares, method, pathname) {
     req.params = params;
-    req.query = query;
-    req.cookies = parseCookies(req.headers.get("cookie") || "");
-    req.ip = detectIP(req);
+    let _query;
+    Object.defineProperty(req, "query", {
+      get() {
+        return _query ??= new URLSearchParams(search);
+      },
+      configurable: true
+    });
+    Object.defineProperty(req, "cookies", {
+      get() {
+        const val = parseCookies(req.headers.get("cookie") ?? "");
+        Object.defineProperty(req, "cookies", { value: val, configurable: true });
+        return val;
+      },
+      configurable: true
+    });
+    Object.defineProperty(req, "ip", {
+      get() {
+        const val = detectIP(req);
+        Object.defineProperty(req, "ip", { value: val, configurable: true });
+        return val;
+      },
+      configurable: true
+    });
     if (["POST", "PUT", "PATCH"].includes(req.method) && !req.parsedBody) {
       const parsed = await this.parseBody(req);
       if (parsed) {
@@ -649,7 +692,7 @@ class Prince {
     for (const hook of this.onBeforeHandleHooks) {
       await hook(req, pathname, method);
     }
-    const allMiddlewares = routeMiddlewares.length > 0 ? [...this.middlewares, ...routeMiddlewares] : this.middlewares;
+    const allMiddlewares = routeMiddlewares;
     let i = 0;
     const next = async () => {
       while (i < allMiddlewares.length) {
@@ -669,16 +712,18 @@ class Prince {
       return this.json(res);
     };
     const response = await next();
-    for (const hook of this.onAfterHandleHooks) {
-      await hook(req, response.clone(), pathname, method);
+    if (this.onAfterHandleHooks.length > 0) {
+      for (const hook of this.onAfterHandleHooks) {
+        await hook(req, response, pathname, method);
+      }
     }
     return response;
   }
   async handleFetch(req) {
-    const url = new URL(req.url);
+    const rawUrl = req.url;
+    const pathname = extractPathname(rawUrl);
     const r = req;
     const method = req.method;
-    const pathname = url.pathname;
     for (const hook of this.onRequestHooks) {
       await hook(r);
     }
@@ -695,15 +740,16 @@ class Prince {
         }
       });
     }
-    return this.executeHandler(r, routeMatch.handler, routeMatch.params, url.searchParams, routeMatch.middlewares, method, pathname);
+    const search = extractSearch(rawUrl);
+    return this.executeHandler(r, routeMatch.handler, routeMatch.params, search, routeMatch.middlewares, method, pathname);
   }
   async fetch(req) {
-    const url = new URL(req.url);
-    const pathname = url.pathname;
+    const rawUrl = req.url;
     const method = req.method;
     try {
       return await this.handleFetch(req);
     } catch (err) {
+      const pathname = extractPathname(rawUrl);
       for (const hook of this.onErrorHooks) {
         await hook(err, req, pathname, method);
       }
@@ -768,12 +814,15 @@ class Prince {
   }
   listen(port = 3000) {
     const self = this;
+    const router = this.buildRouter();
+    this.composeRouterMiddlewares(router);
+    this.composeStaticMiddlewares();
     Bun.serve({
       port,
       fetch: (req, server) => {
-        const url = new URL(req.url);
-        if (self.wsRoutes[url.pathname] && server.upgrade(req, {
-          data: { path: url.pathname }
+        const pathname = extractPathname(req.url);
+        if (self.wsRoutes[pathname] && server.upgrade(req, {
+          data: { path: pathname }
         })) {
           return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "princejs",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "An easy and fast backend framework that is among the top three — by a 13yo developer, for developers.",
   "main": "dist/prince.js",
   "types": "dist/prince.d.ts",