@opengis/fastify-table 1.1.70 → 1.1.72

package/README.md

@@ -1,26 +1,26 @@
-# fastify-table
-
-[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
-
-It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
-
-- pg
-- redis
-- crud
-
-## Install
-
-```bash
-npm i @opengis/fastify-table
-```
-
-## Usage
-
-```js
-fastify.register(import('@opengis/fastify-table'), config);
-```
-
-## Documenation
-
-For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).
+# fastify-table
+
+[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
+
+It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
+
+- pg
+- redis
+- crud
+
+## Install
+
+```bash
+npm i @opengis/fastify-table
+```
+
+## Usage
+
+```js
+fastify.register(import('@opengis/fastify-table'), config);
+```
+
+## Documenation
+
+For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).

package/config.js

@@ -1,10 +1,10 @@
-import fs from 'fs';
-
-const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
-const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
-
-Object.assign(config, {
-  allTemplates: config?.allTemplates || {},
-});
-
-export default config;
+import fs from 'fs';
+
+const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
+const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
+
+Object.assign(config, {
+  allTemplates: config?.allTemplates || {},
+});
+
+export default config;

package/index.js

@@ -13,6 +13,7 @@ import policyPlugin from './server/plugins/policy/index.js';
 import redisPlugin from './server/plugins/redis/index.js';
 import tablePlugin from './server/plugins/table/index.js';
 import utilPlugin from './server/plugins/util/index.js';
+import loggerPlugin from './server/plugins/logger/index.js';
 
 // routes
 import cronRoutes from './server/routes/cron/index.js';
@@ -23,7 +24,7 @@ import tableRoutes from './server/routes/table/index.js';
 import utilRoutes from './server/routes/util/index.js';
 
 import {
-  addTemplateDir, execMigrations, handlebars, handlebarsSync,
+  addTemplateDir, execMigrations,
 } from './utils.js';
 
 async function plugin(fastify, opt) {
@@ -32,10 +33,6 @@ async function plugin(fastify, opt) {
   config.root = opt.root;
   config.mapServerRoot = opt.mapServerRoot;
 
-  /* const d = await handlebars.compile('hb async: {{id}}')({ id: 1 });
-  console.log(d);
-  console.log(handlebarsSync.compile('hb sync: {{id}}')({ id: 1 })); */
-
   // independent npm start / unit test
   if (!fastify.config) {
     fastify.decorate('config', config);
@@ -50,40 +47,9 @@ async function plugin(fastify, opt) {
   });
 
   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 || config.root, server: req.mapServerRoot || config.mapServerRoot };
-    const filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, req.folder || config.folder || '');
-    return filepath;
-  });
-
-  fastify.setErrorHandler((error, request, reply) => {
-    if (error.validation) {
-      request.log.warn(request, { code: error?.code, status: 422, error: error.toString() });
-      return reply.status(422).send(error.toString());
-    }
-    if (error.stack?.startsWith('Error: unhandled exception')) {
-      request.log.fatal(request, { status: 501, error: error.toString() });
-      return reply.status(500).send('ServerError');
-    }
-
-    request.log.error(error, request);
-    return reply.status(error.statusCode || 500).send(config.local ? error.toString() : 'ServerError');
-  });
 
   execMigrations().catch(err => console.log(err));
 
-  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);
-  }
-
   // plugins / utils / funcs
   policyPlugin(fastify);
   redisPlugin(fastify);
