@opengis/fastify-table 1.0.35 → 1.0.37

package/crud/funcs/dataInsert.js

@@ -1,24 +1,24 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-export default async function dataInsert({ table, data, pg: pg1 }) {
-  const pg = pg1 || getPG({ name: 'client' });
-  if (!data) return null;
-  const { columns } = await getMeta(table);
-  if (!columns) return null;
-
-  const names = columns.map((el) => el.name);
-  const filterData = Object.keys(data)
-    .filter((el) => data[el] && names.includes(el)).map((el) => [el, data[el]]);
-
-  const insertQuery = `insert into ${table}
-
-    ( ${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
-
-    values  (${filterData?.map((key, i) => `$${i + 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]))]) || {};
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function dataInsert({ table, data, pg: pg1 }) {
+  const pg = pg1 || getPG({ name: 'client' });
+  if (!data) return null;
+  const { columns } = await getMeta(table);
+  if (!columns) return null;
+
+  const names = columns.map((el) => el.name);
+  const filterData = Object.keys(data)
+    .filter((el) => data[el] && names.includes(el)).map((el) => [el, data[el]]);
+
+  const insertQuery = `insert into ${table}
+
+    ( ${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
+
+    values  (${filterData?.map((key, i) => `$${i + 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]))]) || {};
+  return res;
+}

package/crud/funcs/dataUpdate.js

