ultimate-express 2.1.0 → 2.1.1

package/README.md

@@ -8,10 +8,12 @@ To make sure µExpress matches behavior of Express in all cases, we run all test
 
 `npm install ultimate-express` -> replace `express` with `ultimate-express` -> done[*](https://github.com/dimdenGD/ultimate-express?tab=readme-ov-file#differences-from-express)  
 
-[![Node.js >= 20.0.0](https://img.shields.io/badge/Node.js-%3E=20.0.0-green)](https://nodejs.org)
+[![Node.js >= 22.0.0](https://img.shields.io/badge/Node.js-%3E=22.0.0-green)](https://nodejs.org)
 [![npm](https://img.shields.io/npm/v/ultimate-express?label=last+version)](https://npmjs.com/package/ultimate-express)
 [![Patreon](https://img.shields.io/badge/donate-Patreon-orange)](https://patreon.com/dimdendev)
 
+> Use `npm install ultimate-express@2.1.0` to install last version that supported Node.js v21, v20 and v19.
+
 > Use `npm install ultimate-express@node-v18` to install last version that supported Node.js v18.
 
 ## Difference from similar projects

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-express",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {
@@ -12,7 +12,7 @@
     "cover:report": "nyc report --reporter=html"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "files": [
     "src",
@@ -64,12 +64,12 @@
     "statuses": "^2.0.2",
     "tseep": "^1.3.1",
     "type-is": "^2.0.1",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.64.0",
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.67.0",
     "vary": "^1.1.2"
   },
   "devDependencies": {
     "@codechecks/client": "^0.1.12",
-    "@types/node": "^25.5.2",
+    "@types/node": "^25.6.0",
     "better-sse": "^0.16.1",
     "body-parser": "^2.2.2",
     "compression": "^1.8.1",
@@ -81,6 +81,7 @@
     "eventsource": "^4.1.0",
     "exit-hook": "^2.2.1",
     "express": "latest-4",
+    "express5": "npm:express@5",
     "express-art-template": "^1.0.1",
     "express-async-errors": "^3.1.1",
     "express-dot-engine": "^1.0.8",
@@ -88,7 +89,7 @@
     "express-handlebars": "^8.0.7",
     "express-http-proxy": "^2.1.2",
     "express-mongo-sanitize": "^2.2.0",
-    "express-rate-limit": "^8.3.2",
+    "express-rate-limit": "^8.4.0",
     "express-session": "^1.19.0",
     "express-subdomain": "^1.0.6",
     "graphql-http": "^1.22.4",

package/src/request.js

@@ -38,16 +38,14 @@ module.exports = class Request extends Readable {
     #cachedDistinctHeaders = null;
     #rawHeadersEntries = [];
     #cachedParsedIp = null;
-    #needsData = false;
-    #doneReadingData = false;
-    #bufferedData = null;
+    #paused = false;
     body;
     res;
     optimizedParams;
     _error;
     noEtag;
     constructor(req, res, app) {
-        super();
+        super({ highWaterMark: 128 * 1024 });
         this._res = res;
         this._req = req;
         this.readable = true;
@@ -100,46 +98,38 @@ module.exports = class Request extends Readable {
             this.method === 'PATCH' || 
             (additionalMethods && additionalMethods.includes(this.method))
         ) {
-            this.#bufferedData = Buffer.allocUnsafe(0);
             this._res.onData((ab, isLast) => {
-                // make stream actually readable
                 this.receivedData = true;
-                if(isLast) {
-                    this.#doneReadingData = true;
+                if(this.#responseEnded) {
+                    return;
+                }
+                // ab.slice(0) copies the ArrayBuffer; uWS neuters `ab` after this callback,
+                // so a Buffer.from(ab) view would corrupt data left in the Readable queue.
+                const chunk = Buffer.from(ab.slice(0));
+                const accepted = this.push(chunk);
+                // push() may synchronously end the response via a flowing-mode listener.
+                if(!accepted && !isLast && !this.#responseEnded) {
+                    this._res.pause();
+                    this.#paused = 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(this.#needsData) {
-                    this.#needsData = false;
-                    this._read();
+                if(isLast) {
+                    this.push(null);
                 }
             });
         } else {
             this.receivedData = true;
-            // For GET and other non-body methods, initialize bufferedData as empty buffer
-            // to ensure pipe() works correctly
-            this.#bufferedData = Buffer.allocUnsafe(0);
-            this.#doneReadingData = true;
+            this.push(null);
         }
     }
 
+    get #responseEnded() {
+        return this.res?.finished || this.res?.aborted;
+    }
+
     _read() {
-        if(!this.receivedData || !this.#bufferedData) {
-            this.#needsData = true;
-            return;
-        }
-        if(this.#bufferedData.length > 0) {
-            // push 128kb chunks
-            const chunk = this.#bufferedData.subarray(0, 1024 * 128);
-            this.#bufferedData = this.#bufferedData.subarray(1024 * 128);
-            this.push(chunk);
-        } else if(this.#doneReadingData) {
-            this.push(null);
-        } else {
-            this.#needsData = true;
+        if(this.#paused && !this.#responseEnded) {
+            this.#paused = false;
+            this._res.resume();
         }
     }