ultimate-express 2.0.13 → 2.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-express",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {
@@ -47,7 +47,7 @@
     "accepts": "^1.3.8",
     "acorn": "^8.15.0",
     "bytes": "^3.1.2",
-    "cookie": "^1.0.2",
+    "cookie": "^1.1.1",
     "cookie-signature": "^1.2.2",
     "encodeurl": "^2.0.0",
     "etag": "^1.8.1",
@@ -62,30 +62,30 @@
     "statuses": "^2.0.2",
     "tseep": "^1.3.1",
     "type-is": "^2.0.1",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.55.0",
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.56.0",
     "vary": "^1.1.2"
   },
   "devDependencies": {
     "@codechecks/client": "^0.1.12",
     "better-sse": "^0.14.1",
-    "body-parser": "^2.2.0",
+    "body-parser": "^2.2.1",
     "compression": "^1.8.1",
     "cookie-parser": "^1.4.7",
     "cookie-session": "^2.1.1",
     "cors": "^2.8.5",
     "ejs": "^3.1.10",
-    "errorhandler": "^1.5.1",
-    "eventsource": "^4.0.0",
+    "errorhandler": "^1.5.2",
+    "eventsource": "^4.1.0",
     "exit-hook": "^2.2.1",
     "express": "latest-4",
     "express-art-template": "^1.0.1",
     "express-async-errors": "^3.1.1",
     "express-dot-engine": "^1.0.8",
     "express-fileupload": "^1.5.2",
-    "express-handlebars": "^8.0.3",
+    "express-handlebars": "^8.0.4",
     "express-http-proxy": "^2.1.2",
     "express-mongo-sanitize": "^2.2.0",
-    "express-rate-limit": "^8.1.0",
+    "express-rate-limit": "^8.2.1",
     "express-session": "^1.18.2",
     "express-subdomain": "^1.0.6",
     "graphql-http": "^1.22.4",
@@ -93,17 +93,17 @@
     "http-proxy-middleware": "^3.0.5",
     "method-override": "^3.0.0",
     "morgan": "^1.10.1",
-    "multer": "^1.4.5-lts.2",
+    "multer": "^2.0.2",
     "mustache-express": "^1.3.2",
     "nyc": "^17.1.0",
     "pako": "^2.1.0",
     "passport": "^0.7.0",
     "passport-local": "^1.0.0",
-    "pkg-pr-new": "^0.0.60",
+    "pkg-pr-new": "^0.0.62",
     "pug": "^3.0.3",
     "response-time": "^2.3.4",
     "serve-index": "^1.9.1",
-    "serve-static": "^2.2.0",
+    "serve-static": "^2.2.1",
     "swagger-ui-express": "^5.0.1",
     "swig": "^1.4.2",
     "vhost": "^3.0.2"

package/src/declarative.js

@@ -31,7 +31,7 @@ module.exports = function compileDeclarative(cb, app) {
 
         const tokens = [...acorn.tokenizer(code, { ecmaVersion: "latest" })];
 
-        if(tokens.some(token => ['throw', 'new', 'await', 'return'].includes(token.value))) {
+        if(tokens.some(token => ['throw', 'new', 'await', 'return', 'try', 'catch', 'finally', 'if', 'else', 'switch', 'case', 'default', 'for', 'while', 'do', 'var', 'let', 'const'].includes(token.value))) {
             return false;
         }
 

package/src/router.js

@@ -92,10 +92,10 @@ module.exports = class Router extends EventEmitter {
     }
 
     getFullMountpath(req) {
-        let fullStack = req._stack.join("");
-        if(!fullStack){
+        if(!req._stack.length) {
             return EMPTY_REGEX;
         }
+        const fullStack = req._stack.join("");
         let fullMountpath = this._mountpathCache.get(fullStack);
         if(!fullMountpath) {
             fullMountpath = patternToRegex(fullStack, true);
@@ -112,7 +112,7 @@ module.exports = class Router extends EventEmitter {
             path = path.slice(0, -1);
         }
 
-        if (typeof pattern === 'string') {
+        if(typeof pattern === 'string') {
             if(pattern === '/*') {
                 return true;
             }
@@ -125,7 +125,7 @@ module.exports = class Router extends EventEmitter {
             }
             return pattern === path;
         }
-        if (pattern === EMPTY_REGEX){
+        if(pattern === EMPTY_REGEX) {
             return true;
         }
         return pattern.test(path);
@@ -365,12 +365,15 @@ module.exports = class Router extends EventEmitter {
             path = path.slice(0, -1);
         }
         let match = pattern.exec(path);
-        if( match?.groups ){
-            return match.groups;
-        }
         const obj = new NullObject();
-        for(let i = 1; i < match.length; i++) {
-            obj[i - 1] = match[i];
+        if(match?.groups) {
+            for(let name in match.groups) {
+                if(name.startsWith('_wc')) {
+                    obj[name.slice(3)] = match.groups[name];
+                } else {
+                    obj[name] = match.groups[name];
+                }
+            }
         }
         return obj;
     }
@@ -382,7 +385,10 @@ module.exports = class Router extends EventEmitter {
         } else if(route.complex) {
             let path = req._originalPath;
             if(req._stack.length > 0) {
-                path = path.replace(this.getFullMountpath(req), '');
+                const fullMountpath = this.getFullMountpath(req);
+                if(fullMountpath !== EMPTY_REGEX) {
+                    path = path.replace(fullMountpath, '');
+                } 
             }
             req.params = {...this._extractParams(route.pattern, path)};
             if(req._paramStack.length > 0) {
@@ -540,7 +546,7 @@ module.exports = class Router extends EventEmitter {
                         req._opPath += '/';
                     }
                     const routed = await callback._routeRequest(req, res, 0);
-                    if (req._error) {
+                    if(req._error) {
                         req._errorKey = route.routeKey;
                     }
                     if(routed) return resolve(true);

package/src/types.d.ts

@@ -45,7 +45,14 @@ declare module "ultimate-express" {
     export import Send = e.Send;
   }
 
-  function express(settings?: Settings): e.Express & {readonly uwsApp: uWS.TemplatedApp};
+  type UltimateExpress = Omit<e.Express, 'listen'> & {
+    readonly uwsApp: uWS.TemplatedApp;
+    listen(port: number, callback?: (token: any) => void): uWS.TemplatedApp;
+    listen(host: string, port: number, callback?: (token: any) => void): uWS.TemplatedApp;
+    listen(callback: (token: any) => void): uWS.TemplatedApp;
+  };
+
+  function express(settings?: Settings): UltimateExpress;
 
   export = express;
 }

package/src/utils.js

@@ -51,10 +51,11 @@ function patternToRegex(pattern, isPrefix = false) {
         return EMPTY_REGEX;
     }
 
+    let wildcardIndex = 0;
     let regexPattern = pattern
         .replaceAll('.', '\\.')
         .replaceAll('-', '\\-')
-        .replaceAll('*', '(.*)') // Convert * to .*
+        .replaceAll(/(\*|\(.*?\))/g, (match) => `(?<_wc${wildcardIndex++}>${match.startsWith('(') ? match.slice(1, -1) : match.replaceAll('*', '.*')})`) // Convert * to .* and stuff in parentheses to capture group
         .replace(/\/:(\w+)(\(.+?\))?\??/g, (match, param, regex) => {
             const optional = match.endsWith('?');
             return `\\/${optional ? '?' : ''}(?<${param}>${regex ? regex + '($|\\/)' : '[^/]+'})${optional ? '?' : ''}`;
@@ -67,10 +68,7 @@ function needsConversionToRegex(pattern) {
     if(pattern instanceof RegExp) {
         return false;
     }
-    if(pattern === '/*') {
-        return false;
-    }
-
+    
     return pattern.includes('*') ||
         pattern.includes('?') ||
         pattern.includes('+') ||