@opengis/fastify-table 2.0.17 → 2.0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/server/plugins/logger/checkUserAccess.js +22 -0
- package/dist/server/plugins/logger/createFileStream.js +5 -21
- package/dist/server/plugins/logger/getLogger.js +0 -2
- package/dist/server/plugins/logger/getRootDir.js +22 -0
- package/dist/server/routes/logger/controllers/logger.file.js +2 -2
- package/package.json +1 -1
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import config from "../../../config.js";
|
|
2
|
+
const { accessToken = "0NWcGQxKRP8AsRxD" } = config.auth || {};
|
|
3
|
+
/**
|
|
4
|
+
*
|
|
5
|
+
* @summary check user access to logger interface - per admin user type or user group
|
|
6
|
+
* @returns {Object} message, status
|
|
7
|
+
*/
|
|
8
|
+
export default function checkUserAccess({ user = {}, token, }) {
|
|
9
|
+
if (token && token === accessToken) {
|
|
10
|
+
return { message: "access granted", status: 200 };
|
|
11
|
+
}
|
|
12
|
+
// console.log(user);
|
|
13
|
+
if (!user.user_type?.includes?.("admin") &&
|
|
14
|
+
!config?.local &&
|
|
15
|
+
!config.auth?.disable) {
|
|
16
|
+
return { message: "access restricted", status: 403 };
|
|
17
|
+
}
|
|
18
|
+
/* if (!['admin', 'superadmin']?.includes(user.user_type) && count === '0') {
|
|
19
|
+
return { message: 'access restricted', status: 403 };
|
|
20
|
+
} */
|
|
21
|
+
return { message: "access granted", status: 200 };
|
|
22
|
+
}
|
|
@@ -1,30 +1,14 @@
|
|
|
1
|
-
/* eslint-disable no-console */
|
|
2
|
-
const streams = {};
|
|
3
|
-
import build from "pino-abstract-transport";
|
|
4
1
|
import fs from "node:fs";
|
|
2
|
+
import build from "pino-abstract-transport";
|
|
5
3
|
import labels from "./labels.js";
|
|
6
|
-
import
|
|
7
|
-
|
|
8
|
-
const
|
|
9
|
-
const { dir = "log", interval = "1d", compress = "gzip", // maxFiles = 90, local: teeToStdout,
|
|
10
|
-
} = config?.log || {};
|
|
4
|
+
import getRootDir from "./getRootDir.js";
|
|
5
|
+
const dir = getRootDir();
|
|
6
|
+
const streams = {};
|
|
11
7
|
function createFileStream({ level, status }) {
|
|
12
|
-
console.log(dir, level, generator()(), interval, compress);
|
|
13
|
-
/* const params = {
|
|
14
|
-
maxFiles, // logs to save limit
|
|
15
|
-
history: 'history', // history file name
|
|
16
|
-
interval, // rotate daily
|
|
17
|
-
compress, // compress rotated files
|
|
18
|
-
teeToStdout, // debug / logs to stdout
|
|
19
|
-
path: `${dir}/${level}`, // absolute path (root directory)
|
|
20
|
-
intervalBoundary: true, // true - log name with lower boundary of rotation interval
|
|
21
|
-
initialRotation: true, // true - log rotation check on init
|
|
22
|
-
// intervalUTC: true, // local tz -> utc
|
|
23
|
-
};
|
|
24
|
-
return createStream(generator({ interval }), params); */
|
|
25
8
|
const dt = new Date().toISOString().split("T")[0];
|
|
26
9
|
const fileName = `${dir}/${level}/${dt}${status ? `_${status}` : ""}.log`;
|
|
27
10
|
fs.mkdirSync(`${dir}/${level}`, { recursive: true });
|
|
11
|
+
console.log("creating log stream: " + fileName);
|
|
28
12
|
const stream = fs.createWriteStream(fileName, {
|
|
29
13
|
encoding: "utf8",
|
|
30
14
|
flags: "a+",
|
|
@@ -8,8 +8,6 @@ import serializers from "./serializers.js";
|
|
|
8
8
|
import timestampWithTimeZone from "./timestampWithTimeZone.js";
|
|
9
9
|
const isServer = process.argv[2];
|
|
10
10
|
const rclient2 = getRedis({ db: 2 });
|
|
11
|
-
if (!config.log)
|
|
12
|
-
config.log = {};
|
|
13
11
|
const level = config.log?.level || process.env.PINO_LOG_LEVEL || "info";
|
|
14
12
|
console.log(`log level: ${level}`);
|
|
15
13
|
const options = {
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/* eslint-disable no-console */
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import config from "../../../config.js";
|
|
5
|
+
let logDir = null;
|
|
6
|
+
export default function getRootDir() {
|
|
7
|
+
// absolute / relative path
|
|
8
|
+
if (config.logDir) {
|
|
9
|
+
console.log(`logging to: ${config.logDir}`);
|
|
10
|
+
return config.logDir;
|
|
11
|
+
}
|
|
12
|
+
if (logDir) {
|
|
13
|
+
console.log(`logging to: ${logDir}`);
|
|
14
|
+
return logDir;
|
|
15
|
+
}
|
|
16
|
+
const file = ["config.json", "/data/local/config.json"].find((el) => fs.existsSync(el) ? el : null);
|
|
17
|
+
// .env / config.json => process.cwd()
|
|
18
|
+
const root = file && file.startsWith("/data/local") ? "/data/local" : process.cwd();
|
|
19
|
+
logDir = path.join(root, config.log?.dir || "log");
|
|
20
|
+
console.log(`logging to: ${logDir}`);
|
|
21
|
+
return logDir;
|
|
22
|
+
}
|
|
@@ -2,8 +2,8 @@ import path from "node:path";
|
|
|
2
2
|
import { lstat, readdir, readFile } from "node:fs/promises";
|
|
3
3
|
import { createReadStream, existsSync } from "node:fs";
|
|
4
4
|
import readline from "node:readline";
|
|
5
|
-
import checkUserAccess from "
|
|
6
|
-
import getRootDir from "
|
|
5
|
+
import checkUserAccess from "../../../plugins/logger/checkUserAccess.js";
|
|
6
|
+
import getRootDir from "../../../plugins/logger/getRootDir.js";
|
|
7
7
|
const limit = 200000;
|
|
8
8
|
const rootDir = getRootDir();
|
|
9
9
|
/**
|