@opengis/fastify-table 1.1.56 → 1.1.58

package/{table → server/plugins/table}/funcs/metaFormat/getSelectVal.js

@@ -1,7 +1,9 @@
-import getSelect from '../../controllers/utils/getSelect.js';
-import pgClients from '../../../pg/pgClients.js';
+import getSelect from '../getSelect.js';
+import pgClients from '../../../pg/funcs/pgClients.js';
 import redis from '../../../redis/client.js';
 
+// import { pgClients, getSelect } from '../../../../../utils.js';
+
 export default async function getSelectVal({ pg: pg1, name, values }) {
   const pg = pg1 || pgClients.client;
   const cls = await getSelect(name);

package/{table → server/plugins/table}/funcs/metaFormat/index.js

@@ -1,6 +1,8 @@
-import getTemplate from '../../controllers/utils/getTemplate.js';
+import getTemplate from '../getTemplate.js';
 import getSelectVal from './getSelectVal.js';
 
+// import { getTemplate, getSelectVal } from '../../../../../utils.js';
+
 export default async function metaFormat({ rows, table }) {
   const loadTable = await getTemplate('table', table);
   const selectCols = loadTable?.columns?.filter((e) => e.data);

package/server/plugins/table/index.js

@@ -0,0 +1,13 @@
+import metaFormat from './funcs/metaFormat/index.js';
+import getFilterSQL from './funcs/getFilterSQL/index.js';
+import getTemplate from './funcs/getTemplate.js';
+import getSelect from './funcs/getSelect.js';
+
+async function plugin(fastify) {
+  // fastify.decorate('metaFormat', metaFormat);
+  // fastify.decorate('getFilterSQL', getFilterSQL);
+  // fastify.decorate('getTemplate', getTemplate);
+  // fastify.decorate('getSelect', getSelect);
+}
+
+export default plugin;

package/{util → server/plugins/util/funcs}/eventStream.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-param-reassign */
 export default function eventStream(res) {
+  if (!res) return console.log;
   const time = Date.now();
 
   // eslint-disable-next-line no-underscore-dangle

package/server/plugins/util/index.js

@@ -0,0 +1,7 @@
+import eventStream from './funcs/eventStream.js';
+
+async function plugin(fastify) {
+//   fastify.decorate('eventStream', eventStream);
+}
+
+export default plugin;

package/{cron → server/routes/cron}/controllers/cronApi.js

@@ -1,4 +1,4 @@
-import cronList from './utils/cronList.js';
+import cronList from '../../../plugins/cron/cronList.js';
 
 export default async function cronApi(req) {
   const {

package/{cron → server/routes/cron}/index.js

@@ -1,11 +1,13 @@
 import cronApi from './controllers/cronApi.js';
-import addCron from './funcs/addCron.js';
 
-import { cronSchema } from './schema.js'
+const cronSchema = {
+  params: {
+    name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+  },
+};
 
 async function plugin(fastify, config = {}) {
   const prefix = config.prefix || '/api';
-  fastify.decorate('addCron', addCron);
   fastify.get(`${prefix}/cron/:name`, { schema: cronSchema }, cronApi);
 }
 

package/{crud → server/routes/crud}/controllers/deleteCrud.js

@@ -1,6 +1,6 @@
 import {
   dataDelete, getTemplate, getAccess, applyHook, getToken, config,
-} from '../../utils.js';
+} from '../../../../utils.js';
 
 export default async function deleteCrud(req) {
   const { user, params = {} } = req || {};
@@ -18,7 +18,7 @@ export default async function deleteCrud(req) {
   const { table: del, id } = hookData || tokenData || (config.auth?.disable ? req.params : {});
   const { actions = [] } = await getAccess({ table: del, id, user }) || {};
 
-  if (!actions.includes('del')) {
+  if (!actions.includes('del') && !config?.local) {
     return { message: 'access restricted', status: 403 };
   }
   const loadTemplate = await getTemplate('table', del);

package/{crud → server/routes/crud}/controllers/insert.js

@@ -1,6 +1,6 @@
 import {
   applyHook, getAccess, getTemplate, checkXSS, dataInsert, getToken, config,
-} from '../../utils.js';
+} from '../../../../utils.js';
 
 export default async function insert(req) {
   const {
@@ -18,7 +18,9 @@ export default async function insert(req) {
 
   const { actions = [] } = await getAccess({ table: add, user }) || {};
 
-  if (!actions.includes('add')) return { message: 'access restricted', status: 403 };
+  if (!actions.includes('add') && !config?.local) {
+    return { message: 'access restricted', status: 403 };
+  }
 
   if (!add) {
     return { message: 'table is required', status: 400 };
@@ -40,7 +42,7 @@ export default async function insert(req) {
   }
 
   const uid = user?.uid;
-  if ((add || table) !== 'admin.users') {
+  if (![add, table].filter((el) => el !== 'admin.users')?.length) {
     Object.assign(body, { uid, editor_id: uid });
   }
   const res = await dataInsert({

package/{crud → server/routes/crud}/controllers/update.js

@@ -1,7 +1,7 @@
 import {
   pgClients, applyHook, getAccess, getTemplate, checkXSS, dataInsert, dataUpdate, logger, getToken,
-} from '../../utils.js';
-import config from '../../config.js';
+} from '../../../../utils.js';
+import config from '../../../../config.js';
 
 export default async function update(req) {
   const { user, params = {}, body = {} } = req;
@@ -20,7 +20,7 @@ export default async function update(req) {
 
   const { actions = [] } = await getAccess({ table: edit, id, user }) || {};
 
-  if (!actions.includes('edit')) {
+  if (!actions.includes('edit') && !config?.local) {
     return { message: 'access restricted', status: 403 };
   }
 

package/server/routes/crud/index.js

@@ -0,0 +1,19 @@
+import update from './controllers/update.js';
+import insert from './controllers/insert.js';
+import deleteCrud from './controllers/deleteCrud.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';
+  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/{util → server/routes/logger}/controllers/logger.file.js

@@ -1,7 +1,7 @@
-import path from 'path';
-import { lstat, readdir, readFile } from 'fs/promises';
-import { createReadStream, existsSync } from 'fs';
-import readline from 'readline';
+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';
@@ -14,7 +14,7 @@ import getRootDir from './utils/getRootDir.js';
  */
 
 export default async function loggerFile({
-  params, user, query, originalUrl,
+  params = {}, user = {}, query = {}, originalUrl,
 }, reply) {
   const limit = 200000;
   // console.log(user);

package/{util → server/routes/logger}/controllers/utils/checkUserAccess.js

@@ -1,4 +1,4 @@
-import config from '../../../config.js';
+import config from '../../../../../config.js';
 
 /**
  *

package/{util → server/routes/logger}/controllers/utils/getRootDir.js

@@ -1,6 +1,7 @@
-import path from 'path';
-import fs from 'fs';
-import config from '../../../config.js';
+import fs from 'node:fs';
+import path from 'node:path';
+
+import config from '../../../../../config.js';
 
 // import { existsSync } from 'fs';
 let logDir = null;

package/server/routes/logger/index.js

@@ -0,0 +1,15 @@
+import loggerFile from './controllers/logger.file.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/*', { schema: loggerSchema }, loggerFile);
+}
+
+export default plugin;

package/{util → server/routes/properties}/controllers/properties.add.js

@@ -1,4 +1,4 @@
-import { dataInsert, config } from '../../utils.js';
+import { dataInsert } from '../../../../utils.js';
 
 const table = 'crm.properties';
 
@@ -34,23 +34,22 @@ export default async function addExtraProperties({
     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 };
+  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

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

package/{util → server/routes/properties}/index.js

@@ -1,19 +1,16 @@
 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';
+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/*', { schema: loggerSchema }, loggerFile);
 }
 
 export default plugin;

package/{table → server/routes/table}/controllers/card.js

@@ -1,8 +1,6 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-import applyHook from '../../hook/funcs/applyHook.js';
-import getAccess from '../../crud/funcs/getAccess.js';
+import {
+  getTemplate, getMeta, metaFormat, getAccess, applyHook,
+} from '../../../../utils.js';
 
 export default async function card(req) {
   const time = Date.now();

package/{table → server/routes/table}/controllers/data.js

@@ -1,12 +1,6 @@
-import getTemplate from './utils/getTemplate.js';
-import getFilterSQL from '../funcs/getFilterSQL/index.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-import getAccess from '../../crud/funcs/getAccess.js';
-import setToken from '../../crud/funcs/setToken.js';
-import gisIRColumn from './utils/gisIRColumn.js';
-import applyHook from '../../hook/funcs/applyHook.js';
-// import config from '../../config.js';
+import {
+  config, getTemplate, getFilterSQL, getMeta, metaFormat, getAccess, setToken, gisIRColumn, applyHook,
+} from '../../../../utils.js';
 
 const maxLimit = 100;
 export default async function dataAPI(req) {
@@ -31,7 +25,7 @@ export default async function dataAPI(req) {
   const id = hookData?.id || params?.id;
   const { actions = [], query: accessQuery } = await getAccess({ table: hookData?.table || params.table, id, user }) || {};
 
-  if (!actions.includes('get')) {
+  if (!actions.includes('get') && !config?.local) {
     return { message: 'access restricted', status: 403 };
   }
 

package/{table → server/routes/table}/controllers/filter.js

@@ -1,7 +1,6 @@
-import getTemplate from './utils/getTemplate.js';
-import getSelect from './utils/getSelect.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import getFilterSQL from '../funcs/getFilterSQL/index.js';
+import {
+  getSelect, getMeta, getFilterSQL, getTemplate,
+} from '../../../../utils.js';
 
 export default async function filterAPI(req) {
   const time = Date.now();

package/{table → server/routes/table}/controllers/form.js

@@ -1,4 +1,4 @@
-import { applyHook, getTemplate } from '../../utils.js';
+import { applyHook, getTemplate } from '../../../../utils.js';
 
 const sql = `select property_key as key, property_json as json, property_int as int,
 property_text as text from admin.properties where 1=1`;

package/{table → server/routes/table}/controllers/search.js

@@ -1,7 +1,6 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-import getTemplates from './utils/getTemplates.js';
+import {
+  getMeta, metaFormat, getTemplates, getTemplate, handlebars,
+} from '../../../../utils.js';
 
 function sequence(tables, data, fn) {
   return tables.reduce((promise, table) => promise.then(() => fn({
@@ -10,7 +9,7 @@ function sequence(tables, data, fn) {
 }
 
 async function getData({
-  pg, funcs, tableName, query = {}, maxLimit, res,
+  pg, tableName, query = {}, maxLimit, res,
 }) {
   const loadTable = await getTemplate('table', tableName);
 
@@ -46,7 +45,7 @@ async function getData({
   await metaFormat({ rows, table: tableName });
   res.total += +total;
   rows.forEach((row) => {
-    const href = meta?.href ? funcs.handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
+    const href = meta?.href ? handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
     res.rows.push({
       ...row, register: tableName, register_title: loadTable.ua, href,
     });
@@ -59,18 +58,17 @@ export default async function search({
 }) {
   const time = Date.now();
 
-    const tables = query.table ? [query.table] : await getTemplates('table');
-    const res = { rows: [], sql: [], total: 0 };
+  const tables = query.table ? [query.table] : await getTemplates('table');
+  const res = { rows: [], sql: [], total: 0 };
 
-    const maxLimit = Math.min(100, query.limit || '16');
-    await sequence(tables, {
-      pg, funcs, query, maxLimit, res,
-    }, getData);
+  const maxLimit = Math.min(100, query.limit || '16');
+  await sequence(tables, {
+    pg, funcs, query, maxLimit, res,
+  }, getData);
 
-    if (query.sql) return res.sql.join(';\n');
-
-    return {
-      time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
-    };
+  if (query.sql) return res.sql.join(';\n');
 
+  return {
+    time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
+  };
 }

package/{table → server/routes/table}/controllers/suggest.js

@@ -1,12 +1,13 @@
-import getSelectMeta from './utils/getSelectMeta.js';
-import getPG from '../../pg/funcs/getPG.js';
-import config from '../../config.js';
-import getTemplate from './utils/getTemplate.js';
-
-// import getTableSql from '../funcs/getFilterSQL/util/getTableSql.js';
+import {
+  config, getPG, getTemplate, getSelectMeta,
+} from '../../../../utils.js';
 
 const limit = 50;
-const headers = { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Methods': 'GET', 'Cache-Control': 'no-cache' };
+const headers = {
+  'Access-Control-Allow-Origin': '*',
+  'Access-Control-Allow-Methods': 'GET',
+  'Cache-Control': 'no-cache',
+};
 
 export default async function suggest(req) {
   const {

package/{table → server/routes/table}/controllers/table.js

@@ -1,8 +1,6 @@
-import setToken from '../../crud/funcs/setToken.js';
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import applyHook from '../../hook/funcs/applyHook.js';
-import getAccess from '../../crud/funcs/getAccess.js';
+import {
+  config, getAccess, getTemplate, getMeta, setToken, applyHook,
+} from '../../../../utils.js';
 
 export default async function tableAPI(req) {
   const {
@@ -31,7 +29,7 @@ export default async function tableAPI(req) {
     user,
   }) || {};
 
-  if (!actions.includes('edit')) {
+  if (!actions.includes('edit') && !config?.local) {
     return { message: 'access restricted', status: 403 };
   }
 
@@ -63,7 +61,7 @@ export default async function tableAPI(req) {
   if (extraKeys?.length) {
     await Promise.all(extraKeys?.map(async (key) => {
       const { colModel, table: extraTable, parent_id: parentId } = schema[key];
-      const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
+      const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [hookData?.id || params?.id]);
       Object.assign(data, { [key]: extraRows });
     }));
   }

package/{table → server/routes/table}/index.js

@@ -5,12 +5,8 @@ import card from './controllers/card.js';
 import search from './controllers/search.js';
 import filter from './controllers/filter.js';
 import form from './controllers/form.js';
-import metaFormat from './funcs/metaFormat/index.js';
-import getFilterSQL from './funcs/getFilterSQL/index.js';
-import getTemplate from './controllers/utils/getTemplate.js';
-import getSelect from './controllers/utils/getSelect.js';
 
-import loadTemplatePath from './controllers/utils/loadTemplatePath.js';
+import loadTemplatePath from '../../plugins/table/funcs/loadTemplatePath.js';
 
 import {
   tableSchema, searchSchema, suggestSchema, formSchema, filterSchema,
@@ -18,11 +14,6 @@ import {
 
 async function plugin(fastify, config = {}) {
   const prefix = config.prefix || '/api';
-  fastify.decorate('metaFormat', metaFormat);
-  fastify.decorate('getFilterSQL', getFilterSQL);
-  fastify.decorate('getTemplate', getTemplate);
-  fastify.decorate('getSelect', getSelect);
-
   fastify.get(`${prefix}/suggest/:data`, { schema: suggestSchema }, suggest);
   fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
   fastify.get(`${prefix}/table/:table/:id?`, { schema: tableSchema }, table);

package/{table → server/routes/table}/schema.js

@@ -9,7 +9,7 @@ const tableSchema = {
     // state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
     // custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
     bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
-    polyline: { type: 'string', pattern: '^([\\d\\w\\|@\\/\\{\\}~_`]+)$' },
+    // polyline: { type: 'string', pattern: '^([\\d\\w\\|@\\/\\{\\}~_`]+)$' },
     key: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$' },
     uid: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
     sql: { type: 'string', pattern: '^(\\d)$' },

package/{util → server/routes/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() };
-};
+}

package/server/routes/util/index.js

@@ -0,0 +1,11 @@
+import nextId from './controllers/next.id.js';
+import statusMonitor from './controllers/status.monitor.js';
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+
+  fastify.get(`${prefix}/next-id`, {}, nextId);
+  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
+}
+
+export default plugin;