ultimate-express 1.3.3 → 1.3.5

package/README.md

@@ -24,7 +24,7 @@ Similar projects based on uWebSockets:
 
 ### Test results
 
-Tested using [wrk](https://github.com/wg/wrk) (`-d 60 -t 1 -c 200`). Etag was disabled in both Express and µExpress. Tested on Ubuntu 22.04, Node.js 20.17.0, AMD Ryzen 5 3600, 64GB RAM.
+Tested using [wrk](https://github.com/wg/wrk) (`-d 60 -t 1 -c 200`). Tested on Ubuntu 22.04, Node.js 20.17.0, AMD Ryzen 5 3600, 64GB RAM.
 
 | Test                                          | Express req/sec | µExpress req/sec | Express throughput | µExpress throughput | µExpress speedup |
 | --------------------------------------------- | --------------- | ---------------- | ------------------ | ------------------- | ---------------- |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-express",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {

package/src/middlewares.js

@@ -38,7 +38,6 @@ function static(root, options) {
         options.extensions = options.extensions.map(ext => ext.startsWith('.') ? ext.slice(1) : ext);
     }
     options.root = root;
-    options.skipEncodePath = true;
 
     return (req, res, next) => {
         const iq = req.url.indexOf('?');
@@ -87,7 +86,7 @@ function static(root, options) {
 
         if(stat.isDirectory()) {
             if(!req.endsWithSlash) {
-                if(options.redirect) return res.redirect(301, req.path + '/');
+                if(options.redirect) return res.redirect(301, req._originalPath + '/');
                 else {
                     if(!options.fallthrough) {
                         res.status(404);

package/src/request.js

@@ -60,6 +60,7 @@ module.exports = class Request extends Readable {
         this.path = iq !== -1 ? this.url.substring(0, iq) : this.url;
         this.endsWithSlash = this.path[this.path.length - 1] === '/';
         this._opPath = this.path;
+        this._originalPath = this.path;
         if(this.endsWithSlash && this.path !== '/' && !this.app.get('strict routing')) {
             this._opPath = this._opPath.slice(0, -1);
         }
@@ -119,7 +120,7 @@ module.exports = class Request extends Readable {
     }
 
     get baseUrl() {
-        let match = this.path.match(patternToRegex(this._stack.join(""), true));
+        let match = this._originalPath.match(patternToRegex(this._stack.join(""), true));
         return match ? match[0] : '';
     }
 

package/src/router.js

@@ -285,7 +285,7 @@ module.exports = class Router extends EventEmitter {
             if(!matchedRoute && !response.headersSent && !response.aborted) {
                 response.status(404);
                 request.noEtag = true;
-                this._sendErrorPage(request, response, `Cannot ${request.method} ${request.path}`, false);
+                this._sendErrorPage(request, response, `Cannot ${request.method} ${request._originalPath}`, false);
             }
         };
         route.optimizedPath = optimizedPath;
@@ -359,7 +359,7 @@ module.exports = class Router extends EventEmitter {
             if(route.optimizedParams) {
                 req.params = req.optimizedParams;
             } else if(typeof route.path === 'string' && (route.path.includes(':') || route.path.includes('*')) && route.pattern instanceof RegExp) {
-                let path = req.path;
+                let path = req._originalPath;
                 if(req._stack.length > 0) {
                     path = path.replace(this.getFullMountpath(req), '');
                 }
@@ -449,16 +449,20 @@ module.exports = class Router extends EventEmitter {
         if(route.use) {
             const strictRouting = this.get('strict routing');
             req._stack.push(route.path);
-            req._opPath = req.path.replace(this.getFullMountpath(req), '');
-            if(strictRouting) {
-                if(req.endsWithSlash && req.path !== '/') {
-                     req._opPath += '/';
+            req._opPath = req._originalPath.replace(this.getFullMountpath(req), '');
+            if(req.endsWithSlash && req._opPath[req._opPath.length - 1] !== '/') {
+                if(strictRouting) {
+                    req._opPath += '/';
+                } else {
+                    req._opPath = req._opPath.slice(0, -1);
                 }
-            } else if(req.endsWithSlash && req.path !== '/') {
-                req._opPath = req._opPath.slice(0, -1);
             }
             req.url = req._opPath + req.urlQuery;
-            if(req.url === '') req.url = '/';
+            req.path = req._opPath;
+            if(req._opPath === '') {
+                req.url = '/';
+                req.path = '/';
+            }
         }
         return new Promise((resolve) => {
             const next = async (thingamabob) => {
@@ -467,16 +471,21 @@ module.exports = class Router extends EventEmitter {
                         if(route.use && thingamabob !== 'skipPop') {
                             req._stack.pop();
                             const strictRouting = this.get('strict routing');
-                            req._opPath = req._stack.length > 0 ? req.path.replace(this.getFullMountpath(req), '') : req.path;
+                            req._opPath = req._stack.length > 0 ? req._originalPath.replace(this.getFullMountpath(req), '') : req._originalPath;
                             if(strictRouting) {
-                                if(req.endsWithSlash && req.path !== '/') {
+                                if(req.endsWithSlash && req._opPath[req._opPath.length - 1] !== '/') {
                                     req._opPath += '/';
                                 }
-                            } else if(req.endsWithSlash && req.path !== '/' && req._opPath[req._opPath.length - 1] === '/') {
-                                req._opPath = req._opPath.slice(0, -1);
                             }
                             req.url = req._opPath + req.urlQuery;
-                            if(req.url === '') req.url = '/';
+                            req.path = req._opPath;
+                            if(req._opPath === '') {
+                                req.url = '/';
+                                req.path = '/';
+                            }
+                            if(!strictRouting && req.endsWithSlash && req._originalPath !== '/' && req._opPath[req._opPath.length - 1] === '/') {
+                                req._opPath = req._opPath.slice(0, -1);
+                            }
                             if(req.app.parent && route.callback.constructor.name === 'Application') {
                                 req.app = req.app.parent;
                             }
@@ -498,7 +507,7 @@ module.exports = class Router extends EventEmitter {
                     if(callback.settings.mergeParams) {
                         req._paramStack.push(req.params);
                     }
-                    if(callback.settings['strict routing'] && req.endsWithSlash && req.path !== '/') {
+                    if(callback.settings['strict routing'] && req.endsWithSlash && req._opPath[req._opPath.length - 1] !== '/') {
                         req._opPath += '/';
                     }
                     const routed = await callback._routeRequest(req, res, 0);