ultimate-express 1.2.7 → 1.2.9

package/README.md

@@ -34,23 +34,23 @@ Tested using [wrk](https://github.com/wg/wrk) (`-d 60 -t 1 -c 200`). Etag was di
 | 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)            | 7.90k           | 29.90k           | 1.64 MB/sec        | 5.36 MB/sec         | **3.78X**        |
+| middlewares/body-urlencoded (/abc)            | 8.01k           | 35.10k           | 1.66 MB/sec        | 7.02 MB/sec         | **4.38X**        |
 
 ### Performance against other frameworks
 
 Tested using [bun-http-framework-benchmark](https://github.com/dimdenGD/bun-http-framework-benchmark). This table only includes Node.js results.
 For full table with other runtimes, check [here](https://github.com/dimdenGD/bun-http-framework-benchmark?tab=readme-ov-file#results).
 
-|  Framework       | Average | Ping       | Query      | Body       |
-| ---------------- | ------- | ---------- | ---------- | ---------- |
-| 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 |
+|  Framework           | Average       | Ping          | Query         | Body          |
+| -------------------- | ------------- | ------------- | ------------- | ------------- |
+| 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** |
-| 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 |
-| 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 |
+| 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      |
+| 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      |
 
 ### Performance on real-world application
 
@@ -107,9 +107,11 @@ Optimized routes can be up to 10 times faster than normal routes, as they're usi
 
 2. Do not use external `serve-static` module. Instead use built-in `express.static()` middleware, which is optimized for uExpress.
 
-3. Do not set `body methods` to read body of requests with GET method or other methods that don't need a body. Reading body makes server about 10k req/sec slower.
+3. Do not use `body-parser` module. Instead use built-in `express.text()`, `express.json()` etc.
 
-4. By default, µExpress creates 1 (or 0 if your CPU has only 1 core) child thread to improve performance of reading files. You can change this number by setting `threads` to a different number in `express()`, or set to 0 to disable thread pool (`express({ threads: 0 })`). Threads are shared between all express() instances, with largest `threads` number being used. Using more threads will not necessarily improve performance. Sometimes not using threads at all is faster, please [test](https://github.com/wg/wrk/) both options.
+4. Do not set `body methods` to read body of requests with GET method or other methods that don't need a body. Reading body makes server about 10k req/sec slower.
+
+5. By default, µExpress creates 1 (or 0 if your CPU has only 1 core) child thread to improve performance of reading files. You can change this number by setting `threads` to a different number in `express()`, or set to 0 to disable thread pool (`express({ threads: 0 })`). Threads are shared between all express() instances, with largest `threads` number being used. Using more threads will not necessarily improve performance. Sometimes not using threads at all is faster, please [test](https://github.com/wg/wrk/) both options.
 
 ## WebSockets
 
@@ -133,7 +135,6 @@ In general, basically all features and options are supported. Use [Express 4.x d
 - ✅ express.json()
 - ✅ express.urlencoded()
 - ✅ express.static()
-- - Additionally you can pass `options.ifModifiedSince` to support If-Modified-Since header (this header is not supported in normal Express, but is supported in µExpress)
 - ✅ express.text()
 - ✅ express.raw()
 - 🚧 express.request (this is not a constructor but a prototype for replacing methods)
@@ -253,7 +254,7 @@ In general, basically all features and options are supported. Use [Express 4.x d
 - - ✅ Range header
 - - ✅ Setting ETag header
 - - ✅ If-Match header
-- - ✅ If-Modified-Since header (with `options.ifModifiedSince` option)
+- - ✅ If-Modified-Since header
 - - ✅ If-Unmodified-Since header
 - - ✅ If-Range header
 - ✅ res.sendStatus()
@@ -281,7 +282,7 @@ In general, basically all features and options are supported. Use [Express 4.x d
 
 Most of the 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)
+- ✅ [body-parser](https://npmjs.com/package/body-parser) (use `express.text()` etc instead for better performance)
 - ✅ [cookie-parser](https://npmjs.com/package/cookie-parser)
 - ✅ [cookie-session](https://npmjs.com/package/cookie-session)
 - ✅ [serve-static](https://npmjs.com/package/serve-static) (use `express.static()` instead for better performance)

package/package.json

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

package/src/response.js

@@ -196,21 +196,23 @@ module.exports = class Response extends Writable {
                 if(data && !this.headers['etag'] && etagFn && !this.req.noEtag) {
                     this.set('etag', etagFn(data));
                 }
-                if(this.req.fresh) {
-                    if(!this.headersSent) {
-                        this._res.writeStatus('304');
-                    }
-                    this.headersSent = true;
-                    this.socket.emit('close');
-                    return this._res.end();
+                const fresh = this.req.fresh;
+                if(fresh) {
+                    this._res.writeStatus('304');
+                } else {
+                    this._res.writeStatus(this.statusCode.toString());
                 }
-                this._res.writeStatus(this.statusCode.toString());
                 for(const header in this.headers) {
                     if(header === 'content-length') {
                         continue;
                     }
                     this._res.writeHeader(header, this.headers[header]);
                 }
+                if(fresh) {
+                    this.headersSent = true;
+                    this.socket.emit('close');
+                    return this._res.end();
+                }
                 if(!this.headers['content-type']) {
                     this._res.writeHeader('content-type', 'text/html' + (typeof data === 'string' ? `; charset=utf-8` : ''));
                 }
@@ -396,21 +398,6 @@ module.exports = class Response extends Writable {
             return done(new Error('Precondition Failed'));
         }
 
-        // if-modified-since
-        if(options.ifModifiedSince) {
-            let modifiedSince = this.req.headers['if-modified-since'];
-            let lastModified = this.headers['last-modified'];
-            if(options.lastModified && lastModified && modifiedSince) {
-                modifiedSince = parseHttpDate(modifiedSince);
-                lastModified = parseHttpDate(lastModified);
-
-                if(!isNaN(lastModified) && !isNaN(modifiedSince) && lastModified <= modifiedSince) {
-                    this.status(304);
-                    return this.end();
-                };
-            }
-        }
-
         // range requests
         let offset = 0, len = stat.size, ranged = false;
         if(options.acceptRanges) {
@@ -440,6 +427,11 @@ module.exports = class Response extends Writable {
             }
         }
 
+        // if-modified-since, if-none-match
+        if(this.req.fresh) {
+            return this.end();
+        }
+
         if(this.req.method === 'HEAD') {
             this.set('Content-Length', stat.size);
             return this.end();
@@ -576,7 +568,6 @@ module.exports = class Response extends Writable {
         if(!options) {
             options = {};
         }
-        // TODO: signed cookies
         let val = typeof value === 'object' ? "j:"+JSON.stringify(value) : String(value);
         if(options.maxAge != null) {
             const maxAge = options.maxAge - 0;