From 87203f2cdff84764b900ccabc2addde078492941 Mon Sep 17 00:00:00 2001 From: "Juan Picado @jotadeveloper" Date: Sun, 17 Mar 2019 21:23:13 +0100 Subject: [PATCH] fix: add new enpoind that allow download tarballs according the standard --- src/api/endpoint/api/package.js | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/api/endpoint/api/package.js b/src/api/endpoint/api/package.js index c51bfd504..0fe79910f 100644 --- a/src/api/endpoint/api/package.js +++ b/src/api/endpoint/api/package.js @@ -11,6 +11,20 @@ import type { Router } from 'express'; import type { Config } from '@verdaccio/types'; import type { IAuth, $ResponseExtend, $RequestExtend, $NextFunctionVer, IStorageHandler } from '../../../../types'; +const downloadStream = (packageName: string, filename: string, storage: any, req: $RequestExtend, res: $ResponseExtend) => { + const stream = storage.getTarball(packageName, filename); + + stream.on('content-length', function(content) { + res.header('Content-Length', content); + }); + stream.on('error', function(err) { + return res.report_error(err); + }); + + res.header(HEADERS.CONTENT_TYPE, HEADERS.OCTET_STREAM); + stream.pipe(res); +}; + export default function(route: Router, auth: IAuth, storage: IStorageHandler, config: Config) { const can = allow(auth); // TODO: anonymous user? @@ -51,16 +65,13 @@ export default function(route: Router, auth: IAuth, storage: IStorageHandler, co }); }); - route.get('/:package/-/:filename', can('access'), function(req: $RequestExtend, res: $ResponseExtend) { - const stream = storage.getTarball(req.params.package, req.params.filename); + route.get('/:scopedPackage/-/:scope/:filename', function(req: $RequestExtend, res: $ResponseExtend) { + const { scopedPackage, filename } = req.params; - stream.on('content-length', function(content) { - res.header('Content-Length', content); - }); - stream.on('error', function(err) { - return res.report_error(err); - }); - res.header('Content-Type', HEADERS.OCTET_STREAM); - stream.pipe(res); + downloadStream(scopedPackage, filename, storage, req, res); + }); + + route.get('/:package/-/:filename', can('access'), function(req: $RequestExtend, res: $ResponseExtend) { + downloadStream(req.params.package, req.params.filename, storage, req, res); }); }