@ndiinginc/router 4.16.0 → 4.16.2

package/package.json

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

package/src/response.js

@@ -3,39 +3,60 @@ const fs = require("fs");
 const path = require("path");
 
 class Response extends http.ServerResponse {
-    status(code) {
-        this.statusCode = code;
+    /**
+     * @param {number} statusCode
+     * @returns {this}
+     */
+    status(statusCode = 200) {
+        this.statusCode = statusCode;
         return this;
     }
-    send(chunk) {
-        this.setHeader("Content-Type", "text/plain; charset=utf-8");
-        this.end(chunk);
+
+    /**
+     * @param {string} data
+     */
+    send(data) {
+        this.setHeader("Content-Type", "text/html");
+        this.setHeader("Content-Length", Buffer.byteLength(data));
+        this.end(data);
     }
 
-    json(value) {
-        this.setHeader("Content-Type", "application/json; charset=utf-8");
-        this.end(JSON.stringify(value));
+    /**
+     * @param {object} data
+     */
+    json(data) {
+        const body = JSON.stringify(data);
+        this.setHeader("Content-Type", "application/json");
+        this.setHeader("Content-Length", Buffer.byteLength(body));
+        this.end(body);
     }
 
-    download(filepath, filename) {
-        fs.stat(filepath, (err, stats) => {
-            if (err || !stats.isFile()) {
-                this.statusCode = 404;
-                return this.end();
+    /**
+     * @param {string} filePath
+     * @param {string} filename
+     */
+    download(filePath, filename) {
+        if (!fs.existsSync(filePath)) {
+            this.status(404);
+            return this.end();
+        }
+
+        const stat = fs.statSync(filePath);
+        const basename = filename || path.basename(filePath);
+
+        this.setHeader("Content-Type", "application/octet-stream");
+        this.setHeader("Content-Length", stat.size);
+        this.setHeader("Content-Disposition", `attachment; filename="${basename}"`);
+
+        const stream = fs.createReadStream(filePath);
+        stream.on("error", (err) => {
+            if (!this.headersSent) {
+                this.status(500);
             }
-            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);
+            this.end();
         });
+
+        stream.pipe(this);
     }
 }
 exports.Response = Response;

package/src/router.js

@@ -244,10 +244,10 @@ class Router {
         }
         if (node.params.size) {
             for (const [, child] of node.params) {
-                const index = path.indexOf("/");
-                const value = index === -1 ? path : path.slice(0, index);
+                const slashIdx = path.indexOf("/");
+                const value = slashIdx === -1 ? path : path.slice(0, slashIdx);
                 if (value.length) {
-                    const rest = index === -1 ? "" : path.slice(index);
+                    const rest = slashIdx === -1 ? "" : path.slice(slashIdx);
                     const next = { ...params, [child.name]: value };
                     const result = this.search(method, rest, child, nodes, next, state);
                     if (result.matched) return result;