ultimate-express 1.0.6 → 1.0.8

package/README.md

@@ -23,15 +23,15 @@ Similar projects based on uWebSockets:
 
 Tested using [wrk](https://github.com/wg/wrk) (`-d 60 -t 1 -c 200`). Etag was disabled in both Express and µExpress. Tested on Ubuntu 22.04, Node.js 20.17.0, AMD Ryzen 5 3600, 64GB RAM.
 
-| Test                        | Path              | 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           | 14.43k           | 2.40 MB/sec        | 5.53 MB/sec         | **2.44X**        |
-| middlewares/body-urlencoded | /abc (POST)       | 7.90k           | 29.90k           | 1.64 MB/sec        | 5.36 MB/sec         | **3.78X**        |
+| 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           | 14.43k           | 2.40 MB/sec        | 5.53 MB/sec         | **2.44X**        |
+| middlewares/body-urlencoded (/abc)            | 7.90k           | 29.90k           | 1.64 MB/sec        | 5.36 MB/sec         | **3.78X**        |
 
 Also tested on a real-world application with templates, static files and dynamic pages with data from database ([nekoweb.org](https://nekoweb.org)), and showed about 1.5-4X speedup in requests per second.
 
@@ -229,7 +229,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
+- - ✅ If-Modified-Since header (with `options.ifModifiedSince` option)
 - - ✅ If-Unmodified-Since header
 - - ✅ If-Range header
 - ✅ res.sendStatus()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-express",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {
@@ -39,6 +39,7 @@
     "body-parser": "^1.20.3",
     "cookie": "^0.6.0",
     "cookie-signature": "^1.2.1",
+    "encodeurl": "^2.0.0",
     "etag": "^1.8.1",
     "fresh": "^0.5.2",
     "mime-types": "^2.1.35",

package/src/response.js

@@ -1,6 +1,7 @@
 const cookie = require("cookie");
 const mime = require("mime-types");
 const vary = require("vary");
+const encodeUrl = require("encodeurl");
 const { 
     normalizeType, stringify, deprecated, UP_PATH_REGEXP, decode,
     containsDotFile, isPreconditionFailure, isRangeFresh, parseHttpDate
@@ -332,16 +333,18 @@ module.exports = class Response extends Writable {
         }
 
         // if-modified-since
-        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();
-            };
+        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
@@ -596,7 +599,7 @@ module.exports = class Response extends Writable {
             if(!path) path = this.req.get('Referer');
             if(!path) path = '/';
         }
-        return this.set('Location', encodeURI(path));
+        return this.set('Location', encodeUrl(path));
     }
     redirect(status, url) {
         if(typeof status !== 'number' && !url) {