@opengis/fastify-table 1.1.32 → 1.1.34

package/index.js

@@ -51,17 +51,14 @@ async function plugin(fastify, opt) {
   });
 
   fastify.setErrorHandler((error, request, reply) => {
-    // console.log(error)
-    debugger;
     if (error.validation) {
-      // request.log.warn(request, { code: error?.code, status: 422, error: error.toString() });
-      const { params, instancePath } = error.validation?.[0] || {};
-      return reply.status(422).send(`invalid params: ${instancePath?.substring(1)} (${params?.pattern})`);
+      request.log.warn(request, { code: error?.code, status: 422, error: error.toString() });
+      return reply.status(422).send(error.toString());
     }
     if (error.stack?.startsWith('Error: unhandled exception')) {
+      request.log.fatal(request, { status: 501, error: error.toString() });
       return reply.status(500).send('ServerError');
     }
-
     return reply.status(error.statusCode || 500).send(error);
   });
 

package/logger/createFileStream.js

@@ -1,30 +1,24 @@
-'use strict';
-const streams = {}
+const streams = {};
 
+import build from 'pino-abstract-transport';
 import { createStream } from 'rotating-file-stream';
 import labels from './labels.js';
 
 import config from '../config.js';
 
-
-const generator = (opt) => () => {
-
+const generator = () => () => {
   const date = new Date();
   const tzOffset = date.getTimezoneOffset();
   const currentTimeWithTimezome = date - tzOffset * 60 * 1000;
 
-  if (opt.interval === '1h') {
-    return `${new Date(currentTimeWithTimezome).toISOString().substring(0, 13).replace(/:/g, '_')}.log`;
-  }
-  if (opt.interval === '1m') {
-    return `${new Date(currentTimeWithTimezome).toISOString().substring(0, 16).replace(/:/g, '_')}.log`;
-  }
-  if (!opt.interval || opt.interval === '1d') {
-    return `${new Date(currentTimeWithTimezome).toISOString().split('T')[0].replace(/:/g, '_')}.log`;
-  }
+  // if (!opt.interval || opt.interval === '1d') {
+  return `${new Date(currentTimeWithTimezome).toISOString().split('T')[0].replace(/:/g, '_')}.log`;
+  // }
 };
 
-const { dir = 'log', interval = '1d', compress = 'gzip', maxFiles = 90, local: teeToStdout } = config?.log || {};
+const {
+  dir = 'log', interval = '1d', compress = 'gzip', maxFiles = 90, local: teeToStdout,
+} = config?.log || {};
 function createFileStream({ level }) {
   console.log(dir, level, generator({ interval })(), interval, compress);
   const params = {
@@ -41,18 +35,16 @@ function createFileStream({ level }) {
   return createStream(generator({ interval }), params);
 }
 
-
-import build from 'pino-abstract-transport'
-
 export default function () {
-  return build(function (source) {
-    source.on('data', function (obj) {
+  return build((source) => {
+    source.on('data', (obj) => {
+      if (['incoming request', 'request completed'].includes(obj.msg)) return;
       // console.log(obj)
       const lvl = obj.msg?.file || obj.file || labels[obj.level];
-      streams[lvl] = streams[lvl] || createFileStream({ level: lvl })
-      streams[lvl].write(JSON.stringify(obj) + '\n');
-    })
+      streams[lvl] = streams[lvl] || createFileStream({ level: lvl });
+      streams[lvl].write(`${JSON.stringify(obj)}\n`);
+    });
   }, {
-    parseLine: (line) => JSON.parse(line)
-  })
+    parseLine: (line) => JSON.parse(line),
+  });
 }

package/logger/getLogger.js

@@ -19,6 +19,12 @@ const options = {
   transport: {
     targets: [{
       target: './createFileStream.js', // path.resolve('utils/createFileStream.js')
+    }, {
+      // Use target: 'pino/file' with STDOUT descriptor 1 to write
+      // logs without any change.
+      level: 'error',
+      target: 'pino/file',
+      options: { destination: 1 },
     }],
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.32",
+  "version": "1.1.34",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/server.js

@@ -9,7 +9,15 @@ import loggerTest from './logger/logger.test.api.js';
 const app = Fastify({ logger });
 app.register(appService, config);
 
-app.get('/logger-test', loggerTest);
+app.get('/logger-test', {
+  schema: {
+    querystring: {
+      name: { type: 'string' },
+      excitement: { type: 'integer' },
+    },
+  },
+}, loggerTest);
+
 app.listen({ host: '0.0.0.0', port: process.env.PORT || 3000 }, (err) => {
   if (err) {
     app.log.error(err);

package/util/controllers/logger.file.js

@@ -23,7 +23,7 @@ export default async function loggerFile({
   if (access?.status === 403 && !config?.local) return access;
 
   // absolute / relative path
-  const rootDir = getRootDir(config);
+  const rootDir = getRootDir();
 
   const filepath = path.join(rootDir, params['*'] || '');
 

package/util/controllers/utils/getRootDir.js

@@ -1,14 +1,17 @@
 import path from 'path';
-// import { existsSync } from 'fs';
+import fs from 'fs';
+import config from '../../../config.js';
 
-export default function getRootDir(config) {
+// import { existsSync } from 'fs';
+let logDir = null;
+export default function getRootDir() {
   // absolute / relative path
-  if (config.log?.dir) {
-    return config.log.dir.startsWith('/') || config.log.dir.includes(':')
-      ? config.log.dir
-      : path.join(process.cwd(), config.log.dir);
-  }
-  return path.join(process.cwd(), 'log');
+  if (logDir) return logDir;
+  const file = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
+  const root = file === 'config.json' ? process.cwd() : '/data/local';
+  logDir = config.logDir || path.join(root, config.log?.dir || 'log');
+  console.log({ logDir });
+  return logDir;
 
   // windows debug support
   /* const customLogDir = process.cwd().includes(':') ? 'c:/data/local' : '/data/local';