Use local paths for tarballs

The path for the tarball should be local to the project and not
some file path. This fixes functionality with latest npm

Author: AdamMajer

src/registry.ts

@@ -18,6 +18,7 @@
 */
 
 import { URL } from 'url';
+import { baseTarballName } from './utils';
 
 export type PkgJsonRW = {
 	name: string,
@@ -82,7 +83,7 @@ export class Registry {
 		for (let i = 0; i < this.pkgs.length; i = i + 1) {
 			if (this.pkgs[i].name === pkg_name) {
 				const pkg = JSON.parse(JSON.stringify(this.pkgs[i]));
-				pkg['dist']['tarball'] = this.requestHandler.url + pkg.dist.tarball;
+				pkg['dist']['tarball'] = this.requestHandler.url + '-/' + baseTarballName(pkg.dist.tarball);
 
 				obj.versions[pkg.version] = pkg;
 			}
@@ -144,7 +145,10 @@ export class Registry {
 		return backend_processors;
 	}
 
-	public isRegistered(path: string): boolean {
-		return this.pkgs.filter(json => json.dist.tarball === "-/" + path).length === 1;
+	public archiveFile(file: string): (string|null) {
+		const files = this.pkgs.filter(json => (baseTarballName(json.dist.tarball) === file))
+		if (files.length !== 1)
+			return null;
+		return files[0].dist.tarball.substring(2);
 	}
 };

src/service.ts

@@ -49,10 +49,10 @@ export class Service {
 
 		if (split[0] === '-') {
 			split.shift();
-			// console.log("archive joiner: " + split.join('/'))
+			console.log("archive joiner: " + split.join('/'))
 			return {
 				type: 'archive',
-				package: '/' + split.join('/'),
+				package: split.join('/'),
 			}
 		}
 
@@ -117,11 +117,12 @@ export class Service {
 						break;
 					}
 					case 'archive': {
-						if (registry.isRegistered(<string>req_type.package)) {
+						const archive_path = registry.archiveFile(<string>req_type.package)
+						if (archive_path) {
 							res.writeHead(200, {
 								'Content-Type': 'application/x-compressed-tar'
 							});
-							fs.createReadStream(<string>req_type.package).pipe(res);
+							fs.createReadStream(archive_path).pipe(res);
 						}
 						else {
 							console.log("request: (archive not found)" + req.url);

src/utils.ts

@@ -0,0 +1,27 @@
+/**
+ * npm_install_proxy -- localhost NPM registry to `npm install` without network
+ *
+ * Copyright (C) 2020  SUSE LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+function baseTarballName(path:string): string {
+	const path_components = path.split('/')
+	return path_components[path_components.length-1]
+}
+
+export {
+	baseTarballName
+}

tests/registry.ispec.ts

@@ -50,7 +50,7 @@ describe("directory registry integration tests", function () {
 			},
 			"dist": {
 				"integrity": "sha512-N+aAxov+CKVS3JuhDIQFr24XvZvwE96Wlhk9dytTg/GmwWoghdOvR8dspx8MVz71O+Y0pA3UPqHF68D6iy8UvQ==",
-				"tarball": "http://localhost:8888/-/tests/pkgs/assert-1.4.1.tgz",
+				"tarball": "http://localhost:8888/-/assert-1.4.1.tgz",
 			},
 			"homepage": "https://github.com/defunctzombie/commonjs-assert",
 			"keywords": [

tests/service.spec.ts

@@ -238,7 +238,7 @@ describe("server request processing", function() {
 		return makeRequest("/nothing/ver", b => base_url=b).then(res => {
 			expect(res).toStrictEqual({
 				"dist": {
-					"tarball": base_url + "test",
+					"tarball": base_url + "-/test",
 				},
 				"name": "nothing",
 				"version": "ver",
@@ -251,7 +251,7 @@ describe("server request processing", function() {
 
 		return makeRequest("/@scope%2fbadthings/ver", b => base_url=b).then(res => {
 			expect(res).toStrictEqual({
-					"dist": { "tarball": base_url + "bad2" },
+					"dist": { "tarball": base_url + "-/bad2" },
 					"name": "@scope/badthings",
 					"version": "ver"
 			});

tests/utils.spec.ts

@@ -0,0 +1,14 @@
+import * as utils from '../src/utils'
+
+describe("utility tests", function() {
+	it("returns basename of path", function() {
+
+		expect(utils.baseTarballName("test")).toBe("test");
+		expect(utils.baseTarballName("test1/test2")).toBe("test2");
+		expect(utils.baseTarballName("t1/t2/t3//")).toBe("");
+		expect(utils.baseTarballName("///test/3")).toBe('3');
+		expect(utils.baseTarballName('11/22/3/')).toBe('');
+		expect(utils.baseTarballName('')).toBe('');
+		expect(utils.baseTarballName('-//home/adamm/work/cockpit/systemsmanagement🚀cockpit/cockpit/cockpit/../t/read-pkg-semver-5.7.2.tgz')).toBe('read-pkg-semver-5.7.2.tgz')
+	})
+})