feat: make azure adapter initialize lazyily

Author: olinde

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/plugin.ts

@@ -21,6 +21,8 @@ export const cloudStorage =
 
     const webpack = extendWebpackConfig({ options: pluginOptions, config })
 
+    const initFunctions: (() => void)[] = []
+
     return {
       ...config,
       admin: {
@@ -36,6 +38,8 @@ export const cloudStorage =
             prefix: options.prefix,
           })
 
+          if (adapter.onInit) initFunctions.push(adapter.onInit)
+
           const fields = getFields({
             collection: existingCollection,
             disablePayloadAccessControl: options.disablePayloadAccessControl,
@@ -82,5 +86,9 @@ export const cloudStorage =
 
         return existingCollection
       }),
+      onInit: payload => {
+        initFunctions.forEach(fn => fn())
+        if (config.onInit) config.onInit(payload)
+      },
     }
   }

src/types.ts

@@ -46,6 +46,7 @@ export interface GeneratedAdapter {
   generateURL: GenerateURL
   staticHandler: StaticHandler
   webpack?: (config: WebpackConfig) => WebpackConfig
+  onInit?: () => void
 }
 
 export type Adapter = (args: { collection: CollectionConfig; prefix?: string }) => GeneratedAdapter