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

Add error for non-JS files in ?module mode

This commit is contained in:
Michael Jackson 2018-05-16 08:49:19 -07:00
parent f8beb1c2a8
commit 041d0c407f
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/actions/serveFile.js
View File

@ -70,18 +70,26 @@ function rewriteBareModuleIdentifiers(file, packageConfig, callback) {
} }
function serveJavaScriptModule(req, res) { function serveJavaScriptModule(req, res) {
if (getFileContentType(req.filename) !== "application/javascript") {
return res
.status(403)
.type("text")
.send("?module mode is available only for JavaScript files");
}
const file = path.join(req.packageDir, req.filename); const file = path.join(req.packageDir, req.filename);
rewriteBareModuleIdentifiers(file, req.packageConfig, (error, code) => { rewriteBareModuleIdentifiers(file, req.packageConfig, (error, code) => {
if (error) { if (error) {
console.error(error); console.error(error);
const debugInfo = const errorName = error.constructor.name;
error.constructor.name + const errorMessage = error.message.replace(
": " + /^.*?\/unpkg-.+?\//,
error.message.replace(/^.*?\/unpkg-.+?\//, `/${req.packageSpec}/`) + `/${req.packageSpec}/`
"\n\n" + );
error.codeFrame; const codeFrame = error.codeFrame;
const debugInfo = `${errorName}: ${errorMessage}\n\n${codeFrame}`;
res res
.status(500) .status(500)
@ -106,17 +114,14 @@ function serveJavaScriptModule(req, res) {
} }
function serveStaticFile(req, res) { function serveStaticFile(req, res) {
const file = path.join(req.packageDir, req.filename);
const tags = ["file"]; const tags = ["file"];
const ext = path.extname(req.filename).substr(1); const ext = path.extname(req.filename).substr(1);
if (ext) { if (ext) {
tags.push(`${ext}-file`); tags.push(`${ext}-file`);
} }
let contentType = getFileContentType(file); let contentType = getFileContentType(req.filename);
if (contentType === "application/javascript") { if (contentType === "application/javascript") {
contentType += "; charset=utf-8"; contentType += "; charset=utf-8";
} }
@ -131,6 +136,7 @@ function serveStaticFile(req, res) {
"Cache-Tag": tags.join(",") "Cache-Tag": tags.join(",")
}); });
const file = path.join(req.packageDir, req.filename);
const stream = fs.createReadStream(file); const stream = fs.createReadStream(file);
stream.on("error", error => { stream.on("error", error => {
@ -180,9 +186,7 @@ function serveFile(req, res) {
if (req.query.meta != null) { if (req.query.meta != null) {
serveMetadata(req, res); serveMetadata(req, res);
} else if (req.stats.isFile()) { } else if (req.stats.isFile()) {
const contentType = getFileContentType(req.filename); if (req.query.module != null) {
if (contentType === "application/javascript" && req.query.module != null) {
serveJavaScriptModule(req, res); serveJavaScriptModule(req, res);
} else { } else {
serveStaticFile(req, res); serveStaticFile(req, res);