@opengis/fastify-table 1.3.61 → 1.3.63

package/index.js

@@ -33,6 +33,7 @@ import addTemplateDir from './server/plugins/table/funcs/addTemplateDir.js';
 import execMigrations from './server/plugins/migration/exec.migrations.js';
 
 import locales from './server/routes/table/controllers/utils/locales.js';
+import pgClients from './server/plugins/pg/pgClients.js';
 
 // core templates && cls
 const filename = fileURLToPath(import.meta.url);
@@ -76,7 +77,7 @@ async function plugin(fastify, opt) {
   });
 
   // core migrations (second argument for core only)
-  execMigrations(path.join(cwd, 'server/migrations'), true).catch(err => console.log(err));
+  execMigrations(path.join(cwd, 'server/migrations'), pgClients.client, true).catch(err => console.log(err));
 
   // core templates && cls
   config.templates?.forEach(el => addTemplateDir(el));
@@ -103,4 +104,4 @@ async function plugin(fastify, opt) {
   utilRoutes(fastify, opt);
   fastify.get('/api/test-proxy', {}, (req) => req.headers);
 }
-export default fp(plugin);
+export default fp(plugin);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.61",
+  "version": "1.3.63",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -25,9 +25,6 @@
     "test:helpers": "node --test .\\test\\helpers",
     "test:routes": "node --test .\\test\\routes",
     "test:functions": "node --test .\\test\\functions",
-    "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs",
     "compress": "node compress.js"
   },
   "dependencies": {
@@ -48,17 +45,8 @@
     "uglify-js": "3.19.3"
   },
   "devDependencies": {
-    "@panzoom/panzoom": "4.5.1",
     "eslint": "8.49.0",
-    "eslint-config-airbnb": "19.0.4",
-    "markdown-it-abbr": "2.0.0",
-    "mermaid": "10.9.3",
-    "sass": "1.72.0",
-    "vitepress": "1.3.4",
-    "vitepress-plugin-mermaid": "2.0.16",
-    "vitepress-plugin-tabs": "0.5.0",
-    "vitepress-sidebar": "1.25.0",
-    "vue": "3.4.27"
+    "eslint-config-airbnb": "19.0.4"
   },
   "author": "Softpro",
   "license": "ISC"

package/server/migrations/context.sql

@@ -1,6 +1,7 @@
 CREATE SCHEMA IF NOT EXISTS admin;
 
 CREATE TABLE IF NOT EXISTS admin.rules();
+CREATE TABLE IF NOT EXISTS admin.users( uid text not null constraint admin_user_uid_pkey PRIMARY KEY DEFAULT next_id() );
 ALTER TABLE admin.rules DROP CONSTRAINT IF EXISTS admin_rules_pkey cascade;
 ALTER TABLE admin.rules add column if not exists rule_id text NOT NULL DEFAULT next_id();
 

package/server/migrations/log.sql

@@ -38,6 +38,7 @@ ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS cdate timestamp without time
 ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_id text;
 ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
 ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS auth_data json;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS ip text;
 
 COMMENT ON TABLE log.table_changes IS 'Логи подій змін в БД';
 COMMENT ON COLUMN log.table_changes.change_type IS 'Тип події (insert / update / delete)';
@@ -57,6 +58,7 @@ COMMENT ON COLUMN log.user_auth.user_id IS 'ID користувача';
 COMMENT ON COLUMN log.user_auth.auth_date IS 'Дата авторизації';
 COMMENT ON COLUMN log.user_auth.auth_type IS 'Тип авторизації';
 COMMENT ON COLUMN log.user_auth.auth_data IS 'Дані про користувача';
+COMMENT ON COLUMN log.user_auth.ip IS 'IP адреса користувача';
 
 ALTER TABLE log.table_changes DROP CONSTRAINT IF EXISTS log_table_changes_pkey cascade;
 ALTER TABLE log.table_changes_data DROP CONSTRAINT IF EXISTS log_table_changes_data_pkey;

