diff --git a/index.js b/index.js index d7418f3..6d82b67 100644 --- a/index.js +++ b/index.js @@ -7,7 +7,7 @@ const generateComment = require('./scripts/generateComment.js'); const SefinekAPI = require('./scripts/sefinekAPI.js'); const isImageRequest = require('./scripts/isImageRequest.js'); const headers = require('./scripts/headers.js'); -const { logToCSV, readReportedIPs, wasImageRequestLogged } = require('./scripts/csv.js'); +const { logToCSV, readReportedIPs, wasImageRequestLogged } = require('./services/csv.js'); const formatDelay = require('./scripts/formatDelay.js'); const clientIp = require('./scripts/clientIp.js'); const whitelist = require('./whitelist.js'); diff --git a/scripts/sefinekAPI.js b/scripts/sefinekAPI.js index 3d463a2..64aa148 100644 --- a/scripts/sefinekAPI.js +++ b/scripts/sefinekAPI.js @@ -1,5 +1,5 @@ const { axios } = require('../services/axios.js'); -const { readReportedIPs, updateSefinekAPIInCSV } = require('./csv.js'); +const { readReportedIPs, updateSefinekAPIInCSV } = require('../services/csv.js'); const log = require('./log.js'); const clientIp = require('./clientIp.js'); diff --git a/services/axios.js b/services/axios.js index a79c405..94e795b 100644 --- a/services/axios.js +++ b/services/axios.js @@ -3,6 +3,6 @@ const { UserAgent } = require('../scripts/headers.js'); const { version } = require('../package.json'); axios.defaults.headers.common['User-Agent'] = UserAgent; -axios.defaults.timeout = 9000; +axios.defaults.timeout = 7000; module.exports = { axios, moduleVersion: version }; \ No newline at end of file diff --git a/scripts/csv.js b/services/csv.js similarity index 96% rename from scripts/csv.js rename to services/csv.js index f0424b8..65fe6c8 100644 --- a/scripts/csv.js +++ b/services/csv.js @@ -1,9 +1,9 @@ const fs = require('node:fs'); const path = require('node:path'); -const log = require('./log.js'); +const log = require('../scripts/log.js'); const CSV_FILE_PATH = path.join(__dirname, '..', 'reported_ips.csv'); -const MAX_CSV_SIZE_BYTES = 4 * 1024 * 1024; // 4 MB +const MAX_CSV_SIZE_BYTES = 3 * 1024 * 1024; // 3 MB const CSV_HEADER = 'Timestamp,CF RayID,IP,Country,Hostname,Endpoint,User-Agent,Action taken,Status,Sefinek API\n'; if (!fs.existsSync(CSV_FILE_PATH)) fs.writeFileSync(CSV_FILE_PATH, CSV_HEADER);