@opengis/fastify-table 1.0.0 → 1.0.2

package/Changelog.md

@@ -0,0 +1,12 @@
+# fastify-table
+
+## 1.0.1 - 14.04.2024
+
+- fix redis
+
+## 1.0.0 - 14.04.2024
+
+- crud
+- pg
+- redis
+- table

package/README.md

@@ -1,26 +1,26 @@
-# fastify-table
-
-[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
-
-It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
-
-- pg
-- redis
-- crud
-
-## Install
-
-```bash
-npm i @opengis/fastify-table
-```
-
-## Usage
-
-```js
-fastify.register(import('@opengis/fastify-table'), config);
-```
-
-## Documenation
-
-For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).
+# fastify-table
+
+[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
+
+It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
+
+- pg
+- redis
+- crud
+
+## Install
+
+```bash
+npm i @opengis/fastify-table
+```
+
+## Usage
+
+```js
+fastify.register(import('@opengis/fastify-table'), config);
+```
+
+## Documenation
+
+For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).

package/crud/funcs/dataInsert.js

@@ -1,7 +1,8 @@
-import pgClients from '../../pg/pgClients.js';
+import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 
-export default async function dataInsert({ table, data, pg = pgClients.client }) {
+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;

package/crud/funcs/dataUpdate.js

@@ -1,9 +1,11 @@
-import pgClients from '../../pg/pgClients.js';
+import getPG from '../../pg/funcs/getPG.js';
+
 import getMeta from '../../pg/funcs/getMeta.js';
 
 export default async function dataUpdate({
-  table, id, data, pg = pgClients.client,
+  table, id, data,
 }) {
+  const pg = getPG({ name: 'client' });
   const { columns, pk } = await getMeta(table);
 
   const names = columns.map((el) => el.name);

package/crud/funcs/getOpt.js

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

package/crud/funcs/setOpt.js

@@ -1,5 +1,5 @@
 import { createHash } from 'crypto';
-import rclient from '../../redis/client.js';
+import getRedis from '../../redis/funcs/getRedis.js';
 
 function md5(string) {
   return createHash('md5').update(string).digest('hex');
@@ -9,6 +9,8 @@ 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 });
   await rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
   return token;
 }

package/crud/index.js

@@ -1,23 +1,23 @@
-import fp from 'fastify-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';
-
-const prefix = config.prefix || '/api';
+// import config from '../config.js';
 
