Skip to content

added support to send gzip files if they exist #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MauriceButler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added support to send gzip files if they exist #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ var getBuffer = (function() {
fs.watchFile(filePath, function() { buffers.del(filePath); });
}

return function getBuffer(filePath, callback) {
if(buffers.has(filePath)) { return callback(null, buffers.get(filePath)); }

function getFileInfo(filePath, callback){
fs.stat(filePath, function(err, stats) {
if(err && err.code === "ENOENT") {
return callback({ "file-not-found": true, path: filePath }, null);
Expand All @@ -39,11 +37,33 @@ var getBuffer = (function() {
callback(null, buffers.get(filePath));
});
});
}

return function getBuffer(filePath, acceptsGzip, callback) {
var gzipFilePath = filePath + '.gz';

if(buffers.has(gzipFilePath)) { return callback(null, buffers.get(gzipFilePath), 'gzip'); }
if(buffers.has(filePath)) { return callback(null, buffers.get(filePath)); }

if(!acceptsGzip){
getFileInfo(filePath, callback);
return;
}

fs.exists(gzipFilePath, function(exists){
if(exists){
getFileInfo(gzipFilePath, function(err, buffer){
callback(err, buffer, 'gzip');
});
} else {
getFileInfo(filePath, callback);
}
});
};
})();

function sendBuffer(req, res, mimeType, maxAge) {
return function(err, buffer) {
return function(err, buffer, encoding) {
if(err) {
if(err["file-not-found"]) {
console.error("Could not find file: " + err.path);
Expand All @@ -62,6 +82,10 @@ function sendBuffer(req, res, mimeType, maxAge) {
res.setHeader("Cache-Control", "private, max-age=" + maxAge);
res.setHeader("ETag", buffer.sum);

if(encoding){
res.setHeader("Content-Encoding", encoding);
}

if(req.headers["if-none-match"] === buffer.sum) {
res.writeHead(304);
return res.end();
Expand All @@ -77,7 +101,9 @@ function sendBuffer(req, res, mimeType, maxAge) {

var staticFile = (function() {
function handler(filePath, mimeType, req, res, maxAge) {
getBuffer(filePath, sendBuffer(req, res, mimeType, maxAge));
var acceptsGzip = req.headers && req.headers['accept-encoding'] && ~req.headers['accept-encoding'].indexOf('gzip');

getBuffer(filePath, acceptsGzip, sendBuffer(req, res, mimeType, maxAge));
}

return function staticFile(filePath, mime, maxAge) {
Expand All @@ -96,6 +122,7 @@ function staticDir(rootDir, mimeLookup, maxAge) {
matches = matches || extra;
var filePath = path.join.apply(path, [ rootDir ].concat(matches));
var ext = path.extname(filePath).toLowerCase();
var acceptsGzip = req.headers && req.headers['accept-encoding'] && ~req.headers['accept-encoding'].indexOf('gzip');

if(!(ext in mimeLookup)) {
console.error("Unknown file extension -- file: " + filePath + "; extension: " + ext);
Expand All @@ -109,7 +136,7 @@ function staticDir(rootDir, mimeLookup, maxAge) {
return default404(req, res);
}

getBuffer(filePath, sendBuffer(req, res, mimeLookup[ext], maxAge));
getBuffer(filePath, acceptsGzip, sendBuffer(req, res, mimeLookup[ext], maxAge));
};
}

Expand Down