@opengis/fastify-table 1.0.70 → 1.0.72

package/index.js

@@ -1,89 +1,97 @@
-import path from 'path';
-import { existsSync, readdirSync, readFileSync } from 'fs';
-
-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 pgClients from './pg/pgClients.js';
-
-import execMigrations from './migration/exec.migrations.js';
-
-async function plugin(fastify, opt) {
-  // console.log(opt);
-  config.pg = opt.pg;
-  config.redis = opt.redis;
-  config.root = opt.root;
-  config.mapServerRoot = opt.mapServerRoot;
-
-  // independent npm start / unit test
-  if (!fastify.config) {
-    fastify.decorate('config', config);
-  }
-
-  fastify.register(import('@opengis/fastify-hb'));
-  fastify.decorate('getFolder', (req, type = 'server') => {
-    if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
-    const types = { local: req.root, server: req.mapServerRoot };
-    const filepath = path.posix.join(types[type] || '/data/local', req.folder || config.folder || '');
-    return filepath;
-  });
-
-  fastify.addHook('onListen', async () => {
-    const { client } = pgClients;
-    if (client?.pk?.['crm.cls']) {
-      const clsDir = path.join(process.cwd(), 'server/templates/cls');
-      const files = existsSync(clsDir) ? readdirSync(clsDir) : [];
-      if (files.length) {
-        const res = await Promise.all(files.map(async (filename) => {
-          const filepath = path.join(clsDir, filename);
-          const data = JSON.parse(readFileSync(filepath));
-          return { name: path.parse(filename).name, data };
-        }));
-        await client.query('truncate table crm.cls');
-        const { rows } = await client.query(`insert into crm.cls(name, type) 
-        select value->>'name', 'json' from json_array_elements($1) returning cls_id as id, name`, [JSON.stringify(res).replace(/'/g, "''")]);
-        rows.forEach((row) => Object.assign(row, { data: res.find((cls) => row.name === cls.name)?.data }));
-        const sql = `insert into crm.cls(code, name, parent)
-        select json_array_elements(value->'data')->>'id', json_array_elements(value->'data')->>'text', value->>'name' from json_array_elements($1)`;
-        await client.query(sql, [JSON.stringify(rows).replace(/'/g, "''")]);
-      }
-    }
-    // call from another repo / project
-    fastify.execMigrations = execMigrations;
-    // execute core migrations
-    await fastify.execMigrations();
-  });
-  if (!fastify.funcs) {
-    fastify.addHook('onRequest', async (req) => {
-      req.funcs = fastify;
-      if (!req.user && req.session?.passport?.user) {
-        const { user } = req.session?.passport || {};
-        req.user = user;
-      }
-    });
-    // fastify.decorateRequest('funcs', fastify);
-  }
-
-  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);
-}
-export default fp(plugin);
-// export { rclient };
+import path from 'path';
+import { existsSync, readdirSync, readFileSync } from 'fs';
+
+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 pgClients from './pg/pgClients.js';
+
+import execMigrations from './migration/exec.migrations.js';
+
+async function plugin(fastify, opt) {
+  // console.log(opt);
+  config.pg = opt.pg;
+  config.redis = opt.redis;
+  config.root = opt.root;
+  config.mapServerRoot = opt.mapServerRoot;
+
+  // independent npm start / unit test
+  if (!fastify.config) {
+    fastify.decorate('config', config);
+  }
+
+  fastify.register(import('@fastify/sensible'), {
+    errorHandler: false,
+  });
+
+  fastify.register(import('@fastify/url-data'), {
+    errorHandler: false,
+  });
+
+  fastify.register(import('@opengis/fastify-hb'));
+  fastify.decorate('getFolder', (req, type = 'server') => {
+    if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
+    const types = { local: req.root, server: req.mapServerRoot };
+    const filepath = path.posix.join(types[type] || '/data/local', req.folder || config.folder || '');
+    return filepath;
+  });
+
+  fastify.addHook('onListen', async () => {
+    const { client } = pgClients;
+    if (client?.pk?.['crm.cls']) {
+      const clsDir = path.join(process.cwd(), 'server/templates/cls');
+      const files = existsSync(clsDir) ? readdirSync(clsDir) : [];
+      if (files.length) {
+        const res = await Promise.all(files.map(async (filename) => {
+          const filepath = path.join(clsDir, filename);
+          const data = JSON.parse(readFileSync(filepath));
+          return { name: path.parse(filename).name, data };
+        }));
+        await client.query('truncate table crm.cls');
+        const { rows } = await client.query(`insert into crm.cls(name, type) 
+        select value->>'name', 'json' from json_array_elements($1) returning cls_id as id, name`, [JSON.stringify(res).replace(/'/g, "''")]);
+        rows.forEach((row) => Object.assign(row, { data: res.find((cls) => row.name === cls.name)?.data }));
+        const sql = `insert into crm.cls(code, name, parent)
+        select json_array_elements(value->'data')->>'id', json_array_elements(value->'data')->>'text', value->>'name' from json_array_elements($1)`;
+        await client.query(sql, [JSON.stringify(rows).replace(/'/g, "''")]);
+      }
+    }
+    // call from another repo / project
+    fastify.execMigrations = execMigrations;
+    // execute core migrations
+    await fastify.execMigrations();
+  });
+  if (!fastify.funcs) {
+    fastify.addHook('onRequest', async (req) => {
+      req.funcs = fastify;
+      if (!req.user && req.session?.passport?.user) {
+        const { user } = req.session?.passport || {};
+        req.user = user;
+      }
+    });
+    // fastify.decorateRequest('funcs', fastify);
+  }
+
+  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);
+}
+export default fp(plugin);
+// export { rclient };

package/migration/exec.migrations.js

@@ -1,76 +1,76 @@
-import fs from 'fs';
-import path from 'path';
-
-const time = Date.now();
-
-import getPG from '../pg/funcs/getPG.js';
-
-export default async function execMigrations(opt) {
-    try {
-        const pg = opt?.pg || getPG({ name: 'client' });
-        const rootDir = getCallerDir();
-        const dir = path.join(rootDir.replace(/\\/g, '/').replace(/^file:\/\/\//, ''), rootDir.endsWith('plugins') ? '../..' : '', '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);
-    }
-}
-
-function getCallerDir() {
-    const originalFunc = Error.prepareStackTrace;
-
-    let callerfile;
-    try {
-        const err = new Error();
-        let currentfile;
-
-        Error.prepareStackTrace = function (err, stack) { return stack; };
-
-        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);
-    }
+import fs from 'fs';
+import path from 'path';
+
+const time = Date.now();
+
+import getPG from '../pg/funcs/getPG.js';
+
+export default async function execMigrations(opt) {
+    try {
+        const pg = opt?.pg || getPG({ name: 'client' });
+        const rootDir = getCallerDir();
+        const dir = path.join(rootDir.replace(/\\/g, '/').replace(/^file:\/\/\//, ''), rootDir.endsWith('plugins') ? '../..' : '', '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);
+    }
+}
+
+function getCallerDir() {
+    const originalFunc = Error.prepareStackTrace;
+
+    let callerfile;
+    try {
+        const err = new Error();
+        let currentfile;
+
+        Error.prepareStackTrace = function (err, stack) { return stack; };
+
+        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);
+    }
 }

package/notification/controllers/testEmail.js

@@ -1,49 +1,49 @@
-import path from 'path';
-import { existsSync } from 'fs';
-import { fileURLToPath } from 'url';
-
-const fileName = fileURLToPath(import.meta.url);
-const dirName = path.dirname(fileName);
-
-import notification from '../funcs/sendNotification.js';
-
-export default async function testNotification({
-  pg, funcs = {}, log, query = {}, session = {},
-}) {
-  const { local } = funcs.config || {};
-  if (!session?.passport?.user?.user_type?.includes('admin') && !local) {
-    return { message: 'Forbidden', status: 403 };
-  }
-
-  const date = new Date().toISOString().split('T')[0];
-  if (!query.to) {
-    return { message: 'param to is required', status: 400 };
-  }
-
-  try {
-    const {
-      to, template, table, id, nocache,
-    } = query;
-    const file = [path.join(dirName, '../../', 'changelog.md'), path.join(dirName, 'utils', 'pin-m-ty-media-record-outline+303070.png')].filter((el) => existsSync(el));
-    const data = await notification({
-      pg,
-      funcs,
-      log,
-      to,
-      template,
-      title: `Test Softpro ${date}`,
-      table,
-      nocache,
-      file,
-      id,
-      message: `Test mail Softpro ${date} Lorem Ipsum Lorem Ipsum`,
-    });
-
-    return {
-      message: data || 'ok',
-    };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import path from 'path';
+import { existsSync } from 'fs';
+import { fileURLToPath } from 'url';
+
+const fileName = fileURLToPath(import.meta.url);
+const dirName = path.dirname(fileName);
+
+import notification from '../funcs/sendNotification.js';
+
+export default async function testNotification({
+  pg, funcs = {}, log, query = {}, session = {},
+}) {
+  const { local } = funcs.config || {};
+  if (!session?.passport?.user?.user_type?.includes('admin') && !local) {
+    return { message: 'Forbidden', status: 403 };
+  }
+
+  const date = new Date().toISOString().split('T')[0];
+  if (!query.to) {
+    return { message: 'param to is required', status: 400 };
+  }
+
+  try {
+    const {
+      to, template, table, id, nocache,
+    } = query;
+    const file = [path.join(dirName, '../../', 'changelog.md'), path.join(dirName, 'utils', 'pin-m-ty-media-record-outline+303070.png')].filter((el) => existsSync(el));
+    const data = await notification({
+      pg,
+      funcs,
+      log,
+      to,
+      template,
+      title: `Test Softpro ${date}`,
+      table,
+      nocache,
+      file,
+      id,
+      message: `Test mail Softpro ${date} Lorem Ipsum Lorem Ipsum`,
+    });
+
+    return {
+      message: data || 'ok',
+    };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/notification/funcs/utils/sendEmail.js

@@ -1,39 +1,39 @@
-import nodemailer from 'nodemailer';
-
-/**
- * Надсилає поваідомлення на пошту
- *
- * @type function
- * @alias sendEmail
- * @summary Функція здійснює розсилку по email
- */
-
-export default async function sendEmail({
-  funcs, to, from, subject, html, attachments,
-}) {
-  const { config = {} } = funcs;
-
-  if (!to?.length) {
-    throw new Error('empty to list');
-  }
-
-  const { mailSetting = {} } = config;
-
-  /*= == check service and setting === */
-  if (!mailSetting.service) {
-    throw new Error('service is not defined in config');
-  }
-
-  Object.assign(mailSetting, { rejectUnauthorized: false });
-
-  if (mailSetting.port === 465) {
-    Object.assign(mailSetting, { secure: true });
-  }
-
-  const transport = nodemailer.createTransport(mailSetting);
-
-  const result = await transport.sendMail({
-    from: from || mailSetting.from, to, subject, html, attachments,
-  });
-  return result;
-}
+import nodemailer from 'nodemailer';
+
+/**
+ * Надсилає поваідомлення на пошту
+ *
+ * @type function
+ * @alias sendEmail
+ * @summary Функція здійснює розсилку по email
+ */
+
+export default async function sendEmail({
+  funcs, to, from, subject, html, attachments,
+}) {
+  const { config = {} } = funcs;
+
+  if (!to?.length) {
+    throw new Error('empty to list');
+  }
+
+  const { mailSetting = {} } = config;
+
+  /*= == check service and setting === */
+  if (!mailSetting.service) {
+    throw new Error('service is not defined in config');
+  }
+
+  Object.assign(mailSetting, { rejectUnauthorized: false });
+
+  if (mailSetting.port === 465) {
+    Object.assign(mailSetting, { secure: true });
+  }
+
+  const transport = nodemailer.createTransport(mailSetting);
+
+  const result = await transport.sendMail({
+    from: from || mailSetting.from, to, subject, html, attachments,
+  });
+  return result;
+}

package/notification/index.js

@@ -1,31 +1,31 @@
-// api
-import userNotifications from './controllers/userNotifications.js';
-import testEmail from './controllers/testEmail.js';
-// funcs
-import addNotification from './funcs/addNotification.js'; // add to db
-import notification from './funcs/sendNotification.js'; // send
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.route({
-    method: 'GET',
-    url: `${prefix}/notification`,
-    config: {
-      policy: ['user'], // implement user auth check policy??
-    },
-    handler: userNotifications,
-  });
-  fastify.route({
-    method: 'GET',
-    url: `${prefix}/test-email`,
-    config: {
-      policy: ['user'],
-    },
-    handler: testEmail,
-  });
-
-  fastify.decorate('addNotification', addNotification);
-  fastify.decorate('notification', notification);
-}
-
-export default plugin;
+// api
+import userNotifications from './controllers/userNotifications.js';
+import testEmail from './controllers/testEmail.js';
+// funcs
+import addNotification from './funcs/addNotification.js'; // add to db
+import notification from './funcs/sendNotification.js'; // send
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.route({
+    method: 'GET',
+    url: `${prefix}/notification`,
+    config: {
+      policy: ['user'], // implement user auth check policy??
+    },
+    handler: userNotifications,
+  });
+  fastify.route({
+    method: 'GET',
+    url: `${prefix}/test-email`,
+    config: {
+      policy: ['user'],
+    },
+    handler: testEmail,
+  });
+
+  fastify.decorate('addNotification', addNotification);
+  fastify.decorate('notification', notification);
+}
+
+export default plugin;

package/package.json

@@ -1,25 +1,27 @@
-{
-  "name": "@opengis/fastify-table",
-  "version": "1.0.70",
-  "type": "module",
-  "description": "core-plugins",
-  "main": "index.js",
-  "scripts": {
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "test": "node --test"
-  },
-  "dependencies": {
-    "@opengis/fastify-hb": "^1.0.0",
-    "fastify": "^4.26.1",
-    "fastify-plugin": "^4.0.0",
-    "ioredis": "^5.3.2",
-    "pg": "^8.11.3",
-    "nodemailer": "^6.5.0"
-  },
-  "devDependencies": {
-    "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^19.0.4"
-  },
-  "author": "Softpro",
-  "license": "ISC"
-}
+{
+  "name": "@opengis/fastify-table",
+  "version": "1.0.72",
+  "type": "module",
+  "description": "core-plugins",
+  "main": "index.js",
+  "scripts": {
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "test": "node --test"
+  },
+  "dependencies": {
+    "@opengis/fastify-hb": "^1.0.0",
+    "@fastify/sensible": "^5.0.0",
+    "@fastify/url-data": "^5.4.0",
+    "fastify": "^4.26.1",
+    "fastify-plugin": "^4.0.0",
+    "ioredis": "^5.3.2",
+    "pg": "^8.11.3",
+    "nodemailer": "^6.5.0"
+  },
+  "devDependencies": {
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4"
+  },
+  "author": "Softpro",
+  "license": "ISC"
+}