src: fix range errors

Fixes #148 Re https://nodejs-org.sentry.io/issues/6028971646/?project=4506191181774848 Signed-off-by: flakey5 <[email protected]>
nodejs · Nov 6, 2024 · b0b37ee · b0b37ee
1 parent 16ede56
commit b0b37ee
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/middleware/r2Middleware.ts b/src/middleware/r2Middleware.ts
@@ -1,5 +1,6 @@
 import { CACHE_HEADERS } from '../constants/cache';
 import type { Context } from '../context';
+import type { GetFileResult } from '../providers/provider';
 import { R2Provider } from '../providers/r2Provider';
 import responses from '../responses';
 import { hasTrailingSlash, isDirectoryPath } from '../utils/path';
@@ -107,9 +108,22 @@ async function getFile(
   r2Path: string,
   ctx: Context
 ): Promise<Response> {
-  const result = await getProvider(ctx).getFile(r2Path, {
-    conditionalHeaders: parseConditionalHeaders(request.headers),
-  });
+  const provider = getProvider(ctx);
+
+  let result: GetFileResult | undefined;
+  try {
+    result = await provider.getFile(r2Path, {
+      conditionalHeaders: parseConditionalHeaders(request.headers),
+    });
+  } catch (err) {
+    // Check if R2 threw a range not compatible error
+    if (err instanceof Error && err.message.includes('10039')) {
+      return new Response(undefined, { status: 416 });
+    }
+
+    ctx.sentry.captureException(err)
+    throw err;
+  }
 
   if (result === undefined) {
     return responses.fileNotFound(request.method);

diff --git a/src/providers/r2Provider.ts b/src/providers/r2Provider.ts
@@ -42,6 +42,10 @@ export class R2Provider implements Provider {
     };
   }
 
+  /**
+   * Important: the caller is responsible for wrapping this in a try/catch
+   *  and reporting any errors to Sentry
+   */
   async getFile(
     path: string,
     options?: GetFileOptions
@@ -59,7 +63,8 @@ export class R2Provider implements Provider {
         });
       },
       R2_RETRY_LIMIT,
-      this.ctx.sentry
+      // Don't pass sentry in,
+      undefined
     );
 
     if (object === null) {