@opengis/fastify-table 1.4.82 → 1.4.84

package/index.js

@@ -9,6 +9,7 @@ import proxy from '@fastify/http-proxy';
 import config from './config.js';
 
 const { maxFileSize = 512 } = config;
+const { name: execName } = path.parse(process.argv0);
 
 // helpers
 // import helperPlugin from './server/helpers/index.js';
@@ -117,15 +118,35 @@ async function plugin(fastify, opt) {
   }
 
   config.proxy?.forEach?.(el => {
-    fastify.register(proxy, {
-      upstream: el.target,
-      prefix: el.source,
-      http2: false,
-      preHandler: async (req) => {
-        req.headers.uid = req.session?.passport?.user?.uid;
-        Object.keys(el.headers || {})?.forEach(item => req.headers[item] = el.headers[item]);
-      },
-    });
+    if (execName === 'bun') {
+      fastify.all(`${el.source}/*`, async (req, reply) => {
+        const url = el.target.replace(/\/$/, '') + req.raw.url.replace(new RegExp(`^${el.source}`), '');
+        const res = await fetch(url, {
+          method: req.method,
+          headers: {
+            // ...req.headers,
+            uid: req.user?.uid,
+            ...(el.headers || {}),
+          },
+          body: ['PUT', 'POST'].includes(req.method) ? req.raw : undefined,
+        });
+        const resp = res.headers.get('content-type')?.includes('/json') ? await res.json() : await res.text();
+        reply.headers(Object.fromEntries(res.headers));
+        reply.status(res.status);
+        reply.send(resp);
+      });
+    }
+    else {
+      fastify.register(proxy, {
+        upstream: el.target,
+        prefix: el.source,
+        http2: false,
+        preHandler: async (req) => {
+          req.headers.uid = req.session?.passport?.user?.uid;
+          Object.keys(el.headers || {})?.forEach(item => req.headers[item] = el.headers[item]);
+        },
+      });
+    }
   });
 
   if (config.dblist) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.82",
+  "version": "1.4.84",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -61,4 +61,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

package/server/helpers/core/token.js

@@ -1,18 +1,18 @@
-import setToken from '../../plugins/crud/funcs/setToken.js';
-
-export default function tokenFunc(params) {
-    const { data, hash } = params;
-
-    if (!data?.root?.user?.uid && !hash.uid) return '-';
-    if (!hash || typeof hash !== 'object') return '-';
-
-    // const id = hash?.edit ? hash?.id : data?.root?.id;
-    // console.log(hash)
-    const [token] = setToken({
-        ids: [JSON.stringify(hash)],
-
-        uid: data?.root?.user?.uid || hash.uid,
-        array: 1,
-    });
-    return token;
-}
+import setToken from '../../plugins/crud/funcs/setToken.js';
+
+export default function tokenFunc(params) {
+    const { data, hash } = params;
+
+    if (!data?.root?.user?.uid && !hash.uid) return '-';
+    if (!hash || typeof hash !== 'object') return '-';
+
+    // const id = hash?.edit ? hash?.id : data?.root?.id;
+    // console.log(hash)
+    const [token] = setToken({
+        ids: [JSON.stringify(hash)],
+
+        uid: data?.root?.user?.uid || hash.uid,
+        array: 1,
+    });
+    return token;
+}

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/crud/funcs/dataDelete.js

