Merge branch 'master' into feature/import-api

Author: mdbenito

package-lock.json

@@ -27,6 +27,7 @@
   "dependencies": {
     "@gitbeaker/node": "^23.1.0",
     "@octokit/rest": "^18.0.0",
+    "@octokit/plugin-throttling": "^3.4.3",
     "aws-sdk": "^2.712.0",
     "axios": "^0.21.1",
     "mime-types": "^2.1.27",

package.json

@@ -3,12 +3,13 @@ import GitlabHelper from './gitlabHelper';
 import settings from '../settings';
 
 import {Octokit as GitHubApi} from '@octokit/rest';
+import {throttling} from '@octokit/plugin-throttling';
 import { Gitlab } from '@gitbeaker/node'
 
 import * as fs from 'fs';
 
 import AWS from 'aws-sdk';
-
+import { sleep } from './utils';
 
 const issueCounters = {
   nrOfPlaceholderIssues: 0,
@@ -51,8 +52,10 @@ const gitlabApi = new Gitlab({
   token: settings.gitlab.token,
 });
 
+const MyOctokit = GitHubApi.plugin(throttling);
+
 // Create a GitHub API object
-const githubApi = new GitHubApi({
+const githubApi = new MyOctokit({
   previews: settings.useIssueImportAPI ? ["golden-comet"] : [],
   debug: false,
   baseUrl: settings.github.baseUrl
@@ -64,6 +67,22 @@ const githubApi = new GitHubApi({
     accept: 'application/vnd.github.v3+json',
   },
   auth: 'token ' + settings.github.token,
+  throttle: {
+    onRateLimit: async (retryAfter, options) => {
+      console.log(
+        `Request quota exhausted for request ${options.method} ${options.url}`
+      );
+      await sleep(60000);
+      return true;
+    },
+    onAbuseLimit: async (retryAfter, options) => {
+      console.log(
+        `Abuse detected for request ${options.method} ${options.url}`
+      );
+      await sleep(60000);
+      return true;
+    },
+  },
 });
 
 const gitlabHelper = new GitlabHelper(gitlabApi, settings.gitlab);
@@ -127,6 +146,7 @@ async function migrate() {
   try {
 
     await githubHelper.registerRepoId();
+    await gitlabHelper.registerProjectPath(settings.gitlab.projectId);
 
     // transfer GitLab milestones to GitHub
     if (settings.transfer.milestones) {
@@ -251,8 +271,6 @@ async function transferLabels(attachmentLabel = true, useLowerCase = true) {
 async function transferIssues() {
   inform('Transferring Issues');
 
-  await gitlabHelper. registerProjectPath(settings.gitlab.projectId);
-
   // Because each
   let milestoneData = await githubHelper.getAllGithubMilestones();