@opengis/fastify-table 1.2.41 → 1.2.42

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

@@ -1,44 +1,44 @@
-import { createHash, randomUUID } from 'crypto';
-
-import config from '../../../../config.js';
-
-import getRedis from '../../redis/funcs/getRedis.js';
-
-const rclient = getRedis({ db: 0 });
-
-// import { config, getRedis } from '../../../../utils.js';
-
-const generateCodes = (ids, userToken) => {
-  const token = userToken || randomUUID();
-  const notNullIds = ids.filter((el) => el);
-  const obj = {};
-  const codes = notNullIds.reduce((acc, id) => {
-    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
-    acc[newToken] = id; obj[id] = newToken;
-    return acc;
-  }, {});
-  return { codes, obj };
-};
-
-function setToken({
-  ids: idsOrigin, uid, array,
-}) {
-  //  const rclient5 = getRedis({ db: 0, funcs });
-
-  if (!uid) return { user: 'empty' };
-  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
-
-  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
-
-  // TODO generate salt
-  const { codes, obj } = generateCodes(ids, uid);
-
-  if (!Object.keys(codes).length) return { ids: 'empty' };
-
-  rclient.hmset(`${config.pg.database}:token:edit:${uid}`, codes);
-  // console.log(`${config.pg.database}:token:edit:${uid}`, idsOrigin, Object.values(obj));
-  // TODO дополнительно писать в hset token -> uid
-  return array ? Object.values(obj) : obj;
-}
-
-export default setToken;
+import { createHash, randomUUID } from 'crypto';
+
+import config from '../../../../config.js';
+
+import getRedis from '../../redis/funcs/getRedis.js';
+
+const rclient = getRedis({ db: 0 });
+
+// import { config, getRedis } from '../../../../utils.js';
+
+const generateCodes = (ids, userToken) => {
+  const token = userToken || randomUUID();
+  const notNullIds = ids.filter((el) => el);
+  const obj = {};
+  const codes = notNullIds.reduce((acc, id) => {
+    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
+    acc[newToken] = id; obj[id] = newToken;
+    return acc;
+  }, {});
+  return { codes, obj };
+};
+
+function setToken({
+  ids: idsOrigin, uid, array,
+}) {
+  //  const rclient5 = getRedis({ db: 0, funcs });
+
+  if (!uid) return { user: 'empty' };
+  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
+
+  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
+
+  // TODO generate salt
+  const { codes, obj } = generateCodes(ids, uid);
+
+  if (!Object.keys(codes).length) return { ids: 'empty' };
+
+  rclient.hmset(`${config.pg.database}:token:edit:${uid}`, codes);
+  // console.log(`${config.pg.database}:token:edit:${uid}`, idsOrigin, Object.values(obj));
+  // TODO дополнительно писать в hset token -> uid
+  return array ? Object.values(obj) : obj;
+}
+
+export default setToken;

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

@@ -1,10 +1,10 @@
-import path from 'node:path';
-
-import config from '../../../../../config.js';
-
-export default function getFolder(req, type = 'server') {
-  if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
-  const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
-  const filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, req.folder || config.folder || '');
-  return filepath;
-}
+import path from 'node:path';
+
+import config from '../../../../../config.js';
+
+export default function getFolder(req, type = 'server') {
+  if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
+  const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
+  const filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, req.folder || config.folder || '');
+  return filepath;
+}

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/extra/extraData.js

