Merge pull request #61 from supabase/fix/499-errors

Fix: 499 errors

Author: inian

src/backend/s3.ts

@@ -7,6 +7,7 @@ import {
   S3Client,
   S3ClientConfig,
 } from '@aws-sdk/client-s3'
+import https from 'https'
 import { Upload } from '@aws-sdk/lib-storage'
 import { NodeHttpHandler } from '@aws-sdk/node-http-handler'
 import { ObjectMetadata, ObjectResponse } from '../types/types'
@@ -16,11 +17,16 @@ export class S3Backend implements GenericStorageBackend {
   client: S3Client
 
   constructor(region: string, endpoint?: string | undefined) {
+    const agent = new https.Agent({
+      maxSockets: 50,
+      keepAlive: true,
+    })
     const params: S3ClientConfig = {
       region,
       runtime: 'node',
       requestHandler: new NodeHttpHandler({
-        socketTimeout: 300000,
+        httpsAgent: agent,
+        socketTimeout: 3000,
       }),
     }
     if (endpoint) {
@@ -36,7 +42,6 @@ export class S3Backend implements GenericStorageBackend {
       Range: range,
     })
     const data = await this.client.send(command)
-    data.Body
     return {
       metadata: {
         cacheControl: data.CacheControl,

src/routes/object/getObject.ts

@@ -74,18 +74,23 @@ async function requestHandler(
   // send the object from s3
   const s3Key = `${projectRef}/${bucketName}/${objectName}`
   request.log.info(s3Key)
-  const data = await storageBackend.getObject(globalS3Bucket, s3Key, range)
+  try {
+    const data = await storageBackend.getObject(globalS3Bucket, s3Key, range)
 
-  response
-    .status(data.metadata.httpStatusCode ?? 200)
-    .header('Content-Type', normalizeContentType(data.metadata.mimetype))
-    .header('Cache-Control', data.metadata.cacheControl)
-    .header('ETag', data.metadata.eTag)
-    .header('Last-Modified', data.metadata.lastModified)
-  if (data.metadata.contentRange) {
-    response.header('Content-Range', data.metadata.contentRange)
+    response
+      .status(data.metadata.httpStatusCode ?? 200)
+      .header('Content-Type', normalizeContentType(data.metadata.mimetype))
+      .header('Cache-Control', data.metadata.cacheControl)
+      .header('ETag', data.metadata.eTag)
+      .header('Last-Modified', data.metadata.lastModified)
+    if (data.metadata.contentRange) {
+      response.header('Content-Range', data.metadata.contentRange)
+    }
+    return response.send(data.body)
+  } catch (err) {
+    request.log.error(err)
+    return response.status(400).send(createResponse(err.message, '400', err.name))
   }
-  return response.send(data.body)
 }
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types

src/routes/object/getPublicObject.ts

@@ -86,12 +86,13 @@ export default async function routes(fastify: FastifyInstance) {
         }
         return response.send(data.body)
       } catch (err) {
+        request.log.error(err)
         if (err.$metadata?.httpStatusCode === 404) {
           return response.status(404).send()
         } else {
           return response.status(400).send({
             message: err.message,
-            statusCode: err.$metadata?.httpStatusCode,
+            statusCode: '400',
             error: err.message,
           })
         }