@opengis/fastify-table 2.5.7 → 2.5.9

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;AAyD7E,iBAAS,YAAY,CAAC,OAAO,EAAE,eAAe,QA+B7C;AACD,eAAe,YAAY,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;AAqE7E,iBAAS,YAAY,CAAC,OAAO,EAAE,eAAe,QA+C7C;AACD,eAAe,YAAY,CAAC"}

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

@@ -2,6 +2,12 @@ import errorMessage from "./errorMessage.js";
 import errorStatus from "./errorStatus.js";
 import logger from "./getLogger.js";
 import pgClients from "../pg/pgClients.js";
+const DEFAULT_LOG_STATUS_CODES = [403, 409, 413, 415, 429];
+const logStatusCodes = typeof process.env["LOG_STATUS_CODES"] === "string"
+    ? process.env["LOG_STATUS_CODES"].split(",").map((el) => el - 0)
+    : DEFAULT_LOG_STATUS_CODES;
+const logResponseCodes = process.env.LOG === "true" ? logStatusCodes : [];
+const logWarningCodes = process.env.LOG === "true" ? logStatusCodes.filter((el) => el >= 400) : [];
 // avoid process exit with exception on network changes: disconnect from db, internet altogether etc
 process.on("uncaughtException", (err) => {
     if (err.message === "Connection terminated unexpectedly" ||
@@ -46,18 +52,32 @@ process.on("unhandledRejection", (err) => {
     throw err;
 });
 function loggerPlugin(fastify) {
-    fastify.addHook("onResponse", async (req, reply) => {
+    fastify.addHook("onResponse", async (request, reply) => {
         if (reply?.statusCode && reply.statusCode >= 400) {
             logger.metrics(`error-count:${reply.statusCode}`);
         }
+        if (reply?.statusCode && logResponseCodes.includes(reply.statusCode)) {
+            const { elapsedTime, statusCode } = reply;
+            const { method, url } = request;
+            if (statusCode === 200 && url.startsWith("/logger-file/"))
+                return; // skip logger self-log
+            logger.file("request", { elapsedTime, statusCode, method, url });
+        }
     });
     fastify.setErrorHandler(async (error, request, reply) => {
-        logger.error(error, request);
-        console.error({
-            msg: error.message,
-            where: error.where,
-            stack: error.stack,
-        });
+        if (!error.statusCode || error.statusCode >= 500) {
+            logger.error(error, request);
+        }
+        if (error.statusCode && logWarningCodes.includes(error.statusCode)) {
+            logger.warn(error, request);
+        }
+        if (process.env.trace === "true") {
+            console.error({
+                msg: error.message,
+                where: error.where,
+                stack: error.stack,
+            });
+        }
         const statusCode = errorStatus(error) || 500;
         const message = errorMessage(error, statusCode);
         return reply.status(statusCode).send({

package/dist/server/routes/notifications/controllers/userNotifications.js

@@ -5,7 +5,7 @@ const maxLimit = 100;
 const q = `select notification_id as id, subject, body, created_at,
 author_id, read, link, entity_id, (select avatar from admin.users where uid=a.author_id limit 1) as avatar
 from crm.notifications a
-where addressee_id=$1 order by created_at desc limit $2 offset $3`;
+where addressee_id=$1 order by created_at desc limit $2::bigint offset $3::bigint`;
 export default async function userNotifications(req) {
     const { pg = pgClients.client, query, user, } = req;
     const t1 = Date.now();

package/dist/server/routes/table/controllers/search.js

@@ -45,7 +45,7 @@ async function getData({ pg = pgClients.client, tableName, query = {}, maxLimit,
         meta?.title ? `${meta.title} as title` : "",
     ]
         .filter((el) => el)
-        .join(",")} from ${table} t ${sqlTable} where ${where.join(" and ") || "true"} ${order} limit $1 offset $2`;
+        .join(",")} from ${table} t ${sqlTable} where ${where.join(" and ") || "true"} ${order} limit $1::bigint offset $2::bigint`;
     if (query.sql) {
         res.sql.push(q);
         return null;

package/dist/server/routes/table/functions/getData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAwFzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,KAAK,CAAC,EAAE,YAAY,EACpB,MAAM,CAAC,EAAE,GAAG,gBA84Bb"}
+{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAwFzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,KAAK,CAAC,EAAE,YAAY,EACpB,MAAM,CAAC,EAAE,GAAG,gBA64Bb"}

package/dist/server/routes/table/functions/getData.js

@@ -365,7 +365,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
                       
   ${objectId ? cardSqlTable : ""} 
   where ${where.join(" and ") || "true"} 
-  ${order} limit $${idx.limit} offset $${idx.offset}`;
+  ${order} limit $${idx.limit}::bigint offset $${idx.offset}::bigint`;
     if (q1.includes("{{uid}}")) {
         args.push(uid || "");
         Object.assign(idx, { uid: Object.keys(idx).length + 1 });

package/package.json

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