@opengis/fastify-table 1.2.13 → 1.2.14

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

@@ -1,24 +1,24 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-import logChanges from './utils/logChanges.js';
-
-const rclient = getRedis();
-
-export default async function dataDelete({
-  table, tokenData, referer, id, pg: pg1, uid,
-}) {
-  const pg = pg1 || getPG({ name: 'client' });
-  const { pk } = await getMeta({ pg, table });
-  const table1 = table.replace(/"/g, '');
-  if (!pg.tlist?.includes(table1)) return 'table not exist';
-  const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
-
-  const res = await pg.query(delQuery, [id]).then(el => el.rows?.[0] || {});
-  await logChanges({
-    pg, table, tokenData, referer, id, uid, type: 'DELETE',
-  });
-  rclient.incr(`pg:${table}:crud`);
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+import logChanges from './utils/logChanges.js';
+
+const rclient = getRedis();
+
+export default async function dataDelete({
+  table, tokenData, referer, id, pg: pg1, uid,
+}) {
+  const pg = pg1 || getPG({ name: 'client' });
+  const { pk } = await getMeta({ pg, table });
+  const table1 = table.replace(/"/g, '');
+  if (!pg.tlist?.includes(table1)) return 'table not exist';
+  const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
+
+  const res = await pg.query(delQuery, [id]).then(el => el.rows?.[0] || {});
+  await logChanges({
+    pg, table, tokenData, referer, id, uid, type: 'DELETE',
+  });
+  rclient.incr(`pg:${table}:crud`);
+  return res;
+}

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

@@ -1,53 +1,53 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-import logChanges from './utils/logChanges.js';
-
-const rclient = getRedis();
-
-export default async function dataInsert({
-  id, table, tokenData, referer, data, pg: pg1, uid,
-}) {
-  const pg = pg1 || getPG({ name: 'client' });
-  if (!data) return null;
-  const { columns } = await getMeta({ pg, table });
-  if (!columns) return null;
-
-  const names = columns.map((el) => el.name);
-
-  Object.assign(data, {
-    ...(id && pg.pk?.[table] ? { [pg.pk?.[table]]: id } : {}),
-    ...(table !== 'admin.users' ? { uid } : {}),
-    // editor_id: uid,
-  });
-  const systemColumns = ['cdate', 'editor_date'].filter((el) => names.includes(el)).map((el) => [el, 'now()']);
-
-  const filterData = Object.keys(data)
-    .filter((el) => !['cdate', 'editor_date'].includes(el) && (typeof data[el] === 'boolean' ? true : data[el]) && names.includes(el)).map((el) => [el, data[el]]);
-
-  const insertQuery = `insert into ${table}
-
-    ( ${filterData?.map((key) => `"${key[0]}"`).concat(systemColumns.map((el) => el[0])).join(',')}) 
-
-    values  (${filterData?.map((key, i) => (key[0] === 'geom' ? `st_setsrid(st_geomfromgeojson($${i + 1}::json),4326)` : `$${i + 1}`)).concat(systemColumns.map((el) => el[1])).join(',')}) 
-    
-    returning *`;
-
-  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
-
-  const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
-  await logChanges({
-    pg,
-    table,
-    tokenData,
-    referer,
-    data,
-    id: res.rows?.[0]?.[pg.pk[table1]],
-    uid,
-    type: 'INSERT',
-  });
-
-  rclient.incr(`pg:${table}:crud`);
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+import logChanges from './utils/logChanges.js';
+
+const rclient = getRedis();
+
+export default async function dataInsert({
+  id, table, tokenData, referer, data, pg: pg1, uid,
+}) {
+  const pg = pg1 || getPG({ name: 'client' });
+  if (!data) return null;
+  const { columns } = await getMeta({ pg, table });
+  if (!columns) return null;
+
+  const names = columns.map((el) => el.name);
+
+  Object.assign(data, {
+    ...(id && pg.pk?.[table] ? { [pg.pk?.[table]]: id } : {}),
+    ...(table !== 'admin.users' ? { uid } : {}),
+    // editor_id: uid,
+  });
+  const systemColumns = ['cdate', 'editor_date'].filter((el) => names.includes(el)).map((el) => [el, 'now()']);
+
+  const filterData = Object.keys(data)
+    .filter((el) => !['cdate', 'editor_date'].includes(el) && (typeof data[el] === 'boolean' ? true : data[el]) && names.includes(el)).map((el) => [el, data[el]]);
+
+  const insertQuery = `insert into ${table}
+
+    ( ${filterData?.map((key) => `"${key[0]}"`).concat(systemColumns.map((el) => el[0])).join(',')}) 
+
+    values  (${filterData?.map((key, i) => (key[0] === 'geom' ? `st_setsrid(st_geomfromgeojson($${i + 1}::json),4326)` : `$${i + 1}`)).concat(systemColumns.map((el) => el[1])).join(',')}) 
+    
+    returning *`;
+
+  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
+
+  const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
+  await logChanges({
+    pg,
+    table,
+    tokenData,
+    referer,
+    data,
+    id: res.rows?.[0]?.[pg.pk[table1]],
+    uid,
+    type: 'INSERT',
+  });
+
+  rclient.incr(`pg:${table}:crud`);
+  return res;
+}

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

@@ -1,65 +1,65 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-import logChanges from './utils/logChanges.js';
-
-const rclient = getRedis();
-const srids = {};
-
-function assignValue(key, i, srid = 4326, columnType = 'text') {
-  if (key === 'geom' && columnType === 'geometry') {
-    return `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),4326)`;
-  }
-  if (key?.includes('geom') && columnType === 'geometry') {
-    return `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),${srid})`;
-  }
-  return `"${key}"=$${i + 2}`;
-}
-
-export default async function dataUpdate({
-  table, tokenData, referer, id, data, pg: pg1, uid,
-}) {
-  if (!data || !table || !id) return null;
-
-  const pg = pg1 || getPG({ name: 'client' });
-  const { columns, pk } = await getMeta({ pg, table });
-
-  const names = columns?.map((el) => el.name);
-
-  const filterData = Object.keys(data)
-    .filter((el) => (/* typeof data[el] === 'boolean' ? true : data[el] &&  */ names?.includes(el) && !['editor_date', 'editor_id'].includes(el)));
-
-  const systemColumns = [['editor_date', 'now()'], uid ? ['editor_id', `'${uid.replace(/'/g, "''")}'`] : []].filter((el) => names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
-
-  const filterValue = filterData.map((el) => {
-    const { dataTypeID = 25 } = columns?.find?.((col) => col?.name === el) || {};
-    if (pg.pgType[dataTypeID]?.endsWith('[]') && ['string', 'number'].includes(typeof data[el])) {
-      Object.assign(data, { [el]: data[el].split(',') });
-    }
-    return [el, data[el]];
-  }).map((el) => (typeof el[1] === 'object' && el[1] && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
-
-  // update geometry with srid
-  if (!srids[table]) {
-    const { srids1 } = await pg.query(`select json_object_agg(_table,rel) as srids1 from (
-      select  f_table_schema||'.'||f_table_name as _table, 
-        json_object_agg(f_geometry_column, case when srid = 0 then 4326 else srid end) as rel 
-      from public.geometry_columns group by f_table_schema||'.'||f_table_name
-      )q`).then((res1) => res1.rows?.[0] || {});
-    Object.assign(srids, srids1);
-  }
-
-  const updateQuery = `UPDATE ${table} SET ${systemColumns ? `${systemColumns}${filterData?.length ? ',' : ''}` : ''}
-  ${filterData?.map((key, i) => assignValue(key, i, srids[table]?.[key] || 4326, pg.pgType?.[columns.find(col => col.name === key)?.dataTypeID || '']))?.join(',')} 
-  WHERE ${pk} = $1 returning *`;
-  // console.log(updateQuery, filterValue);
-  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
-
-  await logChanges({
-    pg, table, tokenData, referer, data, id, uid, type: 'UPDATE',
-  });
-
-  rclient.incr(`pg:${table}:crud`);
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+import logChanges from './utils/logChanges.js';
+
+const rclient = getRedis();
+const srids = {};
+
+function assignValue(key, i, srid = 4326, columnType = 'text') {
+  if (key === 'geom' && columnType === 'geometry') {
+    return `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),4326)`;
+  }
+  if (key?.includes('geom') && columnType === 'geometry') {
+    return `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),${srid})`;
+  }
+  return `"${key}"=$${i + 2}`;
+}
+
+export default async function dataUpdate({
+  table, tokenData, referer, id, data, pg: pg1, uid,
+}) {
+  if (!data || !table || !id) return null;
+
+  const pg = pg1 || getPG({ name: 'client' });
+  const { columns, pk } = await getMeta({ pg, table });
+
+  const names = columns?.map((el) => el.name);
+
+  const filterData = Object.keys(data)
+    .filter((el) => (/* typeof data[el] === 'boolean' ? true : data[el] &&  */ names?.includes(el) && !['editor_date', 'editor_id'].includes(el)));
+
+  const systemColumns = [['editor_date', 'now()'], uid ? ['editor_id', `'${uid.replace(/'/g, "''")}'`] : []].filter((el) => names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
+
+  const filterValue = filterData.map((el) => {
+    const { dataTypeID = 25 } = columns?.find?.((col) => col?.name === el) || {};
+    if (pg.pgType[dataTypeID]?.endsWith('[]') && ['string', 'number'].includes(typeof data[el])) {
+      Object.assign(data, { [el]: data[el].split(',') });
+    }
+    return [el, data[el]];
+  }).map((el) => (typeof el[1] === 'object' && el[1] && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
+
+  // update geometry with srid
+  if (!srids[table]) {
+    const { srids1 } = await pg.query(`select json_object_agg(_table,rel) as srids1 from (
+      select  f_table_schema||'.'||f_table_name as _table, 
+        json_object_agg(f_geometry_column, case when srid = 0 then 4326 else srid end) as rel 
+      from public.geometry_columns group by f_table_schema||'.'||f_table_name
+      )q`).then((res1) => res1.rows?.[0] || {});
+    Object.assign(srids, srids1);
+  }
+
+  const updateQuery = `UPDATE ${table} SET ${systemColumns ? `${systemColumns}${filterData?.length ? ',' : ''}` : ''}
+  ${filterData?.map((key, i) => assignValue(key, i, srids[table]?.[key] || 4326, pg.pgType?.[columns.find(col => col.name === key)?.dataTypeID || '']))?.join(',')} 
+  WHERE ${pk} = $1 returning *`;
+  // console.log(updateQuery, filterValue);
+  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
+
+  await logChanges({
+    pg, table, tokenData, referer, data, id, uid, type: 'UPDATE',
+  });
+
+  rclient.incr(`pg:${table}:crud`);
+  return res;
+}

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

@@ -1,13 +1,13 @@
-import getRedis from '../../redis/funcs/getRedis.js';
-
-// import { getRedis } from '../../../../utils.js';
-
-export default async function getOpt(token, uid = 0) {
-  const rclient = getRedis({ db: 0 });
-
-  const key = `opt:${uid}:${token}`;
-  // console.log(key);
-  const data = await rclient.get(key);
-  if (!data) return null;
-  return JSON.parse(data);
-}
+import getRedis from '../../redis/funcs/getRedis.js';
+
+// import { getRedis } from '../../../../utils.js';
+
+export default async function getOpt(token, uid = 0) {
+  const rclient = getRedis({ db: 0 });
+
+  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/setOpt.js

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

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

@@ -1,44 +1,44 @@
-import { createHash, randomUUID } from 'crypto';
-
-import config from '../../../../config.js';
-
-import getRedis from '../../redis/funcs/getRedis.js';
-
-const rclient = getRedis({ db: 0 });
-
-// import { config, getRedis } from '../../../../utils.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, uid, array,
-}) {
-  //  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));
-
-  // TODO generate salt
-  const { codes, obj } = generateCodes(ids, uid);
-
-  if (!Object.keys(codes).length) return { ids: 'empty' };
-
-  rclient.hmset(`${config.pg.database}:token:edit:${uid}`, codes);
-  // console.log(`${config.pg.database}:token:edit:${uid}`, idsOrigin, Object.values(obj));
-  // 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 rclient = getRedis({ db: 0 });
+
+// import { config, getRedis } from '../../../../utils.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, uid, array,
+}) {
+  //  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));
+
+  // TODO generate salt
+  const { codes, obj } = generateCodes(ids, uid);
+
+  if (!Object.keys(codes).length) return { ids: 'empty' };
+
+  rclient.hmset(`${config.pg.database}:token:edit:${uid}`, codes);
+  // console.log(`${config.pg.database}:token:edit:${uid}`, idsOrigin, Object.values(obj));
+  // TODO дополнительно писать в hset token -> uid
+  return array ? Object.values(obj) : obj;
+}
+
+export default setToken;

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

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