@opengis/fastify-table 1.3.63 → 1.3.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.63",
+  "version": "1.3.64",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/cron/funcs/verifyUnique.js

@@ -9,6 +9,7 @@ const md5 = (string) => createHash('md5').update(string).digest('hex');
 const rclient = getRedis();
 
 export default async function verifyUnique(name) {
+    if (!config.redis) return true; // skip if redis is disabled
     const cronId = config.port || 3000 + md5(name);
     // one per node check
     const key = `cron:unique:${cronId}`;
@@ -19,4 +20,4 @@ export default async function verifyUnique(name) {
     }
     await rclient.expire(key, 20);
     return true;
-}
+}

package/server/plugins/cron/index.js

@@ -1,12 +1,12 @@
 import { createHash } from 'node:crypto';
 
-import config from "../../../config.js";
+import config from '../../../config.js';
 
-import getPG from "../pg/funcs/getPG.js";
-import pgClients from "../pg/pgClients.js";
+import getPG from '../pg/funcs/getPG.js';
+import pgClients from '../pg/pgClients.js';
 import getRedis from '../redis/funcs/getRedis.js';
-import logger from "../logger/getLogger.js";
-import interval2ms from "./funcs/interval2ms.js";
+import logger from '../logger/getLogger.js';
+import interval2ms from './funcs/interval2ms.js';
 
 const rclient = getRedis();
 
