@opengis/fastify-table 2.0.103 → 2.0.105

package/dist/server/plugins/logger/getLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getLogger.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/getLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,UAAU,cAAe,SAAQ,IAAI,CAAC,MAAM;IAC1C,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5D;AAkDD,QAAA,MAAM,MAAM,EAAE,cAAgD,CAAC;AA4B/D,eAAe,MAAM,CAAC"}
+{"version":3,"file":"getLogger.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/getLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,UAAU,cAAe,SAAQ,IAAI,CAAC,MAAM;IAC1C,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5D;AAgDD,QAAA,MAAM,MAAM,EAAE,cAAgD,CAAC;AA+B/D,eAAe,MAAM,CAAC"}

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

@@ -7,7 +7,6 @@ import getHooks from "./getHooks.js";
 import serializers from "./serializers.js";
 import timestampWithTimeZone from "./timestampWithTimeZone.js";
 const isServer = process.argv[2];
-const rclient2 = getRedis({ db: 2 });
 const level = process.env.LOG_LEVEL || "info";
 console.log(`log level: ${level}`);
 const targets = [
@@ -49,11 +48,14 @@ if (config.debug) {
     });
 }
 logger.metrics = function metrics(key, val, dbName) {
+    const rclient2 = getRedis({ db: 2 });
     const dbname = dbName || config.pg?.database;
     if (!dbname && !isServer)
         return;
     if (!config.redis)
         return;
-    rclient2.hincrby(`${dbname}:system_metrics`, key, val || 1);
+    rclient2
+        .hincrby(`${dbname}:system_metrics`, key, val || 1)
+        .catch((err) => console.warn("logger metrics error", err.toString()));
 };
 export default logger;

package/dist/server/plugins/logger/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAM7E,iBAAe,MAAM,CAAC,OAAO,EAAE,eAAe,iBAwC7C;AACD,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAiC7E,iBAAe,MAAM,CAAC,OAAO,EAAE,eAAe,iBAwC7C;AACD,eAAe,MAAM,CAAC"}

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

@@ -1,6 +1,30 @@
 import errorMessage from "./errorMessage.js";
 import logger from "./getLogger.js";
 import pgClients from "../pg/pgClients.js";
