@opengis/fastify-table 1.4.34 → 1.4.36

package/package.json

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

package/server/plugins/file/uploadMultiPart.js

@@ -3,6 +3,7 @@ import { mkdir, writeFile } from 'node:fs/promises';
 import { randomUUID } from 'node:crypto';
 import { imageSize } from 'image-size';
 
+import { existsSync } from 'node:fs';
 import config from '../../../config.js';
 
 import providers from './providers/index.js';
@@ -10,6 +11,7 @@ import providers from './providers/index.js';
 import { all, images } from './utils/allowedExtensions.js';
 
 import grpc from '../grpc/grpc.js';
+import getFileType from './utils/getFileType.js';
 
 const { resizeImage } = grpc();
 
@@ -43,7 +45,7 @@ async function writeFileToDisk(file, buffer) {
   return null;
 }
 
-export default async function uploadMultiPart(req) {
+export default async function uploadMultiPart(req, { subdir = 'uploads', originalFilename = false } = {}) {
   const allowedExtensions = {
     '/file/upload-image/*': images,
   }[req.routeOptions?.url || ''] || all;
@@ -70,8 +72,8 @@ export default async function uploadMultiPart(req) {
     throw new Error('file buffer is empty');
   }
 
-  const dir = req.params?.['*'] || 'uploads';
-  const yearMonthDay = (new Date()).toISOString().split('T')[0];
+  const dir = req.params?.['*'] || subdir;
+  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
 
@@ -79,11 +81,17 @@ export default async function uploadMultiPart(req) {
   const reldirpath = path.join('/files', dir, yearMonthDay);
   const folder = path.join(rootDir, config.folder || '', reldirpath);
 
-  const newFilename = `${randomUUID()}${ext}`;
+  const newFilename = originalFilename ? value.filename : `${randomUUID()}${ext}`;
+
+  if (existsSync(path.join(folder, newFilename).replace(/\\/g, '/'))) {
+    throw new Error('file with specified name already exists in directory');
+  }
 
   const file = {
     originalFilename: value.filename,
+    newFilename,
     filepath: path.join(folder, newFilename).replace(/\\/g, '/'),
+    filetype: getFileType(newFilename),
     relativeFilepath: path.join(reldirpath, newFilename).replace(/\\/g, '/'),
     size: Buffer.byteLength(buffer),
     mimetype: value.mimetype,

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

@@ -15,7 +15,7 @@ import getTemplate from '../../../plugins/table/funcs/getTemplate.js';
 import getMeta from '../../../plugins/pg/funcs/getMeta.js';
 import pgClients from '../../../plugins/pg/pgClients.js';
 import eventStream from '../../../plugins/util/funcs/eventStream.js';
-import getData from '../../table/functions/getData.js';
+import getData from '../../../plugins/table/funcs/getData.js';
 import getFolder from '../../../plugins/crud/funcs/utils/getFolder.js';
 import metaFormat from '../../../plugins/table/funcs/metaFormat/index.js';
 

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

@@ -46,7 +46,6 @@ export default async function upload(req) {
         file_name: file?.originalFilename.toLocaleLowerCase(),
         dir: relativeDirpath?.replace(/\\/g, '/'),
         native_file_name: fileName,
-        original: file?.relativeOriginalFilepath?.replace?.(/\\/g, '/'),
       },
     },
   };