Merge branch 'main' into feat/get-file

Author: eduardoboucas

src/main.test.ts

@@ -418,6 +418,59 @@ describe('set', () => {
       `The blob store is unavailable because it's missing required configuration properties`,
     )
   })
+
+  test('Retries failed operations', async () => {
+    let attempts = 0
+
+    const fetcher = async (...args: Parameters<typeof globalThis.fetch>) => {
+      const [url, options] = args
+      const headers = options?.headers as Record<string, string>
+
+      expect(options?.method).toBe('put')
+
+      if (url === `https://api.netlify.com/api/v1/sites/${siteID}/blobs/${key}?context=production`) {
+        const data = JSON.stringify({ url: signedURL })
+
+        expect(headers.authorization).toBe(`Bearer ${apiToken}`)
+
+        return new Response(data)
+      }
+
+      if (url === signedURL) {
+        attempts += 1
+
+        expect(options?.body).toBe(value)
+
+        if (attempts === 1) {
+          return new Response(null, { status: 500 })
+        }
+
+        if (attempts === 2) {
+          throw new Error('Some network problem')
+        }
+
+        if (attempts === 3) {
+          return new Response(null, { headers: { 'X-RateLimit-Reset': '10' }, status: 429 })
+        }
+
+        return new Response(value)
+      }
+
+      throw new Error(`Unexpected fetch call: ${url}`)
+    }
+
+    const blobs = new Blobs({
+      authentication: {
+        token: apiToken,
+      },
+      fetcher,
+      siteID,
+    })
+
+    await blobs.set(key, value)
+
+    expect(attempts).toBe(4)
+  })
 })
 
 describe('setJSON', () => {

src/main.ts

@@ -2,6 +2,8 @@ import { createReadStream } from 'node:fs'
 import { stat } from 'node:fs/promises'
 import { Readable } from 'node:stream'
 
+import { fetchAndRetry } from './retry.ts'
+
 interface APICredentials {
   apiURL?: string
   token: string
@@ -143,7 +145,7 @@ export class Blobs {
       options.duplex = 'half'
     }
 
-    const res = await this.fetcher(url, options)
+    const res = await fetchAndRetry(this.fetcher, url, options)
 
     if (res.status === 404 && method === HTTPMethod.Get) {
       return null

src/retry.ts

@@ -0,0 +1,48 @@
+const DEFAULT_RETRY_DELAY = 5000
+const MIN_RETRY_DELAY = 1000
+const MAX_RETRY = 5
+const RATE_LIMIT_HEADER = 'X-RateLimit-Reset'
+
+export const fetchAndRetry = async (
+  fetcher: typeof globalThis.fetch,
+  url: string,
+  options: RequestInit,
+  attemptsLeft = MAX_RETRY,
+): ReturnType<typeof globalThis.fetch> => {
+  try {
+    const res = await fetcher(url, options)
+
+    if (attemptsLeft > 0 && (res.status === 429 || res.status >= 500)) {
+      const delay = getDelay(res.headers.get(RATE_LIMIT_HEADER))
+
+      await sleep(delay)
+
+      return fetchAndRetry(fetcher, url, options, attemptsLeft - 1)
+    }
+
+    return res
+  } catch (error) {
+    if (attemptsLeft === 0) {
+      throw error
+    }
+
+    const delay = getDelay()
+
+    await sleep(delay)
+
+    return fetchAndRetry(fetcher, url, options, attemptsLeft - 1)
+  }
+}
+
+const getDelay = (rateLimitReset?: string | null) => {
+  if (!rateLimitReset) {
+    return DEFAULT_RETRY_DELAY
+  }
+
+  return Math.max(Number(rateLimitReset) * 1000 - Date.now(), MIN_RETRY_DELAY)
+}
+
+const sleep = (ms: number) =>
+  new Promise((resolve) => {
+    setTimeout(resolve, ms)
+  })