ultimate-express 2.0.0 → 2.0.1

package/package.json

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

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()];