@opengis/fastify-table 2.0.70 → 2.0.72

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/logger/createFileStream.js

@@ -30,7 +30,7 @@ export default function transportTarget() {
         source.on("data", (obj) => {
             if (["incoming request", "request completed"].includes(obj.msg))
                 return;
-            // console.log(obj)
+            // if (config.trace) console.log(obj, streams);
             const file = obj.msg?.logfolder || obj.logfolder;
             const level = file || labels[obj.level];
             const lvl = level + dt;

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;AAuCD,QAAA,MAAM,MAAM,EAAE,cAAgD,CAAC;AA4B/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;AAkDD,QAAA,MAAM,MAAM,EAAE,cAAgD,CAAC;AA4B/D,eAAe,MAAM,CAAC"}

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

@@ -8,24 +8,33 @@ import serializers from "./serializers.js";
 import timestampWithTimeZone from "./timestampWithTimeZone.js";
 const isServer = process.argv[2];
 const rclient2 = getRedis({ db: 2 });
-const level = config.log?.level || process.env.PINO_LOG_LEVEL || "info";
+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 },
+    },
+];
+// push trace logs to console (those would not be saved to file)
+if (["trace", "debug"].includes(level)) {
+    targets.push({
+        level,
+        target: "pino/file",
+        options: { destination: 1 },
+    });
+}
 const options = {
     level, // minimal log level to write
     timestamp: () => `,"time":"${timestampWithTimeZone()}"`, // timestamp as isostring
     hooks: getHooks(),
     serializers, // custom log params
     transport: {
-        targets: [
-            {
-                target: "./createFileStream.js", // path.resolve('utils/createFileStream.js')
-            },
-            {
-                level: "error",
-                target: "pino/file",
-                options: { destination: 1 },
-            },
-        ],
+        targets,
     },
     redact: redactionList,
 };

package/dist/server/plugins/logger/getRootDir.d.ts

@@ -1,2 +1,3 @@
-export default function getRootDir(): any;
+declare const _default: () => string;
+export default _default;
 //# sourceMappingURL=getRootDir.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getRootDir.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/getRootDir.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,UAAU,UAAU,QAqBjC"}
+{"version":3,"file":"getRootDir.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/getRootDir.ts"],"names":[],"mappings":";AAIA,wBAA4B"}

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

@@ -1,22 +1,3 @@
-/* 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;
-}
+const logDir = process.env.LOG_DIR || path.join(process.cwd(), "log");
+export default () => logDir;

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/controllers/logger.test.api.d.ts

@@ -1,4 +1,3 @@
-export default function testLog(request: any): Promise<{
-    root: boolean;
-}>;
+import { FastifyReply } from "fastify";
+export default function testLog(request: any, reply: FastifyReply): Promise<never>;
 //# sourceMappingURL=logger.test.api.d.ts.map

package/dist/server/routes/logger/controllers/logger.test.api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.test.api.d.ts","sourceRoot":"","sources":["../../../../../server/routes/logger/controllers/logger.test.api.ts"],"names":[],"mappings":"AAGA,wBAA8B,OAAO,CAAC,OAAO,EAAE,GAAG;;GA4CjD"}
+{"version":3,"file":"logger.test.api.d.ts","sourceRoot":"","sources":["../../../../../server/routes/logger/controllers/logger.test.api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,wBAA8B,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,kBA2BtE"}

package/dist/server/routes/logger/controllers/logger.test.api.js

@@ -1,42 +1,25 @@
-/* eslint-disable no-unreachable */
-import { rename } from 'fs/promises';
-export default async function testLog(request) {
-    // error handler
+import { rename } from "node:fs/promises";
+import logger from "../../../plugins/logger/getLogger.js";
+export default async function testLog(request, reply) {
+    logger.metrics("logger-test");
+    logger.file("logger-test", { code: 200, start: true });
     if (request.query?.rejection) {
-        rename('/data/local/test', '/data/local/test.txt');
+        rename("/data/local/test", "/data/local/test.txt");
     }
     if (request.query?.awaitRejection) {
-        await rename('/data/local/test', '/data/local/test.txt');
+        await rename("/data/local/test", "/data/local/test.txt");
     }
-    // default pino log
-    // request.log.info({ name: 'custom', test: 'param name and object log - info', status: 200 });
-    /* request.log.info('string info log');
-       //request.log.warn({ name: 'custom', test: 'param name and object log - warn', status: 400 });
-       request.log.warn('string warn log');
-       //request.log.debug({ name: 'custom', test: 'param name and object log - debug', status: 200 });
-       request.log.debug('string debug log');
-       //request.log.error({ name: 'custom', test: 'param name and object log - error', status: 200 });
-       //request.log.error('string error log');
-       request.log.fatal({ name: 'custom', test: 'param name and object log - fatal', status: 200 });
-       //request.log.fatal('string fatal log'); */
-    // custom params
-    //  request.log.info(request, { file: 'test', msg: 'string debug log' });
-    // request.log.info({ file: 'test', msg: 'string debug log1' }, request);
-    // request.log.file('test1', 'my message', request);
-    throw new Error('444');
-    request.log.info({ data: 111, msg: 'string debug log1' }, request);
-    request.log.info('string debug log1', request);
-    request.log.info('string debug log1');
-    request.log.info({ data: 111, msg: 'string debug log1' });
-    request.log.error(new Error('222'), request);
-    /* request.log.error('policy and string log1');
-      request.log.error({ test: 'policy and string log1' });
-      request.log.error(request, { test: 'string name and object log', status: 502 });
-      request.log.error(request, 'policy and string log1'); */
-    // request.log.error(request, { test: 'policy and object error log', status: 500 });
-    // request.log.error(request, 'policy and string log2');
-    ///    throw new Error('222');
-    // d / 0;
-    // throw new Error('unhandled exception');
-    return { root: true };
+    if (request.query?.throw) {
+        throw new Error("444");
+    }
+    logger.trace({ data: 111, msg: "string trace log1" }, request);
+    logger.debug({ data: 111, msg: "string debug log1" }, request);
+    logger.warn({ data: 111, msg: "string warn log1" }, request);
+    logger.fatal({ data: 111, msg: "string fatal log1" }, request);
+    logger.info({ data: 111, msg: "string info log1" }, request);
+    logger.info("string info log1", request);
+    logger.info("string info log1");
+    logger.info({ data: 111, msg: "string info log1" });
+    logger.error(new Error("222"), request);
+    return reply.status(200).send({ root: true });
 }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.0.70",
+  "version": "2.0.72",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -31,7 +31,7 @@
     "compress": "node compress.js",
     "dev1": "bun --hot dist/server",
     "dev": "NODE_ENV=production bun start",
-    "start": "bun server"
+    "start": "LOG_LEVEL=trace bun server"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "3.879.0",