@opengis/fastify-table 1.0.9 → 1.0.11

package/crud/funcs/dataInsert.js

@@ -1,24 +1,24 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-export default async function dataInsert({ table, data }) {
-  const pg = getPG({ name: 'client' });
-  if (!data) return null;
-  const { columns } = await getMeta(table);
-  if (!columns) return null;
-
-  const names = columns.map((el) => el.name);
-  const filterData = Object.keys(data)
-    .filter((el) => data[el] && names.includes(el)).map((el) => [el, data[el]]);
-
-  const insertQuery = `insert into ${table}
-
-    ( ${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
-
-    values  (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) 
-    
-    returning *`;
-  await pg.query('DROP TRIGGER if exists dataset_before_update_insert ON gis.dataset');
-  const res = await pg.one(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' ? JSON.stringify(el[1]) : el[1]))]) || {};
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function dataInsert({ table, data }) {
+  const pg = getPG({ name: 'client' });
+  if (!data) return null;
+  const { columns } = await getMeta(table);
+  if (!columns) return null;
+
+  const names = columns.map((el) => el.name);
+  const filterData = Object.keys(data)
+    .filter((el) => data[el] && names.includes(el)).map((el) => [el, data[el]]);
+
+  const insertQuery = `insert into ${table}
+
+    ( ${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
+
+    values  (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) 
+    
+    returning *`;
+  await pg.query('DROP TRIGGER if exists dataset_before_update_insert ON gis.dataset');
+  const res = await pg.one(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' ? JSON.stringify(el[1]) : el[1]))]) || {};
+  return res;
+}

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,29 +1,27 @@
-import getRedis from '../../redis/funcs/getRedis.js';
-
-function sprintf(str, ...args) {
-  return str.replace(/%s/g, () => args.shift());
-}
-
-const keys = {
-  r: '%s:token:view:%s',
-  a: '%s:token:add:%s',
-  w: '%s:token:edit:%s',
-  e: '%s:token:exec:%s',
-};
-
-async function getIdByToken({
-  funcs, session, token, mode = 'r', json,
-}) {
-  if (mode === 'r') return token;
-
-  const { config } = funcs;
-  const { uid } = session?.passport?.user || (config.local ? { uid: '1' } : {});
-
-  const rclient2 = getRedis({ db: 2, funcs });
-
-  const key = sprintf(keys[mode], config?.pg?.database, uid);
-  const id = await rclient2.hget(key, token);
-  return json && id[0] === '{' ? JSON.parse(id) : id;
-}
-
-export default getIdByToken;
+import getRedis from '../../redis/funcs/getRedis.js';
+import config from '../../config.js';
+
+function sprintf(str, ...args) {
+  return str.replace(/%s/g, () => args.shift());
+}
+
+const keys = {
+  r: '%s:token:view:%s',
+  a: '%s:token:add:%s',
+  w: '%s:token:edit:%s',
+  e: '%s:token:exec:%s',
+};
+
+async function getIdByToken({
+  uid, token, mode = 'r', json,
+}) {
+  if (mode === 'r') return token;
+
+  const rclient = getRedis({ db: 0 });
+
+  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;
+}
+
+export default getIdByToken;

package/crud/funcs/isFileExists.js

@@ -1,13 +1,13 @@
-import { access } from 'fs/promises';
-
-const isFileExists = async (filepath) => {
-  try {
-    await access(filepath);
-    return true;
-  }
-  catch (err) {
-    return false;
-  }
-};
-
-export default isFileExists;
+import { access } from 'fs/promises';
+
+const isFileExists = async (filepath) => {
+  try {
+    await access(filepath);
+    return true;
+  }
+  catch (err) {
+    return false;
+  }
+};
+
+export default isFileExists;

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

@@ -1,55 +1,53 @@
-import { createHash, randomUUID } from 'crypto';
-
-import getRedis from '../../redis/funcs/getRedis.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 setTokenById({
-  funcs, ids: idsOrigin, mode = 'r', session, 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 });
-
-  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));
-  // update/delete
-
-  if (mode === 'r') return null;
-
-  // TODO generate salt
-  const { codes, obj } = generateCodes(ids, uid);
-
-  if (!Object.keys(codes).length) return { ids: 'empty' };
-
-  rclient2.hmset(`${config.pg.database}:token:${{
-    e: 'exec', r: 'view', w: 'edit', a: 'add',
-  }[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) => {
-    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
-
-  // TODO дополнительно писать в hset token -> uid
-  return array ? Object.values(obj) : obj;
-}
-
-export default setTokenById;
+import { createHash, randomUUID } from 'crypto';
+
+import config from '../../config.js';
+import getRedis from '../../redis/funcs/getRedis.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, mode = 'r', uid, referer, array,
+}) {
+  const rclient2 = getRedis({ db: 0 });
+  //  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));
+  // update/delete
+
+  if (mode === 'r') return null;
+
+  // TODO generate salt
+  const { codes, obj } = generateCodes(ids, uid);
+
+  if (!Object.keys(codes).length) return { ids: 'empty' };
+
+  rclient2.hmset(`${config.pg.database}:token:${{
+    e: 'exec', r: 'view', w: 'edit', a: 'add',
+  }[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) => {
+    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 */
+
+  // TODO дополнительно писать в hset token -> uid
+  return array ? Object.values(obj) : obj;
+}
+
+export default setToken;

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;

package/index.js

@@ -1,32 +1,32 @@
-// import pg from 'pg';
-import fp from 'fastify-plugin';
-import config from './config.js';
-// import rclient from './redis/client.js';
-
-import redisPlugin from './redis/index.js';
-import pgPlugin from './pg/index.js';
-import tablePlugin from './table/index.js';
-import crudPlugin from './crud/index.js';
-import policyPlugin from './policy/index.js';
-
-async function plugin(fastify, opt) {
-  // console.log(opt);
-  config.pg = opt.pg;
-  config.redis = opt.redis;
-
-  // independent npm start / unit test
-  if (!fastify.config) {
-    fastify.decorate('config', config);
-  }
-  if (!fastify.funcs) {
-    fastify.decorateRequest('funcs', fastify);
-  }
-
-  policyPlugin(fastify);
-  redisPlugin(fastify);
-  await pgPlugin(fastify, opt);
-  tablePlugin(fastify, opt);
-  crudPlugin(fastify, opt);
-}
-export default fp(plugin);
-// export { rclient };
+// import pg from 'pg';
+import fp from 'fastify-plugin';
+import config from './config.js';
+// import rclient from './redis/client.js';
+
+import redisPlugin from './redis/index.js';
+import pgPlugin from './pg/index.js';
+import tablePlugin from './table/index.js';
+import crudPlugin from './crud/index.js';
+import policyPlugin from './policy/index.js';
+
+async function plugin(fastify, opt) {
+  // console.log(opt);
+  config.pg = opt.pg;
+  config.redis = opt.redis;
+
+  // independent npm start / unit test
+  if (!fastify.config) {
+    fastify.decorate('config', config);
+  }
+  if (!fastify.funcs) {
+    fastify.decorateRequest('funcs', fastify);
+  }
+
+  policyPlugin(fastify);
+  redisPlugin(fastify);
+  await pgPlugin(fastify, opt);
+  tablePlugin(fastify, opt);
+  crudPlugin(fastify, opt);
+}
+export default fp(plugin);
+// export { rclient };

package/package.json

@@ -1,23 +1,23 @@
-{
-  "name": "@opengis/fastify-table",
-  "version": "1.0.9",
-  "type": "module",
-  "description": "core-plugins",
-  "main": "index.js",
-  "scripts": {
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "dependencies": {
-    "ioredis": "^5.3.2",
-    "fastify": "^4.26.1",
-    "fastify-plugin": "^4.0.0",
-    "pg": "^8.11.3"
-  },
-  "devDependencies": {
-    "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^19.0.4"
-  },
-  "author": "Softpro",
-  "license": "ISC"
+{
+  "name": "@opengis/fastify-table",
+  "version": "1.0.11",
+  "type": "module",
+  "description": "core-plugins",
+  "main": "index.js",
+  "scripts": {
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "dependencies": {
+    "ioredis": "^5.3.2",
+    "fastify": "^4.26.1",
+    "fastify-plugin": "^4.0.0",
+    "pg": "^8.11.3"
+  },
+  "devDependencies": {
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4"
+  },
+  "author": "Softpro",
+  "license": "ISC"
 }

package/pg/funcs/autoIndex.js

@@ -1,89 +1,89 @@
-// const rclient = require('../../redis/client')
-import pgClient from '../pgClients.js';
-
-// subfunc
-const getTable = ({ table }) => table.toLowerCase().replace(/[\n\r]+/g, ' ').split(' from ')
-  .filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-  .map((el) => el.split(/[ )]/)[0]);
-
-const loadedIndex = {};
-
-// main func
-async function autoIndex({ table, columns: filter, pg = pgClient.client }) {
-  if (!filter?.length || !table) return null;
-
-  const attrs = filter.map((el) => (el.name || el).replace(/'/g, '')).sort();
-  const types = filter.map((el) => (el.name ? el : { name: el }))
-    .reduce((p, el) => ({ ...p, [el.name]: el.type || '-' }), {});
-
-  const redisKey = `autoindex1:${table}:${attrs.join(';')}`;
-  const tableList = getTable({ table });
-  const existsCache = loadedIndex[redisKey];
-  if (existsCache) { return 'ok'; }
-
-  const tbs = tableList[0];
-  const [ns, tbl] = tableList[0].split('.');
-  const { rows: index } = await pg.query(`select * from pg_indexes where tablename = '${tbl}' and schemaname = '${ns}'`);
-
-  if (existsCache && index?.length > 0) { return null; }
-  // console.log('autoindex', table, filter?.map((el) => el.name || el));
-  const { rows: cols } = await pg.query(`SELECT attrelid::regclass AS tbl, attname AS aname, atttypid::regtype  AS datatype, atttypid  
-    FROM   pg_attribute WHERE  attrelid = '${tbs}'::regclass and attname = any('{ ${attrs} }')`);
-
-  const qIndex = [];
-  const indexAr = {};
-
-  // console.log(cols);
-  for (let i = 0; i < cols.length; i += 1) {
-    const el = cols[i];
-    el.relname = tbl;
-    el.nspname = ns;
-
-    const indexUsing = (el.datatype === 'geometry' ? 'gist' : null)
-      || (types[el.aname] === 'Text' || el.datatype?.includes('[]') ? 'gin' : null)
-      || 'btree';
-
-    const name = `${el.nspname}_${el.relname}_${el.aname}_${indexUsing}_idx`;
-    const exists = index.filter((ind) => ind.tablename === el.relname && ind.schemaname === el.nspname && ind.indexdef.includes(types[el.aname] === 'Text'
-      ? `gin (${el.aname} gin_trgm_ops)` : `btree (${el.aname})`));
-
-    indexAr[el.aname] = {
-      name, type: el.datatype, exists, // exists1,
-    };
-
-    // drop
-    if (exists?.length > 1) {
-      exists.filter((ind, i1) => i1).forEach((ind) => qIndex.push(`DROP INDEX if exists ${ind.schemaname}.${ind.indexname} `));
-    }
-
-    // add
-    if (exists?.length === 0) {
-      // console.log(`${name} - ${el.datatype}`);
-
-      const suffix = types[el.aname] === 'Text' ? 'gin_trgm_ops' : '';
-      if (['text'].includes(el?.datatype)) {
-        qIndex.push(`CREATE INDEX if not exists ${name} ON ${el.nspname}.${el.relname} USING ${indexUsing} (${el.aname} ${suffix})`);
-      }
-      if (indexUsing === 'gist') {
-        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', 'gist1')}  
-          ON ${el.nspname}.${el.relname} USING gist (${el.aname})`);
-
-        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', 'area')}  
-          ON ${el.nspname}.${el.relname} USING btree (st_area(st_transform(${el.aname},3857)))`);
-        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', '4326')}  
-          ON ${el.nspname}.${el.relname} USING gist (st_transform(${el.aname},4326))`);
-      }
-    }
-  }
-
-  loadedIndex[redisKey] = 1;
-  // throw qIndex;
-  if (!qIndex.length) return null;
-
-  // console.log(qIndex.filter((v, i, a) => a.indexOf(v) === i));
-  // logger.file('index', { table, filter, sql: qIndex.filter((v, i, a) => a.indexOf(v) === i) });
-  qIndex.filter((v, i, a) => a.indexOf(v) === i).map((el) => pg.one(el).catch((err) => console.log(err.toString())));
-  return 'ok';
-}
-
-export default autoIndex;
+// const rclient = require('../../redis/client')
+import pgClient from '../pgClients.js';
+
+// subfunc
+const getTable = ({ table }) => table.toLowerCase().replace(/[\n\r]+/g, ' ').split(' from ')
+  .filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+  .map((el) => el.split(/[ )]/)[0]);
+
+const loadedIndex = {};
+
+// main func
+async function autoIndex({ table, columns: filter, pg = pgClient.client }) {
+  if (!filter?.length || !table) return null;
+
+  const attrs = filter.map((el) => (el.name || el).replace(/'/g, '')).sort();
+  const types = filter.map((el) => (el.name ? el : { name: el }))
+    .reduce((p, el) => ({ ...p, [el.name]: el.type || '-' }), {});
+
+  const redisKey = `autoindex1:${table}:${attrs.join(';')}`;
+  const tableList = getTable({ table });
+  const existsCache = loadedIndex[redisKey];
+  if (existsCache) { return 'ok'; }
+
+  const tbs = tableList[0];
+  const [ns, tbl] = tableList[0].split('.');
+  const { rows: index } = await pg.query(`select * from pg_indexes where tablename = '${tbl}' and schemaname = '${ns}'`);
+
+  if (existsCache && index?.length > 0) { return null; }
+  // console.log('autoindex', table, filter?.map((el) => el.name || el));
+  const { rows: cols } = await pg.query(`SELECT attrelid::regclass AS tbl, attname AS aname, atttypid::regtype  AS datatype, atttypid  
+    FROM   pg_attribute WHERE  attrelid = '${tbs}'::regclass and attname = any('{ ${attrs} }')`);
+
+  const qIndex = [];
+  const indexAr = {};
+
+  // console.log(cols);
+  for (let i = 0; i < cols.length; i += 1) {
+    const el = cols[i];
+    el.relname = tbl;
+    el.nspname = ns;
+
+    const indexUsing = (el.datatype === 'geometry' ? 'gist' : null)
+      || (types[el.aname] === 'Text' || el.datatype?.includes('[]') ? 'gin' : null)
+      || 'btree';
+
+    const name = `${el.nspname}_${el.relname}_${el.aname}_${indexUsing}_idx`;
+    const exists = index.filter((ind) => ind.tablename === el.relname && ind.schemaname === el.nspname && ind.indexdef.includes(types[el.aname] === 'Text'
+      ? `gin (${el.aname} gin_trgm_ops)` : `btree (${el.aname})`));
+
+    indexAr[el.aname] = {
+      name, type: el.datatype, exists, // exists1,
+    };
+
+    // drop
+    if (exists?.length > 1) {
+      exists.filter((ind, i1) => i1).forEach((ind) => qIndex.push(`DROP INDEX if exists ${ind.schemaname}.${ind.indexname} `));
+    }
+
+    // add
+    if (exists?.length === 0) {
+      // console.log(`${name} - ${el.datatype}`);
+
+      const suffix = types[el.aname] === 'Text' ? 'gin_trgm_ops' : '';
+      if (['text'].includes(el?.datatype)) {
+        qIndex.push(`CREATE INDEX if not exists ${name} ON ${el.nspname}.${el.relname} USING ${indexUsing} (${el.aname} ${suffix})`);
+      }
+      if (indexUsing === 'gist') {
+        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', 'gist1')}  
+          ON ${el.nspname}.${el.relname} USING gist (${el.aname})`);
+
+        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', 'area')}  
+          ON ${el.nspname}.${el.relname} USING btree (st_area(st_transform(${el.aname},3857)))`);
+        qIndex.push(`CREATE INDEX if not exists ${name.replace('gist', '4326')}  
+          ON ${el.nspname}.${el.relname} USING gist (st_transform(${el.aname},4326))`);
+      }
+    }
+  }
+
+  loadedIndex[redisKey] = 1;
+  // throw qIndex;
+  if (!qIndex.length) return null;
+
+  // console.log(qIndex.filter((v, i, a) => a.indexOf(v) === i));
+  // logger.file('index', { table, filter, sql: qIndex.filter((v, i, a) => a.indexOf(v) === i) });
+  qIndex.filter((v, i, a) => a.indexOf(v) === i).map((el) => pg.one(el).catch((err) => console.log(err.toString())));
+  return 'ok';
+}
+
+export default autoIndex;