@opengis/fastify-table 1.1.51 → 1.1.52

package/user/controllers/user.info.js

@@ -1,21 +1,17 @@
-export default async function userInfo({
-  pg, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const data = await pg.query(`select user_name, sur_name, father_name, user_rnokpp, user_type, email, login from admin.users 
-  where uid=$1`, [uid]).then((res) => res.rows?.[0] || {});
-
-  try {
-    const { notifications = 0 } = await pg.query(`select count(*)::int as notifications from crm.notifications 
-    where addressee_id=$1 and read is not true`, [uid]).then((res) => res.rows?.[0] || {});
-    return { uid, ...data, notifications };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+export default async function userInfo({
+  pg, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const data = await pg.query(`select user_name, sur_name, father_name, user_rnokpp, user_type, email, login from admin.users 
+  where uid=$1`, [uid]).then((res) => res.rows?.[0] || {});
+
+    const { notifications = 0 } = await pg.query(`select count(*)::int as notifications from crm.notifications 
+    where addressee_id=$1 and read is not true`, [uid]).then((res) => res.rows?.[0] || {});
+    return { uid, ...data, notifications };
+
+}

package/user/index.js

@@ -3,44 +3,15 @@ import userClsId from './controllers/user.cls.id.js';
 import userInfo from './controllers/user.info.js';
 import userClsPost from './controllers/user.cls.post.js';
 
+import { userClsSchema, userClsIdSchema } from './schema.js'
+
 async function plugin(fastify, opts) {
   const { prefix = '/api' } = opts || {};
-  fastify.route({
-    method: 'GET',
-    url: `${prefix}/user-cls`,
-    config: {
-      policy: ['user'],
-    },
-    schema: {},
-    handler: userCls,
-  });
-  fastify.route({
-    method: 'GET',
-    url: `${prefix}/user-cls/:id`,
-    config: {
-      policy: ['user'],
-    },
-    schema: {},
-    handler: userClsId,
-  });
-  fastify.route({
-    method: 'POST',
-    url: `${prefix}/user-cls`,
-    config: {
-      policy: ['user'],
-    },
-    schema: {},
-    handler: userClsPost,
-  });
-  fastify.route({
-    method: 'GET',
-    url: `${prefix}/user-info`,
-    config: {
-      policy: ['user'],
-    },
-    schema: {},
-    handler: userInfo,
-  });
+
+  fastify.get(`${prefix}/user-cls`, { config: { policy: ['user'] }, schema: userClsSchema }, userCls);
+  fastify.get(`${prefix}/user-cls/:id`, { config: { policy: ['user'] }, schema: userClsIdSchema }, userClsId);
+  fastify.get(`${prefix}/user-info`, { config: { policy: ['user'] } }, userInfo);
+  fastify.post(`${prefix}/user-cls/:id`, { config: { policy: ['user'] }, schema: userClsIdSchema }, userClsPost);
 }
 
 export default plugin;

package/user/schema.js

@@ -0,0 +1,17 @@
+const userClsSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+  quertstring: {
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+};
+
+const userClsIdSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+};
+
+export { userClsSchema, userClsIdSchema };
+export default null;

package/util/controllers/logger.file.js

@@ -1,91 +1,91 @@
-import path from 'path';
-import { lstat, readdir, readFile } from 'fs/promises';
-import { createReadStream, existsSync } from 'fs';
-import readline from 'readline';
-
-import checkUserAccess from './utils/checkUserAccess.js';
-import getRootDir from './utils/getRootDir.js';
-
-/**
- *
- * @method GET
- * @summary API для перегляду логів
- *
- */
-
-export default async function loggerFile({
-  params = {}, user = {}, query = {}, originalUrl, funcs = {},
-}, reply) {
-  const limit = 200000;
-  const access = await checkUserAccess({ user });
-
-  const { config = {} } = funcs;
-  if (access?.status === 403 && !config?.local) return access;
-
-  // absolute / relative path
-  const rootDir = getRootDir();
-
-  const filepath = path.join(rootDir, params['*'] || '');
-
-  if (!existsSync(filepath)) {
-    return { error: 'file not exists', status: 404 };
-  }
-  const stat = await lstat(filepath);
-  const isFile = stat.isFile();
-
-  if (query.download && isFile) {
-    return reply.download(filepath);
-  }
-
-  if (query.full && isFile) {
-    if (stat.size > 20 * 1000 * 1000) {
-      return { message: 'file size > 20MB' };
-    }
-    const buffer = await readFile(filepath, { buffer: true });
-    return buffer;
-  }
-
-  if (isFile) {
-    const ext = path.extname(filepath);
-
-    const lines = await new Promise((resolve) => {
-      const rl = readline.createInterface({
-        input: createReadStream(filepath, { start: stat.size > limit ? stat.size - limit : 0 }),
-      });
-      const lines1 = [];
-      rl.on('close', () => resolve(lines1));
-      rl.on('line', (line) => lines1.push(line));
-    });
-
-    if (ext === '.html') {
-      const buffer = await readFile(filepath, { buffer: true });
-      reply.headers({ 'Content-type': 'text/html; charset=UTF-8' });
-      return buffer;
-    }
-
-    reply.headers({ 'Content-type': 'text/plain' });
-    return stat.size > limit && lines.length > 1
-      ? lines.reverse().slice(0, -1).join('\n')
-      : lines.reverse().join('\n');
-  }
-
-  // dir
-  const files = await readdir(filepath);
-
-  if (query.dir) {
-    return files.filter((el) => !['backup', 'marker_icon', 'error', 'migration'].includes(el));
-  }
-
-  const lstatsArr = await Promise.all(files.map(async (file) => [file, await lstat(path.join(filepath, file))]));
-  const lstats = Object.fromEntries(lstatsArr);
-
-  const message = (params['*'] ? '<a href="/logger-file/">...</a><br>' : '')
-    + files.map((file) => `<a href="${originalUrl}/${file}">${file}</a> (${lstats[file].size} bytes)`).join('</br>');
-
-  reply.headers({
-    'Content-Type': 'text/html; charset=UTF-8',
-    'Content-Security-Policy': "default-src 'none'",
-    'X-Content-Type-Options': 'nosniff',
-  });
-  return message;
-}
+import path from 'path';
+import { lstat, readdir, readFile } from 'fs/promises';
+import { createReadStream, existsSync } from 'fs';
+import readline from 'readline';
+
+import checkUserAccess from './utils/checkUserAccess.js';
+import getRootDir from './utils/getRootDir.js';
+
+/**
+ *
+ * @method GET
+ * @summary API для перегляду логів
+ *
+ */
+
+export default async function loggerFile({
+  log, params = {}, user = {}, query = {}, originalUrl,
+}, reply) {
+  const limit = 200000;
+  const access = checkUserAccess({ user });
+  // log.info('Сервер запущен по адресу?'); // test!
+
+  if (access?.status !== 200) return access;
+
+  // absolute / relative path
+  const rootDir = getRootDir();
+
+  const filepath = path.join(rootDir, params['*'] || '');
+
+  if (!existsSync(filepath)) {
+    return { message: 'file not exists', status: 404 };
+  }
+  const stat = await lstat(filepath);
+  const isFile = stat.isFile();
+
+  if (query.download && isFile) {
+    return reply.download(filepath);
+  }
+
+  if (query.full && isFile) {
+    if (stat.size > 20 * 1000 * 1000) {
+      return { message: 'file size > 20MB' };
+    }
+    const buffer = await readFile(filepath, { buffer: true });
+    return buffer;
+  }
+
+  if (isFile) {
+    const ext = path.extname(filepath);
+
+    const lines = await new Promise((resolve) => {
+      const rl = readline.createInterface({
+        input: createReadStream(filepath, { start: stat.size > limit ? stat.size - limit : 0 }),
+      });
+      const lines1 = [];
+      rl.on('close', () => resolve(lines1));
+      rl.on('line', (line) => lines1.push(line));
+    });
+
+    if (ext === '.html') {
+      const buffer = await readFile(filepath, { buffer: true });
+      reply.headers({ 'Content-type': 'text/html; charset=UTF-8' });
+      return buffer;
+    }
+
+    reply.headers({ 'Content-type': 'text/plain' });
+    return stat.size > limit && lines.length > 1
+      ? lines.reverse().slice(0, -1).join('\n')
+      : lines.reverse().join('\n');
+  }
+
+  // dir
+  const files = await readdir(filepath);
+
+  if (query.dir) {
+    return files.filter((el) => !['backup', 'marker_icon', 'error', 'migration'].includes(el));
+  }
+
+  const lstatsArr = await Promise.all(files.map(async (file) => [file, await lstat(path.join(filepath, file))]));
+  const lstats = Object.fromEntries(lstatsArr);
+
+  const message = (params['*'] ? '<a href="/logger-file/">...</a><br>' : '')
+    + files.map((file) => `<a href="${originalUrl}/${file}">${file}</a> (${lstats[file].size} bytes)`).join('</br>');
+
+  reply.headers({
+    'Content-Type': 'text/html; charset=UTF-8',
+    'Content-Security-Policy': "default-src 'none'",
+    'X-Content-Type-Options': 'nosniff',
+  });
+  return message;
+}

package/util/controllers/next.id.js

@@ -1,4 +1,4 @@
-export default async function nextId({ pg }) {
-  const { id } = await pg.one('select next_id() as id');
-  return { id: id.toString() };
-};
+export default async function nextId({ pg }) {
+  const { id } = await pg.one('select next_id() as id');
+  return { id: id.toString() };
+};

package/util/controllers/properties.add.js

@@ -1,60 +1,56 @@
-import { dataInsert, config } from '../../utils.js';
-
-const table = 'crm.properties';
-
-function checkKeyType({ body, key }) {
-  if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
-    return { [key]: 'int' };
-  } if (typeof body[key] === 'object') {
-    return { [key]: 'json' };
-  }
-  if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
-    return { [key]: 'date' };
-  }
-  return { [key]: 'text' };
-}
-
-export default async function addExtraProperties({
-  pg, params = {}, body = {}, user = {},
-}) {
-  const { id } = params;
-  const { uid } = user;
-  if (!uid) {
-    return { message: 'access restricted: uid', status: 403 };
-  }
-  if (!id) {
-    return { message: 'not enougn params: 1', status: 400 };
-  }
-  const extraProperties = Object.keys(body);
-  if (!extraProperties.length) {
-    return { message: 'not enougn params: 2', status: 400 };
-  }
-
-  if (!pg.pk?.[table]) {
-    return { message: 'table not found: crm.properties', status: 400 };
-  }
-
-  try {
-    await pg.query('delete from crm.properties where object_id=$1', [id]); // rewrite?
-    const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
-    const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
-      const propertyType = keyTypeMatch[key];
-      const { rows = [] } = await dataInsert({
-        pg,
-        table,
-        data: {
-          property_type: propertyType,
-          property_key: key,
-          object_id: id,
-          [`property_${propertyType}`]: body[key],
-        },
-        uid,
-      });
-      return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
-    }));
-    return { message: { rows: res }, status: 200 };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import { dataInsert, config } from '../../utils.js';
+
+const table = 'crm.properties';
+
+function checkKeyType({ body, key }) {
+  if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
+    return { [key]: 'int' };
+  } if (typeof body[key] === 'object') {
+    return { [key]: 'json' };
+  }
+  if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
+    return { [key]: 'date' };
+  }
+  return { [key]: 'text' };
+}
+
+export default async function addExtraProperties({
+  pg, params = {}, body = {}, user = {},
+}) {
+  const { id } = params;
+  const { uid } = user;
+  if (!uid) {
+    return { message: 'access restricted: uid', status: 403 };
+  }
+  if (!id) {
+    return { message: 'not enougn params: 1', status: 400 };
+  }
+  const extraProperties = Object.keys(body);
+  if (!extraProperties.length) {
+    return { message: 'not enougn params: 2', status: 400 };
+  }
+
+  if (!pg.pk?.[table]) {
+    return { message: 'table not found: crm.properties', status: 400 };
+  }
+
+
+    await pg.query('delete from crm.properties where object_id=$1', [id]); // rewrite?
+    const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
+    const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
+      const propertyType = keyTypeMatch[key];
+      const { rows = [] } = await dataInsert({
+        pg,
+        table,
+        data: {
+          property_type: propertyType,
+          property_key: key,
+          object_id: id,
+          [`property_${propertyType}`]: body[key],
+        },
+        uid,
+      });
+      return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
+    }));
+    return { message: { rows: res }, status: 200 };
+}

