ultimate-express 1.2.15 → 1.2.17

package/README.md

@@ -28,13 +28,13 @@ Tested using [wrk](https://github.com/wg/wrk) (`-d 60 -t 1 -c 200`). Etag was di
 
 | Test                                          | Express req/sec | µExpress req/sec | Express throughput | µExpress throughput | µExpress speedup |
 | --------------------------------------------- | --------------- | ---------------- | ------------------ | ------------------- | ---------------- |
-| routing/simple-routes (/)                     | 10.90k          | 70.10k           | 2.04 MB/sec        | 11.57 MB/sec        | **6.43X**        |
-| routing/lot-of-routes (/999)                  | 4.66k           | 51.58k           | 0.85 MB/sec        | 8.07 MB/sec         | **11.07X**       |
-| routing/some-middlewares (/90)                | 10.18k          | 66.97k           | 1.81 MB/sec        | 10.42 MB/sec        | **6.58X**        |
-| routers/nested-routers (/abccc/nested/ddd)    | 10.25k          | 50.98k           | 1.83 MB/sec        | 7.98 MB/sec         | **4.97X**        |
-| middlewares/express-static (/static/index.js) | 7.52k           | 31.08k           | 6.92 MB/sec        | 26.48 MB/sec        | **4.13X**        |
-| engines/ejs (/test)                           | 5.92k           | 41.64k           | 2.40 MB/sec        | 16.55 MB/sec        | **7.03X**        |
-| middlewares/body-urlencoded (/abc)            | 8.01k           | 35.10k           | 1.66 MB/sec        | 7.02 MB/sec         | **4.38X**        |
+| routing/simple-routes (/)                     | 11.16k          | 75.14k           | 2.08 MB/sec        | 14.46 MB/sec        | **6.73X**        |
+| routing/lot-of-routes (/999)                  | 4.63k           | 54.57k           | 0.84 MB/sec        | 10.03 MB/sec        | **11.78X**       |
+| routing/some-middlewares (/90)                | 10.12k          | 61.92k           | 1.79 MB/sec        | 11.32 MB/sec        | **6.12X**        |
+| routers/nested-routers (/abccc/nested/ddd)    | 10.18k          | 51.15k           | 1.82 MB/sec        | 9.40 MB/sec         | **5.02X**        |
+| middlewares/express-static (/static/index.js) | 6.58k           | 32.45k           | 10.15 MB/sec       | 49.43 MB/sec        | **4.87X**        |
+| engines/ejs (/test)                           | 5.50k           | 40.82k           | 2.45 MB/sec        | 18.38 MB/sec        | **7.42X**        |
+| middlewares/body-urlencoded (/abc)            | 8.07k           | 50.52k           | 1.68 MB/sec        | 10.78 MB/sec        | **6.26X**        |
 
 ### Performance against other frameworks
 
@@ -282,7 +282,7 @@ In general, basically all features and options are supported. Use [Express 4.x d
 
 ## Tested middlewares
 
-Most of the middlewares that are compatible with Express are compatible with µExpress. Here's list of middlewares that we test for compatibility:
+Almost all middlewares that are compatible with Express are compatible with µExpress. Here's list of middlewares that we test for compatibility:
 
 - ✅ [body-parser](https://npmjs.com/package/body-parser) (use `express.text()` etc instead for better performance)
 - ✅ [cookie-parser](https://npmjs.com/package/cookie-parser)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-express",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {
@@ -39,6 +39,7 @@
   "homepage": "https://github.com/dimdenGD/ultimate-express#readme",
   "dependencies": {
     "accepts": "^1.3.8",
+    "bytes": "^3.1.2",
     "cookie": "^0.6.0",
     "cookie-signature": "^1.2.1",
     "encodeurl": "^2.0.0",

package/src/middlewares.js

@@ -155,13 +155,15 @@ function createBodyParser(defaultType, beforeReturn) {
         return (req, res, next) => {
             const type = req.headers['content-type'];
 
-            // skip reading body for non-json content type
-            if(!type) {
+            // skip reading body twice
+            if(req.bodyRead) {
                 return next();
             }
 
-            // skip reading body twice
-            if(req.body) {
+            req.body = {};
+
+            // skip reading body for non-json content type
+            if(!type) {
                 return next();
             }
 
@@ -216,6 +218,8 @@ function createBodyParser(defaultType, beforeReturn) {
                 }
             }
 
+            req.bodyRead = true;
+
             function onData(buf) {
                 if(!Buffer.isBuffer(buf)) {
                     buf = Buffer.from(buf);
@@ -266,7 +270,12 @@ const json = createBodyParser('application/json', function(req, res, next, optio
             return next(new Error('Invalid body'));
         }
     }
-    req.body = JSON.parse(buf.toString(), options.reviver);
+    try {
+        req.body = JSON.parse(buf.toString(), options.reviver);
+    } catch(e) {
+        return next(e);
+    }
+
     next();
 });
 
@@ -290,7 +299,12 @@ const text = createBodyParser('text/plain', function(req, res, next, options, bu
     if(encoding !== 'utf-8' && encoding !== 'utf-16le' && encoding !== 'latin1') {
         return next(new Error('Unsupported charset'));
     }
-    req.body = buf.toString(encoding);
+    try {
+        req.body = buf.toString(encoding);
+    } catch(e) {
+        return next(e);
+    }
+
     next();
 });
 

package/src/request.js

@@ -63,13 +63,12 @@ module.exports = class Request extends Readable {
         if(this.endsWithSlash && this.path !== '/' && !this.app.get('strict routing')) {
             this._opPath = this._opPath.slice(0, -1);
         }
-        this.method = req.getMethod().toUpperCase();
+        this.method = req.getCaseSensitiveMethod().toUpperCase();
         this.params = {};
 
         this._gotParams = new Set();
         this._stack = [];
         this._paramStack = [];
-        this.bufferedData = Buffer.allocUnsafe(0);
         this.receivedData = 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) {
@@ -87,6 +86,7 @@ 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;
@@ -105,7 +105,7 @@ module.exports = class Request extends Readable {
     }
 
     async _read() {
-        if(!this.receivedData) {
+        if(!this.receivedData || !this.bufferedData) {
             return;
         }
         if(this.bufferedData.length > 0) {

package/src/response.js

@@ -43,30 +43,30 @@ class Socket extends EventEmitter {
     constructor(response) {
         super();
         this.response = response;
-        this.writable = true;
 
         this.on('error', (err) => {
             this.emit('close');
         });
-        this.on('close', () => {
-            this.writable = false;
-        });
+    }
+    get writable() {
+        return !this.response.finished;
     }
 }
 
 module.exports = class Response extends Writable {
+    #socket = null;
     constructor(res, req, app) {
         super();
         this._req = req;
         this._res = res;
         this.headersSent = false;
         this.aborted = false;
-        this.socket = new Socket(this);
         this.app = app;
         this.locals = {};
         this.aborted = false;
         this.statusCode = 200;
         this.chunkedTransfer = true;
+        this.finished = false;
         this.totalSize = 0;
         this.headers = {
             'connection': 'keep-alive',
@@ -92,11 +92,20 @@ module.exports = class Response extends Writable {
             }
             this._res.cork(() => {
                 this._res.close();
-                this.socket.emit('close');
+                this.finished = true;
+                if(this.socketExists) this.socket.emit('close');
             });
         });
-        this.emit('socket', this.socket);
     }
+
+    get socket() {
+        this.socketExists = true;
+        if(!this.#socket) {
+            this.#socket = new Socket(this);
+        }
+        return this.#socket;
+    }
+
     _write(chunk, encoding, callback) {
         if(this.aborted) {
             const err = new Error('Request aborted');
@@ -135,7 +144,8 @@ module.exports = class Response extends Writable {
                 const [ok, done] = this._res.tryEnd(chunk, this.totalSize);
                 if(done) {
                     this.destroy();
-                    this.socket.emit('close');
+                    this.finished = true;
+                    if(this.socketExists) this.socket.emit('close');
                     callback();
                 } else {
                     // still writing
@@ -148,7 +158,8 @@ module.exports = class Response extends Writable {
                             const [ok, done] = this._res.tryEnd(chunk.slice(offset - lastOffset), this.totalSize);
                             if(done) {
                                 this.destroy();
-                                this.socket.emit('close');
+                                this.finished = true;
+                                if(this.socketExists) this.socket.emit('close');
                                 callback();
                             } else if(ok) {
                                 callback();
@@ -213,7 +224,8 @@ module.exports = class Response extends Writable {
                 this.headersSent = true;
                 if(fresh) {
                     this._res.end();
-                    this.socket.emit('close');
+                    this.finished = true;
+                    if(this.socketExists) this.socket.emit('close');
                     return;
                 }
             }
@@ -230,7 +242,8 @@ module.exports = class Response extends Writable {
                     this._res.end(data);
                 }
             }
-            this.socket.emit('close');
+            this.finished = true;
+            if(this.socketExists) this.socket.emit('close');
         });
 
         return this;
@@ -692,12 +705,8 @@ module.exports = class Response extends Writable {
         return this;
     }
 
-    get finished() {
-        return !this.socket.writable;
-    }
-
     get writableFinished() {
-        return !this.socket.writable;
+        return this.finished;
     }
 }
 
@@ -728,7 +737,8 @@ function pipeStreamOverResponse(res, readStream, totalSize, callback) {
       
             if (done) {
                 readStream.destroy();
-                res.socket.emit('close');
+                res.finished = true;
+                if(res.socketExists) res.socket.emit('close');
                 if(callback) callback();
             } else if (!ok) {
                 readStream.pause();
@@ -743,7 +753,8 @@ function pipeStreamOverResponse(res, readStream, totalSize, callback) {
                     const [ok, done] = res._res.tryEnd(res._res.ab.slice(offset - res._res.abOffset), totalSize);
                     if (done) {
                         readStream.destroy();
-                        res.socket.emit('close');
+                        res.finished = true;
+                        if(res.socketExists) res.socket.emit('close');
                         if(callback) callback();
                     } else if (ok) {
                         readStream.resume();
@@ -757,7 +768,8 @@ function pipeStreamOverResponse(res, readStream, totalSize, callback) {
         if(callback) callback(e);
         if(!res.finished) {
             res._res.close();
-            res.socket.emit('error', e);
+            res.finished = true;
+            if(res.socketExists) res.socket.emit('error', e);
         }
     });
 }