github-repository-provider 7.24.4 → 7.24.8

package/README.md

@@ -97,7 +97,7 @@ Writes content into the branch
 
 *   `entry` **ConentEntry** 
 
-Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<Entry>** written content with sha values set
+Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<ConentEntry>** written content with sha values set
 
 ### baseTreeSha
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-repository-provider",
-  "version": "7.24.4",
+  "version": "7.24.8",
   "publishConfig": {
     "access": "public"
   },
@@ -36,13 +36,13 @@
     "matching-iterator": "^2.0.0",
     "node-fetch": "3.1.0",
     "one-time-execution-method": "^2.0.9",
-    "repository-provider": "^26.0.2"
+    "repository-provider": "^26.0.3"
   },
   "devDependencies": {
     "ava": "^3.15.0",
-    "c8": "^7.10.0",
+    "c8": "^7.11.0",
     "documentation": "^13.2.5",
-    "repository-provider-test-support": "^1.8.13",
+    "repository-provider-test-support": "^1.9.0",
     "semantic-release": "^18.0.1"
   },
   "engines": {

package/src/github-branch.mjs

@@ -36,15 +36,10 @@ export class GithubBranch extends Branch {
    * @param {string} sha
    */
   async baseTreeSha(sha) {
-    const res = await this.provider.fetch(
+    const json = await this.provider.fetchJSON(
       `repos/${this.slug}/git/commits/${sha}`
     );
-    if (res.ok) {
-      const json = await res.json();
-      return json.tree.sha;
-    }
-
-    throw new Error(`Unable to decode ${res.url}`);
+    return json.tree.sha;
   }
 
   /**
@@ -116,16 +111,11 @@ export class GithubBranch extends Branch {
    * @param {string} name
    */
   async entry(name) {
-    const res = await this.provider.fetch(
+    const json = await this.provider.fetchJSON(
       `repos/${this.slug}/contents/${name}?ref=${this.ref}`
     );
 
-    if (res.ok) {
-      const json = await res.json();
-      return new this.entryClass(name, Buffer.from(json.content, "base64"));
-    }
-
-    throw new Error(res.status);
+    return new this.entryClass(name, Buffer.from(json.content, "base64"));
   }
 
   /** @inheritdoc */
@@ -145,27 +135,10 @@ export class GithubBranch extends Branch {
    * @return {Object[]}
    */
   async tree(treeSha) {
-    const url = `repos/${this.slug}/git/trees/${treeSha}?recursive=1`;
-
-    let res;
-    for (let i = 0; i < 3; i++) {
-      try {
-        res = await this.provider.fetch(url);
-        if (res.ok) {
-          const json = await res.json();
-          return json.tree;
-        }
-      } catch (e) {
-        // errno: 'ERR_STREAM_PREMATURE_CLOSE',
-        // code: 'ERR_STREAM_PREMATURE_CLOSE',
-        
-        this.error(e);
-      }
-    }
-
-    console.log(res.errno, res.code);
-
-    throw new Error(res.status);
+    const json = await this.provider.fetchJSON(
+      `repos/${this.slug}/git/trees/${treeSha}?recursive=1`
+    );
+    return json.tree;
   }
 
   async *entries(patterns) {
@@ -214,11 +187,10 @@ class LazyBufferContentEntry extends BufferContentEntryMixin(ContentEntry) {
     }
 
     const branch = this.branch;
-    const res = await branch.provider.fetch(
+    const json = await branch.provider.fetchJSON(
       `repos/${branch.slug}/contents/${this.name}?ref=${branch.ref}`
     );
 
-    const json = await res.json();
     this._buffer = Buffer.from(json.content, "base64");
     return this._buffer;
   }

package/src/github-provider.mjs

@@ -117,17 +117,21 @@ export class GithubProvider extends MultiGroupProvider {
   }
 
   async fetchJSON(url, options) {
-    for (let i = 0; i < 3; i++) {
+    let i = 1;
+    while (true) {
       try {
         const response = await this.fetch(url, options);
         if (!response.ok) {
-          this.error(`Unable to fetch ${response.status} ${response.url}`);
-          throw new Error(`Unable to fetch ${response.status} ${response.url}`);
+          throw new Error(
+            `Unable to fetch ${response.url} (${response.status}) try #${i}`
+          );
         }
         return await response.json();
       } catch (e) {
+        if (i++ >= 3) {
+          throw e;
+        }
         this.error(e);
-        throw e;
       }
     }
   }

package/src/github-pull-request.mjs

@@ -72,7 +72,7 @@ export class GithubPullRequest extends PullRequest {
       return p;
     }
 
-    const res = await destination.provider.fetch(
+    const json = await destination.provider.fetchJSON(
       `repos/${destination.repository.slug}/pulls`,
       {
         method: "POST",
@@ -84,13 +84,7 @@ export class GithubPullRequest extends PullRequest {
       }
     );
 
-    const json = await res.json();
-
-    if (res.ok) {
-      return new this(source, destination, json.number, json);
-    }
-
-    throw new Error(json.errors.map(e => e.message).join(";"));
+    return new this(source, destination, json.number, json);
   }
 
   /**