@opengis/fastify-table 1.4.55 → 1.4.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.55",
+  "version": "1.4.56",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -59,4 +59,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

package/server/helpers/core/token.js

@@ -1,18 +1,18 @@
-import setToken from '../../plugins/crud/funcs/setToken.js';
-
-export default function tokenFunc(params) {
-    const { data, hash } = params;
-
-    if (!data?.root?.user?.uid && !hash.uid) return '-';
-    if (!hash || typeof hash !== 'object') return '-';
-
-    // const id = hash?.edit ? hash?.id : data?.root?.id;
-    // console.log(hash)
-    const [token] = setToken({
-        ids: [JSON.stringify(hash)],
-
-        uid: data?.root?.user?.uid || hash.uid,
-        array: 1,
-    });
-    return token;
-}
+import setToken from '../../plugins/crud/funcs/setToken.js';
+
+export default function tokenFunc(params) {
+    const { data, hash } = params;
+
+    if (!data?.root?.user?.uid && !hash.uid) return '-';
+    if (!hash || typeof hash !== 'object') return '-';
+
+    // const id = hash?.edit ? hash?.id : data?.root?.id;
+    // console.log(hash)
+    const [token] = setToken({
+        ids: [JSON.stringify(hash)],
+
+        uid: data?.root?.user?.uid || hash.uid,
+        array: 1,
+    });
+    return token;
+}

package/server/plugins/cron/funcs/addCron.js

@@ -1,52 +1,52 @@
-import config from '../../../../config.js';
-
-import logger from '../../logger/getLogger.js';
-import pgClients from '../../pg/pgClients.js';
-
-import cronList from '../cronList.js';
-import runCron from './runCron.js';
-import interval2ms from './interval2ms.js';
-
-/**
- * interval:
- * -   02:54 - every day
- * -    2:03 - every day
- * -   *1:43 - 2 times a day
- * -  *12:03 - 2 times a day
- * -   **:54 - every hour
- * -   **:*3 - every 10 minutes
- * -      60 - every minute
- * - 10 * 60 - every 10 minutes
- */
-
-export default async function addCron(func, interval, pg = pgClients.client) {
-  const { time = {}, disabled = [] } = config.cron || {};
-
-  const name = func.name || func.toString().split('/').at(-1).split('\'')[0];
-
-  // if (!config.isServer) return;
-
-  if (disabled.includes(name)) {
-    logger.file('cron', { name, message: 'cron disabled' });
-    return;
-  }
-
-  cronList[name] = func;
-
-  const userInterval = time[name] || interval;
-  const [waitMs, intervalMs] = interval2ms[typeof interval](userInterval);
-
-  if (intervalMs < 1000) {
-    logger.file('cron', { name, error: `interval ${interval} too small` });
-    return;
-  }
-
-  // setTimeout to w8 for the time to start
-  setTimeout(() => {
-    runCron({ pg, func, name });
-    // interval
-    setInterval(() => {
-      runCron({ pg, func, name });
-    }, intervalMs);
-  }, waitMs);
-}
+import config from '../../../../config.js';
+
+import logger from '../../logger/getLogger.js';
+import pgClients from '../../pg/pgClients.js';
+
+import cronList from '../cronList.js';
+import runCron from './runCron.js';
+import interval2ms from './interval2ms.js';
+
+/**
+ * interval:
+ * -   02:54 - every day
+ * -    2:03 - every day
+ * -   *1:43 - 2 times a day
+ * -  *12:03 - 2 times a day
+ * -   **:54 - every hour
+ * -   **:*3 - every 10 minutes
+ * -      60 - every minute
+ * - 10 * 60 - every 10 minutes
+ */
+
+export default async function addCron(func, interval, pg = pgClients.client) {
+  const { time = {}, disabled = [] } = config.cron || {};
+
+  const name = func.name || func.toString().split('/').at(-1).split('\'')[0];
+
+  // if (!config.isServer) return;
+
+  if (disabled.includes(name)) {
+    logger.file('cron', { name, message: 'cron disabled' });
+    return;
+  }
+
+  cronList[name] = func;
+
+  const userInterval = time[name] || interval;
+  const [waitMs, intervalMs] = interval2ms[typeof interval](userInterval);
+
+  if (intervalMs < 1000) {
+    logger.file('cron', { name, error: `interval ${interval} too small` });
+    return;
+  }
+
+  // setTimeout to w8 for the time to start
+  setTimeout(() => {
+    runCron({ pg, func, name });
+    // interval
+    setInterval(() => {
+      runCron({ pg, func, name });
+    }, intervalMs);
+  }, waitMs);
+}

