@opengis/fastify-table 1.0.26 → 1.0.28

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.28 - 14.05.2024
+
+- dblist api set
+
+## 1.0.27 - 12.05.2024
+
+- code optimization
+
 ## 1.0.26 - 09.05.2024
 
 - fix getTableSql

package/crud/controllers/insert.js

@@ -1,29 +1,29 @@
-import dataInsert from '../funcs/dataInsert.js';
-import getToken from '../funcs/getToken.js';
-import checkXSS from './utils/checkXSS.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-
-export default async function insert(req) {
-  const loadTemplate = await getTemplate('table', req.params.table);
-  const { table } = loadTemplate || req.params || {};
-  if (!table) return { status: 404, message: 'table is required' };
-
-  const { funcs, session, params } = req;
-  const tokenDataString = await getToken({
-    funcs, session, token: params.table, mode: 'a', json: 0,
-  });
-
-  const { form, add } = JSON.parse(tokenDataString || '{}');
-
-  const formData = form ? await getTemplate('form', form) : {};
-
-  const xssCheck = checkXSS({ body: req.body, schema: formData?.schema });
-
-  if (xssCheck.error && formData?.xssCheck !== false) {
-    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
-    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
-  }
-
-  const res = await dataInsert({ table: add || table, data: req.body });
-  return { rows: res.rows };
-}
+import dataInsert from '../funcs/dataInsert.js';
+import getToken from '../funcs/getToken.js';
+import checkXSS from './utils/checkXSS.js';
+import getTemplate from '../../table/controllers/utils/getTemplate.js';
+
+export default async function insert(req) {
+  const loadTemplate = await getTemplate('table', req.params.table);
+  const { table } = loadTemplate || req.params || {};
+  if (!table) return { status: 404, message: 'table is required' };
+
+  const { funcs, session, params } = req;
+  const tokenDataString = await getToken({
+    funcs, session, token: params.table, mode: 'a', json: 0,
+  });
+
+  const { form, add } = JSON.parse(tokenDataString || '{}');
+
+  const formData = form ? await getTemplate('form', form) : {};
+
+  const xssCheck = checkXSS({ body: req.body, schema: formData?.schema });
+
+  if (xssCheck.error && formData?.xssCheck !== false) {
+    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
+    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
+  }
+
+  const res = await dataInsert({ table: add || table, data: req.body });
+  return { rows: res.rows };
+}

package/crud/controllers/update.js

@@ -1,31 +1,31 @@
-import dataUpdate from '../funcs/dataUpdate.js';
-import getToken from '../funcs/getToken.js';
-import checkXSS from './utils/checkXSS.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-
-export default async function update(req) {
-  const loadTemplate = await getTemplate('table', req.params.table);
-  const { table } = loadTemplate || req.params || {};
-  const { id } = req.params || {};
-  if (!req.params?.table) return { message: 'table is required', status: 404 };
-  if (!id) return { message: 'id is required', status: 404 };
-
-  const { funcs, session, params } = req;
-  const tokenDataString = await getToken({
-    funcs, session, token: params.table, mode: 'w', json: 0,
-  });
-
-  const tokenData = JSON.parse(tokenDataString || '{}');
-
-  const formData = tokenData?.form ? await getTemplate('form', tokenData.form) : {};
-
-  const xssCheck = checkXSS({ body: req.body, schema: formData?.schema });
-
-  if (xssCheck.error && formData?.xssCheck !== false) {
-    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
-    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
-  }
-
-  const res = await dataUpdate({ table: tokenData?.table || table, id: tokenData?.id || id, data: req.body });
-  return res;
-}
+import dataUpdate from '../funcs/dataUpdate.js';
+import getToken from '../funcs/getToken.js';
+import checkXSS from './utils/checkXSS.js';
+import getTemplate from '../../table/controllers/utils/getTemplate.js';
+
+export default async function update(req) {
+  const loadTemplate = await getTemplate('table', req.params.table);
+  const { table } = loadTemplate || req.params || {};
+  const { id } = req.params || {};
+  if (!req.params?.table) return { message: 'table is required', status: 404 };
+  if (!id) return { message: 'id is required', status: 404 };
+
+  const { funcs, session, params } = req;
+  const tokenDataString = await getToken({
+    funcs, session, token: params.table, mode: 'w', json: 0,
+  });
+
+  const tokenData = JSON.parse(tokenDataString || '{}');
+
+  const formData = tokenData?.form ? await getTemplate('form', tokenData.form) : {};
+
+  const xssCheck = checkXSS({ body: req.body, schema: formData?.schema });
+
+  if (xssCheck.error && formData?.xssCheck !== false) {
+    req.log.warn({ name: 'injection/xss', msg: xssCheck.error, table }, req);
+    return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
+  }
+
+  const res = await dataUpdate({ table: tokenData?.table || table, id: tokenData?.id || id, data: req.body });
+  return res;
+}

