Re-use registry HTTP agent for package info requests

This commit is contained in:
Michael Jackson
2018-07-14 17:41:58 -07:00
parent 4360fbf7d6
commit 5f0fa21063
8 changed files with 90 additions and 46 deletions

View File

@ -3,7 +3,7 @@ const semver = require("semver");
const addLeadingSlash = require("../utils/addLeadingSlash");
const createPackageURL = require("../utils/createPackageURL");
const createSearch = require("../utils/createSearch");
const getPackageInfo = require("../utils/getPackageInfo");
const getNpmPackageInfo = require("../utils/getNpmPackageInfo");
const incrementCounter = require("../utils/incrementCounter");
function tagRedirect(req, res) {
@ -113,7 +113,7 @@ function filenameRedirect(req, res) {
* exact filename if the request omits the filename.
*/
function fetchPackage(req, res, next) {
getPackageInfo(req.packageName).then(
getNpmPackageInfo(req.packageName).then(
packageInfo => {
if (packageInfo == null || packageInfo.versions == null) {
return res

View File

@ -3,7 +3,7 @@ const path = require("path");
const addLeadingSlash = require("../utils/addLeadingSlash");
const createPackageURL = require("../utils/createPackageURL");
const createSearch = require("../utils/createSearch");
const fetchArchive = require("../utils/fetchArchive");
const fetchNpmPackage = require("../utils/fetchNpmPackage");
const getIntegrity = require("../utils/getIntegrity");
const getContentType = require("../utils/getContentType");
@ -92,9 +92,7 @@ function searchEntries(tarballStream, entryName, wantsHTML) {
const chunks = [];
stream.on("data", chunk => chunks.push(chunk));
stream.on("end", () => {
stream.on("data", chunk => chunks.push(chunk)).on("end", () => {
const content = Buffer.concat(chunks);
// Set some extra properties for files that we will
@ -124,7 +122,7 @@ const trailingSlash = /\/$/;
* Redirect to the "index" file if a directory was requested.
*/
function findFile(req, res, next) {
fetchArchive(req.packageConfig).then(tarballStream => {
fetchNpmPackage(req.packageConfig).then(tarballStream => {
const entryName = req.filename
.replace(trailingSlash, "")
.replace(leadingSlash, "");