@opengis/fastify-table 2.0.81 → 2.0.83

package/dist/server/plugins/file/utils/isFileExists.js

@@ -1,12 +1,12 @@
-import { access } from "node:fs/promises";
+import { stat } from "node:fs/promises";
 import getPath from "./getPath.js";
 const isFileExists = async (filepath) => {
     const fullPath = getPath(filepath, { check: true });
     if (!fullPath)
         return false;
     try {
-        await access(fullPath);
-        return true;
+        const stats = await stat(fullPath);
+        return stats.isFile();
     }
     catch (err) {
         return false;

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/dist/server/routes/file/controllers/files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAU5C;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAA8B,OAAO,CACnC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACvC,KAAK,EAAE,YAAY,gBA+CpB"}
+{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAU5C;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAA8B,OAAO,CACnC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACvC,KAAK,EAAE,YAAY,gBAgDpB"}

package/dist/server/routes/file/controllers/resize.d.ts

@@ -10,6 +10,7 @@ export default function resize({ query, unittest, }: {
         w?: string;
         h?: string;
         nocache?: any;
+        format?: string;
     };
     unittest?: any;
 }, reply: FastifyReply): Promise<never>;

package/dist/server/routes/file/controllers/resize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resize.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA6B5C;;GAEG;AAEH,wBAA8B,MAAM,CAClC,EACE,KAAK,EACL,QAAQ,GACT,EAAE;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC;QACb,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;IACF,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,kBAuGpB"}
+{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resize.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA+B5C;;GAEG;AAEH,wBAA8B,MAAM,CAClC,EACE,KAAK,EACL,QAAQ,GACT,EAAE;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC;QACb,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,EACD,KAAK,EAAE,YAAY,kBAsHpB"}

package/dist/server/routes/file/controllers/resize.js

@@ -1,4 +1,5 @@
 import path from "node:path";
+import sharp from "sharp";
 import { imageSize } from "image-size";
 import { config, downloadFile, uploadFile, isFileExists, } from "../../../../utils.js";
 import grpc from "../../../plugins/grpc/grpc.js";
@@ -18,7 +19,7 @@ const { resizeImage } = grpc();
  * Апі використовується для зміни розміру фото за шляхом
  */
 export default async function resize({ query, unittest, }, reply) {
-    const { filepath, quality, size, w, h, nocache } = query || {};
+    const { filepath, quality, size, w, h, nocache, format } = query || {};
     if (!filepath) {
         return reply.status(400).send("not enough query params: filepath");
     }
@@ -31,17 +32,23 @@ export default async function resize({ query, unittest, }, reply) {
         ? filepath.replace(basename, `${size}_resized_${basename}`)
         : filepath.replace(basename, `${w || defaultWidth}_${h || (w ? "" : defaultHeight)}_resized_${basename}`);
     // get Resize Data
-    const fileExists = await isFileExists(resizePath1);
-    const originalFileExists = await isFileExists(resizePath1.replace("files/", "files/original/")); // resize-all API compatibility
-    const resizePath = originalFileExists
-        ? resizePath1.replace("files/", "files/original/")
+    const resizePath2 = format === "webp"
+        ? resizePath1.replace(path.extname(resizePath1), ".webp")
         : resizePath1;
+    const fileExists = await isFileExists(resizePath2);
+    const originalFileExists = await isFileExists(resizePath2.replace("files/", "files/original/")); // resize-all API compatibility
+    const resizePath = originalFileExists
+        ? resizePath2.replace("files/", "files/original/")
+        : resizePath2;
     const resizeData = fileExists
         ? await downloadFile(resizePath, { buffer: true })
         : null;
     if (resizeData && !config.disableCache && !nocache && !unittest) {
         return reply
-            .headers({ "Content-Type": mimeType, "Cache-control": "max-age=604800" })
+            .headers({
+            "Content-Type": format === "webp" ? "image/webp" : mimeType,
+            "Cache-control": "max-age=604800",
+        })
             .send(resizeData);
     }
     // get File Data
@@ -80,6 +87,13 @@ export default async function resize({ query, unittest, }, reply) {
         quality: resizeQuality,
     });
     await uploadFile(resizePath, Buffer.from(result, "base64"));
+    if (format === "webp") {
+        const buffer = await sharp(Buffer.from(result, "base64"))
+            .webp({ quality: resizeQuality })
+            .toBuffer({ resolveWithObject: false });
+        await uploadFile(resizePath2, buffer);
+        return reply.headers({ "Content-Type": "image/webp" }).send(buffer);
+    }
     return reply
         .headers({ "Content-Type": mimeType })
         .send(Buffer.from(result, "base64"));

package/package.json

@@ -1,88 +1,89 @@
-{
-  "name": "@opengis/fastify-table",
-  "version": "2.0.81",
-  "type": "module",
-  "description": "core-plugins",
-  "keywords": [
-    "fastify",
-    "table",
-    "crud",
-    "auth",
-    "pg",
-    "backend"
-  ],
-  "main": "dist/index.js",
-  "exports": {
-    ".": "./dist/index.js",
-    "./index.js": "./dist/index.js",
-    "./utils.js": "./dist/utils.js"
-  },
-  "files": [
-    "dist/*"
-  ],
-  "scripts": {
-    "prepublishOnly": "npm run build",
-    "clean": "tsc -b --clean",
-    "build": "tsc -b --clean && tsc && copyfiles server/plugins/grpc/utils/*.proto dist && copyfiles server/migrations/*.sql dist && copyfiles server/templates/**/*.html dist",
-    "prod": "NODE_ENV=production bun dist/server",
-    "patch": "npm version patch && git push && npm publish",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "test": "bun test",
-    "compress": "node compress.js",
-    "dev1": "bun --hot dist/server",
-    "dev": "NODE_ENV=production bun start",
-    "start": "LOG_LEVEL=trace bun server"
-  },
-  "dependencies": {
-    "@aws-sdk/client-s3": "3.879.0",
-    "@aws-sdk/lib-storage": "3.879.0",
-    "@fastify/cookie": "11.0.2",
-    "@fastify/http-proxy": "11.1.2",
-    "@fastify/multipart": "9.0.3",
-    "@fastify/passport": "3.0.2",
-    "@fastify/rate-limit": "10.3.0",
-    "@fastify/session": "11.1.0",
-    "@grpc/grpc-js": "1.10.11",
-    "@grpc/proto-loader": "0.7.15",
-    "apache-crypt": "1.2.6",
-    "better-sqlite3": "12.2.0",
-    "dotenv": "16.5.0",
-    "fastify": "5.3.3",
-    "fastify-plugin": "5.0.1",
-    "fastify-session-redis-store": "7.1.2",
-    "handlebars": "4.7.8",
-    "image-size": "1.2.0",
-    "ioredis": "5.3.2",
-    "js-yaml": "4.1.0",
-    "markdown-it": "14.1.0",
-    "nodemailer": "7.0.6",
-    "otplib": "12.0.1",
-    "pg": "8.11.6",
-    "pino": "9.5.0",
-    "pino-abstract-transport": "2.0.0",
-    "promised-handlebars": "2.0.1",
-    "qrcode": "1.5.4",
-    "uglify-js": "3.19.3",
-    "undici": "7.16.0"
-  },
-  "devDependencies": {
-    "@types/better-sqlite3": "^7.6.13",
-    "@types/bun": "^1.2.21",
-    "@types/js-yaml": "^4.0.9",
-    "@types/markdown-it": "^14.1.2",
-    "@types/node": "^24.3.1",
-    "@types/nodemailer": "^7.0.1",
-    "@types/passport": "^1.0.17",
-    "@types/passport-local": "^1.0.38",
-    "@types/pg": "^8.15.5",
-    "@types/qrcode": "^1.5.5",
-    "copyfiles": "^2.4.1",
-    "eslint": "^9.35.0",
-    "eslint-config-airbnb-extended": "^2.3.1",
-    "ts-migrate": "^0.1.35",
-    "typescript": "^5.9.2",
-    "vitest": "^3.2.4"
-  },
-  "author": "Softpro",
-  "license": "ISC"
-}
+{
+  "name": "@opengis/fastify-table",
+  "version": "2.0.83",
+  "type": "module",
+  "description": "core-plugins",
+  "keywords": [
+    "fastify",
+    "table",
+    "crud",
+    "auth",
+    "pg",
+    "backend"
+  ],
+  "main": "dist/index.js",
+  "exports": {
+    ".": "./dist/index.js",
+    "./index.js": "./dist/index.js",
+    "./utils.js": "./dist/utils.js"
+  },
+  "files": [
+    "dist/*"
+  ],
+  "scripts": {
+    "prepublishOnly": "npm run build",
+    "clean": "tsc -b --clean",
+    "build": "tsc -b --clean && tsc && copyfiles server/plugins/grpc/utils/*.proto dist && copyfiles server/migrations/*.sql dist && copyfiles server/templates/**/*.html dist",
+    "prod": "NODE_ENV=production bun dist/server",
+    "patch": "npm version patch && git push && npm publish",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "test": "bun test",
+    "compress": "node compress.js",
+    "dev1": "bun --hot dist/server",
+    "dev": "NODE_ENV=production bun start",
+    "start": "LOG_LEVEL=trace bun server"
+  },
+  "dependencies": {
+    "@aws-sdk/client-s3": "3.879.0",
+    "@aws-sdk/lib-storage": "3.879.0",
+    "@fastify/cookie": "11.0.2",
+    "@fastify/http-proxy": "11.1.2",
+    "@fastify/multipart": "9.0.3",
+    "@fastify/passport": "3.0.2",
+    "@fastify/rate-limit": "10.3.0",
+    "@fastify/session": "11.1.0",
+    "@grpc/grpc-js": "1.10.11",
+    "@grpc/proto-loader": "0.7.15",
+    "apache-crypt": "1.2.6",
+    "better-sqlite3": "12.2.0",
+    "dotenv": "16.5.0",
+    "fastify": "5.3.3",
+    "fastify-plugin": "5.0.1",
+    "fastify-session-redis-store": "7.1.2",
+    "handlebars": "4.7.8",
+    "image-size": "1.2.0",
+    "ioredis": "5.3.2",
+    "js-yaml": "4.1.0",
+    "markdown-it": "14.1.0",
+    "nodemailer": "7.0.6",
+    "otplib": "12.0.1",
+    "pg": "8.11.6",
+    "pino": "9.5.0",
+    "pino-abstract-transport": "2.0.0",
+    "promised-handlebars": "2.0.1",
+    "qrcode": "1.5.4",
+    "sharp": "0.34.5",
+    "uglify-js": "3.19.3",
+    "undici": "7.16.0"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/bun": "^1.2.21",
+    "@types/js-yaml": "^4.0.9",
+    "@types/markdown-it": "^14.1.2",
+    "@types/node": "^24.3.1",
+    "@types/nodemailer": "^7.0.1",
+    "@types/passport": "^1.0.17",
+    "@types/passport-local": "^1.0.38",
+    "@types/pg": "^8.15.5",
+    "@types/qrcode": "^1.5.5",
+    "copyfiles": "^2.4.1",
+    "eslint": "^9.35.0",
+    "eslint-config-airbnb-extended": "^2.3.1",
+    "ts-migrate": "^0.1.35",
+    "typescript": "^5.9.2",
+    "vitest": "^3.2.4"
+  },
+  "author": "Softpro",
+  "license": "ISC"
+}