Exported raw middleware from serve-public-file

no-issue

The current public file middleware handles route matching itself, which
means it is applied to express via the use method. Due to use being a
"global" application of middleware, this means it is not possible to
apply a labs middleware before the public file serving middleware
without it affecting the entire route stack.

This commit exports a piece of raw middleware that can be used with the
get method of express, so that we can attach middleware beforehand.

This will be used to conditionally serve the members specific public
files, based on the labs flag for members.
This commit is contained in:
Fabien O'Carroll 2019-04-23 16:24:33 +02:00
parent d7fadfeff7
commit ed1a42f7f3

View File

@ -4,9 +4,7 @@ const path = require('path');
const config = require('../../../config'); const config = require('../../../config');
const urlService = require('../../../services/url'); const urlService = require('../../../services/url');
// ### servePublicFile Middleware function createPublicFileMiddleware(file, type, maxAge) {
// Handles requests to robots.txt and favicon.ico (and caches them)
function servePublicFile(file, type, maxAge) {
let content; let content;
const publicFilePath = config.get('paths').publicFilePath; const publicFilePath = config.get('paths').publicFilePath;
const filePath = file.match(/^public/) ? path.join(publicFilePath, file.replace(/^public/, '')) : path.join(publicFilePath, file); const filePath = file.match(/^public/) ? path.join(publicFilePath, file.replace(/^public/, '')) : path.join(publicFilePath, file);
@ -14,33 +12,45 @@ function servePublicFile(file, type, maxAge) {
const apiRegex = /(\{\{api-url\}\})/g; const apiRegex = /(\{\{api-url\}\})/g;
return function servePublicFile(req, res, next) { return function servePublicFile(req, res, next) {
if (req.path === '/' + file) { if (content) {
if (content) { res.writeHead(200, content.headers);
res.writeHead(200, content.headers); return res.end(content.body);
res.end(content.body); }
} else { fs.readFile(filePath, (err, buf) => {
fs.readFile(filePath, (err, buf) => { if (err) {
if (err) { return next(err);
return next(err);
}
if (type === 'text/xsl' || type === 'text/plain' || type === 'application/javascript') {
buf = buf.toString().replace(blogRegex, urlService.utils.urlFor('home', true).replace(/\/$/, ''));
buf = buf.toString().replace(apiRegex, urlService.utils.urlFor('api', {cors: true, version: 'v0.1', versionType: 'content'}, true));
}
content = {
headers: {
'Content-Type': type,
'Content-Length': buf.length,
ETag: `"${crypto.createHash('md5').update(buf, 'utf8').digest('hex')}"`,
'Cache-Control': `public, max-age=${maxAge}`
},
body: buf
};
res.writeHead(200, content.headers);
res.end(content.body);
});
} }
let str = buf.toString();
if (type === 'text/xsl' || type === 'text/plain' || type === 'application/javascript') {
str = str.replace(blogRegex, urlService.utils.urlFor('home', true).replace(/\/$/, ''));
str = str.replace(apiRegex, urlService.utils.urlFor('api', {cors: true, version: 'v0.1', versionType: 'content'}, true));
}
content = {
headers: {
'Content-Type': type,
'Content-Length': Buffer.from(str).length,
ETag: `"${crypto.createHash('md5').update(str, 'utf8').digest('hex')}"`,
'Cache-Control': `public, max-age=${maxAge}`
},
body: str
};
res.writeHead(200, content.headers);
res.end(content.body);
});
};
}
// ### servePublicFile Middleware
// Handles requests to robots.txt and favicon.ico (and caches them)
function servePublicFile(file, type, maxAge) {
const publicFileMiddleware = createPublicFileMiddleware(file, type, maxAge);
return function servePublicFile(req, res, next) {
if (req.path === '/' + file) {
return publicFileMiddleware(req, res, next);
} else { } else {
return next(); return next();
} }
@ -48,3 +58,5 @@ function servePublicFile(file, type, maxAge) {
} }
module.exports = servePublicFile; module.exports = servePublicFile;
module.exports.servePublicFile = servePublicFile;
module.exports.createPublicFileMiddleware = createPublicFileMiddleware;