@opengis/fastify-table 1.0.74 → 1.0.75

package/crud/index.js

@@ -1,36 +1,36 @@
-import getOpt from './funcs/getOpt.js';
-import setOpt from './funcs/setOpt.js';
-import isFileExists from './funcs/isFileExists.js';
-import dataUpdate from './funcs/dataUpdate.js';
-import dataInsert from './funcs/dataInsert.js';
-
-import update from './controllers/update.js';
-import insert from './controllers/insert.js';
-import deleteCrud from './controllers/deleteCrud.js';
-import getAccessFunc from './funcs/getAccess.js';
-
-const tableSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  // funcs
-  fastify.decorate('setOpt', setOpt);
-  fastify.decorate('getOpt', getOpt);
-  fastify.decorate('dataUpdate', dataUpdate);
-  fastify.decorate('dataInsert', dataInsert);
-  fastify.decorate('getAccess', getAccessFunc);
-
-  fastify.decorate('isFileExists', isFileExists);
-
-  // api
-  fastify.put(`${prefix}/table/:table/:id`, { schema: tableSchema }, update);
-  fastify.delete(`${prefix}/table/:table/:id`, { schema: tableSchema }, deleteCrud);
-  fastify.post(`${prefix}/table/:table`, { schema: tableSchema }, insert);
-}
-
-export default plugin;
+import getOpt from './funcs/getOpt.js';
+import setOpt from './funcs/setOpt.js';
+import isFileExists from './funcs/isFileExists.js';
+import dataUpdate from './funcs/dataUpdate.js';
+import dataInsert from './funcs/dataInsert.js';
+
+import update from './controllers/update.js';
+import insert from './controllers/insert.js';
+import deleteCrud from './controllers/deleteCrud.js';
+import getAccessFunc from './funcs/getAccess.js';
+
+const tableSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  // funcs
+  fastify.decorate('setOpt', setOpt);
+  fastify.decorate('getOpt', getOpt);
+  fastify.decorate('dataUpdate', dataUpdate);
+  fastify.decorate('dataInsert', dataInsert);
+  fastify.decorate('getAccess', getAccessFunc);
+
+  fastify.decorate('isFileExists', isFileExists);
+
+  // api
+  fastify.put(`${prefix}/table/:table/:id`, { schema: tableSchema }, update);
+  fastify.delete(`${prefix}/table/:table/:id`, { schema: tableSchema }, deleteCrud);
+  fastify.post(`${prefix}/table/:table`, { schema: tableSchema }, insert);
+}
+
+export default plugin;

package/helper.js

@@ -1,28 +1,28 @@
-// This file contains code that we reuse
-// between our tests.
-import Fastify from 'fastify';
-import config from './test/config.js';
-import appService from './index.js';
-
-import rclient from './redis/client.js';
-import pgClients from './pg/pgClients.js';
-
-// automatically build and tear down our instance
-async function build(t) {
-  // you can set all the options supported by the fastify CLI command
-  // const argv = [AppPath]
-  process.env.NODE_ENV = 'production';
-  const app = Fastify({ logger: false });
-  app.register(appService, config);
-  // close the app after we are done
-  t.after(() => {
-    // console.log('close app');
-    pgClients.client.end();
-    rclient.quit();
-    app.close();
-  });
-
-  return app;
-}
-
-export default build;
+// This file contains code that we reuse
+// between our tests.
+import Fastify from 'fastify';
+import config from './test/config.js';
+import appService from './index.js';
+
+import rclient from './redis/client.js';
+import pgClients from './pg/pgClients.js';
+
+// automatically build and tear down our instance
+async function build(t) {
+  // you can set all the options supported by the fastify CLI command
+  // const argv = [AppPath]
+  process.env.NODE_ENV = 'production';
+  const app = Fastify({ logger: false });
+  app.register(appService, config);
+  // close the app after we are done
+  t.after(() => {
+    // console.log('close app');
+    pgClients.client.end();
+    rclient.quit();
+    app.close();
+  });
+
+  return app;
+}
+
+export default build;

package/index.js

@@ -1,97 +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('@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 };
+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/controllers/userNotifications.js

@@ -1,19 +1,19 @@
-export default async function userNotifications({
-  pg, session = {}, query = {},
-}) {
-  const time = Date.now();
-  try {
-    const { uid } = session.passport?.user || {};
-    if (!uid) return { error: 'access restricted', status: 403 };
-
-    const queryFunc = query.nocache ? pg.query : pg.queryCache;
-
-    // queryCache not supports $1 params
-    const { rows } = await queryFunc(`select notification_id as id, notification_type as type, 
-      notification_status as status, title, body, link, uid from crm.notification where uid='${uid}'`);
-    return { time: Date.now() - time, total: rows?.length, rows };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+export default async function userNotifications({
+  pg, session = {}, query = {},
+}) {
+  const time = Date.now();
+  try {
+    const { uid } = session.passport?.user || {};
+    if (!uid) return { error: 'access restricted', status: 403 };
+
+    const queryFunc = query.nocache ? pg.query : pg.queryCache;
+
+    // queryCache not supports $1 params
+    const { rows } = await queryFunc(`select notification_id as id, notification_type as type, 
+      notification_status as status, title, body, link, uid from crm.notification where uid='${uid}'`);
+    return { time: Date.now() - time, total: rows?.length, rows };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/notification/funcs/addNotification.js

@@ -1,8 +1,8 @@
-export default async function addNotification({
-  pg, session = {}, title, body, link, notificationType, uid: uid1,
-}) {
-  const uid = uid1 || session.passport?.user?.uid || {};
-  const { id, status } = await pg.one(`insert into crm.notification(title, body, link, notification_type, uid) 
-  values($1,$2,$3,$4,$5) returning notification_id as id, notification_status as status`, [title, body, link, notificationType, uid]);
-  return { id, status };
-}
+export default async function addNotification({
+  pg, session = {}, title, body, link, notificationType, uid: uid1,
+}) {
+  const uid = uid1 || session.passport?.user?.uid || {};
+  const { id, status } = await pg.one(`insert into crm.notification(title, body, link, notification_type, uid) 
+  values($1,$2,$3,$4,$5) returning notification_id as id, notification_status as status`, [title, body, link, notificationType, uid]);
+  return { id, status };
+}