Merge pull request #258 from wpreul/feature/files

Adding support for etag and last-modified headers
hapijs · Nov 20, 2012 · 24e10df · 24e10df
2 parents 5a8f703 + ace9888
commit 24e10df
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 9 deletions.
diff --git a/lib/response/file.js b/lib/response/file.js
@@ -41,6 +41,7 @@ internals.File.prototype._prepare = function (callback) {
         self.headers['Content-Type'] = Mime.lookup(self._filePath) || 'application/octet-stream';
         self.headers['Content-Length'] = stat.size;
         self.headers['Last-Modified'] = new Date(stat.mtime).toUTCString();
+        self.headers.etag = JSON.stringify([stat.ino, stat.size, Date.parse(stat.mtime)].join('-'));
 
         return callback(self);
     });

diff --git a/lib/response/index.js b/lib/response/index.js
@@ -120,6 +120,22 @@ exports._respond = function (item, request, callback) {
             response = new internals.Error(errOptions);
         }
 
+
+        if (request.method === 'get' || request.method === 'head') {
+            // Process ETag and If-Modified-Since headers
+
+            var ifModifiedSince = request.raw.req.headers['if-modified-since'] ? Date.parse(request.raw.req.headers['if-modified-since']) : null;
+            var lastModified = response.headers && response.headers['Last-Modified'] ? Date.parse(response.headers['Last-Modified']) : null;
+            var etag = response.headers ? response.headers.etag : null;
+
+            if ((etag && request.raw.req.headers['if-none-match'] === etag) ||
+                (ifModifiedSince && lastModified && ifModifiedSince >= lastModified)) {
+
+                response = new internals.Empty();
+                response._code = 304;
+            }
+        }
+
         // Set Cache, CORS, Location headers
 
         Headers.set(response, request);

diff --git a/test/integration/response.js b/test/integration/response.js
@@ -140,11 +140,11 @@ describe('Response', function () {
         { method: 'GET', path: '/direct', config: { handler: directHandler, cache: { mode: 'client', expiresIn: 9999 } } },
         { method: 'POST', path: '/exp', handler: expHandler },
         { method: 'POST', path: '/stream/{issue?}', handler: streamHandler },
-        { method: 'POST', path: '/file', handler: fileHandler },
-        { method: 'POST', path: '/relativefile', handler: relativeFileHandler },
-        { method: 'POST', path: '/filenotfound', handler: fileNotFoundHandler },
-        { method: 'POST', path: '/staticfile', handler: { file: __dirname + '/../../package.json' } },
-        { method: 'POST', path: '/relativestaticfile', handler: { file: './package.json' } },
+        { method: 'GET', path: '/file', handler: fileHandler },
+        { method: 'GET', path: '/relativefile', handler: relativeFileHandler },
+        { method: 'GET', path: '/filenotfound', handler: fileNotFoundHandler },
+        { method: 'GET', path: '/staticfile', handler: { file: __dirname + '/../../package.json' } },
+        { method: 'GET', path: '/relativestaticfile', handler: { file: './package.json' } },
         { method: 'GET', path: '/cache', config: { handler: cacheHandler, cache: { expiresIn: 5000 } } }
     ]);
 
@@ -280,7 +280,7 @@ describe('Response', function () {
 
             server.start(function () {
 
-                Request.post('http://localhost:17082/file', function (err, res, body) {
+                Request.get('http://localhost:17082/file', function (err, res, body) {
 
                     expect(err).to.not.exist;
                     expect(body).to.contain('hapi');
@@ -306,7 +306,7 @@ describe('Response', function () {
 
         it('returns a file using the built-in handler config', function (done) {
 
-            Request.post('http://localhost:17082/staticfile', function (err, res, body) {
+            Request.get('http://localhost:17082/staticfile', function (err, res, body) {
 
                 expect(err).to.not.exist;
                 expect(body).to.contain('hapi');
@@ -322,7 +322,7 @@ describe('Response', function () {
 
                 server.start(function () {
 
-                    Request.post('http://localhost:17082/relativefile', function (err, res, body) {
+                    Request.get('http://localhost:17082/relativefile', function (err, res, body) {
 
                         expect(err).to.not.exist;
                         expect(body).to.contain('hapi');
@@ -335,7 +335,7 @@ describe('Response', function () {
 
             it('returns a file using the built-in handler config', function (done) {
 
-                Request.post('http://localhost:17082/relativestaticfile', function (err, res, body) {
+                Request.get('http://localhost:17082/relativestaticfile', function (err, res, body) {
 
                     expect(err).to.not.exist;
                     expect(body).to.contain('hapi');
@@ -345,5 +345,41 @@ describe('Response', function () {
                 });
             });
         });
+
+        it('returns a 304 when the request has a matching etag', function (done) {
+
+            server.start(function () {
+
+                Request.get('http://localhost:17082/file', function (err, res1) {
+
+                    var headers = {
+                        'if-none-match': res1.headers.etag
+                    };
+
+                    Request.get({ url: 'http://localhost:17082/file', headers: headers }, function (err, res2) {
+
+                        expect(res2.statusCode).to.equal(304);
+                        done();
+                    });
+                });
+            });
+        });
+
+        it('returns a 304 when the request has a future modifed-since', function (done) {
+
+            server.start(function () {
+
+                var date =  new Date(Date.now());
+                var headers = {
+                    'if-modified-since': new Date(date.setFullYear(date.getFullYear() + 1)).toUTCString()
+                };
+
+                Request.get({ url: 'http://localhost:17082/file', headers: headers }, function (err, res) {
+
+                    expect(res.statusCode).to.equal(304);
+                    done();
+                });
+            });
+        });
     });
 });