package/server/migrations/properties.sql

@@ -55,6 +55,7 @@ ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_title text;
 COMMENT ON COLUMN admin.user_properties.property_title IS 'Назва';
 
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS private boolean;
+update admin.user_properties set private = true where private is null;
 ALTER TABLE admin.user_properties ALTER COLUMN private SET NOT NULL;
 ALTER TABLE admin.user_properties ALTER COLUMN private SET default true;
 COMMENT ON COLUMN admin.user_properties.private IS 'Доступ лише для користувача, який додав дане налаштування';

package/server/migrations/template.sql

@@ -30,7 +30,7 @@ ALTER TABLE admin.templates add CONSTRAINT admin_templates_name_type_unique UNIQ
 
 COMMENT ON TABLE admin.templates IS 'Шаблони для друку';
 
-COMMENT ON COLUMN admin.templates.uid IS 'ID користувача';
+COMMENT ON COLUMN admin.templates.created_by IS 'ID користувача';
 
 COMMENT ON COLUMN admin.templates.name IS 'Систамна назва шаблону';
 COMMENT ON COLUMN admin.templates.title IS 'Назва шаблону українською';

package/server/plugins/logger/getLogger.js

@@ -1,7 +1,8 @@
 import pino from 'pino';
 // import path from 'node:path';
 
-import { config, getRedis } from '../../../utils.js';
+import config from '../../../config.js';
+import getRedis from '../redis/funcs/getRedis.js';
 import redactionList from '../../../redactionList.js';
 
 // utils
@@ -45,7 +46,6 @@ if (config.debug) {
   logger.file('test/redaction', { clientId: 'should be redacted', clientSecret: 'should be redacted' });
 }
 
