@opengis/fastify-table 2.4.9 → 2.4.11

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,MAAM,KAA8D,CAAC;AAgD3E,eAAe,MAAM,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,MAAM,KAA8D,CAAC;AAiD3E,eAAe,MAAM,CAAC"}

package/dist/config.js

@@ -12,21 +12,21 @@ Object.assign(config, {
     env: process.env.NODE_ENV,
     port: config.port || process.env.PORT,
 });
-if (existsSync(`.env.local`)) {
-    dotenv.config({ path: `.env.local` }); // ! load .env.local
-}
 // example: bun server kamianske
 if (process.cwd().split("\\").pop() &&
     process.cwd().split("\\").pop() === "fastify-table" &&
     process.argv[2] &&
     existsSync(`.env.${process.argv[2]}`)) {
-    dotenv.config({ path: `.env.${process.argv[2]}` }); // ! for debug only
+    dotenv.config({ path: `.env.${process.argv[2]}`, override: true }); // ! for debug only
 }
 if (process.env?.NODE_ENV && existsSync(`.env.${process.env.NODE_ENV}`)) {
-    dotenv.config({ path: `.env.${process.env.NODE_ENV}` }); // ! load .env.{{production}} etc.
+    dotenv.config({ path: `.env.${process.env.NODE_ENV}`, override: true }); // ! load .env.{{production}} etc.
 }
 if (process.env?.NODE_ENV && existsSync(`.env.${process.env.NODE_ENV}.local`)) {
-    dotenv.config({ path: `.env.${process.env.NODE_ENV}.local` }); // ! load .env.{{production}}.local etc.
+    dotenv.config({ path: `.env.${process.env.NODE_ENV}.local`, override: true }); // ! load .env.{{production}}.local etc.
+}
+if (existsSync(`.env.local`)) {
+    dotenv.config({ path: `.env.local`, override: true }); // ! load .env.local
 }
 function loadEnvConfig() {
     if (config.trace) {

package/dist/server/plugins/grpc/grpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grpc.d.ts","sourceRoot":"","sources":["../../../../server/plugins/grpc/grpc.ts"],"names":[],"mappings":"AA6HA,QAAA,MAAM,OAAO,WAGX,CAAC;AAEH,eAAe,OAAO,CAAC"}
+{"version":3,"file":"grpc.d.ts","sourceRoot":"","sources":["../../../../server/plugins/grpc/grpc.ts"],"names":[],"mappings":"AAyIA,QAAA,MAAM,OAAO,WAIX,CAAC;AAEH,eAAe,OAAO,CAAC"}

package/dist/server/plugins/grpc/grpc.js

@@ -66,6 +66,16 @@ if (convertServerAddress) {
         }
     });
 }
