@opengis/fastify-table 1.4.54 → 1.4.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.54",
+  "version": "1.4.56",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -59,4 +59,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

package/server/plugins/file/uploadMultiPart.js

@@ -46,7 +46,9 @@ async function writeFileToDisk(file, buffer) {
   return null;
 }
 
-export default async function uploadMultiPart(req, { subdir, originalFilename = false } = {}) {
+export default async function uploadMultiPart(req, {
+  extensions, raw, subdir, originalFilename = false,
+} = {}) {
   const allowedExtensions = {
     '/file/upload-image/*': images,
   }[req.routeOptions?.url || ''] || all;
@@ -67,22 +69,28 @@ export default async function uploadMultiPart(req, { subdir, originalFilename =
 
   const ext = path.extname(value.filename).toLowerCase();
 
+  if (Array.isArray(extensions) && !extensions.includes(ext)) {
+    throw new Error('file extension is not allowed');
+  }
+
   // check extension
   if (!allowedExtensions.includes(ext.substring(1))) {
     throw new Error('file extension is not allowed');
   }
 
-  const buffer = await new Promise((res, rej) => {
+  const fileBuffer = await new Promise((res, rej) => {
     const chunks = [];
     value.file.on('data', chunk => chunks.push(chunk));
     value.file.on('end', () => res(Buffer.concat(chunks)));
     value.file.on('error', rej);
   });
 
-  if (!buffer?.length) {
+  if (!fileBuffer?.length) {
     throw new Error('file buffer is empty');
   }
 
+  if (raw) return { buffer: fileBuffer, filename: value.filename, ext }; // return buffer for custom upload
+
   const dir = subdir != null ? subdir : (req.params?.['*'] || 'uploads');
   const yearMonthDay = subdir != null ? '' : (new Date()).toISOString().split('T')[0];
 
@@ -104,18 +112,18 @@ export default async function uploadMultiPart(req, { subdir, originalFilename =
     filepath: path.join(folder, newFilename).replace(/\\/g, '/'),
     filetype: getFileType(newFilename),
     relativeFilepath: path.join(reldirpath, newFilename).replace(/\\/g, '/'),
-    size: Buffer.byteLength(buffer),
+    size: Buffer.byteLength(fileBuffer),
     mimetype: value.mimetype,
     extension: ext.substring(1),
   };
 
   await mkdir(folder, { recursive: true });
-  await writeFileToDisk(file, buffer);
+  await writeFileToDisk(file, fileBuffer);
 
   // move file to s3
   if (config.s3?.endpoint) {
     const s3 = providers();
-    await s3.uploadFile(file.relativeFilepath, buffer);
+    await s3.uploadFile(file.relativeFilepath, fileBuffer);
     if (config.trace) console.log('upload to s3', file.relativeFilepath);
   }