@opengis/fastify-table 1.2.11 → 1.2.13

package/server/plugins/crud/funcs/utils/logChanges.js

@@ -1,118 +1,118 @@
-import getTemplate from '../../..//table/funcs/getTemplate.js';
-import { metaFormat } from '@opengis/fastify-table/utils.js';
-
-const defaultTitles = {
-  editor_date: 'Дата оновлення',
-  editor_id: 'Редактор',
-  сdate: 'Дата створення',
-  uid: 'Автор',
-  body: 'Зміст',
-  entity_id: 'ID Сутності',
-  entity_type: 'Таблиця сутності',
-  file_path: 'Шлях до файлу',
-  uploaded_name: 'Назва файлу',
-  size: 'Розмір файлу',
-  ext: 'Розширення файлу',
-};
-
-function getValue(val, tableName) {
-  if (!val) return null;
-  if (['crm.files'].includes(tableName)) {
-    return typeof val === 'object'
-      ? JSON.stringify(val)
-      : val;
-  }
-  return typeof val === 'object'
-    ? JSON.stringify(val)?.substring?.(0, 30)
-    : val?.toString?.()?.substring?.(0, 30);
-}
-
-// extract titles and cls from form schema
-// alt: extract table template from referer -> form
-export default async function logChanges({
-  pg, table: table1, tokenData, referer, id, data, uid = 1, type,
-}) {
-  const table = table1.replace(/"/g, '');
-  if (!id) {
-    console.error('param id is required');
-    return null;
-  }
-  if (!table || !pg.pk?.[table]) {
-    console.error('table not found');
-    return null;
-  }
-  if (!pg.pk?.['log.table_changes'] || !pg.pk?.['log.table_changes_data']) {
-    console.error('log table not found');
-    return null;
-  }
-  if (!type) {
-    console.error('invalid type');
-    return null;
-  }
-
-  try {
-    const { change_id: changeId } = await pg.query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
-    values(CURRENT_DATE, $1, $2, $3, $4) returning change_id`, [type, uid, table, id]).then((res) => res.rows?.[0] || {});
-
-    const q = `select json_object_agg(entity_key, value_new) from (
-      select
-        entity_key,
-        value_new,
-        ( rank() over (partition by entity_key order by cdate desc) = 1 ) as is_latest
-      from log.table_changes_data
-
-      where change_id in (
-        select
-          change_id
-        from log.table_changes
-        where entity_id=$1
-        and entity_type=$2
-      )
-
-    )q where is_latest`;
-    // console.log(q, type, id);
-
-    const old = type !== 'INSERT' ? await pg.query(q, [id, table]).then(el => el.rows?.[0]?.json_object_agg || {}) : {};
-
-    const body = await getTemplate('form', tokenData?.form);
-    const schema = body?.schema || body || {};
-    const titles = Object.keys(schema)
-      .reduce((acc, curr) => Object.assign(acc, { [curr]: schema[curr].title || schema[curr].ua }), {});
-    const cls = Object.keys(schema)
-      .filter(el => schema[el]?.data)
-      .reduce((acc, curr) => Object.assign(acc, { [curr]: schema[curr].data }), {});
-
-    if (data) {
-      await metaFormat({ rows: [data], cls, sufix: false });
-    }
-
-    const newObj = Object.fromEntries(Object.entries(data || {}).map(el => ([[titles[el[0]] || defaultTitles[el[0]] || el[0]], el[1]])));
-    const changesData = Object.keys(newObj || {}).map(el => ({
-      change_id: changeId,
-      entity_key: el,
-      value_old: getValue(old?.[el], table),
-      value_new: type === 'DELETE' ? null : getValue(newObj?.[el], table),
-      uid,
-    })).filter(el => el?.value_new !== el?.value_old);
-
-    const res = await Promise.all(changesData.map(async (el) => {
-      const insertQuery = `insert into log.table_changes_data (${Object.entries(el)?.map((key) => `"${key[0]}"`).join(',')}) 
-      values (${Object.entries(el)?.map((key, i) => `$${i + 1}`).join(',')}) returning *`;
-
-      const { rows = [] } = await pg.query(insertQuery, [...Object.entries(el).map((el1) => (el1[1] && typeof el1[1] === 'object' && (!Array.isArray(el1[1]) || typeof el1[1]?.[0] === 'object') ? JSON.stringify(el1[1]) : el1[1]))]) || {};
-      return rows[0];
-    }));
-
-    const newData = type === 'DELETE' ? {} : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.entity_key]: curr.value_new }), {});
-    // console.log('logChanges OK', type);
-    return {
-      change_id: changeId, entity_type: table, entity_id: id, uid, change_type: type, old, new: newData,
-    };
-  }
-  catch (err) {
-    console.error('logChanges error', type, table, id, data, err.toString());
-    return {
-      error: err.toString(), entity_type: table, entity_id: id, uid, change_type: type,
-    };
-  }
-}
+import getTemplate from '../../..//table/funcs/getTemplate.js';
+import { metaFormat } from '@opengis/fastify-table/utils.js';
+
+const defaultTitles = {
+  editor_date: 'Дата оновлення',
+  editor_id: 'Редактор',
+  сdate: 'Дата створення',
+  uid: 'Автор',
+  body: 'Зміст',
+  entity_id: 'ID Сутності',
+  entity_type: 'Таблиця сутності',
+  file_path: 'Шлях до файлу',
+  uploaded_name: 'Назва файлу',
+  size: 'Розмір файлу',
+  ext: 'Розширення файлу',
+};
+
+function getValue(val, tableName) {
+  if (!val) return null;
+  if (['crm.files'].includes(tableName)) {
+    return typeof val === 'object'
+      ? JSON.stringify(val)
+      : val;
+  }
+  return typeof val === 'object'
+    ? JSON.stringify(val)?.substring?.(0, 30)
+    : val?.toString?.()?.substring?.(0, 30);
+}
+
+// extract titles and cls from form schema
+// alt: extract table template from referer -> form
+export default async function logChanges({
+  pg, table: table1, tokenData, referer, id, data, uid = 1, type,
+}) {
+  const table = table1.replace(/"/g, '');
+  if (!id) {
+    console.error('param id is required');
+    return null;
+  }
+  if (!table || !pg.pk?.[table]) {
+    console.error('table not found');
+    return null;
+  }
+  if (!pg.pk?.['log.table_changes'] || !pg.pk?.['log.table_changes_data']) {
+    console.error('log table not found');
+    return null;
+  }
+  if (!type) {
+    console.error('invalid type');
+    return null;
+  }
+
+  try {
+    const { change_id: changeId } = await pg.query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
+    values(CURRENT_DATE, $1, $2, $3, $4) returning change_id`, [type, uid, table, id]).then((res) => res.rows?.[0] || {});
+
+    const q = `select json_object_agg(entity_key, value_new) from (
+      select
+        entity_key,
+        value_new,
+        ( rank() over (partition by entity_key order by cdate desc) = 1 ) as is_latest
+      from log.table_changes_data
+
+      where change_id in (
+        select
+          change_id
+        from log.table_changes
+        where entity_id=$1
+        and entity_type=$2
+      )
+
+    )q where is_latest`;
+    // console.log(q, type, id);
+
+    const old = type !== 'INSERT' ? await pg.query(q, [id, table]).then(el => el.rows?.[0]?.json_object_agg || {}) : {};
+
+    const body = await getTemplate('form', tokenData?.form);
+    const schema = body?.schema || body || {};
+    const titles = Object.keys(schema)
+      .reduce((acc, curr) => Object.assign(acc, { [curr]: schema[curr].title || schema[curr].ua }), {});
+    const cls = Object.keys(schema)
+      .filter(el => schema[el]?.data)
+      .reduce((acc, curr) => Object.assign(acc, { [curr]: schema[curr].data }), {});
+
+    if (data) {
+      await metaFormat({ rows: [data], cls, sufix: false });
+    }
+
+    const newObj = Object.fromEntries(Object.entries(data || {}).map(el => ([[titles[el[0]] || defaultTitles[el[0]] || el[0]], el[1]])));
+    const changesData = Object.keys(newObj || {}).map(el => ({
+      change_id: changeId,
+      entity_key: el,
+      value_old: getValue(old?.[el], table),
+      value_new: type === 'DELETE' ? null : getValue(newObj?.[el], table),
+      uid,
+    })).filter(el => el?.value_new !== el?.value_old);
+
+    const res = await Promise.all(changesData.map(async (el) => {
+      const insertQuery = `insert into log.table_changes_data (${Object.entries(el)?.map((key) => `"${key[0]}"`).join(',')}) 
+      values (${Object.entries(el)?.map((key, i) => `$${i + 1}`).join(',')}) returning *`;
+
+      const { rows = [] } = await pg.query(insertQuery, [...Object.entries(el).map((el1) => (el1[1] && typeof el1[1] === 'object' && (!Array.isArray(el1[1]) || typeof el1[1]?.[0] === 'object') ? JSON.stringify(el1[1]) : el1[1]))]) || {};
+      return rows[0];
+    }));
+
+    const newData = type === 'DELETE' ? {} : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.entity_key]: curr.value_new }), {});
+    // console.log('logChanges OK', type);
+    return {
+      change_id: changeId, entity_type: table, entity_id: id, uid, change_type: type, old, new: newData,
+    };
+  }
+  catch (err) {
+    console.error('logChanges error', type, table, id, data, err.toString());
+    return {
+      error: err.toString(), entity_type: table, entity_id: id, uid, change_type: type,
+    };
+  }
+}

