feat: computeUrl method in Manager

batosai · Aug 27, 2024 · a556c69 · a556c69
1 parent d784c37
commit a556c69
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 24 deletions.
diff --git a/src/attachment_manager.ts b/src/attachment_manager.ts
@@ -6,7 +6,7 @@
  */
 
 import type { LoggerService } from '@adonisjs/core/types'
-import type { DriveService } from '@adonisjs/drive/types'
+import type { DriveService, SignedURLOptions } from '@adonisjs/drive/types'
 import type { MultipartFile } from '@adonisjs/core/bodyparser'
 import type { AttachmentBase, Attachment as AttachmentType } from './types/attachment.js'
 import type { ResolvedAttachmentConfig } from './types/config.js'
@@ -83,28 +83,28 @@ export class AttachmentManager {
     }
   }
 
-  async computeUrl(attachment: AttachmentType) {
-    if (attachment.options?.preComputeUrl === false) {
-      return
-    }
-
+  async computeUrl(attachment: AttachmentType | AttachmentBase, signedUrlOptions?: SignedURLOptions) {
     const disk = attachment.getDisk()
     const fileVisibility = await disk.getVisibility(attachment.path!)
 
     if (fileVisibility === 'private') {
-      attachment.url = await attachment.getSignedUrl()
+      attachment.url = await attachment.getSignedUrl(signedUrlOptions)
     } else {
       attachment.url = await attachment.getUrl()
     }
+  }
+
+  async preComputeUrl(attachment: AttachmentType) {
+    if (attachment.options?.preComputeUrl === false) {
+      return
+    }
 
-    if (attachment.variants) {
+    await this.computeUrl(attachment)
+
+    if (attachment instanceof Attachment && attachment.variants) {
       for (const key in attachment.variants) {
         if (Object.prototype.hasOwnProperty.call(attachment.variants, key)) {
-          if (fileVisibility === 'private') {
-            attachment.variants[key].url = await attachment.getSignedUrl(attachment.variants[key].key)
-          } else {
-            attachment.variants[key].url = await attachment.getUrl(attachment.variants[key].key)
-          }
+          await this.computeUrl(attachment.variants[key])
         }
       }
     }

diff --git a/src/attachments/attachment.ts b/src/attachments/attachment.ts
@@ -107,6 +107,15 @@ export class Attachment extends AttachmentBase implements AttachmentInterface {
       this.path = path.join(this.folder, this.name)
     }
 
+    if (this.variants) {
+      this.variants.forEach((v) => {
+        v.setOptions({
+          ...this.options,
+          variants: []
+        })
+      })
+    }
+
     return this
   }
 
@@ -130,16 +139,28 @@ export class Attachment extends AttachmentBase implements AttachmentInterface {
       meta: this.meta,
     }
 
+    if (this.variants) {
+      this.variants!.map(async (v) => {
+        data[v.key] = {
+          name: v.name,
+          extname: v.extname,
+          mimetype: v.mimeType,
+          meta: v.meta,
+          size: v.size,
+        }
+      })
+    }
+
     if (this.url) {
       data.url = this.url
+    }
 
-      if (this.variants) {
-        this.variants!.map(async (v) => {
-          data[v.key] = {
-            url: v.url,
-          }
-        })
-      }
+    if (this.variants) {
+      this.variants!.map(async (v) => {
+        if (v.url) {
+          data[v.key].url = v.url
+        }
+      })
     }
 
     return data

diff --git a/src/mixins/attachmentable.ts b/src/mixins/attachmentable.ts
@@ -10,7 +10,7 @@ import type { NormalizeConstructor } from '@adonisjs/core/types/helpers'
 import type { AttributeOfModelWithAttachment } from '../types/mixin.js'
 
 import { beforeSave, afterSave, beforeDelete, afterFind, afterFetch, afterPaginate } from '@adonisjs/lucid/orm'
-import { persistAttachment, commit, rollback, generateVariants, computeUrl } from '../utils/actions.js'
+import { persistAttachment, commit, rollback, generateVariants, preComputeUrl } from '../utils/actions.js'
 import { clone, getAttachmentAttributeNames } from '../utils/helpers.js'
 import { defaultStateAttributeMixin } from '../utils/default_values.js'
 
@@ -26,7 +26,7 @@ export const Attachmentable = <Model extends NormalizeConstructor<typeof BaseMod
 
       await Promise.all(
         attachmentAttributeNames.map((attributeName) => {
-          return computeUrl(modelInstance, attributeName)
+          return preComputeUrl(modelInstance, attributeName)
         })
       )
     }

diff --git a/src/utils/actions.ts b/src/utils/actions.ts
@@ -84,13 +84,13 @@ export async function persistAttachment(modelInstance: ModelWithAttachment, attr
   }
 }
 
-export async function computeUrl(modelInstance: ModelWithAttachment, attributeName: string) {
+export async function preComputeUrl(modelInstance: ModelWithAttachment, attributeName: string) {
   const attachment = modelInstance.$attributes[attributeName] as Attachment
   const options = getOptions(modelInstance, attributeName)
 
   attachment.setOptions(options)
 
-  return attachmentManager.computeUrl(attachment)
+  return attachmentManager.preComputeUrl(attachment)
 }
 
 /**