@opengis/fastify-table 2.0.8 → 2.0.10

package/dist/index.js

@@ -1,3 +1,4 @@
+import fp from 'fastify-plugin';
 import path from "node:path";
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -37,7 +38,7 @@ 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) {
+function plugin(fastify) {
     const opt = { prefix: '/api' };
     // fastify.register(import('@fastify/sensible'), {
     //   errorHandler: false,
@@ -79,15 +80,15 @@ async function plugin(fastify) {
     addTemplateDir(path.join(cwd, "module/core"));
     // plugins / utils / funcs
     policyPlugin(fastify);
-    await authPlugin(fastify); // fastify-auth api + hooks integrated to core
+    authPlugin(fastify); // fastify-auth api + hooks integrated to core
     metricPlugin();
     redisPlugin(fastify);
-    await pgPlugin(fastify);
-    await sqlitePlugin(fastify);
+    pgPlugin(fastify);
+    sqlitePlugin(fastify);
     cronPlugin();
     loggerPlugin(fastify);
     if (config.rateLimit !== false) {
-        await fastify.register(import("@fastify/rate-limit"), {
+        fastify.register(import("@fastify/rate-limit"), {
             max: parseInt(config.rateLimit?.max || 100),
             timeWindow: config.rateLimit?.timeWindow || 60000,
             hook: "preHandler",
@@ -111,7 +112,7 @@ async function plugin(fastify) {
     fastify.register(templatesRoutes, opt);
     fastify.register(authRoutes); // from fastify-auth
     // from fastify-file
-    await fastify.register(import("@fastify/multipart"), {
+    fastify.register(import("@fastify/multipart"), {
         limits: {
             fileSize: maxFileSize * 1024 * 1024,
         },
@@ -163,4 +164,4 @@ async function plugin(fastify) {
         }
     });
 }
-export default plugin;
+export default fp(plugin);

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

@@ -7,22 +7,22 @@ import config from "../../../config.js";
 import getRedis from "../redis/funcs/getRedis.js";
 const fastifyPassport = new Authenticator();
 const { prefix = "/api" } = config;
-async function plugin(fastify) {
+function plugin(fastify) {
     if (!config.redis) {
         return;
     }
-    await fastify.register(cookie, {
+    fastify.register(cookie, {
         parseOptions: config?.auth?.cookieOptions || { secure: false },
     });
-    await fastify.register(session, {
+    fastify.register(session, {
         secret: config?.auth?.secret || "61b820e12858570a4b0633020d4394a17903d9a9",
         cookieName: "session_auth",
         cookie: config?.auth?.cookieOptions || { secure: false },
         store: new RedisStore({ client: getRedis({ db: 10 }) }),
     });
     // register passport AFTER session is ready
-    await fastify.register(fastifyPassport.initialize());
-    await fastify.register(fastifyPassport.secureSession());
+    fastify.register(fastifyPassport.initialize());
+    fastify.register(fastifyPassport.secureSession());
     // serialize user used to store user info in session store
     fastifyPassport.registerUserSerializer(async (user) => ({ user }));
     // deserialize user used to add user info from session store to req

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

@@ -1,7 +1,39 @@
-// import addHook from './funcs/addHook.js';
-// import applyHook from './funcs/applyHook.js';
-async function plugin() {
-    //   fastify.decorate('addHook', addHook);
-    //   fastify.decorate('applyHook', applyHook);
+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;
 }
-export default plugin;

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

@@ -22,10 +22,10 @@ async function getHeadersPG(req) {
     }
     return null;
 }
-async function plugin(fastify) {
-    const client = await getPGAsync({ ...(config.pg || {}), name: "client" });
+function plugin(fastify) {
     fastify.addHook("onRequest", async (req) => {
         const headersPG = await getHeadersPG(req);
+        const client = await getPGAsync({ ...(config.pg || {}), name: "client" });
         req.pg = headersPG || req.pg || client || pgClients.client;
         if (headersPG) {
             req.user = { uid: req.headers?.uid };

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

@@ -1,3 +1,4 @@
+import config from "../../../config.js";
 // login-password
 import login from "./controllers/core/login.js";
 import registration from "./controllers/core/registration.js";
@@ -19,7 +20,7 @@ import oauthAuthorize from "./controllers/jwt/authorize.js";
 import oauthToken from "./controllers/jwt/token.js";
 const params = { config: { policy: "L0" } };
 async function plugin(app, opt = {}) {
-    if (opt.routes === false) {
+    if (opt.routes === false || config.auth?.customRoutes) {
         return;
     }
     if (!app.hasRoute({ method: "GET", url: "/logout" })) {
@@ -66,19 +67,18 @@ async function plugin(app, opt = {}) {
     }
     // euSign
     if (!app.hasRoute({ method: "GET", url: "/auth/by_data" }) &&
-        !opt.auth?.customRoutes &&
-        !opt.auth?.customGovId) {
+        !config.auth?.customGovId) {
         app.get("/auth/by_data", params, authByData);
     }
     // pages
     if (!app.hasRoute({ method: "GET", url: "/2factor" }) &&
-        !opt.auth?.disable &&
-        !opt.auth?.login2factorPage) {
+        !config.auth?.disable &&
+        !config.auth?.login2factorPage) {
         app.get("/2factor", params, login2faTemplate);
     }
     if (!app.hasRoute({ method: "GET", url: "/login" }) &&
-        !opt.auth?.disable &&
-        !opt?.auth?.loginPage) {
+        !config.auth?.disable &&
+        !config?.auth?.loginPage) {
         app.get("/login", params, loginTemplate);
     }
 }

package/package.json

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

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

@@ -1,137 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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/funcs/addHook.js

@@ -1,7 +0,0 @@
-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

@@ -1,25 +0,0 @@
-/* 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

@@ -1,7 +0,0 @@
-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;
-}