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

Move utilities into middleware/utils

Browse Source
This commit is contained in:
MICHAEL JACKSON
2017-08-18 12:57:42 -07:00
parent 2d03ed9be6
commit 7408b24adf
15 changed files with 149 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/middleware/serveFile.js
View File

@ -2,8 +2,8 @@ const fs = require('fs')
const path = require('path')
const qs = require('querystring')
const etag = require('etag')
const { generateDirectoryIndexHTML } = require('./IndexUtils')
const { getContentType } = require('./FileUtils')
const getFileContentType = require('./utils/getFileContentType')
const getIndexHTML = require('./utils/getIndexHTML')
/**
* Automatically generate HTML pages that show package contents.
@ -11,7 +11,7 @@ const { getContentType } = require('./FileUtils')
const AutoIndex = !process.env.DISABLE_INDEX
function sendFile(res, file, stats) {
let contentType = getContentType(file)
let contentType = getFileContentType(file)
if (contentType === 'text/html')
contentType = 'text/plain' // We can't serve HTML because bad people :(
@ -52,7 +52,7 @@ function serveFile(req, res, next) {
// 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) {
getIndexHTML(req.packageInfo, req.packageVersion, req.packageDir, req.file, function (error, html) {
if (error) {
console.error(error)
res.status(500).type('text').send(`Cannot generate index page for ${req.packageSpec}${req.filename}`)