@opengis/fastify-table 2.0.106 → 2.0.107

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,MAAM,KAA8D,CAAC;AAoC3E,eAAe,MAAM,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,MAAM,KAA8D,CAAC;AAqC3E,eAAe,MAAM,CAAC"}

package/dist/script/adduser

@@ -0,0 +1,15 @@
+#!/bin/bash
+rootDir=`echo $(dirname "$0")`
+echo "$rootDir/passwd"
+
+if [ -e "$rootDir/../passwd" ]
+then
+    password=`echo -n "$2" | sha1sum | awk '{print $1}'`
+    echo "$1:$password"
+    echo "$1:$password" >> "$rootDir/../passwd"
+else
+    > passwd
+    password=`echo -n "$2" | sha1sum | awk '{print $1}'`
+    echo "$1:$password"
+    echo "$1:$password" > "$rootDir/../passwd"
+fi

package/dist/script/dump.js

@@ -0,0 +1,176 @@
+// Вигрузка схеми бд
+// Usage examples:
+// bun .\script\dump.js --table=bpmn.tasks
+// bun .\script\dump.js --schema=bpmn
+
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { mkdir, writeFile, rm, rmdir, stat } from 'node:fs/promises';
+
+import { config, handlebars, pgClients, getTemplate } from '../utils.js';
+
+import { build, teardown } from '../helper.js';
+
+const app = build();
+app.addHook('onClose', async () => teardown());
+dumpMigrateSQL();
+// app.close();
+
+const debug = false;
+
+export default async function dumpMigrateSQL() {
+    try {
+        // const { database, host, port, user, password } = config.pg;
+
+        if (!config.pg) {
+            console.error('empty config.pg, skip...');
+            return null;
+        }
+
+        if (!Bun.argv[2]) {
+            console.error('missing schema / table name, skip...');
+        }
+
+        const [key, value] = Bun.argv[2].substring(2).split('=');
+        const tableName = key === 'table' ? value : null;
+        const schemaName = key === 'schema' ? value : value.split('.').shift();
+
+        const pg = pgClients.client;
+        // const pg = await getPGAsync({ database, host, port, user, password });
+        await pg.query(`select 1`);
+
+        const schemaExists = await pg.query(`SELECT 1 FROM information_schema.schemata WHERE schema_name = $1`, [schemaName]).then(el => el.rowCount);
+
+        if (!schemaExists) {
+            console.error('Вказаної схеми не існує', config.pg?.database);
+            return null;
+        }
+
+        // if (tableName && !pg.pk?.[tableName]) {
+        //     console.error('Вказаної таблиці не існує', config.pg?.database);
+        //     return null;
+        // }
+
+        const dump = await schemaItem({
+            pg,
+            table: tableName,
+            schema: schemaName,
+            debug,
+            is_erd: false
+        });
+
+        if (debug) {
+            console.log(dump);
+            return null;
+        }
+
+        const filepath = await saveFile(dump, tableName || schemaName);
+        console.log('sucess', filepath);
+    } catch (err) {
+        console.error(err);
+    } finally {
+        app.close();
+    }
+}
+
+async function saveFile(data, filename) {
+    if (!data) throw new Error(`no data - ${filename}`);
+
+    const filepath = path.join('log/dump', `${filename}.sql`);
+    const fileExists = existsSync(filepath);
+
+    // overwrite old file
+    if (fileExists) {
+        const stats = await stat(filepath);
+        if (stats.isDirectory()) {
+            await rmdir(filepath, { force: true, recursive: true });
+        } else {
+            await rm(filepath)
+        }
+    }
+
+    await mkdir(path.dirname(filepath), { recursive: true });
+    await writeFile(filepath, Buffer.from(data, 'utf-8'));
+
+    return filepath;
+}
+
+async function schemaItem({
+    pg, table, schema, debug
+}) {
+    if (!schema && !table) return new Error('param schema is required');
+
+    const { rows: schemaInfo } = await pg.query(`select c.oid,relname,nspname,obj_description(c.oid) as description,
+    (
+      select json_agg(row_to_json(q))
+      from (
+        select
+          column_name,
+          case 
+            when data_type='USER-DEFINED' AND udt_name='geometry' THEN 'geometry' 
+            when data_type='ARRAY' AND udt_name='_text'  THEN 'text[]' 
+            when data_type='ARRAY' AND udt_name='_int4'  THEN 'integer[]' 
+            else data_type 
+          end as data_type,
+          ordinal_position,
+          column_default,
+          is_nullable,
+          case 
+            when column_name='uid' then 'ідентифікатор автора запису в БД'
+            when column_name='cdate' then 'Дата створення запису в БД'
+            when column_name='editor_id' then 'Ідентифікатор автора, який останій вніс зміни в запис'
+            when column_name='editor_date' then 'Час останії зміни в записі'
+            when column_name='files' then 'Системна колонка'
+            when column_name='doc_status' then 'Статус документа'
+            when column_name='reg_status' then 'Статус реєстрації'
+            when column_name='obj_version' then 'Версія запису'
+          else col_description(a.attrelid,ordinal_position) 
+          end as description
+        from information_schema.columns col
+        LEFT JOIN pg_attribute a ON col.column_name=a.attname and c.oid = a.attrelid
+        where col.table_schema=nspname and col.table_name=relname
+      )q
+    ) as columns
+    from pg_class c
+    LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
+    where ${table ? `nspname||'.'||relname='${table}'` : `'${schema}'=nspname`} and relam=2
+    order by nspname,relname`);
+
+    if (!schemaInfo?.length) throw new Error('invalid params');
+
+    const { rows: constraints } = await pg.query(`select con.conrelid::regclass as constraint_table, a.column_name,
+    con.conname as constraint_name,contype as constraint_type, con.confrelid::regclass as foreign_table, 
+    con.confupdtype, con.confdeltype, con.confmatchtype, u.column_name as foreign_column from pg_constraint con
+    left join pg_class c ON c.oid = con.conrelid              
+    left join pg_namespace n ON n.oid = c.relnamespace
+    left join lateral (
+      select string_agg(a.attname,',') as column_name from pg_attribute a 
+        where con.conrelid = a.attrelid and a.attnum = any(con.conkey) limit 1
+    )a on 1=1
+    left join lateral (
+      select column_name from information_schema.constraint_column_usage u 
+        where conname=u.constraint_name limit 1
+    )u on 1=1
+    where ${table ? `conrelid::regclass::text = '${table}'` : `nspname = '${schema}'`}`);
+
+    // add table constraints, mermaid
+    schemaInfo?.forEach((row) => {
+        // constraint type to column
+        row?.columns?.forEach((col) => {
+            const { constraint_type } = constraints?.find((con) => con?.column_name === col?.column_name && con.constraint_table === `${row.nspname}.${row.relname}`) || {};
+            Object.assign(col, { constraint_type });
+        });
+
+        // table relations
+        const tableConstraints = constraints?.filter((el) => el?.constraint_table === `${row.nspname}.${row.relname}`);
+        Object.assign(row, { constraints: tableConstraints });
+    });
+
+    if (debug) return schemaInfo;
+
+    const body = await getTemplate('pt', 'schemaItem.pt');
+
+    const schemaContent = await handlebars.compile(body?.hbs || 'template not found: schemaItem.pt')({ nspname: schema, rows: schemaInfo, constraints });
+
+    return schemaContent.replace(/'/g, "'");
+}

package/dist/script/migrate.js

@@ -0,0 +1,25 @@
+import Fastify from 'fastify';
+
+import config from '../config.js';
+import plugin from '../index.js';
+
+const timeoutMs = +(config.migrationTimeout || 5000);
+
+process.env.PORT = process.env.PORT || config.port || 3000;
+
+const app = Fastify();
+
+app.register(plugin, config);
+
+app.listen({ host: '0.0.0.0', port: process.env.PORT }, (err) => {
+    console.log(`Server started via port: ${process.env.PORT}`);
+    setTimeout(() => {
+        console.log('Server closed after timeout', timeoutMs);
+        app.close();
+        process.exit(0);
+    }, timeoutMs);
+    if (err) {
+        console.error('migrations error', err.toString());
+        process.exit(1);
+    }
+});

package/dist/server/plugins/auth/funcs/verifyPassword.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verifyPassword.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/verifyPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWpD,wBAA8B,cAAc,CAAC,EAC3C,EAAE,EACF,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;;;;;;eA+BA"}
+{"version":3,"file":"verifyPassword.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/verifyPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWpD,wBAA8B,cAAc,CAAC,EAC3C,EAAE,EACF,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;;;;;;eAiCA"}

package/dist/server/plugins/auth/funcs/verifyPassword.js

@@ -12,7 +12,9 @@ export default async function verifyPassword({ pg, username, password, }) {
     if (!password || password === "")
         return { message: "not enough params: password" };
     const query = "select * from admin.users where $1 in (login,email,phone) and enabled limit 1";
-    const json = await pg.query(query, [username]).then((res) => res.rows[0]);
+    const json = await pg
+        .query(query, [username])
+        .then((el) => el.rows?.[0] || {});
     if (!json)
         return { message: "user not found" };
     let hash = "";

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

@@ -103,7 +103,7 @@ export default async function dataInsert({ id, table: table1, referer, data, pg:
             uid,
             type: "INSERT",
         });
-        if (config.redis) {
+        if (config.redis && rclient?.status !== "end") {
             rclient.incr(`pg:${table}:crud`);
         }
         if (!isClient) {

package/dist/server/plugins/crud/funcs/dataUpdate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataUpdate.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataUpdate.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAepD,wBAA8B,UAAU,CAAC,EACvC,KAAK,EACL,SAAS,EACT,OAAO,EACP,EAAE,EACF,IAAI,EACJ,EAAE,EAAE,GAAG,EACP,GAAG,GACJ,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,gBA4OA"}
+{"version":3,"file":"dataUpdate.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataUpdate.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAepD,wBAA8B,UAAU,CAAC,EACvC,KAAK,EACL,SAAS,EACT,OAAO,EACP,EAAE,EACF,IAAI,EACJ,EAAE,EAAE,GAAG,EACP,GAAG,GACJ,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,gBAkPA"}

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

@@ -20,11 +20,13 @@ function assignValue(key, i, srid = 4326, columnType = "text") {
     return `"${key}"=$${i + 2}`;
 }
 export default async function dataUpdate({ table, tokenData, referer, id, data, pg: pg1, uid, }) {
-    if (!data || !table || !id)
+    if (!data || !table || !id) {
         return null;
+    }
     const pg = pg1 || getPG({ name: "client" });
-    if (!pg)
+    if (!pg) {
         return null;
+    }
     // pg client single transaction support
     if (!pg?.pk && config.pg) {
         pg.options = pgClients.client?.options;
@@ -34,8 +36,9 @@ export default async function dataUpdate({ table, tokenData, referer, id, data,
         pg.pk = pgClients.client?.pk;
     }
     const { columns, pk } = await getMeta({ pg, table });
-    if (!columns)
+    if (!columns) {
         return null;
+    }
     const names = columns.map((el) => el.name);
     const types = columns.reduce((acc, { name, dataTypeID }) => ({
         ...acc,
@@ -167,7 +170,7 @@ export default async function dataUpdate({ table, tokenData, referer, id, data,
             uid,
             type: "UPDATE",
         });
-        if (config.redis) {
+        if (config.redis && rclient?.status !== "end") {
             rclient.incr(`pg:${table}:crud`);
         }
         if (!isClient) {

package/dist/server/plugins/logger/getLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getLogger.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/getLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,UAAU,cAAe,SAAQ,IAAI,CAAC,MAAM;IAC1C,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5D;AAgDD,QAAA,MAAM,MAAM,EAAE,cAAgD,CAAC;AA+B/D,eAAe,MAAM,CAAC"}
+{"version":3,"file":"getLogger.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/getLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,UAAU,cAAe,SAAQ,IAAI,CAAC,MAAM;IAC1C,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5D;AAmDD,QAAA,MAAM,MAAM,EAAE,cAAgD,CAAC;AA+B/D,eAAe,MAAM,CAAC"}

package/dist/server/plugins/logger/getLogger.js

@@ -9,16 +9,19 @@ import timestampWithTimeZone from "./timestampWithTimeZone.js";
 const isServer = process.argv[2];
 const level = process.env.LOG_LEVEL || "info";
 console.log(`log level: ${level}`);
-const targets = [
-    {
-        target: "./createFileStream.js", // path.resolve('utils/createFileStream.js')
-    },
-    {
-        level: "error",
-        target: "pino/file",
-        options: { destination: 1 },
-    },
-];
+// skip logging during npx vitest run
+const targets = process.env.VITEST
+    ? []
+    : [
+        {
+            target: "./createFileStream.js", // path.resolve('utils/createFileStream.js')
+        },
+        {
+            level: "error",
+            target: "pino/file",
+            options: { destination: 1 },
+        },
+    ];
 // push trace logs to console (those would not be saved to file)
 if (["trace", "debug"].includes(level)) {
     targets.push({

package/dist/server/plugins/logger/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAsC7E,iBAAe,MAAM,CAAC,OAAO,EAAE,eAAe,iBAwC7C;AACD,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAyC7E,iBAAe,MAAM,CAAC,OAAO,EAAE,eAAe,iBAwC7C;AACD,eAAe,MAAM,CAAC"}

package/dist/server/plugins/logger/index.js

@@ -21,7 +21,8 @@ process.on("unhandledRejection", (err) => {
         console.warn("Ignored pg connection timeout / close:", err.toString());
         return;
     }
-    if (err.message === "Connection is closed.") {
+    if (err.message === "Connection is closed." ||
+        err.message.includes("maxRetriesPerRequest")) {
         logger.file("redis", { error: err.message });
         console.warn("Ignored redis connection close:", err.toString());
         return;

package/dist/server/plugins/pg/funcs/getPG.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPG.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPG.ts"],"names":[],"mappings":"AAQA,iBAAS,KAAK,CAAC,KAAK,GAAE,GAAQ,OAuD7B;AAMD,eAAe,KAAK,CAAC"}
+{"version":3,"file":"getPG.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPG.ts"],"names":[],"mappings":"AAQA,iBAAS,KAAK,CAAC,KAAK,GAAE,GAAQ,OAyD7B;AAMD,eAAe,KAAK,CAAC"}

package/dist/server/plugins/pg/funcs/getPG.js

@@ -5,6 +5,7 @@ import dblist from "../../../../dblist.js";
 import pgClients from "../pgClients.js";
 import getDBParams from "./getDBParams.js";
 function getPG(param = {}) {
+    // console.log("config.pg", config.pg, process.env); // ! process.env.VITEST always in uppercase, debug to properly test via npx vitest run
     if (!config.pg)
         return null;
     const dbListParams = dblist.find((el) => el.key === param?.key) ||

package/dist/server/plugins/pg/funcs/getPGAsync.js

@@ -2,7 +2,7 @@ import init from "./init.js";
 import getPG from "./getPG.js";
 async function getPGAsync(param) {
     const client = getPG(param);
-    const { host, port, database } = client.options || {};
+    const { host, port, database } = client?.options || {};
     if (client && !client.tlist) {
         // force init
         await init(client).catch((err) => console.warn("PG client init error", host, port, database));

package/dist/server/plugins/pg/funcs/init.d.ts

@@ -1,4 +1,4 @@
 import { ExtendedPG } from "../../../types/core.js";
-declare function init(client: ExtendedPG): Promise<void>;
+declare function init(client?: ExtendedPG): Promise<void>;
 export default init;
 //# sourceMappingURL=init.d.ts.map

package/dist/server/plugins/pg/funcs/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,iBAAe,IAAI,CAAC,MAAM,EAAE,UAAU,iBAsMrC;AAGD,eAAe,IAAI,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,iBAAe,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,iBAuNtC;AAGD,eAAe,IAAI,CAAC"}

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

@@ -5,7 +5,17 @@ import getRedis from "../../redis/funcs/getRedis.js";
 import logger from "../../logger/getLogger.js";
 const rclient = getRedis({ db: 0 });
 async function init(client) {
-    if (!client?.options?.database) {
+    if (!client)
+        return;
+    // for unit tests
+    const options = client.options || {
+        database: client.database,
+        user: client.user,
+        password: client.password,
+        port: client.port,
+        host: client.host,
+    };
+    if (!client || !client.query || !client.connect) {
         return;
     }
     const { pgType, pk } = await client
@@ -72,6 +82,8 @@ async function init(client) {
         .then((el) => el.rows || []);
     const relkinds = rows.reduce((acc, curr) => Object.assign(acc, { [curr.tname]: curr.relkind }), {});
     async function query(q, args = []) {
+        if (!client)
+            throw new Error("empty pg client");
         try {
             const data = await client.query(q, args);
             return data;
@@ -86,7 +98,7 @@ async function init(client) {
     }
     async function querySafe(q, param) {
         const pg1 = new pg.Pool({
-            ...client.options,
+            ...options,
             statement_timeout: param?.timeout || 100000000,
         });
         try {
@@ -114,6 +126,8 @@ async function init(client) {
         return result;
     }
     async function queryNotice(q, args, cb = () => { }) {
+        if (!client)
+            throw new Error("empty pg client");
         const clientCb = await client.connect();
         clientCb.on("notice", (e) => {
             cb(e.message);
@@ -159,6 +173,8 @@ async function init(client) {
         return data;
     }
     Object.assign(client, {
+        ...options,
+        options,
         one,
         pgType,
         pk,
@@ -168,11 +184,10 @@ async function init(client) {
         queryNotice,
         querySafe,
     });
-    // client.init = undefined;
-    console.log("New client init finished", client.options?.database);
+    console.log("New client init finished", client.database);
     logger.file("pg", {
         message: "client init finished",
-        database: client.options?.database,
+        database: client.database,
     });
 }
 // export default client;

package/dist/server/plugins/pg/funcs/pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/pool.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;yBAK7B,QAAO,GAAQ;AAA/B,wBAsEE"}
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/pool.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;yBAE7B,QAAO,GAAQ;AAA/B,wBAgEE"}

package/dist/server/plugins/pg/funcs/pool.js

@@ -6,9 +6,8 @@ types.setTypeParser(1114, (stringValue) => stringValue);
 import pgClients from "../pgClients.js";
 import init from "./init.js";
 import config from "../../../../config.js";
+config.ready = config.ready || {};
 export const Pools = {};
-const errored = {};
-const inited = {};
 export default (param = {}) => {
     if (!config.pg)
         return null;
@@ -27,7 +26,7 @@ export default (param = {}) => {
     });
     pool.on("error", (err) => {
         console.warn("Unexpected error on idle client", param.database);
-        errored[param.database] = 1;
+        config.ready[`pg:${param.database}`] = false;
         logger.file("pg", {
             error: err.toString(),
             database: param.database,
@@ -36,14 +35,14 @@ export default (param = {}) => {
             console.warn("Unexpected error on idle client details:", err.toString(), err.stack);
         }
     });
-    pool.on("connect", (client) => {
+    pool.on("connect", () => {
         // skip auto drops and reconnects handled by pg internally
-        if (!inited[param.database] || errored[param.database]) {
+        if (!config.ready[`pg:${param.database}`]) {
             logger.file("pg", {
                 message: "client connected",
                 database: param.database,
             });
-            inited[param.database] = 1;
+            config.ready[`pg:${param.database}`] = true;
         }
         if (config.trace) {
             console.log("PG client connected", param.database);
@@ -52,17 +51,12 @@ export default (param = {}) => {
         if (pgClients[name] && !pgClients[name]?.tlist) {
             init(Pools[name]);
         }
-        Pools[name] = client;
+        Pools[name] = pool;
     });
-    pool.on("acquire", () => {
-        if (config.trace) {
-            console.log("PG client acquired", param.database);
-        }
-    });
-    pool.on("remove", () => {
-        if (config.trace) {
+    if (config.trace) {
+        pool.on("remove", () => {
             console.log("PG Client removed from the pool.", param.database);
-        }
-    });
+        });
+    }
     return pool;
 };

package/dist/server/plugins/pg/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/pg/index.ts"],"names":[],"mappings":"AA+BA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QAwB3B;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/pg/index.ts"],"names":[],"mappings":"AAgCA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QAwB3B;AAED,eAAe,MAAM,CAAC"}

package/dist/server/plugins/pg/index.js

@@ -3,8 +3,9 @@ import pgClients from "./pgClients.js";
 import getPGAsync from "./funcs/getPGAsync.js";
 import logger from "../logger/getLogger.js";
 function close() {
-    Object.keys(pgClients).forEach((el) => {
-        pgClients[el].end();
+    Object.keys(pgClients).forEach((key) => {
+        console.log("Closing pg client", key);
+        pgClients[key].end();
     });
 }
 async function getHeadersPG(req) {

package/dist/server/plugins/redis/funcs/getRedis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRedis.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/redis/funcs/getRedis.ts"],"names":[],"mappings":"AAQA,iBAAS,QAAQ,CACf,EACE,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,WAAkB,EAClB,aAAwB,EACxB,kBAAyB,EACzB,WAAkB,EAClB,cAAqB,EACrB,oBAAwB,GACzB,GAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACnB,OAwCd;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"getRedis.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/redis/funcs/getRedis.ts"],"names":[],"mappings":"AAQA,iBAAS,QAAQ,CACf,EACE,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,WAAmB,EACnB,aAA8D,EAC9D,kBAAyB,EACzB,WAAkB,EAClB,cAAqB,EACrB,oBAAwB,GACzB,GAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACnB,OA6Cd;AAED,eAAe,QAAQ,CAAC"}

package/dist/server/plugins/redis/funcs/getRedis.js

@@ -3,10 +3,15 @@ import config from "../../../../config.js";
 import logger from "../../logger/getLogger.js";
 import redisClients from "./redisClients.js";
 config.ready = config.ready || {};
-function getRedis({ db, host, port, closeClient = true, retryStrategy = () => { }, enableOfflineQueue = true, lazyConnect = true, connectTimeout = 2000, maxRetriesPerRequest = 0, } = { db: 0 }) {
+function getRedis({ db, host, port, closeClient = false, retryStrategy = (times) => Math.min(times * 500, 5000), enableOfflineQueue = true, lazyConnect = true, connectTimeout = 2000, maxRetriesPerRequest = 1, } = { db: 0 }) {
     if (!config.redis && !host)
         return null;
     const key = host || port ? [host, port, db].join("-") : db;
+    // try to reconnect after connection error / disconnect
+    if (redisClients[key]?.status === "end" &&
+        typeof redisClients[key].connect === "function") {
+        redisClients[key].connect();
+    }
     if (redisClients[key]) {
         return redisClients[key];
     }
@@ -30,9 +35,6 @@ function getRedis({ db, host, port, closeClient = true, retryStrategy = () => {
     redisClients[key].on("error", (err) => {
         console.warn("Ignored redis error:", err.message);
         logger.file("redis", { error: err.toString() });
-        if (err.code === "ETIMEDOUT") {
-            // redisClients[key].disconnect();
-        }
     });
     console.log("redis connected", db, host, port);
     return redisClients[key];

package/dist/server/plugins/redis/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/redis/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,SAAS,CAAC;AAQ/C,iBAAe,MAAM,CAAC,OAAO,EAAE,eAAe,iBAE7C;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/redis/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,SAAS,CAAC;AAW/C,iBAAe,MAAM,CAAC,OAAO,EAAE,eAAe,iBAE7C;AAED,eAAe,MAAM,CAAC"}

package/dist/server/plugins/redis/index.js

@@ -1,6 +1,9 @@
 import redisClients from "./funcs/redisClients.js";
 function close() {
-    Object.keys(redisClients).forEach((key) => redisClients[key].quit());
+    Object.keys(redisClients).forEach((key) => {
+        console.log("Closing redis client", key);
+        redisClients[key].quit();
+    });
 }
 async function plugin(fastify) {
     fastify.addHook("onClose", close);

package/dist/server/plugins/sqlite/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/sqlite/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAM1C,iBAAe,QAAQ,CAAC,GAAG,EAAE,eAAe,iBAI3C;;AAED,wBAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/sqlite/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAa1C,iBAAe,QAAQ,CAAC,GAAG,EAAE,eAAe,iBAE3C;;AAED,wBAA4B"}

package/dist/server/plugins/sqlite/index.js

@@ -1,8 +1,12 @@
 import fp from "fastify-plugin";
 import sqliteClients from "./sqliteClients.js";
-async function dbPlugin(app) {
-    app.addHook("onClose", async () => {
-        Object.keys(sqliteClients).forEach((key) => sqliteClients[key].close());
+function close() {
+    Object.keys(sqliteClients).forEach((key) => {
+        console.log("Closing sqlite client", key);
+        sqliteClients[key].close();
     });
 }
+async function dbPlugin(app) {
+    app.addHook("onClose", close);
+}
 export default fp(dbPlugin);

package/dist/server/plugins/table/funcs/getFilter.d.ts

@@ -7,5 +7,5 @@ export default function getFilter({ pg, table, filter, custom, state, search, us
     state?: string;
     search?: string;
     user?: Record<string, any>;
-}, reply: any): Promise<any>;
+}, reply?: any): Promise<any>;
 //# sourceMappingURL=getFilter.d.ts.map

package/dist/server/plugins/table/funcs/getFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFilter.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getFilter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGzD,wBAA8B,SAAS,CACrC,EACE,EAAqB,EACrB,KAAK,EACL,MAAM,EACN,MAAM,EACN,KAAK,EACL,MAAM,EACN,IAAI,GACL,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,EACD,KAAK,EAAE,GAAG,gBAoBX"}
+{"version":3,"file":"getFilter.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getFilter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAmBzD,wBAA8B,SAAS,CACrC,EACE,EAAqB,EACrB,KAAK,EACL,MAAM,EACN,MAAM,EACN,KAAK,EACL,MAAM,EACN,IAAI,GACL,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,EACD,KAAK,CAAC,EAAE,GAAG,gBAoBZ"}