ultimate-express 1.2.3 → 1.2.5

package/README.md

@@ -47,7 +47,7 @@ Tested using [bun-http-framework-benchmark](https://github.com/dimdenGD/bun-http
 | elysia | bun | 72,112.447 | 82,589.71 | 69,356.08 | 64,391.55 |
 | hyper-express | node | 66,356.707 | 80,002.53 | 69,953.76 | 49,113.83 |
 | hono | bun | 63,944.627 | 74,550.47 | 62,810.28 | 54,473.13 |
-| **ultimate-express** | **node** | **44,081.737** | **51,753.24** | **48,389.84** | **32,102.13** |
+| **ultimate-express** | **node** | **46,139.797** | **49,010.91** | **49,197.87** | **40,210.61** |
 | oak | deno | 40,878.467 | 68,429.24 | 28,541.99 | 25,664.17 |
 | express | bun | 35,937.977 | 41,329.97 | 34,339.79 | 32,144.17 |
 | h3 | node | 35,423.263 | 41,243.68 | 34,429.26 | 30,596.85 |

package/package.json

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

package/src/index.js

@@ -17,7 +17,7 @@ limitations under the License.
 const Application = require("./application.js");
 const Router = require("./router.js");
 const bodyParser = require("body-parser");
-const { static } = require("./middlewares.js");
+const { static, json } = require("./middlewares.js");
 const Request = require("./request.js");
 const Response = require("./response.js");
 
@@ -30,7 +30,7 @@ Application.response = Response.prototype;
 
 Application.static = static;
 
-Application.json = bodyParser.json;
+Application.json = json;
 Application.urlencoded = bodyParser.urlencoded;
 Application.text = bodyParser.text;
 Application.raw = bodyParser.raw;

package/src/middlewares.js

@@ -128,6 +128,10 @@ function json(options = {}) {
         if(!type || contentType !== options.type) {
             return next();
         }
+        // skip reading body twice
+        if(req.body) {
+            return next();
+        }
 
         // skip reading body for non-POST requests
         // this makes it +10k req/sec faster
@@ -141,36 +145,55 @@ function json(options = {}) {
             return next();
         }
 
-        const abs = [], totalSize = 0;
-        req._res.onData((ab, isLast) => {
-            abs.push(ab);
+        const abs = []
+        let totalSize = 0;
+
+        function onData(ab) {
+            abs.push(Buffer.from(ab));
             totalSize += ab.length;
             if(totalSize > options.limit) {
                 return next(new Error('Request entity too large'));
             }
-            if(isLast) {
-                const buf = Buffer.concat(abs);
-                if(options.verify) {
-                    try {
-                        options.verify(req, res, buf);
-                    } catch(e) {
-                        return next(e);
-                    }
+        }
+
+        function onEnd() {
+            const buf = Buffer.concat(abs);
+            if(options.verify) {
+                try {
+                    options.verify(req, res, buf);
+                } catch(e) {
+                    return next(e);
                 }
-                req.body = JSON.parse(buf, options.reviver);
-                if(options.strict) {
-                    if(req.body && typeof req.body !== 'object') {
-                        return next(new Error('Invalid body'));
-                    }
+            }
+            req.body = JSON.parse(buf, options.reviver);
+            if(options.strict) {
+                if(req.body && typeof req.body !== 'object') {
+                    return next(new Error('Invalid body'));
                 }
-                next();
             }
-        });
+            next();
+        }
+
+        if(!req.receivedData) {
+            // reading data directly from uWS is faster than from a stream
+            // if we are fast enough (not async), we can do it
+            // otherwise we need to use a stream since it already started streaming it
+            req._res.onData((ab, isLast) => {
+                onData(ab);
+                if(isLast) {
+                    onEnd();
+                }
+            });
+        } else {
+            req.on('data', onData);
+            req.on('end', onEnd);
+        }
 
     }
 
 }
 
 module.exports = {
-    static
+    static,
+    json
 };