@opengis/fastify-table 1.4.38 → 1.4.40

package/server/helpers/utils/button.js

@@ -1,6 +1,6 @@
-
-
-export default function button(token, title) {
-    return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
-    class="inline-flex items-center px-2 py-1 text-sm font-medium text-white duration-300 bg-blue-600 border border-transparent rounded-lg gap-x-2 hover:bg-blue-700 hover:text-white">${title || 'Редагувати'}</button>`;
+
+
+export default function button(token, title) {
+    return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
+    class="inline-flex items-center px-2 py-1 text-sm font-medium text-white duration-300 bg-blue-600 border border-transparent rounded-lg gap-x-2 hover:bg-blue-700 hover:text-white">${title || 'Редагувати'}</button>`;
 }

package/server/helpers/utils/mdToHTML.js

@@ -1,17 +1,17 @@
-import md from 'markdown-it';
-
-const md1 = md({ html: true });
-
-/**
- * Перетворення з файла readme.md до формату HTML.
- * Потрабно вставити в хелпер шлях до файла або текст readme.md і за допомогою бібліотеки markdown-it перетвориться в HTML.
-
- * @returns {String} Returns HTML
-*/
-export default function mdToHTML(data, options) {
-  // auto detect HTML or MD
-  // const result = md().render(data);
-  if (!data) return 'empty data';
-  const result = md1.render(data);
-  return result;
-};
+import md from 'markdown-it';
+
+const md1 = md({ html: true });
+
+/**
+ * Перетворення з файла readme.md до формату HTML.
+ * Потрабно вставити в хелпер шлях до файла або текст readme.md і за допомогою бібліотеки markdown-it перетвориться в HTML.
+
+ * @returns {String} Returns HTML
+*/
+export default function mdToHTML(data, options) {
+  // auto detect HTML or MD
+  // const result = md().render(data);
+  if (!data) return 'empty data';
+  const result = md1.render(data);
+  return result;
+};

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

@@ -1,52 +1,52 @@
-import config from '../../../../config.js';
-
-import logger from '../../logger/getLogger.js';
-import pgClients from '../../pg/pgClients.js';
-
-import cronList from '../cronList.js';
-import runCron from './runCron.js';
-import interval2ms from './interval2ms.js';
-
-/**
- * interval:
- * -   02:54 - every day
- * -    2:03 - every day
- * -   *1:43 - 2 times a day
- * -  *12:03 - 2 times a day
- * -   **:54 - every hour
- * -   **:*3 - every 10 minutes
- * -      60 - every minute
- * - 10 * 60 - every 10 minutes
- */
-
-export default async function addCron(func, interval, pg = pgClients.client) {
-  const { time = {}, disabled = [] } = config.cron || {};
-
-  const name = func.name || func.toString().split('/').at(-1).split('\'')[0];
-
-  // if (!config.isServer) return;
-
-  if (disabled.includes(name)) {
-    logger.file('cron', { name, message: 'cron disabled' });
-    return;
-  }
-
-  cronList[name] = func;
-
-  const userInterval = time[name] || interval;
-  const [waitMs, intervalMs] = interval2ms[typeof interval](userInterval);
-
-  if (intervalMs < 1000) {
-    logger.file('cron', { name, error: `interval ${interval} too small` });
-    return;
-  }
-
-  // setTimeout to w8 for the time to start
-  setTimeout(() => {
-    runCron({ pg, func, name });
-    // interval
-    setInterval(() => {
-      runCron({ pg, func, name });
-    }, intervalMs);
-  }, waitMs);
-}
+import config from '../../../../config.js';
+
+import logger from '../../logger/getLogger.js';
+import pgClients from '../../pg/pgClients.js';
+
+import cronList from '../cronList.js';
+import runCron from './runCron.js';
+import interval2ms from './interval2ms.js';
+
+/**
+ * interval:
+ * -   02:54 - every day
+ * -    2:03 - every day
+ * -   *1:43 - 2 times a day
+ * -  *12:03 - 2 times a day
+ * -   **:54 - every hour
+ * -   **:*3 - every 10 minutes
+ * -      60 - every minute
+ * - 10 * 60 - every 10 minutes
+ */
+
+export default async function addCron(func, interval, pg = pgClients.client) {
+  const { time = {}, disabled = [] } = config.cron || {};
+
+  const name = func.name || func.toString().split('/').at(-1).split('\'')[0];
+
+  // if (!config.isServer) return;
+
+  if (disabled.includes(name)) {
+    logger.file('cron', { name, message: 'cron disabled' });
+    return;
+  }
+
+  cronList[name] = func;
+
+  const userInterval = time[name] || interval;
+  const [waitMs, intervalMs] = interval2ms[typeof interval](userInterval);
+
+  if (intervalMs < 1000) {
+    logger.file('cron', { name, error: `interval ${interval} too small` });
+    return;
+  }
+
+  // setTimeout to w8 for the time to start
+  setTimeout(() => {
+    runCron({ pg, func, name });
+    // interval
+    setInterval(() => {
+      runCron({ pg, func, name });
+    }, intervalMs);
+  }, waitMs);
+}

