From 4b8058d3c96b8bc0466aa55d9cbefa42e83a2c55 Mon Sep 17 00:00:00 2001
From: Zoltan Kochan <zoltan.kochan@gmail.com>
Date: Wed, 30 May 2018 01:12:51 +0300
Subject: [PATCH] fix: requestPackage includes fetchingRawManifest

---
 src/connectStoreController.ts | 11 ++++++-----
 src/createServer.ts           |  1 +
 test/index.ts                 |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/connectStoreController.ts b/src/connectStoreController.ts
index 2207c1df09..46cf9f13c6 100644
--- a/src/connectStoreController.ts
+++ b/src/connectStoreController.ts
@@ -98,16 +98,17 @@ function requestPackage (
     wantedDependency,
   })
   .then((packageResponseBody: object) => {
-    const fetchingManifest = packageResponseBody['manifest'] // tslint:disable-line
+    const fetchingRawManifest = !packageResponseBody['fetchingRawManifestInProgress'] // tslint:disable-line
       ? undefined
-      : limitedFetch(`${remotePrefix}/manifestResponse`, {
+      : limitedFetch(`${remotePrefix}/rawManifestResponse`, {
           msgId,
         })
+    delete packageResponseBody['fetchingRawManifestInProgress'] // tslint:disable-line
 
     if (options.skipFetch) {
       return {
         body: packageResponseBody,
-        fetchingManifest,
+        fetchingRawManifest,
       }
     }
 
@@ -117,8 +118,8 @@ function requestPackage (
     return {
       body: packageResponseBody,
       fetchingFiles,
-      fetchingManifest,
-      finishing: Promise.all([fetchingManifest, fetchingFiles]).then(() => undefined),
+      fetchingRawManifest,
+      finishing: Promise.all([fetchingRawManifest, fetchingFiles]).then(() => undefined),
     }
   })
 }
diff --git a/src/createServer.ts b/src/createServer.ts
index 5307ac37a2..4469d9b0a8 100644
--- a/src/createServer.ts
+++ b/src/createServer.ts
@@ -71,6 +71,7 @@ export default function (
           const pkgResponse = await store.requestPackage(body.wantedDependency, body.options)
           if (pkgResponse['fetchingRawManifest']) { // tslint:disable-line
             rawManifestPromises[body.msgId] = pkgResponse['fetchingRawManifest'] // tslint:disable-line
+            pkgResponse.body['fetchingRawManifestInProgress'] = true // tslint:disable-line
           }
           if (pkgResponse['fetchingFiles']) { // tslint:disable-line
             filesPromises[body.msgId] = pkgResponse['fetchingFiles'] // tslint:disable-line
diff --git a/test/index.ts b/test/index.ts
index 9ddc2402fb..f6742fb37c 100644
--- a/test/index.ts
+++ b/test/index.ts
@@ -63,6 +63,7 @@ test('server', async t => {
     }
   )
 
+  t.equal((await response['fetchingRawManifest']).name, 'is-positive', 'responded with fetchingRawManifest')
   t.equal(response.body.id, 'registry.npmjs.org/is-positive/1.0.0', 'responded with correct ID')
 
   t.equal(response.body['manifest'].name, 'is-positive', 'responded with correct name in manifest')