@opengis/fastify-table 1.0.74 → 1.0.76

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/sendNotification.js

@@ -1,111 +1,111 @@
-// eslint-disable-next-line max-len, no-control-regex
-const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
-
-// eslint-disable-next-line import/no-relative-packages
-// import downloadFile from '../../../fastify-file/file/funcs/downloadFile.js'; // test only
-import pgClients from '../../pg/pgClients.js';
-import sendEmail from './utils/sendEmail.js';
-import getTemplate from '../../table/controllers/utils/getTemplate.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-async function generateNotificationContent({
-  pg, funcs, table, template, id, message, data: data1,
-}) {
-  if (template) {
-    const data = table && id ? await pg.one(`select * from ${table} where ${pg.pk[table]}=$1`, [id]) : data1;
-    // console.log(data);
-    const body = await getTemplate('pt', template);
-    // console.log(body);
-    const html = funcs.handlebars.compile(body || 'template not found')(data || {});
-    // console.log(html);
-    return html;
-  }
-  return message;
-}
-
-export default async function notification({
-  pg: pg1,
-  funcs,
-  log,
-  provider = ['email'],
-  from,
-  to,
-  template,
-  table,
-  message,
-  title,
-  file,
-  data,
-  id,
-  nocache,
-}) {
-  const rclient = getRedis();
-  const pg = pg1 || pgClients.client;
-
-  if (!pg) throw new Error('need pg');
-
-  if (pg?.readonly) {
-    return null;
-  }
-
-  const keyTo = `${pg.options?.database}:mail:${provider[0]}:${to || ''}${id || ''}${table || ''}${title || ''}`;
-  const uniqueTo = await rclient.setnx(keyTo, 1);
-  log.info('notification/sent', { keyTo, send: uniqueTo, nocache });
-
-  if (!uniqueTo && !nocache) {
-    return `already sent: ${keyTo}`;
-  }
-  await rclient.expire(keyTo, 1000 * 600);
-
-  if (!to.length) {
-    return null;
-  }
-
-  if (!(Array.isArray(provider) && provider.length)) {
-    return 'notification provider - must be array and not empty';
-  }
-
-  try {
-    const html = await generateNotificationContent({
-      pg, funcs, table, template, id, message, data,
-    });
-
-    // return html;
-
-    if (provider.includes('email')) {
-      const files = Array.isArray(file) ? file : [file];
-      const attachments = files?.length ? await Promise.all(files?.filter((el) => el).map(async (el) => {
-        const content = await funcs.downloadFile(el, { funcs, buffer: true }); // ?
-        return {
-          filename: el.split('/').pop(),
-          encoding: 'base64',
-          content,
-        };
-      })) : [];
-
-      const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
-
-      const result = await sendEmail({
-        funcs,
-        attachments,
-        html,
-        subject: title,
-        from,
-        to: toEmail,
-      });
-
-      log.info('notification', {
-        provider, title, to: toEmail, from, result, len: message?.length, files,
-      });
-
-      return result;
-    }
-    return null;
-  }
-  catch (err) {
-    log.info('notification/error', {
-      provider, from, to, err: err.toString(),
-    });
-    throw err;
-  }
-}
+// eslint-disable-next-line max-len, no-control-regex
+const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
+
+// eslint-disable-next-line import/no-relative-packages
+// import downloadFile from '../../../fastify-file/file/funcs/downloadFile.js'; // test only
+import pgClients from '../../pg/pgClients.js';
+import sendEmail from './utils/sendEmail.js';
+import getTemplate from '../../table/controllers/utils/getTemplate.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+async function generateNotificationContent({
+  pg, funcs, table, template, id, message, data: data1,
+}) {
+  if (template) {
+    const data = table && id ? await pg.one(`select * from ${table} where ${pg.pk[table]}=$1`, [id]) : data1;
+    // console.log(data);
+    const body = await getTemplate('pt', template);
+    // console.log(body);
+    const html = funcs.handlebars.compile(body || 'template not found')(data || {});
+    // console.log(html);
+    return html;
+  }
+  return message;
+}
+
+export default async function notification({
+  pg: pg1,
+  funcs,
+  log,
+  provider = ['email'],
+  from,
+  to,
+  template,
+  table,
+  message,
+  title,
+  file,
+  data,
+  id,
+  nocache,
+}) {
+  const rclient = getRedis();
+  const pg = pg1 || pgClients.client;
+
+  if (!pg) throw new Error('need pg');
+
+  if (pg?.readonly) {
+    return null;
+  }
+
+  const keyTo = `${pg.options?.database}:mail:${provider[0]}:${to || ''}${id || ''}${table || ''}${title || ''}`;
+  const uniqueTo = await rclient.setnx(keyTo, 1);
+  log.info('notification/sent', { keyTo, send: uniqueTo, nocache });
+
+  if (!uniqueTo && !nocache) {
+    return `already sent: ${keyTo}`;
+  }
+  await rclient.expire(keyTo, 1000 * 600);
+
+  if (!to.length) {
+    return null;
+  }
+
+  if (!(Array.isArray(provider) && provider.length)) {
+    return 'notification provider - must be array and not empty';
+  }
+
+  try {
+    const html = await generateNotificationContent({
+      pg, funcs, table, template, id, message, data,
+    });
+
+    // return html;
+
+    if (provider.includes('email')) {
+      const files = Array.isArray(file) ? file : [file];
+      const attachments = files?.length ? await Promise.all(files?.filter((el) => el).map(async (el) => {
+        const content = await funcs.downloadFile(el, { funcs, buffer: true }); // ?
+        return {
+          filename: el.split('/').pop(),
+          encoding: 'base64',
+          content,
+        };
+      })) : [];
+
+      const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
+
+      const result = await sendEmail({
+        funcs,
+        attachments,
+        html,
+        subject: title,
+        from,
+        to: toEmail,
+      });
+
+      log.info('notification', {
+        provider, title, to: toEmail, from, result, len: message?.length, files,
+      });
+
+      return result;
+    }
+    return null;
+  }
+  catch (err) {
+    log.info('notification/error', {
+      provider, from, to, err: err.toString(),
+    });
+    throw err;
+  }
+}

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,38 +1,38 @@
-// 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
-
-const tableSchema = {
-  querystring: {
-    nocache: { type: 'string', pattern: '^(\\d+)$' },
-  },
-};
-
-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??
-    },
-    schema: tableSchema,
-    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
+
+const tableSchema = {
+  querystring: {
+    nocache: { type: 'string', pattern: '^(\\d+)$' },
+  },
+};
+
+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??
+    },
+    schema: tableSchema,
+    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,27 +1,27 @@
-{
-  "name": "@opengis/fastify-table",
-  "version": "1.0.74",
-  "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"
+{
+  "name": "@opengis/fastify-table",
+  "version": "1.0.76",
+  "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"
 }

package/pg/funcs/getPG.js

@@ -1,30 +1,30 @@
-import pg from 'pg';
-import config from '../../config.js';
-import pgClients from '../pgClients.js';
-import init from './init.js';
-
-function getPG(param) {
-  const {
-    user, password, host, port, db, database, name: origin, funcs,
-  } = param || {};
-  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
-  const name = origin || db || database || param || 'client';
-  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 || database || config.pg?.db || config.pg?.database,
-  };
-
-  pgClients[name] = new pg.Pool(dbConfig);
-  pgClients[name].init = async () => {
-    await init(pgClients[name]);
-  };
-  init(pgClients[name]);
-  return pgClients[name];
-}
-
-export default getPG;
+import pg from 'pg';
+import config from '../../config.js';
+import pgClients from '../pgClients.js';
+import init from './init.js';
+
+function getPG(param) {
+  const {
+    user, password, host, port, db, database, name: origin, funcs,
+  } = param || {};
+  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
+  const name = origin || db || database || param || 'client';
+  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 || database || config.pg?.db || config.pg?.database,
+  };
+
+  pgClients[name] = new pg.Pool(dbConfig);
+  pgClients[name].init = async () => {
+    await init(pgClients[name]);
+  };
+  init(pgClients[name]);
+  return pgClients[name];
+}
+
+export default getPG;

package/redis/funcs/getRedis.js

@@ -1,23 +1,23 @@
-import Redis from 'ioredis';
-import config from '../../config.js';
-import redisClients from './redisClients.js';
-
-function getRedis({ db } = { db: 0 }) {
-  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;
+import Redis from 'ioredis';
+import config from '../../config.js';
+import redisClients from './redisClients.js';
+
+function getRedis({ db } = { db: 0 }) {
+  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;