@@ -11,7 +11,7 @@ import logger from '../../logger/getLogger.js';
 const rclient = getRedis();
 
 export default async function dataDelete({
-  table: table1, tokenData, referer, id, pg: pg1, uid,
+  table: table1, tokenData, referer, id, pg: pg1, uid, query = 'true',
 }) {
   const pg = pg1 || getPG({ name: 'client' });
 
@@ -30,7 +30,7 @@ export default async function dataDelete({
 
   const { pk } = await getMeta({ pg, table });
 
-  const delQuery = `delete from ${table} WHERE ${pk}::text = $1::text returning *`;
+  const delQuery = `delete from ${table} WHERE ${pk}::text = $1::text and ${query} returning *`;
 
   // for transactions
   const isClient = typeof pg.query === 'function' && typeof pg.release === 'function';

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/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/logger/errorStatus.js

@@ -1,19 +1,19 @@
-import applyHookSync from '../hook/funcs/applyHookSync.js';
-
-function errorStatus(error) {
-  const hook = applyHookSync('errorStatus', error);
-  if (hook) return hook;
-
-  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
-    return 601;
-  }
-  if (error.routine === 'ExecConstraints') {
-    return 602;
-  }
-  if (error.type === 'DatabaseError') {
-    return 600;
-  }
-
-  return 500;
-}
-export default errorStatus;
+import applyHookSync from '../hook/funcs/applyHookSync.js';
+
+function errorStatus(error) {
+  const hook = applyHookSync('errorStatus', error);
+  if (hook) return hook;
+
+  if (error.routine === 'exec_stmt_raise' && error.file === 'pl_exec.c') {
+    return 601;
+  }
+  if (error.routine === 'ExecConstraints') {
+    return 602;
+  }
+  if (error.type === 'DatabaseError') {
+    return 600;
+  }
+
+  return 500;
+}
+export default errorStatus;

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

@@ -44,8 +44,8 @@ async function init(client) {
   }
 
   async function querySafe(q, param = {}) {
-    const { args, isstream } = param;
-    const data = await query(q, args, isstream);
+    const args = Array.isArray(param) ? param : (param.args || []);
+    const data = await query(q, args, true);
     return data;
   }
 

package/server/plugins/redis/client.js

@@ -1,8 +1,8 @@
-import redisClients from './funcs/redisClients.js';
-import getRedis from './funcs/getRedis.js';
-
-if (!redisClients[0]) {
-  getRedis({ db: 0 });
-}
-
-export default redisClients[0];
+import redisClients from './funcs/redisClients.js';
+import getRedis from './funcs/getRedis.js';
+
+if (!redisClients[0]) {
+  getRedis({ db: 0 });
+}
+
+export default redisClients[0];

package/server/plugins/redis/funcs/redisClients.js

@@ -1,3 +1,3 @@
-const redisClients = {};
-
-export default redisClients;
+const redisClients = {};
+
+export default redisClients;

package/server/plugins/sqlite/funcs/getSqlite.js

@@ -1,6 +1,11 @@
-/* eslint-disable no-console */
+import path from 'node:path';
 
-import Database from 'better-sqlite3';
+const { name: execName } = path.parse(process.argv0);
+
+// import Database from 'better-sqlite3'; // error with bun
+const { default: Database } = execName === 'bun'
+  ? { default: (await import('bun:sqlite')).Database }
+  : await import('better-sqlite3');
 
 import config from '../../../../config.js';
 import sqliteClients from '../sqliteClients.js';
@@ -25,7 +30,7 @@ function getSqliteAsync({
     verbose: config.trace ? console.log : undefined,
   };
 
-  sqliteClients.client = new Database(name || ':memory:', dbConfig);
+  sqliteClients.client = new Database(name || ':memory:', execName === 'bun' ? undefined : dbConfig);
   init(sqliteClients.client);
 
   return sqliteClients.client;

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

@@ -47,7 +47,7 @@ function init(client) {
     tlist,
   });
 
-  console.log('db connected', client.name || ':memory:');
+  console.log('sqlite db connected', client.name || ':memory:');
 }
 
 export default init;

package/server/plugins/sqlite/sqliteClients.js

@@ -1,6 +1,11 @@
-/* eslint-disable no-console */
+import path from 'node:path';
 
-import Database from 'better-sqlite3';
+const { name: execName } = path.parse(process.argv0);
+
+// import Database from 'better-sqlite3';
+const { default: Database } = execName === 'bun'
+  ? { default: (await import('bun:sqlite')).Database }
+  : await import('better-sqlite3');
 
 import config from '../../../config.js';
 import init from './funcs/init.js';
@@ -8,7 +13,7 @@ import init from './funcs/init.js';
 const sqliteClients = {};
 
 if (config.sqlite) {
-  const client = new Database(config.sqlite?.name || ':memory:', {
+  const client = new Database(config.sqlite?.name || ':memory:', execName === 'bun' ? undefined : {
     readonly: config.sqlite?.readonly || false,
     fileMustExist: config.sqlite?.fileMustExist || false,
     timeout: config.sqlite?.statement_timeout || 10000,

package/server/plugins/table/funcs/getFilterSQL/util/getCustomQuery.js

@@ -1,13 +1,13 @@
-async function getCustomQuery({
-  pg, table, customFilter,
-}) {
-  if (!customFilter) return null;
-  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
-  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
-  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
-  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
-  const customQuery = data?.map((el) => el.query).join(' and ');
-  return `${customQuery}`;
-}
-
-export default getCustomQuery;
+async function getCustomQuery({
+  pg, table, customFilter,
+}) {
+  if (!customFilter) return null;
+  const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
+  const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
+  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
+  const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
+  const customQuery = data?.map((el) => el.query).join(' and ');
+  return `${customQuery}`;
+}
+
+export default getCustomQuery;

package/server/plugins/table/funcs/getFilterSQL/util/getTableSql.js

@@ -1,34 +1,34 @@
-function getTable(table) {
-  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    ?.map((el) => el.split(/[ )]/)[0]);
-  return result;
-}
-
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
-const tableSql = {};
-async function getTableSql({
-  pg, body, table, fields,
-}) {
-  if (tableSql[table]) return tableSql[table];
-
-  const fieldList = fields.map((el) => el.name);
-
-  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
-
-  if (!tableList) { tableSql[table] = []; return []; }
-
-  const data = await Promise.all(tableList?.map(async (tableEl) => {
-    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
-    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
-  }));
-
-  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
-
-  return tableSql[table];
-}
-
-export default getTableSql;
+function getTable(table) {
+  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+    ?.map((el) => el.split(/[ )]/)[0]);
+  return result;
+}
+
+/**
+* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
+* @param {String} opt.query - запит до таблиці
+* @param {String} opt.hash - інформація з хешу по запиту
+*/
+const tableSql = {};
+async function getTableSql({
+  pg, body, table, fields,
+}) {
+  if (tableSql[table]) return tableSql[table];
+
+  const fieldList = fields.map((el) => el.name);
+
+  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
+
+  if (!tableList) { tableSql[table] = []; return []; }
+
+  const data = await Promise.all(tableList?.map(async (tableEl) => {
+    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`);
+    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
+  }));
+
+  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
+
+  return tableSql[table];
+}
+
+export default getTableSql;

package/server/plugins/table/funcs/getTemplates.js

@@ -1,19 +1,19 @@
-import fs from 'fs';
-import path from 'path';
-
-import config from '../../../../config.js';
-
-const loadTemplate = {};
-
-export default async function getTemplateDir(type) {
-  if (!type) return null;
-
-  const cwd = process.cwd();
-  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
-
-  if (!loadTemplate[type]) {
-    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
-    loadTemplate[type] = typeList;
-  }
-  return loadTemplate[type];
-}
+import fs from 'fs';
+import path from 'path';
+
+import config from '../../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type) {
+  if (!type) return null;
+
+  const cwd = process.cwd();
+  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
+
+  if (!loadTemplate[type]) {
+    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
+    loadTemplate[type] = typeList;
+  }
+  return loadTemplate[type];
+}