package/server/plugins/crud/index.js

@@ -1,23 +1,23 @@
-// import getOpt from './funcs/getOpt.js';
-// import setOpt from './funcs/setOpt.js';
-
-// import isFileExists from './funcs/isFileExists.js';
-
-// import dataUpdate from './funcs/dataUpdate.js';
-// import dataInsert from './funcs/dataInsert.js';
-
-// import getAccessFunc from './funcs/getAccess.js';
-
-async function plugin(fastify) {
-  // fastify.decorate('setOpt', setOpt);
-  // fastify.decorate('getOpt', getOpt);
-
-  // fastify.decorate('dataUpdate', dataUpdate);
-  // fastify.decorate('dataInsert', dataInsert);
-
-  // fastify.decorate('getAccess', getAccessFunc);
-
-  // fastify.decorate('isFileExists', isFileExists);
-}
-
-export default plugin;
+// import getOpt from './funcs/getOpt.js';
+// import setOpt from './funcs/setOpt.js';
+
+// import isFileExists from './funcs/isFileExists.js';
+
+// import dataUpdate from './funcs/dataUpdate.js';
+// import dataInsert from './funcs/dataInsert.js';
+
+// import getAccessFunc from './funcs/getAccess.js';
+
+async function plugin(fastify) {
+  // fastify.decorate('setOpt', setOpt);
+  // fastify.decorate('getOpt', getOpt);
+
+  // fastify.decorate('dataUpdate', dataUpdate);
+  // fastify.decorate('dataInsert', dataInsert);
+
+  // fastify.decorate('getAccess', getAccessFunc);
+
+  // fastify.decorate('isFileExists', isFileExists);
+}
+
+export default plugin;

