ultimate-express 2.0.1 → 2.0.2

package/README.md

@@ -57,7 +57,7 @@ For full table with other runtimes, check [here](https://github.com/dimdenGD/bun
 | express              | 10,411.313     | 11,245.57     | 10,598.74     | 9,389.63      |
 
 Other benchmarks:
- - [TechEmpower / FrameworkBenchmarks](https://www.techempower.com/benchmarks/#hw=ph&test=composite&section=data-r23&l=zik0sf-cn3)
+ - [TechEmpower / FrameworkBenchmarks](https://www.techempower.com/benchmarks/#section=data-r23&test=plaintext&l=zik0sf-pa7)
  - [the-benchmarker / web-frameworks](https://web-frameworks-benchmark.netlify.app/result?l=javascript)
 
 ### Performance on real-world application

package/package.json

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

package/src/middlewares.js

@@ -86,8 +86,9 @@ function static(root, options) {
 
         if(stat.isDirectory()) {
             if(!req.endsWithSlash) {
-                if(options.redirect) return res.redirect(301, req._originalPath + '/');
-                else {
+                if(options.redirect) {
+                    return res.redirect(301, req._originalPath + '/', true);
+                } else {
                     if(!options.fallthrough) {
                         res.status(404);
                         return next(new Error('Not found'));

package/src/request.js

@@ -135,6 +135,10 @@ module.exports = class Request extends Readable {
         return match ? match[0] : '';
     }
 
+    set baseUrl(x) {
+        return this._originalPath = x;
+    }
+
     get #host() {
         const trust = this.app.get('trust proxy fn');
         if(!trust) {

package/src/response.js

@@ -153,7 +153,7 @@ module.exports = class Response extends Writable {
             if (this.chunkedTransfer) {
                 this.#pendingChunks.push(chunk);
                 const size = this.#pendingChunks.reduce((acc, chunk) => acc + chunk.byteLength, 0);
-                const now = Date.now();
+                const now = performance.now();
                 // the first chunk is sent immediately (!this.#lastWriteChunkTime)
                 // the other chunks are sent when watermark is reached (size >= HIGH_WATERMARK) 
                 // or if elapsed 50ms of last send (now - this.#lastWriteChunkTime > 50)
@@ -173,7 +173,7 @@ module.exports = class Response extends Writable {
                                 const size = this.#pendingChunks.reduce((acc, chunk) => acc + chunk.byteLength, 0);
                                 this._res.write(Buffer.concat(this.#pendingChunks, size));
                                 this.#pendingChunks = [];
-                                this.#lastWriteChunkTime = now;
+                                this.#lastWriteChunkTime = performance.now();
                             }
                         });
                     }, 50);
@@ -775,28 +775,44 @@ module.exports = class Response extends Writable {
         }
         return this.headers['location'] = encodeUrl(path);
     }
-    redirect(status, url) {
+    redirect(status, url, forceHtml = false) {
         if(typeof status !== 'number' && !url) {
             url = status;
             status = 302;
         }
         this.location(url);
         this.status(status);
-        this.headers['content-type'] = 'text/plain; charset=utf-8';
         let body;
         // Support text/{plain,html} by default
-        this.format({
-            text: function() {
-                body = statuses.message[status] + '. Redirecting to ' + url
-            },
-            html: function() {
-                let u = escapeHtml(url);
-                body = '<p>' + statuses.message[status] + '. Redirecting to ' + u + '</p>'
-            },
-            default: function() {
-                body = '';
-            }
-        });
+        if(forceHtml) {
+            this.set('Content-Type', 'text/html; charset=UTF-8');
+            body = 
+                '<!DOCTYPE html>\n' +
+                '<html lang="en">\n' +
+                '<head>\n' +
+                '<meta charset="utf-8">\n' +
+                '<title>Redirecting</title>\n' +
+                '</head>\n' +
+                '<body>\n' +
+                `<pre>Redirecting to ${url.replaceAll("<", "&lt;").replaceAll(">", "&gt;")}</pre>\n` +
+                '</body>\n' +
+                '</html>\n';
+        } else {
+            this.format({
+                text: () => {
+                    this.set('Content-Type', 'text/plain; charset=UTF-8');
+                    body = statuses.message[status] + '. Redirecting to ' + url
+                },
+                html: () => {
+                    this.set('Content-Type', 'text/html; charset=UTF-8');
+                    body = `<p>${statuses.message[status]}. Redirecting to ${url.replaceAll("<", "&lt;").replaceAll(">", "&gt;")}</p>`;
+                },
+                default: () => {
+                    this.set('Content-Type', 'text/plain; charset=UTF-8');
+                    body = '';
+                }
+            });
+        }
         if (this.req.method === 'HEAD') {
             this.end();
         } else {