@opengis/fastify-table 1.0.94 → 1.0.96

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.96 - 12.09.2024
+
+- minor refactor of email notifications
+
+## 1.0.95 - 12.09.2024
+
+- add dbname to getFolder func
+
 ## 1.0.94 - 11.09.2024
 
 - fix getMeta (public schema)

package/index.js

@@ -43,7 +43,7 @@ async function plugin(fastify, opt) {
   fastify.decorate('getFolder', (req, type = 'server') => {
     if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
     const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
-    const filepath = path.posix.join(types[type] || '/data/local', req.folder || config.folder || '');
+    const filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, req.folder || config.folder || '');
     return filepath;
   });
 

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 || '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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.94",
+  "version": "1.0.96",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",