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

package/build/src/attachments/attachment.js

@@ -120,6 +120,7 @@ export class Attachment extends AttachmentBase {
     }
     toJSON() {
         const data = {
+            keyId: this.getKeyId(),
             name: this.name,
             originalName: this.originalName,
             size: this.size,

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

@@ -35,6 +35,8 @@ export declare class AttachmentBase implements AttachmentBaseInterface {
     getStream(): Promise<import("stream").Readable>;
     getUrl(): Promise<string>;
     getSignedUrl(signedUrlOptions?: SignedURLOptions): Promise<string>;
+    getKeyId(): string | undefined;
+    setKeyId(keyId: string): this;
     setOptions(options: LucidOptions): this;
     makeFolder(record?: LucidRow): this;
     /**

package/build/src/attachments/attachment_base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachment_base.d.ts","sourceRoot":"","sources":["../../../src/attachments/attachment_base.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACxB,cAAc,IAAI,uBAAuB,EAC1C,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAOpD,qBAAa,cAAe,YAAW,uBAAuB;;IAC5D,KAAK,EAAE,YAAY,CAAA;IAEnB,KAAK,CAAC,EAAE,KAAK,CAAA;IAKb,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IAEZ,OAAO,EAAE,YAAY,CAAA;gBAET,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,wBAAwB,EAAE,KAAK,CAAC,EAAE,KAAK;IAsBpF;;OAEG;IAEH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAW/B;IAED,IAAI,IAAI,IAAI,MAAM,CAMjB;IAED;;OAEG;IAEH,OAAO;IAIP,QAAQ;IAIF,SAAS;IAKf,SAAS;IAIT,MAAM;IAIN,YAAY,CAAC,gBAAgB,CAAC,EAAE,gBAAgB;IAIhD,UAAU,CAAC,OAAO,EAAE,YAAY;IAQhC,UAAU,CAAC,MAAM,CAAC,EAAE,QAAQ;IAwB5B;;OAEG;IAEH,QAAQ,IAAI,wBAAwB;IAWpC,MAAM,IAAI,MAAM;CAUjB"}
+{"version":3,"file":"attachment_base.d.ts","sourceRoot":"","sources":["../../../src/attachments/attachment_base.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC3E,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACxB,cAAc,IAAI,uBAAuB,EAC1C,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAOpD,qBAAa,cAAe,YAAW,uBAAuB;;IAC5D,KAAK,EAAE,YAAY,CAAA;IAEnB,KAAK,CAAC,EAAE,KAAK,CAAA;IAMb,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IAEZ,OAAO,EAAE,YAAY,CAAA;gBAET,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,wBAAwB,EAAE,KAAK,CAAC,EAAE,KAAK;IAsBpF;;OAEG;IAEH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAW/B;IAED,IAAI,IAAI,IAAI,MAAM,CAMjB;IAED;;OAEG;IAEH,OAAO;IAIP,QAAQ;IAIF,SAAS;IAKf,SAAS;IAIT,MAAM;IAIN,YAAY,CAAC,gBAAgB,CAAC,EAAE,gBAAgB;IAIhD,QAAQ;IAIR,QAAQ,CAAC,KAAK,EAAE,MAAM;IAKtB,UAAU,CAAC,OAAO,EAAE,YAAY;IAQhC,UAAU,CAAC,MAAM,CAAC,EAAE,QAAQ;IAwB5B;;OAEG;IAEH,QAAQ,IAAI,wBAAwB;IAYpC,MAAM,IAAI,MAAM;CAUjB"}

package/build/src/attachments/attachment_base.js

@@ -12,6 +12,7 @@ import { extractPathParameters } from '../utils/helpers.js';
 export class AttachmentBase {
     drive;
     input;
+    #keyId;
     #name;
     #folder;
     size;
@@ -84,6 +85,13 @@ export class AttachmentBase {
     getSignedUrl(signedUrlOptions) {
         return this.getDisk().getSignedUrl(this.path, signedUrlOptions);
     }
+    getKeyId() {
+        return this.#keyId;
+    }
+    setKeyId(keyId) {
+        this.#keyId = keyId;
+        return this;
+    }
     setOptions(options) {
         this.options = {
             ...this.options,
@@ -117,6 +125,7 @@ export class AttachmentBase {
      */
     toObject() {
         return {
+            keyId: this.getKeyId(),
             name: this.name,
             extname: this.extname,
             size: this.size,

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

@@ -0,0 +1,5 @@
+import type { HttpContext } from '@adonisjs/core/http';
+export default class AttachmentsController {
+    handle({ request, response }: HttpContext): Promise<void>;
+}
+//# sourceMappingURL=attachments_controller.d.ts.map

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

@@ -0,0 +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"}

package/build/src/controllers/attachments_controller.js

@@ -0,0 +1,87 @@
+import path from 'node:path';
+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';
+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;
+        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()]);
+            }
+            else {
+                attachmentOrAttachmentsString = JSON.stringify(attachment.toObject());
+            }
+            const trx = await db.transaction();
+            // trx.after('rollback', rollback)
+            try {
+                await trx.query().from(data.model).where('id', data.id).update({
+                    [data.attribute]: attachmentOrAttachmentsString
+                });
+                await trx.commit();
+            }
+            catch (error) {
+                await trx.rollback();
+            }
+            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);
+            }
+        }
+    }
+}

