ultimate-express 1.2.0 → 1.2.1

package/package.json

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

package/src/application.js

@@ -178,23 +178,12 @@ class Application extends Router {
 
     #createRequestHandler() {
         this.uwsApp.any('/*', async (res, req) => {
-            const request = new this._request(req, res, this);
-            const response = new this._response(res, request, this);
-            request.res = response;
-            response.req = request;
-            
-            res.onAborted(() => {
-                const err = new Error('Request aborted');
-                err.code = 'ECONNABORTED';
-                response.aborted = true;
-                response.socket.emit('error', err);
-            });
-
-            let matchedRoute = await this._routeRequest(request, response);
+            const { request, response } = this.handleRequest(res, req);
 
-            if(!matchedRoute && !res.aborted && !response.headersSent) {
+            const matchedRoute = await this._routeRequest(request, response);
+            if(!matchedRoute && !response.headersSent && !response.aborted) {
                 response.status(404);
-                response.send(this._generateErrorPage(`Cannot ${request.method} ${request.path}`));
+                response.send(this._generateErrorPage(`Cannot ${request.method} ${request.path}`, false));
             }
         });
     }

package/src/router.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const { patternToRegex, needsConversionToRegex, deprecated, findIndexStartingFrom } = require("./utils.js");
+const { patternToRegex, needsConversionToRegex, deprecated, findIndexStartingFrom, canBeOptimized } = require("./utils.js");
 const Response = require("./response.js");
 const Request = require("./request.js");
 const { EventEmitter } = require("tseep");
@@ -138,7 +138,7 @@ module.exports = class Router extends EventEmitter {
             };
             routes.push(route);
             // normal routes optimization
-            if(typeof route.pattern === 'string' && route.pattern !== '/*' && !this.parent && this.get('case sensitive routing') && this.uwsApp) {
+            if(canBeOptimized(route.path) && route.pattern !== '/*' && !this.parent && this.get('case sensitive routing') && this.uwsApp) {
                 if(supportedUwsMethods.includes(method)) {
                     const optimizedPath = this.#optimizeRoute(route, this._routes);
                     if(optimizedPath) {
@@ -185,7 +185,8 @@ module.exports = class Router extends EventEmitter {
                                             this.#registerUwsRoute({
                                                 ...cbroute,
                                                 path: route.path + cbroute.path,
-                                                pattern: route.path + cbroute.path
+                                                pattern: route.path + cbroute.path,
+                                                optimizedRouter: true
                                             }, optimizedPath);
                                         }
                                     }
@@ -239,6 +240,21 @@ module.exports = class Router extends EventEmitter {
         return optimizedPath;
     }
 
+    handleRequest(res, req) {
+        const request = new this._request(req, res, this);
+        const response = new this._response(res, request, this);
+        request.res = response;
+        response.req = request;
+        res.onAborted(() => {
+            const err = new Error('Connection closed');
+            err.code = 'ECONNRESET';
+            response.aborted = true;
+            response.socket.emit('error', err);
+        });
+
+        return { request, response };
+    }
+
     #registerUwsRoute(route, optimizedPath) {
         let method = route.method.toLowerCase();
         if(method === 'all') {
@@ -246,35 +262,34 @@ module.exports = class Router extends EventEmitter {
         } else if(method === 'delete') {
             method = 'del';
         }
+        if(!route.optimizedRouter && route.path.includes(":")) {
+            route.optimizedParams = route.path.match(/:(\w+)/g).map(p => p.slice(1));
+        }
         const fn = async (res, req) => {
-            const request = new this._request(req, res, this);
-            const response = new this._response(res, request, this);
-            request.res = response;
-            response.req = request;
-            res.onAborted(() => {
-                const err = new Error('Connection closed');
-                err.code = 'ECONNRESET';
-                response.aborted = true;
-                response.socket.emit('error', err);
-            });
-
-            const routed = await this._routeRequest(request, response, 0, optimizedPath, true, route);
-            if(routed) {
-                return;
+            const { request, response } = this.handleRequest(res, req);
+            if(route.optimizedParams) {
+                request.optimizedParams = {};
+                for(let i = 0; i < route.optimizedParams.length; i++) {
+                    request.optimizedParams[route.optimizedParams[i]] = req.getParameter(i);
+                }
+            }
+            const matchedRoute = await this._routeRequest(request, response, 0, optimizedPath, true, route);
+            if(!matchedRoute && !response.headersSent && !response.aborted) {
+                response.status(404);
+                response.send(this._generateErrorPage(`Cannot ${request.method} ${request.path}`, false));
             }
-            response.status(404);
-            response.send(this._generateErrorPage(`Cannot ${request.method} ${request.path}`, false));
         };
         route.optimizedPath = optimizedPath;
-        this.uwsApp[method](route.path, fn);
+        let replacedPath = route.path.replace(/:(\w+)/g, ':x');
+        this.uwsApp[method](replacedPath, fn);
         if(!this.get('strict routing') && route.path[route.path.length - 1] !== '/') {
-            this.uwsApp[method](route.path + '/', fn);
+            this.uwsApp[method](replacedPath + '/', fn);
             if(method === 'get') {
-                this.uwsApp.head(route.path + '/', fn);
+                this.uwsApp.head(replacedPath + '/', fn);
             }
         }
         if(method === 'get') {
-            this.uwsApp.head(route.path, fn);
+            this.uwsApp.head(replacedPath, fn);
         }
     }
 
@@ -313,7 +328,9 @@ module.exports = class Router extends EventEmitter {
     #preprocessRequest(req, res, route) {
         return new Promise(async resolve => {
             req.route = route;
-            if(typeof route.path === 'string' && (route.path.includes(':') || route.path.includes('*')) && route.pattern instanceof RegExp) {
+            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;
                 if(req._stack.length > 0) {
                     path = path.replace(this.getFullMountpath(req), '');
@@ -324,31 +341,6 @@ module.exports = class Router extends EventEmitter {
                         req.params = {...params, ...req.params};
                     }
                 }
-
-                for(let param in req.params) {
-                    if(this.#paramCallbacks.has(param) && !req._gotParams.has(param)) {
-                        req._gotParams.add(param);
-                        const pcs = this.#paramCallbacks.get(param);
-                        for(let i = 0; i < pcs.length; i++) {
-                            const fn = pcs[i];
-                            await new Promise(resolveRoute => {
-                                const next = (thingamabob) => {
-                                    if(thingamabob) {
-                                        if(thingamabob === 'route') {
-                                            return resolve('route');
-                                        } else {
-                                            this.#handleError(thingamabob, req, res);
-                                            return resolve(false);
-                                        }
-                                    }
-                                    return resolveRoute();
-                                };
-                                req.next = next;
-                                fn(req, res, next, req.params[param], param);
-                            });
-                        }
-                    }
-                }
             } else {
                 req.params = {};
                 if(req._paramStack.length > 0) {
@@ -358,6 +350,31 @@ module.exports = class Router extends EventEmitter {
                 }
             }
 
+            for(let param in req.params) {
+                if(this.#paramCallbacks.has(param) && !req._gotParams.has(param)) {
+                    req._gotParams.add(param);
+                    const pcs = this.#paramCallbacks.get(param);
+                    for(let i = 0; i < pcs.length; i++) {
+                        const fn = pcs[i];
+                        await new Promise(resolveRoute => {
+                            const next = (thingamabob) => {
+                                if(thingamabob) {
+                                    if(thingamabob === 'route') {
+                                        return resolve('route');
+                                    } else {
+                                        this.#handleError(thingamabob, req, res);
+                                        return resolve(false);
+                                    }
+                                }
+                                return resolveRoute();
+                            };
+                            req.next = next;
+                            fn(req, res, next, req.params[param], param);
+                        });
+                    }
+                }
+            }
+
             resolve(true);
         });
     }

package/src/utils.js

@@ -74,6 +74,29 @@ function needsConversionToRegex(pattern) {
         pattern.includes(']');
 }
 
+function canBeOptimized(pattern) {
+    if(pattern === '/*') {
+        return false;
+    }
+    if(pattern instanceof RegExp) {
+        return false;
+    }
+    if(
+        pattern.includes('*') ||
+        pattern.includes('?') ||
+        pattern.includes('+') ||
+        pattern.includes('(') ||
+        pattern.includes(')') ||
+        pattern.includes('{') ||
+        pattern.includes('}') ||
+        pattern.includes('[') ||
+        pattern.includes(']')
+    ) {
+        return false;
+    }
+    return true;
+}
+
 function acceptParams(str) {
     const parts = str.split(/ *; */);
     const ret = { value: parts[0], quality: 1, params: {} }
@@ -311,5 +334,6 @@ module.exports = {
     createETagGenerator,
     isRangeFresh,
     findIndexStartingFrom,
-    fastQueryParse
+    fastQueryParse,
+    canBeOptimized
 };