@jrmc/adonis-attachment 2.2.0 → 2.3.0

package/README.md

@@ -7,6 +7,7 @@ Project sample : [adonis-starter-kit](https://github.com/batosai/adonis-starter-
 ## Links
 
 [View documentation](https://adonis-attachment.jrmc.dev/)
+[Discord](https://discord.gg/89eMn2vB)
 
 [ChangeLog](https://adonis-attachment.jrmc.dev/changelog.html)
 
@@ -18,7 +19,7 @@ Project sample : [adonis-starter-kit](https://github.com/batosai/adonis-starter-
 - [x] save meta data
 - [x] variantes
   - [x] images
-  - [ ] documents thumbnail
+  - [x] documents thumbnail
   - [x] videos thumbnail
 - [ ] command regenerate
 - [x] adonis-drive/flydrive

package/build/src/adapters/exif.js

@@ -8,7 +8,7 @@ import fs from 'node:fs/promises';
 import ExifReader from 'exifreader';
 import logger from '@adonisjs/core/services/logger';
 import { fileTypeFromBuffer, fileTypeFromFile } from 'file-type';
-import { cleanObject, use } from '../utils/helpers.js';
+import { bufferToTempFile, cleanObject, use } from '../utils/helpers.js';
 import { attachmentManager } from '../../index.js';
 export const exif = async (input) => {
     let fileType;
@@ -106,7 +106,11 @@ async function imageExif(buffer) {
 async function videoExif(input) {
     return new Promise(async (resolve) => {
         const ffmpeg = await use('fluent-ffmpeg');
-        const ff = ffmpeg(input);
+        let file = input;
+        if (Buffer.isBuffer(input)) {
+            file = await bufferToTempFile(input);
+        }
+        const ff = ffmpeg(file);
         const config = attachmentManager.getConfig();
         if (config.bin) {
             if (config.bin.ffprobePath) {

package/build/src/attachment_manager.d.ts

@@ -18,6 +18,7 @@ export declare class AttachmentManager {
     createFromDbResponse(response: any): Attachment | null;
     createFromFile(file: MultipartFile): Promise<Attachment>;
     createFromBuffer(buffer: Buffer, name?: string): Promise<Attachment>;
+    createFromBase64(data: string, name?: string): Promise<Attachment>;
     getConverter(key: string): Promise<void | Converter>;
     computeUrl(attachment: AttachmentType | AttachmentBase, signedUrlOptions?: SignedURLOptions): Promise<void>;
     preComputeUrl(attachment: AttachmentType): Promise<void>;

package/build/src/attachment_manager.js

@@ -49,6 +49,11 @@ export class AttachmentManager {
         const attributes = await createAttachmentAttributes(buffer, name);
         return new Attachment(this.#drive, attributes, buffer);
     }
+    async createFromBase64(data, name) {
+        const base64Data = data.replace(/^data:([A-Za-z-+\/]+);base64,/, '');
+        const buffer = Buffer.from(base64Data, 'base64');
+        return await this.createFromBuffer(buffer, name);
+    }
     async getConverter(key) {
         if (this.#config.converters) {
             for (const c of this.#config.converters) {

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

@@ -0,0 +1,13 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @license MIT
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
+ */
+import type { ConverterAttributes } from '../types/converter.js';
+import type { Input } from '../types/input.js';
+import Converter from './converter.js';
+export default class DocumentThumbnailConverter extends Converter {
+    handle({ input, options }: ConverterAttributes): Promise<any>;
+    documentToImage(LibreOfficeFileConverter: any, input: Input): Promise<any>;
+}

package/build/src/converters/document_thumbnail_converter.js

@@ -0,0 +1,56 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @license MIT
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
+ */
+import Converter from './converter.js';
+import ImageConverter from './image_converter.js';
+import { use } from '../utils/helpers.js';
+export default class DocumentThumbnailConverter extends Converter {
+    async handle({ input, options }) {
+        const lib = await use('libreoffice-file-converter');
+        if (lib) {
+            const LibreOfficeFileConverter = lib.LibreOfficeFileConverter;
+            const outputBuffer = await this.documentToImage(LibreOfficeFileConverter, input);
+            if (options && outputBuffer) {
+                const converter = new ImageConverter();
+                return await converter.handle({
+                    input: outputBuffer,
+                    options
+                });
+            }
+            return outputBuffer;
+        }
+    }
+    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
+        });
+        if (Buffer.isBuffer(input)) {
+            const output = await libreOfficeFileConverter.convert({
+                buffer: input,
+                input: 'buffer',
+                output: 'buffer',
+                format: 'jpeg',
+            });
+            return output;
+        }
+        else {
+            const output = await libreOfficeFileConverter.convert({
+                inputPath: input,
+                input: 'file',
+                output: 'buffer',
+                format: 'jpeg',
+            });
+            return output;
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @license MIT
+ * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
+ */
+import type { ConverterAttributes } from '../types/converter.js';
+import type { Input } from '../types/input.js';
+import Converter from './converter.js';
+export default class PdfThumbnailConverter extends Converter {
+    handle({ input, options }: ConverterAttributes): Promise<any>;
+    pdfToImage(Poppler: any, input: Input): Promise<string>;
+}

package/build/src/converters/pdf_thumbnail_converter.js

@@ -0,0 +1,44 @@
+/**
+ * @jrmc/adonis-attachment
+ *
+ * @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';
+export default class PdfThumbnailConverter extends Converter {
+    async handle({ input, options }) {
+        const nodePoppler = await use('node-poppler');
+        if (nodePoppler) {
+            const Poppler = nodePoppler.Poppler;
+            const filePath = await this.pdfToImage(Poppler, input);
+            if (options && filePath) {
+                const converter = new ImageConverter();
+                return await converter.handle({
+                    input: filePath,
+                    options
+                });
+            }
+            return filePath;
+        }
+    }
+    async pdfToImage(Poppler, input) {
+        let binPath = null;
+        if (this.binPaths && this.binPaths.pdftocairoBasePath) {
+            binPath = this.binPaths.pdftocairoBasePath;
+        }
+        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';
+    }
+}

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

@@ -5,8 +5,8 @@
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
  */
 import type { ConverterAttributes } from '../types/converter.js';
+import type { Input } from '../types/input.js';
 import Converter from './converter.js';
-import { Input } from '../types/input.js';
 export default class VideoThumbnailConvert extends Converter {
     handle({ input, options }: ConverterAttributes): Promise<any>;
     videoToImage(ffmpeg: Function, input: Input): Promise<string | false>;

package/build/src/converters/video_thumbnail_converter.js

@@ -9,7 +9,7 @@ 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 { bufferToTempFile, use } from '../utils/helpers.js';
 export default class VideoThumbnailConvert extends Converter {
     async handle({ input, options }) {
         const ffmpeg = await use('fluent-ffmpeg');
@@ -28,10 +28,14 @@ export default class VideoThumbnailConvert extends Converter {
         }
     }
     async videoToImage(ffmpeg, input) {
+        let file = input;
+        if (Buffer.isBuffer(input)) {
+            file = await bufferToTempFile(input);
+        }
         return new Promise((resolve) => {
             const folder = os.tmpdir();
             const filename = `${cuid()}.png`;
-            const ff = ffmpeg(input);
+            const ff = ffmpeg(file);
             if (this.binPaths) {
                 if (this.binPaths.ffmpegPath) {
                     ff.setFfmpegPath(this.binPaths.ffmpegPath);

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

@@ -16,6 +16,8 @@ type ConverterConfig = {
 export type BinPaths = {
     ffmpegPath?: string;
     ffprobePath?: string;
+    pdftocairoBasePath?: string;
+    libreofficePaths?: Array<string>;
 };
 export type AttachmentConfig = {
     bin?: BinPaths;

package/build/src/utils/helpers.d.ts

@@ -18,3 +18,4 @@ export declare function createAttachmentAttributes(input: Input, name?: string):
 export declare function cleanObject(obj: any): any;
 export declare function clone(object: Object): any;
 export declare function use(module: string): Promise<any>;
+export declare function bufferToTempFile(input: Buffer): Promise<string>;

package/build/src/utils/helpers.js

@@ -4,6 +4,9 @@
  * @license MIT
  * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
  */
+import os from 'node:os';
+import path from 'node:path';
+import fs from 'fs/promises';
 import { cuid } from '@adonisjs/core/helpers';
 import string from '@adonisjs/core/helpers/string';
 import logger from '@adonisjs/core/services/logger';
@@ -61,9 +64,18 @@ export function clone(object) {
 export async function use(module) {
     try {
         const result = await import(module);
-        return result.default;
+        if (result.default) {
+            return result.default;
+        }
+        return result;
     }
     catch (error) {
         logger.error({ err: error }, `Dependence missing, please install ${module}`);
     }
 }
+export async function bufferToTempFile(input) {
+    const folder = os.tmpdir();
+    const tempFilePath = path.join(folder, `tempfile-${Date.now()}.tmp`);
+    await fs.writeFile(tempFilePath, input);
+    return tempFilePath;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jrmc/adonis-attachment",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "type": "module",
   "description": "Turn any field on your Lucid model to an attachment data type",
   "engines": {

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

@@ -1,7 +0,0 @@
-export {};
-/**
- * @jrmc/adonis-attachment
- *
- * @license MIT
- * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
- */

package/build/src/converters/document_converter.js

@@ -1,7 +0,0 @@
-export {};
-/**
- * @jrmc/adonis-attachment
- *
- * @license MIT
- * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
- */

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

@@ -1,7 +0,0 @@
-export {};
-/**
- * @jrmc/adonis-attachment
- *
- * @license MIT
- * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
- */

package/build/src/converters/pdf_converter.js

@@ -1,7 +0,0 @@
-export {};
-/**
- * @jrmc/adonis-attachment
- *
- * @license MIT
- * @copyright Jeremy Chaufourier <jeremy@chaufourier.fr>
- */