package/server/plugins/crud/funcs/getOpt.js

@@ -1,14 +1,14 @@
-import config from '../../../../config.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-const rclient = getRedis({ db: 0 });
-
-export default async function getOpt(token, uid = 0) {
-  if (!config.redis) return null;
-
-  const key = `opt:${uid}:${token}`;
-  // console.log(key);
-  const data = await rclient.get(key);
-  if (!data) return null;
-  return JSON.parse(data);
-}
+import config from '../../../../config.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+const rclient = getRedis({ db: 0 });
+
+export default async function getOpt(token, uid = 0) {
+  if (!config.redis) return null;
+
+  const key = `opt:${uid}:${token}`;
+  // console.log(key);
+  const data = await rclient.get(key);
+  if (!data) return null;
+  return JSON.parse(data);
+}

package/server/plugins/crud/funcs/utils/getFolder.js

@@ -1,11 +1,11 @@
-import path from 'node:path';
-
-import config from '../../../../../config.js';
-
-export default function 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 dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params
-  const filepath = path.posix.join(types[type] || `/data/local/${dbname || ''}`, req.folder || config.folder || '');
-  return filepath;
-}
+import path from 'node:path';
+
+import config from '../../../../../config.js';
+
+export default function 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 dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params
+  const filepath = path.posix.join(types[type] || `/data/local/${dbname || ''}`, req.folder || config.folder || '');
+  return filepath;
+}

package/server/plugins/file/uploadMultiPart.js

@@ -46,7 +46,9 @@ async function writeFileToDisk(file, buffer) {
   return null;
 }
 
