fix: error handling on race

storacha · Oct 7, 2022 · 9889753 · 9889753
1 parent ff44d07
commit 9889753
Showing 1 changed file with 36 additions and 29 deletions.
diff --git a/packages/edge-gateway/src/gateway.js b/packages/edge-gateway/src/gateway.js
@@ -214,39 +214,46 @@ async function getFromDotstorage (request, cid, { pathname = '' } = {}) {
 async function getFromGatewayRacer (cid, pathname, headers, env, ctx) {
   const winnerUrlPromise = pDefer()
   let response
+  let winnerResponseFetched = false
+
+  try { 
+    // Trigger first tier resolution
+    response = await env.gwRacerL1.get(cid, {
+      pathname,
+      headers,
+      noAbortRequestsOnWinner: true,
+      onRaceEnd: async (gatewayResponsePromises, winnerGwResponse) => {
+        if (winnerGwResponse) {
+          winnerResponseFetched = true
+          winnerUrlPromise.resolve(winnerGwResponse.url)
+          ctx.waitUntil(
+            reportRaceResults(env, gatewayResponsePromises, winnerGwResponse.url)
+          )
+        } else {
+          ctx.waitUntil(
+            reportRaceResults(env, gatewayResponsePromises, undefined)
+          )
+        }
+      }
+    })
+    if (!winnerResponseFetched) {
+      throw new Error('no winner in the first race')
+    }
+  } catch (err) {
+    // Trigger second tier resolution
+    response = await env.gwRacerL2.get(cid, {
+      pathname,
+      headers,
+      noAbortRequestsOnWinner: true,
+      onRaceEnd: async (gatewayResponsePromises, winnerGwResponse) => {
+        winnerUrlPromise.resolve(winnerGwResponse?.url)
 
-  // Trigger first tier resolution
-  response = await env.gwRacerL1.get(cid, {
-    pathname,
-    headers,
-    noAbortRequestsOnWinner: true,
-    onRaceEnd: async (gatewayResponsePromises, winnerGwResponse) => {
-      if (winnerGwResponse) {
-        winnerUrlPromise.resolve(winnerGwResponse.url)
-        ctx.waitUntil(
-          reportRaceResults(env, gatewayResponsePromises, winnerGwResponse.url)
-        )
-      } else {
         ctx.waitUntil(
-          reportRaceResults(env, gatewayResponsePromises, undefined)
+          reportRaceResults(env, gatewayResponsePromises, winnerGwResponse?.url)
         )
-
-        // Trigger second tier resolution
-        response = await env.gwRacerL2.get(cid, {
-          pathname,
-          headers,
-          noAbortRequestsOnWinner: true,
-          onRaceEnd: async (gatewayResponsePromises, winnerGwResponse) => {
-            winnerUrlPromise.resolve(winnerGwResponse?.url)
-
-            ctx.waitUntil(
-              reportRaceResults(env, gatewayResponsePromises, winnerGwResponse?.url)
-            )
-          }
-        })
       }
-    }
-  })
+    })
+  }
 
   const url = await winnerUrlPromise.promise