package/crud/funcs/dataInsert.js

@@ -19,6 +19,6 @@ export default async function dataInsert({ table, data }) {
     
     returning *`;
 
-  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && !Array.isArray(el[1]) ? 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]))]) || {};
   return res;
 }

package/crud/funcs/dataUpdate.js

@@ -5,16 +5,20 @@ import getMeta from '../../pg/funcs/getMeta.js';
 export default async function dataUpdate({
   table, id, data,
 }) {
+  if (!data || !table || !id) return null;
+
   const pg = getPG({ name: 'client' });
   const { columns, pk } = await getMeta(table);
 
   const names = columns?.map((el) => el.name);
   const filterData = Object.keys(data)
-    .filter((el) => data[el] && names?.includes(el)).map((el) => [el, data[el]]);
+    .filter((el) => data[el] && names?.includes(el));
+
+  const filterValue = filterData.map((el) => [el, data[el]]).map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
 
-  const updateQuery = `UPDATE ${table} SET ${filterData?.map((key, i) => `"${key[0]}"=$${i + 2}`).join(',')} 
+  const updateQuery = `UPDATE ${table} SET ${filterData?.map((key, i) => `"${key}"=$${i + 2}`).join(',')} 
       WHERE ${pk} = $1 returning *`;
   //  console.log(updateDataset);
-  const res = await pg.query(updateQuery, [id, ...filterData.map((el) => (typeof el[1] === 'object' && !Array.isArray(el[1]) ? JSON.stringify(el[1]) : el[1]))]).then(el => el?.rows?.[0]) || {};
+  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
   return res;
 }

package/crud/funcs/getOpt.js

@@ -1,10 +1,10 @@
-import getRedis from '../../redis/funcs/getRedis.js';
-
-export default async function getOpt(token, funcs) {
-  const rclient = getRedis({ db: 0, funcs });
-
-  const key = `opt:${token}`;
-  const data = await rclient.get(key);
-  if (!data) return null;
-  return JSON.parse(data);
-}
+import getRedis from '../../redis/funcs/getRedis.js';
+
+export default async function getOpt(token, funcs) {
+  const rclient = getRedis({ db: 0, funcs });
+
+  const key = `opt:${token}`;
+  const data = await rclient.get(key);
+  if (!data) return null;
+  return JSON.parse(data);
+}

package/crud/funcs/setOpt.js

@@ -1,16 +1,16 @@
-import { createHash } from 'crypto';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-function md5(string) {
-  return createHash('md5').update(string).digest('hex');
-}
-
-export default async function setOpt(params) {
-  const token = Buffer.from(md5(typeof params === 'object' ? JSON.stringify(params) : params), 'hex').toString('base64').replace(/[+-=]+/g, '');
-  // const token = md5(params);
-  const key = `opt:${token}`;
-
-  const rclient = getRedis({ db: 0, funcs: params.funcs });
-  await rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
-  return token;
-}
+import { createHash } from 'crypto';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+function md5(string) {
+  return createHash('md5').update(string).digest('hex');
+}
+
+export default async function setOpt(params) {
+  const token = Buffer.from(md5(typeof params === 'object' ? JSON.stringify(params) : params), 'hex').toString('base64').replace(/[+-=]+/g, '');
+  // const token = md5(params);
+  const key = `opt:${token}`;
+
+  const rclient = getRedis({ db: 0, funcs: params.funcs });
+  await rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
+  return token;
+}

package/crud/index.js

