@opengis/fastify-table 1.1.52 → 1.1.54

package/crud/funcs/dataUpdate.js

@@ -27,7 +27,7 @@ export default async function dataUpdate({
     const { srids1 } = await pg.query(`select json_object_agg(_table,rel) as srids1 from (
       select  f_table_schema||'.'||f_table_name as _table, 
         json_object_agg(f_geometry_column, case when srid = 0 then 4326 else srid end) as rel 
-      from geometry_columns group by f_table_schema||'.'||f_table_name
+      from public.geometry_columns group by f_table_schema||'.'||f_table_name
       )q`).then((res1) => res1.rows?.[0] || {});
     Object.assign(srids, srids1);
   }

package/logger/createFileStream.js

@@ -1,7 +1,8 @@
 const streams = {};
 
 import build from 'pino-abstract-transport';
-import { createStream } from 'rotating-file-stream';
+import fs from 'fs';
+// import { createStream } from 'rotating-file-stream';
 import labels from './labels.js';
 
 import config from '../config.js';
@@ -17,11 +18,11 @@ const generator = () => () => {
 };
 
 const {
-  dir = 'log', interval = '1d', compress = 'gzip', maxFiles = 90, local: teeToStdout,
+  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 = {
+  /* const params = {
     maxFiles, // logs to save limit
     history: 'history', // history file name
     interval, // rotate daily
@@ -32,19 +33,37 @@ function createFileStream({ level }) {
     initialRotation: true, // true - log rotation check on init
     // intervalUTC: true, // local tz -> utc
   };
-  return createStream(generator({ interval }), params);
+  return createStream(generator({ interval }), params); */
+  const dt = new Date().toISOString().split('T')[0];
+
+  // console.log(`${dir}/${level}/${dt}.log`);
+  const stream = fs.createWriteStream(`${dir}/${level}/${dt}.log`, { encoding: 'utf8', flags: 'a' });
+  stream.on('finish', () => stream.destroy());
+  stream.on('close', () => stream.destroy());
+  stream.on('error', () => stream.destroy());
+  return stream;
 }
 
-export default function () {
+setInterval(() => {
+  const dt = new Date().toISOString().split('T')[0];
+  Object.keys(streams).filter(el => !el.includes(dt)).forEach(el => streams[el].destroy());
+}, 1000 * 3600 * 2);
+
+export default function transportTarget() {
   return build((source) => {
+    const dt = new Date().toISOString().split('T')[0];
     source.on('data', (obj) => {
       if (['incoming request', 'request completed'].includes(obj.msg)) return;
       // console.log(obj)
       const file = obj.msg?.logfolder || obj.logfolder;
 
-      const lvl = file || labels[obj.level];
-      streams[lvl] = streams[lvl] || createFileStream({ level: lvl });
+      const level = file || labels[obj.level];
+      const lvl = level + dt;
+
+      if (streams[lvl]?.closed) { streams[lvl].destroy(); }
+      if (streams[lvl]?.destroyed) { delete streams[lvl]; }
 
+      streams[lvl] = streams[lvl] || createFileStream({ level });
       streams[lvl].write(`${JSON.stringify({ ...obj, level: labels[obj.level] })}\n`);
     });
   }, {

package/logger/getHooks.js

@@ -3,7 +3,7 @@ function getHooks() {
     logMethod(inputArgs, method) {
       // string name param to object
 
-      if (inputArgs?.length === 2 && inputArgs[1].originalUrl) {
+      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]]);

package/package.json

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

package/server/migrations/0.sql

@@ -36,6 +36,7 @@ if (_returnType != 'text') then
 	DROP FUNCTION IF EXISTS next_id();
 
 	CREATE EXTENSION if not exists "uuid-ossp";
+	ALTER EXTENSION "uuid-ossp" SET SCHEMA public;
 
 	CREATE OR REPLACE FUNCTION next_id()
 	  RETURNS text AS
@@ -43,7 +44,7 @@ if (_returnType != 'text') then
 	DECLARE
 
 	BEGIN
-	    return replace(uuid_generate_v4()::text, '-', '');
+	    return replace(public.uuid_generate_v4()::text, '-', '');
 	END;
 	$BODY$
 	  LANGUAGE plpgsql VOLATILE
@@ -61,6 +62,7 @@ else
 	raise notice 'skip default reassign';
 
 		CREATE EXTENSION if not exists "uuid-ossp";
+		ALTER EXTENSION "uuid-ossp" SET SCHEMA public;
 
 	CREATE OR REPLACE FUNCTION next_id()
 	  RETURNS text AS
@@ -68,7 +70,7 @@ else
 	DECLARE
 
 	BEGIN
-	    return replace(uuid_generate_v4()::text, '-', '');
+	    return replace(public.uuid_generate_v4()::text, '-', '');
 	END;
 	$BODY$
 	  LANGUAGE plpgsql VOLATILE

package/util/controllers/logger.file.js

@@ -14,9 +14,10 @@ import getRootDir from './utils/getRootDir.js';
  */
 
 export default async function loggerFile({
-  log, params = {}, user = {}, query = {}, originalUrl,
+  params, user, query, originalUrl,
 }, reply) {
   const limit = 200000;
+  // console.log(user);
   const access = checkUserAccess({ user });
   // log.info('Сервер запущен по адресу?'); // test!
 

package/util/controllers/utils/checkUserAccess.js

@@ -6,10 +6,9 @@ import config from '../../../config.js';
  * @returns {Object} message, status
  */
 
-export default function checkUserAccess({
-  user = {},
-}) {
-  if (user?.uid && !config?.local) {
+export default function checkUserAccess({ user = {} }) {
+  // console.log(user);
+  if (user.user_type !== 'admin' && !config?.local) {
     return { message: 'access restricted', status: 403 };
   }
 

package/util/index.js

@@ -4,7 +4,7 @@ import nextId from './controllers/next.id.js';
 import statusMonitor from './controllers/status.monitor.js';
 import loggerFile from './controllers/logger.file.js';
 
-import { propertiesSchema, loggerSchema } from './schema.js'
+import { propertiesSchema, loggerSchema } from './schema.js';
 
 async function plugin(fastify, config = {}) {
   const prefix = config.prefix || '/api';
@@ -13,7 +13,7 @@ async function plugin(fastify, config = {}) {
   fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
   fastify.get(`${prefix}/properties/:id`, { schema: propertiesSchema }, getExtraProperties);
   fastify.post(`${prefix}/properties/:id`, { schema: propertiesSchema }, addExtraProperties);
-  fastify.get('/logger-file/*', { config: { policy: ['log'] }, schema: loggerSchema }, loggerFile);
+  fastify.get('/logger-file/*', { schema: loggerSchema }, loggerFile);
 }
 
 export default plugin;