node-server-engine 1.2.4 → 1.2.6

package/dist/middleware/fileUploader/fileUploader.js

@@ -5,292 +5,105 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fileUploader = fileUploader;
-exports.fileUploaderMiddleware = fileUploaderMiddleware;
-var _busboy = _interopRequireDefault(require("busboy"));
-var _compressAvatar = require("./compressAvatar");
-var _isMultiPart = require("./isMultiPart");
-var _validate = require("./validate");
-var _Storage = require("../../entities/Storage");
 var _WebError = require("../../entities/WebError");
 var _report = require("../../utils/report");
+var _multer = _interopRequireDefault(require("multer"));
+var _validate = require("./validate");
 const namespace = 'engine:middleware:fileUploader';
 
 /**
- * Generate a custom fileUploader middleware
+ * Middleware for handling file uploads.
+ * @param filesOptions Configuration options for expected files.
+ * @param validator Validation schema for request fields.
  */
-function fileUploader(options, validator) {
-  return (request, response, next) => fileUploaderMiddleware(request, response, next, options, validator);
-}
-
-/** Handle file upload and generic multi-part parsing */
-function fileUploaderMiddleware(request, response, next, filesOptions, validator) {
-  (0, _report.reportDebug)({
-    namespace,
-    message: 'Received request to upload file',
-    data: {
-      filesOptions,
-      validator
-    }
-  });
-  // Check that the request is a proper multipart request
-  if (!(0, _isMultiPart.isMultipart)(request)) throw new _WebError.WebError({
-    statusCode: 415,
-    errorCode: 'invalid-content-type',
-    message: 'Request is not of type multipart/form-data',
-    data: {
-      contentType: request.get('Content-Type')
-    }
-  });
-  // If no files to handle ignore
-  if (!filesOptions.length) next();
-  // Parse multipart data with Busboy
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const busboy = new _busboy.default({
-    headers: {
-      ...request.headers,
-      'content-type': request.headers['content-type'] ?? ''
-    }
-  });
-  let hasError = false;
-
-  /**
-   * Function called when an error happened in the process
-   * It immediately stops and drains all connection and deletes all files that have already been uploaded
-   */
-  function triggerError(error) {
-    pendingWrites--;
-    if (hasError) return;
-    hasError = true;
-    request.unpipe(busboy);
-    request.on('readable', request.read.bind(request));
-    busboy.removeAllListeners();
-    next(error);
-    if (request.files) {
-      Object.values(request.files).forEach(files => {
-        files.forEach(file => {
-          _Storage.Storage.delete(file.bucket, file.name).catch(error => {
-            (0, _report.reportError)(error);
-          });
-        });
-      });
-    }
-  }
-  let readFinished = false;
-  let fieldsValidated = false;
-  let pendingWrites = 0;
-
-  /** Function called when all the body has been parsed */
-  function done() {
-    if (readFinished && pendingWrites === 0 && fieldsValidated && !hasError) {
-      const uploadedFiles = Object.keys(request.files ?? {});
-      if (filesOptions.some(options => options.required && !uploadedFiles.includes(options.key))) {
-        triggerError(new _WebError.WebError({
-          statusCode: 400,
-          errorCode: 'missing-field',
-          message: 'Some required files have not been uploaded',
-          data: {
-            filesOptions,
-            validator,
-            uploadedFiles
-          }
-        }));
-        return;
-      }
-      next();
-    }
-  }
-
-  /*
-   * On cancel request, while processing
-   */
-  request.connection.on('close', function () {
-    if (!response.writableEnded) triggerError(new Error('Request cancelled'));
-  });
-
-  /**
-   * Once all the fields have been read they are checked against the validation schema
-   */
-  async function validateFields() {
-    try {
-      await (0, _validate.validate)(request, validator);
-    } catch (error) {
-      triggerError(error);
-    }
+function fileUploader(filesOptions, validator) {
+  return async (request, response, next) => {
     (0, _report.reportDebug)({
       namespace,
-      message: 'Validation processed',
+      message: 'Received request to upload file',
       data: {
-        hasError,
         filesOptions,
         validator
       }
     });
-    fieldsValidated = true;
-    done();
-  }
-  busboy.on('file', (field, file, fileName, encoding, mimeType) => {
-    (async () => {
-      (0, _report.reportDebug)({
-        namespace,
-        message: 'Found file in request',
-        data: {
-          hasError,
-          field,
-          fileName,
-          encoding,
-          mimeType,
-          pendingWrites
-        }
-      });
-      // Do not handle the stream if there has been an error previously
-      if (hasError) file.destroy();
-      pendingWrites++;
-      // Find related file options based on the field name
-      const options = filesOptions.find(fileOption => fileOption.key === field);
-      // Make sure that the field is in the config
-      if (!options) {
-        triggerError(new _WebError.WebError({
-          statusCode: 400,
-          errorCode: 'invalid-file-field',
-          message: 'Request contains a file at an invalid field',
-          hint: {
-            field
-          },
+
+    // Setup multer with memory storage
+    const storage = _multer.default.memoryStorage();
+    const upload = (0, _multer.default)({
+      storage,
+      limits: {
+        fileSize: 10 * 1024 * 1024
+      } // Limit file size to 10MB
+    }).any();
+    upload(request, response, async err => {
+      if (err) {
+        (0, _report.reportDebug)({
+          namespace,
+          message: 'Multer upload error',
           data: {
-            field
+            error: err.message
           }
-        }));
-        return;
+        });
+        return next(err);
       }
-      (0, _report.reportDebug)({
-        namespace,
-        message: 'Found options for file',
-        data: {
-          hasError,
-          field,
-          fileName,
-          encoding,
-          mimeType,
-          pendingWrites,
-          options
-        }
-      });
-      // If a specific MIME type is required check it
-      if (options.mimeTypes && !options.mimeTypes.includes(mimeType)) {
-        triggerError(new _WebError.WebError({
-          statusCode: 415,
-          errorCode: 'invalid-mime-type',
-          message: 'Request contains a file with an invalid MIME type',
-          hint: {
-            field
-          },
-          data: {
-            field,
-            mimeType,
-            expected: options.mimeTypes
-          }
-        }));
-        return;
+
+      // Ensure `request.files` is properly typed
+      let uploadedFiles = [];
+      if (Array.isArray(request.files)) {
+        uploadedFiles = request.files;
+      } else if (typeof request.files === 'object') {
+        uploadedFiles = Object.values(request.files).flat();
       }
-      // Generate the destination path of the file and upload
+
+      // Log uploaded files
       (0, _report.reportDebug)({
         namespace,
-        message: 'Starting file upload',
+        message: 'Files Received',
         data: {
-          hasError,
-          field,
-          fileName,
-          encoding,
-          mimeType,
-          pendingWrites,
-          options
+          uploadedFiles: uploadedFiles.map(file => file.originalname)
         }
       });
+
+      // Validate request body fields
       try {
-        const fileToUpload = options.image ? (0, _compressAvatar.compressAvatar)(file, options.image) : file;
-        const uploadedFile = await _Storage.Storage.upload(fileToUpload, options.bucket, {
-          directory: options.path,
-          mime: mimeType,
-          noExtension: options.noExtension
-        }, {
-          metadata: {
-            contentType: mimeType
+        await (0, _validate.validate)(request, validator);
+      } catch (error) {
+        (0, _report.reportDebug)({
+          namespace,
+          message: 'Validation failed',
+          data: {
+            error
           }
-        }, {
-          maxSize: options.maxSize
         });
+        return next(error);
+      }
+
+      // Extract uploaded field names
+      const uploadedFileKeys = uploadedFiles.map(file => file.fieldname);
+
+      // Check for missing required files
+      const missingFiles = filesOptions.filter(option => option.required && !uploadedFileKeys.includes(option.key));
+      if (missingFiles.length > 0) {
         (0, _report.reportDebug)({
           namespace,
-          message: 'File uploaded',
+          message: 'Missing required files',
           data: {
-            hasError,
-            field,
-            fileName,
-            encoding,
-            mimeType,
-            pendingWrites,
-            options,
-            uploadedFile
+            missingFiles,
+            uploadedFileKeys
           }
         });
-        if (hasError) {
-          // If some other failed before this one terminated
-          // Delete file
-          await _Storage.Storage.delete(uploadedFile.bucket, uploadedFile.name);
-        } else {
-          // Handle successful upload
-          // Add the file's data to the request
-          pendingWrites--;
-          if (!request.files) request.files = {};
-          if (!request.files[field]) request.files[field] = [];
-          request.files[field].push({
-            ...uploadedFile,
-            originalFileName: fileName
-          });
-          done();
-        }
-      } catch (error) {
-        triggerError(error);
+        return next(new _WebError.WebError({
+          statusCode: 400,
+          errorCode: 'missing-field',
+          message: 'Some required files have not been uploaded',
+          data: {
+            missingFiles,
+            uploadedFileKeys
+          }
+        }));
       }
-    })().catch(error => {
-      triggerError(error);
-    });
-  });
-
-  /**
-   * Handle non file fields
-   * These fields will be pushed to the body as array of strings
-   */
-  busboy.on('field', (fieldName, value) => {
-    if (!request.body) request.body = {};
-    if (request.body[fieldName]) {
-      request.body[fieldName].push(value);
-    } else {
-      request.body[fieldName] = [value];
-    }
-  });
-  busboy.on('error', function (error) {
-    triggerError(error);
-  });
-  busboy.on('finish', () => {
-    (async () => {
-      (0, _report.reportDebug)({
-        namespace,
-        message: 'Busboy finished reading',
-        data: {
-          hasError,
-          filesOptions,
-          validator,
-          pendingWrites
-        }
-      });
-      readFinished = true;
-      await validateFields();
-      done();
-    })().catch(error => {
-      triggerError(error);
+      next();
     });
-  });
-  return request.pipe(busboy);
+  };
 }
 //# sourceMappingURL=fileUploader.js.map

package/dist/middleware/fileUploader/fileUploader.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileUploader.js","names":["_busboy","_interopRequireDefault","require","_compressAvatar","_isMultiPart","_validate","_Storage","_WebError","_report","namespace","fileUploader","options","validator","request","response","next","fileUploaderMiddleware","filesOptions","reportDebug","message","data","isMultipart","WebError","statusCode","errorCode","contentType","get","length","busboy","Busboy","headers","hasError","triggerError","error","pendingWrites","unpipe","on","read","bind","removeAllListeners","files","Object","values","forEach","file","Storage","delete","bucket","name","catch","reportError","readFinished","fieldsValidated","done","uploadedFiles","keys","some","required","includes","key","connection","writableEnded","Error","validateFields","validate","field","fileName","encoding","mimeType","destroy","find","fileOption","hint","mimeTypes","expected","fileToUpload","image","compressAvatar","uploadedFile","upload","directory","path","mime","noExtension","metadata","maxSize","push","originalFileName","fieldName","value","body","pipe"],"sources":["../../../src/middleware/fileUploader/fileUploader.ts"],"sourcesContent":["import Busboy from 'busboy';\nimport { Request, Response, NextFunction } from 'express';\nimport { Schema } from 'express-validator';\nimport { compressAvatar } from './compressAvatar';\nimport { FileUploaderConfig } from './fileUploader.types';\nimport { isMultipart } from './isMultiPart';\nimport { validate } from './validate';\nimport { Storage } from 'entities/Storage';\nimport { WebError } from 'entities/WebError';\nimport { reportError, reportDebug } from 'utils/report';\nimport { Readable } from 'stream';\n\nconst namespace = 'engine:middleware:fileUploader';\n\n/**\n * Generate a custom fileUploader middleware\n */\nexport function fileUploader(\n  options: Array<FileUploaderConfig>,\n  validator: Schema\n) {\n  return (\n    request: Request,\n    response: Response,\n    next: NextFunction\n  ): Busboy.Busboy =>\n    fileUploaderMiddleware(request, response, next, options, validator);\n}\n\n/** Handle file upload and generic multi-part parsing */\nexport function fileUploaderMiddleware(\n  request: Request,\n  response: Response,\n  next: NextFunction,\n  filesOptions: Array<FileUploaderConfig>,\n  validator: Schema\n): Busboy.Busboy {\n  reportDebug({\n    namespace,\n    message: 'Received request to upload file',\n    data: { filesOptions, validator }\n  });\n  // Check that the request is a proper multipart request\n  if (!isMultipart(request))\n    throw new WebError({\n      statusCode: 415,\n      errorCode: 'invalid-content-type',\n      message: 'Request is not of type multipart/form-data',\n      data: { contentType: request.get('Content-Type') }\n    });\n  // If no files to handle ignore\n  if (!filesOptions.length) next();\n  // Parse multipart data with Busboy\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const busboy = new (Busboy as any)({\n    headers: {\n      ...request.headers,\n      'content-type': request.headers['content-type'] ?? ''\n    }\n  });\n\n  let hasError = false;\n\n  /**\n   * Function called when an error happened in the process\n   * It immediately stops and drains all connection and deletes all files that have already been uploaded\n   */\n  function triggerError(error: unknown): void {\n    pendingWrites--;\n    if (hasError) return;\n    hasError = true;\n    request.unpipe(busboy);\n    request.on('readable', request.read.bind(request));\n    busboy.removeAllListeners();\n    next(error);\n    if (request.files) {\n      Object.values(request.files).forEach((files) => {\n        files.forEach((file) => {\n          Storage.delete(file.bucket, file.name).catch((error) => {\n            reportError(error);\n          });\n        });\n      });\n    }\n  }\n\n  let readFinished = false;\n  let fieldsValidated = false;\n  let pendingWrites = 0;\n\n  /** Function called when all the body has been parsed */\n  function done(): void {\n    if (readFinished && pendingWrites === 0 && fieldsValidated && !hasError) {\n      const uploadedFiles = Object.keys(request.files ?? {});\n      if (\n        filesOptions.some(\n          (options) => options.required && !uploadedFiles.includes(options.key)\n        )\n      ) {\n        triggerError(\n          new WebError({\n            statusCode: 400,\n            errorCode: 'missing-field',\n            message: 'Some required files have not been uploaded',\n            data: { filesOptions, validator, uploadedFiles }\n          })\n        );\n        return;\n      }\n      next();\n    }\n  }\n\n  /*\n   * On cancel request, while processing\n   */\n  request.connection.on('close', function () {\n    if (!response.writableEnded) triggerError(new Error('Request cancelled'));\n  });\n\n  /**\n   * Once all the fields have been read they are checked against the validation schema\n   */\n  async function validateFields(): Promise<void> {\n    try {\n      await validate(request, validator);\n    } catch (error) {\n      triggerError(error);\n    }\n    reportDebug({\n      namespace,\n      message: 'Validation processed',\n      data: { hasError, filesOptions, validator }\n    });\n    fieldsValidated = true;\n    done();\n  }\n\n  busboy.on(\n    'file',\n    (\n      field: string,\n      file: Readable,\n      fileName: string,\n      encoding: unknown,\n      mimeType: string\n    ) => {\n      (async (): Promise<void> => {\n        reportDebug({\n          namespace,\n          message: 'Found file in request',\n          data: { hasError, field, fileName, encoding, mimeType, pendingWrites }\n        });\n        // Do not handle the stream if there has been an error previously\n        if (hasError) file.destroy();\n        pendingWrites++;\n        // Find related file options based on the field name\n        const options = filesOptions.find(\n          (fileOption) => fileOption.key === field\n        );\n        // Make sure that the field is in the config\n        if (!options) {\n          triggerError(\n            new WebError({\n              statusCode: 400,\n              errorCode: 'invalid-file-field',\n              message: 'Request contains a file at an invalid field',\n              hint: { field },\n              data: { field }\n            })\n          );\n          return;\n        }\n        reportDebug({\n          namespace,\n          message: 'Found options for file',\n          data: {\n            hasError,\n            field,\n            fileName,\n            encoding,\n            mimeType,\n            pendingWrites,\n            options\n          }\n        });\n        // If a specific MIME type is required check it\n        if (options.mimeTypes && !options.mimeTypes.includes(mimeType)) {\n          triggerError(\n            new WebError({\n              statusCode: 415,\n              errorCode: 'invalid-mime-type',\n              message: 'Request contains a file with an invalid MIME type',\n              hint: { field },\n              data: { field, mimeType, expected: options.mimeTypes }\n            })\n          );\n          return;\n        }\n        // Generate the destination path of the file and upload\n        reportDebug({\n          namespace,\n          message: 'Starting file upload',\n          data: {\n            hasError,\n            field,\n            fileName,\n            encoding,\n            mimeType,\n            pendingWrites,\n            options\n          }\n        });\n        try {\n          const fileToUpload = options.image\n            ? compressAvatar(file, options.image)\n            : file;\n\n          const uploadedFile = await Storage.upload(\n            fileToUpload,\n            options.bucket,\n            {\n              directory: options.path,\n              mime: mimeType,\n              noExtension: options.noExtension\n            },\n            {\n              metadata: { contentType: mimeType }\n            },\n            { maxSize: options.maxSize }\n          );\n\n          reportDebug({\n            namespace,\n            message: 'File uploaded',\n            data: {\n              hasError,\n              field,\n              fileName,\n              encoding,\n              mimeType,\n              pendingWrites,\n              options,\n              uploadedFile\n            }\n          });\n          if (hasError) {\n            // If some other failed before this one terminated\n            // Delete file\n            await Storage.delete(uploadedFile.bucket, uploadedFile.name);\n          } else {\n            // Handle successful upload\n            // Add the file's data to the request\n            pendingWrites--;\n            if (!request.files) request.files = {};\n            if (!request.files[field]) request.files[field] = [];\n            request.files[field].push({\n              ...uploadedFile,\n              originalFileName: fileName\n            });\n            done();\n          }\n        } catch (error) {\n          triggerError(error);\n        }\n      })().catch((error) => {\n        triggerError(error);\n      });\n    }\n  );\n\n  /**\n   * Handle non file fields\n   * These fields will be pushed to the body as array of strings\n   */\n  busboy.on('field', (fieldName: string, value: unknown) => {\n    if (!request.body) request.body = {};\n\n    if (request.body[fieldName]) {\n      request.body[fieldName].push(value);\n    } else {\n      request.body[fieldName] = [value];\n    }\n  });\n  busboy.on('error', function (error: unknown) {\n    triggerError(error);\n  });\n  busboy.on('finish', () => {\n    (async (): Promise<void> => {\n      reportDebug({\n        namespace,\n        message: 'Busboy finished reading',\n        data: { hasError, filesOptions, validator, pendingWrites }\n      });\n      readFinished = true;\n      await validateFields();\n      done();\n    })().catch((error) => {\n      triggerError(error);\n    });\n  });\n  return request.pipe(busboy);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"fileUploader.js","names":["_WebError","require","_report","_multer","_interopRequireDefault","_validate","namespace","fileUploader","filesOptions","validator","request","response","next","reportDebug","message","data","storage","multer","memoryStorage","upload","limits","fileSize","any","err","error","uploadedFiles","Array","isArray","files","Object","values","flat","map","file","originalname","validate","uploadedFileKeys","fieldname","missingFiles","filter","option","required","includes","key","length","WebError","statusCode","errorCode"],"sources":["../../../src/middleware/fileUploader/fileUploader.ts"],"sourcesContent":["import { Request, Response, NextFunction } from 'express';\nimport { Schema } from 'express-validator';\nimport { WebError } from 'entities/WebError';\nimport { reportDebug } from 'utils/report';\nimport multer from 'multer';\nimport { FileUploaderConfig } from './fileUploader.types';\nimport { validate } from './validate';\n\nconst namespace = 'engine:middleware:fileUploader';\n\n/**\n * Middleware for handling file uploads.\n * @param filesOptions Configuration options for expected files.\n * @param validator Validation schema for request fields.\n */\nexport function fileUploader(\n  filesOptions: Array<FileUploaderConfig>,\n  validator: Schema\n) {\n  return async (\n    request: Request,\n    response: Response,\n    next: NextFunction\n  ): Promise<void> => {\n    reportDebug({\n      namespace,\n      message: 'Received request to upload file',\n      data: { filesOptions, validator }\n    });\n\n    // Setup multer with memory storage\n    const storage = multer.memoryStorage();\n    const upload = multer({\n      storage,\n      limits: { fileSize: 10 * 1024 * 1024 } // Limit file size to 10MB\n    }).any();\n\n    upload(request, response, async (err) => {\n      if (err) {\n        reportDebug({\n          namespace,\n          message: 'Multer upload error',\n          data: { error: err.message }\n        });\n        return next(err);\n      }\n\n      // Ensure `request.files` is properly typed\n      let uploadedFiles: Express.Multer.File[] = [];\n      if (Array.isArray(request.files)) {\n        uploadedFiles = request.files;\n      } else if (typeof request.files === 'object') {\n        uploadedFiles = Object.values(request.files).flat();\n      }\n\n      // Log uploaded files\n      reportDebug({\n        namespace,\n        message: 'Files Received',\n        data: { uploadedFiles: uploadedFiles.map((file) => file.originalname) }\n      });\n\n      // Validate request body fields\n      try {\n        await validate(request, validator);\n      } catch (error) {\n        reportDebug({\n          namespace,\n          message: 'Validation failed',\n          data: { error }\n        });\n        return next(error);\n      }\n\n      // Extract uploaded field names\n      const uploadedFileKeys = uploadedFiles.map((file) => file.fieldname);\n\n      // Check for missing required files\n      const missingFiles = filesOptions.filter(\n        (option) => option.required && !uploadedFileKeys.includes(option.key)\n      );\n\n      if (missingFiles.length > 0) {\n        reportDebug({\n          namespace,\n          message: 'Missing required files',\n          data: { missingFiles, uploadedFileKeys }\n        });\n\n        return next(\n          new WebError({\n            statusCode: 400,\n            errorCode: 'missing-field',\n            message: 'Some required files have not been uploaded',\n            data: { missingFiles, uploadedFileKeys }\n          })\n        );\n      }\n\n      next();\n    });\n  };\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/middleware/fileUploader/fileUploader.types.d.ts

@@ -1,49 +1,30 @@
-import { CompressionOptions } from './compressAvatar';
-import { StorageUploadedFile } from '../../entities/Storage';
 declare global {
     namespace Express {
-        /** Express request object */
         interface Request {
-            /** Configuration for files that are uploaded with the request */
+            /** Uploaded files mapped by field name */
             files?: {
-                [key: string]: Array<UploadedFile>;
-            };
+                [key: string]: Express.Multer.File[];
+            } | Express.Multer.File[] | undefined;
         }
     }
 }
 /** Custom uploaded file metadata */
-export interface UploadedFile extends StorageUploadedFile {
-    /** File name that was given to the file by the client */
+export interface UploadedFile extends Express.Multer.File {
+    /** Original file name (use `originalname` from `Express.Multer.File`) */
     originalFileName: string;
+    /** File data buffer (use `buffer` from `Express.Multer.File`) */
+    file: Buffer;
 }
-/** Outputs setting for the file upload. Defines where a file should be stored and how it should be processed. */
-interface FileUploaderOutputs {
-    /** Name of the output */
-    name: string;
-    /** Path to which this specific output is stored (defaults to default path if not set) */
-    path?: string;
-    /** Bucket to which this specific output is stored (defaults to default bucket if not set) */
-    bucket?: string;
-}
-/** Configuration for a file upload */
+/** Configuration for file upload */
 export interface FileUploaderConfig {
-    /** Field key for which this configuration applies */
+    /** Field name expected in the request */
     key: string;
-    /** A list of supported MIME Types for the file */
+    /** Allowed MIME types */
     mimeTypes?: Array<string>;
-    /** Base path where the file should be stored (default used when no output config is set, will be used as temporary storage when outputs are set) */
-    path?: string;
-    /** Bucket in which the file should be stored (will be used as temporary storage when outputs are set) */
-    bucket: string;
-    /** Maximum size of the file (ex: 2MB) */
+    /** Maximum file size (e.g., "2MB") */
     maxSize?: string;
-    /** Indicates that the file must be present */
+    /** Whether the file is required */
     required?: boolean;
-    /** Do not store with an extension (will simply be a uuid) */
+    /** Whether to store without an extension */
     noExtension?: boolean;
-    /** Specify multiple outputs with processing */
-    outputs?: Array<FileUploaderOutputs>;
-    /** @deprecated compression of images */
-    image?: CompressionOptions;
 }
-export {};

package/dist/middleware/fileUploader/fileUploader.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileUploader.types.js","names":[],"sources":["../../../src/middleware/fileUploader/fileUploader.types.ts"],"sourcesContent":["import { CompressionOptions } from './compressAvatar';\nimport { StorageUploadedFile } from 'entities/Storage';\n\n// Override the Express request object to add the files\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/no-namespace\n  namespace Express {\n    /** Express request object */\n    interface Request {\n      /** Configuration for files that are uploaded with the request */\n      files?: { [key: string]: Array<UploadedFile> };\n    }\n  }\n}\n\n/** Custom uploaded file metadata */\nexport interface UploadedFile extends StorageUploadedFile {\n  /** File name that was given to the file by the client */\n  originalFileName: string;\n}\n\n/** Outputs setting for the file upload. Defines where a file should be stored and how it should be processed. */\ninterface FileUploaderOutputs {\n  /** Name of the output */\n  name: string;\n  /** Path to which this specific output is stored (defaults to default path if not set) */\n  path?: string;\n  /** Bucket to which this specific output is stored (defaults to default bucket if not set) */\n  bucket?: string;\n}\n\n/** Configuration for a file upload */\nexport interface FileUploaderConfig {\n  /** Field key for which this configuration applies */\n  key: string;\n  /** A list of supported MIME Types for the file */\n  mimeTypes?: Array<string>;\n  /** Base path where the file should be stored (default used when no output config is set, will be used as temporary storage when outputs are set) */\n  path?: string;\n  /** Bucket in which the file should be stored (will be used as temporary storage when outputs are set) */\n  bucket: string;\n  /** Maximum size of the file (ex: 2MB) */\n  maxSize?: string;\n  /** Indicates that the file must be present */\n  required?: boolean;\n  /** Do not store with an extension (will simply be a uuid) */\n  noExtension?: boolean;\n  /** Specify multiple outputs with processing */\n  outputs?: Array<FileUploaderOutputs>;\n  /** @deprecated compression of images */\n  image?: CompressionOptions;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"fileUploader.types.js","names":[],"sources":["../../../src/middleware/fileUploader/fileUploader.types.ts"],"sourcesContent":["// Extend Express request object to include `files`\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/no-namespace\n  namespace Express {\n    interface Request {\n      /** Uploaded files mapped by field name */\n      files?:\n        | { [key: string]: Express.Multer.File[] }\n        | Express.Multer.File[]\n        | undefined;\n    }\n  }\n}\n\n/** Custom uploaded file metadata */\nexport interface UploadedFile extends Express.Multer.File {\n  /** Original file name (use `originalname` from `Express.Multer.File`) */\n  originalFileName: string;\n  /** File data buffer (use `buffer` from `Express.Multer.File`) */\n  file: Buffer;\n}\n\n/** Configuration for file upload */\nexport interface FileUploaderConfig {\n  /** Field name expected in the request */\n  key: string;\n  /** Allowed MIME types */\n  mimeTypes?: Array<string>;\n  /** Maximum file size (e.g., \"2MB\") */\n  maxSize?: string;\n  /** Whether the file is required */\n  required?: boolean;\n  /** Whether to store without an extension */\n  noExtension?: boolean;\n}\n"],"mappings":"","ignoreList":[]}

package/dist/middleware/geminiFileUploader/geminiFileUploader.js

@@ -6,66 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.geminiFileUploader = geminiFileUploader;
 var _multer = _interopRequireDefault(require("multer"));
-var _server = require("@google/generative-ai/server");
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-var _tmp = _interopRequireDefault(require("tmp"));
-var _report = require("../../utils/report");
+var _utils = require("../../utils");
 var _checkEnvironment = require("../../utils/checkEnvironment");
 var _envAssert = require("../../utils/envAssert");
 const namespace = 'engine:middleware:geminiFileUploader';
-const apiKey = process.env.GOOGLE_AI_KEY ?? '';
-const fileManager = new _server.GoogleAIFileManager(apiKey);
 const storage = _multer.default.memoryStorage();
-async function uploadToGemini(buffer, mimeType, originalName) {
-  // Add 'name' to the return type
-  const tempFile = _tmp.default.fileSync({
-    postfix: _path.default.extname(originalName)
-  });
-  _fs.default.writeFileSync(tempFile.name, buffer);
-  const uploadResult = await fileManager.uploadFile(tempFile.name, {
-    mimeType,
-    displayName: originalName
-  });
-  tempFile.removeCallback();
-  const file = uploadResult.file;
-  (0, _report.reportDebug)({
-    namespace,
-    message: 'Uploaded file',
-    data: {
-      displayName: file.displayName,
-      name: file.name
-    }
-  });
-  return {
-    name: file.name,
-    uri: file.uri,
-    mimeType: file.mimeType
-  }; // Include 'name' in the return object
-}
-async function waitForFilesActive(files) {
-  (0, _report.reportDebug)({
-    namespace,
-    message: 'Waiting for file processing...'
-  });
-  for (const {
-    name
-  } of files) {
-    let file = await fileManager.getFile(name);
-    while (file.state === 'PROCESSING') {
-      process.stdout.write('.');
-      await new Promise(resolve => setTimeout(resolve, 10_000));
-      file = await fileManager.getFile(name);
-    }
-    if (file.state !== 'ACTIVE') {
-      (0, _report.reportError)(`File ${file.name} failed to process`);
-    }
-  }
-  (0, _report.reportDebug)({
-    namespace,
-    message: 'all files ready...\n'
-  });
-}
 async function geminiFileUploader(req, res, next) {
   try {
     (0, _checkEnvironment.checkEnvironment)({
@@ -77,31 +22,38 @@ async function geminiFileUploader(req, res, next) {
     }).single('file');
     uploadSingle(req, res, async err => {
       if (err) {
-        (0, _report.reportError)(`Error uploading file`);
+        (0, _utils.reportError)(`Error uploading file`);
         next(err);
         return;
       }
       const file = req.file;
       if (!file) {
-        (0, _report.reportError)(`No file uploaded`);
+        (0, _utils.reportError)(`No file uploaded`);
         next(`No file uploaded`);
         return;
       }
       const mimeType = file.mimetype;
-      const uploadedFile = await uploadToGemini(file.buffer, mimeType, file.originalname);
-      await waitForFilesActive([uploadedFile]);
-
-      // Set the fileUri and mimeType in the request object for the next middleware/route handler
-      req.body.file = {
-        fileUri: uploadedFile.uri,
-        mimeType: uploadedFile.mimeType,
-        originalname: file.originalname
-      };
-      next(); // Proceed to the next middleware or route handler
+      (0, _utils.reportDebug)({
+        namespace,
+        message: 'Upload to Gemini AI',
+        data: {
+          hasBuffer: !!file.buffer,
+          mimeType,
+          originalFileName: file.originalname
+        }
+      });
+      const fileResponse = await (0, _utils.geminiFileUpload)(file.buffer, mimeType, file.originalname);
+      (0, _utils.reportDebug)({
+        namespace,
+        message: 'File Uploaded to Gemini AI',
+        data: fileResponse
+      });
+      req.body.file = fileResponse;
+      next();
     });
   } catch (error) {
     console.error(error);
-    (0, _report.reportError)(`Failed to upload or process file`);
+    (0, _utils.reportError)(`Failed to upload or process file`);
     next(error);
   }
 }

package/dist/middleware/geminiFileUploader/geminiFileUploader.js.map

@@ -1 +1 @@
-{"version":3,"file":"geminiFileUploader.js","names":["_multer","_interopRequireDefault","require","_server","_fs","_path","_tmp","_report","_checkEnvironment","_envAssert","namespace","apiKey","process","env","GOOGLE_AI_KEY","fileManager","GoogleAIFileManager","storage","multer","memoryStorage","uploadToGemini","buffer","mimeType","originalName","tempFile","tmp","fileSync","postfix","path","extname","fs","writeFileSync","name","uploadResult","uploadFile","displayName","removeCallback","file","reportDebug","message","data","uri","waitForFilesActive","files","getFile","state","stdout","write","Promise","resolve","setTimeout","reportError","geminiFileUploader","req","res","next","checkEnvironment","envAssert","isString","uploadSingle","single","err","mimetype","uploadedFile","originalname","body","fileUri","error","console"],"sources":["../../../src/middleware/geminiFileUploader/geminiFileUploader.ts"],"sourcesContent":["import express from 'express';\nimport multer from 'multer';\nimport { GoogleAIFileManager } from '@google/generative-ai/server';\nimport fs from 'fs';\nimport path from 'path';\nimport tmp from 'tmp';\nimport { reportError, reportDebug } from 'utils/report';\nimport { checkEnvironment } from 'utils/checkEnvironment';\nimport { envAssert } from 'utils/envAssert';\n\nconst namespace = 'engine:middleware:geminiFileUploader';\n\nconst apiKey = process.env.GOOGLE_AI_KEY ?? '';\nconst fileManager = new GoogleAIFileManager(apiKey);\n\nconst storage = multer.memoryStorage();\n\nasync function uploadToGemini(\n  buffer: Buffer,\n  mimeType: string,\n  originalName: string\n): Promise<{ name: string; uri: string; mimeType: string }> {\n  // Add 'name' to the return type\n  const tempFile = tmp.fileSync({ postfix: path.extname(originalName) });\n\n  fs.writeFileSync(tempFile.name, buffer);\n\n  const uploadResult = await fileManager.uploadFile(tempFile.name, {\n    mimeType,\n    displayName: originalName\n  });\n\n  tempFile.removeCallback();\n\n  const file = uploadResult.file;\n  reportDebug({\n    namespace,\n    message: 'Uploaded file',\n    data: { displayName: file.displayName, name: file.name }\n  });\n  return { name: file.name, uri: file.uri, mimeType: file.mimeType }; // Include 'name' in the return object\n}\n\nasync function waitForFilesActive(\n  files: { name: string; uri: string; mimeType: string }[]\n): Promise<void> {\n  reportDebug({\n    namespace,\n    message: 'Waiting for file processing...'\n  });\n  for (const { name } of files) {\n    let file = await fileManager.getFile(name);\n    while (file.state === 'PROCESSING') {\n      process.stdout.write('.');\n      await new Promise((resolve) => setTimeout(resolve, 10_000));\n      file = await fileManager.getFile(name);\n    }\n    if (file.state !== 'ACTIVE') {\n      reportError(`File ${file.name} failed to process`);\n    }\n  }\n  reportDebug({\n    namespace,\n    message: 'all files ready...\\n'\n  });\n}\n\nexport async function geminiFileUploader(\n  req: express.Request,\n  res: express.Response,\n  next: express.NextFunction\n): Promise<void> {\n  try {\n    checkEnvironment({\n      GOOGLE_AI_KEY: envAssert.isString()\n    });\n    // Use multer.single() inside the middleware\n    const uploadSingle = multer({ storage }).single('file');\n\n    uploadSingle(req, res, async (err) => {\n      if (err) {\n        reportError(`Error uploading file`);\n        next(err);\n        return;\n      }\n\n      const file = req.file;\n      if (!file) {\n        reportError(`No file uploaded`);\n        next(`No file uploaded`);\n        return;\n      }\n      const mimeType = file.mimetype;\n\n      const uploadedFile = await uploadToGemini(\n        file.buffer,\n        mimeType,\n        file.originalname\n      );\n\n      await waitForFilesActive([uploadedFile]);\n\n      // Set the fileUri and mimeType in the request object for the next middleware/route handler\n      req.body.file = {\n        fileUri: uploadedFile.uri,\n        mimeType: uploadedFile.mimeType,\n        originalname: file.originalname\n      };\n\n      next(); // Proceed to the next middleware or route handler\n    });\n  } catch (error) {\n    console.error(error);\n    reportError(`Failed to upload or process file`);\n    next(error);\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"geminiFileUploader.js","names":["_multer","_interopRequireDefault","require","_utils","_checkEnvironment","_envAssert","namespace","storage","multer","memoryStorage","geminiFileUploader","req","res","next","checkEnvironment","GOOGLE_AI_KEY","envAssert","isString","uploadSingle","single","err","reportError","file","mimeType","mimetype","reportDebug","message","data","hasBuffer","buffer","originalFileName","originalname","fileResponse","geminiFileUpload","body","error","console"],"sources":["../../../src/middleware/geminiFileUploader/geminiFileUploader.ts"],"sourcesContent":["import express from 'express';\nimport multer from 'multer';\nimport { reportError, geminiFileUpload, reportDebug } from 'utils';\nimport { checkEnvironment } from 'utils/checkEnvironment';\nimport { envAssert } from 'utils/envAssert';\n\nconst namespace = 'engine:middleware:geminiFileUploader';\nconst storage = multer.memoryStorage();\n\nexport async function geminiFileUploader(\n  req: express.Request,\n  res: express.Response,\n  next: express.NextFunction\n): Promise<void> {\n  try {\n    checkEnvironment({\n      GOOGLE_AI_KEY: envAssert.isString()\n    });\n    // Use multer.single() inside the middleware\n    const uploadSingle = multer({ storage }).single('file');\n\n    uploadSingle(req, res, async (err) => {\n      if (err) {\n        reportError(`Error uploading file`);\n        next(err);\n        return;\n      }\n\n      const file = req.file;\n      if (!file) {\n        reportError(`No file uploaded`);\n        next(`No file uploaded`);\n        return;\n      }\n      const mimeType = file.mimetype;\n\n      reportDebug({\n        namespace,\n        message: 'Upload to Gemini AI',\n        data: {\n          hasBuffer: !!file.buffer,\n          mimeType,\n          originalFileName: file.originalname\n        }\n      });\n\n      const fileResponse = await geminiFileUpload(\n        file.buffer,\n        mimeType,\n        file.originalname\n      );\n\n      reportDebug({\n        namespace,\n        message: 'File Uploaded to Gemini AI',\n        data: fileResponse\n      });\n\n      req.body.file = fileResponse;\n\n      next();\n    });\n  } catch (error) {\n    console.error(error);\n    reportError(`Failed to upload or process file`);\n    next(error);\n  }\n}\n"],"mappings":";;;;;;;AACA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAEA,MAAMI,SAAS,GAAG,sCAAsC;AACxD,MAAMC,OAAO,GAAGC,eAAM,CAACC,aAAa,CAAC,CAAC;AAE/B,eAAeC,kBAAkBA,CACtCC,GAAoB,EACpBC,GAAqB,EACrBC,IAA0B,EACX;EACf,IAAI;IACF,IAAAC,kCAAgB,EAAC;MACfC,aAAa,EAAEC,oBAAS,CAACC,QAAQ,CAAC;IACpC,CAAC,CAAC;IACF;IACA,MAAMC,YAAY,GAAG,IAAAV,eAAM,EAAC;MAAED;IAAQ,CAAC,CAAC,CAACY,MAAM,CAAC,MAAM,CAAC;IAEvDD,YAAY,CAACP,GAAG,EAAEC,GAAG,EAAE,MAAOQ,GAAG,IAAK;MACpC,IAAIA,GAAG,EAAE;QACP,IAAAC,kBAAW,EAAC,sBAAsB,CAAC;QACnCR,IAAI,CAACO,GAAG,CAAC;QACT;MACF;MAEA,MAAME,IAAI,GAAGX,GAAG,CAACW,IAAI;MACrB,IAAI,CAACA,IAAI,EAAE;QACT,IAAAD,kBAAW,EAAC,kBAAkB,CAAC;QAC/BR,IAAI,CAAC,kBAAkB,CAAC;QACxB;MACF;MACA,MAAMU,QAAQ,GAAGD,IAAI,CAACE,QAAQ;MAE9B,IAAAC,kBAAW,EAAC;QACVnB,SAAS;QACToB,OAAO,EAAE,qBAAqB;QAC9BC,IAAI,EAAE;UACJC,SAAS,EAAE,CAAC,CAACN,IAAI,CAACO,MAAM;UACxBN,QAAQ;UACRO,gBAAgB,EAAER,IAAI,CAACS;QACzB;MACF,CAAC,CAAC;MAEF,MAAMC,YAAY,GAAG,MAAM,IAAAC,uBAAgB,EACzCX,IAAI,CAACO,MAAM,EACXN,QAAQ,EACRD,IAAI,CAACS,YACP,CAAC;MAED,IAAAN,kBAAW,EAAC;QACVnB,SAAS;QACToB,OAAO,EAAE,4BAA4B;QACrCC,IAAI,EAAEK;MACR,CAAC,CAAC;MAEFrB,GAAG,CAACuB,IAAI,CAACZ,IAAI,GAAGU,YAAY;MAE5BnB,IAAI,CAAC,CAAC;IACR,CAAC,CAAC;EACJ,CAAC,CAAC,OAAOsB,KAAK,EAAE;IACdC,OAAO,CAACD,KAAK,CAACA,KAAK,CAAC;IACpB,IAAAd,kBAAW,EAAC,kCAAkC,CAAC;IAC/CR,IAAI,CAACsB,KAAK,CAAC;EACb;AACF","ignoreList":[]}

package/dist/middleware/index.d.ts

@@ -14,3 +14,4 @@ export * from './requestMetrics';
 export * from './version';
 export * from './geminiFileUploader';
 export * from './checkPermission';
+export * from './multiPartFileUploader';