@opengis/fastify-table 1.1.50 → 1.1.51

package/crud/funcs/getToken.js

@@ -1,27 +1,27 @@
-import getRedis from '../../redis/funcs/getRedis.js';
-import config from '../../config.js';
-
-function sprintf(str, ...args) {
-  return str.replace(/%s/g, () => args.shift());
-}
-
-const keys = {
-  r: '%s:token:view:%s',
-  a: '%s:token:add:%s',
-  w: '%s:token:edit:%s',
-  e: '%s:token:exec:%s',
-};
-
-async function getToken({
-  uid, token, mode = 'r', json,
-}) {
-  if (mode === 'r') return token;
-
-  const rclient = getRedis({ db: 0 });
-
-  const key = sprintf(keys[mode], config?.pg?.database, uid?.toString());
-  const id = await rclient.hget(key, token);
-  return json && id?.[0] === '{' ? JSON.parse(id) : id;
-}
-
-export default getToken;
+import getRedis from '../../redis/funcs/getRedis.js';
+import config from '../../config.js';
+
+function sprintf(str, ...args) {
+  return str.replace(/%s/g, () => args.shift());
+}
+
+const keys = {
+  r: '%s:token:view:%s',
+  a: '%s:token:add:%s',
+  w: '%s:token:edit:%s',
+  e: '%s:token:exec:%s',
+};
+
+async function getToken({
+  uid, token, mode = 'r', json,
+}) {
+  if (mode === 'r') return token;
+
+  const rclient = getRedis({ db: 0 });
+
+  const key = sprintf(keys[mode], config?.pg?.database, uid?.toString());
+  const id = await rclient.hget(key, token);
+  return json && id?.[0] === '{' ? JSON.parse(id) : id;
+}
+
+export default getToken;

package/crud/funcs/isFileExists.js

@@ -1,13 +1,13 @@
-import { access } from 'fs/promises';
-
-const isFileExists = async (filepath) => {
-  try {
-    await access(filepath);
-    return true;
-  }
-  catch (err) {
-    return false;
-  }
-};
-
-export default isFileExists;
+import { access } from 'fs/promises';
+
+const isFileExists = async (filepath) => {
+  try {
+    await access(filepath);
+    return true;
+  }
+  catch (err) {
+    return false;
+  }
+};
+
+export default isFileExists;

package/crud/funcs/setOpt.js

@@ -1,16 +1,16 @@
-import { createHash } from 'crypto';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-function md5(string) {
-  return createHash('md5').update(string).digest('hex');
-}
-
-export default async function setOpt(params) {
-  const token = Buffer.from(md5(typeof params === 'object' ? JSON.stringify(params) : params), 'hex').toString('base64').replace(/[+-=]+/g, '');
-  // const token = md5(params);
-  const key = `opt:${token}`;
-
-  const rclient = getRedis({ db: 0, funcs: params.funcs });
-  await rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
-  return token;
-}
+import { createHash } from 'crypto';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+function md5(string) {
+  return createHash('md5').update(string).digest('hex');
+}
+
+export default async function setOpt(params) {
+  const token = Buffer.from(md5(typeof params === 'object' ? JSON.stringify(params) : params), 'hex').toString('base64').replace(/[+-=]+/g, '');
+  // const token = md5(params);
+  const key = `opt:${token}`;
+
+  const rclient = getRedis({ db: 0, funcs: params.funcs });
+  await rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
+  return token;
+}

package/crud/funcs/setToken.js

