@ndiinginc/router 4.15.0 → 4.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndiinginc/router",
-  "version": "4.15.0",
+  "version": "4.16.0",
   "description": "",
   "main": "./src/index.js",
   "scripts": {

package/src/app.js

@@ -61,12 +61,12 @@ class App extends Router {
      * @param {Response} res
      */
     async handle(req, res) {
-        const { params, handlers, errorHandlers } = this.find(req.method, req.path);
-        req.params = this.decodeParams(params);
+        const result = this.find(req.method, req.path);
+        req.params = result.params;
         let err;
         try {
             const handlerPromise = async () => {
-                for (const handler of Object.values(handlers)) {
+                for (const handler of result.handlers) {
                     if (res.writableEnded) break;
                     await handler(req, res);
                 }
@@ -79,7 +79,7 @@ class App extends Router {
         } catch (error) {
             err = error;
             try {
-                for (const handler of Object.values(errorHandlers)) {
+                for (const handler of result.errorHandlers) {
                     if (res.writableEnded) break;
                     await handler(err, req, res);
                 }

package/src/node.js

@@ -1,12 +1,12 @@
 class Node {
     /**
-     * @param {String} segment
+     * @param {String} prefix
      */
-    constructor(segment = "") {
-        this.segment = segment;
-        if (segment.startsWith(":")) {
+    constructor(prefix = "") {
+        this.prefix = prefix;
+        if (prefix.startsWith(":")) {
             /**@type {String}*/
-            this.name = segment.slice(1);
+            this.name = prefix.slice(1);
         }
         /**@type {Map<string,Node>}*/
         this.children = new Map();
@@ -19,25 +19,25 @@ class Node {
     }
 
     /**
-     * @param {String} segment
+     * @param {String} prefix
      * @returns {Node}
      */
-    add(segment) {
-        if (segment === "*") {
+    add(prefix) {
+        if (prefix === "*") {
             if (!this.wildcard) this.wildcard = new Node("*");
             return this.wildcard;
         }
-        if (segment.startsWith(":")) {
-            return this.params.getOrInsertComputed(segment, (segment) => new Node(segment));
+        if (prefix.startsWith(":")) {
+            return this.params.getOrInsertComputed(prefix, (prefix) => new Node(prefix));
         }
-        return this.children.getOrInsertComputed(segment, (segment) => new Node(segment));
+        return this.children.getOrInsertComputed(prefix, (prefix) => new Node(prefix));
     }
 
     /**
-     * @param {String} segment
+     * @param {String} prefix
      */
-    remove(segment) {
-        this.children.delete(segment);
+    remove(prefix) {
+        this.children.delete(prefix);
     }
 
     /**
@@ -56,11 +56,11 @@ 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 [prefix, child] of node.params) {
+            this.add(prefix).merge(child, offset);
         }
-        for (const [segment, child] of node.children) {
-            this.add(segment).merge(child, offset);
+        for (const [prefix, child] of node.children) {
+            this.add(prefix).merge(child, offset);
         }
     }
 

package/src/response.js

@@ -1,31 +1,41 @@
 const http = require("http");
+const fs = require("fs");
+const path = require("path");
 
 class Response extends http.ServerResponse {
-    /**
-     * @param {Number} code
-     * @returns {Response}
-     */
     status(code) {
         this.statusCode = code;
         return this;
     }
-
-    /**
-     * @param {String} chunk
-     */
     send(chunk) {
-        if (this.writableEnded) return;
-        this.end(chunk, null, null);
+        this.setHeader("Content-Type", "text/plain; charset=utf-8");
+        this.end(chunk);
     }
 
-    /**
-     * @param {Object} value
-     */
     json(value) {
-        if (!this.headersSent) {
-            this.setHeader("Content-Type", "application/json; charset=utf-8");
-        }
-        this.send(JSON.stringify(value));
+        this.setHeader("Content-Type", "application/json; charset=utf-8");
+        this.end(JSON.stringify(value));
+    }
+
+    download(filepath, filename) {
+        fs.stat(filepath, (err, stats) => {
+            if (err || !stats.isFile()) {
+                this.statusCode = 404;
+                return this.end();
+            }
+            filename=filename||path.basename(filepath)
+            this.setHeader("Content-Type", "application/octet-stream");
+            this.setHeader("Content-Disposition", `attachment; filename="${filename}"`);
+            this.setHeader("Content-Length", stats.size);
+            const stream = fs.createReadStream(filepath);
+            stream.on("error", (err) => {
+                if (!this.headersSent) {
+                    this.statusCode = 500;
+                    this.end();
+                }
+            });
+            stream.pipe(this);
+        });
     }
 }
 exports.Response = Response;

package/src/router.js

@@ -41,19 +41,19 @@ class Router {
      * @returns
      */
     walk(path, node) {
-        for (const [segment, child] of node.children) {
-            const lcp = this.lcp(segment, path);
+        for (const [prefix, child] of node.children) {
+            const lcp = this.lcp(prefix, path);
             if (lcp === 0) continue;
-            if (lcp === segment.length) {
+            if (lcp === prefix.length) {
                 if (lcp === path.length) return child;
                 return this.walk(path.slice(lcp), child);
             }
-            const newNode = new Node(segment.slice(0, lcp));
-            newNode.add(segment.slice(lcp)).merge(child);
+            const newNode = new Node(prefix.slice(0, lcp));
+            newNode.add(prefix.slice(lcp)).merge(child);
             const rest = path.slice(lcp);
             if (rest.length) newNode.add(rest);
-            node.add(newNode.segment).merge(newNode);
-            node.remove(segment);
+            node.add(newNode.prefix).merge(newNode);
+            node.remove(prefix);
         }
         return node.add(path);
     }
@@ -75,8 +75,8 @@ class Router {
                 if (path[i] === ":") {
                     let j = i + 1;
                     while (j < path.length && path[j] !== "/") j++;
-                    let segment = path.slice(i, j);
-                    node = node.add(segment);
+                    let prefix = path.slice(i, j);
+                    node = node.add(prefix);
                     i = j;
                 } else if (path[i] === "*") {
                     let j = i + 1;
@@ -229,25 +229,29 @@ class Router {
             }
             if (nodes.length > state.nodes.length) {
                 state.nodes = nodes.slice();
-                params = { ...params };
+                state.params = { ...params };
             }
             nodes.pop();
             return { nodes: state.nodes, params: state.params, matched: false };
         }
-        for (const [segment, child] of node.children) {
-            if (path.startsWith(segment)) {
-                const res = this.search(method, path.slice(segment.length), child, nodes, params, state);
-                if (res.matched) return res;
+        if (node.children.size) {
+            for (const [prefix, child] of node.children) {
+                if (path.startsWith(prefix)) {
+                    const res = this.search(method, path.slice(prefix.length), child, nodes, params, state);
+                    if (res.matched) return res;
+                }
             }
         }
-        for (const [, child] of node.params) {
-            const slashIdx = path.indexOf("/");
-            const value = slashIdx === -1 ? path : path.slice(0, slashIdx);
-            const rest = slashIdx === -1 ? "" : path.slice(slashIdx);
-            if (value.length > 0) {
-                const next = { ...params, [child.name]: value };
-                const result = this.search(method, rest, child, nodes, next, state);
-                if (result.matched) return result;
+        if (node.params.size) {
+            for (const [, child] of node.params) {
+                const index = path.indexOf("/");
+                const value = index === -1 ? path : path.slice(0, index);
+                if (value.length) {
+                    const rest = index === -1 ? "" : path.slice(index);
+                    const next = { ...params, [child.name]: value };
+                    const result = this.search(method, rest, child, nodes, next, state);
+                    if (result.matched) return result;
+                }
             }
         }
         if (node.wildcard && (node.wildcard.handlers.get(method) || node.wildcard.handlers.get("ALL"))) {
@@ -256,7 +260,7 @@ class Router {
         }
         if (nodes.length > state.nodes.length) {
             state.nodes = nodes.slice();
-            params = { ...params };
+            state.params = { ...params };
         }
         nodes.pop();
         return { nodes: state.nodes, params: state.params, matched: false };
@@ -269,8 +273,8 @@ class Router {
      */
     collectHandler(node, method, handlers) {
         if (node.handlers.has(method)) {
-            for (const { seq, handler } of node.handlers.get(method)) {
-                handlers[seq] = handler;
+            for (const entry of node.handlers.get(method)) {
+                handlers[entry.seq] = entry.handler;
             }
         }
     }
@@ -287,8 +291,11 @@ class Router {
 
     decodeParams(obj) {
         const params = Object.create(null);
-        for (const key of Object.keys(obj)) {
-            params[key] = decodeParam(obj[key]);
+        const keys = Object.keys(obj);
+        if (keys.length) {
+            for (const key of keys) {
+                params[key] = decodeParam(obj[key]);
+            }
         }
         return params;
     }
@@ -306,13 +313,17 @@ class Router {
         }
         const handlers = {};
         const errorHandlers = {};
+        if (res.matched) {
+            this.collectHandler(res.nodes.at(-1), method, handlers);
+        }
         for (const node of res.nodes) {
             this.collectMiddleware(node, handlers, errorHandlers);
         }
-        if (res.matched) {
-            this.collectHandler(res.nodes[res.nodes.length - 1], method, handlers);
-        }
-        return { params: res.params, handlers, errorHandlers };
+        return {
+            params: this.decodeParams(res.params),
+            handlers: Object.values(handlers),
+            errorHandlers: Object.values(errorHandlers),
+        };
     }
 }
 exports.Router = Router;