@opengis/fastify-table 2.0.7 → 2.0.8

package/dist/index.js

@@ -1,4 +1,3 @@
-import fp from "fastify-plugin";
 import path from "node:path";
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -17,20 +16,29 @@ import metricPlugin from "./server/plugins/metric/index.js";
 import redisPlugin from "./server/plugins/redis/index.js";
 import loggerPlugin from "./server/plugins/logger/index.js";
 import authPlugin from "./server/plugins/auth/index.js";
+// routes
+import cronRoutes from "./server/routes/cron/index.js";
+import crudRoutes from "./server/routes/crud/index.js";
+import loggerRoutes from "./server/routes/logger/index.js";
+import propertiesRoutes from "./server/routes/properties/index.js";
+import tableRoutes from "./server/routes/table/index.js";
+import utilRoutes from "./server/routes/util/index.js";
+import accessRoutes from "./server/routes/access/index.js";
 // utils
 import addTemplateDir from "./server/plugins/table/funcs/addTemplateDir.js";
 import execMigrations from "./server/plugins/migration/exec.migrations.js";
 import locales from "./server/routes/table/controllers/utils/locales.js";
 import pgClients from "./server/plugins/pg/pgClients.js";
+import dblistRoutes from "./server/routes/dblist/index.js";
+import menuRoutes from "./server/routes/menu/index.js";
+import templatesRoutes from "./server/routes/templates/index.js";
+import widgetRoutes from "./server/routes/widget/index.js";
+import authRoutes from "./server/routes/auth/index.js";
 // core templates && cls
 const filename = fileURLToPath(import.meta.url);
 const cwd = path.dirname(filename);