@@ -17,21 +17,23 @@ async function runCron({
 
     // verifyUnique
     const key = `cron:unique:${name}`;
-    const unique = await rclient.setnx(key, 1);
-    const ttl = await rclient.ttl(key);
+    const unique = config.redis ? await rclient.setnx(key, 1) : null;
+    const ttl = config.redis ? await rclient.ttl(key) : -1;
 
     if (!unique && ttl !== -1) {
         // if (config.trace) console.log(name, db, query, 'skip unique');
         return;
     }
 
-    await rclient.expire(key, 20);
+    if (config.redis) {
+        await rclient.expire(key, 20);
+    }
 
     try {
-        if (!pg.pk) await pg.init();
+        if (!pg.pk && config.pg) { await pg.init(); }
 
         if (config.trace) console.time(`${db}:${query}`);
-        const { command, rows = [], rowCount } = await pg.query(query);
+        const { command, rows = [], rowCount } = pg?.pk ? await pg.query(query) : {};
         if (config.trace) console.timeEnd(`${db}:${query}`);
 
         logger.file('cron', { db, name, result: { command, rows, rowCount } });

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

@@ -2,6 +2,7 @@ import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 import pgClients from '../../pg/pgClients.js';
+import config from '../../../../config.js';
 
 import extraData from '../../extra/extraData.js';
 import logChanges from './utils/logChanges.js';
@@ -25,7 +26,9 @@ export default async function dataDelete({
 
   const { pk } = await getMeta({ pg, table })
     .catch(err => {
-      logger.file('crud/delete', { error: err.toString(), stack: err.stack, table, id, referer, uid });
+      logger.file('crud/delete', {
+        error: err.toString(), stack: err.stack, table, id, referer, uid,
+      });
       throw new Error(err.toString());
     });
   const table1 = table.replace(/"/g, '');
@@ -38,7 +41,9 @@ export default async function dataDelete({
 
   const res = await pg.query(delQuery, [id])
     .catch(err => {
-      logger.file('crud/delete', { error: err.toString(), stack: err.stack, table, id, referer, uid, q: delQuery });
+      logger.file('crud/delete', {
+        error: err.toString(), stack: err.stack, table, id, referer, uid, q: delQuery,
+      });
       throw new Error(err.toString());
     })
     .then(el => el.rows?.[0] || {});
@@ -46,6 +51,6 @@ export default async function dataDelete({
   await logChanges({
     pg, table, tokenData, referer, id, uid, type: 'DELETE',
   });
-  rclient.incr(`pg:${table}:crud`);
+  if (config.redis) { rclient.incr(`pg:${table}:crud`); }
   return { ...res, ...extraRes || {} };
 }

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

@@ -2,6 +2,7 @@ import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 import pgClients from '../../pg/pgClients.js';
+import config from '../../../../config.js';
 
 import logChanges from './utils/logChanges.js';
 import logger from '../../logger/getLogger.js';
@@ -32,7 +33,9 @@ export default async function dataInsert({
   Object.assign(data, {
     ...(id && pg.pk?.[table] ? { [pg.pk?.[table]]: id } : {}),
     ...(table !== 'admin.users' ? { uid } : {}),
-    editor_id: uid, created_by: uid, updated_by: uid,
+    editor_id: uid,
+    created_by: uid,
+    updated_by: uid,
     // editor_id: uid,
   });
 
@@ -52,13 +55,17 @@ export default async function dataInsert({
 
   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]))])
     .catch(err => {
-      logger.file('crud/insert', { error: err.toString(), stack: err.stack, table, id, referer, uid, q: insertQuery });
+      logger.file('crud/insert', {
+        error: err.toString(), stack: err.stack, table, id, referer, uid, q: insertQuery,
+      });
       throw new Error(err.toString());
     }).then(el => el || {});
 
   const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
 
-  const extraRes = await extraData({ table, form: tokenData?.form, id: res.rows?.[0]?.[pg.pk[table1]], data, uid }, pg);
+  const extraRes = await extraData({
+    table, form: tokenData?.form, id: res.rows?.[0]?.[pg.pk[table1]], data, uid,
+  }, pg);
   if (extraRes && res?.rows?.[0]) {
     Object.assign(res.rows[0], { ...extraRes });
   }
@@ -74,6 +81,6 @@ export default async function dataInsert({
     type: 'INSERT',
   });
 
-  rclient.incr(`pg:${table}:crud`);
+  if (config.redis) { rclient.incr(`pg:${table}:crud`); }
   return res;
 }

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

@@ -2,6 +2,7 @@ import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 import pgClients from '../../pg/pgClients.js';
+import config from '../../../../config.js';
 
 import extraData from '../../extra/extraData.js';
 import logChanges from './utils/logChanges.js';
@@ -72,17 +73,39 @@ export default async function dataUpdate({
   // console.log(updateQuery, filterValue);
   const res = await pg.query(updateQuery, [id, ...filterValue])
     .catch(err => {
-      logger.file('crud/update', { error: err.toString(), stack: err.stack, table, id, referer, uid, data, q: updateQuery });
+      logger.file('crud/update', {
+        error: err.toString(),
+        stack: err.stack,
+        table,
+        id,
+        referer,
+        uid,
+        data,
+        q: updateQuery,
+      });
       throw new Error(err.toString());
     })
     .then(el => el?.rows?.[0]) || {};
 
-  const extraRes = await extraData({ table, form: tokenData?.form, id, data, uid }, pg);
+  const extraRes = await extraData({
+    table,
+    form: tokenData?.form,
+    id,
+    data,
+    uid,
+  }, pg);
 
   await logChanges({
-    pg, table, tokenData, referer, data, id, uid, type: 'UPDATE',
+    pg,
+    table,
+    tokenData,
+    referer,
+    data,
+    id,
+    uid,
+    type: 'UPDATE',
   });
 
-  rclient.incr(`pg:${table}:crud`);
+  if (config.redis) { rclient.incr(`pg:${table}:crud`); }
   return { ...res, ...extraRes || {} };
 }

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

@@ -1,9 +1,10 @@
+import config from '../../../../config.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 
-// import { getRedis } from '../../../../utils.js';
+const rclient = getRedis({ db: 0 });
 
 export default async function getOpt(token, uid = 0) {
-  const rclient = getRedis({ db: 0 });
+  if (!config.redis) return null;
 
   const key = `opt:${uid}:${token}`;
   // console.log(key);

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

@@ -15,14 +15,15 @@ const keys = {
   e: '%s:token:exec:%s',
 };
 
+const rclient = getRedis({ db: 0 });
+
 async function getToken({
   uid, token, json,
 }) {
+  if (!config.redis) return null;
   const mode = 'w';
   // 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);
   // console.log(key, token);

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

@@ -1,21 +1,21 @@
 import { createHash, randomUUID } from 'crypto';
 
-const random = randomUUID();
-
+import config from '../../../../config.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 
-// import { getRedis } from '../../../../utils.js';
+const random = randomUUID();
+const rclient = getRedis({ db: 0 });
 
 function md5(string) {
   return createHash('md5').update(string).digest('hex');
 }
 
 export default function setOpt(params, uid = 0) {
+  if (!config.redis) return null;
   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

@@ -23,8 +23,7 @@ const generateCodes = (ids, userToken) => {
 function setToken({
   ids: idsOrigin, uid, array,
 }) {
-  //  const rclient5 = getRedis({ db: 0, funcs });
-
+  if (!config.redis) return null;
   if (!uid) return { user: 'empty' };
   if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
 

package/server/plugins/logger/getLogger.js

@@ -49,6 +49,7 @@ if (config.debug) {
 logger.metrics = function metrics(key, val, dbName) {
   const dbname = dbName || config.pg?.database;
   if (!dbname && !isServer) return;
+  if (!config.redis) return;
   rclient2.hincrby(`${dbname}:system_metrics`, key, val || 1);
 };
 

package/server/plugins/metric/loggerSystem.js

@@ -3,7 +3,9 @@ import process from 'process';
 import util from 'node:util';
 import { exec } from 'node:child_process';
 
-import { config, getFolder, pgClients, getRedis } from '../../../utils.js';
+import {
+  config, getFolder, pgClients, getRedis,
+} from '../../../utils.js';
 
 const execAsync = util.promisify(exec);
 const platform = os.platform();
@@ -23,7 +25,7 @@ export default async function loggerSystem(req) {
   const { pg = pgClients.client } = req;
   const dbName = pg.options?.database;
 
-  const dbsize = await rclient.get(`${dbName}:content:dbsize:${redisKey}`);
+  const dbsize = config.redis ? await rclient.get(`${dbName}:content:dbsize:${redisKey}`) : null;
 
   const dbVerion = await pg.query('select version();').then(el => el.rows?.[0]?.version);
 
@@ -46,7 +48,7 @@ export default async function loggerSystem(req) {
   const resource = process.resourceUsage();
 
   const currentCpuUsage = (((process.cpuUsage().user + process.cpuUsage().system) * 1000) / totalCpu) * 100;
-  const redisInfo = await rclient.info();
+  const redisInfo = config.redis ? await rclient.info() : '';
 
   const lines = redisInfo.split('\r\n').filter((el) => el && el.split);
   const redis = {};
@@ -58,21 +60,21 @@ export default async function loggerSystem(req) {
     }
   }
 
-  await rclient.set(`${dbName}:content:dbsize:${redisKey}`, dbSize, 'EX', 30 * 60);
+  if (config.redis) { await rclient.set(`${dbName}:content:dbsize:${redisKey}`, dbSize, 'EX', 30 * 60); }
 
-  const latency = await rclient.latency('latest');
+  const latency = config.redis ? await rclient.latency('latest') : null;
 
-  const uptime = await pg.query(`select extract('epoch' from current_timestamp - pg_postmaster_start_time())::int as uptime`)
+  const uptime = await pg.query('select extract(\'epoch\' from current_timestamp - pg_postmaster_start_time())::int as uptime')
     .then(el => el.rows?.[0]?.uptime);
 
-  const metric5 = await rclient2.hgetall(`${dbName}:system_metrics`);
+  const metric5 = config.redis ? await rclient2.hgetall(`${dbName}:system_metrics`) : {};
 
   Object.keys(metric5 || {}).filter((el) => el.startsWith('time')).forEach((m) => {
     metric5[m] /= 1000.0;
   });
 
   const metricSort = metric5 ? JSON.parse(JSON.stringify(metric5, Object.keys(metric5).sort())) : undefined;
-  const userOnline = await rclient2.scan(['0', 'match', `${dbName}:user:*`, 'count', '10000']);
+  const userOnline = config.redis ? await rclient2.scan(['0', 'match', `${dbName}:user:*`, 'count', '10000']) : [];
   // const userOnline = await rclient10.scan(['0', 'match', 'sess:*', 'count', '10000']);
 
   return {
@@ -101,7 +103,7 @@ export default async function loggerSystem(req) {
       'node.cpu.time': resource.systemCPUTime,
       'node.cpu.load': os.loadavg()[0],
       'redis.ram': redis.used_memory_human,
-      'redis.latency': latency?.join(','),
+      'redis.latency': latency?.join?.(','),
       'redis.ram.peak': redis.used_memory_peak_human,
       'redis.clients': redis.connected_clients,
       'redis.db0': redis.db0?.split(',')?.[0]?.substring(5),
@@ -126,4 +128,4 @@ export default async function loggerSystem(req) {
     top: topProcess,
     query,
   };
-};
+}

package/server/plugins/metric/systemMetricsFifthly.js

@@ -1,6 +1,7 @@
 import pgClients from '../pg/pgClients.js';
 import logger from '../logger/getLogger.js';
 import getRedis from '../redis/funcs/getRedis.js';
+import config from '../../../config.js';
 
 import loggerSystem from './loggerSystem.js';
 
@@ -10,7 +11,7 @@ export default async function systemMetricsFifthly({ pg = pgClients.client }) {
   const system = await loggerSystem({ pg });
   const dbName = pg.options?.database;
 
-  await rclient2.del(`${dbName}:system_metrics`);
+  if (config.redis) { await rclient2.del(`${dbName}:system_metrics`); }
 
   logger.file('metric', {
     dbname: dbName,
@@ -20,4 +21,4 @@ export default async function systemMetricsFifthly({ pg = pgClients.client }) {
   });
 
   return { message: 'Saved Fifthly' };
-}
+}

package/server/plugins/migration/exec.sql.js

@@ -31,7 +31,7 @@ export default async function execSql(filepath, pg = pgClients.client) {
     const sql = readFileSync(filepath, 'utf-8');
 
     const hash = createHash('md5').update(sql).digest('hex');
-    const hashes = await rclient.hgetall(`${pg.options?.database}:migration-hashes`).then(obj => Object.keys(obj));
+    const hashes = config.redis ? await rclient.hgetall(`${pg.options?.database}:migration-hashes`).then(obj => Object.keys(obj)) : {};
 
     if (hashes.includes(hash) && !config.disableCache) {
         console.log(filename, 'skip equal hash', Date.now() - start);
@@ -41,7 +41,7 @@ export default async function execSql(filepath, pg = pgClients.client) {
     try {
         console.log(filename, 'start', Date.now() - start);
         await pg.query(sql);
-        if (!config.disableCache) await rclient.hset(`${pg.options?.database}:migration-hashes`, hash, 1);
+        if (!config.disableCache && config.redis) await rclient.hset(`${pg.options?.database}:migration-hashes`, hash, 1);
         console.log(filename, 'finish', Date.now() - start);
         logger.file('migration/success', {
             filepath,

package/server/plugins/pg/funcs/init.js

@@ -83,13 +83,13 @@ async function init(client) {
 
     // CRUD table state
     const keyCacheTable = `pg:${table}:crud`;
-    const crudInc = table ? await rclient.get(keyCacheTable) || 0 : 0;
+    const crudInc = table && config.redis ? (await rclient.get(keyCacheTable) || 0) : 0;
 
     //
     const hash = createHash('sha1').update([q, JSON.stringify(args)].join()).digest('base64');
     const keyCache = `pg:${hash}:${crudInc}`;
 
-    const cacheData = await rclient.get(keyCache);
+    const cacheData = config.redis ? await rclient.get(keyCache) : null;
 
     if (cacheData && !config.local) {
       // console.log('from cache', table, query);
@@ -98,7 +98,7 @@ async function init(client) {
 
     const data = await query(q, args || []);
 
-    if (seconds > 0) {
+    if (seconds > 0 && config.redis) {
       rclient.set(keyCache, JSON.stringify(data), 'EX', seconds);
     }
 

package/server/routes/dblist/controllers/readItems.js

@@ -1,4 +1,4 @@
-import { dblist, getRedis } from '../../../../utils.js';
+import { config, dblist, getRedis } from '../../../../utils.js';
 
 import formatData from '../utils/formatData.js';
 
@@ -12,10 +12,17 @@ export default async function readItemList(req) {
     || '2';
 
   const key = `current-db:${uid}`;
-  const ttl = await rclient.ttl(key);
-  const currentId = await rclient.get(key);
+  const ttl = config.redis ? await rclient.ttl(key) : null;
+  const currentId = config.redis ? await rclient.get(key) : null;
   rclient.setex(key, 60 * 60 * 10000, currentId);
 
   const { originalMaxAge, expires } = req.session?.cookie || {};
-  return { ttl, current: currentId || rows[0]?.id, rows, user: { ...req.user, originalMaxAge, expires, uid }, };
+  return {
+    ttl,
+    current: currentId || rows[0]?.id,
+    rows,
+    user: {
+      ...req.user, originalMaxAge, expires, uid,
+    },
+  };
 }

package/server/routes/dblist/controllers/setItem.js

@@ -1,4 +1,4 @@
-import { dblist, getRedis } from '../../../../utils.js';
+import { config, dblist, getRedis } from '../../../../utils.js';
 
 const rclient = getRedis();
 
@@ -19,7 +19,7 @@ export default async function setItem(req) {
     || req.session?.passport?.user?.username // login passwd
     || '2';
 
-  await rclient.setex(`current-db:${uid}`, 60 * 60 * 10000, id);
+  if (config.redis) { await rclient.setex(`current-db:${uid}`, 60 * 60 * 10000, id); }
 
   return { current: id };
 }