isomorphic-git 1.25.0 → 1.25.2

package/browser-tests.json

@@ -1,12 +1,10 @@
 [
-  "X Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "Firefox 119.0 (Ubuntu 0.0.0)",
-  "Chrome 117.0.0.0 (Android 10)",
-  "Edge 79.0.309.65 (Windows 10)",
-  "X Safari 13.1 (Mac OS 10.15.4)",
-  "X Mobile Safari 13.0 (iOS 13.0)",
   "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "Chrome 117.0.0.0 (Android 10)",
+  "Firefox 121.0 (Ubuntu 0.0.0)",
+  "X Chrome 117.0.0.0 (Android 10)",
+  "Edge 79.0.309.65 (Windows 10)",
   "Safari 13.1 (Mac OS 10.15.4)",
-  "Mobile Safari 13.0 (iOS 13.0)"
+  "Mobile Safari 13.0 (iOS 13.0)",
+  "Chrome Headless 79.0.3945.0 (Linux x86_64)",
+  "Chrome 117.0.0.0 (Android 10)"
 ]

package/http/node/index.cjs

@@ -213,15 +213,19 @@ 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);
+        }
       }
     );
   })

package/http/node/index.js

@@ -207,15 +207,19 @@ 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);
+        }
       }
     );
   })

package/index.cjs

@@ -2457,6 +2457,7 @@ class StreamReader {
     let { done, value } = await this.stream.next();
     if (done) {
       this._ended = true;
+      if (!value) return Buffer.alloc(0)
     }
     if (value) {
       value = Buffer.from(value);
@@ -6839,7 +6840,7 @@ class GitPktLine {
         if (buffer == null) return true
         return buffer
       } catch (err) {
-        console.log('error', err);
+        stream.error = err;
         return true
       }
     }
@@ -7316,8 +7317,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.25.0',
-  agent: 'git/isomorphic-git@1.25.0',
+  version: '1.25.2',
+  agent: 'git/isomorphic-git@1.25.2',
 };
 
 class FIFO {
@@ -7348,8 +7349,8 @@ class FIFO {
   }
 
   destroy(err) {
-    this._ended = true;
     this.error = err;
+    this.end();
   }
 
   async next() {
@@ -7444,7 +7445,7 @@ class GitSideBand {
       if (line === true) {
         packetlines.end();
         progress.end();
-        packfile.end();
+        input.error ? packfile.destroy(input.error) : packfile.end();
         return
       }
       // Examine first byte to determine which output "stream" to use
@@ -7463,12 +7464,14 @@ class GitSideBand {
           // fatal error message just before stream aborts
           const error = line.slice(1);
           progress.write(error);
+          packetlines.end();
+          progress.end();
           packfile.destroy(new Error(error.toString('utf8')));
           return
         }
         default: {
           // Not part of the side-band-64k protocol
-          packetlines.write(line.slice(0));
+          packetlines.write(line);
         }
       }
       // Careful not to blow up the stack.
@@ -7581,9 +7584,20 @@ 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 });
+        stream.error
+          ? reject(stream.error)
+          : resolve({ shallows, unshallows, acks, nak, packfile, progress });
+      }
+    }).finally(() => {
+      if (!done) {
+        stream.error
+          ? reject(stream.error)
+          : resolve({ shallows, unshallows, acks, nak, packfile, progress });
       }
     });
   })
@@ -7949,6 +7963,7 @@ async function _fetch({
     });
   }
   const packfile = Buffer.from(await collect(response.packfile));
+  if (raw.body.error) throw raw.body.error
   const packfileSha = packfile.slice(-20).toString('hex');
   const res = {
     defaultBranch: response.HEAD,

package/index.js

@@ -2451,6 +2451,7 @@ class StreamReader {
     let { done, value } = await this.stream.next();
     if (done) {
       this._ended = true;
+      if (!value) return Buffer.alloc(0)
     }
     if (value) {
       value = Buffer.from(value);
@@ -6833,7 +6834,7 @@ class GitPktLine {
         if (buffer == null) return true
         return buffer
       } catch (err) {
-        console.log('error', err);
+        stream.error = err;
         return true
       }
     }
@@ -7310,8 +7311,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.25.0',
-  agent: 'git/isomorphic-git@1.25.0',
+  version: '1.25.2',
+  agent: 'git/isomorphic-git@1.25.2',
 };
 
 class FIFO {
@@ -7342,8 +7343,8 @@ class FIFO {
   }
 
   destroy(err) {
-    this._ended = true;
     this.error = err;
+    this.end();
   }
 
   async next() {
@@ -7438,7 +7439,7 @@ class GitSideBand {
       if (line === true) {
         packetlines.end();
         progress.end();
-        packfile.end();
+        input.error ? packfile.destroy(input.error) : packfile.end();
         return
       }
       // Examine first byte to determine which output "stream" to use
@@ -7457,12 +7458,14 @@ class GitSideBand {
           // fatal error message just before stream aborts
           const error = line.slice(1);
           progress.write(error);
+          packetlines.end();
+          progress.end();
           packfile.destroy(new Error(error.toString('utf8')));
           return
         }
         default: {
           // Not part of the side-band-64k protocol
-          packetlines.write(line.slice(0));
+          packetlines.write(line);
         }
       }
       // Careful not to blow up the stack.
@@ -7575,9 +7578,20 @@ 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 });
+        stream.error
+          ? reject(stream.error)
+          : resolve({ shallows, unshallows, acks, nak, packfile, progress });
+      }
+    }).finally(() => {
+      if (!done) {
+        stream.error
+          ? reject(stream.error)
+          : resolve({ shallows, unshallows, acks, nak, packfile, progress });
       }
     });
   })
@@ -7943,6 +7957,7 @@ async function _fetch({
     });
   }
   const packfile = Buffer.from(await collect(response.packfile));
+  if (raw.body.error) throw raw.body.error
   const packfileSha = packfile.slice(-20).toString('hex');
   const res = {
     defaultBranch: response.HEAD,