@opengis/fastify-table 2.0.69 → 2.0.71

package/dist/server/helpers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../server/helpers/index.ts"],"names":[],"mappings":"AACA,OAAO,cAAc,MAAM,YAAY,CAAC;AAOxC,QAAA,MAAM,UAAU,KAAqC,CAAC;AA0ItD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../server/helpers/index.ts"],"names":[],"mappings":"AACA,OAAO,cAAc,MAAM,YAAY,CAAC;AAOxC,QAAA,MAAM,UAAU,KAAqC,CAAC;AA2ItD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC"}

package/dist/server/helpers/index.js

@@ -74,6 +74,7 @@ handlebars.registerHelper("helperMissing", function hm() {
 // format
 handlebars.registerHelper("formatAuto", formatAuto);
 handlebars.registerHelper("formatDate", formatDate);
+handlebarsSync.registerHelper("formatDate", formatDate);
 handlebars.registerHelper("formatDigit", formatDigit);
 handlebars.registerHelper("formatNum", formatNum);
 handlebars.registerHelper("formatNumber", formatNumber);

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

@@ -1 +1 @@
-{"version":3,"file":"loginUser.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/loginUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAUvC,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA+CpE"}
+{"version":3,"file":"loginUser.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/loginUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAUvC,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBAiDpE"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAMtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBA6GxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QA6BvC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAMtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBA8GxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAgCvC;AAED,eAAe,MAAM,CAAC"}

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

@@ -30,7 +30,8 @@ export async function onRequest(req, reply) {
     const isPublic = Array.isArray(policy)
         ? policy.includes("public")
         : policy === "L0";
-    if (!req.session?.passport?.user?.uid &&
+    if (req.cookies?.["session_auth"] &&
+        !req.session?.passport?.user?.uid &&
         (config.auth?.disable || config.auth?.user) &&
         !isPublic) {
         req.session = req.session || {};
@@ -103,7 +104,10 @@ function plugin(fastify) {
         secret: config?.auth?.secret || "61b820e12858570a4b0633020d4394a17903d9a9",
         cookieName: "session_auth",
         cookie: config?.auth?.cookieOptions || { secure: false },
-        store: new RedisStore({ client: getRedis({ db: 10 }) }),
+        store: new RedisStore({
+            prefix: `session_auth:${config.pg?.database || "db"}:`,
+            client: getRedis({ db: 2 }),
+        }),
     });
     // register passport AFTER session is ready
     fastify.register(fastifyPassport.initialize());

package/dist/server/plugins/metric/loggerSystem.d.ts

@@ -1,4 +1,4 @@
-export default function loggerSystem(req: any): Promise<{
+export default function loggerSystem(req?: any): Promise<{
     process: {
         root: string;
         processFolder: string;

package/dist/server/plugins/metric/loggerSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loggerSystem.d.ts","sourceRoot":"","sources":["../../../../server/plugins/metric/loggerSystem.ts"],"names":[],"mappings":"AAsBA,wBAA8B,YAAY,CAAC,GAAG,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6IlD"}
+{"version":3,"file":"loggerSystem.d.ts","sourceRoot":"","sources":["../../../../server/plugins/metric/loggerSystem.ts"],"names":[],"mappings":"AAsBA,wBAA8B,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqJnD"}

package/dist/server/plugins/metric/loggerSystem.js

@@ -15,7 +15,7 @@ const redisKey = "logger-process-online";
 const sqlQuery = `select datname as dbname, application_name as app, client_addr as client_ip, 
 (now()-backend_start)::text as msec, state, query from pg_stat_activity where datname=$1`;
 export default async function loggerSystem(req) {
-    const { pg = pgClients.client } = req;
+    const { pg = pgClients.client } = req || {};
     const dbName = pg?.options?.database;
     const dbsize = config.redis
         ? await rclient.get(`${dbName}:content:dbsize:${redisKey}`)
@@ -27,7 +27,9 @@ export default async function loggerSystem(req) {
         (await pg
             .query(`select pg_size_pretty(pg_database_size('${dbName}'));`)
             .then((el) => el.rows?.[0]?.pg_size_pretty));
-    const { rows: query = [] } = await pg.query(sqlQuery, [dbName]);
+    const query = await pg
+        .query(sqlQuery, [dbName])
+        .then((el) => el.rows || []);
     const { stdout: topProcess } = platform === "win32"
         ? { stdout: "Cant show top on this system type" }
         : await execAsync("top -b -n 1");
@@ -69,7 +71,13 @@ export default async function loggerSystem(req) {
         ? JSON.parse(JSON.stringify(metric5, Object.keys(metric5).sort()))
         : undefined;
     const userOnline = config.redis
-        ? await rclient2.scan(["0", "match", `${dbName}:user:*`, "count", "10000"])
+        ? await rclient2.scan([
+            "0",
+            "match",
+            `session_auth:${dbName}:*`,
+            "count",
+            "10000",
+        ])
         : [];
     // const userOnline = await rclient10.scan(['0', 'match', 'sess:*', 'count', '10000']);
     return {

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

@@ -12,7 +12,7 @@ function getRedis({ db, host, port, } = { db: 0 }) {
     }
     const redisConfig = {
         db,
-        keyPrefix: `${config.db}:`,
+        prefix: `${config.pg?.database || "db"}:`,
         host: host || config.redis?.host || "127.0.0.1",
         port: port || config.redis?.port || 6379, // Redis port
         family: 4, // 4 (IPv4) or 6 (IPv6)

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

@@ -1 +1 @@
-{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEvD;;;;GAIG;AAEH,iBAAe,MAAM,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,kBAG7D;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEvD;;;;GAIG;AAEH,iBAAe,MAAM,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,kBAgB7D;AAED,eAAe,MAAM,CAAC"}

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

@@ -4,7 +4,17 @@
  *
  */
 async function logout(req, reply) {
+    if (!req.user) {
+        return reply.redirect("/");
+    }
     await req.session?.destroy?.();
+    reply.clearCookie("session_auth");
+    // Shield session from resurrection
+    Object.defineProperty(req, "session", {
+        value: null,
+        writable: false,
+        configurable: false,
+    });
     return reply.redirect("/");
 }
 export default logout;

package/dist/server/routes/logger/controllers/logger.metrics.d.ts

@@ -0,0 +1,8 @@
+/**
+ *
+ * @method GET
+ * @summary API для перегляду поточних метрик
+ *
+ */
+export default function loggerMetrics(req: any, reply: any): Promise<any>;
+//# sourceMappingURL=logger.metrics.d.ts.map

package/dist/server/routes/logger/controllers/logger.metrics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.metrics.d.ts","sourceRoot":"","sources":["../../../../../server/routes/logger/controllers/logger.metrics.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AAEH,wBAA8B,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAkB/D"}

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

@@ -0,0 +1,23 @@
+import checkUserAccess from "../../../plugins/logger/checkUserAccess.js";
+import loggerSystem from "../../../plugins/metric/loggerSystem.js";
+/**
+ *
+ * @method GET
+ * @summary API для перегляду поточних метрик
+ *
+ */
+export default async function loggerMetrics(req, reply) {
+    const { pg, user = {}, query = {} } = req;
+    const access = checkUserAccess({ user, token: query.token });
+    if (access?.status !== 200) {
+        return reply.status(access.status).send(access.message);
+    }
+    const system = await loggerSystem();
+    const dbName = pg?.options?.database;
+    return {
+        dbname: dbName,
+        ...system.metric,
+        uptime: system.uptime,
+        ...system.metricSort,
+    };
+}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/logger/index.ts"],"names":[],"mappings":"AAiBA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAMtC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/logger/index.ts"],"names":[],"mappings":"AAkBA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAWtC;AAED,eAAe,MAAM,CAAC"}

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

@@ -1,4 +1,5 @@
 import loggerFile from "./controllers/logger.file.js";
+import loggerMetrics from "./controllers/logger.metrics.js";
 // import loggerTest from './controllers/logger.test.api.js';
 const loggerSchema = {
     querystring: {
@@ -14,5 +15,6 @@ const loggerSchema = {
 };
 function plugin(app, opt = {}) {
     app.get("/logger-file/*", { config: { policy: "L0", rateLimit: false }, schema: loggerSchema }, loggerFile);
+    app.get("/logger-metrics", { config: { policy: "L0", rateLimit: false }, schema: {} }, loggerMetrics);
 }
 export default plugin;

package/dist/server/routes/table/controllers/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/search.ts"],"names":[],"mappings":"AAmHA,wBAA8B,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAU,EAAE,EAAE,GAAG;;;;;;GAoClE"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/search.ts"],"names":[],"mappings":"AA6HA,wBAA8B,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAU,EAAE,EAAE,GAAG;;;;;;GAoClE"}

package/dist/server/routes/table/controllers/search.js

@@ -27,16 +27,20 @@ async function getData({ pg, tableName, query = {}, maxLimit, res }) {
         ? `(${meta?.search
             .concat(meta?.title ? `,${meta?.title}` : "")
             .split(",")
-            .map((el) => `${el} ilike '%${query.key}%'`)
+            .map((el) => `${el}::text ilike '%${query.key}%'`)
             .join(" or ")})`
         : "false";
     const where = [!pk ? "false" : "true", loadTable.query, search1].filter(Boolean);
+    const sqlTable = loadTable.sql
+        ?.filter?.((el) => !el?.disabled)
+        ?.map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)
+        ?.join?.("") || "";
     const q = `select ${[
         `"${pk}" as id`,
         meta?.title ? `${meta.title} as title` : "",
     ]
         .filter((el) => el)
-        .join(",")} from ${table} t where ${where.join(" and ") || "true"} ${order} ${offset} limit ${limit}`;
+        .join(",")} from ${table} t ${sqlTable} where ${where.join(" and ") || "true"} ${order} ${offset} limit ${limit}`;
     if (query.sql) {
         res.sql.push(q);
         return null;
@@ -44,7 +48,7 @@ async function getData({ pg, tableName, query = {}, maxLimit, res }) {
     const rows = await pg.query(q).then((el) => el.rows || []);
     const filtered = pg.queryCache
         ? await pg
-            .queryCache(`select count(*) from ${table} t where ${where.join(" and ") || "true"}`)
+            .queryCache(`select count(*) from ${table} t ${sqlTable} where ${where.join(" and ") || "true"}`)
             .then((el) => +(el?.rows[0]?.count || 0))
         : 0;
     const total = pg.queryCache

package/package.json

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