ultimate-express 1.2.12 → 1.2.14

package/README.md

@@ -45,7 +45,7 @@ For full table with other runtimes, check [here](https://github.com/dimdenGD/bun
 | -------------------- | ------------- | ------------- | ------------- | ------------- |
 | uws                  | 94,296.49     | 108,551.92    | 104,756.22    | 69,581.33     |
 | hyper-express        | 66,356.707    | 80,002.53     | 69,953.76     | 49,113.83     |
-| **ultimate-express** | **46,826.31** | **50,764.93** | **49,117.76** | **40,596.24** |
+| **ultimate-express** | **52,275.677** | **58,756.34** | **55,038.4** | **43,032.29** |
 | h3                   | 35,423.263    | 41,243.68     | 34,429.26     | 30,596.85     |
 | fastify              | 33,094.62     | 40,147.67     | 40,076.35     | 19,059.84     |
 | hono                 | 26,576.02     | 36,215.35     | 34,656.12     | 8,856.59      |

package/package.json

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

package/src/request.js

@@ -29,6 +29,8 @@ const discardedDuplicates = [
     "server", "user-agent"
 ];
 
+let key = 0;
+
 module.exports = class Request extends Readable {
     #cachedQuery = null;
     #cachedHeaders = null;
@@ -43,6 +45,10 @@ module.exports = class Request extends Readable {
         this._req.forEach((key, value) => {
             this.#rawHeadersEntries.push([key, value]);
         });
+        this.key = key++;
+        if(key > 100000) {
+            key = 0;
+        }
         this.app = app;
         this.urlQuery = req.getQuery() ?? '';
         if(this.urlQuery) {
@@ -65,7 +71,12 @@ module.exports = class Request extends Readable {
         this._paramStack = [];
         this.bufferedData = Buffer.allocUnsafe(0);
         this.receivedData = false;
-        this.rawIp = this._res.getRemoteAddress();
+        // 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
+            // also read it for first 100 requests to not error
+            this.rawIp = this._res.getRemoteAddress();
+        }
 
         const additionalMethods = this.app.get('body methods');
         // skip reading body for non-POST requests
@@ -222,6 +233,18 @@ module.exports = class Request extends Readable {
         if(this.#cachedParsedIp) {
             return this.#cachedParsedIp;
         }
+        const finished = !this.res.socket.writable;
+        if(finished) {
+            // mark app as one that needs ip after response
+            this.app.needsIpAfterResponse = true;
+        }
+        if(!this.rawIp) {
+            if(finished) {
+                // fallback once
+                return '127.0.0.1';
+            }
+            this.rawIp = this._res.getRemoteAddress();
+        }
         let ip = '';
         if(this.rawIp.byteLength === 4) {
             // ipv4

package/src/router.js

@@ -375,6 +375,8 @@ module.exports = class Router extends EventEmitter {
                             }
                         }
                     }
+
+                    resolve(true)
                 });
             }
             return true;