fix: retry IPNI queries on 5xx errors

deps.ts

@@ -26,3 +26,7 @@ export {
   HttpChainClient,
   HttpCachingChain
 } from 'https://cdn.jsdelivr.net/npm/drand-client@1.2.6/index.js/+esm'
+
+export { assertOkResponse } from 'https://cdn.skypack.dev/assert-ok-response@1.0.0/?dts'
+import pRetry from 'https://cdn.skypack.dev/p-retry@6.2.1/?dts'
+export { pRetry }

lib/constants.js

@@ -5,4 +5,4 @@ export const MAX_JITTER_BETWEEN_TASKS_IN_MS = 10_000 // 10 seconds
 export const RPC_URL = 'https://api.node.glif.io/'
 export const RPC_AUTH = 'KZLIUb9ejreYOm-mZFM3UNADE0ux6CrHjxnS2D2Qgb8='
 export const MINER_TO_PEERID_CONTRACT_ADDRESS = '0x14183aD016Ddc83D638425D6328009aa390339Ce' // Contract address on the Filecoin EVM
-export const MAX_REQUEST_DURATION_MS = 90_000
+export const MAX_REQUEST_DURATION_MS = 90_000

lib/http-assertions.js

@@ -1,21 +1,6 @@
 import { AssertionError } from 'zinnia:assert'
 
-/**
- * @param {Response} res
- * @param {string} [errorMsg]
- */
-export async function assertOkResponse (res, errorMsg) {
-  if (res.ok) return
-
-  let body
-  try {
-    body = await res.text()
-  } catch {}
-  const err = new Error(`${errorMsg ?? 'Fetch failed'} (${res.status}): ${body?.trimEnd()}`)
-  err.statusCode = res.status
-  err.serverMessage = body
-  throw err
-}
+export { assertOkResponse } from '../vendor/deno-deps.js'
 
 /**
  * @param {Response} res

lib/ipni-client.js

@@ -1,4 +1,4 @@
-import { decodeBase64, decodeVarint } from '../vendor/deno-deps.js'
+import { decodeBase64, decodeVarint, pRetry, assertOkResponse } from '../vendor/deno-deps.js'
 
 /**
  *
@@ -10,22 +10,23 @@ import { decodeBase64, decodeVarint } from '../vendor/deno-deps.js'
  * }>}
  */
 export async function queryTheIndex (cid, providerId) {
-  const url = `https://cid.contact/cid/${encodeURIComponent(cid)}`
-
   let providerResults
   try {
-    const res = await fetch(url)
-    if (!res.ok) {
-      console.error('IPNI query failed, HTTP response: %s %s', res.status, (await res.text()).trimEnd())
-      return { indexerResult: `ERROR_${res.status}` }
-    }
-
-    const result = await res.json()
-    providerResults = result.MultihashResults.flatMap(r => r.ProviderResults)
+    providerResults = await pRetry(() => getRetrievalProviders(cid), {
+      retries: 5,
+      shouldRetry: (error) => {
+        return error.statusCode && error.statusCode >= 500
+      },
+      onFailedAttempt: (error) => {
+        console.error('IPNI query failed, retrying...\n', error)
+      }
+    })
     console.log('IPNI returned %s provider results', providerResults.length)
   } catch (err) {
     console.error('IPNI query failed.', err)
-    return { indexerResult: 'ERROR_FETCH' }
+    return {
+      indexerResult: typeof err.statusCode === 'number' ? `ERROR_${err.statusCode}` : 'ERROR_FETCH'
+    }
   }
 
   let graphsyncProvider
@@ -70,3 +71,12 @@ export async function queryTheIndex (cid, providerId) {
   console.log('All advertisements are from other miners or for unsupported protocols.')
   return { indexerResult: 'NO_VALID_ADVERTISEMENT' }
 }
+
+async function getRetrievalProviders (cid) {
+  const url = `https://cid.contact/cid/${encodeURIComponent(cid)}`
+  const res = await fetch(url)
+  await assertOkResponse(res)
+
+  const result = await res.json()
+  return result.MultihashResults.flatMap((r) => r.ProviderResults)
+}

lib/spark.js

@@ -89,7 +89,6 @@ export default class Spark {
     const { signal } = controller
 
     let requestIdleTimeout
-    let maxDurationTimeout
 
     const resetTimeout = () => {
       if (requestIdleTimeout) {
@@ -100,7 +99,8 @@ export default class Spark {
         controller.abort()
       }, 60_000)
     }
-    maxDurationTimeout = setTimeout(() => {
+
+    const maxDurationTimeout = setTimeout(() => {
       stats.timeout = true
       controller.abort()
     }, maxRequestDurationMs)