@@ -1,29 +1,29 @@
-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 update from './controllers/update.js';
-import insert from './controllers/insert.js';
-import deleteCrud from './controllers/deleteCrud.js';
-
-// import config from '../config.js';
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  // funcs
-  fastify.decorate('setOpt', setOpt);
-  fastify.decorate('getOpt', getOPt);
-  fastify.decorate('dataUpdate', dataUpdate);
-  fastify.decorate('dataInsert', dataInsert);
-
-  fastify.decorate('isFileExists', isFileExists);
-
-  // api
-  fastify.put(`${prefix}/table/:table/:id`, {}, update);
-  fastify.delete(`${prefix}/table/:table/:id`, {}, deleteCrud);
-  fastify.post(`${prefix}/table/:table`, {}, insert);
-}
-
-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 update from './controllers/update.js';
+import insert from './controllers/insert.js';
+import deleteCrud from './controllers/deleteCrud.js';
+
+// import config from '../config.js';
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  // funcs
+  fastify.decorate('setOpt', setOpt);
+  fastify.decorate('getOpt', getOPt);
+  fastify.decorate('dataUpdate', dataUpdate);
+  fastify.decorate('dataInsert', dataInsert);
+
+  fastify.decorate('isFileExists', isFileExists);
+
+  // api
+  fastify.put(`${prefix}/table/:table/:id`, {}, update);
+  fastify.delete(`${prefix}/table/:table/:id`, {}, deleteCrud);
+  fastify.post(`${prefix}/table/:table`, {}, insert);
+}
+
+export default plugin;

package/dblist/controllers/createItem.js

@@ -1,17 +1,32 @@
-import { randomUUID } from 'crypto';
-import { existsSync } from 'fs';
-import { readFile, writeFile } from 'fs/promises';
-
-import checkItem from './utils/checkItem.js';
-
-export default async function insertItem({ body = {} }) {
-  const check = checkItem(body.data);
-  if (check?.error) return check;
-
-  Object.assign(body.data, { id: randomUUID() });
-  const data = existsSync('dblist.json') ? JSON.parse(await readFile('dblist.json') || '[]') : [];
-  data.push(body.data);
-
-  await writeFile('dblist.json', JSON.stringify(data));
-  return { data };
-}
+import { randomUUID } from 'crypto';
+import { existsSync } from 'fs';
+import { readFile, writeFile } from 'fs/promises';
+
+import checkItem from './utils/checkItem.js';
+import formatData from './utils/formatData.js';
+
+export default async function insertItem({ body = {} }) {
+  const check = checkItem(body);
+  if (check?.error) return check;
+
+  const data = existsSync('dblist.json') ? JSON.parse(await readFile('dblist.json') || '[]') : [];
+  const {
+    key, name, database, host, port = 5432,
+  } = body;
+
+  const keys = data.map((el) => el.key);
+  if (keys.includes(key)) {
+    return { error: 'key duplication not allowed', status: 400 };
+  }
+  data.push({
+    id: randomUUID(),
+    key,
+    name,
+    database,
+    host,
+    port,
+  });
+
+  await writeFile('dblist.json', JSON.stringify(data));
+  return { data: formatData(data) };
+}

package/dblist/controllers/deleteItem.js

@@ -1,12 +1,14 @@
-import { existsSync } from 'fs';
-import { readFile, writeFile } from 'fs/promises';
-
-export default async function deleteItem({ params = {} }) {
-  const { id } = params;
-  if (!id) return { error: 'not enough params', status: 400 };
-  if (!existsSync('dblist.json')) return { data: [] };
-  const data = JSON.parse(await readFile('dblist.json') || '[]');
-
-  await writeFile('dblist.json', JSON.stringify(data.filter((el) => el.id !== id)));
-  return { data };
-}
+import { existsSync } from 'fs';
+import { readFile, writeFile } from 'fs/promises';
+
+import formatData from './utils/formatData.js';
+
+export default async function deleteItem({ params = {} }) {
+  const { id } = params;
+  if (!id) return { error: 'not enough params', status: 400 };
+  if (!existsSync('dblist.json')) return { data: [] };
+  const data = JSON.parse(await readFile('dblist.json') || '[]');
+
+  await writeFile('dblist.json', JSON.stringify(data.filter((el) => el.key !== id && el.id !== id)));
+  return { data: formatData(data.filter((el) => el.key !== id && el.id !== id)) };
+}

package/dblist/controllers/readItems.js

