186526/unpkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify server config

Browse Source
This commit is contained in:
MICHAEL JACKSON
2017-08-12 10:38:50 -07:00
parent 4653ee9e42
commit 5f2805c2e9
5 changed files with 53 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
server/middleware/serveFile.js
View File

@ -5,6 +5,16 @@ const Metadata = require('./MetadataUtils')
const { generateDirectoryIndexHTML } = require('./IndexUtils')
const { getContentType } = require('./FileUtils')
/**
* Automatically generate HTML pages that show package contents.
*/
const AutoIndex = !process.env.DISABLE_INDEX
/**
* Maximum recursion depth for ?meta listings.
*/
const MaximumDepth = 128
function sendFile(res, file, stats) {
let contentType = getContentType(file)
@ -30,38 +40,36 @@ function sendFile(res, file, stats) {
/**
* Send the file, JSON metadata, or HTML directory listing.
*/
function serveFile(autoIndex, maximumDepth) {
return function (req, res, next) {
// TODO: remove support for "json" query param
if (req.query.meta != null || req.query.json != null) {
Metadata.get(req.packageDir, req.file, req.stats, maximumDepth, function (error, metadata) {
if (error) {
console.error(error)
res.status(500).send(`Cannot generate JSON metadata for ${req.packageSpec}${req.filename}`)
} else {
// Cache metadata for 1 year.
res.set('Cache-Control', 'public, max-age=31536000').send(metadata)
}
})
} else if (req.stats.isFile()) {
// Cache files for 1 year.
res.set('Cache-Control', 'public, max-age=31536000')
function serveFile(req, res, next) {
// TODO: remove support for "json" query param
if (req.query.meta != null || req.query.json != null) {
Metadata.get(req.packageDir, req.file, req.stats, MaximumDepth, function (error, metadata) {
if (error) {
console.error(error)
res.status(500).send(`Cannot generate JSON metadata for ${req.packageSpec}${req.filename}`)
} else {
// Cache metadata for 1 year.
res.set('Cache-Control', 'public, max-age=31536000').send(metadata)
}
})
} else if (req.stats.isFile()) {
// Cache files for 1 year.
res.set('Cache-Control', 'public, max-age=31536000')
// TODO: use res.sendFile instead of our own sendFile?
sendFile(res, path.join(req.packageDir, req.file), req.stats)
} else if (autoIndex && req.stats.isDirectory()) {
generateDirectoryIndexHTML(req.packageInfo, req.packageVersion, req.packageDir, req.file, function (error, html) {
if (error) {
console.error(error)
res.status(500).send(`Cannot generate index page for ${req.packageSpec}${req.filename}`)
} else {
// Cache HTML directory listings for 1 minute.
res.set('Cache-Control', 'public, max-age=60').send(html)
}
})
} else {
res.status(403).send(`Cannot serve ${req.packageSpec}${req.filename}; it's not a file`)
}
// TODO: use res.sendFile instead of our own sendFile?
sendFile(res, path.join(req.packageDir, req.file), req.stats)
} else if (AutoIndex && req.stats.isDirectory()) {
generateDirectoryIndexHTML(req.packageInfo, req.packageVersion, req.packageDir, req.file, function (error, html) {
if (error) {
console.error(error)
res.status(500).send(`Cannot generate index page for ${req.packageSpec}${req.filename}`)
} else {
// Cache HTML directory listings for 1 minute.
res.set('Cache-Control', 'public, max-age=60').send(html)
}
})
} else {
res.status(403).send(`Cannot serve ${req.packageSpec}${req.filename}; it's not a file`)
}
}