ultimate-express 1.3.18 → 1.4.0

package/README.md

@@ -53,6 +53,10 @@ For full table with other runtimes, check [here](https://github.com/dimdenGD/bun
 | koa                  | 24,045.08      | 28,202.12     | 24,590.84     | 19,342.28     |
 | express              | 10,411.313     | 11,245.57     | 10,598.74     | 9,389.63      |
 
+Other benchmarks:
+ - [TechEmpower / FrameworkBenchmarks](https://www.techempower.com/benchmarks/#hw=ph&test=composite&section=data-r23&l=zik0sf-cn3)
+ - [the-benchmarker / web-frameworks](https://web-frameworks-benchmark.netlify.app/result?l=javascript)
+
 ### Performance on real-world application
 
 Also tested on a [real-world application](https://nekoweb.org) with templates, static files and dynamic pages with data from database, and showed 1.5-4X speedup in requests per second depending on the page.
@@ -122,6 +126,20 @@ Since you don't create http server manually, you can't properly use http.on("upg
 - There's a sister library that implements `ws` compatible API: [Ultimate WS](https://github.com/dimdenGD/ultimate-ws). It's same concept as this library, but for WebSockets: fast drop-in replacement for `ws` module with support for Ultimate Express upgrades. There's a guide for how to upgrade http requests in the documentation.  
 - You can simply use `app.uwsApp` to access uWebSockets.js `App` instance and call its `ws()` method directly.
 
+## HTTP/3
+
+HTTP/3 is supported. To use:
+
+```js
+const app = express({
+  http3: true,
+  uwsOptions: {
+    key_file_name: '/path/to/example.key',
+    cert_file_name: '/path/to/example.crt'
+  }
+});
+```
+
 ## Compatibility
 
 In general, basically all features and options are supported. Use [Express 4.x documentation](https://expressjs.com/en/4x/api.html) for API reference.

package/package.json

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

package/src/application.js

@@ -55,13 +55,17 @@ class Application extends Router {
         if(typeof settings.threads !== 'number') {
             settings.threads = cpuCount > 1 ? 1 : 0;
         }
-        if(settings.uwsOptions.key_file_name && settings.uwsOptions.cert_file_name) {
+        if(settings.http3) {
+            if(!settings.uwsOptions.key_file_name || !settings.uwsOptions.cert_file_name) {
+                throw new Error('uwsOptions.key_file_name and uwsOptions.cert_file_name are required for HTTP/3');
+            }
+            this.uwsApp = uWS.H3App(settings.uwsOptions);
+        } else if(settings.uwsOptions.key_file_name && settings.uwsOptions.cert_file_name) {
             this.uwsApp = uWS.SSLApp(settings.uwsOptions);
-            this.ssl = true;
         } else {
             this.uwsApp = uWS.App(settings.uwsOptions);
-            this.ssl = false;
         }
+        this.ssl = settings.uwsOptions.key_file_name && settings.uwsOptions.cert_file_name;
         this.cache = new NullObject();
         this.engines = {};
         this.locals = {

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,14 +93,14 @@ 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;
@@ -111,11 +112,11 @@ module.exports = class Request extends Readable {
             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();
@@ -742,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) {
@@ -355,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++) {
@@ -602,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');