ultimate-express 1.2.24 → 1.2.26

package/README.md

@@ -119,7 +119,7 @@ Optimized routes can be up to 10 times faster than normal routes, as they're usi
 
 Since you don't create http server manually, you can't properly use http.on("upgrade") to handle WebSockets. To solve this, there's currently 2 options:
 
-- There's currently another library in works: [Ultimate WS](https://github.com/dimdenGD/ultimate-ws) that implements `ws` module. It's same concept as this library, but for WebSockets: fast drop-in replacement for `ws` module with support for uExpress upgrades.
+- There's a sister library that implements `ws` compatible API: [Ultimate WS](https://github.com/dimdenGD/ultimate-ws). It's same concept as this library, but for WebSockets: fast drop-in replacement for `ws` module with support for Ultimate Express upgrades. There's a guide for how to upgrade http requests in the documentation.  
 - You can simply use `app.uwsApp` to access uWebSockets.js `App` instance and call its `ws()` method directly.
 
 ## Compatibility

package/package.json

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

package/src/router.js

@@ -417,12 +417,18 @@ module.exports = class Router extends EventEmitter {
                 return resolve(this._routeRequest(req, res, 0, this._routes, false, skipUntil));
             }
             let callbackindex = 0;
-            let continueRoute = await this._preprocessRequest(req, res, route);
+            const continueRoute = await this._preprocessRequest(req, res, route);
             if(route.use) {
+                const strictRouting = this.get('strict routing');
                 req._stack.push(route.path);
-                req._opPath = 
-                    req.path.replace(this.getFullMountpath(req), '') + 
-                    (req.endsWithSlash && req.path !== '/' && this.get('strict routing') ? '/' : '');
+                req._opPath = req.path.replace(this.getFullMountpath(req), '');
+                if(strictRouting) {
+                    if(req.endsWithSlash && req.path !== '/') {
+                        req._opPath += '/';
+                    }
+                } else if(req.endsWithSlash && req.path !== '/') {
+                    req._opPath = req._opPath.slice(0, -1);
+                }
                 req.url = req._opPath + req.urlQuery;
                 if(req.url === '') req.url = '/';
             }
@@ -431,9 +437,15 @@ module.exports = class Router extends EventEmitter {
                     if(thingamabob === 'route' || thingamabob === 'skipPop') {
                         if(route.use && thingamabob !== 'skipPop') {
                             req._stack.pop();
-                            req._opPath = 
-                                (req._stack.length > 0 ? req.path.replace(this.getFullMountpath(req), '') : req.path) + 
-                                (req.endsWithSlash && req.path !== '/' && this.get('strict routing') ? '/' : '');
+                            const strictRouting = this.get('strict routing');
+                            req._opPath = req._stack.length > 0 ? req.path.replace(this.getFullMountpath(req), '') : req.path;
+                            if(strictRouting) {
+                                if(req.endsWithSlash && req.path !== '/') {
+                                    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 = '/';
                             if(req.app.parent && route.callback.constructor.name === 'Application') {
@@ -457,6 +469,9 @@ module.exports = class Router extends EventEmitter {
                     if(callback.settings.mergeParams) {
                         req._paramStack.push(req.params);
                     }
+                    if(callback.settings['strict routing'] && req.endsWithSlash && req.path !== '/') {
+                        req._opPath += '/';
+                    }
                     const routed = await callback._routeRequest(req, res, 0);
                     if(routed) return resolve(true);
                     next();