package/server/plugins/hook/index.js

@@ -1,8 +1,8 @@
-import addHook from './funcs/addHook.js';
-import applyHook from './funcs/applyHook.js';
-
-async function plugin(fastify) {
-//   fastify.decorate('addHook', addHook);
-//   fastify.decorate('applyHook', applyHook);
-}
-export default plugin;
+import addHook from './funcs/addHook.js';
+import applyHook from './funcs/applyHook.js';
+
+async function plugin(fastify) {
+//   fastify.decorate('addHook', addHook);
+//   fastify.decorate('applyHook', applyHook);
+}
+export default plugin;

package/server/plugins/logger/errorStatus.js

@@ -1,19 +1,19 @@
-import applyHookSync from '../hook/funcs/applyHookSync.js';
-
-function errorStatus(error) {
-  const hook = applyHookSync('errorStatus', error);
-  if (hook) return hook;
-
-  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
-    return 601;
-  }
-  if (error.routine === 'ExecConstraints') {
-    return 602;
-  }
-  if (error.type === 'DatabaseError') {
-    return 600;
-  }
-
-  return 500;
-}
-export default errorStatus;
+import applyHookSync from '../hook/funcs/applyHookSync.js';
+
+function errorStatus(error) {
+  const hook = applyHookSync('errorStatus', error);
+  if (hook) return hook;
+
+  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
+    return 601;
+  }
+  if (error.routine === 'ExecConstraints') {
+    return 602;
+  }
+  if (error.type === 'DatabaseError') {
+    return 600;
+  }
+
+  return 500;
+}
+export default errorStatus;

package/server/plugins/logger/index.js

