@opengis/fastify-table 1.3.10 → 1.3.12

package/package.json

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

package/server/plugins/crud/funcs/dataDelete.js

@@ -5,6 +5,7 @@ import pgClients from '../../pg/pgClients.js';
 
 import extraData from '../../extra/extraData.js';
 import logChanges from './utils/logChanges.js';
+import logger from '../../logger/getLogger.js';
 
 const rclient = getRedis();
 
@@ -22,7 +23,11 @@ export default async function dataDelete({
     pg.pk = pgClients.client?.pk;
   }
 
-  const { pk } = await getMeta({ pg, table });
+  const { pk } = await getMeta({ pg, table })
+    .catch(err => {
+      logger.file('crud/delete', { error: err.toString(), stack: err.stack, table, id, referer, uid });
+      throw new Error(err.toString());
+    });
   const table1 = table.replace(/"/g, '');
   if (!pg.tlist?.includes(table1)) return 'table not exist';
   const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
@@ -31,7 +36,12 @@ export default async function dataDelete({
     table, form: tokenData?.form, id, uid,
   }, pg);
 
-  const res = await pg.query(delQuery, [id]).then(el => el.rows?.[0] || {});
+  const res = await pg.query(delQuery, [id])
+    .catch(err => {
+      logger.file('crud/delete', { error: err.toString(), stack: err.stack, table, id, referer, uid, q: delQuery });
+      throw new Error(err.toString());
+    })
+    .then(el => el.rows?.[0] || {});
 
   await logChanges({
     pg, table, tokenData, referer, id, uid, type: 'DELETE',

package/server/plugins/crud/funcs/dataInsert.js

@@ -5,6 +5,7 @@ import pgClients from '../../pg/pgClients.js';
 
 import logChanges from './utils/logChanges.js';
 import extraData from '../../extra/extraData.js';
+import logger from '../../logger/getLogger.js';
 
 const rclient = getRedis();
 
@@ -46,7 +47,10 @@ export default async function dataInsert({
     
     returning *`;
 
-  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
+  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]).catch(err => {
+    logger.file('crud/insert', { error: err.toString(), stack: err.stack, table, id, referer, uid, data, q: insertQuery });
+    throw new Error(err.toString());
+  }) || {};
 
   const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
 

package/server/plugins/crud/funcs/dataUpdate.js

@@ -5,6 +5,7 @@ import pgClients from '../../pg/pgClients.js';
 
 import extraData from '../../extra/extraData.js';
 import logChanges from './utils/logChanges.js';
+import logger from '../../logger/getLogger.js';
 
 const rclient = getRedis();
 const srids = {};
@@ -66,7 +67,12 @@ export default async function dataUpdate({
   ${filterData?.map((key, i) => assignValue(key, i, srids[table]?.[key] || 4326, pg.pgType?.[columns.find(col => col.name === key)?.dataTypeID || '']))?.join(',')} 
   WHERE ${pk} = $1 returning *`;
   // console.log(updateQuery, filterValue);
-  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
+  const res = await pg.query(updateQuery, [id, ...filterValue])
+    .catch(err => {
+      logger.file('crud/update', { error: err.toString(), stack: err.stack, table, id, referer, uid, data, q: updateQuery });
+      throw new Error(err.toString());
+    })
+    .then(el => el?.rows?.[0]) || {};
 
   const extraRes = await extraData({ table, form: tokenData?.form, id, data, uid }, pg);
 

package/server/plugins/logger/createFileStream.js

@@ -4,18 +4,11 @@ import build from 'pino-abstract-transport';
 import fs from 'fs';
 
 import labels from './labels.js';
+import timestampWithTimeZone from './timestampWithTimeZone.js';
 
 import config from '../../../config.js';
 
-const generator = () => () => {
-  const date = new Date();
-  const tzOffset = date.getTimezoneOffset();
-  const currentTimeWithTimezome = date - tzOffset * 60 * 1000;
-
-  // if (!opt.interval || opt.interval === '1d') {
-  return `${new Date(currentTimeWithTimezome).toISOString().split('T')[0].replace(/:/g, '_')}.log`;
-  // }
-};
+const generator = () => () => `${timestampWithTimeZone().split('T')[0].replace(/:/g, '_')}.log`;
 
 const {
   dir = 'log', interval = '1d', compress = 'gzip', // maxFiles = 90, local: teeToStdout,

package/server/plugins/logger/getLogger.js

@@ -7,6 +7,7 @@ import redactionList from '../../../redactionList.js';
 // utils
 import getHooks from './getHooks.js';
 import serializers from './serializers.js';
+import timestampWithTimeZone from './timestampWithTimeZone.js';
 
 const isServer = process.argv[2];
 
@@ -18,7 +19,7 @@ const level = config.log?.level || process.env.PINO_LOG_LEVEL || 'info';
 console.log(`log level: ${level}`);
 const options = {
   level, // minimal log level to write
-  timestamp: pino.stdTimeFunctions.isoTime, // timestamp as isostring
+  timestamp: () => `,"time":"${timestampWithTimeZone()}"`, // timestamp as isostring
   hooks: getHooks(),
   serializers, // custom log params
   transport: {

package/server/plugins/logger/timestampWithTimeZone.js

@@ -0,0 +1,5 @@
+export default function timestampWithTimeZone() {
+    const date = new Date();
+    const tzOffset = date.getTimezoneOffset();
+    return new Date(date - tzOffset * 60 * 1000).toISOString();
+}

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

@@ -56,7 +56,7 @@ export default async function tableAPI(req) {
   const cols = loadTable?.table
     ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.map((col) => (col?.includes('geom') && schema?.[col]?.type === 'Geom' ? `st_asgeojson(${col})::json as "${col}"` : `"${col}"`))?.join(',')
     : fields.map((el) => (el?.name?.includes('geom') && pg.pgType[el?.dataTypeID] === 'geometry' ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
-  const where = [`"${pk}" = $1`, loadTable.query, accessQuery].filter((el) => el);
+  const where = [`"${pk}" = $1`, loadTable.query, accessQuery].filter((el) => el).filter((el) => (user?.user_type === 'superadmin' ? !el.includes('{{uid}}') : true));
   const geom = dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : '';
   const q = `select "${pk}" as id, ${cols || '*'} ${geom} from ${tableName} t where ${where.join(' and ') || 'true'} limit 1`;