@opengis/fastify-table 2.4.10 → 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/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/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.10",
+  "version": "2.4.11",
   "type": "module",
   "description": "core-plugins",
   "keywords": [