@opengis/admin 0.3.40 → 0.3.41

package/server/plugins/access/index.mjs

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

package/server/plugins/adminHook.js

@@ -1,81 +1,81 @@
-import fp from 'fastify-plugin';
-import fs from 'node:fs';
-
-import config from '../../config.js';
-
-// to export the decorators to the outer scope
-
-async function plugin(fastify) {
-  fastify.decorate('config', config);
-
-  // preSerialization
-  fastify.addHook('preSerialization', async (req, reply, payload) => {
-    if (req.url.includes('/suggest/') && !req.query.json) {
-      return payload?.data;
-    }
-    if (payload?.redirect) {
-      return reply.redirect(payload.redirect);
-    }
-    if (reply.sent) {
-      return null;
-    }
-
-    if ([200, 400, 403, 409, 404, 500].includes(payload.status)) {
-      reply.status(payload.status);
-    }
-    /* if (payload.headers) {
-      reply.headers(payload.headers);
-    } */
-    if (payload?.buffer) {
-      return payload.buffer;
-    }
-    if (payload?.file) {
-      // const buffer = await readFile(payload.file);
-      // return reply.send(buffer);
-      const stream = fs.createReadStream(payload.file);
-      return stream;
-      // return reply.send(stream);
-    }
-
-    if (payload?.message) {
-      return payload.message;
-    }
-    return payload;
-  });
-
-  //  preValidation
-  fastify.addHook('preValidation', async (req) => {
-    const parseRawBody = ['POST', 'PUT'].includes(req.method) && req.body && typeof req.body === 'string'
-      && req.body.trim(/\r\n/g).startsWith('{')
-      && req.body.trim(/\r\n/g).endsWith('}');
-    if (parseRawBody) {
-      try {
-        req.body = JSON.parse(req.body || '{}');
-      }
-      catch (err) {
-        // throw new Error('invalid body');
-        // return { error: 'invalid body', status: 400 };
-      }
-    }
-  });
-
-  // allow upload file
-  const kIsMultipart = Symbol.for('[FastifyMultipart.isMultipart]');
-  fastify.addContentTypeParser('multipart', (request, _, done) => {
-    request[kIsMultipart] = true;
-    done(null);
-  });
-
-  // parse Body
-  function contentParser(req, body, done) {
-    const parseBody = decodeURIComponent(body.toString()).split('&').reduce((acc, el) => {
-      const [key, val] = el.split('=');
-      return { ...acc, [key]: val };
-    }, {});
-    done(null, parseBody);
-  }
-
-  fastify.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
-}
-
-export default fp(plugin);
+import fp from 'fastify-plugin';
+import fs from 'node:fs';
+
+import config from '../../config.js';
+
+// to export the decorators to the outer scope
+
+async function plugin(fastify) {
+  fastify.decorate('config', config);
+
+  // preSerialization
+  fastify.addHook('preSerialization', async (req, reply, payload) => {
+    if (req.url.includes('/suggest/') && !req.query.json) {
+      return payload?.data;
+    }
+    if (payload?.redirect) {
+      return reply.redirect(payload.redirect);
+    }
+    if (reply.sent) {
+      return null;
+    }
+
+    if ([200, 400, 403, 409, 404, 500].includes(payload.status)) {
+      reply.status(payload.status);
+    }
+    /* if (payload.headers) {
+      reply.headers(payload.headers);
+    } */
+    if (payload?.buffer) {
+      return payload.buffer;
+    }
+    if (payload?.file) {
+      // const buffer = await readFile(payload.file);
+      // return reply.send(buffer);
+      const stream = fs.createReadStream(payload.file);
+      return stream;
+      // return reply.send(stream);
+    }
+
+    if (payload?.message) {
+      return payload.message;
+    }
+    return payload;
+  });
+
+  //  preValidation
+  fastify.addHook('preValidation', async (req) => {
+    const parseRawBody = ['POST', 'PUT'].includes(req.method) && req.body && typeof req.body === 'string'
+      && req.body.trim(/\r\n/g).startsWith('{')
+      && req.body.trim(/\r\n/g).endsWith('}');
+    if (parseRawBody) {
+      try {
+        req.body = JSON.parse(req.body || '{}');
+      }
+      catch (err) {
+        // throw new Error('invalid body');
+        // return { error: 'invalid body', status: 400 };
+      }
+    }
+  });
+
+  // allow upload file
+  const kIsMultipart = Symbol.for('[FastifyMultipart.isMultipart]');
+  fastify.addContentTypeParser('multipart', (request, _, done) => {
+    request[kIsMultipart] = true;
+    done(null);
+  });
+
+  // parse Body
+  function contentParser(req, body, done) {
+    const parseBody = decodeURIComponent(body.toString()).split('&').reduce((acc, el) => {
+      const [key, val] = el.split('=');
+      return { ...acc, [key]: val };
+    }, {});
+    done(null, parseBody);
+  }
+
+  fastify.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
+}
+
+export default fp(plugin);

