feat: make gcs adapter initialize lazily

Author: olinde

src/adapters/gcs/generateURL.ts

@@ -3,14 +3,14 @@ import { Storage } from '@google-cloud/storage'
 import type { GenerateURL } from '../../types'
 
 interface Args {
-  gcs: Storage
+  getStorageClient: () => Storage
   bucket: string
 }
 
 export const getGenerateURL =
-  ({ gcs, bucket }: Args): GenerateURL =>
+  ({ getStorageClient, bucket }: Args): GenerateURL =>
   ({ filename, prefix = '' }) => {
     return decodeURIComponent(
-      gcs.bucket(bucket).file(path.posix.join(prefix, filename)).publicUrl(),
+      getStorageClient().bucket(bucket).file(path.posix.join(prefix, filename)).publicUrl(),
     )
   }

src/adapters/gcs/handleDelete.ts

@@ -3,13 +3,13 @@ import { Storage } from '@google-cloud/storage'
 import type { HandleDelete } from '../../types'
 
 interface Args {
-  gcs: Storage
+  getStorageClient: () => Storage
   bucket: string
 }
 
-export const getHandleDelete = ({ gcs, bucket }: Args): HandleDelete => {
+export const getHandleDelete = ({ getStorageClient, bucket }: Args): HandleDelete => {
   return async ({ filename, doc: { prefix = '' } }) => {
-    await gcs.bucket(bucket).file(path.posix.join(prefix, filename)).delete({
+    await getStorageClient().bucket(bucket).file(path.posix.join(prefix, filename)).delete({
       ignoreNotFound: true,
     })
   }

src/adapters/gcs/handleUpload.ts

@@ -8,12 +8,17 @@ interface Args {
   bucket: string
   acl?: 'Private' | 'Public'
   prefix?: string
-  gcs: Storage
+  getStorageClient: () => Storage
 }
 
-export const getHandleUpload = ({ gcs, bucket, acl, prefix = '' }: Args): HandleUpload => {
+export const getHandleUpload = ({
+  getStorageClient,
+  bucket,
+  acl,
+  prefix = '',
+}: Args): HandleUpload => {
   return async ({ data, file }) => {
-    const gcsFile = gcs.bucket(bucket).file(path.posix.join(prefix, file.filename))
+    const gcsFile = getStorageClient().bucket(bucket).file(path.posix.join(prefix, file.filename))
     await gcsFile.save(file.buffer, {
       metadata: {
         contentType: file.mimeType,

src/adapters/gcs/index.ts

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

src/adapters/gcs/staticHandler.ts

@@ -5,16 +5,18 @@ import type { StaticHandler } from '../../types'
 import { getFilePrefix } from '../../utilities/getFilePrefix'
 
 interface Args {
-  gcs: Storage
+  getStorageClient: () => Storage
   bucket: string
   collection: CollectionConfig
 }
 
-export const getHandler = ({ gcs, 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 file = gcs.bucket(bucket).file(path.posix.join(prefix, req.params.filename))
+      const file = getStorageClient()
+        .bucket(bucket)
+        .file(path.posix.join(prefix, req.params.filename))
 
       const [metadata] = await file.getMetadata()