ultimate-express 1.0.9 → 1.1.0

package/package.json

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

package/src/middlewares.js

@@ -17,6 +17,7 @@ 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('?');

package/src/response.js

@@ -244,6 +244,9 @@ module.exports = class Response extends Writable {
             this.status(500);
             return done(new Error('path must be absolute or specify root to res.sendFile'));
         }
+        if(!options.skipEncodePath) {
+            path = encodeURI(path);
+        }
         path = decode(path);
         if(path === -1) {
             this.status(400);
@@ -349,27 +352,30 @@ module.exports = class Response extends Writable {
 
         // range requests
         let offset = 0, len = stat.size, ranged = false;
-        if(options.acceptRanges && this.req.headers.range) {
-            let ranges = this.req.range(stat.size, {
-                combine: true
-            });
-
-            // if-range
-            if(!isRangeFresh(this.req, this)) {
-                ranges = -2;
-            }
-
-            if(ranges === -1) {
-                this.status(416);
-                this.set('Content-Range', `bytes */${stat.size}`);
-                return done(new Error('Range Not Satisfiable'));
-            }
-            if(ranges !== -2 && ranges.length === 1) {
-                this.status(206);
-                this.set('Content-Range', `bytes ${ranges[0].start}-${ranges[0].end}/${stat.size}`);
-                offset = ranges[0].start;
-                len = ranges[0].end - ranges[0].start + 1;
-                ranged = true;
+        if(options.acceptRanges) {
+            this.set('accept-ranges', 'bytes');
+            if(this.req.headers.range) {
+                let ranges = this.req.range(stat.size, {
+                    combine: true
+                });
+    
+                // if-range
+                if(!isRangeFresh(this.req, this)) {
+                    ranges = -2;
+                }
+    
+                if(ranges === -1) {
+                    this.status(416);
+                    this.set('Content-Range', `bytes */${stat.size}`);
+                    return done(new Error('Range Not Satisfiable'));
+                }
+                if(ranges !== -2 && ranges.length === 1) {
+                    this.status(206);
+                    this.set('Content-Range', `bytes ${ranges[0].start}-${ranges[0].end}/${stat.size}`);
+                    offset = ranges[0].start;
+                    len = ranges[0].end - ranges[0].start + 1;
+                    ranged = true;
+                }
             }
         }
 

package/src/router.js

@@ -12,6 +12,7 @@ const methods = [
     'search', 'subscribe', 'unsubscribe', 'report', 'mkactivity', 'mkcalendar',
     'checkout', 'merge', 'm-search', 'notify', 'subscribe', 'unsubscribe', 'search'
 ];
+const supportedUwsMethods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'CONNECT', 'TRACE'];
 
 module.exports = class Router extends EventEmitter {
     #paramCallbacks = new Map();
@@ -122,8 +123,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) {
-                // the only methods that uWS supports natively
-                if(['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'CONNECT', 'TRACE'].includes(method)) {
+                if(supportedUwsMethods.includes(method)) {
                     const optimizedPath = this.#optimizeRoute(route, this._routes);
                     if(optimizedPath) {
                         this.#registerUwsRoute(route, optimizedPath);
@@ -153,13 +153,13 @@ module.exports = class Router extends EventEmitter {
                                     return; // can only optimize router whos parent is listening
                                 }
                                 for(let cbroute of callback._routes) {
-                                    if(!needsConversionToRegex(cbroute.path) && cbroute.path !== '/*') {
+                                    if(!needsConversionToRegex(cbroute.path) && cbroute.path !== '/*' && supportedUwsMethods.includes(cbroute.method)) {
                                         let optimizedRouterPath = this.#optimizeRoute(cbroute, callback._routes);
                                         if(optimizedRouterPath) {
                                             optimizedRouterPath = optimizedRouterPath.slice(0, -1);
                                             const optimizedPath = [...optimizedPathToRouter, {
-                                                ...route,
                                                 // fake route to update req._opPath and req.url
+                                                ...route,
                                                 callbacks: [
                                                     (req, res, next) => {
                                                         next('skipPop');
@@ -263,8 +263,13 @@ module.exports = class Router extends EventEmitter {
     }
 
     #handleError(err, request, response) {
-        if(this.errorRoute) {
-            return this.errorRoute(err, request, response, () => {
+        let errorRoute = this.errorRoute, parent = this.parent;
+        while(!errorRoute && parent) {
+            errorRoute = parent.errorRoute;
+            parent = parent.parent;
+        }
+        if(errorRoute) {
+            return errorRoute(err, request, response, () => {
                 if(!response.headersSent) {
                     if(response.statusCode === 200) {
                         response.statusCode = 500;