@opengis/fastify-table 2.0.16 → 2.0.18

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

@@ -0,0 +1,22 @@
+import config from "../../../config.js";
+const { accessToken = "0NWcGQxKRP8AsRxD" } = config.auth || {};
+/**
+ *
+ * @summary check user access to logger interface - per admin user type or user group
+ * @returns {Object} message, status
+ */
+export default function checkUserAccess({ user = {}, token, }) {
+    if (token && token === accessToken) {
+        return { message: "access granted", status: 200 };
+    }
+    // console.log(user);
+    if (!user.user_type?.includes?.("admin") &&
+        !config?.local &&
+        !config.auth?.disable) {
+        return { message: "access restricted", status: 403 };
+    }
+    /* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
+      return { message: 'access restricted', status: 403 };
+    } */
+    return { message: "access granted", status: 200 };
+}

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

@@ -1,30 +1,14 @@
-/* eslint-disable no-console */
-const streams = {};
-import build from "pino-abstract-transport";
 import fs from "node:fs";
+import build from "pino-abstract-transport";
 import labels from "./labels.js";
-import timestampWithTimeZone from "./timestampWithTimeZone.js";
-import config from "../../../config.js";
-const generator = () => () => `${(timestampWithTimeZone().split("T")[0] || "").replace(/:/g, "_")}.log`;
-const { dir = "log", interval = "1d", compress = "gzip", // maxFiles = 90, local: teeToStdout,
- } = config?.log || {};
+import getRootDir from "./getRootDir.js";
+const dir = getRootDir();
+const streams = {};
 function createFileStream({ level, status }) {
-    console.log(dir, level, generator()(), interval, compress);
-    /* const params = {
-      maxFiles, // logs to save limit
-      history: 'history', // history file name
-      interval, // rotate daily
-      compress, // compress rotated files
-      teeToStdout, // debug / logs to stdout
-      path: `${dir}/${level}`, // absolute path (root directory)
-      intervalBoundary: true, // true - log name with lower boundary of rotation interval
-      initialRotation: true, // true - log rotation check on init
-      // intervalUTC: true, // local tz -> utc
-    };
-    return createStream(generator({ interval }), params); */
     const dt = new Date().toISOString().split("T")[0];
     const fileName = `${dir}/${level}/${dt}${status ? `_${status}` : ""}.log`;
     fs.mkdirSync(`${dir}/${level}`, { recursive: true });
+    console.log("creating log stream: " + fileName);
     const stream = fs.createWriteStream(fileName, {
         encoding: "utf8",
         flags: "a+",

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

@@ -8,8 +8,6 @@ import serializers from "./serializers.js";
 import timestampWithTimeZone from "./timestampWithTimeZone.js";
 const isServer = process.argv[2];
 const rclient2 = getRedis({ db: 2 });
-if (!config.log)
-    config.log = {};
 const level = config.log?.level || process.env.PINO_LOG_LEVEL || "info";
 console.log(`log level: ${level}`);
 const options = {

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

@@ -0,0 +1,22 @@
+/* eslint-disable no-console */
+import fs from "node:fs";
+import path from "node:path";
+import config from "../../../config.js";
+let logDir = null;
+export default function getRootDir() {
+    // absolute / relative path
+    if (config.logDir) {
+        console.log(`logging to: ${config.logDir}`);
+        return config.logDir;
+    }
+    if (logDir) {
+        console.log(`logging to: ${logDir}`);
+        return logDir;
+    }
+    const file = ["config.json", "/data/local/config.json"].find((el) => fs.existsSync(el) ? el : null);
+    // .env / config.json => process.cwd()
+    const root = file && file.startsWith("/data/local") ? "/data/local" : process.cwd();
+    logDir = path.join(root, config.log?.dir || "log");
+    console.log(`logging to: ${logDir}`);
+    return logDir;
+}

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

@@ -13,7 +13,8 @@ function getPG(param = {}) {
     const dbListParams = dblist.find((el) => el.key === param?.key) ||
         dblist.find((el) => el.database === (param?.db || param?.database || param) &&
             el.port === param?.port);
-    const { user, password, host, port, db, database, name: origin, } = dbListParams ??
+    const { user, password, host, port, db, database, name: origin, statement_timeout: timeout, // explicit
+     } = dbListParams ??
         (typeof param === "string" ? getDBParams(param) : param || {});
     const name = origin || db || database || param || "client";
     if (pgClients[name])
@@ -24,7 +25,7 @@ function getPG(param = {}) {
         host: host || config.pg?.host,
         port: port || config.pg?.port,
         database: db || database || config.pg?.db || config.pg?.database,
-        statement_timeout: config.pg?.statement_timeout || 10000,
+        statement_timeout: timeout || config.pg?.statement_timeout || 10000,
     };
     if (!dbConfig.database) {
         return null;

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

@@ -12,7 +12,8 @@ async function getPGAsync(param) {
         return null;
     const dbListParams = dblist.find((el) => el.key === param?.key) ||
         dblist.find((el) => el.database === (param?.db || param?.database || param));
-    const { user, password, host, port, db, database, name: origin, } = dbListParams ??
+    const { user, password, host, port, db, database, name: origin, statement_timeout: timeout, // explicit
+     } = dbListParams ??
         (typeof param === "string" ? getDBParams(param) : param || {});
     const name = origin || db || database || param || "client";
     if (pgClients[name]?.tlist)
@@ -23,7 +24,7 @@ async function getPGAsync(param) {
         host: host || config.pg?.host,
         port: port || config.pg?.port,
         database: db || database || config.pg?.db || config.pg?.database,
-        statement_timeout: config.pg?.statement_timeout || 10000,
+        statement_timeout: timeout || config.pg?.statement_timeout || 10000,
     };
     if (!dbConfig.database) {
         return null;

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

@@ -1,3 +1,4 @@
+import pg from "pg";
 import { createHash } from "node:crypto";
 import config from "../../../../config.js";
 import getRedis from "../../redis/funcs/getRedis.js";
@@ -68,34 +69,43 @@ async function init(client) {
     WHERE
       relkind IN ('r', 'v')`);
     const relkinds = rows.reduce((acc, curr) => Object.assign(acc, { [curr.tname]: curr.relkind }), {});
-    async function query(q, args = [], isstream = false, timeout = 100000000) {
-        let timeoutWasSet;
+    async function query(q, args = []) {
         try {
-            if (isstream) {
-                await client.query(`set statement_timeout to ${timeout}`);
-                timeoutWasSet = true;
-            }
             const data = await client.query(q, args);
             return data;
         }
         catch (err) {
-            if (err.message === "canceling statement due to statement timeout") {
+            // canceling statement due to statement timeout
+            if (err.code === "57014") {
                 logger.file("timeout/query", { q, stack: err.stack });
+            }
+            throw err;
+        }
+    }
+    async function querySafe(q, param) {
+        const pg1 = new pg.Pool({
+            ...client.options,
+            statement_timeout: param?.timeout || 100000000,
+        });
+        try {
+            const args = Array.isArray(param) ? param : param?.args || [];
+            const data = await pg1.query(q, args);
+            console.log("pg.querySafe ok", q);
+            return data;
+        }
+        catch (err) {
+            if (err.code === "57014") {
+                console.error("pg.querySafe timeout", q);
                 return { rows: [], timeout: true };
             }
-            throw new Error(err);
+            console.error("pg.querySafe error", q);
+            throw err;
         }
         finally {
-            if (timeoutWasSet) {
-                await client.query("RESET statement_timeout");
-            }
+            pg1.end();
+            console.log("pg.querySafe released", q);
         }
     }
-    async function querySafe(q, param) {
-        const args = Array.isArray(param) ? param : param?.args || [];
-        const data = await query(q, args, true, param?.timeout);
-        return data;
-    }
     async function one(q, param) {
         const data = await query(q, Array.isArray(param) ? param : param?.args || []);
         const result = ((Array.isArray(data) ? data.pop() : data)?.rows || [])[0] || {};

package/dist/server/plugins/table/funcs/getFilterSQL/index.js

@@ -77,7 +77,7 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
     const { fields = [] } = await pg.query(fieldQuery);
     const autoSearchColumn = fields
         ?.filter((el) => pg.pgType?.[el.dataTypeID] === "text")
-        ?.map((el) => el.name)
+        ?.map((el) => `"${el.name}"`)
         .join(",");
     const searchColumn = body?.search_column || body?.meta?.search || autoSearchColumn;
     const fieldsList = (fieldsModel || fields)?.map((el) => el.name);

package/dist/server/routes/logger/controllers/logger.file.js

@@ -2,8 +2,8 @@ import path from "node:path";
 import { lstat, readdir, readFile } from "node:fs/promises";
 import { createReadStream, existsSync } from "node:fs";
 import readline from "node:readline";
-import checkUserAccess from "./utils/checkUserAccess.js";
-import getRootDir from "./utils/getRootDir.js";
+import checkUserAccess from "../../../plugins/logger/checkUserAccess.js";
+import getRootDir from "../../../plugins/logger/getRootDir.js";
 const limit = 200000;
 const rootDir = getRootDir();
 /**

package/package.json

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