+const checkHealth = convertServerAddress
+    ? () => new Promise((resolve, reject) => {
+        convertClient.healthCheck({}, (err) => {
+            if (err && err.message !== "12 UNIMPLEMENTED: Method not found!") {
+                return reject(err);
+            }
+            resolve({ status: "ok" });
+        });
+    })
+    : () => Promise.resolve();
 const wrapGrpcCall = (methodName) => async (data) => new Promise((res, rej) => {
     if (!convertServerAddress) {
         logger.file("grpc/convert", {
@@ -98,6 +108,7 @@ const grpcMethods = methodNames.reduce((acc, name) => {
 }, {});
 const getGRPC = () => ({
     ...grpcMethods,
+    checkHealth,
     convertServerAddress,
 });
 export default getGRPC;

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

@@ -1,6 +1,7 @@
 syntax = "proto3";
 
 service Convert {
+  rpc HealthCheck (Empty) returns (HealthResponse);
   rpc csvToXls(csvToXlsParams) returns (FileBase64) {}
   rpc jsonToXls(jsonToXlsParams) returns (FileBase64) {}
   rpc pdfMerge(pdfMergeParams) returns (FileBase64) {}
@@ -20,6 +21,12 @@ service Convert {
   rpc geojsonToGpkg(geojsonToShpParams) returns (FileBase64) {}
 }
 
+message Empty {}
+
+message HealthResponse {
+  string status = 1;
+}
+
 message jsonToYamlIn {
   string json = 1;
 }

package/dist/server/routes/auth/controllers/2factor/providers/totp.d.ts

@@ -9,8 +9,12 @@ interface ICode {
     pg: ExtendedPG;
     enable?: boolean;
 }
-declare const enableSecret: ({ uid, pg }: ISecret) => Promise<void>;
-declare const deleteSecret: ({ uid, pg }: ISecret) => Promise<void>;
+declare const enableSecret: ({ uid, pg }: ISecret) => Promise<{
+    rowCount: any;
+}>;
+declare const deleteSecret: ({ uid, pg }: ISecret) => Promise<{
+    rowCount: any;
+}>;
 declare const getSecret: ({ uid, pg }: ISecret) => Promise<{
     secret: any;
     enabled: any;

package/dist/server/routes/auth/controllers/2factor/providers/totp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"totp.d.ts","sourceRoot":"","sources":["../../../../../../../server/routes/auth/controllers/2factor/providers/totp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAW1D,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,UAAU,CAAC;CAChB;AAED,UAAU,KAAK;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAuBD,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO,kBAK/C,CAAC;AAEF,QAAA,MAAM,SAAS,GAAU,aAAa,OAAO;;;;EAc5C,CAAC;AAuBF,QAAA,MAAM,QAAQ,GAAU,aAAa,OAAO;;;;;;;;;;;;EA0D3C,CAAC;AAEF,QAAA,MAAM,MAAM,GAAU,0BAA0B,KAAK;;;EAiBpD,CAAC;AAKF,QAAA,MAAM,MAAM,GAAU,2BAA2B,KAAK,iBAqBrD,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;;AAE3E,wBAAoB"}
+{"version":3,"file":"totp.d.ts","sourceRoot":"","sources":["../../../../../../../server/routes/auth/controllers/2factor/providers/totp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAW1D,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,UAAU,CAAC;CAChB;AAED,UAAU,KAAK;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAuBD,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO;;EAQ/C,CAAC;AAEF,QAAA,MAAM,YAAY,GAAU,aAAa,OAAO;;EAQ/C,CAAC;AAEF,QAAA,MAAM,SAAS,GAAU,aAAa,OAAO;;;;EAc5C,CAAC;AAuBF,QAAA,MAAM,QAAQ,GAAU,aAAa,OAAO;;;;;;;;;;;;EA0D3C,CAAC;AAEF,QAAA,MAAM,MAAM,GAAU,0BAA0B,KAAK;;;EAmBpD,CAAC;AAKF,QAAA,MAAM,MAAM,GAAU,2BAA2B,KAAK,iBAqBrD,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;;AAE3E,wBAAoB"}

package/dist/server/routes/auth/controllers/2factor/providers/totp.js

@@ -11,17 +11,23 @@ const getOTP = (id, secret) => {
     return `otpauth://totp/${issuer}:${encodeURIComponent(id.toString())}?secret=${secret}&period=30&digits=6&algorithm=SHA1&issuer=${encodeURIComponent(issuer)}`;
 };
 const enableSecret = async ({ uid, pg }) => {
-    await pg.query("update admin.users_social_auth set enabled=true where uid = $1 and social_auth_type = $2", [uid, TYPE]);
+    const rowCount = await pg
+        .query("update admin.users_social_auth set enabled=true where uid = $1 and social_auth_type = $2", [uid, TYPE])
+        .then((r) => r.rowCount);
+    return { rowCount };
 };
 const deleteSecret = async ({ uid, pg }) => {
-    await pg.query("delete from admin.users_social_auth where uid=$1 and social_auth_type = $2", [uid, TYPE]);
+    const rowCount = await pg
+        .query("delete from admin.users_social_auth where uid=$1 and social_auth_type = $2", [uid, TYPE])
+        .then((r) => r.rowCount);
+    return { rowCount };
 };
 const getSecret = async ({ uid, pg }) => {
     const { social_auth_code: secret, enabled, recoveryCodes, } = await pg
         .query(`select social_auth_code, enabled, social_auth_obj->'codesArray' as "recoveryCodes"
     from admin.users_social_auth 
     where uid = $1 and social_auth_type = $2`, [uid, TYPE])
-        .then((el) => el.rows?.[0] || {});
+        .then((r) => r.rows?.[0] || {});
     return { secret, enabled, recoveryCodes };
 };
 const addSecret = async ({ uid, secret, pg, recoveryCodes, otp }) => {
@@ -33,7 +39,7 @@ const updateSecret = async ({ uid, pg, secret, recoveryCodes, otp }) => {
         .query(`update admin.users_social_auth
     set social_auth_code=$3, social_auth_obj=$4::json, social_auth_url=$5
     where uid = $1 and social_auth_type = $2`, [uid, TYPE, secret, { codesArray: recoveryCodes }, otp])
-        .then((el) => el.rows?.[0] || {});
+        .then((r) => r.rows?.[0] || {});
     return result;
 };
 // return a new secret until it's enabled
@@ -51,7 +57,7 @@ const generate = async ({ uid, pg }) => {
     ];
     const userData = await pg
         .query(`select social_auth_id as code, coalesce(login,email) as login, email from admin.users where uid=$1`, [uid])
-        .then((el) => el.rows?.[0] || {});
+        .then((r) => r.rows?.[0] || {});
     const { sufix } = config.auth?.["2fa"] || {};
     if (sufix && !userData[sufix]) {
         console.warn("⚠️ 2fa prefix not found at userData");
@@ -90,7 +96,8 @@ const verify = async ({ uid, code: token, pg }) => {
     if (!secret) {
         throw new BadRequestError("Включіть двофакторну аутентифікацію");
     }
-    const isValid = authenticator.verify({ token, secret }) ||
+    const { valid } = await authenticator.verify({ token, secret });
+    const isValid = valid ||
         recoveryCodes.reduce((result, recoveryCode) => result || recoveryCode === token, false);
     if (!isValid) {
         throw new ForbiddenError("Невірний код");

package/dist/server/routes/util/controllers/api.check.d.ts

@@ -0,0 +1,2 @@
+export default function apiCheck(): Promise<any>;
+//# sourceMappingURL=api.check.d.ts.map

package/dist/server/routes/util/controllers/api.check.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"api.check.d.ts","sourceRoot":"","sources":["../../../../../server/routes/util/controllers/api.check.ts"],"names":[],"mappings":"AAqCA,wBAA8B,QAAQ,iBAkBrC"}

package/dist/server/routes/util/controllers/api.check.js

@@ -0,0 +1,36 @@
+import { HeadBucketCommand } from "@aws-sdk/client-s3";
+import config from "../../../../config.js";
+import grpc from "../../../plugins/grpc/grpc.js";
+import pgClients from "../../../plugins/pg/pgClients.js";
+import getRedis from "../../../plugins/redis/funcs/getRedis.js";
+import s3Client from "../../../plugins/file/providers/s3/client.js";
+import { applyHook } from "../../../../utils.js";
+const timeoutPromise = async (name, promise) => {
+    if (!promise) {
+        return Promise.resolve({ [name]: "not configured" });
+    }
+    return Promise.race([
+        promise.then(() => ({ [name]: "ok" })).catch(() => ({ [name]: "error" })),
+        new Promise((resolve) => setTimeout(() => resolve({ [name]: "timeout" }), timeoutMs)),
+    ]);
+};
+const { checkHealth, convertServerAddress } = grpc();
+const redisClient = getRedis();
+const timeoutMs = 300;
+const bucketParams = new HeadBucketCommand({
+    Bucket: config.s3?.containerName || "work",
+});
+/*addHook("afterApiCheck", async (result: Record<string, string>) => {
+  return { ...result, mapnik: "not configured" };
+});*/
+export default async function apiCheck() {
+    const timeStart = Date.now();
+    const res = await Promise.all([
+        timeoutPromise("redis", redisClient ? redisClient.ping() : undefined),
+        timeoutPromise("pg", pgClients.client ? pgClients.client.query("select 1") : undefined),
+        timeoutPromise("convert", convertServerAddress ? checkHealth() : undefined),
+        timeoutPromise("s3", s3Client ? s3Client.send(bucketParams) : undefined),
+    ]).then((result) => result.reduce((acc, curr) => ({ ...acc, ...curr }), {}));
+    const hootData = await applyHook("afterApiCheck", res);
+    return { time: Date.now() - timeStart, ...res, ...(hootData || {}) };
+}

package/dist/server/routes/util/controllers/api.list.js

@@ -49,7 +49,7 @@ export default function apiListService({ includeTags: queryIncludeTags, excludeT
         const markdownStr = toMarkdownTable(filteredRoutes3, Array.isArray(columns) ? columns : columns.split("|"));
         return {
             headers: {
-                "Content-Type": "text/markdown",
+                "Content-Type": "text/markdown; charset=utf-8",
             },
             data: markdownStr,
         };

package/dist/server/routes/util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/util/index.ts"],"names":[],"mappings":"AAWA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAmCtC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/util/index.ts"],"names":[],"mappings":"AAYA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAoCtC;AAED,eAAe,MAAM,CAAC"}

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

@@ -4,9 +4,11 @@ import statusMonitor from "./controllers/status.monitor.js";
 import userTokens from "./controllers/user.tokens.js";
 import codeGenerator from "./controllers/code.generator.js";
 import dependencies from "./controllers/dependencies.js";
+import apiCheck from "./controllers/api.check.js";
 const tags = ["core", "util"];
 function plugin(app, opt = {}) {
     app.get("/next-id", { config: { tags, policy: "L0" } }, nextId);
+    app.get("/check", { config: { tags, role: "admin" } }, apiCheck);
     app.get("/status-monitor", { config: { tags, role: "admin" } }, statusMonitor);
     app.get("/user-tokens/:token", { config: { tags, role: "admin|regular" } }, userTokens);
     app.get("/code-gen/:token/:column/:id?", { config: { tags, role: "admin|regular" } }, codeGenerator);

package/package.json

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