small fix

Author: josStorer

scripts/submit-stores.mjs

@@ -102,56 +102,57 @@ async function readResponseText(response) {
   }
 }
 
+function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms)
+  })
+}
+
 export async function updateFirefoxVersionNotes({
   extensionId,
   version,
   jwtIssuer,
   jwtSecret,
   fetchImpl = fetch,
   logger = console.log,
+  maxAttempts = 6,
+  retryDelayMs = 10000,
+  sleepImpl = sleep,
 }) {
   const amoId = encodeURIComponent(stripFirefoxExtensionId(extensionId))
   const authHeader = `JWT ${createFirefoxJwt(jwtIssuer, jwtSecret)}`
-  const versionsUrl = `${AMO_BASE_URL}/api/v5/addons/addon/${amoId}/versions/?page_size=50`
-  const versionsResponse = await fetchImpl(versionsUrl, {
-    headers: {
-      Authorization: authHeader,
-    },
-  })
-
-  if (!versionsResponse.ok) {
-    const body = await readResponseText(versionsResponse)
-    throw new Error(`Failed to fetch Firefox versions: ${versionsResponse.status} ${body}`)
-  }
-
-  const versions = await versionsResponse.json()
-  const matchedVersion = versions.results?.find((item) => item.version === version)
-  if (!matchedVersion?.id) {
-    throw new Error(`Could not find Firefox AMO version ${version} to update release notes`)
-  }
-
+  const amoVersion = encodeURIComponent(`v${version}`)
   const releaseNotes = buildFirefoxReleaseNotes(version)
-  const patchUrl = `${AMO_BASE_URL}/api/v5/addons/addon/${amoId}/versions/${matchedVersion.id}/`
-  const patchResponse = await fetchImpl(patchUrl, {
-    method: 'PATCH',
-    headers: {
-      Authorization: authHeader,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      compatibility: FIREFOX_COMPATIBILITY,
-      release_notes: {
-        'en-US': releaseNotes,
+  const patchUrl = `${AMO_BASE_URL}/api/v5/addons/addon/${amoId}/versions/${amoVersion}/`
+
+  for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+    const patchResponse = await fetchImpl(patchUrl, {
+      method: 'PATCH',
+      headers: {
+        Authorization: authHeader,
+        'Content-Type': 'application/json',
       },
-    }),
-  })
+      body: JSON.stringify({
+        compatibility: FIREFOX_COMPATIBILITY,
+        release_notes: {
+          'en-US': releaseNotes,
+        },
+      }),
+    })
+
+    if (patchResponse.ok) {
+      logger(`Updated Firefox version metadata: ${releaseNotes}`)
+      return
+    }
 
-  if (!patchResponse.ok) {
     const body = await readResponseText(patchResponse)
-    throw new Error(`Failed to update Firefox version notes: ${patchResponse.status} ${body}`)
-  }
+    if (patchResponse.status !== 404 || attempt === maxAttempts) {
+      throw new Error(`Failed to update Firefox version metadata: ${patchResponse.status} ${body}`)
+    }
 
-  logger(`Updated Firefox version metadata: ${releaseNotes}`)
+    logger(`Firefox AMO version ${version} is not ready yet, retrying metadata update`)
+    await sleepImpl(retryDelayMs)
+  }
 }
 
 function resolvePublishExtensionBin() {

tests/unit/release/submit-stores.test.mjs

@@ -89,20 +89,6 @@ test('updateFirefoxVersionNotes patches release notes and compatibility for the
   const fetchImpl = async (url, init) => {
     calls.push({ url, init })
 
-    if (String(url).includes('/versions/?page_size=50')) {
-      return {
-        ok: true,
-        async json() {
-          return {
-            results: [
-              { id: 100, version: '2.6.0' },
-              { id: 101, version: '2.6.1' },
-            ],
-          }
-        },
-      }
-    }
-
     return {
       ok: true,
       async text() {
@@ -120,20 +106,54 @@ test('updateFirefoxVersionNotes patches release notes and compatibility for the
     logger: () => {},
   })
 
-  assert.equal(calls.length, 2)
+  assert.equal(calls.length, 1)
   assert.equal(
     calls[0].url,
-    'https://addons.mozilla.org/api/v5/addons/addon/chatgptbox/versions/?page_size=50',
+    'https://addons.mozilla.org/api/v5/addons/addon/chatgptbox/versions/v2.6.1/',
   )
-  assert.equal(
-    calls[1].url,
-    'https://addons.mozilla.org/api/v5/addons/addon/chatgptbox/versions/101/',
-  )
-  assert.equal(calls[1].init.method, 'PATCH')
-  assert.deepEqual(JSON.parse(calls[1].init.body), {
+  assert.equal(calls[0].init.method, 'PATCH')
+  assert.deepEqual(JSON.parse(calls[0].init.body), {
     compatibility: FIREFOX_COMPATIBILITY,
     release_notes: {
       'en-US': 'https://github.com/josStorer/chatGPTBox/releases/tag/v2.6.1',
     },
   })
 })
+
+test('updateFirefoxVersionNotes retries when the AMO version endpoint is not ready yet', async () => {
+  const calls = []
+  const fetchImpl = async (url, init) => {
+    calls.push({ url, init })
+
+    if (calls.length < 3) {
+      return {
+        ok: false,
+        status: 404,
+        async text() {
+          return 'not found'
+        },
+      }
+    }
+
+    return {
+      ok: true,
+      async text() {
+        return ''
+      },
+    }
+  }
+
+  await updateFirefoxVersionNotes({
+    extensionId: 'chatgptbox',
+    version: '2.6.1',
+    jwtIssuer: 'issuer',
+    jwtSecret: 'secret',
+    fetchImpl,
+    logger: () => {},
+    retryDelayMs: 0,
+    maxAttempts: 3,
+  })
+
+  assert.equal(calls.length, 3)
+  assert.ok(calls.every((call) => call.url.endsWith('/versions/v2.6.1/')))
+})