-async function plugin(fastify) {
+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

package/helper.js

@@ -1,7 +1,7 @@
 // This file contains code that we reuse
 // between our tests.
 import Fastify from 'fastify';
-import config from './test/confg.js';
+import config from './test/config.js';
 import appService from './index.js';
 
 import rclient from './redis/client.js';

package/package.json

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

package/pg/funcs/getMeta.js

@@ -1,10 +1,11 @@
-import pgClient from '../pgClients.js';
+// import pgClient from '../pgClients.js';
+import getPG from './getPG.js';
 
 const data = {};
 
 // decorator
 export default async function getMeta(opt) {
-  const pg = pgClient.client;
+  const pg = opt.pg || getPG({ name: 'client' });
   const table = opt.table || opt;
 
   if (data[table]) return data[table];
@@ -19,13 +20,8 @@ export default async function getMeta(opt) {
   const pk = pks1[table];
 
   const geomAttr = fields.find((el) => pg.pgType[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
-  const q = `select st_extent( ${geomAttr}) as bounds, count(*), 
-    (select st_srid(${geomAttr}) from ${table} where ${geomAttr} is not null limit 1) as srid,  
-    json_agg(distinct ST_GeometryType(${geomAttr}))::json  as geometry from ${table} 
-    where ${geomAttr} is not null `;
-  const geom = await pg.one(q, { cache: 0 });
 
-  const res = { pk, columns: fields, geom };
+  const res = { pk, columns: fields, geom: geomAttr };
   data[table] = res;
   return res;
 }

package/pg/funcs/getPG.js

@@ -3,22 +3,23 @@ import config from '../../config.js';
 import pgClients from '../pgClients.js';
 import init from './init.js';
 
-async function getPG({
-  user, password, host, port, db,
+function getPG({
+  user, password, host, port, db, database, name: origin,
 }) {
-  if (pgClients[db]) return pgClients[db];
+  const name = origin || db || database;
+  if (pgClients[name]) return pgClients[name];
 
   const dbConfig = {
     user: user || config.pg?.user,
     password: password || config.pg?.password,
     host: host || config.pg?.host,
     port: port || config.pg?.port,
-    database: db || config.pg?.db,
+    database: db || database || config.pg?.db || config.pg?.database,
   };
 
-  pgClients[db] = new pg.Pool(dbConfig);
-  init(pgClients[db]);
-  return pgClients[db];
+  pgClients[name] = new pg.Pool(dbConfig);
+  init(pgClients[name]);
+  return pgClients[name];
 }
 
 export default getPG;

package/pg/funcs/init.js

@@ -1,7 +1,7 @@
 import crypto from 'crypto';
 
 // import pg from 'pg';
-import rclient from '../../redis/client.js';
+import getRedis from '../../redis/funcs/getRedis.js';
 // import config from '../config.js';
 
 async function init(client) {
@@ -21,6 +21,7 @@ async function init(client) {
   }
 
   async function queryCache(query) {
+    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/index.js

@@ -1,5 +1,5 @@
 // import fp from 'fastify-plugin';
-import pg from 'pg';
+//import pg from 'pg';
 import pgClients from './funcs/pgClients.js';
 import init from './funcs/init.js';
 import autoIndex from './funcs/autoIndex.js';
@@ -17,19 +17,13 @@ function close() {
 }
 
 async function plugin(fastify, config) {
-  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',
-  });
+  const client = getPG({ ...config.pg || {}, name: 'client' })
   await init(client);
   fastify.addHook('onRequest', async (req) => {
     // req.funcs = fastify;
     req.pg = client;
   });
-  pgClients.client = client;
+  //pgClients.client = client;
 
   // fastify.decorate('pg', client);
   fastify.decorate('autoIndex', autoIndex);

package/redis/client.js

@@ -1,14 +1,8 @@
-import Redis from 'ioredis';
+import redisClients from './funcs/redisClients.js';
+import getRedis from './funcs/getRedis.js';
 
-// const config = {};
-import config from '../config.js';
+if (!redisClients[0]) {
+  getRedis({ db: 0 });
+}
 
-const rclient = new Redis({
-  keyPrefix: `${config?.db}:`,
-  host: config?.redis?.host || '127.0.0.1',
-  port: config?.redis?.port || 6379, // Redis port
-  family: 4, // 4 (IPv4) or 6 (IPv6)
-  closeClient: true,
-});
-
-export default rclient;
+export default redisClients[0];

package/redis/funcs/getRedis.js

@@ -0,0 +1,23 @@
+import Redis from 'ioredis';
+import config from '../../config.js';
+import redisClients from './redisClients.js';
+
+function getRedis({ db }) {
+  if (!config.redis) return null;
+  if (redisClients[db]) return redisClients[db];
+
+  const redisConfig = {
+    db,
+    keyPrefix: `${config.db}:`,
+    host: config.redis?.host || '127.0.0.1',
+    port: config.redis?.port || 6379, // Redis port
+    family: 4, // 4 (IPv4) or 6 (IPv6)
+    closeClient: true,
+  };
+
+  redisClients[db] = new Redis(redisConfig);
+
+  return redisClients[db];
+}
+
+export default getRedis;

package/redis/funcs/redisClients.js

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

package/redis/index.js

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

package/table/controllers/data.js

@@ -21,7 +21,8 @@ export default async function data(req) {
   const cols = columns.map((el) => el.name || el).join(',');
   const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
 
-  const fData = query.filter ? await getFilterSQL(query.filter, {
+  const fData = query.filter ? await getFilterSQL({
+    filter: query.filter,
     table,
     json: 1,
   }) : {};

package/table/controllers/utils/getSelectMeta.js

@@ -1,18 +1,20 @@
-import pgClients from '../../../pg/pgClients.js';
+// import pgClients from '../../../pg/pgClients.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 = pgClients.client }) {
+export default async function getSelectMeta({ name, pg: pg1 }) {
   if (selectMeta[name]) return selectMeta[name];
+  const pg = pg1 || getPG({ db: 'client' });
 
   const cls = await getSelect(name);
 

package/table/index.js

@@ -3,11 +3,8 @@ import data from './controllers/data.js';
 import filter from './controllers/filter.js';
 import form from './controllers/form.js';
 
-import config from '../config.js';
-
-const prefix = config.prefix || '/api';
-
-async function plugin(fastify) {
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
   fastify.get(`${prefix}/suggest/:data`, {}, suggest);
   fastify.get(`${prefix}/data/:table/:id?`, {}, data); // vs.crm.data.api с node
   fastify.get(`${prefix}/filter/:table`, {}, filter);

package/test/funcs/crud.test.js

@@ -1,6 +1,6 @@
 import { test } from 'node:test';
 import assert from 'node:assert';
-import '../confg.js';
+import '../config.js';
 
 import pgClients from '../../pg/pgClients.js';
 import rclient from '../../redis/client.js';

package/test/funcs/pg.test.js

@@ -1,7 +1,7 @@
 import { test } from 'node:test';
 import assert from 'node:assert';
 
-import '../confg.js';
+import '../config.js';
 
 import getMeta from '../../pg/funcs/getMeta.js';
 import autoIndex from '../../pg/funcs/autoIndex.js';

package/test/funcs/redis.test.js

@@ -1,7 +1,7 @@
 import { test } from 'node:test';
 import assert from 'node:assert';
 
-import '../confg.js';
+import '../config.js';
 
 import rclient from '../../redis/client.js';
 

package/test/funcs/table.test.js

@@ -1,6 +1,6 @@
 import { test } from 'node:test';
 import assert from 'node:assert';
-import '../confg.js';
+import '../config.js';
 import pgClients from '../../pg/pgClients.js';
 import rclient from '../../redis/client.js';
 import getFilterSQL from '../../table/funcs/getFilterSQL/index.js';