@@ -1,24 +1,24 @@
-import getPG from '../../pg/funcs/getPG.js';
-
-import getMeta from '../../pg/funcs/getMeta.js';
-
-export default async function dataUpdate({
-  table, id, data, pg: pg1
-}) {
-  if (!data || !table || !id) return null;
-
-  const pg = pg1 || getPG({ name: 'client' });
-  const { columns, pk } = await getMeta(table);
-
-  const names = columns?.map((el) => el.name);
-  const filterData = Object.keys(data)
-    .filter((el) => data[el] && names?.includes(el));
-
-  const filterValue = filterData.map((el) => [el, data[el]]).map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
-
-  const updateQuery = `UPDATE ${table} SET ${filterData?.map((key, i) => `"${key}"=$${i + 2}`).join(',')} 
-      WHERE ${pk} = $1 returning *`;
-  //  console.log(updateDataset);
-  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function dataUpdate({
+  table, id, data, pg: pg1
+}) {
+  if (!data || !table || !id) return null;
+
+  const pg = pg1 || getPG({ name: 'client' });
+  const { columns, pk } = await getMeta(table);
+
+  const names = columns?.map((el) => el.name);
+  const filterData = Object.keys(data)
+    .filter((el) => data[el] && names?.includes(el));
+
+  const filterValue = filterData.map((el) => [el, data[el]]).map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
+
+  const updateQuery = `UPDATE ${table} SET ${filterData?.map((key, i) => `"${key}"=$${i + 2}`).join(',')} 
+      WHERE ${pk} = $1 returning *`;
+  //  console.log(updateDataset);
+  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
+  return res;
+}

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 getIdByToken({
-  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 getIdByToken;
+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 getIdByToken({
+  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 getIdByToken;

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/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, referer, 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);
-
-  // 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, referer, 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);
+
+  // 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/index.js

@@ -1,39 +1,39 @@
-// import pg from 'pg';
-import fp from 'fastify-plugin';
-import config from './config.js';
-// import rclient from './redis/client.js';
-
-import redisPlugin from './redis/index.js';
-import pgPlugin from './pg/index.js';
-import tablePlugin from './table/index.js';
-import notificationPlugin from './notification/index.js';
-import widgetPlugin from './widget/index.js';
-import crudPlugin from './crud/index.js';
-import policyPlugin from './policy/index.js';
-
-async function plugin(fastify, opt) {
-  // console.log(opt);
-  config.pg = opt.pg;
-  config.redis = opt.redis;
-
-  // independent npm start / unit test
-  if (!fastify.config) {
-    fastify.decorate('config', config);
-  }
-  if (!fastify.funcs) {
-    fastify.addHook('onRequest', async (req) => {
-      req.funcs = fastify;
-    });
-    // fastify.decorateRequest('funcs', fastify);
-  }
-
-  policyPlugin(fastify);
-  redisPlugin(fastify);
-  await pgPlugin(fastify, opt);
-  tablePlugin(fastify, opt);
-  crudPlugin(fastify, opt);
-  notificationPlugin(fastify, opt);
-  widgetPlugin(fastify, opt);
-}
-export default fp(plugin);
-// export { rclient };
+// import pg from 'pg';
+import fp from 'fastify-plugin';
+import config from './config.js';
+// import rclient from './redis/client.js';
+
+import redisPlugin from './redis/index.js';
+import pgPlugin from './pg/index.js';
+import tablePlugin from './table/index.js';
+import notificationPlugin from './notification/index.js';
+import widgetPlugin from './widget/index.js';
+import crudPlugin from './crud/index.js';
+import policyPlugin from './policy/index.js';
+
+async function plugin(fastify, opt) {
+  // console.log(opt);
+  config.pg = opt.pg;
+  config.redis = opt.redis;
+
+  // independent npm start / unit test
+  if (!fastify.config) {
+    fastify.decorate('config', config);
+  }
+  if (!fastify.funcs) {
+    fastify.addHook('onRequest', async (req) => {
+      req.funcs = fastify;
+    });
+    // fastify.decorateRequest('funcs', fastify);
+  }
+
+  policyPlugin(fastify);
+  redisPlugin(fastify);
+  await pgPlugin(fastify, opt);
+  tablePlugin(fastify, opt);
+  crudPlugin(fastify, opt);
+  notificationPlugin(fastify, opt);
+  widgetPlugin(fastify, opt);
+}
+export default fp(plugin);
+// export { rclient };

package/package.json

@@ -1,23 +1,23 @@
-{
-  "name": "@opengis/fastify-table",
-  "version": "1.0.35",
-  "type": "module",
-  "description": "core-plugins",
-  "main": "index.js",
-  "scripts": {
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "dependencies": {
-    "ioredis": "^5.3.2",
-    "fastify": "^4.26.1",
-    "fastify-plugin": "^4.0.0",
-    "pg": "^8.11.3"
-  },
-  "devDependencies": {
-    "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^19.0.4"
-  },
-  "author": "Softpro",
-  "license": "ISC"
+{
+  "name": "@opengis/fastify-table",
+  "version": "1.0.37",
+  "type": "module",
+  "description": "core-plugins",
+  "main": "index.js",
+  "scripts": {
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "dependencies": {
+    "ioredis": "^5.3.2",
+    "fastify": "^4.26.1",
+    "fastify-plugin": "^4.0.0",
+    "pg": "^8.11.3"
+  },
+  "devDependencies": {
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4"
+  },
+  "author": "Softpro",
+  "license": "ISC"
 }

package/pg/funcs/getPG.js

@@ -1,29 +1,29 @@
-import pg from 'pg';
-import config from '../../config.js';
-import pgClients from '../pgClients.js';
-import init from './init.js';
-
-function getPG({
-  user, password, host, port, db, database, name: origin, funcs,
-} = { name: 'client' }) {
-  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
-  const name = origin || db || database;
-  if (pgClients[name]) return pgClients[name];
-
-  const dbConfig = {
-    user: user || config.pg?.user,
-    password: password || config.pg?.password,
-    host: host || config.pg?.host,
-    port: port || config.pg?.port,
-    database: db || database || config.pg?.db || config.pg?.database,
-  };
-
-  pgClients[name] = new pg.Pool(dbConfig);
-  pgClients[name].init = async () => {
-    await init(pgClients[name]);
-  };
-  init(pgClients[name]);
-  return pgClients[name];
-}
-
-export default getPG;
+import pg from 'pg';
+import config from '../../config.js';
+import pgClients from '../pgClients.js';
+import init from './init.js';
+
+function getPG({
+  user, password, host, port, db, database, name: origin, funcs,
+} = { name: 'client' }) {
+  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
+  const name = origin || db || database;
+  if (pgClients[name]) return pgClients[name];
+
+  const dbConfig = {
+    user: user || config.pg?.user,
+    password: password || config.pg?.password,
+    host: host || config.pg?.host,
+    port: port || config.pg?.port,
+    database: db || database || config.pg?.db || config.pg?.database,
+  };
+
+  pgClients[name] = new pg.Pool(dbConfig);
+  pgClients[name].init = async () => {
+    await init(pgClients[name]);
+  };
+  init(pgClients[name]);
+  return pgClients[name];
+}
+
+export default getPG;

package/redis/funcs/getRedis.js

@@ -1,23 +1,23 @@
-import Redis from 'ioredis';
-import config from '../../config.js';
-import redisClients from './redisClients.js';
-
-function getRedis({ db } = { db: 0 }) {
-  if (!config.redis) return null;
-  if (redisClients[db]) return redisClients[db];
-
-  const redisConfig = {
-    db,
-    keyPrefix: `${config.db}:`,
-    host: config.redis?.host || '127.0.0.1',
-    port: config.redis?.port || 6379, // Redis port
-    family: 4, // 4 (IPv4) or 6 (IPv6)
-    closeClient: true,
-  };
-
-  redisClients[db] = new Redis(redisConfig);
-
-  return redisClients[db];
-}
-
-export default getRedis;
+import Redis from 'ioredis';
+import config from '../../config.js';
+import redisClients from './redisClients.js';
+
+function getRedis({ db } = { db: 0 }) {
+  if (!config.redis) return null;
+  if (redisClients[db]) return redisClients[db];
+
+  const redisConfig = {
+    db,
+    keyPrefix: `${config.db}:`,
+    host: config.redis?.host || '127.0.0.1',
+    port: config.redis?.port || 6379, // Redis port
+    family: 4, // 4 (IPv4) or 6 (IPv6)
+    closeClient: true,
+  };
+
+  redisClients[db] = new Redis(redisConfig);
+
+  return redisClients[db];
+}
+
+export default getRedis;