@opengis/fastify-table 1.0.10 → 1.0.11

package/crud/controllers/insert.js

@@ -1,5 +1,5 @@
 import dataInsert from '../funcs/dataInsert.js';
-import getIdByToken from '../funcs/getIdByToken.js';
+import getToken from '../funcs/getToken.js';
 import checkXSS from './utils/checkXSS.js';
 import getTemplate from '../../table/controllers/utils/getTemplate.js';
 
@@ -8,7 +8,7 @@ export default async function insert(req) {
   if (!table) return { status: 404, message: 'table is required' };
 
   const { funcs, session, params } = req;
-  const tokenDataString = await getIdByToken({
+  const tokenDataString = await getToken({
     funcs, session, token: params.table, mode: 'a', json: 0,
   });
 

package/crud/controllers/update.js

@@ -1,5 +1,5 @@
 import dataUpdate from '../funcs/dataUpdate.js';
-import getIdByToken from '../funcs/getIdByToken.js';
+import getToken from '../funcs/getToken.js';
 import checkXSS from './utils/checkXSS.js';
 import getTemplate from '../../table/controllers/utils/getTemplate.js';
 
@@ -9,7 +9,7 @@ export default async function update(req) {
   if (!id) return { message: 'id is required', status: 404 };
 
   const { funcs, session, params } = req;
-  const tokenDataString = await getIdByToken({
+  const tokenDataString = await getToken({
     funcs, session, token: params.table, mode: 'w', json: 0,
   });
 

package/crud/funcs/dataDelete.js

@@ -7,7 +7,7 @@ export default async function dataDelete({
 }) {
   const pg = getPG({ name: 'client' });
   const { pk } = await getMeta(table);
-  if (!pg.tlist.includes(table)) return 'table not exist';
+  if (!pg.tlist?.includes(table)) return 'table not exist';
   const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
   //  console.log(updateDataset);
   const res = await pg.one(delQuery, [id]) || {};

package/crud/funcs/dataUpdate.js

@@ -8,13 +8,13 @@ export default async function dataUpdate({
   const pg = getPG({ name: 'client' });
   const { columns, pk } = await getMeta(table);
 
-  const names = columns.map((el) => el.name);
+  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)).map((el) => [el, data[el]]);
 
   const updateQuery = `UPDATE ${table} SET ${filterData?.map((key, i) => `"${key[0]}"=$${i + 2}`).join(',')} 
       WHERE ${pk} = $1 returning *`;
   //  console.log(updateDataset);
-  const res = await pg.one(updateQuery, [id, ...filterData.map((el) => (typeof el[1] === 'object' ? JSON.stringify(el[1]) : el[1]))]) || {};
+  const res = await pg.query(updateQuery, [id, ...filterData.map((el) => (typeof el[1] === 'object' ? JSON.stringify(el[1]) : el[1]))]).then(el => el?.rows?.[0]) || {};
   return res;
 }

package/crud/funcs/{getIdByToken.js → getToken.js}

@@ -1,4 +1,5 @@
 import getRedis from '../../redis/funcs/getRedis.js';
+import config from '../../config.js';
 
 function sprintf(str, ...args) {
   return str.replace(/%s/g, () => args.shift());
@@ -12,17 +13,14 @@ const keys = {
 };
 
 async function getIdByToken({
-  funcs, session, token, mode = 'r', json,
+  uid, token, mode = 'r', json,
 }) {
   if (mode === 'r') return token;
 
-  const { config } = funcs;
-  const { uid } = session?.passport?.user || (config.local ? { uid: '1' } : {});
+  const rclient = getRedis({ db: 0 });
 
-  const rclient2 = getRedis({ db: 2, funcs });
-
-  const key = sprintf(keys[mode], config?.pg?.database, uid);
-  const id = await rclient2.hget(key, token);
+  const key = sprintf(keys[mode], config?.pg?.database, uid?.toString());
+  const id = await rclient.hget(key, token);
   return json && id[0] === '{' ? JSON.parse(id) : id;
 }
 

package/crud/funcs/{setTokenById.js → setToken.js}

@@ -1,5 +1,6 @@
 import { createHash, randomUUID } from 'crypto';
 
+import config from '../../config.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 
 const generateCodes = (ids, userToken) => {
@@ -14,14 +15,11 @@ const generateCodes = (ids, userToken) => {
   return { codes, obj };
 };
 
-function setTokenById({
-  funcs, ids: idsOrigin, mode = 'r', session, referer, array,
+function setToken({
+  ids: idsOrigin, mode = 'r', uid, referer, array,
 }) {
-  const { config } = funcs;
-  const { uid } = session?.passport?.user || (config.local ? { uid: '1' } : {});
-
-  const rclient2 = getRedis({ db: 2, funcs });
-  const rclient5 = getRedis({ db: 5, funcs });
+  const rclient2 = getRedis({ db: 0 });
+  //  const rclient5 = getRedis({ db: 0, funcs });
 
   if (!uid) return { user: 'empty' };
   if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
@@ -41,15 +39,15 @@ function setTokenById({
   }[mode]}:${uid}`, codes);
 
   // log token for debug. add extra data - uid, mode, date
-  const dt = new Date().toISOString();
-  const codesLog = Object.keys(codes).reduce((acc, key) => {
+  /* const dt = new Date().toISOString();
+   const codesLog = Object.keys(codes).reduce((acc, key) => {
     acc[key] = `{"referer": "${referer}" ,"uid":"${uid}","mode":"${mode}","date":"${dt}",${codes[key].substr(1)}`;
     return acc;
   }, {});
-  rclient5.hmset(`${config.pg.database}:token:edit`, codesLog); // 'EX', 64800
+   rclient5.hmset(`${config.pg.database}:token:edit`, codesLog); // 'EX', 64800 */
 
   // TODO дополнительно писать в hset token -> uid
   return array ? Object.values(obj) : obj;
 }
 
-export default setTokenById;
+export default setToken;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/pg/funcs/getMeta.js

@@ -10,7 +10,7 @@ export default async function getMeta(opt) {
 
   if (data[table]) return data[table];
 
-  if (!pg.tlist.includes(table)) {
+  if (!pg.tlist?.includes(table)) {
     return { error: `${table} - not found`, status: 400 };
   }
 

package/pg/funcs/getPG.js

@@ -19,6 +19,9 @@ function getPG({
   };
 
   pgClients[name] = new pg.Pool(dbConfig);
+  pgClients[name].init = async () => {
+    await init(pgClients[name]);
+  };
   init(pgClients[name]);
   return pgClients[name];
 }

package/pg/funcs/init.js

@@ -21,7 +21,7 @@ async function init(client) {
   }
 
   async function queryCache(query) {
-    const rclient = getRedis({ db: 0 })
+    const rclient = getRedis({ db: 0 });
     const hash = crypto.createHash('sha1').update(query).digest('base64');
     const keyCache = `pg:${hash}`;
     const cache = await rclient.get(keyCache);

package/pg/pgClients.js

@@ -11,7 +11,10 @@ if (config.pg) {
     user: config.pg?.user || 'postgres',
     password: config.pg?.password || 'postgres',
   });
-  await init(client);
+  client.init = async () => {
+    await init(client);
+  };
+  client.init();
   pgClients.client = client;
 }
 export default pgClients;

package/redis/funcs/getRedis.js

@@ -2,8 +2,7 @@ import Redis from 'ioredis';
 import config from '../../config.js';
 import redisClients from './redisClients.js';
 
-function getRedis({ db, funcs }) {
-  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
+function getRedis({ db }) {
   if (!config.redis) return null;
   if (redisClients[db]) return redisClients[db];
 

package/table/controllers/data.js

@@ -32,17 +32,17 @@ export default async function data(req) {
 
   const limit = Math.min(maxLimit, +(query.limit || 10));
 
-  const offset = query.page ? ` offset ${(query.page - 1) * limit}` : '';
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
   // id, query, filter
-  const orderColumn = query.order || loadTable.order;
+  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
 
-  const order = cols.includes(orderColumn) ? `order by ${orderColumn} ${query.desc ? 'desc' : ''}` : '';
+  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
   const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
   const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
   const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
 
   const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search].filter((el) => el);
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${offset} ${order} limit ${limit}`;
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
 
   if (query.sql === '1') { return q; }
 
@@ -52,6 +52,6 @@ export default async function data(req) {
 
   await metaFormat({ rows, table: params.table });
   return {
-    time: Date.now() - time, total, pk, form, rows, meta, columns, filters,
+    time: Date.now() - time, total, count: rows.length, pk, form, rows, meta, columns, filters,
   };
 }

package/table/funcs/metaFormat/getSelectVal.js

@@ -0,0 +1,20 @@
+import getSelect from '../../controllers/utils/getSelect.js';
+import pg from '../../../pg/pgClients.js';
+import redis from '../../../redis/client.js';
+
+export default async function metaFormat({ name, values }) {
+  const cls = await getSelect(name);
+  if (!cls?.arr && !cls?.sql) return null;
+  const key = `select:${name}`;
+  const cache = !cls.arr ? (await redis.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {}) : {};
+
+  const data = cls.arr || (values.filter(el => !cache[el]).length
+    ? await pg.client.query(`with c(id,text) as (${cls.sql}) select * from c where id = any('{${values.filter(el => !cache[el])}}')`).then(el => el.rows)
+    : []);
+
+  const clsAr = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.text }), {}) };
+  if (!cls.arr && data.length) {
+    redis.hmset(key, clsAr);
+  }
+  return clsAr;
+}

package/table/funcs/metaFormat/index.js

@@ -1,6 +1,5 @@
 import getTemplate from '../../controllers/utils/getTemplate.js';
-import getSelect from '../../controllers/utils/getSelect.js';
-import pg from '../../../pg/pgClients.js';
+import getSelectVal from './getSelectVal.js';
 
 export default async function metaFormat({ rows, table }) {
   const loadTable = await getTemplate('table', table);
@@ -9,14 +8,11 @@ export default async function metaFormat({ rows, table }) {
   // cls & select format
 
   await Promise.all(selectCols?.map(async (attr) => {
-    const val = [...new Set(rows?.map((el) => el[attr.name]).flat())];
-    if (!val.filter((el) => el).length) return null;
-    const cls = await getSelect(attr.data);
-    if (!cls?.arr && !cls?.sql) return null;
+    const val = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => el);
+    if (!val.length) return null;
 
-    const data = cls.arr || await pg.client.query(`with c(id,text) as (${cls.sql}) select * from c where id = any('{${val}}')`).then(el => el.rows);
-
-    const clsAr = data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.text }), {});
+    const clsAr = await getSelectVal({ name: attr.data, values: val });
+    if (!clsAr) return null;
     rows.forEach(el => {
       Object.assign(el, { [`${attr.name}_text`]: clsAr[el[attr.name]] || el[attr.name] });
     });

package/table/index.js

@@ -4,12 +4,20 @@ import filter from './controllers/filter.js';
 import form from './controllers/form.js';
 import metaFormat from './funcs/metaFormat/index.js';
 
+const tableSchema = {
+  querystring: {
+    page: { type: 'number' },
+    order: { type: 'string' },
+    filter: { type: 'string' },
+  },
+};
+
 async function plugin(fastify, config = {}) {
   const prefix = config.prefix || '/api';
   fastify.decorate('metaFormat', metaFormat);
 
   fastify.get(`${prefix}/suggest/:data`, {}, suggest);
-  fastify.get(`${prefix}/data/:table/:id?`, {}, data); // vs.crm.data.api с node
+  fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
   fastify.get(`${prefix}/filter/:table`, {}, filter);
   fastify.get(`${prefix}/form/:form`, {}, form);
 }

package/test/api/crud.xss.test.js

@@ -3,7 +3,7 @@ import assert from 'node:assert';
 
 import build from '../../helper.js';
 
-import setTokenById from '../../crud/funcs/setTokenById.js';
+import setToken from '../../crud/funcs/setToken.js';
 import config from '../config.js';
 
 test('api crud xss', async (t) => {
@@ -17,19 +17,17 @@ test('api crud xss', async (t) => {
   let editTokens;
 
   // before
-  t.test('setTokenById', async () => {
-    addTokens = setTokenById({
-      funcs: { config },
+  t.test('setToken', async () => {
+    addTokens = setToken({
       ids: [JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' })],
       mode: 'a',
-      session,
+      uid: 1,
       array: 1,
     });
-    editTokens = setTokenById({
-      funcs: { config },
+    editTokens = setToken({
       ids: [JSON.stringify({ id: '5400000', table: 'gis.dataset', form: 'test.dataset.form' })],
       mode: 'w',
-      session,
+      uid: 1,
       array: 1,
     });
     assert.ok(addTokens.length === 1 && editTokens.length === 1, 'invalid token');

package/test/funcs/crud.test.js

@@ -1,6 +1,6 @@
 import { test } from 'node:test';
 import assert from 'node:assert';
-
+import config from '../config.js';
 import pgClients from '../../pg/pgClients.js';
 import rclient from '../../redis/client.js';
 
@@ -12,11 +12,11 @@ import isFileExists from '../../crud/funcs/isFileExists.js';
 import getOpt from '../../crud/funcs/getOpt.js';
 import setOpt from '../../crud/funcs/setOpt.js';
 
-import getIdByToken from '../../crud/funcs/getIdByToken.js';
-import setTokenById from '../../crud/funcs/setTokenById.js';
-import config from '../config.js';
+import getToken from '../../crud/funcs/getToken.js';
+import setToken from '../../crud/funcs/setToken.js';
 
 test('funcs crud', async (t) => {
+  await pgClients.client.init();
   await t.test('getOpt/setOpt', async () => {
     const opt = await setOpt({ table: 'gis.dataset' });
     const data = await getOpt(opt);
@@ -49,20 +49,19 @@ test('funcs crud', async (t) => {
   const session = { passport: { user: { uid: '1' } } };
   const tokenData = JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' });
 
-  await t.test('setTokenById', async () => {
-    tokens = setTokenById({
+  await t.test('setToken', async () => {
+    tokens = setToken({
       funcs: { config },
       ids: [tokenData],
       mode: 'a',
-      session,
+      uid: 1,
       array: 1,
     });
     assert.equal(tokens.length, 1);
   });
-  await t.test('getIdByToken', async () => {
-    const data = await getIdByToken({
-      funcs: { config },
-      session,
+  await t.test('getToken', async () => {
+    const data = await getToken({
+      uid: 1,
       token: tokens[0],
       mode: 'a',
     });

package/test/funcs/pg.test.js

@@ -7,19 +7,20 @@ import getMeta from '../../pg/funcs/getMeta.js';
 import autoIndex from '../../pg/funcs/autoIndex.js';
 import pgClients from '../../pg/pgClients.js';
 import rclient from '../../redis/client.js';
-import getPG from '../../pg/funcs/getPG.js'
+// import pgClients from '../../pg/funcs/pgClients.js';
 
 test('funcs pg', async (t) => {
+  await pgClients.client.init();
   await t.test('getMeta', async () => {
     const { columns } = await getMeta({ table: 'gis.dataset' });
     // console.log(columns)
     assert.ok(columns);
   });
 
-  await t.test('getPG', async (t) => {
+  /* await t.test('getPG', async (t) => {
     const data = await getPG({});
     assert.ok(data);
-  });
+  }); */
 
   await t.test('autoIndex', async () => {
     await autoIndex({ table: 'gis.dataset', columns: ['service_type'] });
@@ -27,6 +28,7 @@ test('funcs pg', async (t) => {
   });
   t.after(() => {
     pgClients.client.end();
+
     rclient.quit();
   });
 });

package/test/funcs/table.test.js

@@ -1,48 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-import '../config.js';
-import pgClients from '../../pg/pgClients.js';
-import rclient from '../../redis/client.js';
-import getFilterSQL from '../../table/funcs/getFilterSQL/index.js';
-import getTableSql from '../../table/funcs/getFilterSQL/index.js';
-import getCustomQuery from '../../table/funcs/getFilterSQL/index.js';
-import getFilterQuery from '../../table/funcs/getFilterSQL/index.js';
-import formatValue from '../../table/funcs/getFilterSQL/index.js';
-import getOptimizedQuery from '../../table/funcs/getFilterSQL/index.js';
-
-test('fucns table', async (t) => {
-  await t.test('getMeta', async () => {
-    const data = await getFilterSQL({ table: 'gis.dataset', filter: 'service_type=1' });
-    // console.log(data);
-    assert.ok(data.q);
-  });
-  
-  await t.test('formatValue', async (t) => {
-    const data = await formatValue( {table: 'gis.dataset'} );
-    assert.ok(data);
-  });
-  
-  await t.test('getCustomQuery', async (t) => {
-    const data = await getCustomQuery( {table: 'gis.dataset'} );
-    assert.ok(data);
-  });
-  
-  await t.test('getFilterQuery', async (t) => {
-    const data = await getFilterQuery( {table: 'gis.dataset'} );
-    assert.ok(data);
-  });
-  
-  await t.test('getOptimizedQuery', async (t) => {
-    const data = await getOptimizedQuery( {table: 'gis.dataset'} );
-    assert.ok(data);
-  });
-  
-  await t.test('getTableSql', async (t) => {
-    const data = await getTableSql( {table: 'gis.dataset'} );
-    assert.ok(data);
-  });
-  t.after(() => {
-    pgClients.client.end();
-    rclient.quit();
-  });
-});