-export default async function uploadMultiPart(req, { buffer, subdir, originalFilename = false } = {}) {
+export default async function uploadMultiPart(req, {
+  extensions, raw, subdir, originalFilename = false,
+} = {}) {
   const allowedExtensions = {
     '/file/upload-image/*': images,
   }[req.routeOptions?.url || ''] || all;
@@ -67,6 +69,10 @@ export default async function uploadMultiPart(req, { buffer, subdir, originalFil
 
   const ext = path.extname(value.filename).toLowerCase();
 
+  if (Array.isArray(extensions) && !extensions.includes(ext)) {
+    throw new Error('file extension is not allowed');
+  }
+
   // check extension
   if (!allowedExtensions.includes(ext.substring(1))) {
     throw new Error('file extension is not allowed');
@@ -83,7 +89,7 @@ export default async function uploadMultiPart(req, { buffer, subdir, originalFil
     throw new Error('file buffer is empty');
   }
 
-  if (buffer) return fileBuffer; // return buffer for custom upload
+  if (raw) return { buffer: fileBuffer, filename: value.filename, ext }; // return buffer for custom upload
 
   const dir = subdir != null ? subdir : (req.params?.['*'] || 'uploads');
   const yearMonthDay = subdir != null ? '' : (new Date()).toISOString().split('T')[0];

package/server/plugins/logger/errorStatus.js

@@ -1,19 +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;
+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/redis/client.js

@@ -1,8 +1,8 @@
-import redisClients from './funcs/redisClients.js';
-import getRedis from './funcs/getRedis.js';
-
-if (!redisClients[0]) {
-  getRedis({ db: 0 });
-}
-
-export default redisClients[0];
+import redisClients from './funcs/redisClients.js';
+import getRedis from './funcs/getRedis.js';
+
+if (!redisClients[0]) {
+  getRedis({ db: 0 });
+}
+
+export default redisClients[0];

package/server/plugins/redis/funcs/redisClients.js

@@ -1,3 +1,3 @@
-const redisClients = {};
-
-export default redisClients;
+const redisClients = {};
+
+export default redisClients;

package/server/plugins/table/funcs/getFilterSQL/util/getCustomQuery.js

@@ -1,13 +1,13 @@
-async function getCustomQuery({
-  pg, table, customFilter,
-}) {
-  if (!customFilter) return null;
-  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
-  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
-  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
-  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
-  const customQuery = data?.map((el) => el.query).join(' and ');
-  return `${customQuery}`;
-}
-
-export default getCustomQuery;
+async function getCustomQuery({
+  pg, table, customFilter,
+}) {
+  if (!customFilter) return null;
+  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
+  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
+  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
+  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
+  const customQuery = data?.map((el) => el.query).join(' and ');
+  return `${customQuery}`;
+}
+
+export default getCustomQuery;

package/server/plugins/table/funcs/getFilterSQL/util/getTableSql.js

@@ -1,34 +1,34 @@
-function getTable(table) {
-  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    ?.map((el) => el.split(/[ )]/)[0]);
-  return result;
-}
-
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
-const tableSql = {};
-async function getTableSql({
-  pg, body, table, fields,
-}) {
-  if (tableSql[table]) return tableSql[table];
-
-  const fieldList = fields.map((el) => el.name);
-
-  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
-
-  if (!tableList) { tableSql[table] = []; return []; }
-
-  const data = await Promise.all(tableList?.map(async (tableEl) => {
-    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
-    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
-  }));
-
-  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
-
-  return tableSql[table];
-}
-
-export default getTableSql;
+function getTable(table) {
+  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+    ?.map((el) => el.split(/[ )]/)[0]);
+  return result;
+}
+
+/**
+* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
+* @param {String} opt.query - запит до таблиці
+* @param {String} opt.hash - інформація з хешу по запиту
+*/
+const tableSql = {};
+async function getTableSql({
+  pg, body, table, fields,
+}) {
+  if (tableSql[table]) return tableSql[table];
+
+  const fieldList = fields.map((el) => el.name);
+
+  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
+
+  if (!tableList) { tableSql[table] = []; return []; }
+
+  const data = await Promise.all(tableList?.map(async (tableEl) => {
+    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
+    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
+  }));
+
+  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
+
+  return tableSql[table];
+}
+
+export default getTableSql;

package/server/plugins/table/funcs/getTemplates.js

@@ -1,19 +1,19 @@
-import fs from 'fs';
-import path from 'path';
-
-import config from '../../../../config.js';
-
-const loadTemplate = {};
-
-export default async function getTemplateDir(type) {
-  if (!type) return null;
-
-  const cwd = process.cwd();
-  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
-
-  if (!loadTemplate[type]) {
-    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
-    loadTemplate[type] = typeList;
-  }
-  return loadTemplate[type];
-}
+import fs from 'fs';
+import path from 'path';
+
+import config from '../../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type) {
+  if (!type) return null;
+
+  const cwd = process.cwd();
+  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
+
+  if (!loadTemplate[type]) {
+    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
+    loadTemplate[type] = typeList;
+  }
+  return loadTemplate[type];
+}

package/server/plugins/table/funcs/gisIRColumn.js

@@ -1,82 +1,82 @@
-import getSelect from './getSelect.js';
-
-import getFilterSQL from './getFilterSQL/index.js';
-import getTemplate from './getTemplate.js';
-import pgClients from '../../pg/pgClients.js';
-import config from '../../../../config.js';
-import getSelectVal from './metaFormat/getSelectVal.js';
-
-export default async function gisIRColumn({
-  pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
-}) {
-  const time = Date.now();
-
-  const sel = await getSelect(query.cls || column, pg);
-
-  const body = await getTemplate('table', layer);
-  const fData = await getFilterSQL({
-    table: layer,
-    filter,
-    state,
-    search,
-    custom,
-  });
-
-  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
-  where relkind in ('r','v','m')`);
-
-  const tableName = body?.table || layer;
-  if (!tlist.includes(tableName)) return { error: `table not found: ${tableName}`, status: 400 };
-
-  // eslint-disable-next-line max-len
-  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${tableName}`})q limit 0`);
-
-  const col = fields.find((el) => el.name === column);
-
-  if (!col) return { status: 404, message: 'not found' };
-  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
-
-  const q = `select ${colField} as id, count(*)::int from (
-    ${fData?.optimizedSQL || `select * from ${tableName} where ${body?.query || 'true'}`}
-  )t group by ${colField} order by count desc limit 15`;
-
-  if (sql) return q;
-
-  if (!body?.columns?.length) {
-    const { rows } = await pg.query(q);
-    if (sel?.arr?.length) {
-      rows.forEach((el) => {
-        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
-        Object.assign(el, data || {});
-      });
-    }
-    return {
-      count: rows?.reduce((acc, el) => acc + el.count, 0),
-      sql: config.local ? q : undefined,
-      rows,
-    };
-  }
-
-  const { rows } = await pg.query(q);
-  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
-  const select = await getSelectVal({
-    pg, name: cls, values: rows.map((el) => el.id), ar: 1,
-  });
-  rows.forEach((el) => {
-    if (Array.isArray(select)) {
-      Object.assign(el, select.find((item) => item.id?.toString() === el.id?.toString()) || {});
-    }
-    else if (typeof select?.[el.id] === 'string') {
-      Object.assign(el, { text: select?.[el.id] });
-    }
-    else {
-      Object.assign(el, select?.[el.id] || {});
-    }
-  });
-  return {
-    time: Date.now() - time,
-    count: rows.reduce((acc, el) => acc + el.count, 0),
-    sql: config.local ? q : undefined,
-    rows,
-  };
-}
+import getSelect from './getSelect.js';
+
+import getFilterSQL from './getFilterSQL/index.js';
+import getTemplate from './getTemplate.js';
+import pgClients from '../../pg/pgClients.js';
+import config from '../../../../config.js';
+import getSelectVal from './metaFormat/getSelectVal.js';
+
+export default async function gisIRColumn({
+  pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
+}) {
+  const time = Date.now();
+
+  const sel = await getSelect(query.cls || column, pg);
+
+  const body = await getTemplate('table', layer);
+  const fData = await getFilterSQL({
+    table: layer,
+    filter,
+    state,
+    search,
+    custom,
+  });
+
+  const { tlist } = await pg.one(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
+  where relkind in ('r','v','m')`);
+
+  const tableName = body?.table || layer;
+  if (!tlist.includes(tableName)) return { error: `table not found: ${tableName}`, status: 400 };
+
+  // eslint-disable-next-line max-len
+  const { fields } = await pg.query(`select * from (${fData?.optimizedSQL || `select * from ${tableName}`})q limit 0`);
+
+  const col = fields.find((el) => el.name === column);
+
+  if (!col) return { status: 404, message: 'not found' };
+  const colField = pg.pgType[col.dataTypeID]?.includes('[]') ? `unnest(${column})` : column;
+
+  const q = `select ${colField} as id, count(*)::int from (
+    ${fData?.optimizedSQL || `select * from ${tableName} where ${body?.query || 'true'}`}
+  )t group by ${colField} order by count desc limit 15`;
+
+  if (sql) return q;
+
+  if (!body?.columns?.length) {
+    const { rows } = await pg.query(q);
+    if (sel?.arr?.length) {
+      rows.forEach((el) => {
+        const data = sel?.find((item) => item.id?.toString() === el.id?.toString());
+        Object.assign(el, data || {});
+      });
+    }
+    return {
+      count: rows?.reduce((acc, el) => acc + el.count, 0),
+      sql: config.local ? q : undefined,
+      rows,
+    };
+  }
+
+  const { rows } = await pg.query(q);
+  const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
+  const select = await getSelectVal({
+    pg, name: cls, values: rows.map((el) => el.id), ar: 1,
+  });
+  rows.forEach((el) => {
+    if (Array.isArray(select)) {
+      Object.assign(el, select.find((item) => item.id?.toString() === el.id?.toString()) || {});
+    }
+    else if (typeof select?.[el.id] === 'string') {
+      Object.assign(el, { text: select?.[el.id] });
+    }
+    else {
+      Object.assign(el, select?.[el.id] || {});
+    }
+  });
+  return {
+    time: Date.now() - time,
+    count: rows.reduce((acc, el) => acc + el.count, 0),
+    sql: config.local ? q : undefined,
+    rows,
+  };
+}

package/server/plugins/table/funcs/loadTemplate.js

@@ -1 +1 @@
-export default {};
+export default {};

package/server/plugins/table/funcs/loadTemplatePath.js

@@ -1 +1 @@
-export default {};
+export default {};

package/server/plugins/table/funcs/userTemplateDir.js

@@ -1 +1 @@
-export default [];
+export default [];