@opengis/fastify-table 1.2.32 → 1.2.34

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

@@ -1,91 +1,91 @@
-import {
-  config, getAccess, getTemplate, getMeta, setToken, applyHook, getToken,
-} from '../../../../utils.js';
-
-export default async function tableAPI(req) {
-  const {
-    pg, params, user = {}, query = {},
-  } = req;
-  const tokenData = await getToken({ token: params?.table, uid: user.uid, json: 1 }) || {};
-
-  const hookData = await applyHook('preTable', {
-    table: params?.table, id: params?.id, ...tokenData || {}, user,
-  });
-
-  if (hookData?.message && hookData?.status) {
-    return { message: hookData?.message, status: hookData?.status };
-  }
-  const tableName1 = hookData?.table || tokenData.table || params.table;
-
-  const loadTable = await getTemplate('table', tableName1) || {};
-  if (!loadTable && !pg.pk?.[tokenData.table]) {
-    return { message: 'not found', status: 404 };
-  }
-
-  const { table, /* columns, */ form } = loadTable;
-
-  const tableName = table || hookData?.table || tokenData.table || params.table;
-
-  const id = hookData?.id || tokenData.id || params.id;
-
-  if (tokenData && !id) return { message: {} };
-  if (!tableName && !id) {
-    return { message: 'not enough params', status: 400 };
-  }
-
-  const { actions = [], query: accessQuery } = await getAccess({
-    table: hookData?.table || tokenData.table || params.table,
-    id,
-    user,
-  }) || {};
-
-  if (!actions.includes('edit') && !config?.local && !tokenData) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const { pk, columns: dbColumns = [] } = await getMeta(tableName);
-  if (!pk) return { message: `table not found: ${table}`, status: 404 };
-
-  // const cols = columns.map((el) => el.name || el).join(',');
-  const formName = hookData?.form || tokenData?.form || form;
-  const formData = await getTemplate('form', formName) || {};
-  const schema = formData?.schema || formData;
-  // skip DataTable from another table
-  const extraKeys = Object.keys(schema)?.filter((key) => schema[key]?.type === 'DataTable' && schema[key]?.table && schema[key]?.parent_id && schema[key]?.colModel?.length);
-  // skip non-existing columns
-  const columnList = dbColumns.map((el) => el.name || el).join(',');
-
-  const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${tableName} limit 0`) : {};
-  const cols = loadTable?.table
-    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.map((col) => (col?.includes('geom') && schema?.[col]?.type === 'Geom' ? `st_asgeojson(${col})::json as "${col}"` : `"${col}"`))?.join(',')
-    : fields.map((el) => (el?.name?.includes('geom') && pg.pgType[el?.dataTypeID] === 'geometry' ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
-  const where = [`"${pk}" = $1`, loadTable.query, accessQuery].filter((el) => el);
-  const geom = dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : '';
-  const q = `select "${pk}" as id, ${cols || '*'} ${geom} from ${tableName} t where ${where.join(' and ') || 'true'} limit 1`;
-
-  if (query?.sql === '1') return q;
-
-  const data = await pg.query(q, [id]).then(el => el.rows[0]);
-  if (!data) return { message: 'not found', status: 404 };
-
-  if (extraKeys?.length) {
-    await Promise.all(extraKeys?.map(async (key) => {
-      const { colModel, table: extraTable, parent_id: parentId } = schema[key];
-      const q1 = `select ${parentId} as parent, ${colModel.map((col) => col.name || col.key).join(',')} from ${extraTable} a where ${parentId}=$1`;
-      // console.log(tableName, formName, q1);
-      const { rows: extraRows } = await pg.query(q1, [hookData?.id || tokenData?.id || params?.id]);
-      Object.assign(data, { [key]: extraRows });
-    }));
-  }
-  if (user?.uid && actions?.includes?.('edit')) {
-    data.token = tokenData?.table ? params.table : setToken({
-      ids: [JSON.stringify({ id, table: tableName, form: loadTable.form })],
-      uid: user.uid,
-      array: 1,
-    })[0];
-  }
-  const res = await applyHook('afterTable', {
-    table: tableName, payload: [data], user,
-  });
-  return res || data || {};
-}
+import {
+  config, getAccess, getTemplate, getMeta, setToken, applyHook, getToken,
+} from '../../../../utils.js';
+
+export default async function tableAPI(req) {
+  const {
+    pg, params, user = {}, query = {},
+  } = req;
+  const tokenData = await getToken({ token: params?.table, uid: user.uid, json: 1 }) || {};
+
+  const hookData = await applyHook('preTable', {
+    table: params?.table, id: params?.id, ...tokenData || {}, user,
+  });
+
+  if (hookData?.message && hookData?.status) {
+    return { message: hookData?.message, status: hookData?.status };
+  }
+  const tableName1 = hookData?.table || tokenData.table || params.table;
+
+  const loadTable = await getTemplate('table', tableName1) || {};
+  if (!loadTable && !pg.pk?.[tokenData.table]) {
+    return { message: 'not found', status: 404 };
+  }
+
+  const { table, /* columns, */ form } = loadTable;
+
+  const tableName = table || hookData?.table || tokenData.table || params.table;
+
+  const id = hookData?.id || tokenData.id || params.id;
+
+  if (tokenData && !id) return { message: {} };
+  if (!tableName && !id) {
+    return { message: 'not enough params', status: 400 };
+  }
+
+  const { actions = [], query: accessQuery } = await getAccess({
+    table: hookData?.table || tokenData.table || params.table,
+    id,
+    user,
+  }) || {};
+
+  if (!actions.includes('edit') && !config?.local && !tokenData) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const { pk, columns: dbColumns = [] } = await getMeta(tableName);
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  // const cols = columns.map((el) => el.name || el).join(',');
+  const formName = hookData?.form || tokenData?.form || form;
+  const formData = await getTemplate('form', formName) || {};
+  const schema = formData?.schema || formData;
+  // skip DataTable from another table
+  const extraKeys = Object.keys(schema)?.filter((key) => schema[key]?.type === 'DataTable' && schema[key]?.table && schema[key]?.parent_id && schema[key]?.colModel?.length);
+  // skip non-existing columns
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+
+  const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${tableName} limit 0`) : {};
+  const cols = loadTable?.table
+    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.map((col) => (col?.includes('geom') && schema?.[col]?.type === 'Geom' ? `st_asgeojson(${col})::json as "${col}"` : `"${col}"`))?.join(',')
+    : fields.map((el) => (el?.name?.includes('geom') && pg.pgType[el?.dataTypeID] === 'geometry' ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
+  const where = [`"${pk}" = $1`, loadTable.query, accessQuery].filter((el) => el);
+  const geom = dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : '';
+  const q = `select "${pk}" as id, ${cols || '*'} ${geom} from ${tableName} t where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query?.sql === '1') return q;
+
+  const data = await pg.query(q, [id]).then(el => el.rows[0]);
+  if (!data) return { message: 'not found', status: 404 };
+
+  if (extraKeys?.length) {
+    await Promise.all(extraKeys?.map(async (key) => {
+      const { colModel, table: extraTable, parent_id: parentId } = schema[key];
+      const q1 = `select ${parentId} as parent, ${colModel.map((col) => col.name || col.key).join(',')} from ${extraTable} a where ${parentId}=$1`;
+      // console.log(tableName, formName, q1);
+      const { rows: extraRows } = await pg.query(q1, [hookData?.id || tokenData?.id || params?.id]);
+      Object.assign(data, { [key]: extraRows });
+    }));
+  }
+  if (user?.uid && actions?.includes?.('edit')) {
+    data.token = tokenData?.table ? params.table : setToken({
+      ids: [JSON.stringify({ id, table: tableName, form: loadTable.form })],
+      uid: user.uid,
+      array: 1,
+    })[0];
+  }
+  const res = await applyHook('afterTable', {
+    table: tableName, payload: [data], user,
+  });
+  return res || data || {};
+}

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

@@ -1,92 +1,92 @@
-import path from 'node:path';
-import { lstat, readdir, readFile } from 'node:fs/promises';
-import { createReadStream, existsSync } from 'node:fs';
-import readline from 'node: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,
-}, reply) {
-  const limit = 200000;
-  // console.log(user);
-  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; charset=UTF-8' });
-    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 'node:path';
+import { lstat, readdir, readFile } from 'node:fs/promises';
+import { createReadStream, existsSync } from 'node:fs';
+import readline from 'node: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,
+}, reply) {
+  const limit = 200000;
+  // console.log(user);
+  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; charset=UTF-8' });
+    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/server/routes/logger/controllers/utils/checkUserAccess.js

@@ -1,19 +1,19 @@
-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 = {} }) {
-  // console.log(user);
-  if (user.user_type !== 'admin' && !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 };
-}
+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 = {} }) {
+  // console.log(user);
+  if (user.user_type !== 'admin' && !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/server/routes/logger/controllers/utils/getRootDir.js

@@ -1,26 +1,26 @@
-import fs from 'node:fs';
-import path from 'node:path';
-
-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 fs from 'node:fs';
+import path from 'node:path';
+
+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/server/routes/logger/index.js

@@ -1,17 +1,17 @@
-import loggerFile from './controllers/logger.file.js';
-
-// import loggerTest from './controllers/logger.test.api.js';
-
-const loggerSchema = {
-  querystring: {
-    download: { type: 'string', pattern: '^(\\d+)$' },
-    full: { type: 'string', pattern: '^(\\d+)$' },
-    dir: { type: 'string', pattern: '^(\\d+)$' },
-  },
-};
-
-async function plugin(fastify) {
-  fastify.get('/logger-file/*', { config: { policy: ['site'] }, schema: loggerSchema }, loggerFile);
-}
-
-export default plugin;
+import loggerFile from './controllers/logger.file.js';
+
+// import loggerTest from './controllers/logger.test.api.js';
+
+const loggerSchema = {
+  querystring: {
+    download: { type: 'string', pattern: '^(\\d+)$' },
+    full: { type: 'string', pattern: '^(\\d+)$' },
+    dir: { type: 'string', pattern: '^(\\d+)$' },
+  },
+};
+
+async function plugin(fastify) {
+  fastify.get('/logger-file/*', { config: { policy: ['site'] }, schema: loggerSchema }, loggerFile);
+}
+
+export default plugin;

package/server/routes/properties/controllers/properties.add.js

@@ -1,55 +1,55 @@
-import { dataInsert } 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 };
-}
+import { dataInsert } 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/server/routes/properties/controllers/properties.get.js

@@ -1,17 +1,17 @@
-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 };
-}
+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 };
+}