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

Split up fetchFile middleware into 2

This commit is contained in:
Michael Jackson 2018-05-17 15:21:35 -07:00
parent da06a5b97f
commit 29697ed201
5 changed files with 257 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/actions/serveFile.js
View File

@ -4,10 +4,10 @@ const etag = require("etag");
const babel = require("babel-core");
const IndexPage = require("../components/IndexPage");
const unpkgRewrite = require("../plugins/unpkgRewrite");
const renderPage = require("../utils/renderPage");
const getMetadata = require("../utils/getMetadata");
const getFileContentType = require("../utils/getFileContentType");
const unpkgRewrite = require("../plugins/unpkgRewrite");
const getEntries = require("../utils/getEntries");
/**

3
server/createRouter.js
View File

@ -68,7 +68,8 @@ function createRouter() {
"*",
require("./middleware/parseURL"),
require("./middleware/checkBlacklist"),
require("./middleware/fetchFile"),
require("./middleware/fetchPackage"),
require("./middleware/findFile"),
require("./actions/serveFile")
);

247
server/middleware/fetchFile.js
View File

@ -1,247 +0,0 @@
const fs = require("fs");
const path = require("path");
const semver = require("semver");
const createPackageURL = require("../utils/createPackageURL");
const createSearch = require("./utils/createSearch");
const getPackageInfo = require("./utils/getPackageInfo");
const getPackage = require("./utils/getPackage");
const incrementCounter = require("./utils/incrementCounter");
function getBasename(file) {
return path.basename(file, path.extname(file));
}
/**
* File extensions to look for when automatically resolving.
*/
const FindExtensions = ["", ".js", ".json"];
/**
* Resolves a path like "lib/file" into "lib/file.js" or "lib/file.json"
* depending on which one is available, similar to require('lib/file').
*/
function findFile(base, useIndex, callback) {
FindExtensions.reduceRight((next, ext) => {
const file = base + ext;
return () => {
fs.stat(file, (error, stats) => {
if (error) {
if (error.code === "ENOENT" || error.code === "ENOTDIR") {
next();
} else {
callback(error);
}
} else if (useIndex && stats.isDirectory()) {
findFile(
path.join(file, "index"),
false,
(error, indexFile, indexStats) => {
if (error) {
callback(error);
} else if (indexFile) {
callback(null, indexFile, indexStats);
} else {
next();
}
}
);
} else {
callback(null, file, stats);
}
});
};
}, callback)();
}
/**
* Fetch the file from the registry and get its stats. Redirect if the URL
* specifies a tag, a semver version number, or an inexact path in ?module mode.
*/
function fetchFile(req, res, next) {
getPackageInfo(req.packageName, (error, packageInfo) => {
if (error) {
console.error(error);
return res
.status(500)
.type("text")
.send(`Cannot get info for package "${req.packageName}"`);
}
if (packageInfo == null || packageInfo.versions == null) {
return res
.status(404)
.type("text")
.send(`Cannot find package "${req.packageName}"`);
}
req.packageInfo = packageInfo;
if (req.packageVersion in req.packageInfo.versions) {
// A valid request for a package we haven't downloaded yet.
req.packageConfig = req.packageInfo.versions[req.packageVersion];
getPackage(req.packageConfig, (error, outputDir) => {
if (error) {
console.error(error);
res
.status(500)
.type("text")
.send(`Cannot fetch package ${req.packageSpec}`);
} else {
req.packageDir = outputDir;
let filename = req.filename;
let useIndex = true;
if (req.query.module != null) {
// They want an ES module.
if (!filename) {
// See https://github.com/rollup/rollup/wiki/pkg.module
filename =
req.packageConfig.module ||
req.packageConfig["jsnext:main"] ||
"/";
}
} else if (filename) {
// They are requesting an explicit filename. Only try to find an
// index.js if they are NOT requesting an HTML directory listing.
useIndex = filename.charAt(filename.length - 1) !== "/";
} else if (
req.query.main &&
typeof req.packageConfig[req.query.main] === "string"
) {
// They specified a custom ?main field.
// Deprecated, see https://github.com/unpkg/unpkg/issues/63
filename = req.packageConfig[req.query.main];
// Count which packages are using this so we can warn them when we
// remove this functionality.
incrementCounter(
"package-json-custom-main",
req.packageSpec + "?main=" + req.query.main,
1
);
} else if (typeof req.packageConfig.unpkg === "string") {
// The "unpkg" field allows packages to explicitly declare the
// file to serve at the bare URL.
filename = req.packageConfig.unpkg;
} else if (typeof req.packageConfig.browser === "string") {
// Fall back to the "browser" field if declared (only support strings).
// Deprecated, see https://github.com/unpkg/unpkg/issues/63
filename = req.packageConfig.browser;
// Count which packages + versions are actually using this fallback
// so we can warn them when we deprecate this functionality.
incrementCounter(
"package-json-browser-fallback",
req.packageSpec,
1
);
} else {
// Fall back to "main" or / (same as npm).
filename = req.packageConfig.main || "/";
}
findFile(
path.join(req.packageDir, filename),
useIndex,
(error, file, stats) => {
if (error) console.error(error);
if (file == null) {
return res
.status(404)
.type("text")
.send(
`Cannot find module "${filename}" in package ${
req.packageSpec
}`
);
}
filename = file.replace(req.packageDir, "");
if (
req.query.main != null ||
getBasename(req.filename) !== getBasename(filename)
) {
// Need to redirect to the module file so relative imports resolve
// correctly. Cache module redirects for 1 minute.
delete req.query.main;
res
.set({
"Cache-Control": "public, max-age=60",
"Cache-Tag": "redirect,module-redirect"
})
.redirect(
302,
createPackageURL(
req.packageName,
req.packageVersion,
filename,
createSearch(req.query)
)
);
} else {
req.filename = filename;
req.stats = stats;
next();
}
}
);
}
});
} else if (req.packageVersion in req.packageInfo["dist-tags"]) {
// Cache tag redirects for 1 minute.
res
.set({
"Cache-Control": "public, max-age=60",
"Cache-Tag": "redirect,tag-redirect"
})
.redirect(
302,
createPackageURL(
req.packageName,
req.packageInfo["dist-tags"][req.packageVersion],
req.filename,
req.search
)
);
} else {
const maxVersion = semver.maxSatisfying(
Object.keys(req.packageInfo.versions),
req.packageVersion
);
if (maxVersion) {
// Cache semver redirects for 1 minute.
res
.set({
"Cache-Control": "public, max-age=60",
"Cache-Tag": "redirect,semver-redirect"
})
.redirect(
302,
createPackageURL(
req.packageName,
maxVersion,
req.filename,
req.search
)
);
} else {
res
.status(404)
.type("text")
.send(`Cannot find package ${req.packageSpec}`);
}
}
});
}
module.exports = fetchFile;