@@ -1,21 +1,21 @@
-import errorMessage from './errorMessage.js';
-
-async function plugin(fastify) {
-  fastify.setErrorHandler(async (error, request, reply) => {
-    // validation not error
-    if (error.validation) {
-      request.log.warn(request, { code: error?.code, status: 422, error: error.toString() });
-      return reply.status(422).send(error.toString());
-    }
-
-    // logger
-    request.log.error(error, request);
-    console.error({ msg: error.message, where: error.where, stack: error.stack });
-
-    // errorMessage
-    const msg = errorMessage(error);
-
-    return reply.status(error.statusCode || 500).send(msg);
-  });
-}
-export default plugin;
+import errorMessage from './errorMessage.js';
+
+async function plugin(fastify) {
+  fastify.setErrorHandler(async (error, request, reply) => {
+    // validation not error
+    if (error.validation) {
+      request.log.warn(request, { code: error?.code, status: 422, error: error.toString() });
+      return reply.status(422).send(error.toString());
+    }
+
+    // logger
+    request.log.error(error, request);
+    console.error({ msg: error.message, where: error.where, stack: error.stack });
+
+    // errorMessage
+    const msg = errorMessage(error);
+
+    return reply.status(error.statusCode || 500).send(msg);
+  });
+}
+export default plugin;

package/server/plugins/migration/exec.migrations.js

@@ -0,0 +1,37 @@
+import path from 'node:path';
+import { readdirSync, existsSync } from 'node:fs';
+
+import config from '../../../config.js';
+import execSql from './exec.sql.js';
+// import getCallerDir from './get.caller.dir.js';
+
+const time = Date.now();
+
+export default async function execMigrations(dirPath, iscore) {
+  if (
+    !dirPath
+    || (config.migrationsCore === false && iscore)
+    || config.migrations === false
+  ) {
+    console.log('migrations skip', 'core: ', !!iscore, 'dir: ', dirPath || 'not specified');
+    return;
+  }
+
+  console.log('migrations start', dirPath, Date.now() - time);
+
+  const exists = existsSync(dirPath);
+
+  if (exists) {
+    // get directory sql file list
+    const content = readdirSync(dirPath, { withFileTypes: true })
+      ?.filter((el) => el.isFile() && path.extname(el.name) === '.sql')
+      ?.map((el) => el.name) || [];
+
+    // execute sql files
+    if (content?.length) {
+      await content.reduce((promise, filename) => promise.then(() => execSql(path.join(dirPath, filename))), Promise.resolve());
+    }
+  }
+
+  console.log('migrations finish', dirPath, exists, Date.now() - time);
+}

package/server/plugins/migration/exec.sql.js

@@ -0,0 +1,46 @@
+import path from 'node:path';
+import { existsSync, readFileSync } from 'node:fs';
+
+import { logger, pgClients } from '../../../utils.js';
+
+export default async function execSql(filepath, pg = pgClients.client) {
+    const start = Date.now();
+
+    if (!filepath) return null;
+
+    const filename = path.basename(filepath);
+
+    if (!existsSync(filepath)) {
+        logger.file('migration/notfound', {
+            filepath,
+            result: 'not found',
+        });
+        console.log(filepath, 'warn', 'not found', Date.now() - start);
+        return null;
+    }
+
+    const sql = readFileSync(filepath, 'utf-8');
+
+    try {
+        console.log(filename, 'start', Date.now() - start);
+        await pg.query(sql);
+        console.log(filename, 'finish', Date.now() - start);
+        logger.file('migration/success', {
+            filepath,
+            result: 'success',
+            time: Date.now() - start,
+        });
+        return 'ok';
+    }
+    catch (err) {
+        console.log(filename, 'error', err.toString(), Date.now() - start);
+        logger.file('migration/error', {
+            filepath,
+            result: 'error',
+            error: err.toString(),
+            stack: err.stack,
+            time: Date.now() - start,
+        });
+        return err.toString();
+    }
+}

package/server/plugins/migration/get.caller.dir.js

@@ -0,0 +1,26 @@
+import path from 'node:path';
+
+export default function getCallerDir() {
+  const originalFunc = Error.prepareStackTrace;
+
+  let callerfile;
+  try {
+    const err = new Error();
+    // let currentfile;
+
+    Error.prepareStackTrace = function (err, stack) { return stack; };
+
+    const currentfile = err.stack.shift().getFileName();
+
+    while (err.stack.length) {
+      callerfile = err.stack.shift().getFileName();
+
+      if (currentfile !== callerfile) break;
+    }
+  }
+  catch (err) { }
+
+  Error.prepareStackTrace = originalFunc;
+
+  return path.dirname(callerfile);
+}

