Merge pull request #33 from rande/fix_npm_download

fix(npm): fix regression with download package

Author: rande

fixtures/mock/npm/-/all

@@ -396,7 +396,14 @@ func (ns *NpmService) WriteArchive(w io.Writer, pkg, version string) error {
 	vaultKey := fmt.Sprintf("%s/%s", pkg, version)
 
 	if !ns.Vault.Has(vaultKey) {
-		url := fmt.Sprintf("%s/%s/-/%s-%s.tgz", ns.Config.SourceServer, pkg, pkg, version)
+		var url string
+
+		if pkg[0] == '@' { // scoped package
+			subNames := strings.Split(pkg, "%2f")
+			url = fmt.Sprintf("%s/%s/%s/-/%s-%s.tgz", ns.Config.SourceServer, subNames[0], subNames[1], subNames[1], version)
+		} else {
+			url = fmt.Sprintf("%s/%s/-/%s-%s.tgz", ns.Config.SourceServer, pkg, pkg, version)
+		}
 
 		logger.WithField("url", url).Info("Create vault entry")
 

fixtures/mock/npm/@types/react/-/react-0.0.0.tgz

@@ -37,6 +37,7 @@ func Test_Npm_Pat(t *testing.T) {
 		{"/npm/npm/aspace/-/aspace-0.0.1.tgz", "aspace", "0.0.1"},
 		{"/npm/npm/@type%2fnode/-/node-6.0.90.tgz", "@type%2fnode", "6.0.90"},
 		{"/npm/npm/dateformat/-/dateformat-1.0.2-1.2.3.tgz", "dateformat", "1.0.2-1.2.3"},
+		{"/npm/npm/@storybook%2freact/-/react-3.0.0.tgz", "@storybook%2freact", "3.0.0"},
 	}
 
 	matcher := NewArchivePat("npm")

fixtures/mock/npm/@types/react/index.html

@@ -10,26 +10,22 @@ import (
 	"fmt"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/rande/pkgmirror/mirror/npm"
 	"github.com/rande/pkgmirror/test"
 	"github.com/stretchr/testify/assert"
 )
 
-func Test_Npm_Get_Package(t *testing.T) {
+func Test_Npm_Get_Standard_Package(t *testing.T) {
 
 	optin := &test.TestOptin{Npm: true}
 
 	test.RunHttpTest(t, optin, func(args *test.Arguments) {
-		res, err := test.RunRequest("GET", fmt.Sprintf("%s/npm/angular-oauth", args.MockedServer.URL))
+		res, err := test.RunRequest("GET", fmt.Sprintf("%s/npm/angular-oauth", args.MockedServer.URL)) // Mocked server
 
 		assert.NoError(t, err)
 		assert.Equal(t, 200, res.StatusCode)
 
-		// wait for the synchro to complete
-		time.Sleep(1 * time.Second)
-
 		res, err = test.RunRequest("GET", fmt.Sprintf("%s/npm/npm/non-existant-package", args.TestServer.URL))
 		assert.NoError(t, err)
 		assert.Equal(t, 404, res.StatusCode)
@@ -54,3 +50,17 @@ func Test_Npm_Get_Package(t *testing.T) {
 		assert.Equal(t, 19497, len(res.GetBody()))
 	})
 }
+func Test_Npm_Download_Scoped_Package_Archive(t *testing.T) {
+
+	optin := &test.TestOptin{Npm: true}
+
+	test.RunHttpTest(t, optin, func(args *test.Arguments) {
+		url := strings.Replace("http://localhost:8000/npm/npm/@types/react/-/react-0.0.0.tgz", "http://localhost:8000", args.TestServer.URL, -1)
+
+		res, err := test.RunRequest("GET", url)
+
+		assert.NoError(t, err)
+		assert.Equal(t, 200, res.StatusCode)
+		assert.Equal(t, 25276, len(res.GetBody()))
+	})
+}