@ndiinginc/router 4.11.0 → 4.11.1

package/README.md

@@ -50,23 +50,19 @@ app.listen(3000);
 
 Yang diekspor adalah class `App`, dengan tiga properti tambahan:
 
-| Export | Keterangan |
-| --- | --- |
-| `App` | Router + HTTP server (`listen`) |
+| Export       | Keterangan                               |
+| ------------ | ---------------------------------------- |
+| `App`        | Router + HTTP server (`listen`)          |
 | `App.Router` | Router tanpa server, untuk nested router |
-| `App.json` | Middleware JSON body parser |
-| `App.cors` | Middleware CORS |
+| `App.json`   | Middleware JSON body parser              |
+| `App.cors`   | Middleware CORS                          |
 
 ## Routing
 
 Semua method mengembalikan `this`, jadi bisa di-chain.
 
 ```js
-app.get("/users", handler)
-   .post("/users", handler)
-   .put("/users/:id", handler)
-   .patch("/users/:id", handler)
-   .delete("/users/:id", handler);
+app.get("/users", handler).post("/users", handler).put("/users/:id", handler).patch("/users/:id", handler).delete("/users/:id", handler);
 ```
 
 Method yang tersedia: `get`, `post`, `put`, `patch`, `delete`, `head`, `options`, `trace`, `connect`, `query`, dan `use` (semua method).
