fix: Handle promise resolution/rejection (#1845)

isomorphic-git · Dec 7, 2023 · fb5ed3a · fb5ed3a
1 parent 4e09a73
commit fb5ed3a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -642,6 +642,15 @@
         "doc",
         "test"
       ]
+    },
+    {
+      "login": "hisco",
+      "name": "Eyal Hisco",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39222286?v=4",
+      "profile": "https://api.github.com/users/hisco",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "commitConvention": "angular"

diff --git a/src/http/node/index.js b/src/http/node/index.js
@@ -36,15 +36,19 @@ export async function request({
       },
       (err, res) => {
         if (err) return reject(err)
-        const iter = fromNodeStream(res)
-        resolve({
-          url: res.url,
-          method: res.method,
-          statusCode: res.statusCode,
-          statusMessage: res.statusMessage,
-          body: iter,
-          headers: res.headers,
-        })
+        try {
+          const iter = fromNodeStream(res)
+          resolve({
+            url: res.url,
+            method: res.method,
+            statusCode: res.statusCode,
+            statusMessage: res.statusMessage,
+            body: iter,
+            headers: res.headers,
+          })
+        } catch (e) {
+          reject(e)
+        }
       }
     )
   })

diff --git a/src/wire/parseUploadPackResponse.js b/src/wire/parseUploadPackResponse.js
@@ -32,6 +32,9 @@ export async function parseUploadPackResponse(stream) {
       } else if (line.startsWith('NAK')) {
         nak = true
         done = true
+      } else {
+        done = true
+        nak = true
       }
       if (done) {
         resolve({ shallows, unshallows, acks, nak, packfile, progress })