@opengis/fastify-table 1.4.37 → 1.4.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.37",
+  "version": "1.4.39",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/file/uploadMultiPart.js

@@ -45,17 +45,22 @@ async function writeFileToDisk(file, buffer) {
   return null;
 }
 
-export default async function uploadMultiPart(req, { subdir = 'uploads', originalFilename = false } = {}) {
+export default async function uploadMultiPart(req, { subdir, originalFilename = false } = {}) {
   const allowedExtensions = {
     '/file/upload-image/*': images,
   }[req.routeOptions?.url || ''] || all;
 
   const parts = req.parts();
-  const part = await parts.next();
+  // const part = await parts.next();
+  const { value: part, done } = await parts.next();
 
-  const value = part?.value?.fields?.file || part?.value;
+  if (done) {
+    return null;
+  }
+
+  const value = part?.fields?.file || part;
 
-  if (!value?.filename) {
+  if (!value?.file || !value?.filename) {
     throw new Error('upload error');
   }
 
@@ -66,13 +71,18 @@ export default async function uploadMultiPart(req, { subdir = 'uploads', origina
     throw new Error('file extension is not allowed');
   }
 
-  const buffer = await value.toBuffer();
+  const buffer = await new Promise((res, rej) => {
+    const chunks = [];
+    part.file.on('data', chunk => chunks.push(chunk));
+    part.file.on('end', () => res(Buffer.concat(chunks)));
+    part.file.on('error', rej);
+  });
 
   if (!buffer?.length) {
     throw new Error('file buffer is empty');
   }
 
-  const dir = req.params?.['*'] || subdir;
+  const dir = subdir != null ? subdir : (req.params?.['*'] || 'uploads');
   const yearMonthDay = subdir != null ? '' : (new Date()).toISOString().split('T')[0];
 
   const dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params

package/server/routes/file/controllers/upload.js

@@ -14,23 +14,26 @@ export default async function upload(req) {
   });
   if (hookData) return hookData;
 
-  const extName = path.extname(file.filepath).slice(1).toLowerCase();
-
-  const resultInsert = await dataInsert({
+  const resultInsert = pg ? await dataInsert({
     pg,
     table: 'crm.files',
     data: {
-      uploaded_name: file?.originalFilename?.toLocaleLowerCase(),
-      file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
-      ext: extName,
-      size: file?.size,
+      uploaded_name: file.originalFilename?.toLocaleLowerCase?.(),
+      file_path: file.relativeFilepath?.replace?.(/\\/g, '/'),
+      ext: file.extension,
+      size: file.size,
       file_status: 1,
       entity_id: objectId,
     },
     uid: req.user?.uid,
-  }).then(el => el?.rows?.[0] || {});
+  }).then(el => el?.rows?.[0] || {}) : {};
 
-  const { dir: relativeDirpath, base: fileName } = resultInsert?.file_path ? path.parse(resultInsert.file_path) : '';
+  const { dir: relativeDirpath, base: fileName } = resultInsert?.file_path
+  ? path.parse(resultInsert.file_path)
+  : {
+    relativeDirpath: path.dirname(file.relativeFilepath),
+    fileName: file.newFilename,
+   };
 
   // req.log.info('upload', { filepath: file?.filepath, uid: session.passport?.user?.uid });
   return {
@@ -38,13 +41,13 @@ export default async function upload(req) {
       res: 'ok',
       name: file?.originalFilename,
       result: {
-        file_id: resultInsert.file_id,
-        format: resultInsert.ext || extName,
-        size: resultInsert.size || file?.size,
-        entity_id: resultInsert.entity_id,
-        file_path: resultInsert.file_path || file?.relativeFilepath?.replace(/\\/g, '/'),
-        file_name: file?.originalFilename.toLocaleLowerCase(),
-        dir: relativeDirpath?.replace(/\\/g, '/'),
+        file_id: resultInsert?.file_id,
+        format: resultInsert?.ext || file.extension,
+        size: resultInsert?.size || file?.size,
+        entity_id: resultInsert?.entity_id,
+        file_path: resultInsert?.file_path || file?.relativeFilepath?.replace(/\\/g, '/'),
+        file_name: file?.originalFilename?.toLocaleLowerCase?.(),
+        dir: relativeDirpath?.replace?.(/\\/g, '/'),
         native_file_name: fileName,
       },
     },