ultimate-express 1.0.9 → 1.1.1

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "ultimate-express",
-  "version": "1.0.9",
+  "version": "1.1.1",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {
     "test": "node tests/index.js"
   },
+  "engines": {
+    "node": ">=16"
+  },
   "files": [
     "src",
     "EXPRESS_LICENSE"

package/src/application.js

@@ -65,7 +65,7 @@ class Application extends Router {
         for(const key in defaultSettings) {
             if(typeof this.settings[key] === 'undefined') {
                 if(typeof defaultSettings[key] === 'function') {
-                    this.settings[key] = defaultSettings[key]();
+                    this.settings[key] = defaultSettings[key](this);
                 } else {
                     this.settings[key] = defaultSettings[key];
                 }
@@ -75,19 +75,23 @@ class Application extends Router {
         this.set('views', path.resolve('views'));
     }
 
+    createWorkerTask(resolve, reject) {
+        const key = taskKey++;
+        workerTasks[key] = { resolve, reject };
+        if(key > 1000000) {
+            taskKey = 0;
+        }
+        return key;
+    }
+
     readFileWithWorker(path) {
         return new Promise((resolve, reject) => {
             const worker = this.workers[Math.floor(Math.random() * this.workers.length)];
-            const key = taskKey++;
+            const key = this.createWorkerTask(resolve, reject);
             worker.postMessage({ key, type: 'readFile', path });
-            workerTasks[key] = { resolve, reject };
-            if(key > 1000000) {
-                taskKey = 0;
-            }
         });
     }
 
-
     set(key, value) {
         if(key === 'trust proxy') {
             if(!value) {

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

@@ -96,7 +96,7 @@ module.exports = class Response extends Writable {
                     this._res.writeHeader(header, this.headers[header]);
                 }
                 if(!this.headers['content-type']) {
-                    this._res.writeHeader('content-type', 'text/html');
+                    this._res.writeHeader('content-type', 'text/html' + (typeof chunk === 'string' ? `; charset=utf-8` : ''));
                 }
                 this.headersSent = true;
             }
@@ -139,7 +139,7 @@ module.exports = class Response extends Writable {
             if(!this.headersSent) {
                 const etagFn = this.app.get('etag fn');
                 if(data && !this.headers['etag'] && etagFn && !this.req.noEtag) {
-                    this.set('etag', etagFn(data, this.req));
+                    this.set('etag', etagFn(data));
                 }
                 if(this.req.fresh) {
                     if(!this.headersSent) {
@@ -157,13 +157,16 @@ module.exports = class Response extends Writable {
                     this._res.writeHeader(header, this.headers[header]);
                 }
                 if(!this.headers['content-type']) {
-                    this._res.writeHeader('content-type', 'text/html');
+                    this._res.writeHeader('content-type', 'text/html' + (typeof data === 'string' ? `; charset=utf-8` : ''));
                 }
                 this.headersSent = true;
             }
             if(!data && this.headers['content-length']) {
                 this._res.endWithoutBody(this.headers['content-length'].toString());
             } else {
+                if(data instanceof Buffer) {
+                    data = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
+                }
                 if(this.req.method === 'HEAD') {
                     const length = Buffer.byteLength(data ?? '');
                     this._res.endWithoutBody(length.toString());
@@ -180,14 +183,10 @@ module.exports = class Response extends Writable {
         if(this.headersSent) {
             throw new Error('Can\'t write body: Response was already sent');
         }
-        if(Buffer.isBuffer(body)) {
-            body = body.buffer.slice(body.byteOffset, body.byteOffset + body.byteLength);
-        } else if(body === null || body === undefined) {
+        if(body === null || body === undefined) {
             body = '';
-        } else if(typeof body === 'object') {
-            if(!(body instanceof ArrayBuffer)) {
-                return this.json(body);
-            }
+        } else if(typeof body === 'object' && !Buffer.isBuffer(body)) {
+            return this.json(body);
         } else if(typeof body === 'number') {
             if(arguments[1]) {
                 deprecated('res.send(status, body)', 'res.status(status).send(body)');
@@ -199,6 +198,12 @@ module.exports = class Response extends Writable {
         } else {
             body = String(body);
         }
+        if(typeof body === 'string') {
+            const contentType = this.headers['content-type'];
+            if(contentType && !contentType.includes(';')) {
+                this.headers['content-type'] += '; charset=utf-8';
+            }
+        }
         this.writeHead(this.statusCode);
         return this.end(body);
     }
@@ -244,6 +249,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 +357,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;
+                }
             }
         }
 
@@ -384,7 +395,7 @@ module.exports = class Response extends Writable {
                 if(this._res.aborted) {
                     return;
                 }
-                this.send(data);
+                this.end(data);
                 if(callback) callback();
             }).catch((err) => {
                 if(callback) callback(err);
@@ -440,10 +451,15 @@ module.exports = class Response extends Writable {
                 this.set(header, field[header]);
             }
         } else {
+            field = field.toLowerCase();
             if(field === 'set-cookie' && Array.isArray(value)) {
                 value = value.join('; ');
+            } else if(field === 'content-type') {
+                if(value.startsWith('text/') || value === 'application/json' || value === 'application/javascript') {
+                    value += '; charset=utf-8';
+                }
             }
-            this.headers[field.toLowerCase()] = String(value);
+            this.headers[field] = String(value);
         }
         return this;
     }
@@ -551,7 +567,7 @@ module.exports = class Response extends Writable {
     }
     json(body) {
         if(!this.get('Content-Type')) {
-            this.set('Content-Type', 'application/json');
+            this.set('Content-Type', 'application/json; charset=utf-8');
         }
         const escape = this.app.get('json escape');
         const replacer = this.app.get('json replacer');
@@ -563,7 +579,7 @@ module.exports = class Response extends Writable {
         let body = stringify(object, this.app.get('json replacer'), this.app.get('json spaces'), this.app.get('json escape'));
 
         if(!this.get('Content-Type')) {
-            this.set('Content-Type', 'application/javascript');
+            this.set('Content-Type', 'application/javascript; charset=utf-8');
             this.set('X-Content-Type-Options', 'nosniff');
         }
 
@@ -572,7 +588,7 @@ module.exports = class Response extends Writable {
         }
 
         if(typeof callback === 'string' && callback.length !== 0) {
-            this.set('Content-Type', 'application/javascript');
+            this.set('Content-Type', 'application/javascript; charset=utf-8');
             this.set('X-Content-Type-Options', 'nosniff');
             callback = callback.replace(/[^\[\]\w$.]/g, '');
 
@@ -608,14 +624,17 @@ module.exports = class Response extends Writable {
         }
         this.location(url);
         this.status(status);
-        this.set('Content-Type', 'text/plain');
+        this.set('Content-Type', 'text/plain; charset=utf-8');
         return this.send(`${statuses.message[status] ?? status}. Redirecting to ${url}`);
     }
 
     type(type) {
-        const ct = type.indexOf('/') === -1
+        let ct = type.indexOf('/') === -1
             ? (mime.contentType(type) || 'application/octet-stream')
             : type;
+        if(ct.startsWith('text/') || ct === 'application/json' || ct === 'application/javascript') {
+            ct += '; charset=UTF-8';
+        }
         return this.set('Content-Type', ct);
     }
     contentType(type) {

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;