@opengis/fastify-table 1.1.56 → 1.1.57

package/index.js

@@ -7,20 +7,27 @@ 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 notificationPlugin from './notification/index.js';
-import widgetPlugin from './widget/index.js';
-import crudPlugin from './crud/index.js';
-import policyPlugin from './policy/index.js';
-import utilPlugin from './util/index.js';
-import cronPlugin from './cron/index.js';
-import userPlugin from './user/index.js';
+// plugins
+import cronPlugin from './server/plugins/cron/index.js';
+import crudPlugin from './server/plugins/crud/index.js';
+// hook, logger, migration - utils only
+import pgPlugin from './server/plugins/pg/index.js';
+import policyPlugin from './server/plugins/policy/index.js';
+import redisPlugin from './server/plugins/redis/index.js';
+import tablePlugin from './server/plugins/table/index.js';
+import utilPlugin from './server/plugins/util/index.js';
+
+// routes
+import cronRoutes from './server/routes/cron/index.js';
+import crudRoutes from './server/routes/crud/index.js';
+import loggerRoutes from './server/routes/logger/index.js';
+import propertiesRoutes from './server/routes/properties/index.js';
+import tableRoutes from './server/routes/table/index.js';
+import utilRoutes from './server/routes/util/index.js';
 
 // import pgClients from './pg/pgClients.js';
 