+// avoid process exit with exception on network changes: disconnect from db, internet altogether etc
+process.on("uncaughtException", (err) => {
+    if (err.message === "Connection terminated unexpectedly" ||
+        err.code === "ECONNRESET") {
+        logger.file("pg", { error: err.toString() });
+        console.warn("Ignored pg connection drop:", err.toString());
+        return;
+    }
+    throw err; // keep normal behavior
+});
+// avoid process exit with rejection during client connect at process start
+process.on("unhandledRejection", (err) => {
+    if (err.message === "Connection terminated due to connection timeout") {
+        logger.file("pg", { error: err.message });
+        console.warn("Ignored pg connection timeout:", err.toString());
+        return;
+    }
+    if (err.message === "Connection is closed.") {
+        logger.file("redis", { error: err.message });
+        console.warn("Ignored redis connection close:", err.toString());
+        return;
+    }
+    throw err;
+});
 async function plugin(fastify) {
     fastify.addHook("onResponse", async (req, reply) => {
         if (reply?.statusCode && reply.statusCode >= 400) {

package/dist/server/plugins/pg/funcs/getPG.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPG.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPG.ts"],"names":[],"mappings":"AAQA,iBAAS,KAAK,CAAC,KAAK,GAAE,GAAQ,OAsD7B;AAMD,eAAe,KAAK,CAAC"}
+{"version":3,"file":"getPG.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPG.ts"],"names":[],"mappings":"AAQA,iBAAS,KAAK,CAAC,KAAK,GAAE,GAAQ,OAuD7B;AAMD,eAAe,KAAK,CAAC"}

package/dist/server/plugins/pg/funcs/getPG.js

@@ -33,6 +33,7 @@ function getPG(param = {}) {
         return null;
     }
     pgClients[name] = pool(dbConfig);
+    pgClients[name].init = () => init(pgClients[name]); // for compatibility
     // force init
     init(pgClients[name]).catch((err) => console.warn("pg client init error", host, port, dbConfig.database));
     return pgClients[name];

package/dist/server/plugins/pg/funcs/pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/pool.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;yBAqB7B,QAAO,GAAQ;AAA/B,wBAuEE"}
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/pool.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;yBAK7B,QAAO,GAAQ;AAA/B,wBAsEE"}

package/dist/server/plugins/pg/funcs/pool.js

@@ -9,23 +9,10 @@ import config from "../../../../config.js";
 export const Pools = {};
 const errored = {};
 const inited = {};
-// avoid process exit with exception on network changes: disconnect from db, internet altogether etc
-process.on("uncaughtException", (err) => {
-    if (err.message === "Connection terminated unexpectedly" ||
-        err.code === "ECONNRESET") {
-        logger.file("pg", {
-            message: "client connection drop",
-            error: err.toString(),
-        });
-        console.warn("Ignored pg connection drop:", err.toString());
-        return;
-    }
-    throw err; // keep normal behavior
-});
 export default (param = {}) => {
     if (!config.pg)
         return null;
-    const { name = "client" } = param;
+    const { name = param.database || "client" } = param;
     // return inited client
     if (pgClients[name]?.tlist)
         return pgClients[name];
@@ -58,7 +45,6 @@ export default (param = {}) => {
             });
             inited[param.database] = 1;
         }
-        // client.options = param;
         if (config.trace) {
             console.log("PG client connected", param.database);
         }

package/dist/server/plugins/redis/funcs/getRedis.d.ts

@@ -1,7 +1,13 @@
-declare function getRedis({ db, host, port, }?: {
+declare function getRedis({ db, host, port, closeClient, retryStrategy, enableOfflineQueue, lazyConnect, connectTimeout, maxRetriesPerRequest, }?: {
     db: number;
     host?: string;
     port?: number;
+    closeClient?: boolean;
+    retryStrategy?: any;
+    enableOfflineQueue?: boolean;
+    lazyConnect?: boolean;
+    connectTimeout?: number;
+    maxRetriesPerRequest?: number;
 }): any;
 export default getRedis;
 //# sourceMappingURL=getRedis.d.ts.map

package/dist/server/plugins/redis/funcs/getRedis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRedis.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/redis/funcs/getRedis.ts"],"names":[],"mappings":"AAOA,iBAAS,QAAQ,CACf,EACE,EAAE,EACF,IAAI,EACJ,IAAI,GACL,GAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACH,OAsBd;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"getRedis.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/redis/funcs/getRedis.ts"],"names":[],"mappings":"AAQA,iBAAS,QAAQ,CACf,EACE,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,WAAkB,EAClB,aAAwB,EACxB,kBAAyB,EACzB,WAAkB,EAClB,cAAqB,EACrB,oBAAwB,GACzB,GAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACnB,OAwCd;AAED,eAAe,QAAQ,CAAC"}

package/dist/server/plugins/redis/funcs/getRedis.js

@@ -1,9 +1,9 @@
-/* eslint-disable no-console */
 import { Redis } from "ioredis";
-// import Redis from 'ioredis';
 import config from "../../../../config.js";
+import logger from "../../logger/getLogger.js";
 import redisClients from "./redisClients.js";
-function getRedis({ db, host, port, } = { db: 0 }) {
+config.ready = config.ready || {};
+function getRedis({ db, host, port, closeClient = true, retryStrategy = () => { }, enableOfflineQueue = true, lazyConnect = true, connectTimeout = 2000, maxRetriesPerRequest = 0, } = { db: 0 }) {
     if (!config.redis && !host)
         return null;
     const key = host || port ? [host, port, db].join("-") : db;
@@ -16,9 +16,24 @@ function getRedis({ db, host, port, } = { db: 0 }) {
         host: host || config.redis?.host || "127.0.0.1",
         port: port || config.redis?.port || 6379, // Redis port
         family: 4, // 4 (IPv4) or 6 (IPv6)
-        closeClient: true,
+        closeClient,
+        retryStrategy,
+        enableOfflineQueue,
+        lazyConnect,
+        connectTimeout,
+        maxRetriesPerRequest,
     };
     redisClients[key] = new Redis(redisConfig);
+    redisClients[key].on("ready", () => {
+        config.ready[`redis:${key}`] = true;
+    });
+    redisClients[key].on("error", (err) => {
+        console.warn("Ignored redis error:", err.message);
+        logger.file("redis", { error: err.toString() });
+        if (err.code === "ETIMEDOUT") {
+            // redisClients[key].disconnect();
+        }
+    });
     console.log("redis connected", db, host, port);
     return redisClients[key];
 }

package/dist/server/plugins/table/funcs/metaFormat/getSelectVal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSelectVal.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/metaFormat/getSelectVal.ts"],"names":[],"mappings":"AAaA,wBAA8B,YAAY,CAAC,EACzC,EAAqB,EACrB,IAAI,EACJ,MAAM,EAAE,YAAY,EACpB,EAAU,GACX,EAAE,GAAG,gBAmGL"}
+{"version":3,"file":"getSelectVal.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/metaFormat/getSelectVal.ts"],"names":[],"mappings":"AAaA,wBAA8B,YAAY,CAAC,EACzC,EAAqB,EACrB,IAAI,EACJ,MAAM,EAAE,YAAY,EACpB,EAAU,GACX,EAAE,GAAG,gBA6GL"}

package/dist/server/plugins/table/funcs/metaFormat/getSelectVal.js

@@ -32,7 +32,14 @@ export default async function getSelectVal({ pg = pgClients.client, name, values
     }
     const id = selectIds[name];
     // cache
-    const key = `select:${name}`;
+    const table = cls.sql
+        ?.toLowerCase?.()
+        ?.replace?.(/[\n\r]+/g, " ")
+        ?.split?.(" from ")
+        ?.filter?.((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+        ?.map?.((el) => el.split(/[ )]/)[0])?.[0];
+    const crudInc = table && config.redis ? (await rclient.get(`pg:${table}:crud`)) || 0 : 0;
+    const key = `select:${name}:${crudInc}`;
     const cache = values?.length && config.redis && !config.disableCache
         ? (await rclient.hmget(key, values)).reduce((p, el, i) => ({
             ...p,

package/package.json

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