feat(thumbnail): enhance thumbnail upload process with file type handling

Author: larryrider

src/commands/upload-file.ts

@@ -137,6 +137,7 @@ export default class UploadFile extends Command {
         if (thumbnailBuffer) {
           await ThumbnailService.instance.uploadThumbnail(
             thumbnailBuffer,
+            fileType,
             user.bucket,
             user.mnemonic,
             createdDriveFile.id,

src/services/thumbnail.service.ts

@@ -3,44 +3,61 @@ import { DriveFileService } from './drive/drive-file.service';
 import { StorageTypes } from '@internxt/sdk/dist/drive';
 import { NetworkFacade } from './network/network-facade.service';
 import { UploadService } from './network/upload.service';
+import { isImageThumbnailable, ThumbnailConfig } from '../utils/thumbnail.utils';
+import sharp from 'sharp';
 
 export class ThumbnailService {
   public static readonly instance: ThumbnailService = new ThumbnailService();
 
-  public static readonly MaxWidth = 300;
-  public static readonly MaxHeight = 300;
-  public static readonly Quality = 80;
-  public static readonly Type = 'png';
-
   public uploadThumbnail = async (
     fileContent: Buffer,
+    fileType: string,
     userBucket: string,
     userMnemonic: string,
     file_id: number,
     networkFacade: NetworkFacade,
-  ): Promise<StorageTypes.Thumbnail> => {
-    const size = fileContent.length;
-    const [thumbnailPromise] = await UploadService.instance.uploadFileStream(
-      Readable.from(fileContent),
-      userBucket,
-      userMnemonic,
-      size,
-      networkFacade,
-      () => {},
-    );
+  ): Promise<StorageTypes.Thumbnail | undefined> => {
+    let thumbnailBuffer: Buffer | undefined;
+    if (isImageThumbnailable(fileType)) {
+      thumbnailBuffer = await this.getThumbnailFromImageBuffer(fileContent);
+    }
+    if (thumbnailBuffer) {
+      const size = thumbnailBuffer.length;
+      const [thumbnailPromise] = await UploadService.instance.uploadFileStream(
+        Readable.from(thumbnailBuffer),
+        userBucket,
+        userMnemonic,
+        size,
+        networkFacade,
+        () => {},
+      );
+
+      const thumbnailUploadResult = await thumbnailPromise;
 
-    const thumbnailUploadResult = await thumbnailPromise;
+      const createdThumbnailFile = await DriveFileService.instance.createThumbnail({
+        file_id: file_id,
+        max_width: ThumbnailConfig.MaxWidth,
+        max_height: ThumbnailConfig.MaxHeight,
+        type: ThumbnailConfig.Type,
+        size: size,
+        bucket_id: userBucket,
+        bucket_file: thumbnailUploadResult.fileId,
+        encrypt_version: StorageTypes.EncryptionVersion.Aes03,
+      });
+      return createdThumbnailFile;
+    }
+  };
 
-    const createdThumbnailFile = await DriveFileService.instance.createThumbnail({
-      file_id: file_id,
-      max_width: ThumbnailService.MaxWidth,
-      max_height: ThumbnailService.MaxHeight,
-      type: ThumbnailService.Type,
-      size: size,
-      bucket_id: userBucket,
-      bucket_file: thumbnailUploadResult.fileId,
-      encrypt_version: StorageTypes.EncryptionVersion.Aes03,
-    });
-    return createdThumbnailFile;
+  private getThumbnailFromImageBuffer = (buffer: Buffer): Promise<Buffer> => {
+    return sharp(buffer)
+      .resize({
+        height: ThumbnailConfig.MaxHeight,
+        width: ThumbnailConfig.MaxWidth,
+        fit: 'inside',
+      })
+      .png({
+        quality: ThumbnailConfig.Quality,
+      })
+      .toBuffer();
   };
 }

src/utils/thumbnail.utils.ts

@@ -1,25 +1,10 @@
-import sharp from 'sharp';
-
 export const ThumbnailConfig = {
   MaxWidth: 300,
   MaxHeight: 300,
   Quality: 100,
   Type: 'png',
 } as const;
 
-export const getThumbnailFromImageBuffer = (buffer: Buffer): Promise<Buffer> => {
-  return sharp(buffer)
-    .resize({
-      height: ThumbnailConfig.MaxHeight,
-      width: ThumbnailConfig.MaxWidth,
-      fit: 'inside',
-    })
-    .png({
-      quality: ThumbnailConfig.Quality,
-    })
-    .toBuffer();
-};
-
 type FileExtensionMap = Record<string, string[]>;
 const imageExtensions: FileExtensionMap = {
   tiff: ['tif', 'tiff'],
@@ -32,19 +17,27 @@ const imageExtensions: FileExtensionMap = {
   raw: ['raw', 'cr2', 'nef', 'orf', 'sr2'],
   webp: ['webp'],
 };
+const pdfExtensions: FileExtensionMap = {
+  pdf: ['pdf'],
+};
 const thumbnailableImageExtension: string[] = [
   ...imageExtensions['jpg'],
   ...imageExtensions['png'],
   ...imageExtensions['webp'],
   ...imageExtensions['gif'],
   ...imageExtensions['tiff'],
 ];
-const pdfExtensions: FileExtensionMap = {
-  pdf: ['pdf'],
-};
 const thumbnailablePdfExtension: string[] = pdfExtensions['pdf'];
 const thumbnailableExtension: string[] = [...thumbnailableImageExtension];
 
 export const isFileThumbnailable = (fileType: string) => {
   return fileType.trim().length > 0 && thumbnailableExtension.includes(fileType);
 };
+
+export const isPDFThumbnailable = (fileType: string) => {
+  return fileType.trim().length > 0 && thumbnailablePdfExtension.includes(fileType);
+};
+
+export const isImageThumbnailable = (fileType: string) => {
+  return fileType.trim().length > 0 && thumbnailableImageExtension.includes(fileType);
+};

src/webdav/handlers/PUT.handler.ts

@@ -130,6 +130,7 @@ export class PUTRequestHandler implements WebDavMethodHandler {
         if (thumbnailBuffer) {
           await ThumbnailService.instance.uploadThumbnail(
             thumbnailBuffer,
+            fileType,
             user.bucket,
             user.mnemonic,
             file.id,