@opengis/fastify-table 2.0.81 → 2.0.82

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

@@ -14,35 +14,50 @@ const filesFolder = getFolder(config);
 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`;
+const prev = {};
+const cpuUsage = () => {
+    const usage = process.cpuUsage();
+    const cpus = os.cpus();
+    const total = cpus.reduce((acc, curr) => acc + Object.values(curr.times).reduce((a, b) => a + b, 0), 0);
+    if (!prev.usage || !prev.total) {
+        Object.assign(prev, { usage, total });
+        return 0;
+    }
+    const diffUsage = (usage.user - prev.usage.user + usage.system - prev.usage.system) / 1000;
+    const diffTotal = total - prev.total;
+    Object.assign(prev, { usage, total });
+    return (diffUsage / diffTotal) * cpus.length * 100;
+};
+cpuUsage();
 export default async function loggerSystem(req) {
     const { pg = pgClients.client } = req || {};
     const dbName = pg?.options?.database;
     const dbsize = config.redis
         ? await rclient.get(`${dbName}:content:dbsize:${redisKey}`)
         : null;
-    const dbVerion = await pg
-        .query("select version();")
-        .then((el) => el.rows?.[0]?.version);
+    const dbVerion = pg?.query
+        ? await pg
+            .query("select version();")
+            .then((el) => el.rows?.[0]?.version)
+        : null;
     const dbSize = dbsize ||
-        (await pg
-            .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])
-        .then((el) => el.rows || []);
+        (pg?.query
+            ? await pg
+                .query(`select pg_size_pretty(pg_database_size($1))`, [dbName])
+                .then((el) => el.rows?.[0]?.pg_size_pretty)
+            : null);
+    const query = pg?.query
+        ? await pg.query(sqlQuery, [dbName]).then((el) => el.rows || [])
+        : null;
     const { stdout: topProcess } = platform === "win32"
         ? { stdout: "Cant show top on this system type" }
         : await execAsync("top -b -n 1");
     const osInfo = `${os.version()} ${os.machine?.() || ""}`;
     const cpuInfo = os.cpus();
-    const totalCpu = Object.values(cpuInfo?.[0]?.times || {}).reduce((acc, tv) => acc + tv, 0) *
-        cpuInfo.length;
     const totalMemory = os.totalmem();
     const memory = process.memoryUsage();
     const resource = process.resourceUsage();
-    const currentCpuUsage = (((process.cpuUsage().user + process.cpuUsage().system) * 1000) /
-        totalCpu) *
-        100;
+    const currentCpuUsage = cpuUsage();
     const redisInfo = config.redis ? await rclient.info() : "";
     const lines = redisInfo.split("\r\n").filter((el) => el && el.split);
     const redis = {};
@@ -56,9 +71,11 @@ export default async function loggerSystem(req) {
         await rclient.set(`${dbName}:content:dbsize:${redisKey}`, dbSize, "EX", 30 * 60);
     }
     const latency = config.redis ? await rclient.latency("latest") : null;
-    const uptime = await pg
-        .query("select extract('epoch' from current_timestamp - pg_postmaster_start_time())::int as uptime")
-        .then((el) => el.rows?.[0]?.uptime);
+    const uptime = pg?.query
+        ? await pg
+            .query("select extract('epoch' from current_timestamp - pg_postmaster_start_time())::int as uptime")
+            .then((el) => el.rows?.[0]?.uptime)
+        : null;
     const metric5 = config.redis
         ? await rclient2.hgetall(`${dbName}:system_metrics`)
         : {};

package/dist/server/plugins/pg/pgClients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pgClients.d.ts","sourceRoot":"","sources":["../../../../server/plugins/pg/pgClients.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;AAgB1C,eAAe,SAAS,CAAC"}
+{"version":3,"file":"pgClients.d.ts","sourceRoot":"","sources":["../../../../server/plugins/pg/pgClients.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;AAiB1C,eAAe,SAAS,CAAC"}

package/dist/server/plugins/pg/pgClients.js

@@ -10,6 +10,7 @@ if (config.pg) {
         user: config.pg?.user || "postgres",
         password: config.pg?.password || "postgres",
         statement_timeout: config.pg?.statement_timeout || 10000,
+        connectionTimeoutMillis: config.pg?.connectionTimeoutMillis || 5000,
     });
     client.init = async () => {
         await init(client);

package/package.json

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