ultimate-express 1.3.17 → 1.3.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-express",
-  "version": "1.3.17",
+  "version": "1.3.19",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {
@@ -72,7 +72,8 @@
     "ejs": "^3.1.10",
     "errorhandler": "^1.5.1",
     "exit-hook": "^2.2.1",
-    "express": "^4.19.2",
+    "express-4": "npm:express@4",
+    "express-5": "npm:express@5",
     "express-art-template": "^1.0.1",
     "express-async-errors": "^3.1.1",
     "express-dot-engine": "^1.0.8",

package/src/middlewares.js

@@ -180,11 +180,6 @@ function createBodyParser(defaultType, beforeReturn) {
                 return next();
             }
 
-            // skip reading too large body
-            if(length && +length > options.limit) {
-                return next(new Error('Request entity too large'));
-            }
-
             if(options.simpleType) {
                 const semicolonIndex = type.indexOf(';');
                 const clearType = semicolonIndex !== -1 ? type.substring(0, semicolonIndex) : type;
@@ -203,6 +198,12 @@ function createBodyParser(defaultType, beforeReturn) {
                 }
             }
 
+            // skip reading too large body
+            if(length && +length > options.limit) {
+                return next(new Error('Request entity too large'));
+            }
+
+
             // skip reading body for non-POST requests
             // this makes it +10k req/sec faster
             if( additionalMethods === undefined ) additionalMethods = req.app.get('body methods') ?? null;

package/src/request.js

@@ -72,6 +72,7 @@ module.exports = class Request extends Readable {
         this._stack = [];
         this._paramStack = [];
         this.receivedData = false;
+        this.doneReadingData = false;
         // reading ip is very slow in UWS, so its better to not do it unless truly needed
         if(this.app.needsIpAfterResponse || this.key < 100) {
             // if app needs ip after response, read it now because after response its not accessible
@@ -92,30 +93,30 @@ module.exports = class Request extends Readable {
             this._res.onData((ab, isLast) => {
                 // make stream actually readable
                 this.receivedData = true;
+                if(isLast) {
+                    this.doneReadingData = true;
+                }
                 // instead of pushing data immediately, buffer it
                 // because writable streams cant handle the amount of data uWS gives (usually 512kb+)
                 const chunk = Buffer.from(ab);
                 this.bufferedData = Buffer.concat([this.bufferedData, chunk]);
-                if(isLast) {
-                    // once its done start pushing data
-                    this._read();
-                }
+                this._read();
             });
         } else {
             this.receivedData = true;
         }
     }
 
-    async _read() {
+    _read() {
         if(!this.receivedData || !this.bufferedData) {
             return;
         }
         if(this.bufferedData.length > 0) {
-            // push 64kb chunks
-            const chunk = this.bufferedData.subarray(0, 1024 * 64);
-            this.bufferedData = this.bufferedData.subarray(1024 * 64);
+            // push 128kb chunks
+            const chunk = this.bufferedData.subarray(0, 1024 * 128);
+            this.bufferedData = this.bufferedData.subarray(1024 * 128);
             this.push(chunk);
-        } else {
+        } else if(this.doneReadingData) {
             this.push(null);
         }
     }

package/src/response.js

@@ -78,6 +78,7 @@ module.exports = class Response extends Writable {
         this.finished = false;
         this.aborted = false;
         this.statusCode = 200;
+        this.statusText = undefined;
         this.chunkedTransfer = true;
         this.totalSize = 0;
         this.headers = {
@@ -132,7 +133,8 @@ module.exports = class Response extends Writable {
         this._res.cork(() => {
             if(!this.headersSent) {
                 this.writeHead(this.statusCode);
-                this._res.writeStatus(this.statusCode.toString());
+                const statusMessage = this.statusText ?? statuses.message[this.statusCode] ?? '';
+                this._res.writeStatus(`${this.statusCode} ${statusMessage}`.trim());
                 this.writeHeaders(typeof chunk === 'string');
             }
             if(!Buffer.isBuffer(chunk) && !(chunk instanceof ArrayBuffer)) {
@@ -181,6 +183,9 @@ module.exports = class Response extends Writable {
     }
     writeHead(statusCode, statusMessage, headers) {
         this.statusCode = statusCode;
+        if(typeof statusMessage === 'string') {
+            this.statusText = statusMessage;
+        }
         if(!headers) {
             if(!statusMessage) return;
             headers = statusMessage;
@@ -235,7 +240,8 @@ module.exports = class Response extends Writable {
                     this.headers['etag'] = etagFn(data);
                 }
                 const fresh = this.req.fresh;
-                this._res.writeStatus(fresh ? '304' : this.statusCode.toString());
+                const statusMessage = this.statusText ?? statuses.message[this.statusCode] ?? '';
+                this._res.writeStatus(fresh ? '304 Not Modified' : `${this.statusCode} ${statusMessage}`.trim());
                 this.writeHeaders(true);
                 if(fresh) {
                     this._res.end();
@@ -556,7 +562,9 @@ module.exports = class Response extends Writable {
     get(field) {
         return this.headers[field.toLowerCase()];
     }
-    getHeader = this.get;
+    getHeader(field) {
+        return this.get(field);
+    }
     removeHeader(field) {
         delete this.headers[field.toLowerCase()];
         return this;
@@ -568,7 +576,7 @@ module.exports = class Response extends Writable {
             const newVal = [];
             if(Array.isArray(old)) {
                 newVal.push(...old);
-            } else if(old) {
+            } else {
                 newVal.push(old);
             }
             if(Array.isArray(value)) {
@@ -740,7 +748,8 @@ function pipeStreamOverResponse(res, readStream, totalSize, callback) {
         res._res.cork(() => {
             if(!res.headersSent) {
                 res.writeHead(res.statusCode);
-                res._res.writeStatus(res.statusCode.toString());
+                const statusMessage = res.statusText ?? statuses.message[res.statusCode] ?? '';
+                res._res.writeStatus(`${res.statusCode} ${statusMessage}`.trim());
                 res.writeHeaders(true);
             }
             const ab = chunk.buffer.slice(chunk.byteOffset, chunk.byteOffset + chunk.byteLength);

package/src/router.js

@@ -19,6 +19,7 @@ const Response = require("./response.js");
 const Request = require("./request.js");
 const { EventEmitter } = require("tseep");
 const compileDeclarative = require("./declarative.js");
+const statuses = require("statuses");
 
 let resCodes = {}, resDecMethods = ['set', 'setHeader', 'header', 'send', 'end', 'append', 'status'];
 for(let method of resDecMethods) {
@@ -108,6 +109,10 @@ module.exports = class Router extends EventEmitter {
         let path = req._opPath;
         let pattern = route.pattern;
 
+        if(req.endsWithSlash && path.endsWith('/') && !this.get('strict routing')) {
+            path = path.slice(0, -1);
+        }
+
         if (typeof pattern === 'string') {
             if(pattern === '/*') {
                 return true;
@@ -351,6 +356,9 @@ module.exports = class Router extends EventEmitter {
     }
 
     _extractParams(pattern, path) {
+        if(path.endsWith('/')) {
+            path = path.slice(0, -1);
+        }
         let match = pattern.exec(path);
         const obj = match?.groups ?? new NullObject();
         for(let i = 1; i < match.length; i++) {
@@ -598,7 +606,7 @@ module.exports = class Router extends EventEmitter {
 
     _sendErrorPage(request, response, err, checkEnv = false) {
         if(checkEnv && this.get('env') === 'production') {
-            err = 'Internal Server Error';
+            err = response.statusCode >= 400 ? (statuses.message[response.statusCode] ?? 'Internal Server Error') : 'Internal Server Error';
         }
         request.noEtag = true;
         response.setHeader('Content-Type', 'text/html; charset=utf-8');