improve s3 pre-signing errors

Author: nicktrn

apps/webapp/app/presenters/v3/ApiRetrieveRunPresenter.server.ts

@@ -117,12 +117,21 @@ export class ApiRetrieveRunPresenter extends BasePresenter {
         payloadPacket.dataType === "application/store" &&
         typeof payloadPacket.data === "string"
       ) {
-        $payloadPresignedUrl = await generatePresignedUrl(
+        const signed = await generatePresignedUrl(
           env.project.externalRef,
           env.slug,
           payloadPacket.data,
           "GET"
         );
+
+        if (signed.success) {
+          $payloadPresignedUrl = signed.url;
+        } else {
+          logger.error(`Failed to generate presigned URL for payload: ${signed.error}`, {
+            taskRunId: taskRun.id,
+            payload: payloadPacket.data,
+          });
+        }
       } else {
         $payload = await parsePacket(payloadPacket);
       }
@@ -137,12 +146,21 @@ export class ApiRetrieveRunPresenter extends BasePresenter {
           outputPacket.dataType === "application/store" &&
           typeof outputPacket.data === "string"
         ) {
-          $outputPresignedUrl = await generatePresignedUrl(
+          const signed = await generatePresignedUrl(
             env.project.externalRef,
             env.slug,
             outputPacket.data,
             "GET"
           );
+
+          if (signed.success) {
+            $outputPresignedUrl = signed.url;
+          } else {
+            logger.error(`Failed to generate presigned URL for output: ${signed.error}`, {
+              taskRunId: taskRun.id,
+              output: outputPacket.data,
+            });
+          }
         } else {
           $output = await parsePacket(outputPacket);
         }

apps/webapp/app/routes/api.v1.packets.$.ts

@@ -25,19 +25,19 @@ export async function action({ request, params }: ActionFunctionArgs) {
   const parsedParams = ParamsSchema.parse(params);
   const filename = parsedParams["*"];
 
-  const presignedUrl = await generatePresignedUrl(
+  const signed = await generatePresignedUrl(
     authenticationResult.environment.project.externalRef,
     authenticationResult.environment.slug,
     filename,
     "PUT"
   );
 
-  if (!presignedUrl) {
-    return json({ error: "Failed to generate presigned URL" }, { status: 500 });
+  if (!signed.success) {
+    return json({ error: `Failed to generate presigned URL: ${signed.error}` }, { status: 500 });
   }
 
   // Caller can now use this URL to upload to that object.
-  return json({ presignedUrl });
+  return json({ presignedUrl: signed.url });
 }
 
 export const loader = createLoaderApiRoute(
@@ -50,18 +50,18 @@ export const loader = createLoaderApiRoute(
   async ({ params, authentication }) => {
     const filename = params["*"];
 
-    const presignedUrl = await generatePresignedUrl(
+    const signed = await generatePresignedUrl(
       authentication.environment.project.externalRef,
       authentication.environment.slug,
       filename,
       "GET"
     );
 
-    if (!presignedUrl) {
-      return json({ error: "Failed to generate presigned URL" }, { status: 500 });
+    if (!signed.success) {
+      return json({ error: `Failed to generate presigned URL: ${signed.error}` }, { status: 500 });
     }
 
     // Caller can now use this URL to fetch that object.
-    return json({ presignedUrl });
+    return json({ presignedUrl: signed.url });
   }
 );

apps/webapp/app/routes/resources.packets.$environmentId.$.ts

@@ -41,12 +41,12 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
     "GET"
   );
 
-  if (!signed) {
-    return new Response("Failed to generate presigned URL", { status: 500 });
+  if (!signed.success) {
+    return new Response(`Failed to generate presigned URL: ${signed.error}`, { status: 500 });
   }
 
-  const response = await fetch(signed.url, {
-    headers: signed.headers,
+  const response = await fetch(signed.request.url, {
+    headers: signed.request.headers,
   });
 
   return new Response(response.body, {

apps/webapp/app/v3/r2.server.ts

@@ -152,13 +152,28 @@ export async function generatePresignedRequest(
   envSlug: string,
   filename: string,
   method: "PUT" | "GET" = "PUT"
-) {
+): Promise<
+  | {
+      success: false;
+      error: string;
+    }
+  | {
+      success: true;
+      request: Request;
+    }
+> {
   if (!env.OBJECT_STORE_BASE_URL) {
-    return;
+    return {
+      success: false,
+      error: "Object store base URL is not set",
+    };
   }
 
   if (!r2) {
-    return;
+    return {
+      success: false,
+      error: "Object store client is not initialized",
+    };
   }
 
   const url = new URL(env.OBJECT_STORE_BASE_URL);
@@ -182,16 +197,40 @@ export async function generatePresignedRequest(
     filename,
   });
 
-  return signed;
+  return {
+    success: true,
+    request: signed,
+  };
 }
 
 export async function generatePresignedUrl(
   projectRef: string,
   envSlug: string,
   filename: string,
   method: "PUT" | "GET" = "PUT"
-) {
+): Promise<
+  | {
+      success: false;
+      error: string;
+    }
+  | {
+      success: true;
+      url: string;
+    }
+> {
   const signed = await generatePresignedRequest(projectRef, envSlug, filename, method);
 
-  return signed?.url;
+  if (!signed.success) {
+    return {
+      success: false,
+      error: signed.error,
+    };
+  }
+
+  signed;
+
+  return {
+    success: true,
+    url: signed.request.url,
+  };
 }