@@ -92,6 +58,7 @@ async function plugin(fastify, opt) {
   crudPlugin(fastify, opt);
   utilPlugin(fastify, opt);
   cronPlugin(fastify, opt);
+  loggerPlugin(fastify, opt);
 
   // routes / api
   cronRoutes(fastify, opt);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.70",
+  "version": "1.1.72",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@fastify/sensible": "^5.0.0",
     "@fastify/url-data": "^5.4.0",
-    "@opengis/fastify-hb": "^1.4.7",
+    "@opengis/fastify-hb": "^1.4.8",
     "fastify": "^4.26.1",
     "fastify-plugin": "^4.0.0",
     "ioredis": "^5.3.2",

package/server/plugins/hook/funcs/applyHookSync.js

@@ -0,0 +1,9 @@
+import hookList from '../hookList.js';
+
+export default function applyHookSync(name, data) {
+  if (!hookList[name]?.length) return null;
+
+  const hookData = hookList[name].map((hook) => hook(data))[0];
+
+  return hookData;
+}

package/server/plugins/logger/createFileStream.js

@@ -20,7 +20,7 @@ const generator = () => () => {
 const {
   dir = 'log', interval = '1d', compress = 'gzip', // maxFiles = 90, local: teeToStdout,
 } = config?.log || {};
-function createFileStream({ level }) {
+function createFileStream({ level, status }) {
   console.log(dir, level, generator({ interval })(), interval, compress);
   /* const params = {
     maxFiles, // logs to save limit
@@ -36,7 +36,7 @@ function createFileStream({ level }) {
   return createStream(generator({ interval }), params); */
   const dt = new Date().toISOString().split('T')[0];
 
-  const fileName = `${dir}/${level}/${dt}.log`;
+  const fileName = `${dir}/${level}/${dt}${status ? `_${status}` : ''}.log`;
 
   fs.mkdirSync(`${dir}/${level}`, { recursive: true });
 
@@ -60,12 +60,27 @@ export default function transportTarget() {
     const dt = new Date().toISOString().split('T')[0];
     source.on('data', (obj) => {
       if (['incoming request', 'request completed'].includes(obj.msg)) return;
+
       // console.log(obj)
       const file = obj.msg?.logfolder || obj.logfolder;
 
       const level = file || labels[obj.level];
       const lvl = level + dt;
 
+      // write error status
+      if (obj.err?.status) {
+        const status = obj.err?.status;
+        streams[status] = streams[status] || createFileStream({ level, status });
+        streams[status].write(`${JSON.stringify({ ...obj, level: labels[obj.level] })}\n`);
+      }
+
+      // write error type
+      if (obj.err?.type) {
+        const status = obj.err?.type;
+        streams[status] = streams[status] || createFileStream({ level, status });
+        streams[status].write(`${JSON.stringify({ ...obj, level: labels[obj.level] })}\n`);
+      }
+
       if (streams[lvl]?.closed) { streams[lvl].destroy(); }
       if (streams[lvl]?.destroyed) { delete streams[lvl]; }
 

package/server/plugins/logger/errorMessage.js

@@ -0,0 +1,25 @@
+import config from '../../../config.js';
+import applyHookSync from '../hook/funcs/applyHookSync.js';
+import errorStatus from './errorStatus.js';
+
+const defaultMessage = {
+  602: 'Порушення цілісності бази даних',
+};
+
+function errorMessage(error) {
+  const hook = applyHookSync('errorMessage', error);
+  if (hook) return hook;
+
+  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
+    return error.message;
+  }
+
+  // messgae status
+  const status = errorStatus(error);
+  if (config.errorMessage?.[status]) return config.errorMessage[status.toString()];
+  if (defaultMessage[status]) return defaultMessage[status];
+
+  return config.local ? error.toString() : (config.errorMessage?.[500] || 'ServerError');
+}
+
+export default errorMessage;

package/server/plugins/logger/errorStatus.js

@@ -0,0 +1,19 @@
+import applyHookSync from '../hook/funcs/applyHookSync.js';
+
+function errorStatus(error) {
+  const hook = applyHookSync('errorStatus', error);
+  if (hook) return hook;
+
+  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
+    return 601;
+  }
+  if (error.routine === 'ExecConstraints') {
+    return 602;
+  }
+  if (error.type === 'DatabaseError') {
+    return 600;
+  }
+
+  return 500;
+}
+export default errorStatus;

package/server/plugins/logger/getHooks.js

@@ -1,3 +1,5 @@
+import errorStatus from './errorStatus.js';
+
 function getHooks() {
   return {
     logMethod(inputArgs, method) {
@@ -6,6 +8,8 @@ function getHooks() {
       if (inputArgs?.length === 2 && inputArgs[1]?.originalUrl) {
         const req = inputArgs[1];
         const err = inputArgs[0]?.stack ? inputArgs[0] : undefined;
+        if (err) err.status = errorStatus(err);
+
         return method.apply(this, [{ req, err }, err ? inputArgs[0].toString() : inputArgs[0]]);
       }
 

package/server/plugins/logger/getLogger.js

@@ -19,12 +19,6 @@ const options = {
   transport: {
     targets: [{
       target: './createFileStream.js', // path.resolve('utils/createFileStream.js')
-    }, {
-      // Use target: 'pino/file' with STDOUT descriptor 1 to write
-      // logs without any change.
-      level: 'error',
-      target: 'pino/file',
-      options: { destination: 1 },
     }],
   },
 };

package/server/plugins/logger/index.js

@@ -0,0 +1,21 @@
+import errorMessage from './errorMessage.js';
+
+async function plugin(fastify) {
+  fastify.setErrorHandler(async (error, request, reply) => {
+    // validation not error
+    if (error.validation) {
+      request.log.warn(request, { code: error?.code, status: 422, error: error.toString() });
+      return reply.status(422).send(error.toString());
+    }
+
+    // logger
+    request.log.error(error, request);
+    console.error({ msg: error.message, where: error.where, stack: error.stack });
+
+    // errorMessage
+    const msg = errorMessage(error);
+
+    return reply.status(error.statusCode || 500).send(msg);
+  });
+}
+export default plugin;

package/server/routes/crud/controllers/deleteCrud.js

@@ -23,7 +23,7 @@ export default async function deleteCrud(req) {
   }
   const loadTemplate = await getTemplate('table', del);
 
-  const { table } = loadTemplate || hookData || req.params || {};
+  const { table } = loadTemplate || hookData || tokenData || req.params || {};
 
   if (!table) return { status: 404, message: 'table is required' };
   if (!id) return { status: 404, message: 'id is required' };

package/server/routes/crud/controllers/insert.js

@@ -4,7 +4,7 @@ import {
 
 export default async function insert(req) {
   const {
-    user, params = {}, body = {},
+    user = {}, params = {}, body = {},
   } = req || {};
   if (!user) return { message: 'access restricted', status: 403 };
   const hookData = await applyHook('preInsert', { table: params?.table, user });
@@ -12,7 +12,7 @@ export default async function insert(req) {
     return { message: hookData?.message, status: hookData?.status };
   }
   const tokenData = await getToken({
-    uid: user.uid, token: params.table, mode: 'a', json: 1,
+    uid: user?.uid, token: params.table, mode: 'a', json: 1,
   });
 
   const { form, table: add } = hookData || tokenData || (config.auth?.disable ? req.params : {});
@@ -42,10 +42,8 @@ export default async function insert(req) {
     return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
   }
 
-  const uid = user?.uid;
-
   if (![add, table].includes('admin.users')) {
-    Object.assign(body, { uid, editor_id: uid });
+    Object.assign(body, { uid: user?.uid, editor_id: user?.uid });
   }
   if (tokenData?.obj) {
     const objData = tokenData.obj?.split('#').reduce((p, el) => ({ ...p, [el.split('=')[0]]: el.split('=')[1] }), {}) || {};
@@ -53,7 +51,7 @@ export default async function insert(req) {
   }
 
   const res = await dataInsert({
-    table: loadTemplate?.table || table, data: body, uid,
+    table: loadTemplate?.table || table, data: body, uid: user?.uid,
   });
   if (!res) return { message: 'nothing added ' };
 
@@ -69,7 +67,7 @@ export default async function insert(req) {
       const objId = body[formData[key].parent_id] || req.body?.id;
       const extraRows = await Promise.all(body[key].map(async (row) => {
         const extraRes = await dataInsert({
-          table: formData[key].table, data: { ...row, [formData[key].parent_id]: objId }, uid,
+          table: formData[key].table, data: { ...row, [formData[key].parent_id]: objId }, uid: user?.uid,
         });
         return extraRes?.rows?.[0];
       }));

package/server/routes/logger/controllers/logger.file.js

@@ -64,7 +64,7 @@ export default async function loggerFile({
       return buffer;
     }
 
-    reply.headers({ 'Content-type': 'text/plain' });
+    reply.headers({ 'Content-type': 'text/plain; charset=UTF-8' });
     return stat.size > limit && lines.length > 1
       ? lines.reverse().slice(0, -1).join('\n')
       : lines.reverse().join('\n');

package/server/routes/logger/index.js

@@ -1,4 +1,5 @@
 import loggerFile from './controllers/logger.file.js';
+
 // import loggerTest from './controllers/logger.test.api.js';
 
 const loggerSchema = {
@@ -11,7 +12,6 @@ const loggerSchema = {
 
 async function plugin(fastify) {
   fastify.get('/logger-file/*', { schema: loggerSchema }, loggerFile);
-  // fastify.get('/logger-test', {}, loggerTest);
 }
 
 export default plugin;

package/server/routes/table/controllers/data.js

@@ -6,12 +6,12 @@ import {
 const maxLimit = 100;
 export default async function dataAPI(req) {
   const {
-    pg, params, query = {}, user,
+    pg, params, query = {}, user = {},
   } = req;
 
   const time = Date.now();
 
-  const uid = config?.auth?.disable ? '1' : user?.uid;
+  const { uid } = user;
 
   const hookData = await applyHook('preData', {
     table: params?.table, id: params?.id, user,

package/utils.js

@@ -46,6 +46,7 @@ import checkXSS from './server/plugins/policy/funcs/checkXSS.js';
 
 // hook
 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';
 
@@ -79,6 +80,7 @@ export {
   // hook
   addHook,
   applyHook,
+  applyHookSync,
 
   // template
   getTemplate,