99
server/middleware/fetchPackage.js Normal file
View File

@ -0,0 +1,99 @@
const semver = require("semver");
const createPackageURL = require("../utils/createPackageURL");
const getPackageInfo = require("./utils/getPackageInfo");
const getPackage = require("./utils/getPackage");
function tagRedirect(req, res) {
// Cache tag redirects for 1 minute.
res
.set({
"Cache-Control": "public, max-age=60",
"Cache-Tag": "redirect,tag-redirect"
})
.redirect(
302,
createPackageURL(
req.packageName,
req.packageInfo["dist-tags"][req.packageVersion],
req.filename,
req.search
)
);
}
function semverRedirect(req, res) {
const maxVersion = semver.maxSatisfying(
Object.keys(req.packageInfo.versions),
req.packageVersion
);
if (maxVersion) {
// Cache semver redirects for 1 minute.
res
.set({
"Cache-Control": "public, max-age=60",
"Cache-Tag": "redirect,semver-redirect"
})
.redirect(
302,
createPackageURL(req.packageName, maxVersion, req.filename, req.search)
);
} else {
res
.status(404)
.type("text")
.send(`Cannot find package ${req.packageSpec}`);
}
}
/**
* Fetch the package metadata and tarball from npm. Redirect to the exact
* version if the request targets a tag or uses a semver version.
*/
function fetchPackage(req, res, next) {
getPackageInfo(req.packageName, (error, packageInfo) => {
if (error) {
console.error(error);
return res
.status(500)
.type("text")
.send(`Cannot get info for package "${req.packageName}"`);
}
if (packageInfo == null || packageInfo.versions == null) {
return res
.status(404)
.type("text")
.send(`Cannot find package "${req.packageName}"`);
}
req.packageInfo = packageInfo;
if (req.packageVersion in req.packageInfo.versions) {
// A valid request for a package we haven't downloaded yet.
req.packageConfig = req.packageInfo.versions[req.packageVersion];
getPackage(req.packageConfig, (error, outputDir) => {
if (error) {
console.error(error);
res
.status(500)
.type("text")
.send(`Cannot fetch package ${req.packageSpec}`);
} else {
req.packageDir = outputDir;
next();
}
});
} else if (req.packageVersion in req.packageInfo["dist-tags"]) {
tagRedirect(req, res);
} else {
semverRedirect(req, res);
}
});
}
module.exports = fetchPackage;

