ultimate-express 1.1.7 → 1.1.9

package/package.json

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

package/src/response.js

@@ -139,6 +139,9 @@ module.exports = class Response extends Writable {
                     if(!ok) {
                         // wait until uWS is ready to accept more data
                         this._res.onWritable((offset) => {
+                            if(this.aborted) {
+                                return true;
+                            }
                             const [ok, done] = this._res.tryEnd(chunk.slice(offset - lastOffset), this.totalSize);
                             if(done) {
                                 this.destroy();
@@ -147,6 +150,8 @@ module.exports = class Response extends Writable {
                             } else if(ok) {
                                 callback();
                             }
+                            
+                            return ok;
                         });
                     } else {
                         callback();
@@ -233,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]) {
@@ -245,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') {
@@ -742,7 +748,10 @@ function pipeStreamOverResponse(res, readStream, totalSize, callback) {
                 res._res.ab = ab;
                 res._res.abOffset = lastOffset;
         
-                res._res.onWritable((offset) => {  
+                res._res.onWritable((offset) => {
+                    if(res.aborted) {
+                        return true;
+                    }
                     const [ok, done] = res._res.tryEnd(res._res.ab.slice(offset - res._res.abOffset), totalSize);
                     if (done) {
                         readStream.destroy();

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

@@ -36,7 +36,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