@@ -1,8 +1,10 @@
-import { existsSync } from 'fs';
-import { readFile } from 'fs/promises';
-
-export default async function readItemList(req) {
-  const data = existsSync('dblist.json') ? JSON.parse(await readFile('dblist.json') || '[]') : [];
-  // const { user = {} } = req.session?.passport || {};
-  return { data };
-}
+import { existsSync } from 'fs';
+import { readFile } from 'fs/promises';
+
+import formatData from './utils/formatData.js';
+
+export default async function readItemList(req) {
+  const filedata = existsSync('dblist.json') ? JSON.parse(await readFile('dblist.json') || '[]') : [];
+  const data = formatData(filedata);
+  return { current: req.session?.currentDB || data[0]?.id, data };
+}

package/dblist/controllers/setItem.js

@@ -0,0 +1,21 @@
+import { existsSync } from 'fs';
+import { readFile } from 'fs/promises';
+
+export default async function setItem({
+  params = {}, session = {},
+}) {
+  const { id } = params;
+  if (!id) return { error: 'not enough params', status: 400 };
+
+  if (!existsSync('dblist.json')) {
+    return { error: 'nothing to update: 1', status: 400 };
+  }
+
+  const data = JSON.parse(await readFile('dblist.json') || '[]');
+  const current = data.find((el) => [el.id, el.key].includes(id));
+  if (!current?.database) {
+    return { error: 'invalid param id', status: 400 };
+  }
+  Object.assign(session, { currentDB: id });
+  return { current: id };
+}

package/dblist/controllers/updateItem.js

@@ -1,22 +1,25 @@
-import { existsSync } from 'fs';
-import { readFile, writeFile } from 'fs/promises';
-
-import checkItem from './utils/checkItem.js';
-
-export default async function updateItem({ body = {}, params = {} }) {
-  const { id } = params;
-  if (!id) return { error: 'not enough params', status: 400 };
-
-  if (!existsSync('dblist.json')) {
-    return { error: 'nothing to update: 1', status: 400 };
-  }
-
-  const check = checkItem(body.data);
-  if (check?.error) return check;
-
-  const data = JSON.parse(await readFile('dblist.json') || '[]');
-  data.filter((el) => el.id === id)?.forEach((el) => Object.assign(el, body.data));
-
-  await writeFile('dblist.json', JSON.stringify(data));
-  return { data };
-}
+import { existsSync } from 'fs';
+import { readFile, writeFile } from 'fs/promises';
+
+import checkItem from './utils/checkItem.js';
+import formatData from './utils/formatData.js';
+
+export default async function updateItem({ body = {}, params = {} }) {
+  const { id } = params;
+  if (!id) return { error: 'not enough params', status: 400 };
+
+  if (!existsSync('dblist.json')) {
+    return { error: 'nothing to update: 1', status: 400 };
+  }
+
+  const check = checkItem(body);
+  if (check?.error) return check;
+
+  const data = JSON.parse(await readFile('dblist.json') || '[]');
+  data.filter((el) => [el.id, el.key].includes(id))?.forEach((el) => {
+    ['key', 'name', 'database', 'host', 'port'].forEach((key) => Object.assign(el, { [key]: body[key] }));
+  });
+
+  await writeFile('dblist.json', JSON.stringify(data));
+  return { data: formatData(data) };
+}

package/dblist/controllers/utils/checkItem.js

@@ -1,9 +1,24 @@
-export default function validateItem(item) {
-  if (!item || typeof item !== 'object' || Array.isArray(item)) {
-    return { error: 'param data is invalid: 1', status: 400 };
-  }
-  if (!item.options?.database || Object.keys(item).filter((key) => !['key', 'name', 'options'].includes(key) || (typeof item[key] !== 'string' && key !== 'options')).length) {
-    return { error: 'param data is invalid: 2', status: 400 };
-  }
-  return null;
-}
+export default function validateItem(item) {
+  if (!item || typeof item !== 'object' || Array.isArray(item)) {
+    return { error: 'param data is invalid: 1', status: 400 };
+  }
+  const {
+    key, name, database, host, port,
+  } = item;
+  if (!key) {
+    return { error: 'param body.key is required', status: 400 };
+  }
+  if (!name) {
+    return { error: 'param body.name is required', status: 400 };
+  }
+  if (!database) {
+    return { error: 'param body.database is required', status: 400 };
+  }
+  if (!host) {
+    return { error: 'param body.host is required', status: 400 };
+  }
+  if (!port) {
+    return { error: 'param body.port is required', status: 400 };
+  }
+  return null;
+}

