@opengis/fastify-table 1.4.35 → 1.4.37

package/config.js

@@ -1,4 +1,4 @@
-import dotenv from 'dotenv';
+// import dotenv from 'dotenv';
 
 import { existsSync, readFileSync } from 'node:fs';
 
@@ -20,7 +20,8 @@ Object.assign(config, {
 
 function loadEnvConfig() {
   // node --env-file-if-exists=.env.dev --env-file-if-exists=.env server
-  const configKeys = Object.keys(process.env).filter(key => !skipKeys.includes(key) && key.charAt(0) === key.charAt(0)?.toLowerCase?.() || key.includes('.')).reduce((acc, curr) => ({ ...acc, [curr]: process.env[curr] }), {});
+  if (config.trace) { console.log(Object.keys(process.env)); }
+  const configKeys = Object.keys(process.env).filter(key => !key.startsWith('npm_') && !skipKeys.includes(key) && (key.charAt(0) === key.charAt(0)?.toLowerCase?.() || key.includes('.'))).reduce((acc, curr) => ({ ...acc, [curr]: process.env[curr] }), {});
   Object.assign(config, unflattenObject(configKeys));
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.35",
+  "version": "1.4.37",
   "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/plugins/table/funcs/getData.js

@@ -1,11 +1,11 @@
 import routeData from '../../../routes/table/controllers/tableData.js';
 
 export default async function getData({
-  id, table, pg, headers, filter, state, limit, page, search, user, order, sql, contextQuery, sufix,
+  id, table, pg, headers, filter, state, limit, page, search, user, order, desc, sql, contextQuery, sufix,
 }, reply, called) {
   const params = { table, id };
   const query = {
-    filter, limit, page, search, sql, state, order,
+    filter, limit, page, search, sql, state, order, desc,
   };
   const result = await routeData({
     pg, headers, params, query, user, contextQuery, sufix,

package/server/plugins/util/funcs/unflattenObject.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
 export default function unflattenObject(flatObj) {
-    return Object.keys(flatObj).reduce((acc, key) => {
+    return Object.keys(flatObj || {}).reduce((acc, key) => {
         const keys = key.split('.');
         keys.reduce((nestedObj, part, index) => {
             if (index === keys.length - 1) {

package/server/routes/crud/controllers/update.js

@@ -65,6 +65,11 @@ export default async function update(req, reply) {
     Object.keys(body || {}).filter(key => !Object.keys(schema || {}).includes(key)).forEach(key => delete body[key]);
   }
 
+  if (tokenData?.obj) {
+    const objData = tokenData.obj?.split('#').reduce((p, el) => ({ ...p, [el.split('=')[0]]: el.split('=')[1] }), {}) || {};
+    Object.assign(body, objData);
+  }
+
   const xssCheck = checkXSS({ body, schema });
 
   if (xssCheck.error && formData?.xssCheck !== false) {

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, '/'),
       },
     },
   };

package/server/routes/table/functions/getData.js

@@ -73,7 +73,9 @@ export default async function dataAPI(req, reply, called) {
 
   if (!config.pg) { return reply.status(500).send('empty pg'); }
 
-  if (!loadTable && !(tokenData?.table && pg.pk?.[tokenData?.table]) && !(called && pg.pk?.[params?.table])) {
+  const pkey = pg.pk?.[params?.table] || pg.pk?.[params?.table.replace(/"/g, '')];
+
+  if (!loadTable && !(tokenData?.table && pg.pk?.[tokenData?.table]) && !(called && pkey)) {
     return reply.status(404).send('template not found');
   }