@jrmc/adonis-attachment 5.0.0-beta.1 → 5.0.0-beta.3

package/build/index.d.ts

@@ -1,7 +1,6 @@
 import attachmentManager from './services/main.js';
 import RegenerateService from './services/regenerate_service.js';
 export { configure } from './configure.js';
-export { ConverterManager } from './src/converter_manager.js';
 export { Attachment } from './src/attachments/attachment.js';
 export { attachment } from './src/decorators/attachment.js';
 export { attachments } from './src/decorators/attachment.js';

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,oBAAoB,CAAA;AAClD,OAAO,iBAAiB,MAAM,kCAAkC,CAAA;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAC5B,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAC5B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,oBAAoB,CAAA;AAClD,OAAO,iBAAiB,MAAM,kCAAkC,CAAA;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAC5B,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAC5B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAA"}

package/build/index.js

@@ -1,7 +1,6 @@
 import attachmentManager from './services/main.js';
 import RegenerateService from './services/regenerate_service.js';
 export { configure } from './configure.js';
-export { ConverterManager } from './src/converter_manager.js';
 export { Attachment } from './src/attachments/attachment.js';
 export { attachment } from './src/decorators/attachment.js';
 export { attachments } from './src/decorators/attachment.js';

package/build/providers/attachment_provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachment_provider.d.ts","sourceRoot":"","sources":["../../providers/attachment_provider.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAIhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE/D,OAAO,QAAQ,sBAAsB,CAAC;IACpC,UAAiB,iBAAiB;QAChC,iBAAiB,EAAE,iBAAiB,CAAA;KACrC;CACF;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,MAAM;QACd,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,KAAK,CAAA;KACzC;CACF;AAED,MAAM,CAAC,OAAO,OAAO,kBAAkB;;IAGzB,SAAS,CAAC,GAAG,EAAE,kBAAkB;gBAAvB,GAAG,EAAE,kBAAkB;IAE7C,QAAQ;IAoBF,IAAI;CAQX"}
+{"version":3,"file":"attachment_provider.d.ts","sourceRoot":"","sources":["../../providers/attachment_provider.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAIhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE/D,OAAO,QAAQ,sBAAsB,CAAC;IACpC,UAAiB,iBAAiB;QAChC,iBAAiB,EAAE,iBAAiB,CAAA;KACrC;CACF;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,MAAM;QACd,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,KAAK,CAAA;KACzC;CACF;AAED,MAAM,CAAC,OAAO,OAAO,kBAAkB;;IAGzB,SAAS,CAAC,GAAG,EAAE,kBAAkB;gBAAvB,GAAG,EAAE,kBAAkB;IAE7C,QAAQ;IAqBF,IAAI;CAQX"}

package/build/providers/attachment_provider.js

@@ -18,10 +18,11 @@ export default class AttachmentProvider {
             const attachmentConfig = this.app.config.get('attachment');
             const config = await configProvider.resolve(this.app, attachmentConfig);
             const drive = await this.app.container.make('drive.manager');
+            const lock = await this.app.container.make('lock.manager');
             if (!config) {
                 throw new RuntimeException('Invalid config exported from "config/attachment.ts" file. Make sure to use the defineConfig method');
             }
-            this.#manager = new AttachmentManager(config, drive);
+            this.#manager = new AttachmentManager(config, drive, lock);
             return this.#manager;
         });
     }

package/build/src/attachment_manager.d.ts

@@ -5,6 +5,7 @@
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
  */
 import type { DriveService, SignedURLOptions } from '@adonisjs/drive/types';
+import type { LockService } from '@adonisjs/lock/types';
 import type { MultipartFile } from '@adonisjs/core/bodyparser';
 import type { AttachmentAttributes, AttachmentBase, Attachment as AttachmentType } from './types/attachment.js';
 import type { ResolvedAttachmentConfig } from './define_config.js';
