@opengis/fastify-table 1.3.76 → 1.4.1

package/index.js

@@ -51,23 +51,20 @@ async function plugin(fastify, opt) {
   config.root = opt.root;
   config.mapServerRoot = opt.mapServerRoot;
 
-  // independent npm start / unit test
-  if (!fastify.config) {
-    // fastify.decorate('config', config);
+  // fastify.register(import('@fastify/sensible'), {
+  //   errorHandler: false,
+  // });
+
+  // fastify.register(import('@fastify/url-data'), {
+  //   errorHandler: false,
+  // });
+
+  if (config.disableCors) {
+    fastify.addHook('onSend', async (request, reply) => {
+      reply.header('Access-Control-Allow-Origin', '*');
+    });
   }
 
-  fastify.register(import('@fastify/sensible'), {
-    errorHandler: false,
-  });
-
-  fastify.register(import('@fastify/url-data'), {
-    errorHandler: false,
-  });
-
-  fastify.addHook('onSend', async (request, reply) => {
-    if (config.disableCors) reply.header('Access-Control-Allow-Origin', '*');
-  });
-
   fastify.addHook('onReady', async () => {
     if (existsSync('locales')) {
       const subdirs = (readdirSync('locales', { withFileTypes: true })).filter(el => el.isDirectory());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.76",
+  "version": "1.4.1",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -28,11 +28,9 @@
     "compress": "node compress.js"
   },
   "dependencies": {
-    "@fastify/http-proxy": "9.5.0",
-    "@fastify/sensible": "5.0.0",
-    "@fastify/url-data": "5.4.0",
-    "fastify": "4.26.1",
-    "fastify-plugin": "4.0.0",
+    "@fastify/http-proxy": "11.1.2",
+    "fastify": "5.3.3",
+    "fastify-plugin": "5.0.1",
     "handlebars": "4.7.8",
     "ioredis": "5.3.2",
     "js-yaml": "4.1.0",
@@ -50,4 +48,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

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

@@ -26,11 +26,10 @@ async function readFileData(file) {
         ? parseLinesRecursively(lines, index + 1, { ...result, [key.trim()]: rest.join(':').trim() })
         : parseLinesRecursively(lines, index + 1, result))((lines[index] || '').split(':'));
 
-    const header = parseLinesRecursively(match[1]?.split?.(/\r?\n/) || []);
-    const body = match[2]?.replace(/\r\n/g, '')?.startsWith('```html') ? match[2]?.match?.(/```html\r?\n([\s\S]*?)```/)?.[1] : match[2];
-
-    return { ...header, html: mdToHTML(body) };
+    const header = match?.length ? parseLinesRecursively(match[1]?.split?.(/\r?\n/) || []) : {};
+    const body = match?.[2]?.replace?.(/\r\n/g, '')?.startsWith?.('```html') ? match[2]?.match?.(/```html\r?\n([\s\S]*?)```/)?.[1] : match?.[2];
 
+    return { ...header, html: mdToHTML(body || data) };
   }
   return data;
 }

package/server/routes/cron/index.js

@@ -1,8 +1,11 @@
 import cronApi from './controllers/cronApi.js';
 
 const cronSchema = {
-  params: {
-    name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+  type: 'object',
+  properties: {
+    params: {
+      name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    },
   },
 };
 

package/server/routes/crud/index.js

@@ -4,9 +4,12 @@ import deleteCrud from './controllers/deleteCrud.js';
 import table from './controllers/table.js';
 
 const tableSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  type: 'object',
+    properties: {
+    params: {
+      id: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+      table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+    },
   },
 };
 

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

@@ -2,10 +2,11 @@ import {
  getOpt, getMeta, getTemplate, getData, pgClients,
 } from '../../../../utils.js';
 
-export default async function getTableData(req) {
+export default async function getTableData(req, reply) {
     const {
         user = {}, params = {}, query = {}, pg = pgClients.client,
     } = req;
+
     const {
         filter, limit, page, search, sql, state, order,
     } = query || {};
@@ -18,8 +19,6 @@ export default async function getTableData(req) {
         const loadTable = await getTemplate('table', tokenData.table);
 
         if (!loadTable) {
-            // const resp = await getData({ id, table: params.table, pg, filter, state, limit, page, search, order, user, sql, contextQuery: tokenData.query, sufix: false });
-            // return resp;
             const { rows = [], fields = [] } = await pg.query(`select ${tokenData.columns || '*'} from ${tokenData.table} where ${tokenData.query || 'true'} limit 10`);
             const meta = await getMeta({ pg, table: tokenData.table });
             const columns = (meta?.columns || fields).map(el => ({ name: el.name, type: pg.pgType?.[el.dataTypeID], title: el.title }));
@@ -28,7 +27,7 @@ export default async function getTableData(req) {
 
         const resp = await getData({
             id, table: tokenData.table, pg, filter, state, limit, page, search, order, user, sql, contextQuery: tokenData.query,
-        });
+        }, reply);
         return resp;
     }
 
@@ -49,7 +48,7 @@ export default async function getTableData(req) {
 
     const res = await getData({
         id, table: params.table, pg, filter, state, limit, page, search, order, user, sql, contextQuery,
-    });
+    }, reply);
 
     return res;
 }

package/server/routes/data/schema.js

@@ -1,54 +1,70 @@
 const tableDataSchema = {
-    querystring: {
-        limit: { type: 'string', pattern: '^(\\d+)$' },
-        page: { type: 'string', pattern: '^(\\d+)$' },
-        // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-        // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-        order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        desc: { type: 'string', pattern: '^(\\d+)$' },
-        state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
-        polyline: { type: 'string', pattern: '^([\\d\\w|@{}~_`]+)$' },
-        // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-        sql: { type: 'string', pattern: '^(\\d)$' },
+    type: 'object',
+    properties: {
+        querystring: {
+            limit: { type: 'string', pattern: '^(\\d+)$' },
+            page: { type: 'string', pattern: '^(\\d+)$' },
+            // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+            // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+            order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+            desc: { type: 'string', pattern: '^(\\d+)$' },
+            state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+            custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+            bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
+            polyline: { type: 'string', pattern: '^([\\d\\w|@{}~_`]+)$' },
+            // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+            sql: { type: 'string', pattern: '^(\\d)$' },
+        },
+        params: {
+            id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+            table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+        },
     },
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    }
 };
 
 const tableDataIdSchema = {
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
+    type: 'object',
+    properties: {
+        params: {
+            id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+            name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        },
+    },
 };
 
 const tableFilterSchema = {
-    params: {
-        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
+    type: 'object',
+    properties: {
+        params: {
+            name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        },
+    },
 };
 
 const cardDataSchema = {
-    params: {
-        id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-        table: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    }
+    type: 'object',
+    properties: {
+        params: {
+            id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+            table: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        },
+    },
 };
 
 const cardTabDataSchema = {
-    querystring: {
-        sql: { type: 'string', pattern: '^(\\d)$' }
+    type: 'object',
+    properties: {
+        querystring: {
+            sql: { type: 'string', pattern: '^(\\d)$' }
+        },
+        params: {
+            token: { type: 'string', pattern: '^([\\d\\w]+)$' },
+        },
     },
-    params: {
-        token: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    }
 };
-export { 
+export {
     tableDataSchema, tableDataIdSchema, tableFilterSchema,
-    cardDataSchema, cardTabDataSchema
- }
+    cardDataSchema, cardTabDataSchema,
+};
+
 export default null;

package/server/routes/logger/index.js

@@ -3,10 +3,13 @@ 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+)$' },
+  type: 'object',
+    properties: {
+      querystring: {
+        download: { type: 'string', pattern: '^(\\d+)$' },
+        full: { type: 'string', pattern: '^(\\d+)$' },
+        dir: { type: 'string', pattern: '^(\\d+)$' },
+      },
   },
 };
 

package/server/routes/properties/index.js

@@ -2,8 +2,11 @@ import getExtraProperties from './controllers/properties.get.js';
 import addExtraProperties from './controllers/properties.add.js';
 
 const propertiesSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  type: 'object',
+    properties: {
+    params: {
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
   },
 };
 

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

@@ -15,6 +15,8 @@ const components = {
 
 const checkInline = {};
 const maxLimit = 100;
+const defaultLimit = 20;
+
 export default async function dataAPI(req, reply, called) {
   const {
     pg = pgClients.client, params, query = {}, user = {}, contextQuery, sufix = true,
@@ -143,7 +145,7 @@ export default async function dataAPI(req, reply, called) {
 
   const keyQuery = query.key && (loadTable?.key || tokenData?.key) && !objectId ? `${loadTable?.key || tokenData?.key}=$1` : null;
 
-  const limit = called ? (query.limit || 20) : Math.min(maxLimit, +(query.limit || 20));
+  const limit = (called ? (query.limit || defaultLimit) : Math.min(maxLimit, +(query.limit || defaultLimit))) || defaultLimit;
 
   const offset = query.page && query.page > 0 && !objectId ? ` offset ${(query.page - 1) * limit}` : '';
   // id, query, filter

package/server/routes/table/schema.js

@@ -1,62 +1,77 @@
 const tableSchema = {
-  querystring: {
-    limit: { type: 'string', pattern: '^(\\d+)$' },
-    page: { type: 'string', pattern: '^(\\d+)$' },
-    // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-    // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-    order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    desc: { type: 'string', pattern: '^(\\d+)$' },
-    // state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    // custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-    bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
-    // polyline: { type: 'string', pattern: '^([\\d\\w\\|@\\/\\{\\}~_`]+)$' },
-    key: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$' },
-    uid: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+  type: 'object',
+  properties: {
+    querystring: {
+      limit: { type: 'string', pattern: '^(\\d+)$' },
+      page: { type: 'string', pattern: '^(\\d+)$' },
+      // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+      // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
+      order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+      desc: { type: 'string', pattern: '^(\\d+)$' },
+      // state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+      // custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+      bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
+      // polyline: { type: 'string', pattern: '^([\\d\\w\\|@\\/\\{\\}~_`]+)$' },
+      key: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$' },
+      uid: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+      sql: { type: 'string', pattern: '^(\\d)$' },
+    },
+    params: {
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    },
   },
 };
 
 const searchSchema = {
-  querystring: {
-    page: { type: 'string', pattern: '^(\\d+)$' },
-    limit: { type: 'string', pattern: '^(\\d+)$' },
-    order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    desc: { type: 'string', pattern: '^(\\d+)$' },
-    key: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$' },
-    table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
+  type: 'object',
+  properties: {
+    querystring: {
+      page: { type: 'string', pattern: '^(\\d+)$' },
+      limit: { type: 'string', pattern: '^(\\d+)$' },
+      order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+      desc: { type: 'string', pattern: '^(\\d+)$' },
+      key: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$' },
+      table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+      sql: { type: 'string', pattern: '^(\\d)$' },
+    },
   },
 };
 
 const suggestSchema = {
-  querystring: {
-    lang: { type: 'string', pattern: '^([\\w]+)$' },
-    parent: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    sel: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    name: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    // key: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-    val: { type: 'string', pattern: '([\\d\\w]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-    count: { type: 'string', pattern: '^(\\d)$' },
-  },
-  params: {
-  //  data: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  type: 'object',
+  properties: {
+    querystring: {
+      lang: { type: 'string', pattern: '^([\\w]+)$' },
+      parent: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+      sel: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+      name: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+      // key: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+      val: { type: 'string', pattern: '([\\d\\w]+)$' },
+      sql: { type: 'string', pattern: '^(\\d)$' },
+      count: { type: 'string', pattern: '^(\\d)$' },
+    },
+    params: {
+    //  data: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
   },
 };
 
 const formSchema = {
-  params: {
-    form: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+  type: 'object',
+  properties: {
+    params: {
+      form: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    },
   },
 };
 
 const filterSchema = {
-  params: {
-    table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+  type: 'object',
+  properties: {
+    params: {
+      table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+    },
   },
 };
 

package/server/routes/templates/schema.js

@@ -1,7 +1,10 @@
 const getTemplateSchema = {
-    params: {
-        name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        // type: { type: 'string' },
+    type: 'object',
+    properties: {
+        params: {
+            name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+            // type: { type: 'string' },
+        },
     },
 };