@opengis/fastify-table 2.0.105 → 2.0.107

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"}

package/dist/server/plugins/table/funcs/getFilter.js

@@ -1,5 +1,18 @@
 import routeFilter from "../../../routes/table/controllers/filter.js";
 import pgClients from "../../pg/pgClients.js";
+const reply1 = {
+    response: {},
+    // redirect: (txt) => txt,
+    redirect: (txt) => Object.assign(reply1.response, {
+        body: txt,
+        statusCode: reply1.response.statusCode || 200,
+    }),
+    status: (statusCode) => {
+        Object.assign(reply1.response, { status: statusCode });
+        return reply1;
+    },
+    send: (txt) => Object.assign(reply1.response, txt),
+};
 export default async function getFilter({ pg = pgClients.client, table, filter, custom, state, search, user, }, reply) {
     const params = { table };
     const query = {
@@ -13,6 +26,6 @@ export default async function getFilter({ pg = pgClients.client, table, filter,
         params,
         query,
         user,
-    }, reply, 1);
+    }, reply || reply1, 1);
     return result;
 }

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

@@ -1,8 +1,10 @@
 import type { ExtendedPG } from "../../../types/core.js";
-export default function getSelectMeta({ name, pg, nocache, parent, }: {
+export default function getSelectMeta({ name, startsWith, key, nocache, parent, pg, }: {
     name: string;
-    pg: ExtendedPG;
+    startsWith?: boolean;
+    key?: string;
     nocache?: any;
     parent?: string;
+    pg?: ExtendedPG;
 }): Promise<any>;
 //# sourceMappingURL=getSelectMeta.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getSelectMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelectMeta.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzD,wBAA8B,aAAa,CAAC,EAC1C,IAAI,EACJ,EAAqB,EACrB,OAAO,EACP,MAAM,GACP,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,UAAU,CAAC;IACf,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,gBAyFA"}
+{"version":3,"file":"getSelectMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelectMeta.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzD,wBAA8B,aAAa,CAAC,EAC1C,IAAI,EACJ,UAAU,EACV,GAAG,EACH,OAAO,EACP,MAAM,EACN,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB,gBA4GA"}

package/dist/server/plugins/table/funcs/getSelectMeta.js

@@ -1,18 +1,23 @@
 import logger from "../../logger/getLogger.js";
 import autoIndex from "../../pg/funcs/autoIndex.js";
-import getPG from "../../pg/funcs/getPG.js";
+import getPGAsync from "../../pg/funcs/getPGAsync.js";
 import pgClients from "../../pg/pgClients.js";
 import getSelect from "./getSelect.js";
 const limit = 50;
 const selectMeta = {};
-export default async function getSelectMeta({ name, pg = pgClients.client, nocache, parent, }) {
-    if (selectMeta[name] && !nocache)
+export default async function getSelectMeta({ name, startsWith, key, nocache, parent, pg = pgClients.client, }) {
+    if (selectMeta[name] && !startsWith && !nocache)
         return selectMeta[name];
+    if (selectMeta[name] && startsWith && key && !nocache) {
+        const searchQuery = `(${selectMeta[name].searchColumn
+            .split(",")
+            .map((el) => `left(lower("${el}"),${key.length}) = $1`)
+            .join(" or ")})`;
+        return { ...selectMeta[name], searchQuery };
+    }
     const cls = await getSelect(name, pg, nocache);
     const db = typeof cls?.db === "string" ? { database: cls.db } : cls?.db;
-    const pg1 = cls?.db ? getPG(db) : pg;
-    if (!pg1?.pk)
-        await pg1.init();
+    const pg1 = cls?.db ? await getPGAsync(db) : pg;
     if (!cls)
         return null;
     if (cls.arr)
@@ -52,12 +57,13 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
         (dataOrigin.fields.find((el) => el.name === "search")
             ? "search"
             : dataOrigin1.fields[1].name);
+    // by default - search by like %value%
     const searchQuery = `(${searchColumn
         .split(",")
         .map((el) => `lower("${el}") ~ $1 `)
         .join(" or ")})`;
-    // console.log(dataOrigin1.fields.map((el) => el.name).join(','));
     const data = {
+        searchColumn,
         minLength: cls.minLength,
         limit: cls.limit,
         type: type.join(","),
@@ -73,5 +79,13 @@ export default async function getSelectMeta({ name, pg = pgClients.client, nocac
         time: new Date().toISOString(),
     };
     selectMeta[name] = data;
+    // on demand - search by "start with these characters"
+    if (startsWith && key?.length) {
+        const searchQuery = `(${selectMeta[name].searchColumn
+            .split(",")
+            .map((el) => `left(lower("${el}"),${key.length}) = $1`)
+            .join(" or ")})`;
+        return { ...data, searchQuery };
+    }
     return data;
 }

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

@@ -28,7 +28,7 @@ export default function gisIRColumn({ pg, layer, column, sql, query, filter, sta
 } | {
     count: any;
     sql: string | undefined;
-    rows: any[];
+    rows: any;
     error?: undefined;
     status?: undefined;
     message?: undefined;
@@ -37,7 +37,7 @@ export default function gisIRColumn({ pg, layer, column, sql, query, filter, sta
     time: number;
     count: any;
     sql: string | undefined;
-    rows: any[];
+    rows: any;
     error?: undefined;
     status?: undefined;
     message?: undefined;

package/dist/server/plugins/table/funcs/gisIRColumn.js

@@ -19,7 +19,7 @@ export default async function gisIRColumn({ pg = pgClients.client, layer, column
     const { tlist } = await pg
         .query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist from pg_class 
   where relkind in ('r','v','m')`)
-        .then((el) => el.rows[0]);
+        .then((el) => el.rows?.[0] || {});
     const tableName = body?.table || layer;
     if (!tlist.includes(tableName))
         return { error: `table not found: ${tableName}`, status: 400 };

package/dist/server/plugins/util/funcs/unflattenObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unflattenObject.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/util/funcs/unflattenObject.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,OAAO,EAAE,GAAG,MA0CnD"}
+{"version":3,"file":"unflattenObject.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/util/funcs/unflattenObject.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,OAAO,EAAE,GAAG,MA4CnD"}

package/dist/server/plugins/util/funcs/unflattenObject.js

@@ -5,7 +5,9 @@
 export default function unflattenObject(flatObj) {
     const res = Object.keys(flatObj || {}).reduce((acc, key) => {
         const keys = key.split(".");
-        keys.reduce((nestedObj, part, index) => {
+        keys.reduce((nestedObj, part1, index) => {
+            // ! prevent npx vitest run from upper case -ing env variables
+            const part = process.env.VITEST ? part1.toLowerCase() : part1;
             if (index === keys.length - 1) {
                 // json array
                 if (typeof flatObj[key] === "string" &&

package/dist/server/routes/access/controllers/access.group.d.ts

@@ -8,7 +8,7 @@ export default function accessGroup({ pg, params, user, unittest, }: {
     user: Record<string, any>;
     unittest?: any;
 }, reply: FastifyReply): Promise<{
-    routes: any[];
-    users: any[];
+    routes: any;
+    users: any;
 }>;
 //# sourceMappingURL=access.group.d.ts.map

package/dist/server/routes/access/controllers/access.group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"access.group.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIzD,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EAED,KAAK,EAAE,YAAY;;;GAgCpB"}
+{"version":3,"file":"access.group.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIzD,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EAED,KAAK,EAAE,YAAY;;;GA+BpB"}

package/dist/server/routes/access/controllers/access.group.js

@@ -1,6 +1,5 @@
 import { pgClients, getAdminAccess } from "../../../../utils.js";
 export default async function accessGroup({ pg = pgClients.client, params, user = {}, unittest, }, reply) {
-    debugger;
     if (!params?.id) {
         return reply.status(400).send("not enough params: id");
     }

package/dist/server/routes/access/controllers/access.group.post.d.ts

@@ -9,7 +9,7 @@ export default function accessGroupPost({ pg, params, user, body, unittest, }: {
     body: Record<string, any>;
     unittest?: any;
 }, reply: FastifyReply): Promise<{
-    routes: any[];
-    users: any[];
+    routes: any;
+    users: any;
 }>;
 //# sourceMappingURL=access.group.post.d.ts.map

package/dist/server/routes/access/controllers/access.group.post.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"access.group.post.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.group.post.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD,wBAA8B,eAAe,CAC3C,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,IAAS,EACT,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EACD,KAAK,EAAE,YAAY;;;GA4FpB"}
+{"version":3,"file":"access.group.post.d.ts","sourceRoot":"","sources":["../../../../../server/routes/access/controllers/access.group.post.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD,wBAA8B,eAAe,CAC3C,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,IAAS,EACT,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EACD,KAAK,EAAE,YAAY;;;GA2FpB"}

package/dist/server/routes/access/controllers/access.group.post.js

@@ -12,7 +12,6 @@ export default async function accessGroupPost({ pg = pgClients.client, params, u
     }
     const { users = [], routes = [] } = body;
     if (!routes?.length) {
-        // return { message: 'not enough params: users / routes', status: 400 };
         await pg.query("delete from admin.role_access where role_id=$1", [id]);
         if (!users?.length) {
             return reply.status(200).send({ id, routes });

package/dist/server/routes/auth/controllers/core/registration.d.ts

@@ -17,8 +17,5 @@ import { FastifyReply } from "fastify";
  * @returns {String|Object} error Опис помилки
  * @returns {String|Object} message Повідомлення про успішну реєстрацію
  */
-export default function registration({ pg, body }: any, reply: FastifyReply): Promise<{
-    message: string;
-    status: number;
-}>;
+export default function registration({ method, pg, body }: any, reply: FastifyReply): Promise<never>;
 //# sourceMappingURL=registration.d.ts.map

package/dist/server/routes/auth/controllers/core/registration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registration.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAWvC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,YAAY,CACxC,EAAE,EAAqB,EAAE,IAAS,EAAE,EAAE,GAAG,EACzC,KAAK,EAAE,YAAY;;;GA4FpB"}
+{"version":3,"file":"registration.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAWvC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,YAAY,CACxC,EAAE,MAAM,EAAE,EAAqB,EAAE,IAAS,EAAE,EAAE,GAAG,EACjD,KAAK,EAAE,YAAY,kBAoHpB"}

package/dist/server/routes/auth/controllers/core/registration.js

@@ -22,26 +22,41 @@ import pgClients from "../../../../plugins/pg/pgClients.js";
  * @returns {String|Object} error Опис помилки
  * @returns {String|Object} message Повідомлення про успішну реєстрацію
  */
-export default async function registration({ pg = pgClients.client, body = {} }, reply) {
+export default async function registration({ method, pg = pgClients.client, body = {} }, reply) {
     const { password, email } = body;
     if (!password || (!email && !body.login)) {
-        return { message: "Недостатньо параметрів", status: 400 };
+        return reply.status(400).send({
+            error: "Недостатньо параметрів",
+            code: 400,
+        });
     }
     const regularExp = /^([a-z0-9_-]+\.)*[a-z0-9_-]+@[a-z0-9_-]+(\.[a-z0-9_-]+)*\.[a-z]{2,6}$/;
     if (email && !regularExp.test(email)) {
-        return { message: "Параметр E-mail невалідний", status: 400 };
+        return reply.status(400).send({
+            error: "Параметр E-mail невалідний",
+            code: 400,
+        });
     }
     if (body?.first_name &&
         !/[А-Яа-яA-Za-zёЁЇїІіЄєҐґ '-]+/.test(body?.first_name)) {
-        return { message: "Параметр Ім'я невалідний", status: 400 };
+        return reply.status(400).send({
+            error: "Параметр Ім'я невалідний",
+            code: 400,
+        });
     }
     if (body?.last_name &&
         !/[А-Яа-яA-Za-zёЁЇїІіЄєҐґ '-]+/.test(body?.last_name)) {
-        return { message: "Параметр Прізвище невалідний", status: 400 };
+        return reply.status(400).send({
+            error: "Параметр Прізвище невалідний",
+            code: 400,
+        });
     }
     if (body?.phone &&
         !/^\+\d{3}\s?\d{2}\s?\d{3}\s?\d{2}\s?\d{2}$/.test(body?.phone)) {
-        return { message: "Параметр Телефон невалідний", status: 400 };
+        return reply.status(400).send({
+            error: "Параметр Телефон невалідний",
+            code: 400,
+        });
     }
     const login = body.login || email;
     const data = {
@@ -63,7 +78,7 @@ export default async function registration({ pg = pgClients.client, body = {} },
         const txt = !body.login
             ? "Даний адрес електронної пошти вже прив'язаний до іншого облікового запису"
             : "Даний логін вже використовується";
-        return { message: txt, status: 409 };
+        return reply.status(409).send({ error: txt, code: 409 });
     }
     if (pg.pk?.["crm_acc.crm_contact"]) {
         // insert crm contact
@@ -74,7 +89,7 @@ export default async function registration({ pg = pgClients.client, body = {} },
             const txt = !body.login
                 ? "Користувача за даною адресою вже зареєстровано"
                 : "Даний логін вже використовується";
-            return { message: txt, status: 409 };
+            return reply.status(409).send({ error: txt, code: 409 });
         }
         await dataInsert({ pg, table: "crm_acc.crm_contact", data });
         const { uid } = await pg
@@ -92,5 +107,9 @@ export default async function registration({ pg = pgClients.client, body = {} },
             data,
         });
     }
-    return reply.redirect("/login");
+    const redirectUrl = config.auth?.link?.core?.login || config?.auth?.redirect || "/login";
+    if (method === "POST") {
+        return reply.status(200).send({ msg: "registration success", redirectUrl });
+    }
+    return reply.redirect(redirectUrl);
 }

package/dist/server/routes/auth/controllers/core/updateUserInfo.js

@@ -3,7 +3,7 @@ import dataUpdate from "../../../../plugins/crud/funcs/dataUpdate.js";
 export default async function updateUserInfo(req, reply) {
     const { body: payload, pg = pgClients.client } = req;
     if (!req.user?.uid) {
-        return reply.code(401).send({ message: "Unauthorized", code: 401 });
+        return reply.code(401).send({ error: "Unauthorized", code: 401 });
     }
     const userInfo = Object.fromEntries(Object.entries(payload || {}).filter(([key]) => !["salt", "user_type"].includes(key)));
     const result = await dataUpdate({

package/dist/server/routes/auth/controllers/jwt/authorize.js

@@ -19,12 +19,12 @@ export default async function authorize(req, reply) {
     if (response_type !== "code") {
         return reply
             .code(400)
-            .send({ message: "unsupported response_type", code: 400 });
+            .send({ error: "unsupported response_type", code: 400 });
     }
     if (!client_id) {
         return reply
             .code(400)
-            .send({ message: "not enough query params: client_id", code: 400 });
+            .send({ error: "not enough query params: client_id", code: 400 });
     }
     const q = `select owner_user_id, client_secret_hash, redirect_uris from oauth.clients where client_id=$1 and token_endpoint_auth_method=$2 and ${scope ? "$1=any(scopes)" : "1=1"}`;
     const { owner_user_id: userId, client_secret_hash: secret, redirect_uris = [], } = pg.pk?.["oauth.clients"]
@@ -33,12 +33,12 @@ export default async function authorize(req, reply) {
             .then((el) => el.rows?.[0] || {})
         : {};
     if (!userId) {
-        return reply.code(400).send({ message: "invalid client id", code: 400 });
+        return reply.code(400).send({ error: "invalid client id", code: 400 });
     }
     if (redirect_uri &&
         Array.isArray(redirect_uris) &&
         !redirect_uris.includes(redirect_uri)) {
-        return reply.code(400).send({ message: "invalid redirect_uri", code: 400 });
+        return reply.code(400).send({ error: "invalid redirect_uri", code: 400 });
     }
     const user = pg.pk?.["admin.users"]
         ? await pg
@@ -48,7 +48,7 @@ export default async function authorize(req, reply) {
             .then((el) => el.rows[0])
         : null;
     if (!user) {
-        return reply.code(404).send({ message: "user not found", code: 404 });
+        return reply.code(404).send({ error: "user not found", code: 404 });
     }
     const href1 = await authorizeUser(user, req, "jwt", expireMsec);
     // Generate authorization code

package/dist/server/routes/auth/controllers/jwt/token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/jwt/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAmB5D,wBAA8B,UAAU,CACtC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBAqHpB"}
+{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/jwt/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAmB5D,wBAA8B,UAAU,CACtC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,YAAY,kBAmHpB"}