Merge pull request #20 from linde12/master

Lazily initialize storage clients

Author: jmikrut

src/adapters/azure/handleDelete.ts

@@ -5,12 +5,12 @@ import type { HandleDelete } from '../../types'
 
 interface Args {
   collection: CollectionConfig
-  containerClient: ContainerClient
+  getStorageClient: () => ContainerClient
 }
 
-export const getHandleDelete = ({ containerClient }: Args): HandleDelete => {
+export const getHandleDelete = ({ getStorageClient }: Args): HandleDelete => {
   return async ({ filename, doc: { prefix = '' } }) => {
-    const blockBlobClient = containerClient.getBlockBlobClient(path.posix.join(prefix, filename))
+    const blockBlobClient = getStorageClient().getBlockBlobClient(path.posix.join(prefix, filename))
     await blockBlobClient.deleteIfExists()
   }
 }

src/adapters/azure/handleUpload.ts

@@ -5,22 +5,13 @@ import type { HandleUpload } from '../../types'
 
 interface Args {
   collection: CollectionConfig
-  containerClient: ContainerClient
-  allowContainerCreate: boolean
+  getStorageClient: () => ContainerClient
   prefix?: string
 }
 
-export const getHandleUpload = ({
-  allowContainerCreate,
-  containerClient,
-  prefix = '',
-}: Args): HandleUpload => {
-  if (allowContainerCreate) {
-    containerClient.createIfNotExists({ access: 'blob' })
-  }
-
+export const getHandleUpload = ({ getStorageClient, prefix = '' }: Args): HandleUpload => {
   return async ({ data, file }) => {
-    const blockBlobClient = containerClient.getBlockBlobClient(
+    const blockBlobClient = getStorageClient().getBlockBlobClient(
       path.posix.join(prefix, file.filename),
     )
 

src/adapters/azure/index.ts

@@ -1,4 +1,4 @@
-import { BlobServiceClient } from '@azure/storage-blob'
+import { BlobServiceClient, ContainerClient } from '@azure/storage-blob'
 import type { Adapter, GeneratedAdapter } from '../../types'
 import { getHandler } from './staticHandler'
 import { getGenerateURL } from './generateURL'
@@ -13,22 +13,35 @@ export interface Args {
   allowContainerCreate: boolean
 }
 
-export const azureBlobStorageAdapter =
-  ({ connectionString, containerName, baseURL, allowContainerCreate }: Args): Adapter =>
-  ({ collection, prefix }): GeneratedAdapter => {
+export const azureBlobStorageAdapter = ({
+  connectionString,
+  allowContainerCreate,
+  containerName,
+  baseURL,
+}: Args): Adapter => {
+  let storageClient: ContainerClient | null = null
+  const getStorageClient = () => {
+    if (storageClient) return storageClient
     const blobServiceClient = BlobServiceClient.fromConnectionString(connectionString)
-    const containerClient = blobServiceClient.getContainerClient(containerName)
+    return (storageClient = blobServiceClient.getContainerClient(containerName))
+  }
+
+  const createContainerIfNotExists = () => {
+    getStorageClient().createIfNotExists({ access: 'blob' })
+  }
 
+  return ({ collection, prefix }): GeneratedAdapter => {
     return {
       handleUpload: getHandleUpload({
         collection,
-        containerClient,
-        allowContainerCreate,
+        getStorageClient,
         prefix,
       }),
-      handleDelete: getHandleDelete({ collection, containerClient }),
+      handleDelete: getHandleDelete({ collection, getStorageClient }),
       generateURL: getGenerateURL({ containerName, baseURL }),
-      staticHandler: getHandler({ containerClient, collection }),
+      staticHandler: getHandler({ getStorageClient, collection }),
       webpack: extendWebpackConfig,
+      ...(allowContainerCreate && { onInit: createContainerIfNotExists }),
     }
   }
+}

src/adapters/azure/staticHandler.ts

@@ -5,15 +5,15 @@ import type { StaticHandler } from '../../types'
 import { getFilePrefix } from '../../utilities/getFilePrefix'
 
 interface Args {
-  containerClient: ContainerClient
+  getStorageClient: () => ContainerClient
   collection: CollectionConfig
 }
 
-export const getHandler = ({ containerClient, collection }: Args): StaticHandler => {
+export const getHandler = ({ getStorageClient, collection }: Args): StaticHandler => {
   return async (req, res, next) => {
     try {
       const prefix = await getFilePrefix({ req, collection })
-      const blockBlobClient = containerClient.getBlockBlobClient(
+      const blockBlobClient = getStorageClient().getBlockBlobClient(
         path.posix.join(prefix, req.params.filename),
       )
 

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()
 

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),
     })