@@ -13,14 +14,15 @@ import Converter from './converters/converter.js';
 export declare class AttachmentManager<KnownConverters extends Record<string, Converter>> {
     #private;
     queue: DeferQueue;
-    constructor(config: ResolvedAttachmentConfig<KnownConverters>, drive: DriveService);
+    lock: LockService;
+    constructor(config: ResolvedAttachmentConfig<KnownConverters>, drive: DriveService, lock: LockService);
     createFromDbResponse(response?: string | JSON): AttachmentType | null;
     createFromFile(input: MultipartFile): Promise<AttachmentType>;
     createFromFiles(inputs: MultipartFile[]): Promise<(AttachmentBase & {
         originalName: string;
         variants?: import("./types/attachment.js").Variant[];
         createVariant(key: string, input: import("./types/input.js").Input): Promise<import("./types/attachment.js").Variant>;
-        getVariant(variantName: string): import("./types/attachment.js").Variant | undefined;
+        getVariant(variantName: string): import("./types/attachment.js").Variant | null;
         getUrl(variantName?: string): Promise<string>;
         getSignedUrl(variantNameOrOptions?: string | SignedURLOptions, signedUrlOptions?: SignedURLOptions): Promise<string>;
         toObject(): AttachmentAttributes;

package/build/src/attachment_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachment_manager.d.ts","sourceRoot":"","sources":["../../src/attachment_manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EACV,oBAAoB,EACpB,cAAc,EACd,UAAU,IAAI,cAAc,EAC7B,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAA;AAGlE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG5C,OAAO,SAAS,MAAM,2BAA2B,CAAA;AAQjD,qBAAa,iBAAiB,CAAC,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;;IAC9E,KAAK,aAAA;gBAIO,MAAM,EAAE,wBAAwB,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,YAAY;IASlF,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI;IAiBvC,cAAc,CAAC,KAAK,EAAE,aAAa;IAgBnC,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE;;;;;;;;;IAIvC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAiB3C,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAgB7C,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAW7C,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM;IAMvC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,MAAM;IAM7D,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAMpD,UAAU,CACd,UAAU,EAAE,cAAc,GAAG,cAAc,EAC3C,gBAAgB,CAAC,EAAE,gBAAgB;IAY/B,aAAa,CAAC,UAAU,EAAE,cAAc;IAgBxC,KAAK,CAAC,UAAU,EAAE,cAAc;IAgBhC,MAAM,CAAC,UAAU,EAAE,cAAc;IAuBvC,SAAS;CAqBV"}
+{"version":3,"file":"attachment_manager.d.ts","sourceRoot":"","sources":["../../src/attachment_manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EACV,oBAAoB,EACpB,cAAc,EACd,UAAU,IAAI,cAAc,EAC7B,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAA;AAGlE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG5C,OAAO,SAAS,MAAM,2BAA2B,CAAA;AAQjD,qBAAa,iBAAiB,CAAC,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;;IAC9E,KAAK,aAAA;IAGL,IAAI,EAAE,WAAW,CAAA;gBAEL,MAAM,EAAE,wBAAwB,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW;IAUrG,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI;IAiBvC,cAAc,CAAC,KAAK,EAAE,aAAa;IAgBnC,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE;;;;;;;;;IAIvC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAiB3C,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAgB7C,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAW7C,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM;IAMvC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,MAAM;IAM7D,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAMpD,UAAU,CACd,UAAU,EAAE,cAAc,GAAG,cAAc,EAC3C,gBAAgB,CAAC,EAAE,gBAAgB;IAY/B,aAAa,CAAC,UAAU,EAAE,cAAc;IAgBxC,KAAK,CAAC,UAAU,EAAE,cAAc;IAgBhC,MAAM,CAAC,UAAU,EAAE,cAAc;IAuBvC,SAAS;CAqBV"}

package/build/src/attachment_manager.js

@@ -17,8 +17,10 @@ export class AttachmentManager {
     queue;
     #config;
     #drive;
-    constructor(config, drive) {
+    lock;
+    constructor(config, drive, lock) {
         this.#drive = drive;
+        this.lock = lock;
         this.#config = config;
         const concurrency = this.#config.queue?.concurrency || 1;
         this.queue = new DeferQueue({ concurrency });

package/build/src/attachments/attachment.d.ts

@@ -21,7 +21,7 @@ export declare class Attachment extends AttachmentBase implements AttachmentInte
      * Methods
      */
     createVariant(key: string, input: Input): Promise<Variant>;
-    getVariant(variantName: string): Variant | undefined;
+    getVariant(variantName: string): Variant | null;
     getUrl(variantName?: string): Promise<string>;
     getSignedUrl(variantNameOrOptions?: string | SignedURLOptions, signedUrlOptions?: SignedURLOptions): Promise<string>;
     setOptions(options: LucidOptions): this;

package/build/src/attachments/attachment.js

@@ -56,7 +56,7 @@ export class Attachment extends AttachmentBase {
         return variant;
     }
     getVariant(variantName) {
-        return this.variants?.find((v) => v.key === variantName);
+        return this.variants?.find((v) => v.key === variantName) ?? null;
     }
     async getUrl(variantName) {
         if (variantName) {

package/build/src/controllers/attachments_controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachments_controller.d.ts","sourceRoot":"","sources":["../../../src/controllers/attachments_controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAkBtD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAElC,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,WAAW;CA2FhD"}
+{"version":3,"file":"attachments_controller.d.ts","sourceRoot":"","sources":["../../../src/controllers/attachments_controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAoBtD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAElC,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,WAAW;CAgGhD"}

package/build/src/controllers/attachments_controller.js

@@ -1,87 +1,92 @@
 import path from 'node:path';
+import { Readable } from 'node:stream';
 import encryption from '@adonisjs/core/services/encryption';
 import db from '@adonisjs/lucid/services/db';
 import { attachmentManager } from '@jrmc/adonis-attachment';
-import { ConverterManager } from '../converter_manager.js';
-import { Readable } from 'node:stream';
+import VariantGenerator from '../services/variant/variant_generator.js';
+import VariantPersister from '../services/variant/variant_persister.js';
 export default class AttachmentsController {
     async handle({ request, response }) {
         const { key } = request.params();
         const format = request.qs()?.variant;
-        const index = request.qs()?.index;
-        let isAttachments = false;
+        let multiple = false;
         const data = encryption.decrypt(key);
-        const queryWithTableSelection = await db
-            .from(data.model)
-            .select(data.attribute)
-            .where('id', data.id).first();
-        /*
-        * 1. Get the entity
-        */
-        let result = JSON.parse(queryWithTableSelection[data.attribute]);
-        if (Array.isArray(result)) {
-            isAttachments = true;
-            result = result[index || 0];
-        }
-        result.folder = path.dirname(result.path);
-        /*
-        * 2. Get the attachment
-        */
-        const attachment = attachmentManager.createFromDbResponse(result);
-        attachment?.setOptions(data?.options);
-        if (!attachment) {
-            return response.notFound();
-        }
-        /*
-        * 4. Get the variant
-        */
-        const variant = attachment?.getVariant(format);
-        /*
-        * 5. Get the stream
-        * if variant and path, get the stream and return it
-        * if not, generate the variant
-        * if not, return the default file
-        */
-        if (variant && variant?.path) {
-            const image = await variant.getStream();
-            const readable = Readable.from(image);
-            response.header('Content-Type', variant?.mimeType);
-            response.stream(readable);
-        }
-        else {
-            let attachmentOrAttachmentsString;
-            const converter = (await attachmentManager.getConverter(format));
-            const variant = await ConverterManager.generate({
-                key: format,
-                attachment,
-                converter
-            });
-            if (isAttachments) {
-                attachmentOrAttachmentsString = JSON.stringify([attachment.toObject()]);
+        await attachmentManager.lock.createLock(`attachment.${data.model}-${data.attribute}`).run(async () => {
+            const queryWithTableSelection = await db
+                .from(data.model)
+                .select(data.attribute)
+                .where('id', data.id).first();
+            /*
+            * 1. Get the Attachment(s)
+            */
+            const result = JSON.parse(queryWithTableSelection[data.attribute]);
+            const attachments = [];
+            let currentAttachment = null;
+            if (Array.isArray(result)) {
+                multiple = true;
+                for (const item of result) {
+                    item.folder = path.dirname(item.path);
+                    const attachment = attachmentManager.createFromDbResponse(item);
+                    if (attachment) {
+                        attachment.setOptions(data.options);
+                        attachments.push(attachment);
+                    }
+                }
+                currentAttachment = attachments[data.index || 0];
             }
             else {
-                attachmentOrAttachmentsString = JSON.stringify(attachment.toObject());
+                result.folder = path.dirname(result.path);
+                currentAttachment = attachmentManager.createFromDbResponse(result);
+                if (currentAttachment) {
+                    currentAttachment.setOptions(data.options);
+                }
             }
-            const trx = await db.transaction();
-            // trx.after('rollback', rollback)
-            try {
-                await trx.query().from(data.model).where('id', data.id).update({
-                    [data.attribute]: attachmentOrAttachmentsString
+            if (!currentAttachment) {
+                return response.notFound();
+            }
+            /*
+            * 2. Get the variant
+            */
+            let variant = currentAttachment.getVariant(format);
+            /*
+            * 3. Get the stream
+            * if variant and path, get the stream and return it
+            * if not, generate the variant
+            * if not, return the default file
+            */
+            if (!variant && format) {
+                const converter = (await attachmentManager.getConverter(format));
+                variant = await (new VariantGenerator()).generateVariant({
+                    key: format,
+                    attachment: currentAttachment,
+                    converter
                 });
-                await trx.commit();
+                if (variant) {
+                    const variantPersister = new VariantPersister({
+                        id: data.id,
+                        modelTable: data.model,
+                        attributeName: data.attribute,
+                        multiple
+                    });
+                    await variantPersister.persist({ attachments: attachments ?? [currentAttachment], variants: [variant] });
+                }
             }
-            catch (error) {
-                await trx.rollback();
+            /*
+            * 5. Get the stream
+            */
+            let file;
+            let mimeType;
+            if (variant) {
+                file = await variant.getStream();
+                mimeType = variant.mimeType;
             }
-            finally {
-                if (!variant) {
-                    return response.notFound();
-                }
-                const image = await variant.getStream();
-                const readable = Readable.from(image);
-                response.header('Content-Type', variant.mimeType);
-                response.stream(readable);
+            else {
+                file = await currentAttachment.getStream();
+                mimeType = currentAttachment.mimeType;
             }
-        }
+            const readable = Readable.from(file);
+            response.header('Content-Type', mimeType);
+            response.stream(readable);
+        });
     }
 }

package/build/src/decorators/attachment.d.ts

@@ -4,12 +4,12 @@
  * @license MIT
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
  */
-import type { LucidModel } from '@adonisjs/lucid/types/model';
+import type { LucidModel, LucidRow } from '@adonisjs/lucid/types/model';
 import type { LucidOptions } from '../types/attachment.js';
 import type { AttributeOfRowWithAttachment } from '../types/mixin.js';
 export declare const bootModel: (model: LucidModel & {
     $attachments: AttributeOfRowWithAttachment;
 }) => void;
-export declare const attachment: (options?: LucidOptions) => (target: any, attributeName: string) => void;
-export declare const attachments: (options?: LucidOptions) => (target: any, attributeName: string) => void;
+export declare const attachment: <T = LucidRow>(options?: LucidOptions<T>) => (target: any, attributeName: string) => void;
+export declare const attachments: <T = LucidRow>(options?: LucidOptions<T>) => (target: any, attributeName: string) => void;
 //# sourceMappingURL=attachment.d.ts.map

package/build/src/decorators/attachment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachment.d.ts","sourceRoot":"","sources":["../../../src/decorators/attachment.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,KAAK,EAAc,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAKtE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAYrE,eAAO,MAAM,SAAS,UACb,UAAU,GAAG;IAClB,YAAY,EAAE,4BAA4B,CAAA;CAC3C,SA0BF,CAAA;AAyDD,eAAO,MAAM,UAAU,aAtBkD,YAAY,cACxD,GAAG,iBAAiB,MAAM,SAqBJ,CAAA;AACnD,eAAO,MAAM,WAAW,aAvBiD,YAAY,cACxD,GAAG,iBAAiB,MAAM,SAiCpD,CAAA"}
+{"version":3,"file":"attachment.d.ts","sourceRoot":"","sources":["../../../src/decorators/attachment.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,KAAK,EAAc,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAKtE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAYrE,eAAO,MAAM,SAAS,UACb,UAAU,GAAG;IAClB,YAAY,EAAE,4BAA4B,CAAA;CAC3C,SA0BF,CAAA;AAyDD,eAAO,MAAM,UAAU,GAtBwC,CAAC,uBAAuB,YAAY,CAAC,CAAC,CAAC,cACzE,GAAG,iBAAiB,MAAM,SAqBJ,CAAA;AACnD,eAAO,MAAM,WAAW,GAvBuC,CAAC,uBAAuB,YAAY,CAAC,CAAC,CAAC,cACzE,GAAG,iBAAiB,MAAM,SAiCpD,CAAA"}

package/build/src/services/record_with_attachment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"record_with_attachment.d.ts","sourceRoot":"","sources":["../../../src/services/record_with_attachment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,KAAK,EAAE,UAAU,IAAI,cAAc,EAAgB,MAAM,wBAAwB,CAAA;AACxF,OAAO,KAAK,EAAE,oBAAoB,IAAI,kCAAkC,EAAE,MAAM,qBAAqB,CAAA;AACrG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAW/D,MAAM,CAAC,OAAO,OAAO,oBAAqB,YAAW,kCAAkC;;gBAGzE,GAAG,EAAE,iBAAiB;IAWlC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ7B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAQzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDxB,WAAW,CAAC,OAAO;;KAA4B,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/D,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB9B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BzB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA+BjC,kBAAkB,CAAC,OAAO,GAAE,iBAAsB;IAmClD,MAAM;IA2CN,SAAS;IAkBf,IAAI,GAAG,sBAEN;IAED,cAAc,CAAC,OAAO,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAAC,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE;CAwEvG"}
+{"version":3,"file":"record_with_attachment.d.ts","sourceRoot":"","sources":["../../../src/services/record_with_attachment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,KAAK,EAAE,UAAU,IAAI,cAAc,EAAgB,MAAM,wBAAwB,CAAA;AACxF,OAAO,KAAK,EAAE,oBAAoB,IAAI,kCAAkC,EAAE,MAAM,qBAAqB,CAAA;AACrG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAW/D,MAAM,CAAC,OAAO,OAAO,oBAAqB,YAAW,kCAAkC;;gBAGzE,GAAG,EAAE,iBAAiB;IAWlC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ7B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAQzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDxB,WAAW,CAAC,OAAO;;KAA4B,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/D,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB9B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BzB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqCjC,kBAAkB,CAAC,OAAO,GAAE,iBAAsB;IAuClD,MAAM;IA2CN,SAAS;IAkBf,IAAI,GAAG,sBAEN;IAED,cAAc,CAAC,OAAO,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAAC,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE;CA4EvG"}

package/build/src/services/record_with_attachment.js

@@ -1,10 +1,10 @@
 import logger from '@adonisjs/core/services/logger';
 import encryption from '@adonisjs/core/services/encryption';
 import attachmentManager from '../../services/main.js';
+import VariantService from './variant_service.js';
 import { defaultStateAttributeMixin } from '../utils/default_values.js';
 import { Attachment } from '../attachments/attachment.js';
 import { optionsSym } from '../utils/symbols.js';
-import { ConverterManager } from '../converter_manager.js';
 import { E_CANNOT_CREATE_VARIANT } from '../errors.js';
 export default class RecordWithAttachment {
     #row;
@@ -113,6 +113,7 @@ export default class RecordWithAttachment {
                         model: model.table,
                         id: this.#row.$attributes['id'],
                         attribute: name,
+                        index: i,
                         options: {
                             disk,
                             folder,
@@ -133,16 +134,21 @@ export default class RecordWithAttachment {
          * Launch async generation variants
          */
         for await (const name of attachmentAttributeNames) {
+            if (!this.#row.$attributes[name]) {
+                continue;
+            }
             const record = this;
             attachmentManager.queue.push({
                 name: `${this.#row.constructor.name}-${name}`,
                 async run() {
-                    const converterManager = new ConverterManager({
-                        record,
-                        attributeName: name,
-                        options: record.#getOptionsByAttributeName(name),
+                    await attachmentManager.lock.createLock(`attachment.${record.#row.constructor.name}-${name}`).run(async () => {
+                        const variantService = new VariantService({
+                            record,
+                            attributeName: name,
+                            options: record.#getOptionsByAttributeName(name),
+                        });
+                        await variantService.run();
                     });
-                    await converterManager.run();
                 },
             })
                 .onError = function (error) {
@@ -164,11 +170,14 @@ export default class RecordWithAttachment {
             attachmentAttributeNames = this.#getAttributeNamesOfAttachment();
         }
         for await (const name of attachmentAttributeNames) {
+            if (!this.#row.$attributes[name]) {
+                continue;
+            }
             const record = this;
             attachmentManager.queue.push({
                 name: `${this.#row.constructor.name}-${name}`,
                 async run() {
-                    const converterManager = new ConverterManager({
+                    const variantService = new VariantService({
                         record,
                         attributeName: name,
                         options: record.#getOptionsByAttributeName(name),
@@ -176,7 +185,7 @@ export default class RecordWithAttachment {
                             variants: options.variants
                         }
                     });
-                    await converterManager.run();
+                    await variantService.run();
                 },
             })
                 .onError = function (error) {
@@ -254,7 +263,11 @@ export default class RecordWithAttachment {
             attachments = this.#getAttachmentsByAttributeName(options.attributeName);
         }
         const opts = this.#getOptionsByAttributeName(options.attributeName);
-        attachments.map((attachment) => attachment.setOptions(opts).makeFolder(this.#row));
+        attachments.forEach((attachment) => {
+            if (attachment) {
+                attachment.setOptions(opts).makeFolder(this.#row);
+            }
+        });
         return attachments;
     }
     #getAttachmentsByAttributeName(name) {

package/build/src/services/variant/variant_generator.d.ts

@@ -0,0 +1,18 @@
+import type { Attachment, Variant, LucidOptions } from '../../types/attachment.js';
+import type { Converter } from '../../types/converter.js';
+export default class VariantGenerator {
+    #private;
+    generate({ attachments, options, filters }: {
+        attachments: Attachment[];
+        options: LucidOptions;
+        filters?: {
+            variants?: string[];
+        };
+    }): Promise<Variant[]>;
+    generateVariant({ key, attachment, converter }: {
+        key: string;
+        attachment: Attachment;
+        converter: Converter;
+    }): Promise<Variant | null>;
+}
+//# sourceMappingURL=variant_generator.d.ts.map

package/build/src/services/variant/variant_generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"variant_generator.d.ts","sourceRoot":"","sources":["../../../../src/services/variant/variant_generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAClF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAOzD,MAAM,CAAC,OAAO,OAAO,gBAAgB;;IAC7B,QAAQ,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAChD,WAAW,EAAE,UAAU,EAAE,CAAC;QAC1B,OAAO,EAAE,YAAY,CAAC;QACtB,OAAO,CAAC,EAAE;YAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE,CAAA;KAClC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAmBhB,eAAe,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE;QACpD,GAAG,EAAE,MAAM,CAAC;QACZ,UAAU,EAAE,UAAU,CAAC;QACvB,SAAS,EAAE,SAAS,CAAA;KACrB,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;CAkF5B"}

package/build/src/services/variant/variant_generator.js

@@ -0,0 +1,91 @@
+import logger from '@adonisjs/core/services/logger';
+import attachmentManager from '../../../services/main.js';
+import { streamToTempFile } from '../../utils/helpers.js';
+export default class VariantGenerator {
+    async generate({ attachments, options, filters }) {
+        const variants = [];
+        const variantKeys = this.#getVariantKeysToProcess(options, filters);
+        for (const key of variantKeys) {
+            const converter = await this.#getConverter(key);
+            if (!converter)
+                continue;
+            for (const attachment of attachments) {
+                const variant = await this.generateVariant({ key, attachment, converter });
+                if (variant) {
+                    variants.push(variant);
+                }
+            }
+        }
+        return variants;
+    }
+    async generateVariant({ key, attachment, converter }) {
+        try {
+            const input = await this.#prepareInput(attachment);
+            const output = await this.#convertFile(input, converter);
+            if (!output) {
+                // throw new errors.E_CANNOT_PATH_BY_CONVERTER()
+                logger.warn(`Converter returned no output for key: ${key}`);
+                return null;
+            }
+            const variant = await attachment.createVariant(key, output);
+            await this.#processBlurhash(variant, converter);
+            await attachmentManager.write(variant);
+            return variant;
+        }
+        catch (error) {
+            logger.error(`Failed to generate variant ${key} for attachment: ${error.message}`);
+            return null;
+        }
+    }
+    #getVariantKeysToProcess(options, filters) {
+        if (!options.variants)
+            return [];
+        return options.variants.filter(key => filters?.variants === undefined ||
+            filters.variants.includes(key));
+    }
+    async #getConverter(key) {
+        try {
+            return await attachmentManager.getConverter(key);
+        }
+        catch (error) {
+            logger.error(`Failed to get converter for key ${key}: ${error.message}`);
+            return null;
+        }
+    }
+    async #prepareInput(attachment) {
+        if (attachment.input) {
+            return attachment.input;
+        }
+        const stream = await attachment.getStream();
+        return await streamToTempFile(stream);
+    }
+    async #convertFile(input, converter) {
+        if (!converter.handle) {
+            throw new Error('Converter handle method is required');
+        }
+        if (!converter.options) {
+            throw new Error('Converter options are required');
+        }
+        return await converter.handle({
+            input,
+            options: converter.options,
+        });
+    }
+    async #processBlurhash(variant, converter) {
+        const blurhashConfig = converter.options?.blurhash;
+        if (!blurhashConfig)
+            return;
+        const shouldGenerate = typeof blurhashConfig === 'boolean'
+            ? blurhashConfig
+            : blurhashConfig.enabled === true;
+        if (!shouldGenerate)
+            return;
+        try {
+            const options = typeof blurhashConfig !== 'boolean' ? blurhashConfig : undefined;
+            await variant.generateBlurhash(options);
+        }
+        catch (error) {
+            logger.error(`Blurhash generation failed: ${error.message}`);
+        }
+    }
+}

package/build/src/services/variant/variant_persister.d.ts

@@ -0,0 +1,17 @@
+import type { Attachment, Variant } from '../../types/attachment.js';
+type PersistAttributes = {
+    id: string;
+    modelTable: string;
+    attributeName: string;
+    multiple: boolean;
+};
+export default class VariantPersister {
+    #private;
+    constructor({ id, modelTable, attributeName, multiple }: PersistAttributes);
+    persist({ attachments, variants }: {
+        attachments: Attachment[];
+        variants: Variant[];
+    }): Promise<void>;
+}
+export {};
+//# sourceMappingURL=variant_persister.d.ts.map

package/build/src/services/variant/variant_persister.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"variant_persister.d.ts","sourceRoot":"","sources":["../../../../src/services/variant/variant_persister.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAOpE,KAAK,iBAAiB,GAAG;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,gBAAgB;;gBAMvB,EAAE,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,iBAAiB;IAOpE,OAAO,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE;QACvC,WAAW,EAAE,UAAU,EAAE,CAAC;QAC1B,QAAQ,EAAE,OAAO,EAAE,CAAA;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;CA2ClB"}

package/build/src/services/variant/variant_persister.js

@@ -0,0 +1,54 @@
+import logger from '@adonisjs/core/services/logger';
+import string from '@adonisjs/core/helpers/string';
+import db from '@adonisjs/lucid/services/db';
+import attachmentManager from '../../../services/main.js';
+export default class VariantPersister {
+    #id;
+    #modelTable;
+    #attributeName;
+    #multiple;
+    constructor({ id, modelTable, attributeName, multiple }) {
+        this.#id = id;
+        this.#modelTable = modelTable;
+        this.#attributeName = attributeName;
+        this.#multiple = multiple;
+    }
+    async persist({ attachments, variants }) {
+        const rollback = () => this.#rollbackVariants(variants);
+        const trx = await db.transaction();
+        trx.after('rollback', rollback);
+        try {
+            const data = this.#prepareUpdateData(attachments);
+            await this.#executeUpdate(trx, data);
+            await trx.commit();
+        }
+        catch (error) {
+            logger.error(`Persist failed: ${error.message}`);
+            await trx.rollback();
+            throw error;
+        }
+    }
+    #rollbackVariants(variants) {
+        variants.forEach(variant => {
+            try {
+                attachmentManager.remove(variant);
+            }
+            catch (error) {
+                logger.error(`Rollback failed for variant: ${error.message}`);
+            }
+        });
+    }
+    #prepareUpdateData(attachments) {
+        const index = string.snakeCase(this.#attributeName);
+        const data = this.#multiple
+            ? attachments.map(att => att.toObject())
+            : attachments[0]?.toObject();
+        return { [index]: JSON.stringify(data) };
+    }
+    async #executeUpdate(trx, data) {
+        await trx.query()
+            .from(this.#modelTable)
+            .where('id', this.#id)
+            .update(data);
+    }
+}

package/build/src/services/variant/variant_purger.d.ts

@@ -0,0 +1,9 @@
+import type { Attachment } from '../../types/attachment.js';
+export default class VariantPurger {
+    #private;
+    constructor(filters?: {
+        variants?: string[];
+    });
+    purge(attachments: Attachment[]): Promise<void>;
+}
+//# sourceMappingURL=variant_purger.d.ts.map

package/build/src/services/variant/variant_purger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"variant_purger.d.ts","sourceRoot":"","sources":["../../../../src/services/variant/variant_purger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAW,MAAM,2BAA2B,CAAA;AAIpE,MAAM,CAAC,OAAO,OAAO,aAAa;;gBAGpB,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE;IAIvC,KAAK,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CA6CtD"}