package/server/plugins/cron.js

@@ -1,11 +1,11 @@
-//import { addCron } from '@opengis/fastify-table/utils.js';
-
-async function deleteOldNotifications({ pg }) {
-    const { rowCount } = pg?.pk?.['crm.notifications'] ? await pg.query('delete from crm.notifications where CURRENT_DATE - \'14 days\'::interval > cdate') : {};
-    return { rowCount };
-}
-
-export default async function cron(fastify) {
-    // addCron(deleteOldNotifications, 60 * 60 * 24, fastify);
-    //  addCron(deleteOldNotifications, 60 * 1, fastify); // debug
+//import { addCron } from '@opengis/fastify-table/utils.js';
+
+async function deleteOldNotifications({ pg }) {
+    const { rowCount } = pg?.pk?.['crm.notifications'] ? await pg.query('delete from crm.notifications where CURRENT_DATE - \'14 days\'::interval > cdate') : {};
+    return { rowCount };
+}
+
+export default async function cron(fastify) {
+    // addCron(deleteOldNotifications, 60 * 60 * 24, fastify);
+    //  addCron(deleteOldNotifications, 60 * 1, fastify); // debug
 }

package/server/plugins/docs.js

@@ -1,28 +1,28 @@
-'use strict'
-
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
-import fs from 'fs';
-
-const dir = dirname(fileURLToPath(import.meta.url));
-const root = `${dir}/../../`;
-
-
-async function plugin(fastify, opts) {
-  fastify.get('/docs*', async (req, reply) => {
-    if (!fs.existsSync(path.join(root, 'docs/.vitepress/dist/'))) {
-      return reply.status(404).send('docs not exists');
-    }
-    const { params } = req;
-    const url = params['*']
-    const filePath = url && url[url.length - 1] !== '/' ? path.join(root, 'docs/.vitepress/dist/', url) : path.join(root, 'docs/.vitepress/dist/', url, 'index.html')
-    const ext = path.extname(filePath);
-    const mime = {
-      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg'
-    }[ext];
-    const stream = fs.createReadStream(filePath);
-    return mime ? reply.type(mime).send(stream) : stream;
-
-  })
-}
-export default plugin;
+'use strict'
+
+import path, { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import fs from 'fs';
+
+const dir = dirname(fileURLToPath(import.meta.url));
+const root = `${dir}/../../`;
+
+
+async function plugin(fastify, opts) {
+  fastify.get('/docs*', async (req, reply) => {
+    if (!fs.existsSync(path.join(root, 'docs/.vitepress/dist/'))) {
+      return reply.status(404).send('docs not exists');
+    }
+    const { params } = req;
+    const url = params['*']
+    const filePath = url && url[url.length - 1] !== '/' ? path.join(root, 'docs/.vitepress/dist/', url) : path.join(root, 'docs/.vitepress/dist/', url, 'index.html')
+    const ext = path.extname(filePath);
+    const mime = {
+      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg'
+    }[ext];
+    const stream = fs.createReadStream(filePath);
+    return mime ? reply.type(mime).send(stream) : stream;
+
+  })
+}
+export default plugin;

package/server/plugins/hook.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { createHash } from 'node:crypto';
-import { readFileSync } from 'node:fs';
+import { readFileSync, writeFileSync } from 'node:fs';
 
 import {
     getTemplatePath, addHook, getToken, getTemplate, config, pgClients, initPG, getRedis, logger,
@@ -12,6 +12,9 @@ import printTemplates from '../routes/print/controllers/printTemplates.js';
 const { client } = pgClients;
 
 const rclient = getRedis();
+const cwd = process.cwd();
+
+const logDir = path.join(cwd, 'log/migration');
 
 export default async function plugin(fastify) {
     const user1 = config?.auth?.disable || process.env.NODE_ENV !== 'admin' ? { uid: '1' } : null;
@@ -121,28 +124,47 @@ export default async function plugin(fastify) {
 
         try {
             const hashes = await rclient.hgetall('cls-insert-hashes').then(obj => Object.keys(obj));
-            const names = await pgClients.client.query(`select array_agg(name) from admin.cls where parent is null`).then(el => el.rows?.[0]?.array_agg || []);
+            const names = await client.query(`select array_agg(name) from admin.cls where parent is null`).then(el => el.rows?.[0]?.array_agg || []);
             const qHashes = await Promise.all(cls.filter((el, idx, arr) => arr.map((item) => item.name).indexOf(el.name) === idx).map(async (el) => {
                 const { name, module, type } = el;
                 const loadTemplate = await getTemplate(type, name);
-                const hash = createHash('md5').update(type === 'cls' ? JSON.stringify(loadTemplate) : (loadTemplate?.sql || loadTemplate)).digest('hex');
-                if (type === 'select' && (!hashes.includes(hash) || !names.includes(name))) {
+                el.hash = createHash('md5').update(type === 'cls' ? JSON.stringify(loadTemplate) : (loadTemplate?.sql || loadTemplate)).digest('hex');
+
+                const q = {
+                    cls: `select json_agg(row_to_json(q)) as data from (select code as id, name as text from admin.cls where parent=$1)q`,
+                    select: `select data from admin.cls where name=$1 and type='sql'`
+                }[type];
+                const dbdata = q ? await client.query(q, [name]).then(el => el.rows?.[0]?.data) : null;
+                el.dbhash = createHash('md5').update(type === 'cls' ? JSON.stringify(dbdata) : (dbdata)).digest('hex');
+
+                // check for changes by redis hash / dropped from db / changed at git project
+                el.update = !hashes.includes(el.hash) || !names.includes(name) || el.hash !== el.dbhash;
+
+                if (type === 'select' && (loadTemplate?.sql || loadTemplate) && el.update) {
                     clsQuery.push(`insert into admin.cls(name,type,data,module) values('${name}','sql','${(loadTemplate?.sql || loadTemplate)?.replace(/'/g, "''")}', '${module?.replace(/'/g, "''")}')`);
-                    return hash;
-                } else if (type === 'cls' && loadTemplate?.length && (!hashes.includes(hash) || !names.includes(name))) {
+                    console.log(name, type, 'insert fresh select');
+                    return el.hash;
+                } else if (type === 'cls' && loadTemplate?.length && el.update) {
                     clsQuery.push(`insert into admin.cls(name,type, module) values('${name}','json', '${module?.replace(/'/g, "''")}'); 
                 insert into admin.cls(code,name,parent,icon,data) 
                 select value->>'id',value->>'text','${name}',value->>'icon',value->>'data' 
                 from json_array_elements('${JSON.stringify(loadTemplate).replace(/'/g, "''")}'::json)`);
-                    return hash;
-                } else if (hashes.includes(hash)) {
+                    console.log(name, type, 'insert fresh cls');
+                    return el.hash;
+                } else if (hashes.includes(el.hash)) {
                     console.log(name, type, names.includes(name) ? 'skip equal hash' : 'insert missing cls');
+                    return el.hash;
                 } else {
                     console.log(name, type, 'empty');
+                    return el.hash;
                 }
             }));
 
-            const { rowCount = 0 } = await client.query('delete from admin.cls where $1::text[] && array[name,parent]', [cls.map(el => el.name)]);
+            // debug
+            writeFileSync(path.join(logDir, `${path.basename(cwd)}-${client.options?.database}-cls.sql`), clsQuery.filter((el) => el).join(';'));
+            writeFileSync(path.join(logDir, `${path.basename(cwd)}-${client.options?.database}-cls.json`), JSON.stringify(cls));
+
+            const { rowCount = 0 } = await client.query('delete from admin.cls where $1::text[] && array[name,parent]', [cls.filter(el => el.update).map(el => el.name)]);
             console.log('admin/hook old cls deleted', rowCount);
             if (clsQuery.filter((el) => el).length) {
                 console.log('admin/hook cls sql start', clsQuery?.length);

package/server/routes/access/controllers/access.group.js

@@ -1,30 +1,30 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-import { getAdminAccess } from '../../../../utils.js';
-
-export default async function accessGroup({
-    pg = pgClients.client, params = {}, session = {},
-}) {
-    const { user = {} } = session?.passport || {};
-
-    if (!params?.id) {
-        return { message: 'not enough params: id', status: 400 };
-    }
-
-    // restrict access - admin only
-    const check = await getAdminAccess({
-        id: params.id, user,
-    });
-    if (check) return check;
-
-    const { rows: routes = [] } = await pg.query(`select a.route_id as path, b.actions from admin.routes a 
-    left join admin.role_access b on a.route_id=b.route_id
-    where b.role_id=$1`, [params.id]);
-
-    const { rows: users = [] } = await pg.query(`select user_uid as id, user_name as name, access_granted, 
-    b.cdate as user_created, b.last_activity_date as last_activity from admin.user_roles a
-    left join admin.users b on a.user_uid=b.uid
-    where a.role_id=$1`, [params.id]);
-
-    return { routes, users };
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+import { getAdminAccess } from '../../../../utils.js';
+
+export default async function accessGroup({
+    pg = pgClients.client, params = {}, session = {},
+}) {
+    const { user = {} } = session?.passport || {};
+
+    if (!params?.id) {
+        return { message: 'not enough params: id', status: 400 };
+    }
+
+    // restrict access - admin only
+    const check = await getAdminAccess({
+        id: params.id, user,
+    });
+    if (check) return check;
+
+    const { rows: routes = [] } = await pg.query(`select a.route_id as path, b.actions from admin.routes a 
+    left join admin.role_access b on a.route_id=b.route_id
+    where b.role_id=$1`, [params.id]);
+
+    const { rows: users = [] } = await pg.query(`select user_uid as id, user_name as name, access_granted, 
+    b.cdate as user_created, b.last_activity_date as last_activity from admin.user_roles a
+    left join admin.users b on a.user_uid=b.uid
+    where a.role_id=$1`, [params.id]);
+
+    return { routes, users };
 }

package/server/routes/access/controllers/access.group.post.js

@@ -1,55 +1,55 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-import { getAdminAccess } from '../../../../utils.js';
-import accessGroup from './access.group.js';
-
-export default async function accessGroupPost({
-    pg = pgClients.client, params = {}, session = {}, body = {},
-}) {
-    const { id } = params;
-    const { user } = session?.passport || {};
-    if (!user) return { status: 403, message: 'access restricted' }
-
-    // restrict access - admin only
-    const check = await getAdminAccess({ id, user });
-    if (check) return check;
-
-    const { users = [], routes = [] } = body;
-
-    if (!routes?.length) {
-        // return { message: 'not enough params: users / routes', status: 400 };
-        await pg.query(`delete from admin.role_access where role_id=$1`, [id]);
-
-        if (!users?.length) {
-            return { message: { id, routes }, status: 200 };
-        }
-    }
-
-    if (routes?.length) {
-        const { routesDB = [] } = await pg.query('select array_agg(route_id) as "routesDB" from admin.routes where enabled')
-            .then((res1) => res1.rows?.[0] || {});
-        await pg.query(`delete from admin.role_access where role_id=$1;`, [id]);
-
-
-        const q = `insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)`;
-        await Promise.all(routes.filter(el => routesDB.includes(el.path) && el.actions).map(el => pg.query(q, [id, el.path, el.actions])))
-
-        const { rows } = await pg.query(`select a.route_id as path, b.actions as actions from admin.routes a 
-            left join admin.role_access b on a.route_id=b.route_id
-            where b.role_id=$1`, [id]);
-
-        if (!users?.length) {
-            return { message: { id, routes: rows }, status: 200 };
-        }
-    }
-
-    const q = `delete from admin.user_roles where role_id='${id.replace(/'/g, "''")}';
-    insert into admin.user_roles(role_id,user_uid,access_granted)
-    values ${users.filter((el) => el?.id).map((el) => `('${id.replace(/'/g, "''")}','${el.id.replace(/'/g, "''")}','${uid?.replace(/'/g, "''")}')`)}`;
-
-    await pg.query(q);
-
-    const res = await accessGroup({ pg, params, session });
-
-    return res;
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+import { getAdminAccess } from '../../../../utils.js';
+import accessGroup from './access.group.js';
+
+export default async function accessGroupPost({
+    pg = pgClients.client, params = {}, session = {}, body = {},
+}) {
+    const { id } = params;
+    const { user } = session?.passport || {};
+    if (!user) return { status: 403, message: 'access restricted' }
+
+    // restrict access - admin only
+    const check = await getAdminAccess({ id, user });
+    if (check) return check;
+
+    const { users = [], routes = [] } = body;
+
+    if (!routes?.length) {
+        // return { message: 'not enough params: users / routes', status: 400 };
+        await pg.query(`delete from admin.role_access where role_id=$1`, [id]);
+
+        if (!users?.length) {
+            return { message: { id, routes }, status: 200 };
+        }
+    }
+
+    if (routes?.length) {
+        const { routesDB = [] } = await pg.query('select array_agg(route_id) as "routesDB" from admin.routes where enabled')
+            .then((res1) => res1.rows?.[0] || {});
+        await pg.query(`delete from admin.role_access where role_id=$1;`, [id]);
+
+
+        const q = `insert into admin.role_access(role_id,route_id,actions)   values ($1,$2,$3)`;
+        await Promise.all(routes.filter(el => routesDB.includes(el.path) && el.actions).map(el => pg.query(q, [id, el.path, el.actions])))
+
+        const { rows } = await pg.query(`select a.route_id as path, b.actions as actions from admin.routes a 
+            left join admin.role_access b on a.route_id=b.route_id
+            where b.role_id=$1`, [id]);
+
+        if (!users?.length) {
+            return { message: { id, routes: rows }, status: 200 };
+        }
+    }
+
+    const q = `delete from admin.user_roles where role_id='${id.replace(/'/g, "''")}';
+    insert into admin.user_roles(role_id,user_uid,access_granted)
+    values ${users.filter((el) => el?.id).map((el) => `('${id.replace(/'/g, "''")}','${el.id.replace(/'/g, "''")}','${uid?.replace(/'/g, "''")}')`)}`;
+
+    await pg.query(q);
+
+    const res = await accessGroup({ pg, params, session });
+
+    return res;
 }

package/server/routes/access/index.mjs

@@ -1,11 +1,11 @@
-import accessGroup from "./controllers/access.group.js";
-import accessGroupPost from "./controllers/access.group.post.js";
-import accessInterface from "./controllers/access.interface.js";
-
-import { accessGroupPostSchema, accessGroupSchema, accessInterfaceSchema } from "./schema.mjs";
-
-export default async function route(fastify) {
-    fastify.get('/access-group/:id', { schema: accessGroupSchema }, accessGroup);
-    fastify.post('/access-group/:id', { schema: accessGroupPostSchema }, accessGroupPost);
-    fastify.get('/access-interface/:name', { schema: accessInterfaceSchema }, accessInterface);
-}
+import accessGroup from "./controllers/access.group.js";
+import accessGroupPost from "./controllers/access.group.post.js";
+import accessInterface from "./controllers/access.interface.js";
+
+import { accessGroupPostSchema, accessGroupSchema, accessInterfaceSchema } from "./schema.mjs";
+
+export default async function route(fastify) {
+    fastify.get('/access-group/:id', { schema: accessGroupSchema }, accessGroup);
+    fastify.post('/access-group/:id', { schema: accessGroupPostSchema }, accessGroupPost);
+    fastify.get('/access-interface/:name', { schema: accessInterfaceSchema }, accessInterface);
+}