ultimate-express 1.2.9 → 1.2.11

package/package.json

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

package/src/response.js

@@ -197,26 +197,22 @@ module.exports = class Response extends Writable {
                     this.set('etag', etagFn(data));
                 }
                 const fresh = this.req.fresh;
-                if(fresh) {
-                    this._res.writeStatus('304');
-                } else {
-                    this._res.writeStatus(this.statusCode.toString());
-                }
+                this._res.writeStatus(fresh ? '304' : 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` : ''));
                 }
                 this.headersSent = true;
+                if(fresh) {
+                    this._res.end();
+                    this.socket.emit('close');
+                    return;
+                }
             }
             if(!data && this.headers['content-length']) {
                 this._res.endWithoutBody(this.headers['content-length'].toString());
@@ -365,15 +361,15 @@ module.exports = class Response extends Writable {
         }
 
         // headers
-        if(!this.get('Content-Type')) {
+        if(!this.headers['content-type']) {
             const m = mime.lookup(fullpath);
             if(m) this.type(m);
         }
         if(options.cacheControl) {
-            this.set('Cache-Control', `public, max-age=${options.maxAge / 1000}` + (options.immutable ? ', immutable' : ''));
+            this.headers['cache-control'] = `public, max-age=${options.maxAge / 1000}` + (options.immutable ? ', immutable' : '');
         }
         if(options.lastModified) {
-            this.set('Last-Modified', stat.mtime.toUTCString());
+            this.headers['last-modified'] = stat.mtime.toUTCString();
         }
         if(options.headers) {
             for(const header in options.headers) {
@@ -386,7 +382,7 @@ module.exports = class Response extends Writable {
 
         // etag
         if(options.etag && !this.headers['etag'] && etagFn) {
-            this.set('etag', etagFn(stat));
+            this.headers['etag'] = etagFn(stat);
         }
         if(!options.etag) {
             this.req.noEtag = true;
@@ -401,7 +397,7 @@ module.exports = class Response extends Writable {
         // range requests
         let offset = 0, len = stat.size, ranged = false;
         if(options.acceptRanges) {
-            this.set('accept-ranges', 'bytes');
+            this.headers['accept-ranges'] = 'bytes';
             if(this.req.headers.range) {
                 let ranges = this.req.range(stat.size, {
                     combine: true
@@ -414,12 +410,12 @@ module.exports = class Response extends Writable {
     
                 if(ranges === -1) {
                     this.status(416);
-                    this.set('Content-Range', `bytes */${stat.size}`);
+                    this.headers['content-range'] = `bytes */${stat.size}`;
                     return done(new Error('Range Not Satisfiable'));
                 }
                 if(ranges !== -2 && ranges.length === 1) {
                     this.status(206);
-                    this.set('Content-Range', `bytes ${ranges[0].start}-${ranges[0].end}/${stat.size}`);
+                    this.headers['content-range'] = `bytes ${ranges[0].start}-${ranges[0].end}/${stat.size}`;
                     offset = ranges[0].start;
                     len = ranges[0].end - ranges[0].start + 1;
                     ranged = true;
@@ -505,7 +501,7 @@ module.exports = class Response extends Writable {
             if(field === 'set-cookie' && Array.isArray(value)) {
                 value = value.join('; ');
             } else if(field === 'content-type') {
-                if(value.startsWith('text/') || value === 'application/json' || value === 'application/javascript') {
+                if(!value.includes('charset=') && (value.startsWith('text/') || value === 'application/json' || value === 'application/javascript')) {
                     value += '; charset=utf-8';
                 }
             }
@@ -593,7 +589,7 @@ module.exports = class Response extends Writable {
         return this.cookie(name, '', opts);
     }
     attachment(filename) {
-        this.set('Content-Disposition', `attachment; filename="${filename}"`);
+        this.headers['Content-Disposition'] = `attachment; filename="${filename}"`;
         this.type(filename.split('.').pop());
         return this;
     }
@@ -615,8 +611,8 @@ module.exports = class Response extends Writable {
         return this;
     }
     json(body) {
-        if(!this.get('Content-Type')) {
-            this.set('Content-Type', 'application/json; charset=utf-8');
+        if(!this.headers['content-type']) {
+            this.headers['content-type'] = 'application/json; charset=utf-8';
         }
         const escape = this.app.get('json escape');
         const replacer = this.app.get('json replacer');
@@ -627,9 +623,9 @@ module.exports = class Response extends Writable {
         let callback = this.req.query[this.app.get('jsonp callback name')];
         let body = stringify(object, this.app.get('json replacer'), this.app.get('json spaces'), this.app.get('json escape'));
 
-        if(!this.get('Content-Type')) {
-            this.set('Content-Type', 'application/javascript; charset=utf-8');
-            this.set('X-Content-Type-Options', 'nosniff');
+        if(!this.headers['content-type']) {
+            this.headers['content-type'] = 'application/javascript; charset=utf-8';
+            this.headers['X-Content-Type-Options'] = 'nosniff';
         }
 
         if(Array.isArray(callback)) {
@@ -637,8 +633,6 @@ module.exports = class Response extends Writable {
         }
 
         if(typeof callback === 'string' && callback.length !== 0) {
-            this.set('Content-Type', 'application/javascript; charset=utf-8');
-            this.set('X-Content-Type-Options', 'nosniff');
             callback = callback.replace(/[^\[\]\w$.]/g, '');
 
             if(body === undefined) {
@@ -664,7 +658,7 @@ module.exports = class Response extends Writable {
             if(!path) path = this.req.get('Referer');
             if(!path) path = '/';
         }
-        return this.set('Location', encodeUrl(path));
+        return this.headers['location'] = encodeUrl(path);
     }
     redirect(status, url) {
         if(typeof status !== 'number' && !url) {
@@ -673,7 +667,7 @@ module.exports = class Response extends Writable {
         }
         this.location(url);
         this.status(status);
-        this.set('Content-Type', 'text/plain; charset=utf-8');
+        this.headers['content-type'] = 'text/plain; charset=utf-8';
         return this.send(`${statuses.message[status] ?? status}. Redirecting to ${url}`);
     }
 
@@ -684,7 +678,7 @@ module.exports = class Response extends Writable {
         if(ct.startsWith('text/') || ct === 'application/json' || ct === 'application/javascript') {
             ct += '; charset=UTF-8';
         }
-        return this.set('Content-Type', ct);
+        return this.set('content-type', ct);
     }
     contentType(type) {
         return this.type(type);