From d9b0d5765ab8307099b885c50014856f48c0f3d7 Mon Sep 17 00:00:00 2001
From: Steve Repsher <steverep@users.noreply.github.com>
Date: Sun, 2 Apr 2023 15:03:18 -0400
Subject: [PATCH] Add automatic retries to translation fetches (#16020)

---
 .../gulp/fetch-nightly-translations.cjs       |  3 ++-
 package.json                                  |  1 +
 yarn.lock                                     | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/build-scripts/gulp/fetch-nightly-translations.cjs b/build-scripts/gulp/fetch-nightly-translations.cjs
index 13795995e1..a0c986bd56 100644
--- a/build-scripts/gulp/fetch-nightly-translations.cjs
+++ b/build-scripts/gulp/fetch-nightly-translations.cjs
@@ -8,6 +8,7 @@ const gulp = require("gulp");
 const jszip = require("jszip");
 const tar = require("tar");
 const { Octokit } = require("@octokit/rest");
+const { retry } = require("@octokit/plugin-retry");
 const { createOAuthDeviceAuth } = require("@octokit/auth-oauth-device");
 
 const MAX_AGE = 24; // hours
@@ -95,7 +96,7 @@ gulp.task("fetch-nightly-translations", async function () {
 
   // Authenticate with token and request workflow runs from GitHub
   console.log("Fetching new translations...");
-  const octokit = new Octokit({
+  const octokit = new (Octokit.plugin(retry))({
     userAgent: "Fetch Nightly Translations",
     auth: tokenAuth.token,
   });
diff --git a/package.json b/package.json
index 99ad81844b..b063de09c2 100644
--- a/package.json
+++ b/package.json
@@ -162,6 +162,7 @@
     "@babel/preset-typescript": "7.21.0",
     "@koa/cors": "4.0.0",
     "@octokit/auth-oauth-device": "4.0.4",
+    "@octokit/plugin-retry": "4.1.3",
     "@octokit/rest": "19.0.7",
     "@open-wc/dev-server-hmr": "0.1.4",
     "@rollup/plugin-babel": "6.0.3",
diff --git a/yarn.lock b/yarn.lock
index cab79d905a..1bf7c0e8a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3240,6 +3240,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@octokit/plugin-retry@npm:4.1.3":
+  version: 4.1.3
+  resolution: "@octokit/plugin-retry@npm:4.1.3"
+  dependencies:
+    "@octokit/types": ^9.0.0
+    bottleneck: ^2.15.3
+  peerDependencies:
+    "@octokit/core": ">=3"
+  checksum: f9ed5869be23dddcf1ee896ce996e46a412a586259b55612ba44c82cdeed91436102e6e3ec57db879bd91a4446dcafbaa94632e4e059c6af56d9cca9b163eacb
+  languageName: node
+  linkType: hard
+
 "@octokit/request-error@npm:^3.0.0, @octokit/request-error@npm:^3.0.3":
   version: 3.0.3
   resolution: "@octokit/request-error@npm:3.0.3"
@@ -6084,6 +6096,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bottleneck@npm:^2.15.3":
+  version: 2.19.5
+  resolution: "bottleneck@npm:2.19.5"
+  checksum: c5eef1bbea12cef1f1405e7306e7d24860568b0f7ac5eeab706a86762b3fc65ef6d1c641c8a166e4db90f412fc5c948fc5ce8008a8cd3d28c7212ef9c3482bda
+  languageName: node
+  linkType: hard
+
 "brace-expansion@npm:^1.1.7":
   version: 1.1.11
   resolution: "brace-expansion@npm:1.1.11"
@@ -9458,6 +9477,7 @@ __metadata:
     "@mdi/js": 7.2.96
     "@mdi/svg": 7.2.96
     "@octokit/auth-oauth-device": 4.0.4
+    "@octokit/plugin-retry": 4.1.3
     "@octokit/rest": 19.0.7
     "@open-wc/dev-server-hmr": 0.1.4
     "@polymer/app-layout": 3.1.0