fix: handling legacy requests

Author: fforbeck

src/middleware/withCarParkFetch.js

@@ -54,10 +54,12 @@ const MAX_BATCH_SIZE = 20 * 1024 * 1024
  */
 export function withCarParkFetch (handler) {
   return async (request, env, ctx) => {
-    // if carpark public bucket is not set, just use default
-    if (!env.CARPARK_PUBLIC_BUCKET_URL) {
+    const url = new URL(request.url)
+    const legacyRequest = url.searchParams.get('legacyReq') === 'true'
+    if (!env.CARPARK_PUBLIC_BUCKET_URL || legacyRequest) {
       return handler(request, env, { ...ctx, fetch: globalThis.fetch })
     }
+
     const bucket = new TraceBucket(/** @type {import('@web3-storage/public-bucket').Bucket} */ (env.CARPARK))
     const bucketHandler = createHandler({ bucket, maxBatchSize: MAX_BATCH_SIZE })
 

src/middleware/withLocator.js

@@ -22,12 +22,16 @@ import { trace } from '@opentelemetry/api'
  */
 export function withLocator (handler) {
   return async (request, env, ctx) => {
+    const url = new URL(request.url)
+    const legacyRequest = url.searchParams.get('legacyReq') === 'true'
     const useIndexingService = isIndexingServiceEnabled(request, env)
     const span = trace.getActiveSpan()
     if (span) {
       span.setAttribute('useIndexingService', useIndexingService)
+      span.setAttribute('legacyRequest', legacyRequest)
     }
-    const client = useIndexingService
+
+    const client = !legacyRequest && useIndexingService
       ? new Client({
         serviceURL: env.INDEXING_SERVICE_URL
           ? new URL(env.INDEXING_SERVICE_URL)
@@ -37,10 +41,10 @@ export function withLocator (handler) {
         serviceURL: env.CONTENT_CLAIMS_SERVICE_URL
           ? new URL(env.CONTENT_CLAIMS_SERVICE_URL)
           : undefined,
-        carpark: env.CARPARK,
-        carparkPublicBucketURL: env.CARPARK_PUBLIC_BUCKET_URL
-          ? new URL(env.CARPARK_PUBLIC_BUCKET_URL)
-          : undefined
+        ...(legacyRequest ? {} : {
+          carpark: env.CARPARK,
+          carparkPublicBucketURL: env.CARPARK_PUBLIC_BUCKET_URL ? new URL(env.CARPARK_PUBLIC_BUCKET_URL) : undefined
+        })
       })
 
     const locator = Locator.create({ client })