ultimate-express 1.2.8 → 1.2.10

package/README.md

@@ -135,7 +135,6 @@ In general, basically all features and options are supported. Use [Express 4.x d
 - ✅ express.json()
 - ✅ express.urlencoded()
 - ✅ express.static()
-- - Additionally you can pass `options.ifModifiedSince` to support If-Modified-Since header (this header is not supported in normal Express, but is supported in µExpress)
 - ✅ express.text()
 - ✅ express.raw()
 - 🚧 express.request (this is not a constructor but a prototype for replacing methods)
@@ -255,7 +254,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 (with `options.ifModifiedSince` option)
+- - ✅ If-Modified-Since header
 - - ✅ If-Unmodified-Since header
 - - ✅ If-Range header
 - ✅ res.sendStatus()

package/package.json

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

package/src/response.js

@@ -196,15 +196,8 @@ module.exports = class Response extends Writable {
                 if(data && !this.headers['etag'] && etagFn && !this.req.noEtag) {
                     this.set('etag', etagFn(data));
                 }
-                if(this.req.fresh) {
-                    if(!this.headersSent) {
-                        this._res.writeStatus('304');
-                    }
-                    this.headersSent = true;
-                    this.socket.emit('close');
-                    return this._res.end();
-                }
-                this._res.writeStatus(this.statusCode.toString());
+                const fresh = this.req.fresh;
+                this._res.writeStatus(fresh ? '304' : this.statusCode.toString());
                 for(const header in this.headers) {
                     if(header === 'content-length') {
                         continue;
@@ -215,6 +208,11 @@ module.exports = class Response extends Writable {
                     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());
@@ -396,21 +394,6 @@ module.exports = class Response extends Writable {
             return done(new Error('Precondition Failed'));
         }
 
-        // if-modified-since
-        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
         let offset = 0, len = stat.size, ranged = false;
         if(options.acceptRanges) {
@@ -440,6 +423,11 @@ module.exports = class Response extends Writable {
             }
         }
 
+        // if-modified-since, if-none-match
+        if(this.req.fresh) {
+            return this.end();
+        }
+
         if(this.req.method === 'HEAD') {
             this.set('Content-Length', stat.size);
             return this.end();
@@ -576,7 +564,6 @@ module.exports = class Response extends Writable {
         if(!options) {
             options = {};
         }
-        // TODO: signed cookies
         let val = typeof value === 'object' ? "j:"+JSON.stringify(value) : String(value);
         if(options.maxAge != null) {
             const maxAge = options.maxAge - 0;