@opengis/fastify-table 1.0.82 → 1.0.84

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/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/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/index.js

@@ -42,7 +42,7 @@ async function plugin(fastify, opt) {
   fastify.register(import('@opengis/fastify-hb'));
   fastify.decorate('getFolder', (req, type = 'server') => {
     if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
-    const types = { local: req.root, server: req.mapServerRoot };
+    const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
     const filepath = path.posix.join(types[type] || '/data/local', req.folder || config.folder || '');
     return filepath;
   });

package/migration/exec.migrations.js

@@ -1,76 +1,76 @@
-import fs from 'fs';
-import path from 'path';
-
-const time = Date.now();
-
-import getPG from '../pg/funcs/getPG.js';
-
-export default async function execMigrations(opt) {
-    try {
-        const pg = opt?.pg || getPG({ name: 'client' });
-        const rootDir = getCallerDir();
-        const dir = path.join(rootDir.replace(/\\/g, '/').replace(/^file:\/\/\//, ''), rootDir.endsWith('plugins') ? '../..' : '', 'server/migrations');
-
-        console.log('migrations start', dir, Date.now() - time);
-        const exists = fs.existsSync(dir);
-        if (exists) {
-            // get directory sql file list
-            const content = fs.readdirSync(dir, { withFileTypes: true })
-                ?.filter((el) => el.isFile() && path.extname(el.name) === '.sql')
-                ?.map((el) => el.name) || [];
-
-            // execute sql files
-            if (content?.length) {
-                await sequence(content, { pg, dir }, execSql);
-            }
-        }
-        console.log('migrations finish', dir, exists, Date.now() - time);
-    } catch(err) {
-        console.error('migrations error', err.toString(), Date.now() - time);
-    }
-}
-
-function getCallerDir() {
-    const originalFunc = Error.prepareStackTrace;
-
-    let callerfile;
-    try {
-        const err = new Error();
-        let currentfile;
-
-        Error.prepareStackTrace = function (err, stack) { return stack; };
-
-        currentfile = err.stack.shift().getFileName();
-
-        while (err.stack.length) {
-            callerfile = err.stack.shift().getFileName();
-
-            if(currentfile !== callerfile) break;
-        }
-    } catch (err) { }
-
-    Error.prepareStackTrace = originalFunc; 
-
-    return path.dirname(callerfile);
-}
-
-function sequence(files, data, fn) {
-    return files.reduce((promise, filename) => promise.then(() => fn({
-      ...data, filename,
-    })), Promise.resolve());
-}
-
-async function execSql({
-    pg, dir, filename,
-}) {
-    const start = Date.now();
-    const filepath = path.join(dir, filename);
-    const sql = fs.readFileSync(filepath, 'utf-8');
-    try {
-        console.log(filename, 'start', Date.now() - start);
-        await pg.query(sql);
-        console.log(filename, 'finish', Date.now() - start);
-    } catch (err) {
-        console.log(filepath, 'error', err.toString(), Date.now() - start);
-    }
+import fs from 'fs';
+import path from 'path';
+
+const time = Date.now();
+
+import getPG from '../pg/funcs/getPG.js';
+
+export default async function execMigrations(opt) {
+    try {
+        const pg = opt?.pg || getPG({ name: 'client' });
+        const rootDir = getCallerDir();
+        const dir = path.join(rootDir.replace(/\\/g, '/').replace(/^file:\/\/\//, ''), rootDir.endsWith('plugins') ? '../..' : '', 'server/migrations');
+
+        console.log('migrations start', dir, Date.now() - time);
+        const exists = fs.existsSync(dir);
+        if (exists) {
+            // get directory sql file list
+            const content = fs.readdirSync(dir, { withFileTypes: true })
+                ?.filter((el) => el.isFile() && path.extname(el.name) === '.sql')
+                ?.map((el) => el.name) || [];
+
+            // execute sql files
+            if (content?.length) {
+                await sequence(content, { pg, dir }, execSql);
+            }
+        }
+        console.log('migrations finish', dir, exists, Date.now() - time);
+    } catch(err) {
+        console.error('migrations error', err.toString(), Date.now() - time);
+    }
+}
+
+function getCallerDir() {
+    const originalFunc = Error.prepareStackTrace;
+
+    let callerfile;
+    try {
+        const err = new Error();
+        let currentfile;
+
+        Error.prepareStackTrace = function (err, stack) { return stack; };
+
+        currentfile = err.stack.shift().getFileName();
+
+        while (err.stack.length) {
+            callerfile = err.stack.shift().getFileName();
+
+            if(currentfile !== callerfile) break;
+        }
+    } catch (err) { }
+
+    Error.prepareStackTrace = originalFunc; 
+
+    return path.dirname(callerfile);
+}
+
+function sequence(files, data, fn) {
+    return files.reduce((promise, filename) => promise.then(() => fn({
+      ...data, filename,
+    })), Promise.resolve());
+}
+
+async function execSql({
+    pg, dir, filename,
+}) {
+    const start = Date.now();
+    const filepath = path.join(dir, filename);
+    const sql = fs.readFileSync(filepath, 'utf-8');
+    try {
+        console.log(filename, 'start', Date.now() - start);
+        await pg.query(sql);
+        console.log(filename, 'finish', Date.now() - start);
+    } catch (err) {
+        console.log(filepath, 'error', err.toString(), Date.now() - start);
+    }
 }

package/notification/controllers/testEmail.js

@@ -1,49 +1,49 @@
-import path from 'path';
-import { existsSync } from 'fs';
-import { fileURLToPath } from 'url';
-
-const fileName = fileURLToPath(import.meta.url);
-const dirName = path.dirname(fileName);
-
-import notification from '../funcs/sendNotification.js';
-
-export default async function testNotification({
-  pg, funcs = {}, log, query = {}, session = {},
-}) {
-  const { local } = funcs.config || {};
-  if (!session?.passport?.user?.user_type?.includes('admin') && !local) {
-    return { message: 'Forbidden', status: 403 };
-  }
-
-  const date = new Date().toISOString().split('T')[0];
-  if (!query.to) {
-    return { message: 'param to is required', status: 400 };
-  }
-
-  try {
-    const {
-      to, template, table, id, nocache,
-    } = query;
-    const file = [path.join(dirName, '../../', 'changelog.md'), path.join(dirName, 'utils', 'pin-m-ty-media-record-outline+303070.png')].filter((el) => existsSync(el));
-    const data = await notification({
-      pg,
-      funcs,
-      log,
-      to,
-      template,
-      title: `Test Softpro ${date}`,
-      table,
-      nocache,
-      file,
-      id,
-      message: `Test mail Softpro ${date} Lorem Ipsum Lorem Ipsum`,
-    });
-
-    return {
-      message: data || 'ok',
-    };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import path from 'path';
+import { existsSync } from 'fs';
+import { fileURLToPath } from 'url';
+
+const fileName = fileURLToPath(import.meta.url);
+const dirName = path.dirname(fileName);
+
+import notification from '../funcs/sendNotification.js';
+
+export default async function testNotification({
+  pg, funcs = {}, log, query = {}, session = {},
+}) {
+  const { local } = funcs.config || {};
+  if (!session?.passport?.user?.user_type?.includes('admin') && !local) {
+    return { message: 'Forbidden', status: 403 };
+  }
+
+  const date = new Date().toISOString().split('T')[0];
+  if (!query.to) {
+    return { message: 'param to is required', status: 400 };
+  }
+
+  try {
+    const {
+      to, template, table, id, nocache,
+    } = query;
+    const file = [path.join(dirName, '../../', 'changelog.md'), path.join(dirName, 'utils', 'pin-m-ty-media-record-outline+303070.png')].filter((el) => existsSync(el));
+    const data = await notification({
+      pg,
+      funcs,
+      log,
+      to,
+      template,
+      title: `Test Softpro ${date}`,
+      table,
+      nocache,
+      file,
+      id,
+      message: `Test mail Softpro ${date} Lorem Ipsum Lorem Ipsum`,
+    });
+
+    return {
+      message: data || 'ok',
+    };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}