-async function plugin(fastify, opt) {
-    const prefix = opt.prefix ?? "/api";
-    config.pg = opt.pg || config.pg;
-    config.redis = opt.redis || config.redis;
-    config.root = opt.root || config.root;
-    config.mapServerRoot = opt.mapServerRoot || config.mapServerRoot;
+async function plugin(fastify) {
+    const opt = { prefix: '/api' };
     // fastify.register(import('@fastify/sensible'), {
     //   errorHandler: false,
     // });
@@ -69,10 +77,9 @@ async function plugin(fastify, opt) {
     // core templates && cls
     config.templates?.forEach((el) => addTemplateDir(el));
     addTemplateDir(path.join(cwd, "module/core"));
-    // plugins
-    policyPlugin(fastify); // !first
-    // ! fastify-auth api + hooks integrated to core
-    await authPlugin(fastify); // ! session, before any route
+    // plugins / utils / funcs
+    policyPlugin(fastify);
+    await authPlugin(fastify); // fastify-auth api + hooks integrated to core
     metricPlugin();
     redisPlugin(fastify);
     await pgPlugin(fastify);
@@ -88,30 +95,29 @@ async function plugin(fastify, opt) {
             keyGenerator: (req) => `${req.ip}-${req.raw.url.split("?")[0]}`,
         });
     }
-    // routes / api
     if (config.dblist) {
-        fastify.register(import("./server/routes/dblist/index.js")); // ! without prefix
+        dblistRoutes(fastify);
     }
-    fastify.register(import("./server/routes/cron/index.js"), { prefix });
-    fastify.register(import("./server/routes/crud/index.js"), { prefix });
-    fastify.register(import("./server/routes/logger/index.js")); // ! without prefix
-    fastify.register(import("./server/routes/properties/index.js"), { prefix });
-    fastify.register(import("./server/routes/table/index.js"), { prefix });
-    fastify.register(import("./server/routes/util/index.js"), { prefix });
-    fastify.register(import("./server/routes/access/index.js"), { prefix });
-    fastify.register(import("./server/routes/menu/index.js"), { prefix });
-    fastify.register(import("./server/routes/templates/index.js"), { prefix });
-    fastify.register(import("./server/routes/widget/index.js"), { prefix });
-    // ! from fastify-auth, without prefix
-    fastify.register(import("./server/routes/auth/index.js"));
-    // ! from fastify-file, without prefix
+    // routes / api
+    cronRoutes(fastify);
+    fastify.register(crudRoutes, opt);
+    loggerRoutes(fastify);
+    fastify.register(propertiesRoutes, opt);
+    fastify.register(tableRoutes, opt);
+    utilRoutes(fastify);
+    fastify.register(accessRoutes, opt);
+    fastify.register(widgetRoutes, opt);
+    fastify.register(menuRoutes, opt);
+    fastify.register(templatesRoutes, opt);
+    fastify.register(authRoutes); // from fastify-auth
+    // from fastify-file
     await fastify.register(import("@fastify/multipart"), {
         limits: {
             fileSize: maxFileSize * 1024 * 1024,
         },
     }); // content parser, await before adding upload routes
-    fastify.register(import("./server/routes/file/index.js"));
-    fastify.register(import("./server/routes/grpc/index.js"));
+    fastify.register(import("./server/routes/file/index.js"), opt);
+    fastify.register(import("./server/routes/grpc/index.js"), opt);
     config.proxy?.forEach?.((el) => {
         if (execName === "bun") {
             fastify.all(`${el.source}/*`, async (req, reply) => {
@@ -157,4 +163,4 @@ async function plugin(fastify, opt) {
         }
     });
 }
-export default fp(plugin);
+export default plugin;

package/dist/server/plugins/auth/funcs/authorizeUser.js

@@ -1,6 +1,6 @@
 import config from "../../../../config.js";
 import logger from "../../logger/getLogger.js";
-import { applyHook } from "../../hook/index.js";
+import applyHook from "../../hook/applyHook.js";
 import logAuth from "./logAuth.js";
 /*
 session duration by default

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

@@ -68,7 +68,7 @@ async function plugin(fastify) {
         req.user = req.user === null ? undefined : req.user; // fix for user.uid errors, by default user is null, while with express passport it was {}, unauthorized user does not trigger serializer
         // already done by @fastify/passport serializer / deserializer
         // req.user = passport.user;
-        if (config.trace) {
+        if (config.trace && false) {
             console.log("req.user?.uid", req.user?.uid, "req.session?.passport?.user?.uid", req.session?.passport?.user?.uid, "config.auth", config.auth);
         }
         // currently 2factor + auth with passwd file not supported

package/dist/server/plugins/crud/funcs/getAccess.js

@@ -1,6 +1,6 @@
 import pgClients from "../../pg/pgClients.js";
 import getTemplate from "../../table/funcs/getTemplate.js";
-import { applyHook } from "../../hook/index.js";
+import applyHook from "../../hook/applyHook.js";
 const allActions = ["view", "edit", "add", "del"];
 const q = `select a.route_id as id, d.actions as user_roles, d.actions as role_actions, coalesce(b.actions, array['view']) as interface_actions, b.scope, c.role_id
 from admin.routes a 

package/dist/server/plugins/grpc/utils/server/plugins/grpc/utils/convertp.proto

@@ -0,0 +1,137 @@
+syntax = "proto3";
+
+service Convert {
+  rpc csvToXls(csvToXlsParams) returns (FileBase64) {}
+  rpc jsonToXls(jsonToXlsParams) returns (FileBase64) {}
+  rpc pdfMerge(pdfMergeParams) returns (FileBase64) {}
+  rpc htmlToPdf(htmlToPdfParams) returns (FileBase64) {}
+  rpc excelToJson(excelToJsonParams) returns (FileBase64) {}
+  rpc xmlToJson(xmlToJsonParams) returns (FileBase64) {}
+  rpc htmlToDoc(htmlToDocParams) returns (FileBase64) {}
+  rpc htmlToImage(htmlToImageParams) returns (FileBase64) {}
+  rpc geojsonToShp(geojsonToShpParams) returns (FileBase64) {}
+  rpc shpToGeojson(shpToGeojsonParams) returns (FileBase64) {}
+  rpc docToPDF(docToPDFParams) returns (FileBase64) {}
+  rpc mergeImages(mergeImagesIn) returns (FileBase64) {}
+  rpc resizeImage(resizeImageIn) returns (FileBase64) {}
+  rpc jsonToYaml(jsonToYamlIn) returns (FileBase64) {}
+  rpc yamlToJson(yamlToJsonIn) returns (FileBase64) {}
+  rpc log(log_in) returns (log_out) {}
+  rpc geojsonToGpkg(geojsonToShpParams) returns (FileBase64) {}
+}
+
+message jsonToYamlIn {
+  string json = 1;
+}
+
+message yamlToJsonIn {
+  string yaml = 1;
+}
+
+message resizeImageIn {
+  string base64 = 1;
+  uint64 width = 2;
+  uint64 height = 3;
+  uint32 quality = 4;
+  uint32 subsampling = 5;
+}
+
+message pdfToImgIn {
+  string pdfPath = 1;
+  string imgPath = 2;
+}
+
+message pdfToImgOut {
+  string imgPath = 1;
+}
+
+message log_in {
+	uint32 rows = 1;
+	string level = 2;
+}
+
+message log_out {
+	repeated string logs = 1;
+}
+
+enum mergeImageFormat {
+  VERTICAL = 0;
+  HORIZONTAL = 1;
+  OVERLAY = 2;
+}
+
+message imageMeta {
+  string base64 = 1;
+  mergeImageFormat mergeFormat = 2;
+}
+
+message mergeImagesIn {
+  repeated string images = 1;
+  repeated imageMeta imagesMeta = 2;
+  string background = 3;
+  string mergeFormat = 4;
+}
+
+message docToPDFParams {
+  string base64 = 1;
+  string to = 2;
+  string ext = 3;
+}
+
+message shpToGeojsonParams {
+  string base64 = 1;
+}
+
+message geojsonToShpParams {
+  string geojson = 1;
+  string proj = 2;
+}
+
+message xmlToJsonParams {
+  string xml = 1;
+}
+
+message jsonToXlsParams {
+  string json = 1;
+  string header = 2;
+  string subheader = 3;
+  string colmodel = 4;
+}
+
+message csvToXlsParams {
+  string csv = 1;
+  string header = 2;
+  string subheader = 3;
+  string separator = 4;
+}
+
+message excelToJsonParams {
+  string base64 = 1;
+  string type = 2;
+  string delimiter = 3;
+  string encoding = 4;
+}
+
+message htmlToPdfParams {
+  string html = 1;
+  string pdfPageConfig = 2;
+}
+
+message pdfMergeParams {
+  repeated string mergeFiles = 1;
+}
+
+message htmlToImageParams {
+  string html = 1;
+  string format = 2;
+  uint64 width = 3;
+  uint64 height = 4;
+}
+
+message htmlToDocParams {
+  string html = 1;
+}
+
+message FileBase64 {
+  string result = 1;
+}

package/dist/server/plugins/grpc/utils/server/plugins/grpc/utils/office2pdf.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+service OfficeConverterService {
+  rpc OfficeToPdf(OfficeToPdfRequest) returns (OfficeToPdfResponse) {}
+}
+
+message OfficeToPdfRequest {
+  string file = 1;
+  string ext = 2;
+}
+
+message OfficeToPdfResponse {
+  string file = 1;
+}

package/dist/server/plugins/hook/addHook.js

@@ -0,0 +1,7 @@
+import hookList from './hookList.js';
+export default function addHook(name, fn) {
+    if (!hookList[name]) {
+        hookList[name] = [];
+    }
+    hookList[name].push(fn);
+}

package/dist/server/plugins/hook/applyHook.js

@@ -0,0 +1,18 @@
+import hookList from './hookList.js';
+export default async function applyHook(name, data) {
+    if (!hookList[name]?.length)
+        return null;
+    const result = {};
+    await Promise.all(hookList[name].map(async (hook) => {
+        const hookData = await hook({ ...data });
+        if (hookData) {
+            Object.assign(result, hookData);
+        }
+    })).catch((err) => {
+        console.error("applyHook", name, err.toString());
+    });
+    if (Object.keys(result).length) {
+        return result;
+    }
+    return null;
+}

package/dist/server/plugins/hook/applyHookSync.js

@@ -0,0 +1,7 @@
+import hookList from './hookList.js';
+export default function applyHookSync(name, data) {
+    if (!hookList[name]?.length)
+        return null;
+    const hookData = hookList[name].map((hook) => hook(data))[0];
+    return hookData;
+}

package/dist/server/plugins/hook/funcs/addHook.js

@@ -0,0 +1,7 @@
+import hookList from "../hookList.js";
+export default function addHook(name, fn) {
+    if (!hookList[name]) {
+        hookList[name] = [];
+    }
+    hookList[name].push(fn);
+}

package/dist/server/plugins/hook/funcs/applyHook.js

@@ -0,0 +1,25 @@
+/* eslint-disable no-console */
+import config from "../../../../config.js";
+import hookList from "../hookList.js";
+export default async function applyHook(name, data) {
+    const { trace } = config;
+    if (trace)
+        console.log("applyHook", name);
+    if (!hookList[name]?.length)
+        return null;
+    const result = {};
+    await Promise.all(hookList[name].map(async (hook) => {
+        const hookData = await hook({ ...data, config });
+        if (hookData) {
+            if (trace)
+                console.log("applyHook", name, hookData);
+            Object.assign(result, hookData);
+        }
+    })).catch((err) => {
+        console.error("applyHook", name, err.toString());
+    });
+    if (Object.keys(result).length) {
+        return result;
+    }
+    return null;
+}

package/dist/server/plugins/hook/funcs/applyHookSync.js

@@ -0,0 +1,7 @@
+import hookList from "../hookList.js";
+export default function applyHookSync(name, data) {
+    if (!hookList[name]?.length)
+        return null;
+    const hookData = hookList[name].map((hook) => hook(data))[0];
+    return hookData;
+}

package/dist/server/plugins/hook/hookList.js

@@ -0,0 +1 @@
+export default {};

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

@@ -1,39 +1,7 @@
-import config from "../../../config.js";
-export const hookList = {};
-export async function applyHook(name, data) {
-    if (config.trace)
-        console.log("applyHook", name);
-    if (!hookList[name]?.length)
-        return null;
-    const result = {};
-    await Promise.all(hookList[name].map(async (hook) => {
-        const hookData = await hook({ ...data, config });
-        if (hookData) {
-            if (config.trace)
-                console.log("applyHook", name, hookData);
-            Object.assign(result, hookData);
-        }
-    })).catch((err) => {
-        console.error("applyHook", name, err.toString());
-    });
-    if (Object.keys(result).length) {
-        return result;
-    }
-    return null;
-}
-export function addHook(name, fn) {
-    if (!hookList[name]) {
-        hookList[name] = [];
-    }
-    if (config.trace)
-        console.log("addHook", name);
-    hookList[name].push(fn);
-}
-export function applyHookSync(name, data) {
-    if (!hookList[name]?.length)
-        return null;
-    if (config.trace)
-        console.log("applyHookSync", name);
-    const hookData = hookList[name].map((hook) => hook(data))[0];
-    return hookData;
+// import addHook from './funcs/addHook.js';
+// import applyHook from './funcs/applyHook.js';
+async function plugin() {
+    //   fastify.decorate('addHook', addHook);
+    //   fastify.decorate('applyHook', applyHook);
 }
+export default plugin;

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

@@ -1,5 +1,5 @@
 import config from "../../../config.js";
-import { applyHookSync } from "../hook/index.js";
+import applyHookSync from "../hook/applyHookSync.js";
 import errorStatus from "./errorStatus.js";
 const defaultMessage = {
     602: "Порушення цілісності бази даних",

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

@@ -1,4 +1,4 @@
-import { applyHookSync } from "../hook/index.js";
+import applyHookSync from "../hook/applyHookSync.js";
 function errorStatus(error) {
     const hook = applyHookSync("errorStatus", error);
     if (hook)

package/dist/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -1,4 +1,4 @@
-import { applyHookSync } from "../../../../hook/index.js";
+import applyHookSync from "../../../../hook/applyHookSync.js";
 import getRangeQuery from "./getRangeQuery.js";
 export default function formatValue({ pg, table, filter = {}, name, value, dataTypeID, uid = 1, optimize, }) {
     const { extra, sql, select, strict, options /* default: defaultValue, */ } = filter;

package/dist/utils.js

@@ -52,7 +52,8 @@ export { default as validateData } from "./server/plugins/crud/funcs/validateDat
 // policy
 export { default as checkXSS } from "./server/plugins/policy/funcs/checkXSS.js";
 // hook
-export * from "./server/plugins/hook/index.js";
+export { default as addHook } from "./server/plugins/hook/addHook.js";
+export { default as applyHook } from "./server/plugins/hook/applyHook.js";
 export { default as execMigrations } from "./server/plugins/migration/exec.migrations.js";
 export { default as execSql } from "./server/plugins/migration/exec.sql.js";
 // cron

package/package.json

@@ -1,88 +1,88 @@
-{
-  "name": "@opengis/fastify-table",
-  "version": "2.0.7",
-  "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": "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.8",
+  "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": "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"
+}