@@ -0,0 +1,61 @@
+import { config, getMeta, pgClients, getTemplate, dataInsert } from '../../../utils.js';
+
+const defaultTable = 'crm.extra_data';
+
+export default async function extraData({
+  pg = pgClients.client, table: mainTable, form, id, body, uid,
+}) {
+  if (!id || !mainTable || !body) {
+    return null;
+  }
+
+  const loadTemplate = await getTemplate('form', form);
+  if (!loadTemplate?.extra) return null;
+
+  const table = config.extraData?.[mainTable]
+    || config.extraData?.[mainTable.split('.').shift()]
+    || config.extraData?.['default']
+    || config.extraData
+    || defaultTable;
+
+  const { pk: mainPK, columns: mainColumns = [] } = await getMeta({ pg, table: mainTable });
+  const { pk, columns: extraColumns = [] } = await getMeta({ pg, table });
+
+  if (!mainPK) {
+    return { error: `table pk not found: ${mainTable}`, status: 404 };
+  }
+
+  if (!pk) {
+    return { error: `extra table pk not found: ${table}`, status: 404 };
+  }
+
+  const mode = extraColumns.find((col) => col?.name === mainPK)
+    ? 'column'
+    : 'property';
+
+  const args = [id];
+
+  const q = {
+    column: `delete from ${table} where ${mainPK}=$1`,
+    property: `delete from ${table} where object_id=$1 and property_key = any($2::text[])`,
+  }[mode];
+
+  if (mode === 'property') {
+    args.push(Object.keys(body || {}));
+    Object.assign(body || {}, { object_id: id });
+  }
+
+  if (config.trace) console.log(q, args);
+  await pg.query(q, args);
+
+  const data = mode === 'column'
+    ? { ...body || {}, [mainPK]: id }
+    : Object.keys(body || {})
+      .filter(key => !mainColumns.map(el => el.name).concat('id', 'token').includes(key))
+      .reduce((acc, curr) => Object.assign(acc, { [curr]: body?.[curr] }), {});
+
+  // console.log('extraData POST insert start', mode, mainTable, table);
+  const res = await dataInsert({ pg, table, data, uid }).then(el => el.rows?.[0] || {});
+  console.log('extraData POST insert', mode, mainTable, table, res);
+  return res;
+}

package/server/plugins/extra/extraDataGet.js

@@ -0,0 +1,44 @@
+import { config, getTemplate, pgClients, getMeta } from "../../../utils.js";
+
+const defaultTable = 'crm.extra_data';
+
+export default async function extraDataGet({
+  pg = pgClients.client, table: mainTable, form, id,
+}) {
+  if (!id || !form || !mainTable) {
+    return null;
+  }
+
+  const loadTemplate = await getTemplate('form', form);
+  if (!loadTemplate?.extra) return null;
+
+  const table = config.extraData?.[mainTable]
+    || config.extraData?.[mainTable.split('.').shift()]
+    || config.extraData?.['default']
+    || config.extraData
+    || defaultTable;
+
+  const { pk: mainPK } = await getMeta({ pg, table: mainTable });
+  const { pk, columns: extraColumns = [] } = await getMeta({ pg, table });
+
+  if (!mainPK) {
+    return { error: `table pk not found: ${mainTable}`, status: 404 };
+  }
+
+  if (!pk) {
+    return { error: `extra table pk not found: ${table}`, status: 404 };
+  }
+
+  const mode = extraColumns.find((col) => col?.name === mainPK)
+    ? 'column'
+    : 'property';
+
+  const { rows = [] } = await pg.query(`select * from ${table} where ${mode === 'column' ? mainPK : 'object_id'}=$1`, [id]);
+
+  if (mode === 'column') {
+    return rows[0];
+  }
+
+  const res = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr.value_text }), {});
+  return res;
+};

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/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/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];

package/server/plugins/redis/funcs/redisClients.js

@@ -1,3 +1,3 @@
-const redisClients = {};
-
-export default redisClients;
+const redisClients = {};
+
+export default redisClients;

package/server/plugins/redis/index.js

@@ -1,17 +1,17 @@
-// import redis from './client.js';
-import redisClients from './funcs/redisClients.js';
-
-function close(fastify) {
-  // redis.quit();
-  Object.keys(redisClients).forEach((key) => redisClients[key].quit());
-}
-
-async function plugin(fastify) {
-  // const client = getRedis({ db: 0 });
-  // client.getJSON = client.get;
-  // fastify.decorate('rclient', client);
-  // fastify.decorate('getRedis', getRedis);
-  fastify.addHook('onClose', close);
-}
-
-export default plugin;
+// import redis from './client.js';
+import redisClients from './funcs/redisClients.js';
+
+function close(fastify) {
+  // redis.quit();
+  Object.keys(redisClients).forEach((key) => redisClients[key].quit());
+}
+
+async function plugin(fastify) {
+  // const client = getRedis({ db: 0 });
+  // client.getJSON = client.get;
+  // fastify.decorate('rclient', client);
+  // fastify.decorate('getRedis', getRedis);
+  fastify.addHook('onClose', close);
+}
+
+export default plugin;

package/server/plugins/table/funcs/getData.js

@@ -0,0 +1,8 @@
+import routeData from '../../../routes/table/controllers/data.js';
+
+export default async function getData({ id, table, pg, filter, limit, page, search, user }) {
+  const params = { table, id };
+  const query = { filter, limit, page, search };
+  const result = await routeData({ pg, params, query, user });
+  return result;
+}