-
 logger.metrics = function metrics(key, val, dbName) {
   const dbname = dbName || config.pg?.database;
   if (!dbname && !isServer) return;

package/server/plugins/migration/exec.migrations.js

@@ -3,11 +3,12 @@ import { readdirSync, existsSync } from 'node:fs';
 
 import config from '../../../config.js';
 import execSql from './exec.sql.js';
+import pgClients from '../pg/pgClients.js';
 // import getCallerDir from './get.caller.dir.js';
 
 const time = Date.now();
 
-export default async function execMigrations(dirPath, iscore) {
+export default async function execMigrations(dirPath, pg = pgClients.client, iscore = false) {
   if (
     !dirPath
     || (config.migrationsCore === false && iscore)
@@ -30,7 +31,7 @@ export default async function execMigrations(dirPath, iscore) {
 
     // execute sql files
     if (content?.length) {
-      await content.reduce((promise, filename) => promise.then(() => execSql(path.join(dirPath, filename))), Promise.resolve());
+      await content.reduce((promise, filename) => promise.then(() => execSql(path.join(dirPath, filename), pg)), Promise.resolve());
     }
   }
 

package/server/plugins/migration/exec.sql.js

@@ -2,14 +2,20 @@ import path from 'node:path';
 import { createHash } from 'node:crypto';
 import { existsSync, readFileSync } from 'node:fs';
 
-import { config, logger, pgClients, getRedis } from '../../../utils.js';
+import config from '../../../config.js';
+
+import pgClients from '../pg/pgClients.js';
+
+import logger from '../logger/getLogger.js';
+
+import getRedis from '../redis/funcs/getRedis.js';
 
 const rclient = getRedis();
 
 export default async function execSql(filepath, pg = pgClients.client) {
     const start = Date.now();
 
-    if (!filepath) return null;
+    if (!pg || !filepath) return null;
 
     const filename = path.basename(filepath);
 
@@ -55,4 +61,4 @@ export default async function execSql(filepath, pg = pgClients.client) {
         });
         return err.toString();
     }
-}
+}

package/server/plugins/pg/funcs/getMeta.js

@@ -7,9 +7,9 @@ export default async function getMeta(opt, nocache) {
   const pg = opt?.pg || getPG({ name: 'client' });
   const table = opt?.table || opt;
 
-  if (pg.options?.database && data[pg.options.database]?.[table] && !nocache) return data[pg.options.database][table];
+  if (pg?.options?.database && data[pg.options.database]?.[table] && !nocache) return data[pg.options.database][table];
 
-  if (!pg.tlist?.includes(table?.replace?.(/"/g, ''))) {
+  if (!pg?.tlist?.includes(table?.replace?.(/"/g, ''))) {
     return { error: `${table} - not found`, status: 400 };
   }
 

package/server/plugins/pg/funcs/getPG.js

@@ -28,6 +28,8 @@ function getPG(param) {
     statement_timeout: config.pg?.statement_timeout || 10000,
   };
 
+  if (!dbConfig.database) { return null; }
+
   pgClients[name] = new pg.Pool(dbConfig);
   pgClients[name].init = async () => {
     await init(pgClients[name]);

package/server/plugins/pg/funcs/getPGAsync.js

@@ -29,6 +29,8 @@ async function getPGAsync(param) {
     statement_timeout: config.pg?.statement_timeout || 10000,
   };
 
+  if (!dbConfig.database) { return null; }
+
   pgClients[name] = new pg.Pool(dbConfig);
 
   await init(pgClients[name]);

package/server/plugins/pg/funcs/init.js

@@ -7,6 +7,9 @@ import logger from '../../logger/getLogger.js';
 const rclient = getRedis({ db: 0 });
 
 async function init(client) {
+  if (!client.options?.database) {
+    return;
+  }
   const textQuery = `select 
   (select json_object_agg(conrelid::regclass  ,(SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid and attnum = c.conkey[1]))
   from   pg_constraint c where contype='p' and connamespace::regnamespace::text not in ('sde')) as pk,
@@ -20,15 +23,16 @@ async function init(client) {
       from pg_class where relkind in ('r','v')`);
   const relkinds = rows.reduce((acc, curr) => Object.assign(acc, { [curr.tname]: curr.relkind }), {});
 
-  async function query(q, args = [], disableTimeout) {
+  async function query(q, args = [], isstream) {
     try {
-      if (disableTimeout) {
-        await client.query('set statement_timeout to 2147483647'); // max limit of integer value
+      if (isstream) {
+        await client.query('set statement_timeout to 100000000');
       }
       const data = await client.query(q, args);
       await client.query('set statement_timeout to 0');
       return data;
-    } catch (err) {
+    }
+    catch (err) {
       await client.query('set statement_timeout to 0');
       if (err.message === 'canceling statement due to statement timeout') {
         logger.file('timeout/query', { q, stack: err.stack });
@@ -39,7 +43,8 @@ async function init(client) {
   }
 
   async function querySafe(q, param = {}) {
-    const data = await query(q, Array.isArray(param) ? param : param?.args, 1);
+    const { args, isstream } = param;
+    const data = await query(q, args, isstream);
     return data;
   }
 

package/server/plugins/policy/funcs/checkPolicy.js

@@ -88,7 +88,7 @@ export default function checkPolicy(req, reply) {
   }
 
   /* === 3. policy: user === */
-  if (!validToken && !user && policy.includes('user') && !skipCheckPolicy(path)) {
+  if (!validToken && !user && policy.includes('user') && config.pg && !config.auth?.disable && !skipCheckPolicy(path)) {
     logger.file('policy/user', {
       path, method, params, query, body, message: 'access restricted: 3',
     });

package/server/routes/crud/controllers/insert.js

@@ -8,7 +8,7 @@ export default async function insert(req) {
   } = req || {};
   if (!user) return { message: 'access restricted', status: 403 };
 
-  const hookData = await applyHook('preInsert', { pg, table: params?.table, user });
+  const hookData = await applyHook('preInsert', { pg, table: params?.table, user, body });
 
   if (hookData?.message && hookData?.status) {
     return { message: hookData?.message, status: hookData?.status };