fix: not prevent ipfs.io requests

nftstorage · Feb 3, 2022 · ebc6f59 · ebc6f59
1 parent 05c5b96
commit ebc6f59
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/packages/gateway/src/durable-objects/gateway-rate-limits.js b/packages/gateway/src/durable-objects/gateway-rate-limits.js
@@ -75,11 +75,6 @@ const MINUTE = 1000 * 60
  */
 function getRateLimitingCharacteristics(gatewayUrl) {
   switch (gatewayUrl) {
-    case 'https://ipfs.io':
-      return {
-        RATE_LIMIT_REQUESTS: 800,
-        RATE_LIMIT_TIMEFRAME: MINUTE,
-      }
     case 'https://cf-ipfs.com':
       return {
         RATE_LIMIT_REQUESTS: 100,

diff --git a/packages/gateway/src/gateway.js b/packages/gateway/src/gateway.js
@@ -153,14 +153,13 @@ async function gatewayFetch(
   env,
   { pathname = '', timeout = 20000 } = {}
 ) {
-  // Block before hitting rate limit if needed
-  const { shouldBlock } = await getGatewayRateLimitState(request, env, gwUrl)
-
-  if (shouldBlock) {
+  // Block requests if needed
+  const requestPreventedCode = await shouldPreventRequest(request, env, gwUrl)
+  if (requestPreventedCode) {
     /** @type {GatewayResponse} */
     return {
       url: gwUrl,
-      requestPreventedCode: REQUEST_PREVENTED_RATE_LIMIT_CODE,
+      requestPreventedCode,
     }
   }
 
@@ -188,6 +187,19 @@ async function gatewayFetch(
   return gwResponse
 }
 
+async function shouldPreventRequest(request, env, gwUrl) {
+  // We don't need to prevent requests to ipfs.io gateway
+  if (gwUrl === 'https://ipfs.io') {
+    return undefined
+  }
+
+  // Block before hitting rate limit if needed
+  const { shouldBlock } = await getGatewayRateLimitState(request, env, gwUrl)
+  if (shouldBlock) {
+    return REQUEST_PREVENTED_RATE_LIMIT_CODE
+  }
+}
+
 /**
  * @param {Request} request
  */