package/server/plugins/cron/index.js

@@ -1,76 +1,76 @@
-import { createHash } from 'node:crypto';
-
-import config from '../../../config.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';
-
-const rclient = getRedis();
-
-async function runCron({
-    pg = pgClients.client, query, name,
-}) {
-    const db = pg?.options?.database;
-
-    // verifyUnique
-    const key = `cron:unique:${name}`;
-    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;
-    }
-
-    if (config.redis) {
-        await rclient.expire(key, 20);
-    }
-
-    try {
-        if (!pg.pk && config.pg) { await pg.init(); }
-
-        if (config.trace) console.time(`${db}:${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 } });
-    }
-    catch (err) {
-        if (config.trace) console.error(name, err.toString());
-        logger.file('cron/error', { db, name, error: err.toString() });
-        logger.error(err);
-    }
-}
-
-async function plugin(fastify) {
-    if (config.cronList?.length) {
-        config.cronList?.filter?.(el => el.query && !el.disabled)?.forEach?.((el, idx) => {
-            const { interval, db, query } = el;
-            const name = createHash('md5').update(`${config.port || 3000}:${db}:${query}`).digest('hex');
-            const pg = getPG(db);
-
-            if (config.trace) console.log('cron-list: init', db, idx);
-
-            const [waitMs, intervalMs] = interval2ms[typeof interval](interval);
-
-            if (intervalMs < 1000) {
-                if (config.trace) console.error('cron-list: skip too small interval', db, idx);
-                logger.file('cron', { name, error: `interval ${interval} too small` });
-                return;
-            }
-
-            // setTimeout to w8 for the time to start
-            setTimeout(() => {
-                runCron({ pg, query, name });
-                // interval
-                setInterval(() => {
-                    runCron({ pg, query, name });
-                }, intervalMs);
-            }, waitMs);
-        });
-    }
-}
-export default plugin;
+import { createHash } from 'node:crypto';
+
+import config from '../../../config.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';
+
+const rclient = getRedis();
+
+async function runCron({
+    pg = pgClients.client, query, name,
+}) {
+    const db = pg?.options?.database;
+
+    // verifyUnique
+    const key = `cron:unique:${name}`;
+    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;
+    }
+
+    if (config.redis) {
+        await rclient.expire(key, 20);
+    }
+
+    try {
+        if (!pg.pk && config.pg) { await pg.init(); }
+
+        if (config.trace) console.time(`${db}:${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 } });
+    }
+    catch (err) {
+        if (config.trace) console.error(name, err.toString());
+        logger.file('cron/error', { db, name, error: err.toString() });
+        logger.error(err);
+    }
+}
+
+async function plugin(fastify) {
+    if (config.cronList?.length) {
+        config.cronList?.filter?.(el => el.query && !el.disabled)?.forEach?.((el, idx) => {
+            const { interval, db, query } = el;
+            const name = createHash('md5').update(`${config.port || 3000}:${db}:${query}`).digest('hex');
+            const pg = getPG(db);
+
+            if (config.trace) console.log('cron-list: init', db, idx);
+
+            const [waitMs, intervalMs] = interval2ms[typeof interval](interval);
+
+            if (intervalMs < 1000) {
+                if (config.trace) console.error('cron-list: skip too small interval', db, idx);
+                logger.file('cron', { name, error: `interval ${interval} too small` });
+                return;
+            }
+
+            // setTimeout to w8 for the time to start
+            setTimeout(() => {
+                runCron({ pg, query, name });
+                // interval
+                setInterval(() => {
+                    runCron({ pg, query, name });
+                }, intervalMs);
+            }, waitMs);
+        });
+    }
+}
+export default plugin;

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