@@ -1,53 +1,53 @@
-import { createHash, randomUUID } from 'crypto';
-
-import config from '../../config.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-const generateCodes = (ids, userToken) => {
-  const token = userToken || randomUUID();
-  const notNullIds = ids.filter((el) => el);
-  const obj = {};
-  const codes = notNullIds.reduce((acc, id) => {
-    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
-    acc[newToken] = id; obj[id] = newToken;
-    return acc;
-  }, {});
-  return { codes, obj };
-};
-
-function setToken({
-  ids: idsOrigin, mode = 'r', uid, array,
-}) {
-  const rclient2 = getRedis({ db: 0 });
-  //  const rclient5 = getRedis({ db: 0, funcs });
-
-  if (!uid) return { user: 'empty' };
-  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
-
-  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
-  // update/delete
-
-  if (mode === 'r') return null;
-
-  // TODO generate salt
-  const { codes, obj } = generateCodes(ids, uid);
-
-  if (!Object.keys(codes).length) return { ids: 'empty' };
-
-  rclient2.hmset(`${config.pg.database}:token:${{
-    e: 'exec', r: 'view', w: 'edit', a: 'add',
-  }[mode]}:${uid}`, codes);
-  // console.log(codes);
-  // log token for debug. add extra data - uid, mode, date
-  /* const dt = new Date().toISOString();
-   const codesLog = Object.keys(codes).reduce((acc, key) => {
-    acc[key] = `{"referer": "${referer}" ,"uid":"${uid}","mode":"${mode}","date":"${dt}",${codes[key].substr(1)}`;
-    return acc;
-  }, {});
-   rclient5.hmset(`${config.pg.database}:token:edit`, codesLog); // 'EX', 64800 */
-
-  // TODO дополнительно писать в hset token -> uid
-  return array ? Object.values(obj) : obj;
-}
-
-export default setToken;
+import { createHash, randomUUID } from 'crypto';
+
+import config from '../../config.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+const generateCodes = (ids, userToken) => {
+  const token = userToken || randomUUID();
+  const notNullIds = ids.filter((el) => el);
+  const obj = {};
+  const codes = notNullIds.reduce((acc, id) => {
+    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
+    acc[newToken] = id; obj[id] = newToken;
+    return acc;
+  }, {});
+  return { codes, obj };
+};
+
+function setToken({
+  ids: idsOrigin, mode = 'r', uid, array,
+}) {
+  const rclient2 = getRedis({ db: 0 });
+  //  const rclient5 = getRedis({ db: 0, funcs });
+
+  if (!uid) return { user: 'empty' };
+  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
+
+  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
+  // update/delete
+
+  if (mode === 'r') return null;
+
+  // TODO generate salt
+  const { codes, obj } = generateCodes(ids, uid);
+
+  if (!Object.keys(codes).length) return { ids: 'empty' };
+
+  rclient2.hmset(`${config.pg.database}:token:${{
+    e: 'exec', r: 'view', w: 'edit', a: 'add',
+  }[mode]}:${uid}`, codes);
+  // console.log(codes);
+  // log token for debug. add extra data - uid, mode, date
+  /* const dt = new Date().toISOString();
+   const codesLog = Object.keys(codes).reduce((acc, key) => {
+    acc[key] = `{"referer": "${referer}" ,"uid":"${uid}","mode":"${mode}","date":"${dt}",${codes[key].substr(1)}`;
+    return acc;
+  }, {});
+   rclient5.hmset(`${config.pg.database}:token:edit`, codesLog); // 'EX', 64800 */
+
+  // TODO дополнительно писать в hset token -> uid
+  return array ? Object.values(obj) : obj;
+}
+
+export default setToken;

package/crud/funcs/utils/getFolder.js

@@ -1,9 +1,9 @@
-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 filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, 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 filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, req.folder || config.folder || '');
+  return filepath;
+}

package/crud/funcs/utils/logChanges.js