155
server/middleware/findFile.js Normal file
View File

@ -0,0 +1,155 @@
const fs = require("fs");
const path = require("path");
const createPackageURL = require("../utils/createPackageURL");
const createSearch = require("./utils/createSearch");
const incrementCounter = require("./utils/incrementCounter");
/**
* File extensions to look for when automatically resolving.
*/
const resolveExtensions = ["", ".js", ".json"];
/**
* Resolves a path like "lib/file" into "lib/file.js" or "lib/file.json"
* depending on which one is available, similar to require('lib/file').
*/
function resolveFile(base, useIndex, callback) {
resolveExtensions.reduceRight((next, ext) => {
const file = base + ext;
return () => {
fs.stat(file, (error, stats) => {
if (error) {
if (error.code === "ENOENT" || error.code === "ENOTDIR") {
next();
} else {
callback(error);
}
} else if (useIndex && stats.isDirectory()) {
resolveFile(
path.join(file, "index"),
false,
(error, indexFile, indexStats) => {
if (error) {
callback(error);
} else if (indexFile) {
callback(null, indexFile, indexStats);
} else {
next();
}
}
);
} else {
callback(null, file, stats);
}
});
};
}, callback)();
}
function getBasename(file) {
return path.basename(file, path.extname(file));
}
/**
* Find the file targeted by the request and get its stats. Redirect
* inexact paths in ?module mode so relative imports resolve correctly.
*/
function findFile(req, res, next) {
let filename = req.filename;
let useIndex = true;
if (req.query.module != null) {
// They want an ES module.
if (!filename) {
// See https://github.com/rollup/rollup/wiki/pkg.module
filename =
req.packageConfig.module || req.packageConfig["jsnext:main"] || "/";
}
} else if (filename) {
// They are requesting an explicit filename. Only try to find an
// index.js if they are NOT requesting an HTML directory listing.
useIndex = filename.charAt(filename.length - 1) !== "/";
} else if (
req.query.main &&
typeof req.packageConfig[req.query.main] === "string"
) {
// They specified a custom ?main field.
// Deprecated, see https://github.com/unpkg/unpkg/issues/63
filename = req.packageConfig[req.query.main];
// Count which packages are using this so we can warn them when we
// remove this functionality.
incrementCounter(
"package-json-custom-main",
req.packageSpec + "?main=" + req.query.main,
1
);
} else if (typeof req.packageConfig.unpkg === "string") {
// The "unpkg" field allows packages to explicitly declare the
// file to serve at the bare URL.
filename = req.packageConfig.unpkg;
} else if (typeof req.packageConfig.browser === "string") {
// Fall back to the "browser" field if declared (only support strings).
// Deprecated, see https://github.com/unpkg/unpkg/issues/63
filename = req.packageConfig.browser;
// Count which packages + versions are actually using this fallback
// so we can warn them when we deprecate this functionality.
incrementCounter("package-json-browser-fallback", req.packageSpec, 1);
} else {
// Fall back to "main" or / (same as npm).
filename = req.packageConfig.main || "/";
}
resolveFile(
path.join(req.packageDir, filename),
useIndex,
(error, file, stats) => {
if (error) console.error(error);
if (file == null) {
return res
.status(404)
.type("text")
.send(
`Cannot find module "${filename}" in package ${req.packageSpec}`
);
}
filename = file.replace(req.packageDir, "");
if (
req.query.main != null ||
getBasename(req.filename) !== getBasename(filename)
) {
// Need to redirect to the module file so relative imports resolve
// correctly.
delete req.query.main;
// Cache module redirects for 1 minute.
res
.set({
"Cache-Control": "public, max-age=60",
"Cache-Tag": "redirect,module-redirect"
})
.redirect(
302,
createPackageURL(
req.packageName,
req.packageVersion,
filename,
createSearch(req.query)
)
);
} else {
req.filename = filename;
req.stats = stats;
next();
}
}
);
}
module.exports = findFile;