package/util/controllers/properties.get.js

@@ -1,20 +1,17 @@
-export default async function getExtraProperties({
-    pg, params = {},
-}) {
-    const { id } = params;
-    if (!id) {
-        return { message: 'not enougn params', status: 400 };
-    }
-    try {
-        const { rows = [] } = pg.pk?.['crm.properties']
-            ? await pg.query(`select property_key, property_type, property_text, property_int,
-            property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
-            : {};
-        if (!rows.length) return {};
-
-        const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
-        return { message: data, status: 200 };
-    } catch (err) {
-        return { error: err.toString(), status: 500 };
-    }
+export default async function getExtraProperties({
+    pg, params = {},
+}) {
+    const { id } = params;
+    if (!id) {
+        return { message: 'not enougn params', status: 400 };
+    }
+
+        const { rows = [] } = pg.pk?.['crm.properties']
+            ? await pg.query(`select property_key, property_type, property_text, property_int,
+            property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
+            : {};
+        if (!rows.length) return {};
+
+        const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
+        return { message: data, status: 200 };
 }

package/util/controllers/status.monitor.js

@@ -1,8 +1,8 @@
-const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`;
-
-export default async function statusMonitor() {
-  const memoryUsage = process.memoryUsage();
-  const message = Object.keys(memoryUsage)
-    .reduce((acc, curr) => Object.assign(acc, { [curr]: formatMemoryUsage(memoryUsage[curr]) }), {});
-  return { message, status: 200 };
-}
+const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`;
+
+export default async function statusMonitor() {
+  const memoryUsage = process.memoryUsage();
+  const message = Object.keys(memoryUsage)
+    .reduce((acc, curr) => Object.assign(acc, { [curr]: formatMemoryUsage(memoryUsage[curr]) }), {});
+  return { message, status: 200 };
+}

package/util/controllers/utils/checkUserAccess.js

@@ -1,17 +1,20 @@
-/**
- *
- * @summary check user access to logger interface - per admin user type or user group
- * @returns {Object} message, status
- */
-
-export default async function checkUserAccess({
-  user,
-}) {
-  // console.log(user);
-  if (!user?.uid) return { message: 'access restricted', status: 403 };
-
-  /* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
-    return { message: 'access restricted', status: 403 };
-  } */
-  return { message: 'access granted', status: 200 };
-}
+import config from '../../../config.js';
+
+/**
+ *
+ * @summary check user access to logger interface - per admin user type or user group
+ * @returns {Object} message, status
+ */
+
+export default function checkUserAccess({
+  user = {},
+}) {
+  if (user?.uid && !config?.local) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  /* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
+    return { message: 'access restricted', status: 403 };
+  } */
+  return { message: 'access granted', status: 200 };
+}

package/util/controllers/utils/getRootDir.js

@@ -1,25 +1,25 @@
-import path from 'path';
-import fs from 'fs';
-import config from '../../../config.js';
-
-// import { existsSync } from 'fs';
-let logDir = null;
-export default function getRootDir() {
-  // absolute / relative path
-  if (logDir) return logDir;
-  const file = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
-  const root = file === 'config.json' ? process.cwd() : '/data/local';
-  logDir = config.logDir || path.join(root, config.log?.dir || 'log');
-  console.log({ logDir });
-  return logDir;
-
-  // windows debug support
-  /* const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
-  // docker default path
-  if (existsSync(customLogDir)) {
-    return path.join(customLogDir, config.folder || '', 'log');
-  }
-
-  // non-docker default path
-  return path.join(config.root || '/data/local', config.folder || '', 'log'); */
-}
+import path from 'path';
+import fs from 'fs';
+import config from '../../../config.js';
+
+// import { existsSync } from 'fs';
+let logDir = null;
+export default function getRootDir() {
+  // absolute / relative path
+  if (logDir) return logDir;
+  const file = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
+  const root = file === 'config.json' ? process.cwd() : '/data/local';
+  logDir = config.logDir || path.join(root, config.log?.dir || 'log');
+  console.log({ logDir });
+  return logDir;
+
+  // windows debug support
+  /* const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';
+  // docker default path
+  if (existsSync(customLogDir)) {
+    return path.join(customLogDir, config.folder || '', 'log');
+  }
+
+  // non-docker default path
+  return path.join(config.root || '/data/local', config.folder || '', 'log'); */
+}

package/util/index.js

@@ -1,23 +1,19 @@
-import getExtraProperties from './controllers/properties.get.js';
-import addExtraProperties from './controllers/properties.add.js';
-import nextId from './controllers/next.id.js';
-import statusMonitor from './controllers/status.monitor.js';
-import loggerFile from './controllers/logger.file.js';
-
-const propertiesSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-
-  fastify.get(`${prefix}/next-id`, {}, nextId);
-  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
-  fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
-  fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
-  fastify.get('/logger-file/*', { config: { policy: ['log'] } }, loggerFile);
-}
-
-export default plugin;
+import getExtraProperties from './controllers/properties.get.js';
+import addExtraProperties from './controllers/properties.add.js';
+import nextId from './controllers/next.id.js';
+import statusMonitor from './controllers/status.monitor.js';
+import loggerFile from './controllers/logger.file.js';
+
+import { propertiesSchema, loggerSchema } from './schema.js'
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+
+  fastify.get(`${prefix}/next-id`, {}, nextId);
+  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
+  fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
+  fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
+  fastify.get('/logger-file/*', { config: { policy: ['log'] }, schema: loggerSchema }, loggerFile);
+}
+
+export default plugin;

package/util/schema.js

@@ -0,0 +1,19 @@
+const propertiesSchema = {
+    params: {
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+  };
+  const loggerSchema = {
+    // params: {
+    //   
+    // },
+    querystring: {
+        download: { type: 'string', pattern: '^(\\d+)$' },
+        full: { type: 'string', pattern: '^(\\d+)$' },
+        dir: { type: 'string', pattern: '^(\\d+)$' },
+    }
+  };
+  export { 
+    propertiesSchema, loggerSchema
+ }
+export default null;