@@ -24,11 +24,11 @@ export default async function dataDelete({
     pg.pk = pgClients.client?.pk;
   }
 
-  const table = table1.replace(/"/g, '');
+  const table = pg.pk[table1] ? table1 : table1.replace(/"/g, '');
 
   const { pk } = await getMeta({ pg, table });
 
-  if (!pg.tlist?.includes(table1)) return 'table not exist';
+  if (!pg.tlist?.includes(table)) return 'table not exist';
 
   const delQuery = `delete from ${table} WHERE ${pk}::text = $1::text returning *`;
 

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

@@ -60,7 +60,7 @@ export default async function dataInsert({
     }
     const res = await client.query(insertQuery, args).then(el => el || {});
 
-    const id1 = res.rows?.[0]?.[pg.pk[table1]];
+    const id1 = res.rows?.[0]?.[pg.pk[table]];
 
     if (!id1) return null;
 

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

@@ -1,14 +1,14 @@
-import config from '../../../../config.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-const rclient = getRedis({ db: 0 });
-
-export default async function getOpt(token, uid = 0) {
-  if (!config.redis) return null;
-
-  const key = `opt:${uid}:${token}`;
-  // console.log(key);
-  const data = await rclient.get(key);
-  if (!data) return null;
-  return JSON.parse(data);
-}
+import config from '../../../../config.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+const rclient = getRedis({ db: 0 });
+
+export default async function getOpt(token, uid = 0) {
+  if (!config.redis) return null;
+
+  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';
-
-import config from '../../../../config.js';
-import getRedis from '../../redis/funcs/getRedis.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}`;
-
-  rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
-  return token;
-}
+import { createHash, randomUUID } from 'crypto';
+
+import config from '../../../../config.js';
+import getRedis from '../../redis/funcs/getRedis.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}`;
+
+  rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
+  return token;
+}

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

@@ -1,43 +1,43 @@
-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,
-}) {
-  if (!config.redis) return null;
-  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,
+}) {
+  if (!config.redis) return null;
+  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,11 +1,11 @@
-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 dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params
-  const filepath = path.posix.join(types[type] || `/data/local/${dbname || ''}`, 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 dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params
+  const filepath = path.posix.join(types[type] || `/data/local/${dbname || ''}`, req.folder || config.folder || '');
+  return filepath;
+}

package/server/plugins/crud/index.js

@@ -1,23 +1,23 @@
-// 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 getAccessFunc from './funcs/getAccess.js';
-
-async function plugin(fastify) {
-  // fastify.decorate('setOpt', setOpt);
-  // fastify.decorate('getOpt', getOpt);
-
-  // fastify.decorate('dataUpdate', dataUpdate);
-  // fastify.decorate('dataInsert', dataInsert);
-
-  // fastify.decorate('getAccess', getAccessFunc);
-
-  // fastify.decorate('isFileExists', isFileExists);
-}
-
-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 getAccessFunc from './funcs/getAccess.js';
+
+async function plugin(fastify) {
+  // fastify.decorate('setOpt', setOpt);
+  // fastify.decorate('getOpt', getOpt);
+
+  // fastify.decorate('dataUpdate', dataUpdate);
+  // fastify.decorate('dataInsert', dataInsert);
+
+  // fastify.decorate('getAccess', getAccessFunc);
+
+  // fastify.decorate('isFileExists', isFileExists);
+}
+
+export default plugin;

package/server/plugins/file/uploadMultiPart.js

@@ -51,11 +51,16 @@ export default async function uploadMultiPart(req, { subdir, originalFilename =
   }[req.routeOptions?.url || ''] || all;
 
   const parts = req.parts();
-  const part = await parts.next();
+  // const part = await parts.next();
+  const { value: part, done } = await parts.next();
 
-  const value = part?.value?.fields?.file || part?.value;
+  if (done) {
+    return null;
+  }
+
+  const value = part?.fields?.file || part;
 
-  if (!value?.filename) {
+  if (!value?.file || !value?.filename) {
     throw new Error('upload error');
   }
 
@@ -66,13 +71,18 @@ export default async function uploadMultiPart(req, { subdir, originalFilename =
     throw new Error('file extension is not allowed');
   }
 
-  const buffer = await value.toBuffer();
+  const buffer = await new Promise((res, rej) => {
+    const chunks = [];
+    part.file.on('data', chunk => chunks.push(chunk));
+    part.file.on('end', () => res(Buffer.concat(chunks)));
+    part.file.on('error', rej);
+  });
 
   if (!buffer?.length) {
     throw new Error('file buffer is empty');
   }
 
-  const dir = req.params?.['*'] || subdir || 'uploads';
+  const dir = subdir != null ? subdir : (req.params?.['*'] || 'uploads');
   const yearMonthDay = subdir != null ? '' : (new Date()).toISOString().split('T')[0];
 
   const dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params

package/server/plugins/hook/index.js

@@ -1,8 +1,8 @@
-import addHook from './funcs/addHook.js';
-import applyHook from './funcs/applyHook.js';
-
-async function plugin(fastify) {
-//   fastify.decorate('addHook', addHook);
-//   fastify.decorate('applyHook', applyHook);
-}
-export default plugin;
+import addHook from './funcs/addHook.js';
+import applyHook from './funcs/applyHook.js';
+
+async function plugin(fastify) {
+//   fastify.decorate('addHook', addHook);
+//   fastify.decorate('applyHook', applyHook);
+}
+export default plugin;