From 951f5fdd0579247758474e45928665989290d5c7 Mon Sep 17 00:00:00 2001 From: Timofei Galkin Date: Fri, 12 Jan 2024 13:42:56 +0300 Subject: [PATCH 1/4] feat(logs): made logs formatting more clean --- djs-bot/index.js | 5 ++--- djs-bot/lib/Bot.js | 2 +- djs-bot/lib/Logger.js | 14 ++++---------- djs-bot/util/dates.js | 25 +++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/djs-bot/index.js b/djs-bot/index.js index 634f02b5e..3eabc0dcd 100644 --- a/djs-bot/index.js +++ b/djs-bot/index.js @@ -12,15 +12,14 @@ const colors = require("colors"); const getConfig = require("./util/getConfig"); const { ShardingManager } = require('discord.js'); +const { getCurrentTimeString } = require("./util/dates"); try { // Gets the config file and passes it (as if returned) to the function in `.then( () => {} )` getConfig().then((conf) => { const manager = new ShardingManager('./bot.js', { token: conf.token, respawn: true, totalShards: "auto", timeout: -1 }); manager.on('shardCreate', shard => { - let d = new Date(); - let time = `[${d.getDate()}:${d.getMonth()}:${d.getFullYear()} - ${d.getHours()}:${d.getMinutes()}]`; - console.log(colors.gray(time) + colors.cyan(" | " + `Spawned shard ${shard.id}`)); + console.log(colors.gray(getCurrentTimeString()) + colors.cyan(`${' '.repeat(9)}| Spawned shard ${shard.id}`)); }); manager.spawn({ amount: "auto", delay: 5500, timeout: -1 }).catch((err) => { console.log(colors.red("\tError spawning shards: " + err)); diff --git a/djs-bot/lib/Bot.js b/djs-bot/lib/Bot.js index 702bb7481..5533d5864 100644 --- a/djs-bot/lib/Bot.js +++ b/djs-bot/lib/Bot.js @@ -112,7 +112,7 @@ class Bot extends Client { this.LoadSchedules(); this.LoadEvents(); - this.warn("Booting up the bot...\n\t" + this.denom); + this.warn("Booting up the bot...\n" + ' '.repeat(31) + this.denom); LoadErrorHandler(this); LoadDebugListeners(this); diff --git a/djs-bot/lib/Logger.js b/djs-bot/lib/Logger.js index 14178097a..5f4cc6461 100644 --- a/djs-bot/lib/Logger.js +++ b/djs-bot/lib/Logger.js @@ -1,5 +1,6 @@ const winston = require("winston"); const colors = require("colors"); +const { getCurrentTimeString } = require("../util/dates"); const map = { log: { level: "debug", message: "info: ", color: "green" }, @@ -22,20 +23,12 @@ class Logger { }); } - /** - * @returns String formatted date for logging - */ - getCurrentTimeString() { - let d = new Date(); - return `[${d.getDate()}:${d.getMonth()}:${d.getFullYear()} - ${d.getHours()}:${d.getMinutes()}]`; - } - /** * @param {Formatting} formatting * @param {...any} args */ printLog(formatting, ...args) { - const time = this.getCurrentTimeString(); + const time = getCurrentTimeString(); this.logger.log({ time: `${time}`, @@ -45,7 +38,8 @@ class Logger { if (formatting.color) { console.log( - colors.gray(time) + colors[formatting.color || "green"](` [${formatting.level.toUpperCase()}] | `) + args.join(" ") + colors.gray(time) + + colors[formatting.color || "green"](` [${formatting.level.toUpperCase().padEnd(5, ' ')}] | `) + args.join(" ") ); } } diff --git a/djs-bot/util/dates.js b/djs-bot/util/dates.js index fa97b24c6..a54916be3 100644 --- a/djs-bot/util/dates.js +++ b/djs-bot/util/dates.js @@ -43,7 +43,32 @@ function thisWeek(begOffset = { days: 0 }, endOffset = { days: 0 }) { return dateSpan("week", "week", begOffset, endOffset); } +/** + * Returns formatted time string + * + * @example [10.01.2024 - 21:14] + */ +function getCurrentTimeString() { + const date = new Date(); + + const formatNumber = (num) => num.toLocaleString('en-US', { + minimumIntegerDigits: 2, + useGrouping: false + }); + + const formattedDate = { + date: formatNumber(date.getDate()), + month: formatNumber(date.getMonth() + 1), + year: date.getFullYear(), + hours: formatNumber(date.getHours()), + minutes: formatNumber(date.getMinutes()), + } + + return `[${formattedDate.date}.${formattedDate.month}.${formattedDate.year} - ${formattedDate.hours}:${formattedDate.minutes}]`; +} + module.exports = { thisWeek, dateSpan, + getCurrentTimeString, }; \ No newline at end of file From 325b0c21eff7dc19733ff62158a3795de1a761de Mon Sep 17 00:00:00 2001 From: Timofei Galkin Date: Fri, 12 Jan 2024 13:43:11 +0300 Subject: [PATCH 2/4] chore: bumped version --- djs-bot/package-lock.json | 4 ++-- djs-bot/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/djs-bot/package-lock.json b/djs-bot/package-lock.json index d01314506..cb8dbd972 100644 --- a/djs-bot/package-lock.json +++ b/djs-bot/package-lock.json @@ -1,12 +1,12 @@ { "name": "discord-musicbot", - "version": "5.3.2", + "version": "5.4.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "discord-musicbot", - "version": "5.3.2", + "version": "5.4.4", "license": "CUSTOM", "dependencies": { "@fastify/cors": "^8.3.0", diff --git a/djs-bot/package.json b/djs-bot/package.json index 291525fb6..5a9b9a008 100644 --- a/djs-bot/package.json +++ b/djs-bot/package.json @@ -1,7 +1,7 @@ { "description": "", "main": "index.js", - "version": "5.4.1", + "version": "5.4.4", "name": "discord-musicbot", "scripts": { "guild": "npm run api-build && node scripts/guild", From 9737bdaf83878657f691607a3ed47614a67dd293 Mon Sep 17 00:00:00 2001 From: Timofei Galkin Date: Fri, 12 Jan 2024 13:52:51 +0300 Subject: [PATCH 3/4] Added `\ n` at the end of dates.js --- djs-bot/util/dates.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djs-bot/util/dates.js b/djs-bot/util/dates.js index a54916be3..f3c486b89 100644 --- a/djs-bot/util/dates.js +++ b/djs-bot/util/dates.js @@ -71,4 +71,4 @@ module.exports = { thisWeek, dateSpan, getCurrentTimeString, -}; \ No newline at end of file +}; From 08322a91b440762638877423bcf24d84fae7df3e Mon Sep 17 00:00:00 2001 From: Timofei Galkin Date: Fri, 12 Jan 2024 14:05:52 +0300 Subject: [PATCH 4/4] Brought back 5.4.3 --- djs-bot/package-lock.json | 4 ++-- djs-bot/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/djs-bot/package-lock.json b/djs-bot/package-lock.json index cb8dbd972..51955002c 100644 --- a/djs-bot/package-lock.json +++ b/djs-bot/package-lock.json @@ -1,12 +1,12 @@ { "name": "discord-musicbot", - "version": "5.4.4", + "version": "5.4.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "discord-musicbot", - "version": "5.4.4", + "version": "5.4.3", "license": "CUSTOM", "dependencies": { "@fastify/cors": "^8.3.0", diff --git a/djs-bot/package.json b/djs-bot/package.json index 5a9b9a008..b92da68e3 100644 --- a/djs-bot/package.json +++ b/djs-bot/package.json @@ -1,7 +1,7 @@ { "description": "", "main": "index.js", - "version": "5.4.4", + "version": "5.4.3", "name": "discord-musicbot", "scripts": { "guild": "npm run api-build && node scripts/guild",