Consolidate gunzip logic

This commit is contained in:
Michael Jackson 2019-08-02 16:06:13 -07:00
parent 746a6fddf5
commit be843179d4
7 changed files with 6 additions and 12 deletions

View File

@ -1,5 +1,6 @@
import fs from 'fs';
import path from 'path';
import gunzip from 'gunzip-maybe';
function getPackageInfo(packageName) {
const file = path.resolve(__dirname, `./metadata/${packageName}.json`);
@ -29,5 +30,5 @@ export function getPackage(packageName, version) {
`./packages/${packageName}-${version}.tgz`
);
return fs.existsSync(file) ? fs.createReadStream(file) : null;
return fs.existsSync(file) ? fs.createReadStream(file).pipe(gunzip()) : null;
}

View File

@ -1,5 +1,4 @@
import path from 'path';
import gunzip from 'gunzip-maybe';
import tar from 'tar-stream';
import asyncHandler from '../utils/asyncHandler.js';
@ -15,7 +14,6 @@ async function findMatchingEntries(stream, filename) {
const entries = {};
stream
.pipe(gunzip())
.pipe(tar.extract())
.on('error', reject)
.on('entry', async (header, stream, next) => {

View File

@ -1,5 +1,4 @@
import path from 'path';
import gunzip from 'gunzip-maybe';
import tar from 'tar-stream';
import asyncHandler from '../utils/asyncHandler.js';
@ -16,7 +15,6 @@ async function findMatchingEntries(stream, filename) {
entries[filename] = { path: filename, type: 'directory' };
stream
.pipe(gunzip())
.pipe(tar.extract())
.on('error', reject)
.on('entry', async (header, stream, next) => {

View File

@ -1,4 +1,3 @@
import gunzip from 'gunzip-maybe';
import tar from 'tar-stream';
import asyncHandler from '../utils/asyncHandler.js';
@ -18,7 +17,6 @@ async function findEntry(stream, filename) {
let foundEntry = null;
stream
.pipe(gunzip())
.pipe(tar.extract())
.on('error', reject)
.on('entry', async (header, stream, next) => {

View File

@ -1,4 +1,3 @@
import gunzip from 'gunzip-maybe';
import tar from 'tar-stream';
import asyncHandler from '../utils/asyncHandler.js';
@ -13,7 +12,6 @@ async function findEntry(stream, filename) {
let foundEntry = null;
stream
.pipe(gunzip())
.pipe(tar.extract())
.on('error', reject)
.on('entry', async (header, stream, next) => {

View File

@ -1,5 +1,4 @@
import path from 'path';
import gunzip from 'gunzip-maybe';
import tar from 'tar-stream';
import asyncHandler from '../utils/asyncHandler.js';
@ -67,7 +66,6 @@ function searchEntries(stream, filename) {
}
stream
.pipe(gunzip())
.pipe(tar.extract())
.on('error', reject)
.on('entry', async (header, stream, next) => {

View File

@ -1,5 +1,6 @@
import url from 'url';
import https from 'https';
import gunzip from 'gunzip-maybe';
import LRUCache from 'lru-cache';
import debug from './debug.js';
@ -179,7 +180,9 @@ export async function getPackage(packageName, version) {
const res = await get(options);
if (res.statusCode === 200) {
return res;
const stream = res.pipe(gunzip());
// stream.pause();
return stream;
}
const data = await bufferStream(res);