package/build/src/converter_manager.d.ts

@@ -1,7 +1,13 @@
-import type { ConverterInitializeAttributes } from './types/converter.js';
+import type { Converter, ConverterInitializeAttributes } from './types/converter.js';
+import type { Attachment, Variant } from './types/attachment.js';
 export declare class ConverterManager {
     #private;
     constructor({ record, attributeName, options, filters }: ConverterInitializeAttributes);
     run(): Promise<void>;
+    static generate({ key, attachment, converter }: {
+        key: string;
+        attachment: Attachment;
+        converter: Converter;
+    }): Promise<Variant | undefined>;
 }
 //# sourceMappingURL=converter_manager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"converter_manager.d.ts","sourceRoot":"","sources":["../../src/converter_manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAa,6BAA6B,EAAE,MAAM,sBAAsB,CAAA;AAWpF,qBAAa,gBAAgB;;gBAQf,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,6BAA6B;IAOhF,GAAG;CAmIV"}
+{"version":3,"file":"converter_manager.d.ts","sourceRoot":"","sources":["../../src/converter_manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAA;AACpF,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAgB,MAAM,uBAAuB,CAAA;AAS9E,qBAAa,gBAAgB;;gBAQf,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,6BAA6B;IAOhF,GAAG;WAyCI,QAAQ,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,EAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,UAAU,CAAC;QAAC,SAAS,EAAE,SAAS,CAAA;KAAE;CA6FrH"}

package/build/src/converter_manager.js

@@ -2,7 +2,6 @@ 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';
-import * as errors from './errors.js';
 import { streamToTempFile } from './utils/helpers.js';
 export class ConverterManager {
     #record;
@@ -31,12 +30,14 @@ export class ConverterManager {
             const converter = (await attachmentManager.getConverter(key));
             if (converter) {
                 for await (const attachment of attachments) {
-                    const variant = await this.#generate({
+                    const variant = await ConverterManager.generate({
                         key,
                         attachment,
                         converter
                     });
-                    variants.push(variant);
+                    if (variant) {
+                        variants.push(variant);
+                    }
                 }
             }
         }
@@ -46,7 +47,7 @@ export class ConverterManager {
             }
         });
     }
