@opengis/fastify-table 2.0.17 → 2.0.19

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/table/funcs/getTemplates.js

@@ -7,8 +7,8 @@ export default function getTemplateDir(type) {
     const arr = Array.isArray(type)
         ? type.map((el) => getTemplatePath(el)).flat()
         : getTemplatePath(type);
-    if (!loadTemplate[type]) {
-        loadTemplate[type] = arr.filter((el) => fs.existsSync(el[1]));
+    if (!loadTemplate[type.toString()]) {
+        loadTemplate[type.toString()] = arr.filter((el) => fs.existsSync(el[1]));
     }
-    return loadTemplate[type];
+    return loadTemplate[type.toString()];
 }

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

@@ -1,5 +1,6 @@
 import { handlebars } from "../../../../helpers/index.js";
 import getTemplate from "../getTemplate.js";
+import getTemplates from "../getTemplates.js";
 import getSelectVal from "./getSelectVal.js";
 import pgClients from "../../../pg/pgClients.js";
 export default async function metaFormat({ rows: original, table, cls = {}, htmls = {}, sufix = true, reassign = true, }, pg = pgClients.client) {
@@ -11,11 +12,21 @@ export default async function metaFormat({ rows: original, table, cls = {}, html
         name: el,
         data: loadTable?.meta?.cls[el],
     }));
+    const list = getTemplates(["cls", "select"]).map((el) => el[0]);
+    const columnNameAsCls = Object.keys(original?.[0] || {})
+        .filter((key) => list.includes(`${table}.${key}`) || list.includes(key))
+        .map((key) => ({
+        name: key,
+        data: list.find((clsName) => [key, `${table}.${key}`].includes(clsName)),
+    }));
     const htmlCols = Object.keys(htmls || {})
         .map((key) => ({ name: key, html: htmls[key] }))
         .concat(loadTable?.columns?.filter?.((e) => e.name && e.html && e.format && ["html", "slot"].includes(e.format)) || []);
     if (!original?.length ||
-        (!selectCols?.length && !metaCls?.length && !htmlCols?.length))
+        (!selectCols?.length &&
+            !metaCls?.length &&
+            !columnNameAsCls.length &&
+            !htmlCols?.length))
         return original;
     const rows = reassign ? original : JSON.parse(JSON.stringify(original));
     // html && slot (vue component) format
@@ -31,7 +42,10 @@ export default async function metaFormat({ rows: original, table, cls = {}, html
         }));
     }));
     // cls & select format
-    await Promise.all(selectCols.concat(metaCls)?.map(async (attr) => {
+    await Promise.all(selectCols
+        .concat(metaCls)
+        .concat(columnNameAsCls)
+        ?.map(async (attr) => {
         const values = [
             ...new Set(rows?.map((el) => el[attr.name]).flat()),
         ].filter((el) => (typeof el === "boolean" ? true : el));
@@ -52,9 +66,7 @@ export default async function metaFormat({ rows: original, table, cls = {}, html
             }
             else {
                 Object.assign(el, {
-                    [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: val.color
-                        ? val
-                        : val.text || val,
+                    [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: val.color ? val : val.text || val,
                 });
             }
         });

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/dist/server/routes/table/controllers/filter.js

@@ -18,6 +18,9 @@ export default async function filterAPI(req, reply, iscalled) {
     if (!table) {
         return { status: 404, message: "not found" };
     }
+    if (!pg.pk?.[table]) {
+        return { status: 404, message: "table not found" };
+    }
     const sqlTable = sql
         ?.filter?.((el) => !el?.disabled && el?.sql?.replace)
         ?.map?.((el, i) => ` left join lateral (${el.sql.replace("{{uid}}", user?.uid)}) ${el.name || `t${i}`} on 1=1 `)

package/package.json

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