-import { addTemplateDir, execMigrations, logger } from './utils.js';
+import { addTemplateDir, execMigrations } from './utils.js';
 
 async function plugin(fastify, opt) {
   // console.log(opt);
@@ -85,16 +92,22 @@ async function plugin(fastify, opt) {
     // fastify.decorateRequest('funcs', fastify);
   }
 
+  // plugins / utils / funcs
   policyPlugin(fastify);
   redisPlugin(fastify);
   await pgPlugin(fastify, opt);
   tablePlugin(fastify, opt);
   crudPlugin(fastify, opt);
-  notificationPlugin(fastify, opt);
-  widgetPlugin(fastify, opt);
   utilPlugin(fastify, opt);
   cronPlugin(fastify, opt);
-  userPlugin(fastify, opt);
+
+  // routes / api
+  cronRoutes(fastify, opt);
+  crudRoutes(fastify, opt);
+  loggerRoutes(fastify, opt);
+  propertiesRoutes(fastify, opt);
+  tableRoutes(fastify, opt);
+  utilRoutes(fastify, opt);
 
   // core templates && cls
   const filename = fileURLToPath(import.meta.url);

package/package.json

@@ -1,9 +1,15 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.56",
+  "version": "1.1.57",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",
+  "files": [
+    "server/*",
+    "index.js",
+    "utils.js",
+    "config.js"
+  ],
   "scripts": {
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "test": "node --test",
@@ -14,8 +20,7 @@
   "dependencies": {
     "@fastify/sensible": "^5.0.0",
     "@fastify/url-data": "^5.4.0",
-    "@opengis/fastify-hb": "^1.4.2",
-    "@opengis/fastify-table": "^1.1.47",
+    "@opengis/fastify-hb": "^1.4.4",
     "fastify": "^4.26.1",
     "fastify-plugin": "^4.0.0",
     "ioredis": "^5.3.2",
@@ -38,4 +43,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

package/{cron → server/plugins/cron}/funcs/addCron.js

@@ -1,10 +1,10 @@
 import { createHash } from 'crypto';
 
-import cronList from '../controllers/utils/cronList.js';
+import config from '../../../../config.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 import getPG from '../../pg/funcs/getPG.js';
-import config from '../../config.js';
 import logger from '../../logger/getLogger.js';
+import cronList from '../cronList.js';
 
 const md5 = (string) => createHash('md5').update(string).digest('hex');
 
@@ -59,21 +59,21 @@ const interval2ms = {
 };
 
 async function runCron({
-  pg, funcs, func, name, rclient, log,
+  pg, func, name, rclient,
 }) {
   const unique = await verifyUnique(name, rclient);
 
   if (!unique) return;
   const db = pg.options.database;
-  log.debug(`cron.${name}`, 1, db);
+  logger.debug(`cron.${name}`, 1, db);
   try {
-    const data = await func({ pg, funcs, log });
-    log.debug('cron', { db, name, result: data });
-    log.info('cron', { db, name, result: data });
+    const data = await func({ pg });
+    logger.debug('cron', { db, name, result: data });
+    logger.info('cron', { db, name, result: data });
   }
   catch (err) {
-    log.debug('cron', { db, name, error: err.toString() });
-    log.error('cron', { db, name, error: err.toString() });
+    logger.debug('cron', { db, name, error: err.toString() });
+    logger.error('cron', { db, name, error: err.toString() });
   }
 }
 
@@ -89,7 +89,7 @@ async function runCron({
  * - 10 * 60 - every 10 minutes
  */
 
-export default async function addCron(func, interval, fastify = {}) {
+export default async function addCron(func, interval) {
   const { time = {}, disabled = [] } = config.cron || {};
   const pg = getPG();
   const rclient = getRedis();
@@ -116,12 +116,12 @@ export default async function addCron(func, interval, fastify = {}) {
   // setTimeout to w8 for the time to start
   setTimeout(() => {
     runCron({
-      pg, funcs: fastify, func, name, rclient, log: logger,
+      pg, func, name, rclient, logger,
     });
     // interval
     setInterval(() => {
       runCron({
-        pg, funcs: fastify, func, name, rclient, log: logger,
+        pg, func, name, rclient, logger,
       });
     }, intervalMs);
   }, waitMs);

package/server/plugins/cron/index.js

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

package/{crud → server/plugins/crud}/funcs/dataDelete.js

@@ -1,6 +1,8 @@
 import getPG from '../../pg/funcs/getPG.js';
-
 import getMeta from '../../pg/funcs/getMeta.js';
+
+// import { getPG, getMeta } from '../../../../utils.js';
+
 import logChanges from './utils/logChanges.js';
 
 export default async function dataDelete({

package/{crud → server/plugins/crud}/funcs/dataInsert.js

@@ -1,5 +1,8 @@
 import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
+
+// import { getPG, getMeta } from '../../../../utils.js';
+
 import logChanges from './utils/logChanges.js';
 
 export default async function dataInsert({

package/{crud → server/plugins/crud}/funcs/dataUpdate.js

@@ -1,6 +1,8 @@
 import getPG from '../../pg/funcs/getPG.js';
-
 import getMeta from '../../pg/funcs/getMeta.js';
+
+// import { getPG, getMeta } from '../../../../utils.js';
+
 import logChanges from './utils/logChanges.js';
 
 const srids = {};

package/{crud → server/plugins/crud}/funcs/getAccess.js

@@ -1,9 +1,11 @@
-// import getMeta from '../../pg/funcs/getMeta.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-import config from '../../config.js';
+import config from '../../../../config.js';
 import pgClients from '../../pg/pgClients.js';
+
+import getTemplate from '../../table/funcs/getTemplate.js';
 import applyHook from '../../hook/funcs/applyHook.js';
 
+// import { config, pgClients, getTemplate, applyHook } from '../../../../utils.js';
+
 const q = `select a.route_id as id, coalesce(b.actions,array['get']) as actions, b.scope 
 from admin.routes a 
 left join admin.access b on 

package/{crud → server/plugins/crud}/funcs/getOpt.js

@@ -1,5 +1,7 @@
 import getRedis from '../../redis/funcs/getRedis.js';
 
+// import { getRedis } from '../../../../utils.js';
+
 export default async function getOpt(token, funcs) {
   const rclient = getRedis({ db: 0, funcs });
 

package/{crud → server/plugins/crud}/funcs/getToken.js

@@ -1,5 +1,8 @@
+import config from '../../../../config.js';
+
 import getRedis from '../../redis/funcs/getRedis.js';
-import config from '../../config.js';
+
+// import { config, getRedis } from '../../../../utils.js';
 
 function sprintf(str, ...args) {
   return str.replace(/%s/g, () => args.shift());

package/{crud → server/plugins/crud}/funcs/setOpt.js

@@ -1,6 +1,9 @@
 import { createHash } from 'crypto';
+
 import getRedis from '../../redis/funcs/getRedis.js';
 
+// import { getRedis } from '../../../../utils.js';
+
 function md5(string) {
   return createHash('md5').update(string).digest('hex');
 }

package/{crud → server/plugins/crud}/funcs/setToken.js

@@ -1,8 +1,11 @@
 import { createHash, randomUUID } from 'crypto';
 
-import config from '../../config.js';
+import config from '../../../../config.js';
+
 import getRedis from '../../redis/funcs/getRedis.js';
 
+// import { config, getRedis } from '../../../../utils.js';
+
 const generateCodes = (ids, userToken) => {
   const token = userToken || randomUUID();
   const notNullIds = ids.filter((el) => el);

package/{crud → server/plugins/crud}/funcs/utils/getFolder.js

@@ -1,5 +1,6 @@
 import path from 'node:path';
-import config from '../../../config.js';
+
+import config from '../../../../../config.js';
 
 export default function getFolder(req, type = 'server') {
   if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');

package/{crud → server/plugins/crud}/funcs/utils/logChanges.js

@@ -38,12 +38,12 @@ export default async function logChanges({
       const filterData = Object.entries({
         change_id: changeId, entity_key: el, value_old: old[el], value_new: data[el], uid,
       })
-        .filter((el) => el[1] && names.includes(el[0]));
+        .filter((el1) => el1[1] && names.includes(el1[0]));
 
       const insertQuery = `insert into log.table_changes_data (${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
       values (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) returning *`;
 
-      const { rows = [] } = await pg.query(insertQuery, [...filterData.map((el) => (el[1] && typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
+      const { rows = [] } = await pg.query(insertQuery, [...filterData.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];
     }));
 

package/server/plugins/crud/index.js

@@ -0,0 +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;

package/{hook → server/plugins/hook}/funcs/addHook.js

@@ -1,4 +1,4 @@
-import hookList from './hookList.js';
+import hookList from '../hookList.js';
 
 export default function addHook(name, fn) {
   if (!hookList[name]) {

package/{hook → server/plugins/hook}/funcs/applyHook.js

@@ -1,5 +1,5 @@
-import config from '../../config.js';
-import hookList from './hookList.js';
+import config from '../../../../config.js';
+import hookList from '../hookList.js';
 
 export default async function applyHook(name, data) {
   const { debug } = config;

package/server/plugins/hook/index.js

@@ -0,0 +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;

package/{logger → server/plugins/logger}/createFileStream.js

@@ -5,7 +5,7 @@ import fs from 'fs';
 
 import labels from './labels.js';
 
-import config from '../config.js';
+import config from '../../../config.js';
 
 const generator = () => () => {
   const date = new Date();

package/{logger → server/plugins/logger}/getLogger.js

@@ -1,7 +1,7 @@
 import pino from 'pino';
 // import path from 'node:path';
 
-import config from '../config.js';
+import config from '../../../config.js';
 
 if (!config.log) config.log = {};
 

package/{migration → server/plugins/migration/funcs}/exec.migrations.js

@@ -3,7 +3,7 @@ import path from 'path';
 
 const time = Date.now();
 
-import getPG from '../pg/funcs/getPG.js';
+import getPG from '../../pg/funcs/getPG.js';
 
 function getCallerDir() {
   const originalFunc = Error.prepareStackTrace;

package/server/plugins/migration/index.js

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

package/{pg → server/plugins/pg}/funcs/getPG.js

@@ -1,13 +1,13 @@
 import pg from 'pg';
-import config from '../../config.js';
+
+import config from '../../../../config.js';
 import pgClients from '../pgClients.js';
 import init from './init.js';
 
 function getPG(param) {
   const {
-    user, password, host, port, db, database, name: origin, funcs,
+    user, password, host, port, db, database, name: origin,
   } = param || {};
-  // if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
   const name = origin || db || database || param || 'client';
   if (pgClients[name]) return pgClients[name];
 

package/{pg → server/plugins/pg}/funcs/getPGAsync.js

@@ -1,13 +1,13 @@
 import pg from 'pg';
-import config from '../../config.js';
+
+import config from '../../../../config.js';
 import pgClients from '../pgClients.js';
 import init from './init.js';
 
 async function getPGAsync(param) {
   const {
-    user, password, host, port, db, database, name: origin, funcs,
+    user, password, host, port, db, database, name: origin,
   } = typeof param === 'string' ? { db: param } : param || {};
-  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
   const name = origin || db || database || param || 'client';
 
   if (pgClients[name]?.tlist) return pgClients[name];

package/{pg → server/plugins/pg}/funcs/init.js

@@ -1,8 +1,6 @@
-import crypto from 'crypto';
+import { createHash } from 'crypto';
 
-// import pg from 'pg';
 import getRedis from '../../redis/funcs/getRedis.js';
-// import config from '../config.js';
 
 async function init(client) {
   const textQuery = `select 
@@ -44,7 +42,7 @@ async function init(client) {
 
   async function queryCache(query) {
     const rclient = getRedis({ db: 0 });
-    const hash = crypto.createHash('sha1').update(query).digest('base64');
+    const hash = createHash('sha1').update(query).digest('base64');
     const keyCache = `pg:${hash}`;
     const cache = await rclient.get(keyCache);
     if (cache) {

package/{pg → server/plugins/pg}/index.js

@@ -1,34 +1,25 @@
-// import fp from 'fastify-plugin';
-//import pg from 'pg';
 import pgClients from './funcs/pgClients.js';
 import init from './funcs/init.js';
+import getPG from './funcs/getPG.js';
 import autoIndex from './funcs/autoIndex.js';
 import getMeta from './funcs/getMeta.js';
-import getPG from './funcs/getPG.js';
 
 function close() {
-  // console.log('pg close');
   Object.keys(pgClients).forEach((el) => {
-    // console.log(el);
     pgClients[el].end();
   });
-
-  // return pgClients.client.end();
 }
 
 async function plugin(fastify, config) {
-  const client = getPG({ ...config.pg || {}, name: 'client' })
+  const client = getPG({ ...config.pg || {}, name: 'client' });
   await init(client);
   fastify.addHook('onRequest', async (req) => {
-    // req.funcs = fastify;
     req.pg = req.pg || client;
   });
-  //pgClients.client = client;
 
-  // fastify.decorate('pg', client);
-  fastify.decorate('autoIndex', autoIndex);
-  fastify.decorate('getMeta', getMeta);
-  fastify.decorate('getPG', getPG);
+  // fastify.decorate('autoIndex', autoIndex);
+  // fastify.decorate('getMeta', getMeta);
+  // fastify.decorate('getPG', getPG);
   fastify.addHook('onClose', close);
 }
 

package/{pg → server/plugins/pg}/pgClients.js

@@ -1,5 +1,6 @@
 import pg from 'pg';
-import config from '../config.js';
+
+import config from '../../../config.js';
 import init from './funcs/init.js';
 
 const pgClients = {};

package/{policy → server/plugins/policy}/funcs/checkPolicy.js

@@ -1,4 +1,4 @@
-import block from './sqlInjection.js';
+import block from '../sqlInjection.js';
 
 /**
  * Middleware func

package/{crud/controllers/utils → server/plugins/policy/funcs}/checkXSS.js

@@ -1,7 +1,4 @@
-/* import sqlInjection from '../../../policy/funcs/sqlInjection.js'; */
-import xssInjection from './xssInjection.js';
-
-/* const checkList = xssInjection.concat(sqlInjection); */
+import xssInjection from '../xssInjection.js';
 
 // RTE - rich text editor
 

package/{policy → server/plugins/policy}/index.js

@@ -1,5 +1,3 @@
-// import fp from 'fastify-plugin';
-
 import checkPolicy from './funcs/checkPolicy.js';
 
 async function plugin(fastify) {

package/{policy/funcs → server/plugins/policy}/sqlInjection.js

@@ -28,6 +28,6 @@ const sqlInjection = [
   '"""  ',
   '<script',
   'javascript:',
-]
+];
 
 export default sqlInjection;

package/{redis → server/plugins/redis}/funcs/getRedis.js

@@ -1,5 +1,6 @@
 import Redis from 'ioredis';
-import config from '../../config.js';
+
+import config from '../../../../config.js';
 import redisClients from './redisClients.js';
 
 function getRedis({ db } = { db: 0 }) {

package/{redis → server/plugins/redis}/funcs/redisClients.js

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

package/{redis → server/plugins/redis}/index.js

@@ -1,18 +1,14 @@
-// import client from './client.js';
 import getRedis from './funcs/getRedis.js';
-// import client from './funcs/redisClients.js';
 
 function close(fastify) {
   fastify.rclient.quit();
-  // fastify.rclient2.quit();
 }
 
 async function plugin(fastify) {
   const client = getRedis({ db: 0, funcs: fastify });
   client.getJSON = client.get;
-  fastify.decorate('rclient', client);
-  fastify.decorate('getRedis', getRedis);
-  // fastify.decorate('rclient2', client2);
+  // fastify.decorate('rclient', client);
+  // fastify.decorate('getRedis', getRedis);
   fastify.addHook('onClose', close);
 }
 

package/{table → server/plugins/table}/funcs/getFilterSQL/index.js

@@ -1,6 +1,8 @@
-import getTemplate from '../../controllers/utils/getTemplate.js';
+import getTemplate from '../getTemplate.js';
 import pgClients from '../../../pg/pgClients.js';
 
+// import { getTemplate, pgClients } from '../../../../../utils.js';
+
 // filter util
 import getTableSql from './util/getTableSql.js';
 import getFilterQuery from './util/getFilterQuery.js';

package/{table/controllers/utils → server/plugins/table/funcs}/getSelectMeta.js

@@ -1,16 +1,7 @@
-// import pgClients from '../../../pg/pgClients.js';
-import getPG from '../../../pg/funcs/getPG.js';
+import getPG from '../../pg/funcs/getPG.js';
 
 import getSelect from './getSelect.js';
 
-/*
-function getTable(table) {
-  // eslint-disable-next-line class-methods-use-this
-  const result = table.toLowerCase().replace(/[\n\r]+/g, ' ').split(' from ').filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    .map((el) => el.split(/[ )]/)[0]);
-  return result?.pop();
-} */
-
 const selectMeta = {};
 
 export default async function getSelectMeta({ name, pg: pg1, nocache }) {

package/{table/controllers/utils → server/plugins/table/funcs}/getTemplate.js

@@ -1,7 +1,8 @@
-import { readdir, readFile } from 'fs/promises';
 import path from 'path';
 import yaml from 'js-yaml';
 
+import { readdir, readFile } from 'fs/promises';
+
 import getTemplatePath from './getTemplatePath.js';
 import loadTemplate from './loadTemplate.js';
 

package/{table/controllers/utils → server/plugins/table/funcs}/getTemplatePath.js

@@ -1,7 +1,7 @@
-// import { readFile } from 'fs/promises';
-import fs, { existsSync, readdirSync } from 'fs';
 import path from 'path';
-import config from '../../../config.js';
+import fs, { existsSync, readdirSync } from 'fs';
+
+import config from '../../../../config.js';
 
 import loadTemplatePath from './loadTemplatePath.js';
 import userTemplateDir from './userTemplateDir.js';

package/{table/controllers/utils → server/plugins/table/funcs}/getTemplates.js

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
-import config from '../../../config.js';
+
+import config from '../../../../config.js';
 
 const loadTemplate = {};
 

package/{table/controllers/utils → server/plugins/table/funcs}/gisIRColumn.js

@@ -1,9 +1,6 @@
-import pgClients from '../../../pg/pgClients.js';
-import config from '../../../config.js';
-
-import getTemplate from './getTemplate.js';
-import getSelect from './getSelect.js';
-import getFilterSQL from '../../funcs/getFilterSQL/index.js';
+import {
+  config, pgClients, getTemplate, getSelect, getFilterSQL,
+} from '../../../../utils.js';
 
 export default async function gisIRColumn({
   pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
@@ -14,7 +11,7 @@ export default async function gisIRColumn({
 
   const body = await getTemplate('table', layer);
   const fData = await getFilterSQL({
-    table: layer, 
+    table: layer,
     filter,
     state,
     search,