ultimate-express 1.4.10 → 2.0.1

package/README.md

@@ -8,10 +8,12 @@ To make sure µExpress matches behavior of Express in all cases, we run all test
 
 `npm install ultimate-express` -> replace `express` with `ultimate-express` -> done[*](https://github.com/dimdenGD/ultimate-express?tab=readme-ov-file#differences-from-express)  
 
-[![Node.js >= 16.0.0](https://img.shields.io/badge/Node.js-%3E=16.0.0-green)](https://nodejs.org)
+[![Node.js >= 20.0.0](https://img.shields.io/badge/Node.js-%3E=20.0.0-green)](https://nodejs.org)
 [![npm](https://img.shields.io/npm/v/ultimate-express?label=last+version)](https://npmjs.com/package/ultimate-express)
 [![Patreon](https://img.shields.io/badge/donate-Patreon-orange)](https://patreon.com/dimdendev)
 
+> Use `npm install ultimate-express@node-v18` to install last version that supported Node.js v18.
+
 ## Difference from similar projects
 
 Similar projects based on uWebSockets:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-express",
-  "version": "1.4.10",
+  "version": "2.0.1",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {
@@ -11,7 +11,7 @@
     "cover:report": "nyc report --reporter=html"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "files": [
     "src",
@@ -61,48 +61,47 @@
     "range-parser": "^1.2.1",
     "statuses": "^2.0.1",
     "tseep": "^1.3.1",
-    "type-is": "^1.6.18",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.51.0",
+    "type-is": "^2.0.1",
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.52.0",
     "vary": "^1.1.2"
   },
   "devDependencies": {
     "@codechecks/client": "^0.1.12",
     "better-sse": "^0.14.1",
-    "body-parser": "^1.20.3",
+    "body-parser": "^2.2.0",
     "compression": "^1.8.0",
-    "cookie-parser": "^1.4.6",
+    "cookie-parser": "^1.4.7",
     "cookie-session": "^2.1.0",
     "cors": "^2.8.5",
     "ejs": "^3.1.10",
     "errorhandler": "^1.5.1",
-    "eventsource": "^3.0.6",
+    "eventsource": "^3.0.7",
     "exit-hook": "^2.2.1",
     "express": "latest-4",
     "express-art-template": "^1.0.1",
     "express-async-errors": "^3.1.1",
     "express-dot-engine": "^1.0.8",
     "express-fileupload": "^1.5.1",
-    "express-handlebars": "^8.0.2",
+    "express-handlebars": "^8.0.3",
     "express-mongo-sanitize": "^2.2.0",
     "express-rate-limit": "^7.5.0",
-    "express-session": "^1.18.0",
+    "express-session": "^1.18.1",
     "express-subdomain": "^1.0.6",
-    "formdata-node": "^6.0.3",
     "graphql-http": "^1.22.4",
     "helmet": "^8.1.0",
     "method-override": "^3.0.0",
     "morgan": "^1.10.0",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^1.4.5-lts.2",
     "mustache-express": "^1.3.2",
     "nyc": "^17.1.0",
     "pako": "^2.1.0",
     "passport": "^0.7.0",
     "passport-local": "^1.0.0",
-    "pkg-pr-new": "^0.0.29",
+    "pkg-pr-new": "^0.0.43",
     "pug": "^3.0.3",
     "response-time": "^2.3.3",
     "serve-index": "^1.9.1",
-    "serve-static": "^1.16.2",
+    "serve-static": "^2.2.0",
     "swagger-ui-express": "^5.0.1",
     "swig": "^1.4.2",
     "vhost": "^3.0.2"

package/src/declarative.js

@@ -187,10 +187,16 @@ module.exports = function compileDeclarative(cb, app) {
                     return false;
                 }
                 const sameHeader = headers.find(header => header[0].toLowerCase() === call.arguments[0].value.toLowerCase());
+                let [header, value] = [call.arguments[0].value, call.arguments[1].value];
+                if(call.obj.propertyName !== 'setHeader') {
+                    if(value.includes('text/') && !value.includes('; charset=')) {
+                        value += '; charset=utf-8';
+                    }
+                }
                 if(sameHeader) {
-                    sameHeader[1] = call.arguments[1].value;
+                    sameHeader[1] = value;
                 } else {
-                    headers.push([call.arguments[0].value, call.arguments[1].value]);
+                    headers.push([header, value]);
                 }
             } else if(call.obj.propertyName === 'append') {
                 if(call.arguments[0].type !== 'Literal' || call.arguments[1].type !== 'Literal') {
@@ -211,6 +217,10 @@ module.exports = function compileDeclarative(cb, app) {
                     const index = headers.findIndex(header => header[0].toLowerCase() === 'content-type');
                     if(index === -1) {
                         headers.push(['content-type', 'text/html; charset=utf-8']);
+                    } else {
+                        if(headers[index][1].includes('text/') && !headers[index][1].includes('; charset=')) {
+                            headers[index][1] += '; charset=utf-8';
+                        }
                     }
                 }
                 const arg = call.arguments[0];
@@ -355,9 +365,6 @@ module.exports = function compileDeclarative(cb, app) {
             if(header[0].toLowerCase() === 'content-length') {
                 return false;
             }
-            if(header[0].toLowerCase() === 'content-type' && header[1].includes('text/') && !header[1].includes(';')) {
-                header[1] += '; charset=utf-8';
-            }
             decRes = decRes.writeHeader(header[0], header[1]);
         }
 

package/src/response.js

@@ -350,7 +350,9 @@ module.exports = class Response extends Writable {
                 this.headers['content-type'] += '; charset=utf-8';
             }
         } else {
-            this.headers['content-type'] = 'application/octet-stream';
+            if(!this.headers['content-type']) {
+                this.headers['content-type'] = 'application/octet-stream';
+            }
         }
         return this.end(body);
     }
@@ -585,23 +587,17 @@ module.exports = class Response extends Writable {
         this.attachment(name);
         this.sendFile(path, opts, done);
     }
-    set(field, value) {
+    setHeader(field, value) {
         if(this.headersSent) {
             throw new Error('Cannot set headers after they are sent to the client');
         }
-        if(typeof field === 'object') {
-            for(const header in field) {
-                this.set(header, field[header]);
-            }
+        if(typeof field !== 'string') {
+            throw new TypeError('Header name must be a valid HTTP token');
         } else {
             field = field.toLowerCase();
             if(Array.isArray(value)) {
                 this.headers[field] = value;
                 return this;
-            } else if(field === 'content-type') {
-                if(!value.includes('charset=') && (value.startsWith('text/') || value === 'application/json' || value === 'application/javascript')) {
-                    value += '; charset=utf-8';
-                }
             }
             this.headers[field] = String(value);
         }
@@ -610,8 +606,21 @@ module.exports = class Response extends Writable {
     header(field, value) {
         return this.set(field, value);
     }
-    setHeader(field, value) {
-        return this.set(field, value);
+    set(field, value) {
+        if(typeof field === 'object') {
+            for(const header in field) {
+                this.setHeader(header, field[header]);
+            }
+        } else {
+            field = field.toLowerCase();
+            if(field === 'content-type') {
+                if(!value.includes('charset=') && (value.startsWith('text/') || value === 'application/json' || value === 'application/javascript')) {
+                    value += '; charset=utf-8';
+                }
+            }
+            this.setHeader(field, value);
+        }
+        return this;
     }
     get(field) {
         return this.headers[field.toLowerCase()];