ultimate-express 1.1.8 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-express",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {
@@ -44,6 +44,7 @@
     "cookie-signature": "^1.2.1",
     "encodeurl": "^2.0.0",
     "etag": "^1.8.1",
+    "fast-querystring": "^1.1.2",
     "fresh": "^0.5.2",
     "mime-types": "^2.1.35",
     "ms": "^2.1.3",

package/src/application.js

@@ -16,9 +16,8 @@ limitations under the License.
 
 const uWS = require("uWebSockets.js");
 const Router = require("./router.js");
-const { removeDuplicateSlashes, defaultSettings, compileTrust, createETagGenerator } = require("./utils.js");
-const querystring = require("querystring");
-const qs = require("qs");
+const { removeDuplicateSlashes, defaultSettings, compileTrust, createETagGenerator, fastQueryParse } = require("./utils.js");
+const querystring = require("fast-querystring");
 const ViewClass = require("./view.js");
 const path = require("path");
 const os = require("os");
@@ -117,7 +116,7 @@ class Application extends Router {
             }
         } else if(key === 'query parser') {
             if(value === 'extended') {
-                this.settings['query parser fn'] = qs.parse;
+                this.settings['query parser fn'] = fastQueryParse;
             } else if(value === 'simple') {
                 this.settings['query parser fn'] = querystring.parse;
             } else if(typeof value === 'function') {

package/src/response.js

@@ -238,9 +238,10 @@ module.exports = class Response extends Writable {
         if(this.headersSent) {
             throw new Error('Can\'t write body: Response was already sent');
         }
+        const isBuffer = Buffer.isBuffer(body);
         if(body === null || body === undefined) {
             body = '';
-        } else if(typeof body === 'object' && !Buffer.isBuffer(body)) {
+        } else if(typeof body === 'object' && !isBuffer) {
             return this.json(body);
         } else if(typeof body === 'number') {
             if(arguments[1]) {
@@ -250,7 +251,7 @@ module.exports = class Response extends Writable {
                 deprecated('res.send(status)', 'res.sendStatus(status)');
                 return this.sendStatus(body);
             }
-        } else {
+        } else if(!isBuffer) {
             body = String(body);
         }
         if(typeof body === 'string') {

package/src/router.js

@@ -303,13 +303,17 @@ module.exports = class Router extends EventEmitter {
 
     #extractParams(pattern, path) {
         let match = pattern.exec(path);
-        return match?.groups ?? {};
+        const obj = match?.groups ?? {};
+        for(let i = 1; i < match.length; i++) {
+            obj[i - 1] = match[i];
+        }
+        return obj;
     }
 
     #preprocessRequest(req, res, route) {
         return new Promise(async resolve => {
             req.route = route;
-            if(typeof route.path === 'string' && route.path.includes(':') && route.pattern instanceof RegExp) {
+            if(typeof route.path === 'string' && (route.path.includes(':') || route.path.includes('*')) && route.pattern instanceof RegExp) {
                 let path = req.path;
                 if(req._stack.length > 0) {
                     path = path.replace(this.getFullMountpath(req), '');

package/src/utils.js

@@ -18,9 +18,19 @@ const mime = require("mime-types");
 const path = require("path");
 const proxyaddr = require("proxy-addr");
 const qs = require("qs");
+const querystring = require("fast-querystring");
 const etag = require("etag");
 const { Stats } = require("fs");
 
+function fastQueryParse(query) {
+    if(query.length <= 128) {
+        if(!query.includes('[') && !query.includes('%5B') && !query.includes('.') && !query.includes('%2E')) {
+            return querystring.parse(query);
+        }
+    }
+    return qs.parse(query);
+}
+
 function removeDuplicateSlashes(path) {
     return path.replace(/\/{2,}/g, '/');
 }
@@ -36,7 +46,7 @@ function patternToRegex(pattern, isPrefix = false) {
     let regexPattern = pattern
         .replace(/\./g, '\\.')
         .replace(/\-/g, '\\-')
-        .replace(/\*/g, '.*') // Convert * to .*
+        .replace(/\*/g, '(.*)') // Convert * to .*
         .replace(/:(\w+)(\(.+?\))?/g, (match, param, regex) => {
             return `(?<${param}>${regex ? regex + '($|\\/)' : '[^/]+'})`;
         }); // Convert :param to capture group
@@ -115,7 +125,7 @@ const defaultSettings = {
     'etag': 'weak',
     'etag fn': () => createETagGenerator({ weak: true }),
     'query parser': 'extended',
-    'query parser fn': () => qs.parse,
+    'query parser fn': () => fastQueryParse,
     'subdomain offset': 2,
     'trust proxy': false,
     'views': () => path.join(process.cwd(), 'views'),
@@ -300,5 +310,6 @@ module.exports = {
     isPreconditionFailure,
     createETagGenerator,
     isRangeFresh,
-    findIndexStartingFrom
+    findIndexStartingFrom,
+    fastQueryParse
 };