@@ -1,62 +1,62 @@
-import getMeta from '../../../pg/funcs/getMeta.js';
-
-export default async function logChanges({
-  pg, table, id, data, uid = 1, type,
-}) {
-  if (!id) {
-    console.error('param id is required');
-    return null;
-  }
-  if (!table || !pg.pk?.[table]) {
-    console.error('table not found');
-    return null;
-  }
-  if (!pg.pk?.['log.table_changes'] || !pg.pk?.['log.table_changes_data']) {
-    console.error('log table not found');
-    return null;
-  }
-  if (!type) {
-    console.error('invalid type');
-    return null;
-  }
-
-  try {
-    const { change_id: changeId } = await pg.query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
-    values(CURRENT_DATE, $1, $2, $3, $4) returning change_id`, [type, uid, table, id]).then((res) => res.rows?.[0] || {});
-
-    const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
-    const columnList = fields.map((el) => el?.name);
-    const q = `select ${Object.keys(data || {}).filter((el) => columnList.includes(el)).join(',') || '*'} from ${table} where ${pg.pk?.[table]}=$1`;
-    // console.log(q, type, id);
-
-    const old = type !== 'INSERT' ? await pg.query(q, [id]).then((res) => res.rows?.[0] || {}) : {};
-
-    const { columns = [] } = await getMeta({ table: 'log.table_changes_data' });
-    const names = columns.map((el) => el.name);
-
-    const res = await Promise.all(Object.keys(data || {}).map(async (el) => {
-      const filterData = Object.entries({
-        change_id: changeId, entity_key: el, value_old: old[el], value_new: data[el], uid,
-      })
-        .filter((el) => el[1] && names.includes(el[0]));
-
-      const insertQuery = `insert into log.table_changes_data (${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
-      values (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) returning *`;
-
-      const { rows = [] } = await pg.query(insertQuery, [...filterData.map((el) => (el[1] && typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
-      return rows[0];
-    }));
-
-    const newData = type === 'DELETE' ? {} : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.entity_key]: curr.value_new }), {});
-    // console.log('logChanges OK', type);
-    return {
-      change_id: changeId, entity_type: table, entity_id: id, uid, change_type: type, old, new: newData,
-    };
-  }
-  catch (err) {
-    console.error('logChanges error', type, table, id, data, err.toString());
-    return {
-      error: err.toString(), entity_type: table, entity_id: id, uid, change_type: type,
-    };
-  }
-}
+import getMeta from '../../../pg/funcs/getMeta.js';
+
+export default async function logChanges({
+  pg, table, id, data, uid = 1, type,
+}) {
+  if (!id) {
+    console.error('param id is required');
+    return null;
+  }
+  if (!table || !pg.pk?.[table]) {
+    console.error('table not found');
+    return null;
+  }
+  if (!pg.pk?.['log.table_changes'] || !pg.pk?.['log.table_changes_data']) {
+    console.error('log table not found');
+    return null;
+  }
+  if (!type) {
+    console.error('invalid type');
+    return null;
+  }
+
+  try {
+    const { change_id: changeId } = await pg.query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
+    values(CURRENT_DATE, $1, $2, $3, $4) returning change_id`, [type, uid, table, id]).then((res) => res.rows?.[0] || {});
+
+    const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
+    const columnList = fields.map((el) => el?.name);
+    const q = `select ${Object.keys(data || {}).filter((el) => columnList.includes(el)).join(',') || '*'} from ${table} where ${pg.pk?.[table]}=$1`;
+    // console.log(q, type, id);
+
+    const old = type !== 'INSERT' ? await pg.query(q, [id]).then((res) => res.rows?.[0] || {}) : {};
+
+    const { columns = [] } = await getMeta({ table: 'log.table_changes_data' });
+    const names = columns.map((el) => el.name);
+
+    const res = await Promise.all(Object.keys(data || {}).map(async (el) => {
+      const filterData = Object.entries({
+        change_id: changeId, entity_key: el, value_old: old[el], value_new: data[el], uid,
+      })
+        .filter((el) => el[1] && names.includes(el[0]));
+
+      const insertQuery = `insert into log.table_changes_data (${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
+      values (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) returning *`;
+
+      const { rows = [] } = await pg.query(insertQuery, [...filterData.map((el) => (el[1] && typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
+      return rows[0];
+    }));
+
+    const newData = type === 'DELETE' ? {} : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.entity_key]: curr.value_new }), {});
+    // console.log('logChanges OK', type);
+    return {
+      change_id: changeId, entity_type: table, entity_id: id, uid, change_type: type, old, new: newData,
+    };
+  }
+  catch (err) {
+    console.error('logChanges error', type, table, id, data, err.toString());
+    return {
+      error: err.toString(), entity_type: table, entity_id: id, uid, change_type: type,
+    };
+  }
+}

package/crud/index.js

@@ -1,36 +1,36 @@
-import getOpt from './funcs/getOpt.js';
-import setOpt from './funcs/setOpt.js';
-import isFileExists from './funcs/isFileExists.js';
-import dataUpdate from './funcs/dataUpdate.js';
-import dataInsert from './funcs/dataInsert.js';
-
-import update from './controllers/update.js';
-import insert from './controllers/insert.js';
-import deleteCrud from './controllers/deleteCrud.js';
-import getAccessFunc from './funcs/getAccess.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';
-  // funcs
-  fastify.decorate('setOpt', setOpt);
-  fastify.decorate('getOpt', getOpt);
-  fastify.decorate('dataUpdate', dataUpdate);
-  fastify.decorate('dataInsert', dataInsert);
-  fastify.decorate('getAccess', getAccessFunc);
-
-  fastify.decorate('isFileExists', isFileExists);
-
-  // 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;
+import getOpt from './funcs/getOpt.js';
+import setOpt from './funcs/setOpt.js';
+import isFileExists from './funcs/isFileExists.js';
+import dataUpdate from './funcs/dataUpdate.js';
+import dataInsert from './funcs/dataInsert.js';
+
+import update from './controllers/update.js';
+import insert from './controllers/insert.js';
+import deleteCrud from './controllers/deleteCrud.js';
+import getAccessFunc from './funcs/getAccess.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';
+  // funcs
+  fastify.decorate('setOpt', setOpt);
+  fastify.decorate('getOpt', getOpt);
+  fastify.decorate('dataUpdate', dataUpdate);
+  fastify.decorate('dataInsert', dataInsert);
+  fastify.decorate('getAccess', getAccessFunc);
+
+  fastify.decorate('isFileExists', isFileExists);
+
+  // 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/docs/.vitepress/abbr.mjs

@@ -1,26 +1,26 @@
-import abbr from '../abbr.json';
-
-function handleAbbr(md) {
-  if (!abbr || typeof abbr !== 'object') {
-    return false;
-  }
-
-  const defaultRender = md.renderer.render.bind(md.renderer);
-
-  md.renderer.render = function(tokens, options, env) {
-    let result = defaultRender(tokens, options, env);
-
-    for (const key in abbr) {
-      const pattern = new RegExp(`${key}(?!\s*<\/abbr>)`, 'gm');
-      const replacement = `<abbr title="${abbr[key]}">${key}</abbr>`;
-
-      result = result.replace(pattern, replacement);
-    }
-
-    return result;
-  };
-
-  return true;
-}
-
-export default handleAbbr;
+import abbr from '../abbr.json';
+
+function handleAbbr(md) {
+  if (!abbr || typeof abbr !== 'object') {
+    return false;
+  }
+
+  const defaultRender = md.renderer.render.bind(md.renderer);
+
+  md.renderer.render = function(tokens, options, env) {
+    let result = defaultRender(tokens, options, env);
+
+    for (const key in abbr) {
+      const pattern = new RegExp(`${key}(?!\s*<\/abbr>)`, 'gm');
+      const replacement = `<abbr title="${abbr[key]}">${key}</abbr>`;
+
+      result = result.replace(pattern, replacement);
+    }
+
+    return result;
+  };
+
+  return true;
+}
+
+export default handleAbbr;