@ndiinginc/router 4.12.0 → 4.13.0

package/package.json

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

package/rest/router.http

@@ -8,6 +8,10 @@ Content-Type: application/json; charset=utf-8; asdfadsf
     "user":"name",
     "pass":"word"
 }
+###
+POST http://localhost:3000
+Content-Type: application/x-www-form-urlencoded
+
 ###
 GET http://localhost:4000
 ###

package/src/index.js

@@ -3,9 +3,11 @@ const { App } = require("./app");
 const { Router } = require("./router");
 const { json } = require("./middleware/json");
 const { cors } = require("./middleware/cors");
+const { urlencoded } = require("./middleware/urlencoded");
 
 App.Router = Router;
 App.json = json;
 App.cors = cors;
+App.urlencoded = urlencoded;
 
 module.exports = App;

package/src/middleware/urlencoded.js

@@ -0,0 +1,44 @@
+const http = require("http");
+const { parseQueryString } = require("../util");
+
+/**
+ * @typedef {Object} Options
+ * @property {Number} [limit=1.024e+5]
+ */
+
+/**
+ * @param {Options} Options
+ * @returns {Callback}
+ */
+function urlencoded({ limit = 1.024e5 } = {}) {
+    return async (req, res) => {
+        if (!["POST", "PUT", "PATCH", "QUERY"].includes(req.method)) {
+            return;
+        }
+        const contentType = req.headers["content-type"];
+        if (!contentType || !contentType.includes("application/x-www-form-urlencoded")) {
+            return;
+        }
+        const contentLength = parseInt(req.headers["content-length"], 10);
+        if (contentLength && contentLength > limit) {
+            res.statusCode = 413;
+            throw new Error(http.STATUS_CODES[res.statusCode]);
+        }
+        let chunkLength = 0;
+        const chunks = [];
+        for await (const chunk of req) {
+            chunkLength += chunk.length;
+            if (chunkLength > limit) {
+                res.statusCode = 413;
+                throw new Error(http.STATUS_CODES[res.statusCode]);
+            }
+            chunks.push(chunk);
+        }
+        if (chunks.length === 0) {
+            req.body = null;
+            return;
+        }
+        req.body = parseQueryString(Buffer.concat(chunks).toString("utf8"));
+    };
+}
+exports.urlencoded = urlencoded;

package/src/router.js

@@ -189,32 +189,14 @@ class Router {
         }
         const segment = segments[index];
         if (node.children.has(segment)) {
-            const res = this.search(
-                //
-                method,
-                segments,
-                node.children.get(segment),
-                path,
-                params,
-                state,
-                index + 1,
-            );
+            const res = this.search(method, segments, node.children.get(segment), path, params, state, index + 1);
             if (res.matched) return res;
         }
         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,
-                );
+                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;
@@ -223,8 +205,7 @@ class Router {
             }
         }
         if (node.wildcard && (node.wildcard.handlers.get(method) || node.wildcard.handlers.get("ALL"))) {
-            const rest = segments.slice(index).join("/");
-            params["wildcard"] = decodeParam(rest);
+            params["wildcard"] = segments.slice(index).map(decodeParam).join("/");
             path.push(node.wildcard);
             return { path, params, matched: true };
         }
@@ -265,12 +246,7 @@ class Router {
      * @returns {{matched: boolean;params: Object;paramsLength: number;handlers: any[];errorHandlers: any[];}}
      */
     find(method, path) {
-        const res = this.search(
-            //
-            method,
-            this.split(path),
-            this.root,
-        );
+        const res = this.search(method, this.split(path), this.root);
         const handlers = {};
         const errorHandlers = {};
         for (const r of res.path) {