github-repository-provider 7.23.46 → 7.24.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-repository-provider",
-  "version": "7.23.46",
+  "version": "7.24.3",
   "publishConfig": {
     "access": "public"
   },
@@ -30,7 +30,7 @@
     "lint:docs": "documentation lint ./src/**/*.mjs"
   },
   "dependencies": {
-    "content-entry": "^3.0.0",
+    "content-entry": "^3.0.2",
     "fetch-link-util": "^1.0.4",
     "fetch-rate-limit-util": "^1.1.6",
     "matching-iterator": "^2.0.0",
@@ -42,7 +42,7 @@
     "ava": "^3.15.0",
     "c8": "^7.10.0",
     "documentation": "^13.2.5",
-    "repository-provider-test-support": "^1.8.11",
+    "repository-provider-test-support": "^1.8.13",
     "semantic-release": "^18.0.1"
   },
   "engines": {

package/src/github-branch.mjs

@@ -72,7 +72,7 @@ export class GithubBranch extends Branch {
     const shaLatestCommit = await this.refId();
     const shaBaseTree = await this.baseTreeSha(shaLatestCommit);
 
-    let result = await this.provider.fetch(`repos/${this.slug}/git/trees`, {
+    let json = await this.provider.fetchJSON(`repos/${this.slug}/git/trees`, {
       method: "POST",
       body: JSON.stringify({
         base_tree: shaBaseTree,
@@ -87,11 +87,9 @@ export class GithubBranch extends Branch {
       })
     });
 
-    let json = await result.json();
-
     const shaNewTree = json.sha;
 
-    result = await this.provider.fetch(`repos/${this.slug}/git/commits`, {
+    json = await this.provider.fetchJSON(`repos/${this.slug}/git/commits`, {
       method: "POST",
       body: JSON.stringify({
         message,
@@ -99,11 +97,10 @@ export class GithubBranch extends Branch {
         parents: [shaLatestCommit]
       })
     });
-    json = await result.json();
 
     const sha = json.sha;
 
-    result = await this.provider.fetch(
+    return await this.provider.fetchJSON(
       `repos/${this.slug}/git/refs/heads/${this.name}`,
       {
         method: "PATCH",
@@ -113,8 +110,6 @@ export class GithubBranch extends Branch {
         })
       }
     );
-
-    return result.json();
   }
 
   /**
@@ -163,9 +158,8 @@ export class GithubBranch extends Branch {
         }
       } catch (e) {
         // errno: 'ERR_STREAM_PREMATURE_CLOSE',
-      // code: 'ERR_STREAM_PREMATURE_CLOSE',
-
-        console.error(e);
+        // code: 'ERR_STREAM_PREMATURE_CLOSE',
+        
         this.error(e);
       }
     }

package/src/github-provider.mjs

@@ -42,7 +42,7 @@ export class GithubProvider extends MultiGroupProvider {
    * @return {string} default instance environment name prefix
    */
   static get instanceIdentifier() {
-    return "GITHUB_"
+    return "GITHUB_";
   }
 
   static get attributes() {
@@ -116,34 +116,51 @@ export class GithubProvider extends MultiGroupProvider {
     );
   }
 
+  async fetchJSON(url, options) {
+    for (let i = 0; i < 3; i++) {
+      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}`);
+        }
+        return await response.json();
+      } catch (e) {
+        this.error(e);
+        throw e;
+      }
+    }
+  }
+
   /**
    * {@link https://developer.github.com/v3/repos/#list-repositories-for-the-authenticated-user}
    */
   async initializeRepositories() {
     for (let page = 1; ; page++) {
-      const response = await this.fetch(`user/repos?page=${page}`, {
-        headers: {
-          accept: "application/vnd.github.baptiste-preview+json"
+      try {
+        const json = await this.fetchJSON(
+          `user/repos?page=${page}&per_page=100`,
+          {
+            headers: {
+              accept: "application/vnd.github.baptiste-preview+json"
+              //            accept: "application/vnd.github.v3+json"
+            }
+          }
+        );
+        if (json.length === 0 || !Array.isArray(json)) {
+          break;
         }
-      });
 
-      if (!response.ok) {
-        this.error(
-          `Unable to fetch repositories ${response.status} ${response.url}`
-        );
+        json.forEach(r => {
+          const [groupName, repoName] = r.full_name.split(/\//);
+          this.addRepositoryGroup(groupName, r.owner).addRepository(
+            repoName,
+            r
+          );
+        });
+      } catch (e) {
         return;
       }
-
-      const json = await response.json();
-
-      if (json.length === 0 || !Array.isArray(json)) {
-        break;
-      }
-
-      json.forEach(r => {
-        const [groupName, repoName] = r.full_name.split(/\//);
-        this.addRepositoryGroup(groupName, r.owner).addRepository(repoName, r);
-      });
     }
   }
 

package/src/github-repository.mjs

@@ -112,13 +112,7 @@ export class GithubRepository extends Repository {
   async refId(ref) {
     ref = ref.replace(/^refs\//, "");
 
-    const res = await this.provider.fetch(`repos/${this.slug}/git/ref/${ref}`);
-
-    if (!res.ok) {
-      throw new Error(`Unable to fetch ${res.url}: ${res.code}`);
-    }
-
-    const json = await res.json();
+    const json = await this.provider.fetchJSON(`repos/${this.slug}/git/ref/${ref}`);
 
     // TODO why does this happen ?
     if (!json.object.sha) {
@@ -153,12 +147,11 @@ export class GithubRepository extends Repository {
       console.log(res);
       */
     } else {
-      const res = await this.provider.fetch(
+      const json = await this.provider.fetchJSON(
         `repos/${this.slug}/git/ref/heads/${
           from === undefined ? this.defaultBranchName : from.name
         }`
       );
-      let json = await res.json();
       sha = json.object.sha;
     }