@opengis/fastify-table 1.4.20 → 1.4.22

package/config.js

@@ -1,4 +1,5 @@
 import dotenv from 'dotenv';
+import path from 'node:path';
 
 import { existsSync, readFileSync } from 'node:fs';
 
@@ -16,19 +17,39 @@ Object.assign(config, {
   env: process.env?.NODE_ENV || process.argv[2]?.split?.('=')?.pop?.(),
 });
 
-if (config.env && existsSync(`.env.${config.env}`)) {
-  const { parsed } = dotenv.config({ path: `.env.${config.env}` });
-  console.log('start with env:', config.env);
-
-  const obj = unflattenObject(parsed);
-
-  Object.keys(obj)
-    .filter(key => typeof obj[key] === 'string'
-      && (obj[key].startsWith('[') || ['true', 'false'].includes(obj[key]))) // json array / boolean
-    .forEach(key => {
-      obj[key] = JSON.parse(obj[key]);
-    });
-  Object.assign(config, { ...obj });
+function loadEnvConfig() {
+  if (config.env && existsSync(`.env.${config.env}`)) {
+    const { parsed } = dotenv.config({ path: `.env.${config.env}` });
+    if (parsed) {
+      console.log('start with env:', config.env);
+
+      const obj = unflattenObject(parsed);
+
+      Object.keys(obj || {})
+        .filter(key => typeof obj[key] === 'string'
+          && (obj[key].startsWith('[') || ['true', 'false'].includes(obj[key]))) // json array / boolean
+        .forEach(key => {
+          try {
+            obj[key] = JSON.parse(obj[key]);
+          }
+          catch (err) {
+            console.warn(`Invalid JSON for key "${key}": ${obj[key]}`);
+          }
+        });
+      if (obj) {
+        Object.assign(config, obj);
+        console.log('env init success', config.env, config.pg?.database);
+      }
+      else {
+        console.log('env init error', config.env, config.pg?.database);
+      }
+    }
+    else {
+      console.error('env init error: malformed file', config.env);
+    }
+  }
 }
 
+loadEnvConfig();
+
 export default config;

package/package.json

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

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

@@ -11,7 +11,7 @@ import logger from '../../logger/getLogger.js';
 const rclient = getRedis();
 
 export default async function dataDelete({
-  table, tokenData, referer, id, pg: pg1, uid,
+  table: table1, tokenData, referer, id, pg: pg1, uid,
 }) {
   const pg = pg1 || getPG({ name: 'client' });
 
@@ -24,33 +24,67 @@ export default async function dataDelete({
     pg.pk = pgClients.client?.pk;
   }
 
-  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);
-    });
-  const table1 = table.replace(/"/g, '');
+  const table = table1.replace(/"/g, '');
+
+  const { pk } = await getMeta({ pg, table });
+
   if (!pg.tlist?.includes(table1)) return 'table not exist';
+
   const delQuery = `delete from ${table} WHERE ${pk}::text = $1::text returning *`;
 
-  const extraRes = await extraData({
-    table, form: tokenData?.form, id, uid,
-  }, pg);
+    // for transactions
+    const isClient = typeof pg.query === 'function' && typeof pg.release === 'function';
+    const client = isClient ? pg : await pg.connect();
+
+    if (!isClient) {
+      client.caller = 'dataDelete';
+    }
+
+    if (isClient || !client.pk) {
+      client.options = pg.options;
+      client.tlist = pg.tlist;
+      client.pgType = pg.pgType;
+      client.relkinds = pg.relkinds;
+      client.pk = pg.pk;
+    }
+
+    try {
+      if (client.caller === 'dataDelete') {
+        await client.query('begin;');
+      }
+
+      const row = {};
+      await extraData({
+        table, form: tokenData?.form, id, uid, row,
+      }, client);
+
+      const res = await client.query(delQuery, [id])
+        .then(el => (el.rows?.[0] ? { rowCount: 1, ...el.rows[0] } : {}));
+
+      await logChanges({
+        pg: client, table, tokenData, referer, id, uid, type: 'DELETE',
+      });
+
+      if (config.redis) { rclient.incr(`pg:${table}:crud`); }
+
+      if (client.caller === 'dataDelete') {
+        await client.query('commit;');
+      }
 
-  const res = await pg.query(delQuery, [id])
-    .catch(err => {
+      return { ...res, ...row };
+    }
+catch (err) {
       logger.file('crud/delete', {
-        error: err.toString(), stack: err.stack, table, id, referer, uid, q: delQuery,
+        error: err.toString(), stack: err.stack, table, id, referer, uid, form: tokenData?.form,
       });
+      if (client.caller === 'dataDelete') {
+        await client.query('rollback;');
+      }
       throw err;
-    })
-    .then(el => (el.rows?.[0] ? { rowCount: 1, ...el.rows[0] } : {}));
-
-  await logChanges({
-    pg, table, tokenData, referer, id, uid, type: 'DELETE',
-  });
-  if (config.redis) { rclient.incr(`pg:${table}:crud`); }
-  return { ...res, ...extraRes || {} };
+    }
+ finally {
+      if (client.caller === 'dataDelete') {
+        await client.query('begin;');
+      }
+    }
 }

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

@@ -15,6 +15,7 @@ export default async function dataInsert({
   id, table: table1, referer, data, pg: pg1, uid, tokenData = {},
 }) {
   const pg = pg1 || getPG({ name: 'client' });
+  if (!pg) return null;
 
   // pg client single transaction support
   if (!pg?.pk && config.pg) {
@@ -38,16 +39,24 @@ export default async function dataInsert({
   if (!insertQuery || !args.length) return null;
 
   // for transactions
-  const client = pg?._connected ? pg : await pg.connect();
+  const isClient = typeof pg.query === 'function' && typeof pg.release === 'function';
+  const client = isClient ? pg : await pg.connect();
+  if (!isClient) {
+    client.caller = 'dataInsert';
+  }
 
-  client.options = pg?.options;
-  client.tlist = pg?.tlist;
-  client.pgType = pg?.pgType;
-  client.relkinds = pg?.relkinds;
-  client.pk = pg?.pk;
+  if (isClient || !client.pk) {
+    client.options = pg.options;
+    client.tlist = pg.tlist;
+    client.pgType = pg.pgType;
+    client.relkinds = pg.relkinds;
+    client.pk = pg.pk;
+  }
 
   try {
-    await client.query('begin;');
+    if (client.caller === 'dataInsert') {
+      await client.query('begin;');
+    }
     const res = await client.query(insertQuery, args).then(el => el || {});
 
     const id1 = res.rows?.[0]?.[pg.pk[table1]];
@@ -98,17 +107,23 @@ export default async function dataInsert({
     });
 
     if (config.redis) { rclient.incr(`pg:${table}:crud`); }
-    await client.query('commit;');
+    if (client.caller === 'dataInsert') {
+      await client.query('commit;');
+    }
     return res;
   }
   catch (err) {
     logger.file('crud/insert', {
       error: err.toString(), stack: err.stack, table, id, referer, uid, form: tokenData?.form,
     });
-    await client.query('rollback;');
+    if (client.caller === 'dataInsert') {
+      await client.query('rollback;');
+    }
     throw err;
   }
   finally {
-    client.release();
+    if (client.caller === 'dataInsert') {
+      client.release();
+    }
   }
 }

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

@@ -29,6 +29,7 @@ export default async function dataUpdate({
   if (!data || !table || !id) return null;
 
   const pg = pg1 || getPG({ name: 'client' });
+  if (!pg) return null;
 
   // pg client single transaction support
   if (!pg?.pk && config.pg) {
@@ -75,10 +76,25 @@ export default async function dataUpdate({
   // console.log(updateQuery, filterValue);
 
   // for transactions
-  const client = pg?._connected ? pg : await pg.connect();
+  const isClient = typeof pg.query === 'function' && typeof pg.release === 'function';
+  const client = isClient ? pg : await pg.connect();
+
+  if (!isClient) {
+    client.caller = 'dataUpdate';
+  }
+
+  if (isClient || !client.pk) {
+    client.options = pg.options;
+    client.tlist = pg.tlist;
+    client.pgType = pg.pgType;
+    client.relkinds = pg.relkinds;
+    client.pk = pg.pk;
+  }
 
   try {
-    await client.query('begin;');
+    if (client.caller === 'dataUpdate') {
+      await client.query('begin;');
+    }
     const res = await client.query(updateQuery, [id, ...filterValue])
       .catch(err => {
         logger.file('crud/update', {
@@ -145,17 +161,23 @@ export default async function dataUpdate({
 
     if (config.redis) { rclient.incr(`pg:${table}:crud`); }
 
-    await client.query('commit;');
+    if (client.caller === 'dataUpdate') {
+      await client.query('commit;');
+    }
     return res || {};
   }
   catch (err) {
     logger.file('crud/update', {
       error: err.toString(), stack: err.stack, table, id, referer, uid, form: tokenData?.form,
     });
-    await client.query('rollback;');
+    if (client.caller === 'dataUpdate') {
+      await client.query('rollback;');
+    }
     throw err;
   }
   finally {
-    client.release();
+    if (client.caller === 'dataUpdate') {
+      client.release();
+    }
   }
 }

package/server/plugins/extra/extraData.js

@@ -9,7 +9,7 @@ const defaultTable = 'crm.extra_data';
 function format(key, value, schema) {
   if (!key || !schema?.[key]) return value;
   if (schema?.[key]?.type && ['Number', 'Switcher'].includes(schema?.[key]?.type)) {
-    return JSON.parse(value || null);
+    return typeof value === 'string' ? JSON.parse(value) : value;
   }
   return value;
 }
@@ -45,7 +45,9 @@ export default async function extraData({
   const deleteRes = await pg.query(`delete from ${extraTable} where object_id=$1 and property_key = any($2::text[]) returning *`, [id, Object.keys(loadTemplate?.schema || {})]);
 
   if (!data) {
-    return deleteRes?.rows?.reduce?.((acc, curr) => Object.assign(acc, { [curr.property_key]: format(curr.property_key, curr.value_text, curr.value_array, loadTemplate?.schema) }), {});
+    const result = deleteRes?.rows?.reduce?.((acc, curr) => Object.assign(acc, { [curr.property_key]: format(curr.property_key, curr.value_text || curr.value_array, loadTemplate?.schema) }), {}) || {};
+    Object.assign(row, result);
+    return result;
   }
 
   const rows = Object.keys(data || {})
@@ -70,7 +72,7 @@ export default async function extraData({
   }));
 
   Object.assign(row, {
-    ...res.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: format(curr.property_key, curr.value_text, curr.value_array, loadTemplate?.schema) }), {}),
+    ...res.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: format(curr.property_key, curr.value_text || curr.value_array, loadTemplate?.schema) }), {}),
     id: res?.[0]?.object_id,
   });
   return row;

package/server/plugins/extra/extraDataGet.js

@@ -44,21 +44,9 @@ export default async function extraDataGet({
     rows.forEach(row => {
       Object.assign(row, {
         ...extraRows
-          .filter(el => el.object_id === row.id)
+          .filter(el => el.object_id === row.id && (el.value_text || el.value_array))
           .reduce((acc, curr) => {
-            let value = null;
-
-            if (curr.value_text !== null) {
-              value = curr.value_text;
-            }
-            else if (curr.value_array !== null) {
-              value = curr.value_array;
-            }
-
-            if (value !== null) {
-              acc[curr.property_key] = format(curr.property_key, value, loadTemplate?.schema);
-            }
-
+            acc[curr.property_key] = format(curr.property_key, curr.value_text || curr.value_array, loadTemplate?.schema);
             return acc;
           }, {}),
       });

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

@@ -32,7 +32,7 @@ export default async function insert(req, reply) {
     return reply.status(400).send('invalid token');
   }
 
-  if (!actions.includes('add') && !config.local) {
+  if (!actions.includes('add') && !config.local && !tokenData) {
     return reply.status(403).send('access restricted: actions');
   }
 

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

@@ -36,7 +36,7 @@ export default async function update(req, reply) {
     return reply.status(400).send('invalid token');
   }
 
-  if (!actions.includes('edit') && !config.local) {
+  if (!actions.includes('edit') && !config.local && !tokenData) {
     return reply.status(403).send('access restricted: actions');
   }
 

package/server/routes/logger/controllers/utils/checkUserAccess.js

@@ -13,7 +13,7 @@ export default function checkUserAccess({ user = {}, token }) {
     return { message: 'access granted', status: 200 };
   }
   // console.log(user);
-  if (user.user_type !== 'admin' && !config?.local && !config.auth?.disable) {
+  if (!user.user_type?.includes?.('admin') && !config?.local && !config.auth?.disable) {
     return { message: 'access restricted', status: 403 };
   }