github-repository-provider 7.23.44 → 7.24.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-repository-provider",
-  "version": "7.23.44",
+  "version": "7.24.1",
   "publishConfig": {
     "access": "public"
   },
@@ -30,7 +30,7 @@
     "lint:docs": "documentation lint ./src/**/*.mjs"
   },
   "dependencies": {
-    "content-entry": "^3.0.0",
+    "content-entry": "^3.0.1",
     "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.12",
     "semantic-release": "^18.0.1"
   },
   "engines": {

package/src/github-branch.mjs

@@ -154,17 +154,22 @@ export class GithubBranch extends Branch {
     const url = `repos/${this.slug}/git/trees/${treeSha}?recursive=1`;
 
     let res;
-    for (const i = 0; i < 3; i++) {
-      res = await this.provider.fetch(url);
-      if (res.ok) {
-        const json = await res.json();
-        return json.tree;
+    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);
-    // errno: 'ERR_STREAM_PREMATURE_CLOSE',
-    // code: 'ERR_STREAM_PREMATURE_CLOSE',
 
     throw new Error(res.status);
   }

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);
-      });
     }
   }