-    async #generate({ key, attachment, converter }) {
+    static async generate({ key, attachment, converter }) {
         let input = attachment.input;
         if (!input) {
             input = await streamToTempFile(await attachment.getStream());
@@ -56,7 +57,8 @@ export class ConverterManager {
             options: converter.options,
         });
         if (output === undefined) {
-            throw new errors.E_CANNOT_PATH_BY_CONVERTER();
+            // throw new errors.E_CANNOT_PATH_BY_CONVERTER()
+            return;
         }
         const variant = await attachment.createVariant(key, output);
         if (converter.options.blurhash) {

package/build/src/converters/autodetect_converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"autodetect_converter.d.ts","sourceRoot":"","sources":["../../../src/converters/autodetect_converter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,SAAS,MAAM,gBAAgB,CAAA;AAItC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,SAAS;IAClD,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;CAqBlF"}
+{"version":3,"file":"autodetect_converter.d.ts","sourceRoot":"","sources":["../../../src/converters/autodetect_converter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,SAAS,MAAM,gBAAgB,CAAA;AAMtC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,SAAS;IAClD,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;CAoElF"}

package/build/src/converters/autodetect_converter.js

@@ -8,6 +8,8 @@ import { fileTypeFromBuffer, fileTypeFromFile } from 'file-type';
 import Converter from './converter.js';
 import ImageConverter from './image_converter.js';
 import VideoThumnailConverter from './video_thumbnail_converter.js';
+import DocumentThumbnailConverter from './document_thumbnail_converter.js';
+import PdfThumbnailConverter from './pdf_thumbnail_converter.js';
 export default class AutodetectConverter extends Converter {
     async handle({ input, options }) {
         let converter;
@@ -18,11 +20,54 @@ export default class AutodetectConverter extends Converter {
         else {
             fileType = await fileTypeFromFile(input);
         }
-        if (fileType?.mime.includes('video')) {
+        if (!fileType) {
+            fileType = {
+                mime: 'text/plain',
+            };
+        }
+        if (fileType?.mime.includes('image')) {
+            converter = new ImageConverter(options, this.binPaths);
+        }
+        else if (fileType?.mime.includes('video')) {
             converter = new VideoThumnailConverter(options, this.binPaths);
         }
+        else if (fileType?.mime.includes('pdf')) {
+            converter = new PdfThumbnailConverter(options, this.binPaths);
+        }
+        else if (
+        // Documents texte
+        fileType?.mime.includes('application/vnd.openxmlformats-officedocument.wordprocessingml.document') || // .docx
+            fileType?.mime.includes('application/vnd.oasis.opendocument.text') || // .odt
+            fileType?.mime.includes('application/msword') || // .doc
+            fileType?.mime.includes('application/rtf') || // .rtf
+            fileType?.mime.includes('text/plain') || // .txt
+            fileType?.mime.includes('application/xml') || // .xml, .svg
+            // Feuilles de calcul
+            fileType?.mime.includes('application/vnd.oasis.opendocument.spreadsheet') || // .ods
+            fileType?.mime.includes('application/vnd.ms-excel') || // .xls
+            fileType?.mime.includes('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') || // .xlsx
+            fileType?.mime.includes('text/csv') || // .csv
+            // Présentations
+            fileType?.mime.includes('application/vnd.oasis.opendocument.presentation') || // .odp
+            fileType?.mime.includes('application/vnd.ms-powerpoint') || // .ppt
+            fileType?.mime.includes('application/vnd.openxmlformats-officedocument.presentationml.presentation') || // .pptx
+            // Dessins
+            fileType?.mime.includes('application/vnd.oasis.opendocument.graphics') || // .odg
+            fileType?.mime.includes('application/vnd.visio') || // .vsd
+            // Formules mathématiques
+            fileType?.mime.includes('application/vnd.oasis.opendocument.formula') || // .odf
+            fileType?.mime.includes('application/mathml+xml') || // .mml
+            // Bases de données
+            fileType?.mime.includes('application/vnd.oasis.opendocument.database') || // .odb
+            fileType?.mime.includes('application/x-msaccess') || // .mdb, .accdb
+            // Autres formats Office
+            fileType?.mime.includes('application/vnd.ms-office') || // Formats MS Office génériques
+            fileType?.mime.includes('application/vnd.oasis.opendocument') // Formats OpenDocument génériques
+        ) {
+            converter = new DocumentThumbnailConverter(options, this.binPaths);
+        }
         else {
-            converter = new ImageConverter(options, this.binPaths);
+            return;
         }
         return converter.handle({
             input,

package/build/src/converters/document_thumbnail_converter.d.ts

@@ -9,6 +9,6 @@ import type { Input } from '../types/input.js';
 import Converter from './converter.js';
 export default class DocumentThumbnailConverter extends Converter {
     handle({ input, options }: ConverterAttributes): Promise<Input>;
-    documentToImage(LibreOfficeFileConverter: any, input: Input): Promise<any>;
+    documentToImage(input: Input): Promise<string>;
 }
 //# sourceMappingURL=document_thumbnail_converter.d.ts.map

package/build/src/converters/document_thumbnail_converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"document_thumbnail_converter.d.ts","sourceRoot":"","sources":["../../../src/converters/document_thumbnail_converter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,SAAS,MAAM,gBAAgB,CAAA;AAItC,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,SAAS;IACzD,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,CAAC;IAgB/D,eAAe,CAAC,wBAAwB,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK;CAiClE"}
+{"version":3,"file":"document_thumbnail_converter.d.ts","sourceRoot":"","sources":["../../../src/converters/document_thumbnail_converter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,SAAS,MAAM,gBAAgB,CAAA;AAItC,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,SAAS;IACzD,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,CAAC;IAc/D,eAAe,CAAC,KAAK,EAAE,KAAK;CAiBnC"}

package/build/src/converters/document_thumbnail_converter.js

@@ -4,51 +4,33 @@
  * @license MIT
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
  */
+import { bufferToTempFile } from '../utils/helpers.js';
 import Converter from './converter.js';
 import ImageConverter from './image_converter.js';
-import { use } from '../utils/helpers.js';
+import Soffice from '../adapters/soffice.js';
 export default class DocumentThumbnailConverter extends Converter {
     async handle({ input, options }) {
-        const lib = await use('libreoffice-file-converter');
-        const LibreOfficeFileConverter = lib.LibreOfficeFileConverter;
-        const outputBuffer = await this.documentToImage(LibreOfficeFileConverter, input);
-        if (options && outputBuffer) {
+        const filePath = await this.documentToImage(input);
+        if (options && filePath) {
             const converter = new ImageConverter();
             return await converter.handle({
-                input: outputBuffer,
+                input: filePath,
                 options,
             });
         }
-        return outputBuffer;
+        return filePath;
     }
-    async documentToImage(LibreOfficeFileConverter, input) {
-        let binaryPaths = undefined;
-        if (this.binPaths && this.binPaths.libreofficePaths) {
-            binaryPaths = this.binPaths.libreofficePaths;
-        }
-        const libreOfficeFileConverter = new LibreOfficeFileConverter({
-            childProcessOptions: {
-                timeout: 60 * 1000,
-            },
-            binaryPaths,
-        });
+    async documentToImage(input) {
+        let file = input;
         if (Buffer.isBuffer(input)) {
-            const output = await libreOfficeFileConverter.convert({
-                buffer: input,
-                input: 'buffer',
-                output: 'buffer',
-                format: 'jpeg',
-            });
-            return output;
+            file = await bufferToTempFile(input);
         }
-        else {
-            const output = await libreOfficeFileConverter.convert({
-                inputPath: input,
-                input: 'file',
-                output: 'buffer',
-                format: 'jpeg',
-            });
-            return output;
+        const soffice = new Soffice(file);
+        if (this.binPaths) {
+            if (this.binPaths.sofficePath) {
+                soffice.setSofficePath(this.binPaths.sofficePath);
+            }
         }
+        return soffice.convert();
     }
 }

package/build/src/converters/pdf_thumbnail_converter.d.ts

@@ -9,6 +9,6 @@ import type { Input } from '../types/input.js';
 import Converter from './converter.js';
 export default class PdfThumbnailConverter extends Converter {
     handle({ input, options }: ConverterAttributes): Promise<Input>;
-    pdfToImage(Poppler: any, input: Input): Promise<string>;
+    pdfToImage(input: Input): Promise<string>;
 }
 //# sourceMappingURL=pdf_thumbnail_converter.d.ts.map

package/build/src/converters/pdf_thumbnail_converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pdf_thumbnail_converter.d.ts","sourceRoot":"","sources":["../../../src/converters/pdf_thumbnail_converter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAK9C,OAAO,SAAS,MAAM,gBAAgB,CAAA;AAItC,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,SAAS;IACpD,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,CAAC;IAgB/D,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK;CAmB5C"}
+{"version":3,"file":"pdf_thumbnail_converter.d.ts","sourceRoot":"","sources":["../../../src/converters/pdf_thumbnail_converter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,SAAS,MAAM,gBAAgB,CAAA;AAKtC,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,SAAS;IACpD,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,CAAC;IAc/D,UAAU,CAAC,KAAK,EAAE,KAAK;CAoB9B"}

package/build/src/converters/pdf_thumbnail_converter.js

@@ -4,17 +4,13 @@
  * @license MIT
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
  */
-import os from 'node:os';
-import path from 'node:path';
-import { cuid } from '@adonisjs/core/helpers';
 import Converter from './converter.js';
 import ImageConverter from './image_converter.js';
-import { use } from '../utils/helpers.js';
+import Poppler from '../adapters/poppler.js';
+import { bufferToTempFile } from '../utils/helpers.js';
 export default class PdfThumbnailConverter extends Converter {
     async handle({ input, options }) {
-        const nodePoppler = await use('node-poppler');
-        const Poppler = nodePoppler.Poppler;
-        const filePath = await this.pdfToImage(Poppler, input);
+        const filePath = await this.pdfToImage(input);
         if (options && filePath) {
             const converter = new ImageConverter();
             return await converter.handle({
@@ -24,19 +20,20 @@ export default class PdfThumbnailConverter extends Converter {
         }
         return filePath;
     }
-    async pdfToImage(Poppler, input) {
-        let binPath = null;
-        if (this.binPaths && this.binPaths.pdftocairoBasePath) {
-            binPath = this.binPaths.pdftocairoBasePath;
+    async pdfToImage(input) {
+        let file = input;
+        if (Buffer.isBuffer(input)) {
+            file = await bufferToTempFile(input);
         }
-        const poppler = new Poppler(binPath);
-        const options = {
-            // firstPageToConvert: 1,
-            lastPageToConvert: 1,
-            jpegFile: true,
-        };
-        const filePath = path.join(os.tmpdir(), cuid());
-        await poppler.pdfToCairo(input, filePath, options);
-        return filePath + '-1.jpg';
+        const poppler = new Poppler(file);
+        if (this.binPaths) {
+            if (this.binPaths.pdftoppmPath) {
+                poppler.setPdfToPpmPath(this.binPaths.pdftoppmPath);
+            }
+        }
+        return poppler.pdfToPpm({
+            page: this.options?.startPage || 1,
+            dpi: 300,
+        });
     }
 }

package/build/src/converters/video_thumbnail_converter.d.ts

@@ -9,6 +9,6 @@ import type { Input } from '../types/input.js';
 import Converter from './converter.js';
 export default class VideoThumbnailConvert extends Converter {
     handle({ input, options }: ConverterAttributes): Promise<Input | undefined>;
-    videoToImage(ffmpeg: Function, input: Input): Promise<string | undefined>;
+    videoToImage(input: Input): Promise<string | undefined>;
 }
 //# sourceMappingURL=video_thumbnail_converter.d.ts.map

package/build/src/converters/video_thumbnail_converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"video_thumbnail_converter.d.ts","sourceRoot":"","sources":["../../../src/converters/video_thumbnail_converter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAK9C,OAAO,SAAS,MAAM,gBAAgB,CAAA;AAItC,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,SAAS;IACpD,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAe3E,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK;CAgClD"}
+{"version":3,"file":"video_thumbnail_converter.d.ts","sourceRoot":"","sources":["../../../src/converters/video_thumbnail_converter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,SAAS,MAAM,gBAAgB,CAAA;AAKtC,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,SAAS;IACpD,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAc3E,YAAY,CAAC,KAAK,EAAE,KAAK;CAmBhC"}

package/build/src/converters/video_thumbnail_converter.js

@@ -4,16 +4,13 @@
  * @license MIT
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
  */
-import os from 'node:os';
-import path from 'node:path';
-import { cuid } from '@adonisjs/core/helpers';
 import Converter from './converter.js';
 import ImageConverter from './image_converter.js';
-import { bufferToTempFile, use } from '../utils/helpers.js';
+import { bufferToTempFile } from '../utils/helpers.js';
+import FFmpeg from '../adapters/ffmpeg.js';
 export default class VideoThumbnailConvert extends Converter {
     async handle({ input, options }) {
-        const ffmpeg = await use('fluent-ffmpeg');
-        const filePath = await this.videoToImage(ffmpeg, input);
+        const filePath = await this.videoToImage(input);
         if (options && filePath) {
             const converter = new ImageConverter();
             return converter.handle({
@@ -25,31 +22,19 @@ export default class VideoThumbnailConvert extends Converter {
             return filePath;
         }
     }
-    async videoToImage(ffmpeg, input) {
+    async videoToImage(input) {
         let file = input;
         if (Buffer.isBuffer(input)) {
             file = await bufferToTempFile(input);
         }
-        return new Promise((resolve, reject) => {
-            const folder = os.tmpdir();
-            const filename = `${cuid()}.png`;
-            const ff = ffmpeg(file);
-            if (this.binPaths) {
-                if (this.binPaths.ffmpegPath) {
-                    ff.setFfmpegPath(this.binPaths.ffmpegPath);
-                }
+        const ffmpeg = new FFmpeg(file);
+        if (this.binPaths) {
+            if (this.binPaths.ffmpegPath) {
+                ffmpeg.setFfmpegPath(this.binPaths.ffmpegPath);
             }
-            ff.screenshots({
-                count: 1,
-                filename,
-                folder,
-            })
-                .on('end', () => {
-                resolve(path.join(folder, filename));
-            })
-                .on('error', (err) => {
-                reject(err);
-            });
+        }
+        return ffmpeg.screenshots({
+            time: this.options?.startTime || 2,
         });
     }
 }

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,SA2BF,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,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"}

package/build/src/define_config.d.ts

@@ -15,6 +15,7 @@ export type ResolvedAttachmentConfig<KnownConverters extends Record<string, Conv
     meta?: boolean;
     rename?: boolean;
     preComputeUrl?: boolean;
+    timeout?: number;
     converters?: {
         [K in keyof KnownConverters]: KnownConverters[K];
     };

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

@@ -1 +1 @@
-{"version":3,"file":"define_config.d.ts","sourceRoot":"","sources":["../../src/define_config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAE3F,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEhD;;GAEG;AACH,MAAM,MAAM,wBAAwB,CAAC,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IACxF,GAAG,CAAC,EAAE,QAAQ,CAAA;IACd,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,UAAU,CAAC,EAAE;SAAG,CAAC,IAAI,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,CAAC;KAAE,CAAA;IACjE,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,wBAAgB,YAAY,CAAC,cAAc,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACjF,MAAM,EAAE,gBAAgB,CAAC,cAAc,CAAC,GACvC,cAAc,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC,CA0B1D"}
+{"version":3,"file":"define_config.d.ts","sourceRoot":"","sources":["../../src/define_config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAE3F,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEhD;;GAEG;AACH,MAAM,MAAM,wBAAwB,CAAC,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IACxF,GAAG,CAAC,EAAE,QAAQ,CAAA;IACd,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE;SAAG,CAAC,IAAI,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,CAAC;KAAE,CAAA;IACjE,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,wBAAgB,YAAY,CAAC,cAAc,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACjF,MAAM,EAAE,gBAAgB,CAAC,cAAc,CAAC,GACvC,cAAc,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC,CAiC1D"}

package/build/src/define_config.js

@@ -13,10 +13,15 @@ export function defineConfig(config) {
             for (let converterName of convertersList) {
                 const converter = config.converters[converterName];
                 const binConfig = config.bin;
+                if (converter.converter === undefined) {
+                    converter.converter = () => import('@jrmc/adonis-attachment/converters/autodetect_converter');
+                }
                 try {
                     const { default: value } = await converter.converter();
+                    const { converter: _, ...opt } = converter;
+                    const options = converter.options || opt;
                     const Converter = value;
-                    converters[converterName] = new Converter(converter.options, binConfig);
+                    converters[converterName] = new Converter(options, binConfig);
                 }
                 catch (error) {
                     console.error(`Failed to load converter ${converterName}:`, error);

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

@@ -18,6 +18,7 @@ export default class RecordWithAttachment implements RecordWithAttachmentImpleme
         enabledRollback: boolean;
     }): Promise<void>;
     preComputeUrl(): Promise<void>;
+    setKeyId(): Promise<void>;
     generateVariants(): Promise<void>;
     regenerateVariants(options?: RegenerateOptions): Promise<void>;
     detach(): Promise<PromiseSettledResult<void>[]>;

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":"AAAA,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;AAU/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,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;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"}

package/build/src/services/record_with_attachment.js

@@ -1,4 +1,5 @@
 import logger from '@adonisjs/core/services/logger';
+import encryption from '@adonisjs/core/services/encryption';
 import attachmentManager from '../../services/main.js';
 import { defaultStateAttributeMixin } from '../utils/default_values.js';
 import { Attachment } from '../attachments/attachment.js';
@@ -100,6 +101,30 @@ export default class RecordWithAttachment {
             }
         }));
     }
+    async setKeyId() {
+        const attachmentAttributeNames = this.#getAttributeNamesOfAttachment();
+        await Promise.all(attachmentAttributeNames.map(async (name) => {
+            if (this.#row.$attributes[name]) {
+                const attachments = this.#getAttachmentsByAttributeName(name);
+                for (let i = 0; i < attachments.length; i++) {
+                    const { disk, folder, meta, rename } = attachments[i].options;
+                    const model = this.#row.constructor;
+                    const key = encryption.encrypt({
+                        model: model.table,
+                        id: this.#row.$attributes['id'],
+                        attribute: name,
+                        options: {
+                            disk,
+                            folder,
+                            meta,
+                            rename
+                        }
+                    });
+                    attachments[i].setKeyId(key);
+                }
+            }
+        }));
+    }
     async generateVariants() {
         /* this.#row.$dirty is not avalable in afterSave hooks */
         const attachmentAttributeNames = this.#row.$attachments.dirtied;

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

@@ -31,6 +31,7 @@ export type AttachmentBase = {
     getStream(): Promise<NodeJS.ReadableStream>;
     getUrl(): Promise<string>;
     getSignedUrl(signedUrlOptions?: SignedURLOptions): Promise<string>;
+    setKeyId(keyId: string): AttachmentBase;
     setOptions(options: LucidOptions): AttachmentBase;
     toObject(): AttachmentBaseAttributes;
     toJSON(): Object;
@@ -62,6 +63,7 @@ export type LucidOptions = {
     serializeAs?: string | null;
 };
 export type AttachmentBaseAttributes = {
+    keyId?: string;
     name?: string;
     size: number;
     meta?: Exif;