package/dblist/controllers/utils/formatData.js

@@ -0,0 +1,7 @@
+const showKeys = ['id', 'key', 'name'];
+
+export default function formatData(data = []) {
+  return data?.length
+    ? data.map((el) => Object.keys(el).filter((key) => showKeys.includes(key)).reduce((acc, curr) => Object.assign(acc, { [curr]: el[curr] }), {}))
+    : [];
+}

package/dblist/index.js

@@ -1,40 +1,49 @@
-import createItem from './controllers/createItem.js';
-import readItemList from './controllers/readItems.js';
-import updateItem from './controllers/updateItem.js';
-import deleteItem from './controllers/deleteItem.js';
-
-export default async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.route({
-    method: 'POST',
-    url: `${prefix}/list`,
-    config: {
-      policy: [],
-    },
-    handler: createItem,
-  });
-  fastify.route({
-    method: 'GET',
-    url: `${prefix}/list`,
-    config: {
-      policy: [],
-    },
-    handler: readItemList,
-  });
-  fastify.route({
-    method: 'PUT',
-    url: `${prefix}/list/:id`,
-    config: {
-      policy: [],
-    },
-    handler: updateItem,
-  });
-  fastify.route({
-    method: 'DELETE',
-    url: `${prefix}/list/:id`,
-    config: {
-      policy: [],
-    },
-    handler: deleteItem,
-  });
-}
+import createItem from './controllers/createItem.js';
+import readItemList from './controllers/readItems.js';
+import updateItem from './controllers/updateItem.js';
+import deleteItem from './controllers/deleteItem.js';
+import setItem from './controllers/setItem.js';
+
+export default async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.route({
+    method: 'POST',
+    url: `${prefix}/list`,
+    config: {
+      policy: [],
+    },
+    handler: createItem,
+  });
+  fastify.route({
+    method: 'GET',
+    url: `${prefix}/list`,
+    config: {
+      policy: [],
+    },
+    handler: readItemList,
+  });
+  fastify.route({
+    method: 'PUT',
+    url: `${prefix}/list/:id`,
+    config: {
+      policy: [],
+    },
+    handler: updateItem,
+  });
+  fastify.route({
+    method: 'DELETE',
+    url: `${prefix}/list/:id`,
+    config: {
+      policy: [],
+    },
+    handler: deleteItem,
+  });
+  fastify.route({
+    method: 'GET',
+    url: `${prefix}/list/:id`,
+    config: {
+      policy: [],
+    },
+    handler: setItem,
+  });
+}

package/helper.js

@@ -1,28 +1,28 @@
-// This file contains code that we reuse
-// between our tests.
-import Fastify from 'fastify';
-import config from './test/config.js';
-import appService from './index.js';
-
-import rclient from './redis/client.js';
-import pgClients from './pg/pgClients.js';
-
-// automatically build and tear down our instance
-async function build(t) {
-  // you can set all the options supported by the fastify CLI command
-  // const argv = [AppPath]
-  process.env.NODE_ENV = 'production';
-  const app = Fastify({ logger: false });
-  app.register(appService, config);
-  // close the app after we are done
-  t.after(() => {
-    // console.log('close app');
-    pgClients.client.end();
-    rclient.quit();
-    app.close();
-  });
-
-  return app;
-}
-
-export default build;
+// This file contains code that we reuse
+// between our tests.
+import Fastify from 'fastify';
+import config from './test/config.js';
+import appService from './index.js';
+
+import rclient from './redis/client.js';
+import pgClients from './pg/pgClients.js';
+
+// automatically build and tear down our instance
+async function build(t) {
+  // you can set all the options supported by the fastify CLI command
+  // const argv = [AppPath]
+  process.env.NODE_ENV = 'production';
+  const app = Fastify({ logger: false });
+  app.register(appService, config);
+  // close the app after we are done
+  t.after(() => {
+    // console.log('close app');
+    pgClients.client.end();
+    rclient.quit();
+    app.close();
+  });
+
+  return app;
+}
+
+export default build;