package/server/plugins/migration/index.js

@@ -1,7 +1,7 @@
-import execMigrations from './funcs/exec.migrations.js';
-
-async function plugin(fastify) {
-//   fastify.decorate('execMigrations', execMigrations);
-}
-
-export default plugin;
+import execMigrations from './funcs/exec.migrations.js';
+
+async function plugin(fastify) {
+//   fastify.decorate('execMigrations', execMigrations);
+}
+
+export default plugin;

package/server/plugins/pg/pgClients.js

@@ -1,21 +1,21 @@
-import pg from 'pg';
-
-import config from '../../../config.js';
-import init from './funcs/init.js';
-
-const pgClients = {};
-if (config.pg) {
-  const client = new pg.Pool({
-    host: config.pg?.host || '127.0.0.1',
-    port: config.pg?.port || 5432,
-    database: config.pg?.database || 'postgres',
-    user: config.pg?.user || 'postgres',
-    password: config.pg?.password || 'postgres',
-  });
-  client.init = async () => {
-    await init(client);
-  };
-  client.init();
-  pgClients.client = client;
-}
-export default pgClients;
+import pg from 'pg';
+
+import config from '../../../config.js';
+import init from './funcs/init.js';
+
+const pgClients = {};
+if (config.pg) {
+  const client = new pg.Pool({
+    host: config.pg?.host || '127.0.0.1',
+    port: config.pg?.port || 5432,
+    database: config.pg?.database || 'postgres',
+    user: config.pg?.user || 'postgres',
+    password: config.pg?.password || 'postgres',
+  });
+  client.init = async () => {
+    await init(client);
+  };
+  client.init();
+  pgClients.client = client;
+}
+export default pgClients;

package/server/plugins/policy/index.js

@@ -1,12 +1,12 @@
-import checkPolicy from './funcs/checkPolicy.js';
-
-async function plugin(fastify) {
-  fastify.addHook('preParsing', async (request, reply) => {
-    const resp = checkPolicy(request, reply);
-    if (resp) {
-      return resp;
-    }
-  });
-}
-
-export default plugin;
+import checkPolicy from './funcs/checkPolicy.js';
+
+async function plugin(fastify) {
+  fastify.addHook('preParsing', async (request, reply) => {
+    const resp = checkPolicy(request, reply);
+    if (resp) {
+      return resp;
+    }
+  });
+}
+
+export default plugin;

package/server/plugins/policy/sqlInjection.js

@@ -1,33 +1,33 @@
-const sqlInjection = [
-  '()',
-  '^',
-  '*',
-  'like ',
-  '@variable',
-  '@@variable',
-  'group by ',
-  'union ',
-  'select ',
-  'having ',
-  'as injectx',
-  'where ',
-  'rlike ',
-  'if(',
-  'sleep(',
-  'waitfor delay',
-  'benchmark(',
-  'pg_sleep(',
-  "'\\\"",
-  'randomblob(',
-  'order by ',
-  'union all ',
-  '+or',
-  'or ',
-  'and ',
-  "'' ",
-  '"""  ',
-  '<script',
-  'javascript:',
-];
-
-export default sqlInjection;
+const sqlInjection = [
+  '()',
+  '^',
+  '*',
+  'like ',
+  '@variable',
+  '@@variable',
+  'group by ',
+  'union ',
+  'select ',
+  'having ',
+  'as injectx',
+  'where ',
+  'rlike ',
+  'if(',
+  'sleep(',
+  'waitfor delay',
+  'benchmark(',
+  'pg_sleep(',
+  "'\\\"",
+  'randomblob(',
+  'order by ',
+  'union all ',
+  '+or',
+  'or ',
+  'and ',
+  "'' ",
+  '"""  ',
+  '<script',
+  'javascript:',
+];
+
+export default sqlInjection;

package/server/plugins/redis/client.js

@@ -1,8 +1,8 @@
-import redisClients from './funcs/redisClients.js';
-import getRedis from './funcs/getRedis.js';
-
-if (!redisClients[0]) {
-  getRedis({ db: 0 });
-}
-
-export default redisClients[0];
+import redisClients from './funcs/redisClients.js';
+import getRedis from './funcs/getRedis.js';
+
+if (!redisClients[0]) {
+  getRedis({ db: 0 });
+}
+
+export default redisClients[0];