@@ -236,12 +232,12 @@ app.get("/proxy", async (req, res) => {
 
 ## Request
 
-| Properti | Keterangan |
-| --- | --- |
-| `req.path` | Pathname tanpa query string |
-| `req.query` | Object query string, di-parse secara lazy. Key yang berulang menjadi array, dan `+` di-decode menjadi spasi |
-| `req.params` | Parameter dari route dinamis (sudah di-decode). Wildcard `*` ada di `req.params.wildcard` |
-| `req.body` | Hasil parse body (butuh middleware `json()`) |
+| Properti         | Keterangan                                                                                                  |
+| ---------------- | ----------------------------------------------------------------------------------------------------------- |
+| `req.path`       | Pathname tanpa query string                                                                                 |
+| `req.query`      | Object query string, di-parse secara lazy. Key yang berulang menjadi array, dan `+` di-decode menjadi spasi |
+| `req.params`     | Parameter dari route dinamis (sudah di-decode). Wildcard `*` ada di `req.params.wildcard`                   |
+| `req.body`       | Hasil parse body (butuh middleware `json()`)                                                                |
 | `req.controller` | `AbortController` untuk request ini. Di-abort saat timeout atau error handler (jika `requestTimeout` aktif) |
 
 ```js
@@ -257,11 +253,11 @@ app.get("/search", (req, res) => {
 
 ## Response
 
-| Method | Keterangan |
-| --- | --- |
-| `res.status(code)` | Set status code, mengembalikan `res` sehingga bisa di-chain |
-| `res.send(chunk)` | Kirim response dan akhiri |
-| `res.json(value)` | Set `Content-Type: application/json; charset=utf-8`, serialize, lalu kirim |
+| Method             | Keterangan                                                                 |
+| ------------------ | -------------------------------------------------------------------------- |
+| `res.status(code)` | Set status code, mengembalikan `res` sehingga bisa di-chain                |
+| `res.send(chunk)`  | Kirim response dan akhiri                                                  |
+| `res.json(value)`  | Set `Content-Type: application/json; charset=utf-8`, serialize, lalu kirim |
 
 ```js
 res.status(201).json({ created: true });
@@ -277,8 +273,8 @@ res.status(201).json({ created: true });
 app.use(App.json({ limit: 100 * 1024 })); // default 100 KB
 ```
 
-| Opsi | Default | Keterangan |
-| --- | --- | --- |
+| Opsi    | Default  | Keterangan                      |
+| ------- | -------- | ------------------------------- |
 | `limit` | `102400` | Ukuran body maksimum dalam byte |
 
 Perilaku:
@@ -303,13 +299,13 @@ app.use(
 );
 ```
 
-| Opsi | Default | Keterangan |
-| --- | --- | --- |
-| `origin` | `"*"` | `"*"`, satu origin, atau array origin. `null` tidak mengirim header `Access-Control-Allow-Origin` sama sekali |
-| `credentials` | `false` | Mengirim `Access-Control-Allow-Credentials: true` |
-| `headers` | - | `"*"` atau array nama header (tidak membedakan huruf besar/kecil) |
-| `methods` | - | `"*"` atau array nama method (tidak membedakan huruf besar/kecil) |
-| `maxAge` | `0` | Lama cache preflight (detik). `0` berarti header tidak dikirim |
+| Opsi          | Default | Keterangan                                                                                                    |
+| ------------- | ------- | ------------------------------------------------------------------------------------------------------------- |
+| `origin`      | `"*"`   | `"*"`, satu origin, atau array origin. `null` tidak mengirim header `Access-Control-Allow-Origin` sama sekali |
+| `credentials` | `false` | Mengirim `Access-Control-Allow-Credentials: true`                                                             |
+| `headers`     | -       | `"*"` atau array nama header (tidak membedakan huruf besar/kecil)                                             |
+| `methods`     | -       | `"*"` atau array nama method (tidak membedakan huruf besar/kecil)                                             |
+| `maxAge`      | `0`     | Lama cache preflight (detik). `0` berarti header tidak dikirim                                                |
 
 Perilaku:
 
@@ -329,9 +325,9 @@ Perilaku:
 const app = new App({ requestTimeout: 5000 });
 ```
 
-| Opsi | Default | Keterangan |
-| --- | --- | --- |
-| `requestTimeout` | `0` | Batas waktu handler dalam ms (khusus `App`). Lihat bagian [Timeout](#timeout) |
+| Opsi             | Default | Keterangan                                                                    |
+| ---------------- | ------- | ----------------------------------------------------------------------------- |
+| `requestTimeout` | `0`     | Batas waktu handler dalam ms (khusus `App`). Lihat bagian [Timeout](#timeout) |
 
 `Router` tidak memiliki opsi sendiri; `requestTimeout` hanya dipakai oleh `App`.
 
@@ -373,10 +369,7 @@ console.log(server.address().port);
 ```js
 const https = require("https");
 
-const server = https.createServer(
-    { ...App.SERVER_OPTIONS, key, cert },
-    (req, res) => app.handle(req, res),
-);
+const server = https.createServer({ ...App.SERVER_OPTIONS, key, cert }, (req, res) => app.handle(req, res));
 server.listen(443);
 ```
 
@@ -384,11 +377,11 @@ server.listen(443);
 
 Hello world dengan satu route `GET /`, diuji memakai `autocannon -c 100 -d 40 -p 10` di mesin lokal.
 
-| | Req/sec (avg) | Latency (avg) |
-| --- | --- | --- |
-| Fastify | 31.475 | 31,27 ms |
-| **@ndiinginc/router** | 29.735 | 33,12 ms |
-| Express | 20.211 | 48,93 ms |
+|                       | Req/sec (avg) | Latency (avg) |
+| --------------------- | ------------- | ------------- |
+| Fastify               | 31.475        | 31,27 ms      |
+| **@ndiinginc/router** | 29.735        | 33,12 ms      |
+| Express               | 20.211        | 48,93 ms      |
 
 Hasil bervariasi tergantung mesin, versi Node.js, dan jumlah route. Benchmark ini hanya menggambarkan overhead dasar, bukan performa aplikasi nyata.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndiinginc/router",
-  "version": "4.11.0",
+  "version": "4.11.1",
   "description": "",
   "main": "./src/index.js",
   "scripts": {
@@ -22,6 +22,6 @@
     "@ndiinginc/test": "^1.17.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^26.6.5",
-    "autocannon": "^8.0.0"
+    "autocannon": "^2.0.1"
   }
 }

package/src/app.js

@@ -17,20 +17,16 @@ class App extends Router {
             handleAbort = () => reject(req.controller.signal.reason);
             req.controller.signal.addEventListener("abort", handleAbort, { once: true });
         });
-
         const timeout = setTimeout(() => {
             res.statusCode = 504;
             req.controller.abort(new Error(http.STATUS_CODES[res.statusCode]));
         }, this.requestTimeout);
-
         const promise = handlerPromise().catch((error) => {
             if (!req.controller.signal.aborted) {
                 req.controller.abort(error);
             } else {
-                console.error(error); // swallow error?
             }
         });
-
         try {
             await Promise.race([promise, timeoutPromise]);
         } finally {
@@ -45,16 +41,13 @@ class App extends Router {
                 res.statusCode = 404;
                 err = new Error(http.STATUS_CODES[res.statusCode]);
             }
-
             if (res.statusCode < 400) {
                 res.statusCode = 500;
             }
-
             const error = { message: err.message };
             if (process.env.NODE_ENV === "development") {
                 error.stack = err.stack;
             }
-
             res.json({ error });
         }
     }
@@ -66,7 +59,6 @@ class App extends Router {
     async handle(req, res) {
         const { params, paramsLength, handlers, errorHandlers } = this.find(req.method, req.path);
         req.params = paramsLength ? Object.assign(Object.create(null), params) : EMPTY_PARAMS;
-
         let err;
         try {
             const handlerPromise = async () => {
@@ -75,7 +67,6 @@ class App extends Router {
                     await handler(req, res);
                 }
             };
-
             if (this.requestTimeout) {
                 await this.withTimeout(req, res, handlerPromise);
             } else {
@@ -83,7 +74,6 @@ class App extends Router {
             }
         } catch (error) {
             err = error;
-            
             try {
                 for (const handler of errorHandlers) {
                     if (res.writableEnded) break;
@@ -93,7 +83,6 @@ class App extends Router {
                 err = new Error(error.message, { cause: err });
             }
         }
-
         this.fallback(res, err);
     }
 
@@ -105,6 +94,6 @@ class App extends Router {
     }
 }
 
-App.SERVER_OPTIONS=SERVER_OPTIONS
+App.SERVER_OPTIONS = SERVER_OPTIONS;
 
 exports.App = App;

package/src/middleware/cors.js

@@ -28,15 +28,12 @@ function cors({ origin = "*", credentials = false, headers, maxAge = 0, methods
         const reqOrigin = req.headers["origin"];
         let value;
         let explicit = false;
-
         if (origin === "*" && !credentials) {
             value = "*";
         } else if (origin === "*" || origin === reqOrigin || (Array.isArray(origin) && origin.includes(reqOrigin))) {
             value = reqOrigin;
             explicit = true;
         }
-        // origin === null -> skip (jangan set "null", celah keamanan)
-
         if (value) res.setHeader("Access-Control-Allow-Origin", value);
         if (explicit) res.appendHeader("Vary", "Origin");
     }
@@ -44,9 +41,7 @@ function cors({ origin = "*", credentials = false, headers, maxAge = 0, methods
     function setAllowHeaders(req, res) {
         const reqHeaders = req.headers["access-control-request-headers"];
         if (!reqHeaders) return;
-
         const requested = reqHeaders.split(",").map((h) => h.trim().toLowerCase());
-
         let value;
         if (headers === "*" && !credentials) {
             value = "*";
@@ -54,7 +49,6 @@ function cors({ origin = "*", credentials = false, headers, maxAge = 0, methods
             const allowed = requested.filter((h) => headers.includes(h));
             if (allowed.length === requested.length) value = headers;
         } else {
-            // headers undefined -> echo request headers (wajib per spec)
             value = requested;
         }
         if (value) res.setHeader("Access-Control-Allow-Headers", value);
@@ -63,16 +57,13 @@ function cors({ origin = "*", credentials = false, headers, maxAge = 0, methods
     function setAllowMethods(req, res) {
         const reqMethod = req.headers["access-control-request-method"];
         if (!reqMethod) return;
-
         const method = reqMethod.toUpperCase();
-
         let value;
         if (methods === "*" && !credentials) {
             value = "*";
         } else if (Array.isArray(methods)) {
             if (methods.includes(method)) value = methods;
         } else {
-            // methods undefined -> echo request method
             value = [method];
         }
         if (value) res.setHeader("Access-Control-Allow-Methods", value);
@@ -96,9 +87,7 @@ function cors({ origin = "*", credentials = false, headers, maxAge = 0, methods
 
     return (req, res) => {
         setAllowCredentials(res);
-
         if (req.method === "OPTIONS" && req.headers["access-control-request-method"]) {
-            // preflight
             setAllowOrigin(req, res);
             setAllowHeaders(req, res);
             setAllowMethods(req, res);
@@ -107,7 +96,6 @@ function cors({ origin = "*", credentials = false, headers, maxAge = 0, methods
             res.setHeader("Content-Length", "0");
             res.end();
         } else {
-            // normal response (termasuk OPTIONS non-preflight)
             setAllowOrigin(req, res);
             setExposeHeaders(res);
         }

package/src/middleware/json.js

@@ -7,6 +7,7 @@ function json({ limit = 100 * 1024 } = {}) {
         }
         return value;
     };
+
     return async (req, res) => {
         if (!["POST", "PUT", "PATCH", "QUERY"].includes(req.method)) {
             return;

package/src/node.js

@@ -1,6 +1,9 @@
 class Node {
     constructor(segment = "") {
         this.segment = segment;
+        if (segment.startsWith(":")) {
+            this.name = segment.slice(1);
+        }
         /** @type {Map<string, Node>} static children */
         this.children = new Map();
         /** @type {Map<string, Node>} param children, key = ':name' */
@@ -15,13 +18,11 @@ class Node {
             if (!this.wildcard) this.wildcard = new Node("*");
             return this.wildcard;
         }
-
         if (segment.startsWith(":")) {
             return this.params.getOrInsertComputed(segment, (segment) => {
                 return new Node(segment);
             });
         }
-
         return this.children.getOrInsertComputed(segment, (segment) => {
             return new Node(segment);
         });
@@ -36,15 +37,12 @@ class Node {
                 });
             }
         }
-
         if (node.wildcard) {
             this.add("*").merge(node.wildcard, offset);
         }
-
         for (const [segment, child] of node.params) {
             this.add(segment).merge(child, offset);
         }
-
         for (const [segment, child] of node.children) {
             this.add(segment).merge(child, offset);
         }
@@ -52,25 +50,20 @@ class Node {
 
     getMaxSeq() {
         let max = -1;
-
         for (const [, entries] of this.handlers) {
             for (const entry of entries) {
                 max = Math.max(max, entry.seq);
             }
         }
-
         if (this.wildcard) {
             max = Math.max(max, this.wildcard.getMaxSeq());
         }
-
         for (const [, child] of this.params) {
             max = Math.max(max, child.getMaxSeq());
         }
-
         for (const [, child] of this.children) {
             max = Math.max(max, child.getMaxSeq());
         }
-
         return max;
     }
 }

package/src/polyfill.js

@@ -1,5 +1,3 @@
-
-// Polyfill for Map.prototype.getOrInsert
 if (!Map.prototype.getOrInsert) {
     Map.prototype.getOrInsert = function (key, defaultValue) {
         if (!this.has(key)) {
@@ -8,7 +6,7 @@ if (!Map.prototype.getOrInsert) {
         return this.get(key);
     };
 }
-// Polyfill for Map.prototype.getOrInsertComputed
+
 if (!Map.prototype.getOrInsertComputed) {
     Map.prototype.getOrInsertComputed = function (key, callback) {
         if (typeof callback !== "function") {

package/src/request.js

@@ -13,7 +13,6 @@ class Request extends http.IncomingMessage {
             this._path = path;
             this._queryString = queryString;
         }
-
         return this._path;
     }
 
@@ -21,7 +20,6 @@ class Request extends http.IncomingMessage {
         if (!this._query) {
             this._query = parseQueryString(this._queryString);
         }
-
         return this._query;
     }
 
@@ -32,7 +30,6 @@ class Request extends http.IncomingMessage {
         if (!this._controller) {
             this._controller = new AbortController();
         }
-        
         return this._controller;
     }
 }

package/src/response.js

@@ -10,7 +10,7 @@ class Response extends http.ServerResponse {
         if (this.writableEnded) return;
         this.end(chunk, null, null);
     }
-    
+
     json(value) {
         if (!this.headersSent) {
             this.setHeader("Content-Type", "application/json; charset=utf-8");

package/src/router.js

@@ -17,15 +17,12 @@ class Router {
             handlers = [path, ...handlers];
             path = null;
         }
-
         let node = this.root;
-
         if (path) {
             for (const segment of this.split(path)) {
                 node = node.add(segment);
             }
         }
-
         for (const handler of handlers) {
             if (handler.root) {
                 node.merge(handler.root, this.seq);
@@ -104,62 +101,66 @@ class Router {
      * @param {{ best: { nodes: Node[], params: Record<string, string> } }} state
      * @returns {{ nodes: Node[], params: Record<string, string>, matched: boolean }}
      */
-    search(node, segments, index, path, params, state,method) {
+    search(method, segments, node, path = [], params = {}, state = { path: [], params: {} }, index = 0) {
         path.push(node);
-
-        // habis segmen -> full match
-        // if (index === segments.length) {
-        //     return { nodes: path.slice(), params: { ...params }, matched: true };
-        // }
         if (index === segments.length) {
-            if (node.handlers.has(method)) {
-                return { nodes: path.slice(), params: { ...params }, matched: true };
+            if (node.handlers.has(method) || node.handlers.has("ALL")) {
+                return { path, params, matched: true };
             }
-            // node ada tapi tidak punya handler method ini: catat sebagai partial, lalu coba cabang lain
-            if (path.length > state.best.nodes.length) {
-                state.best = { nodes: path.slice(), params: { ...params } };
+            if (path.length > state.path.length) {
+                state.path = path.slice();
+                state.params = { ...params };
             }
             path.pop();
-            return { matched: false };
+            return { path: state.path, params: state.params, matched: false };
         }
-
         const segment = segments[index];
-
-        // 1. static (prioritas tertinggi)
-        const staticChild = node.children.get(segment);
-        if (staticChild) {
-            const res = this.search(staticChild, segments, index + 1, path, params, state,method);
+        if (node.children.has(segment)) {
+            const res = this.search(
+                //
+                method,
+                segments,
+                node.children.get(segment),
+                path,
+                params,
+                state,
+                index + 1,
+            );
             if (res.matched) return res;
         }
-
-        // 2. semua param child (bisa lebih dari satu)
-        for (const [key, child] of node.params) {
-            const name = key.slice(1); // buang ':'
-            const prev = params[name];
-            params[name] = decodeParam(segment);
-            const res = this.search(child, segments, index + 1, path, params, state,method);
-            if (res.matched) return res;
-            // backtrack param value
-            if (prev === undefined) delete params[name];
-            else params[name] = prev;
+        if (node.params.size) {
+            for (const [, child] of node.params) {
+                const prev = params[child.name];
+                params[child.name] = decodeParam(segment);
+                const res = this.search(
+                    //
+                    method,
+                    segments,
+                    child,
+                    path,
+                    params,
+                    state,
+                    index + 1,
+                );
+                if (res.matched) return res;
+                if (prev === undefined) {
+                    const { [child.name]: _, ...rest } = params;
+                    params = rest;
+                } else params[child.name] = prev;
+            }
         }
-
-        // 3. wildcard (prioritas terendah, menyerap sisa segmen)
-        if (node.wildcard) {
+        if (node.wildcard && (node.wildcard.handlers.get(method) || node.wildcard.handlers.get("ALL"))) {
             const rest = segments.slice(index).join("/");
             params["wildcard"] = decodeParam(rest);
             path.push(node.wildcard);
-            return { nodes: path.slice(), params: { ...params }, matched: true };
+            return { path, params, matched: true };
         }
-
-        // tidak match di sini -> update partial terpanjang
-        // path.length > state.best.nodes.length artinya kita sudah lebih dalam
-        if (path.length > state.best.nodes.length) {
-            state.best = { nodes: path.slice(), params: { ...params } };
+        if (path.length > state.path.length) {
+            state.path = path.slice();
+            state.params = { ...params };
         }
-
         path.pop();
-        return { matched: false };
+        return { path: state.path, params: state.params, matched: false };
     }
 
     collectHandler(r, method, handlers) {
@@ -170,49 +171,30 @@ class Router {
         }
     }
 
-    collectErrorHandler(r, errorHandlers) {
-        if (r.handlers.has("CATCH")) {
-            for (const entry of r.handlers.get("CATCH")) {
-                errorHandlers[entry.seq] = entry.handler;
-            }
-        }
-    }
-
     collectMiddleware(r, handlers, errorHandlers) {
         this.collectHandler(r, "ALL", handlers);
-        this.collectErrorHandler(r, errorHandlers);
+        this.collectHandler(r, "CATCH", errorHandlers);
     }
 
     find(method, path) {
-        const segments = this.split(path);
-
-        const params = {};
+        const res = this.search(
+            //
+            method,
+            this.split(path),
+            this.root,
+        );
         const handlers = {};
         const errorHandlers = {};
-
-        /** @type {{ best: { nodes: Node[], params: Record<string, string> } }} */
-        const state = { best: { nodes: [], params: {} } };
-
-        const res = this.search(this.root, segments, 0, [], params, state,method);
-
-        const matchedNodes = res.matched ? res.nodes : state.best.nodes;
-        const finalParams = res.matched ? res.params : state.best.params;
-
-        // middleware dari semua node di jalur (partial atau full)
-        for (const r of matchedNodes) {
+        for (const r of res.path) {
             this.collectMiddleware(r, handlers, errorHandlers);
         }
-
-        // method handler HANYA kalau full match
         if (res.matched) {
-            const leaf = matchedNodes[matchedNodes.length - 1];
-            this.collectHandler(leaf, method, handlers);
+            this.collectHandler(res.path.at(-1), method, handlers);
         }
-
         return {
             matched: res.matched,
-            params: finalParams,
-            paramsLength: Object.keys(finalParams).length,
+            params: res.params,
+            paramsLength: Object.keys(res.params).length,
             handlers: Object.values(handlers),
             errorHandlers: Object.values(errorHandlers),
         };

package/src/util.js

@@ -1,5 +1,4 @@
-// const EMPTY_PARAMS = Object.freeze(Object.create(null));
-const EMPTY_PARAMS = Object.create(null)
+const EMPTY_PARAMS = Object.create(null);
 exports.EMPTY_PARAMS = EMPTY_PARAMS;
 
 function decodeParam(raw) {
@@ -13,7 +12,6 @@ exports.decodeParam = decodeParam;
 
 function decodeQuery(raw) {
     const normalized = raw.replace(/\+/g, " ");
-
     try {
         return decodeURIComponent(normalized);
     } catch (error) {
@@ -23,17 +21,13 @@ function decodeQuery(raw) {
 
 function parseQueryString(queryString) {
     if (queryString === "") return Object.create(null);
-
     const regex = /([^=&]*)=([^&]*)/g;
     const result = Object.create(null);
-
     let match;
     while ((match = regex.exec(queryString))) {
         const [, rawName, rawValue] = match;
-
         const name = decodeQuery(rawName);
         const value = decodeQuery(rawValue);
-
         if (Object.hasOwn(result, name)) {
             if (Array.isArray(result[name])) result[name].push(value);
             else result[name] = [result[name], value];
@@ -48,10 +42,8 @@ function parseUrl(url) {
     if (!(url.includes("?") || url.includes("#"))) {
         return { path: url, queryString: "" };
     }
-
     const regex = /^([^?#]*)(\?([^#]*))?(#.*)?$/;
     const [, path = "/", , queryString = ""] = regex.exec(url);
-    
     return { path, queryString };
 }
 exports.parseUrl = parseUrl;