From 11325cc775b500591d585f9fe564a528ddb436e6 Mon Sep 17 00:00:00 2001 From: bangdk Date: Mon, 18 Nov 2024 21:05:29 +0900 Subject: [PATCH] auto commit --- fems-realtime-api/package.json | 7 +++-- .../src/middleware/apiKey.middleware.js | 2 +- .../src/services/mainBackend.service.js | 2 +- .../src/services/mqtt.service.js | 2 +- fems-realtime-api/yarn.lock | 31 +++++++++++++++++-- 5 files changed, 36 insertions(+), 8 deletions(-) diff --git a/fems-realtime-api/package.json b/fems-realtime-api/package.json index c2a95c4..7a71f91 100644 --- a/fems-realtime-api/package.json +++ b/fems-realtime-api/package.json @@ -11,13 +11,14 @@ "test": "jest" }, "dependencies": { + "axios": "^1.6.2", + "dotenv": "^16.3.1", "express": "^4.18.2", - "pg": "^8.11.3", "ioredis": "^5.3.2", "mqtt": "^5.3.0", - "axios": "^1.6.2", + "pg": "^8.11.3", "winston": "^3.11.0", - "dotenv": "^16.3.1" + "winston-daily-rotate-file": "^5.0.0" }, "devDependencies": { "eslint": "^8.40.0", diff --git a/fems-realtime-api/src/middleware/apiKey.middleware.js b/fems-realtime-api/src/middleware/apiKey.middleware.js index 3ef2edd..6775f78 100644 --- a/fems-realtime-api/src/middleware/apiKey.middleware.js +++ b/fems-realtime-api/src/middleware/apiKey.middleware.js @@ -1,5 +1,5 @@ // fems-realtime-api/src/middleware/apiKey.middleware.js -const logger = require("./config/logger"); +const logger = require("../config/logger"); const apiKeyAuth = async (req, res, next) => { const apiKey = req.header("X-API-Key"); diff --git a/fems-realtime-api/src/services/mainBackend.service.js b/fems-realtime-api/src/services/mainBackend.service.js index 52ba818..0d86c15 100644 --- a/fems-realtime-api/src/services/mainBackend.service.js +++ b/fems-realtime-api/src/services/mainBackend.service.js @@ -1,6 +1,6 @@ // fems-realtime-api/src/services/mainBackend.service.js const axios = require("axios"); -const logger = require("./config/logger"); +const logger = require("../config/logger"); class MainBackendService { constructor(redis, baseURL, adminApiKey) { diff --git a/fems-realtime-api/src/services/mqtt.service.js b/fems-realtime-api/src/services/mqtt.service.js index 73c37f8..ba1363a 100644 --- a/fems-realtime-api/src/services/mqtt.service.js +++ b/fems-realtime-api/src/services/mqtt.service.js @@ -1,6 +1,6 @@ // fems-realtime-api/src/services/mqtt.service.js const mqtt = require("mqtt"); -const logger = require("./config/logger"); +const logger = require("../config/logger"); class MQTTService { constructor(mainBackend, sensorData, redis, brokerUrl, options) { diff --git a/fems-realtime-api/yarn.lock b/fems-realtime-api/yarn.lock index f2a9978..254e0a5 100644 --- a/fems-realtime-api/yarn.lock +++ b/fems-realtime-api/yarn.lock @@ -1602,6 +1602,13 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +file-stream-rotator@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/file-stream-rotator/-/file-stream-rotator-0.6.1.tgz#007019e735b262bb6c6f0197e58e5c87cb96cec3" + integrity sha512-u+dBid4PvZw17PmDeRcNOtCP9CCK/9lRN2w+r1xIS7yOL9JFrIBKTvrYsxT4P0pGtThYTn++QS5ChHaUov3+zQ== + dependencies: + moment "^2.29.1" + fill-range@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" @@ -2614,6 +2621,11 @@ minimist@^1.2.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== +moment@^2.29.1: + version "2.30.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" + integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== + mqtt-packet@^9.0.1: version "9.0.1" resolved "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-9.0.1.tgz#2d4f1085f84493ce410ee263a7e4ed113d4351d7" @@ -2711,6 +2723,11 @@ number-allocator@^1.0.14: debug "^4.3.1" js-sdsl "4.3.0" +object-hash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" + integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== + object-inspect@^1.13.1: version "1.13.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a" @@ -3432,7 +3449,7 @@ touch@^3.1.0: resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.1.tgz#097a23d7b161476435e5c1344a95c0f75b4a5694" integrity sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA== -triple-beam@^1.3.0: +triple-beam@^1.3.0, triple-beam@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984" integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg== @@ -3545,7 +3562,17 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -winston-transport@^4.9.0: +winston-daily-rotate-file@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/winston-daily-rotate-file/-/winston-daily-rotate-file-5.0.0.tgz#8cd94800025490e47c00ec892b655a5821f4266d" + integrity sha512-JDjiXXkM5qvwY06733vf09I2wnMXpZEhxEVOSPenZMii+g7pcDcTBt2MRugnoi8BwVSuCT2jfRXBUy+n1Zz/Yw== + dependencies: + file-stream-rotator "^0.6.1" + object-hash "^3.0.0" + triple-beam "^1.4.1" + winston-transport "^4.7.0" + +winston-transport@^4.7.0, winston-transport@^4.9.0: version "4.9.0" resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.9.0.tgz#3bba345de10297654ea6f33519424560003b3bf9" integrity sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==