@opengis/fastify-table 1.1.33 → 1.1.35

package/logger/getHooks.js

@@ -1,15 +1,17 @@
 function getHooks() {
-    return {
-        logMethod(inputArgs, method) {
+  return {
+    logMethod(inputArgs, method) {
+      // string name param to object
 
-            // string name param to object
+      if (inputArgs?.length === 2 && inputArgs[1].originalUrl) {
+        const req = inputArgs[1];
+        const err = inputArgs[0]?.stack ? inputArgs[0] : undefined;
+        return method.apply(this, [{ req, err }, err ? inputArgs[0].toString() : inputArgs[0]]);
+      }
 
-            if (inputArgs?.length === 2 && inputArgs[1].originalUrl) {
-                return method.apply(this, [inputArgs[1], inputArgs[0]]);
-            }
-            return method.apply(this, inputArgs);
-        }
-    };
+      return method.apply(this, inputArgs);
+    },
+  };
 }
 
-export default getHooks;
+export default getHooks;

package/logger/labels.js

@@ -1,11 +1,11 @@
 const labels = {
-    10: 'trace',
-    20: 'debug',
-    30: 'info',
-    40: 'warn',
-    50: "error",
-    60: "fatal",
-    'infinity': "silent",
+  10: 'trace',
+  20: 'debug',
+  30: 'info',
+  40: 'warn',
+  50: 'error',
+  60: 'fatal',
+  infinity: 'silent',
 };
 
 export default labels;

package/logger/logger.test.api.js

@@ -22,10 +22,16 @@ export default async function testLog(request) {
      //request.log.fatal('string fatal log'); */
   // custom params
 
-  request.log.info(request, { file: 'test', msg: 'string debug log' });
-  request.log.info({ file: 'test', msg: 'string debug log1' }, request);
+  //  request.log.info(request, { file: 'test', msg: 'string debug log' });
+  // request.log.info({ file: 'test', msg: 'string debug log1' }, request);
 
-  request.log.file('test1', 'my message', request);
+  // request.log.file('test1', 'my message', request);
+  // throw new Error('444');
+  request.log.info({ data: 111, msg: 'string debug log1' }, request);
+  request.log.info('string debug log1', request);
+  request.log.info('string debug log1');
+  request.log.info({ data: 111, msg: 'string debug log1' });
+  request.log.error(new Error('222'), request);
   /* request.log.error('policy and string log1');
     request.log.error({ test: 'policy and string log1' });
     request.log.error(request, { test: 'string name and object log', status: 502 });
@@ -35,7 +41,7 @@ export default async function testLog(request) {
   // request.log.error(request, 'policy and string log2');
 
   ///    throw new Error('222');
-  d / 0;
+  // d / 0;
   // throw new Error('unhandled exception');
   return { root: true };
 }

package/package.json

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

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/checkUserAccess.js

@@ -5,7 +5,7 @@
  */
 
 export default async function checkUserAccess({
-  user, pg,
+  user,
 }) {
   // console.log(user);
   if (!user?.uid) return { message: 'access restricted', status: 403 };

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';