feat: make s3 adapter initialize lazily

Author: olinde

src/adapters/s3/handleDelete.ts

@@ -3,13 +3,13 @@ import type * as AWS from '@aws-sdk/client-s3'
 import type { HandleDelete } from '../../types'
 
 interface Args {
-  s3: AWS.S3
+  getStorageClient: () => AWS.S3
   bucket: string
 }
 
-export const getHandleDelete = ({ s3, bucket }: Args): HandleDelete => {
+export const getHandleDelete = ({ getStorageClient, bucket }: Args): HandleDelete => {
   return async ({ filename, doc: { prefix = '' } }) => {
-    await s3.deleteObject({
+    await getStorageClient().deleteObject({
       Bucket: bucket,
       Key: path.posix.join(prefix, filename),
     })

src/adapters/s3/handleUpload.ts

@@ -8,12 +8,17 @@ interface Args {
   bucket: string
   acl?: 'private' | 'public-read'
   prefix?: string
-  s3: AWS.S3
+  getStorageClient: () => AWS.S3
 }
 
-export const getHandleUpload = ({ s3, bucket, acl, prefix = '' }: Args): HandleUpload => {
+export const getHandleUpload = ({
+  getStorageClient,
+  bucket,
+  acl,
+  prefix = '',
+}: Args): HandleUpload => {
   return async ({ data, file }) => {
-    await s3.putObject({
+    await getStorageClient().putObject({
       Bucket: bucket,
       Key: path.posix.join(prefix, file.filename),
       Body: file.buffer,

src/adapters/s3/index.ts

@@ -15,19 +15,23 @@ export interface Args {
 export const s3Adapter =
   ({ config, bucket, acl }: Args): Adapter =>
   ({ collection, prefix }): GeneratedAdapter => {
-    const s3 = new AWS.S3(config)
+    let storageClient: AWS.S3 | null = null
+    const getStorageClient = () => {
+      if (storageClient) return storageClient
+      return (storageClient = new AWS.S3(config))
+    }
 
     return {
       handleUpload: getHandleUpload({
         collection,
-        s3,
+        getStorageClient,
         bucket,
         acl,
         prefix,
       }),
-      handleDelete: getHandleDelete({ s3, bucket }),
+      handleDelete: getHandleDelete({ getStorageClient, bucket }),
       generateURL: getGenerateURL({ bucket, config }),
-      staticHandler: getHandler({ bucket, s3, collection }),
+      staticHandler: getHandler({ bucket, getStorageClient, collection }),
       webpack: extendWebpackConfig,
     }
   }

src/adapters/s3/staticHandler.ts

@@ -6,17 +6,17 @@ import type { StaticHandler } from '../../types'
 import { getFilePrefix } from '../../utilities/getFilePrefix'
 
 interface Args {
-  s3: AWS.S3
+  getStorageClient: () => AWS.S3
   bucket: string
   collection: CollectionConfig
 }
 
-export const getHandler = ({ s3, bucket, collection }: Args): StaticHandler => {
+export const getHandler = ({ getStorageClient, bucket, collection }: Args): StaticHandler => {
   return async (req, res, next) => {
     try {
       const prefix = await getFilePrefix({ req, collection })
 
-      const object = await s3.getObject({
+      const object = await getStorageClient().getObject({
         Bucket: bucket,
         Key: path.posix.join(prefix, req.params.filename),
       })