@opengis/fastify-table 1.2.10 → 1.2.12

package/index.js

@@ -48,7 +48,15 @@ async function plugin(fastify, opt) {
 
   fastify.register(import('@opengis/fastify-hb'));
 
-  execMigrations().catch(err => console.log(err));
+  const filename = fileURLToPath(import.meta.url);
+  const cwd = path.dirname(filename);
+
+  // core migrations (second argument for core only)
+  execMigrations(path.join(cwd, 'server/migrations'), true).catch(err => console.log(err));
+
+  // core templates && cls
+  config.templates?.forEach(el => addTemplateDir(el));
+  addTemplateDir(path.join(cwd, 'module/core'));
 
   // plugins / utils / funcs
   policyPlugin(fastify);
@@ -67,12 +75,5 @@ async function plugin(fastify, opt) {
   propertiesRoutes(fastify, opt);
   tableRoutes(fastify, opt);
   utilRoutes(fastify, opt);
-
-  // core templates && cls
-  const filename = fileURLToPath(import.meta.url);
-  const cwd = path.dirname(filename);
-
-  config.templates?.forEach(el => addTemplateDir(el));
-  addTemplateDir(path.join(cwd, 'module/core'));
 }
 export default fp(plugin);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/migrations/template.sql

@@ -0,0 +1,35 @@
+create schema if not exists admin;
+
+-- DROP TABLE is exists admin.templates;
+CREATE TABLE if not exists admin.templates();
+ALTER TABLE admin.templates add column if not exists template_id text NOT NULL DEFAULT next_id();
+ALTER TABLE admin.templates DROP CONSTRAINT if exists admin_templates_template_id_pkey cascade;
+ALTER TABLE admin.templates DROP CONSTRAINT if exists admin_templates_name_type_unique;
+
+ALTER TABLE admin.templates add column if not exists name text;
+ALTER TABLE admin.templates add column if not exists title text;
+ALTER TABLE admin.templates add column if not exists type text;
+ALTER TABLE admin.templates add column if not exists route_id text;
+ALTER TABLE admin.templates add column if not exists enabled boolean;
+ALTER TABLE admin.templates alter column enabled set default true;
+ALTER TABLE admin.templates add column if not exists body text;
+
+ALTER TABLE admin.templates add column if not exists uid text;
+ALTER TABLE admin.templates add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE admin.templates alter column cdate set DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE admin.templates add column if not exists editor_id text;
+ALTER TABLE admin.templates add column if not exists editor_date timestamp without time zone;
+
+ALTER TABLE admin.templates add CONSTRAINT admin_templates_template_id_pkey PRIMARY KEY (template_id);
+ALTER TABLE admin.templates add CONSTRAINT admin_templates_name_type_unique UNIQUE (name, type);
+
+COMMENT ON TABLE admin.templates IS 'Шаблони для друку';
+
+COMMENT ON COLUMN admin.templates.uid IS 'ID користувача';
+
+COMMENT ON COLUMN admin.templates.name IS 'Систамна назва шаблону';
+COMMENT ON COLUMN admin.templates.title IS 'Назва шаблону українською';
+COMMENT ON COLUMN admin.templates.type IS 'Тип вихідних даних шаблону (demo/user)';
+COMMENT ON COLUMN admin.templates.route_id IS 'ID інтерфейсу';
+COMMENT ON COLUMN admin.templates.enabled IS 'On / Off';
+COMMENT ON COLUMN admin.templates.body IS 'Body HTML';

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

@@ -0,0 +1,37 @@
+import path from 'node:path';
+import { readdirSync, existsSync } from 'node:fs';
+
+import config from '../../../config.js';
+import execSql from './exec.sql.js';
+// import getCallerDir from './get.caller.dir.js';
+
+const time = Date.now();
+
+export default async function execMigrations(dirPath, iscore) {
+  if (
+    !dirPath
+    || (config.migrationsCore === false && iscore)
+    || config.migrations === false
+  ) {
+    console.log('migrations skip', 'core: ', !!iscore, 'dir: ', dirPath || 'not specified');
+    return;
+  }
+
+  console.log('migrations start', dirPath, Date.now() - time);
+
+  const exists = existsSync(dirPath);
+
+  if (exists) {
+    // get directory sql file list
+    const content = readdirSync(dirPath, { withFileTypes: true })
+      ?.filter((el) => el.isFile() && path.extname(el.name) === '.sql')
+      ?.map((el) => el.name) || [];
+
+    // execute sql files
+    if (content?.length) {
+      await content.reduce((promise, filename) => promise.then(() => execSql(path.join(dirPath, filename))), Promise.resolve());
+    }
+  }
+
+  console.log('migrations finish', dirPath, exists, Date.now() - time);
+}

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

@@ -0,0 +1,46 @@
+import path from 'node:path';
+import { existsSync, readFileSync } from 'node:fs';
+
+import { logger, pgClients } from '../../../utils.js';
+
+export default async function execSql(filepath, pg = pgClients.client) {
+    const start = Date.now();
+
+    if (!filepath) return null;
+
+    const filename = path.basename(filepath);
+
+    if (!existsSync(filepath)) {
+        logger.file('migration/notfound', {
+            filepath,
+            result: 'not found',
+        });
+        console.log(filepath, 'warn', 'not found', Date.now() - start);
+        return null;
+    }
+
+    const sql = readFileSync(filepath, 'utf-8');
+
+    try {
+        console.log(filename, 'start', Date.now() - start);
+        await pg.query(sql);
+        console.log(filename, 'finish', Date.now() - start);
+        logger.file('migration/success', {
+            filepath,
+            result: 'success',
+            time: Date.now() - start,
+        });
+        return 'ok';
+    }
+    catch (err) {
+        console.log(filename, 'error', err.toString(), Date.now() - start);
+        logger.file('migration/error', {
+            filepath,
+            result: 'error',
+            error: err.toString(),
+            stack: err.stack,
+            time: Date.now() - start,
+        });
+        return err.toString();
+    }
+}

package/server/plugins/migration/get.caller.dir.js

@@ -0,0 +1,26 @@
+import path from 'node:path';
+
+export default function getCallerDir() {
+  const originalFunc = Error.prepareStackTrace;
+
+  let callerfile;
+  try {
+    const err = new Error();
+    // let currentfile;
+
+    Error.prepareStackTrace = function (err, stack) { return stack; };
+
+    const currentfile = err.stack.shift().getFileName();
+
+    while (err.stack.length) {
+      callerfile = err.stack.shift().getFileName();
+
+      if (currentfile !== callerfile) break;
+    }
+  }
+  catch (err) { }
+
+  Error.prepareStackTrace = originalFunc;
+
+  return path.dirname(callerfile);
+}

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

@@ -27,9 +27,9 @@ export default function checkPolicy(req, reply) {
   const { policy = [] } = routeOptions?.config || {};
 
   /*= == 0.Check superadmin access  === */
-  if (policy.includes('superadmin') && user?.user_type !== 'superadmin') {
+  if (policy.includes('admin') && user?.user_type !== 'admin') {
     logger.file('policy/access', {
-      path, method, params, query, body, message: 'access restricted: not superadmin', uid: user?.uid,
+      path, method, params, query, body, message: 'access restricted: not admin', uid: user?.uid,
     });
     return reply.status(403).send('access restricted: 0');
   }

package/utils.js

@@ -49,7 +49,8 @@ import checkXSS from './server/plugins/policy/funcs/checkXSS.js';
 import applyHook from './server/plugins/hook/funcs/applyHook.js';
 import applyHookSync from './server/plugins/hook/funcs/applyHookSync.js';
 import addHook from './server/plugins/hook/funcs/addHook.js';
-import execMigrations from './server/plugins/migration/funcs/exec.migrations.js';
+import execMigrations from './server/plugins/migration/exec.migrations.js';
+import execSql from './server/plugins/migration/exec.sql.js';
 
 // cron
 import addCron from './server/plugins/cron/funcs/addCron.js';
@@ -74,6 +75,7 @@ export {
   getFilterSQL,
   addCron,
   execMigrations,
+  execSql,
   getRedis,
   redisClients,
   logger,

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

@@ -1,86 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-
-const time = Date.now();
-
-import getPG from '../../pg/funcs/getPG.js';
-
-function getCallerDir() {
-  const originalFunc = Error.prepareStackTrace;
-
-  let callerfile;
-  try {
-    const err = new Error();
-    // let currentfile;
-
-    Error.prepareStackTrace = function (err, stack) { return stack; };
-
-    const currentfile = err.stack.shift().getFileName();
-
-    while (err.stack.length) {
-      callerfile = err.stack.shift().getFileName();
-
-      if (currentfile !== callerfile) break;
-    }
-  }
-  catch (err) { }
-
-  Error.prepareStackTrace = originalFunc;
-
-  return path.dirname(callerfile);
-}
-
-function sequence(files, data, fn) {
-  return files.reduce((promise, filename) => promise.then(() => fn({
-    ...data, filename,
-  })), Promise.resolve());
-}
-
-async function execSql({
-  pg, dir, filename,
-}) {
-  const start = Date.now();
-  const filepath = path.join(dir, filename);
-  const sql = fs.readFileSync(filepath, 'utf-8');
-  try {
-    console.log(filename, 'start', Date.now() - start);
-    await pg.query(sql);
-    console.log(filename, 'finish', Date.now() - start);
-  }
-  catch (err) {
-    console.log(filepath, 'error', err.toString(), Date.now() - start);
-  }
-}
-
-export default async function execMigrations(opt) {
-  try {
-    const pg = opt?.pg || getPG({ name: 'client' });
-    const rootDir = getCallerDir();
-    const subdir = () => {
-      if (rootDir.endsWith('plugins')) {
-        return '../..';
-      } if (path.basename(rootDir) === 'server') {
-        return '..';
-      }
-    };
-    const dir = path.join(rootDir.replace(/\\/g, '/').replace(/^file:\/\/\//, ''), subdir() || '', 'server/migrations');
-
-    console.log('migrations start', dir, Date.now() - time);
-    const exists = fs.existsSync(dir);
-    if (exists) {
-      // get directory sql file list
-      const content = fs.readdirSync(dir, { withFileTypes: true })
-        ?.filter((el) => el.isFile() && path.extname(el.name) === '.sql')
-        ?.map((el) => el.name) || [];
-
-      // execute sql files
-      if (content?.length) {
-        await sequence(content, { pg, dir }, execSql);
-      }
-    }
-    console.log('migrations finish', dir, exists, Date.now() - time);
-  }
-  catch (err) {
-    console.error('migrations error', err.toString(), Date.now() - time);
-  }
-}