@opengis/fastify-table 2.0.74 → 2.0.76

package/dist/server/migrations/users.sql

@@ -33,7 +33,7 @@ ALTER TABLE admin.users add column if not exists twofa boolean not null DEFAULT
 ALTER TABLE admin.users add CONSTRAINT admin_user_uid_pkey PRIMARY KEY (uid);
 ALTER TABLE admin.users add CONSTRAINT admin_user_user_rnokpp UNIQUE (user_rnokpp);
 
-update admin.users set user_type='regular' where user_type not in ('viewer', 'regular','admin','superadmin');
+-- update admin.users set user_type='regular' where user_type not in ('viewer', 'regular','admin','superadmin');
 -- ALTER TABLE admin.users add constraint admin_user_type_check CHECK (user_type=any(array['viewer', 'regular','admin','superadmin']));
 insert into admin.users (uid,login,password,user_type,enabled)values('viewer','viewer','viewer','viewer', false) on conflict (uid) do update set enabled=excluded.enabled;
 -- update admin.users set enabled=true where uid='viewer';

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

@@ -1,51 +1,2 @@
-export default function loggerSystem(req?: any): Promise<{
-    process: {
-        root: string;
-        processFolder: string;
-        saveDirectory: string;
-        dbhost: any;
-        dbport: any;
-        dbname: any;
-    };
-    uptime: {
-        node: number;
-        system: number;
-        pg: any;
-        redis: number;
-    };
-    metric: {
-        cpu: string;
-        memory: string;
-        "user.online": any;
-        "node.total": string;
-        "node.used": string;
-        "node.rss": string;
-        "node.cpu.time": number;
-        "node.cpu.load": number;
-        "redis.ram": string;
-        "redis.latency": any;
-        "redis.ram.peak": string;
-        "redis.clients": string;
-        "redis.db0": string;
-        "redis.db1": string;
-        "redis.db2": string;
-        "redis.db10": string;
-        "pg.connection": any;
-        dbsize: any;
-        filesize: number;
-    };
-    metricSort: any;
-    system: {
-        os: string;
-        release: string;
-        core: number;
-        cpu: string;
-        ram: string;
-        db: any;
-        redis: any;
-        node: string;
-    };
-    top: string;
-    query: any;
-}>;
+export default function loggerSystem(req?: any): Promise<Record<string, any>>;
 //# sourceMappingURL=loggerSystem.d.ts.map

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,CAAC,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqJnD"}
+{"version":3,"file":"loggerSystem.d.ts","sourceRoot":"","sources":["../../../../server/plugins/metric/loggerSystem.ts"],"names":[],"mappings":"AAsBA,wBAA8B,YAAY,CACxC,GAAG,CAAC,EAAE,GAAG,GACR,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAsJ9B"}

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

@@ -25,7 +25,7 @@ export default async function loggerSystem(req) {
         .then((el) => el.rows?.[0]?.version);
     const dbSize = dbsize ||
         (await pg
-            .query(`select pg_size_pretty(pg_database_size('${dbName}'));`)
+            .query(`select pg_size_pretty(pg_database_size($1))`, [dbName])
             .then((el) => el.rows?.[0]?.pg_size_pretty));
     const query = await pg
         .query(sqlQuery, [dbName])
@@ -80,6 +80,14 @@ export default async function loggerSystem(req) {
         ])
         : [];
     // const userOnline = await rclient10.scan(['0', 'match', 'sess:*', 'count', '10000']);
+    const uptimes = {
+        "uptime:node": Math.round(process.uptime()),
+        "uptime:system": os.uptime(),
+        "uptime:pg": uptime,
+        "uptime:redis": typeof redis?.uptime_in_seconds === "number"
+            ? redis.uptime_in_seconds - 0
+            : 0,
+    };
     return {
         process: {
             root: process.cwd(),
@@ -89,14 +97,7 @@ export default async function loggerSystem(req) {
             dbport: pg?.options?.port,
             dbname: dbName,
         },
-        uptime: {
-            node: Math.round(process.uptime()),
-            system: os.uptime(),
-            pg: uptime,
-            redis: typeof redis?.uptime_in_seconds === "number"
-                ? redis.uptime_in_seconds - 0
-                : 0,
-        },
+        uptimes,
         metric: {
             cpu: `${Math.round(currentCpuUsage)} %`,
             memory: `${Math.round((memory.rss / totalMemory) * 100 * 100) / 100} %`,

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

@@ -13,7 +13,7 @@ export default async function systemMetricsFifthly({ pg = pgClients.client }) {
     logger.file("metric", {
         dbname: dbName,
         ...system.metric,
-        uptime: system.uptime,
+        ...system.uptimes,
         ...system.metricSort,
     });
     return { message: "Saved Fifthly" };

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

@@ -17,7 +17,7 @@ export default async function loggerMetrics(req, reply) {
     return {
         dbname: dbName,
         ...system.metric,
-        uptime: system.uptime,
+        ...system.uptimes,
         ...system.metricSort,
     };
 }

package/package.json

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