Update logger

.eslintrc

@@ -21,6 +21,7 @@
     "prefer-const": ["warn", { "destructuring": "all" }],
     "no-constant-condition": ["error", { "checkLoops": false }],
     "import/extensions": ["warn", "always", { "ts": "never" }],
-    "no-throw-literal": "error"
+    "no-throw-literal": "error",
+    "no-console": "error"
   }
 }

API/stats/bestiary.js

@@ -1,3 +1,4 @@
+const { errorMessage } = require("../../src/Logger.js");
 const constants = require("../constants/bestiary.js");
 
 function formatBestiaryMobs(userProfile, mobs) {
@@ -72,7 +73,7 @@ function getBestiary(userProfile) {
       maxMilestone: totalTiers / 10,
     };
   } catch (error) {
-    console.log(error);
+    errorMessage(error);
     return null;
   }
 }

API/stats/chocolateFactory.js

@@ -1,4 +1,5 @@
 // CREDITS: by @Kathund (https://github.com/Kathund)
+const { errorMessage } = require("../../src/Logger.js");
 
 module.exports = (profile) => {
   try {
@@ -18,7 +19,7 @@ module.exports = (profile) => {
       level: profile.events?.easter?.chocolate_level || 0,
     };
   } catch (error) {
-    console.log(error);
+    errorMessage(error);
     return null;
   }
 };

API/stats/crimson.js

@@ -1,6 +1,6 @@
 // CREDITS: by @Kathund (https://github.com/Kathund)
-
 const { titleCase } = require("../constants/functions.js");
+const { errorMessage } = require("../../src/Logger.js");
 
 module.exports = (profile) => {
   try {
@@ -62,7 +62,7 @@ module.exports = (profile) => {
       trophyFishing: getTrophyFish(profile),
     };
   } catch (error) {
-    console.log(error);
+    errorMessage(error);
     return null;
   }
 };

API/stats/dungeons.js

@@ -1,5 +1,6 @@
 const calcSkill = require("../constants/skills.js");
 const { titleCase } = require("../constants/functions.js");
+const { errorMessage } = require("../../src/Logger.js");
 
 module.exports = (profile) => {
   try {
@@ -95,7 +96,7 @@ module.exports = (profile) => {
       },
     };
   } catch (error) {
-    console.log(error);
+    errorMessage(error);
     return null;
   }
 };

API/stats/hotm.js

@@ -1,5 +1,6 @@
 // CREDITS: by @Kathund (https://github.com/Kathund)
 const { titleCase } = require("../constants/functions.js");
+const { errorMessage } = require("../../src/Logger.js");
 const miningConst = require("../constants/mining.js");
 const calcSkill = require("../constants/skills.js");
 const moment = require("moment");
@@ -51,7 +52,7 @@ module.exports = (player, profile) => {
           forgeItem.timeFinishedText =
             timeFinished < Date.now() ? "Finished" : `ending ${moment(timeFinished).fromNow()}`;
         } else {
-          console.log(item);
+          errorMessage(item);
           forgeItem.name = "Unknown Item";
           forgeItem.id = `UNKNOWN-${item.id}`;
         }
@@ -84,7 +85,7 @@ module.exports = (player, profile) => {
       forge: forgeItems,
     };
   } catch (error) {
-    console.log(error);
+    errorMessage(error);
     return null;
   }
 };

API/stats/talismans.js

@@ -1,5 +1,6 @@
 const { decodeData } = require("../../src/contracts/helperFunctions.js");
 const { titleCase } = require("../constants/functions.js");
+const { errorMessage } = require("../../src/Logger.js");
 
 module.exports = async (profile) => {
   try {
@@ -75,7 +76,7 @@ module.exports = async (profile) => {
       return null;
     }
   } catch (error) {
-    console.log(error);
+    errorMessage(error);
     return null;
   }
 };

index.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 process.on("uncaughtException", (error) => console.log(error));
 const app = require("./src/Application.js");
 

package.json

@@ -6,10 +6,10 @@
   "scripts": {
     "start": "node index.js",
     "test": "jest --detectOpenHandles --forceExit",
-    "lint": "npx eslint .",
-    "lint:fix": "npx eslint . --fix",
-    "prettier": "npx prettier --check .",
-    "prettier:fix": "npx prettier --write .",
+    "lint": "npx eslint src/",
+    "lint:fix": "npx eslint src/ --fix",
+    "prettier": "npx prettier src/ --check",
+    "prettier:fix": "npx prettier src/ --write",
     "nodemon": "nodemon index"
   },
   "repository": {

src/Logger.js

@@ -1,8 +1,8 @@
+/* eslint-disable no-console */
 const customLevels = { discord: 0, minecraft: 1, web: 2, warn: 3, error: 4, broadcast: 5, max: 6 };
 const { createLogger, format, transports } = require("winston");
 const config = require("../config.json");
 const chalk = require("chalk");
-
 const discordTransport = new transports.File({ level: "discord", filename: "./logs/discord.log" });
 const minecraftTransport = new transports.File({ level: "minecraft", filename: "./logs/minecraft.log" });
 const webTransport = new transports.File({ level: "web", filename: "./logs/web.log" });
@@ -18,7 +18,7 @@ const discordLogger = createLogger({
     format.timestamp({ format: getCurrentTime }),
     format.printf(({ timestamp, level, message }) => {
       return `[${timestamp}] ${level.toUpperCase()} > ${message}`;
-    })
+    }),
   ),
   transports: [discordTransport, combinedTransport],
 });
@@ -30,7 +30,7 @@ const minecraftLogger = createLogger({
     format.timestamp({ format: getCurrentTime }),
     format.printf(({ timestamp, level, message }) => {
       return `[${timestamp}] ${level.toUpperCase()} > ${message}`;
-    })
+    }),
   ),
   transports: [minecraftTransport, combinedTransport],
 });
@@ -42,7 +42,7 @@ const webLogger = createLogger({
     format.timestamp({ format: getCurrentTime }),
     format.printf(({ timestamp, level, message }) => {
       return `[${timestamp}] ${level.toUpperCase()} > ${message}`;
-    })
+    }),
   ),
   transports: [webTransport, combinedTransport],
 });
@@ -54,7 +54,7 @@ const warnLogger = createLogger({
     format.timestamp({ format: getCurrentTime }),
     format.printf(({ timestamp, level, message }) => {
       return `[${timestamp}] ${level.toUpperCase()} > ${message}`;
-    })
+    }),
   ),
   transports: [warnTransport, combinedTransport],
 });
@@ -66,7 +66,7 @@ const errorLogger = createLogger({
     format.timestamp({ format: getCurrentTime }),
     format.printf(({ timestamp, level, message }) => {
       return `[${timestamp}] ${level.toUpperCase()} > ${message}`;
-    })
+    }),
   ),
   transports: [errorTransport, combinedTransport],
 });
@@ -78,7 +78,7 @@ const broadcastLogger = createLogger({
     format.timestamp({ format: getCurrentTime }),
     format.printf(({ timestamp, level, message }) => {
       return `[${timestamp}] ${level.toUpperCase()} > ${message}`;
-    })
+    }),
   ),
   transports: [broadcastTransport, combinedTransport],
 });
@@ -115,12 +115,13 @@ function warnMessage(message) {
   return console.log(chalk.bgYellow.black(`[${getCurrentTime()}] Warning >`) + " " + chalk.yellow(message));
 }
 
-function errorMessage(message) {
+function errorMessage(error) {
+  const errorString = `${error.toString()}${error.stack?.replace(error.toString(), "")}`;
   if (config.other.logToFiles) {
-    errorLogger.log("error", message);
+    errorLogger.log("error", errorString);
   }
-  
-  return console.log(chalk.bgRedBright.black(`[${getCurrentTime()}] Error >`) + " " + chalk.redBright(message));
+
+  return console.log(chalk.bgRedBright.black(`[${getCurrentTime()}] Error >`) + " " + chalk.redBright(errorString));
 }
 
 function broadcastMessage(message, location) {
@@ -156,8 +157,8 @@ async function configUpdateMessage(message) {
   console.log();
   console.log(
     `${chalk.bgRedBright.black(`[${getCurrentTime()}] Config Update >`)} ${chalk.redBright("Added")} ${chalk.gray(
-      message
-    )} ${chalk.redBright("to config.json")}`
+      message,
+    )} ${chalk.redBright("to config.json")}`,
   );
 }
 

src/Updater.js

@@ -10,7 +10,7 @@ function updateCode() {
 
   exec("git pull", (error, stdout, stderr) => {
     if (error) {
-      console.error(`Git pull error: ${error}`);
+      Logger.errorMessage(error);
       return;
     }
 

src/contracts/API/mowojangAPI.js

@@ -1,3 +1,4 @@
+const { errorMessage } = require("../../Logger.js");
 const axios = require("axios");
 
 const uuidCache = new Map();
@@ -28,7 +29,7 @@ async function getUUID(username) {
   } catch (error) {
     // eslint-disable-next-line no-throw-literal
     if (error.response.data === "Not found") throw "Invalid username.";
-    console.log(error);
+    errorMessage(error);
     throw error;
   }
 }
@@ -57,7 +58,7 @@ async function getUsername(uuid) {
 
     return data.name;
   } catch (error) {
-    console.log(error);
+    errorMessage(error);
     // eslint-disable-next-line no-throw-literal
     if (error.response?.data === "Not found") throw "Invalid UUID.";
     throw error;
@@ -75,7 +76,7 @@ async function resolveUsernameOrUUID(username) {
   } catch (error) {
     // eslint-disable-next-line no-throw-literal
     if (error.response.data === "Not found") throw "Invalid Username Or UUID.";
-    console.log(error);
+    errorMessage(error);
     throw error;
   }
 }

src/discord/CommandHandler.js

@@ -1,5 +1,6 @@
 // eslint-disable-next-line import/extensions
 const { Routes } = require("discord-api-types/v9");
+const { errorMessage } = require("../Logger.js");
 const config = require("../../config.json");
 const { REST } = require("@discordjs/rest");
 const fs = require("fs");
@@ -26,7 +27,7 @@ class CommandHandler {
 
     rest
       .put(Routes.applicationGuildCommands(clientID, config.discord.bot.serverID), { body: commands })
-      .catch(console.error);
+      .catch((e) => errorMessage(e));
   }
 }
 

src/discord/commands/verifyCommand.js

@@ -3,6 +3,7 @@ const hypixelRebornAPI = require("../../contracts/API/HypixelRebornAPI.js");
 const { writeFileSync, readFileSync } = require("fs");
 const config = require("../../../config.json");
 const { EmbedBuilder } = require("discord.js");
+const { errorMessage } = require("../../Logger.js");
 
 module.exports = {
   name: "verify",
@@ -94,7 +95,7 @@ module.exports = {
 
       await updateRolesCommand.execute(interaction, user);
     } catch (error) {
-      console.log(error);
+      errorMessage(error);
       // eslint-disable-next-line no-ex-assign
       error = error
         .toString()
@@ -133,7 +134,7 @@ module.exports = {
             iconURL: "https://i.imgur.com/uUuZx2E.png",
           });
 
-        await interaction.followUp({ embeds: [verificationTutorialEmbed], ephemeral: true  });
+        await interaction.followUp({ embeds: [verificationTutorialEmbed], ephemeral: true });
       }
     }
   },

src/discord/events/interactionCreate.js

@@ -23,7 +23,7 @@ module.exports = {
         if (command === undefined) {
           return;
         }
-        
+
         Logger.discordMessage(`${interaction.user.username} - [${interaction.commandName}]`);
 
         if (command.verificationCommand === true && config.verification.enabled === false) {
@@ -41,8 +41,7 @@ module.exports = {
         await command.execute(interaction);
       }
     } catch (error) {
-      console.log(error);
-
+      Logger.errorMessage(error);
       const errrorMessage =
         error instanceof HypixelDiscordChatBridgeError
           ? ""

src/discord/handlers/MessageHandler.js

@@ -1,5 +1,6 @@
 const { uploadImage } = require("../../contracts/API/imgurAPI.js");
 const { demojify } = require("discord-emoji-converter");
+const { errorMessage } = require("../../Logger.js");
 const config = require("../../../config.json");
 
 class MessageHandler {
@@ -68,7 +69,7 @@ class MessageHandler {
 
       this.discord.broadcastMessage(messageData);
     } catch (error) {
-      console.log(error);
+      errorMessage(error);
     }
   }
 
@@ -111,7 +112,7 @@ class MessageHandler {
 
       return mentionedUserName ?? null;
     } catch (error) {
-      console.log(error);
+      errorMessage(error);
       return null;
     }
   }

src/discord/other/updateUsers.js

@@ -1,13 +1,13 @@
-const updateRolesCommand = require("../commands/forceUpdateEveryone.js");
-const config = require("../../../config.json");
-const Logger = require("../../Logger.js");
-const cron = require("node-cron");
-
-if (config.verification.autoUpdater) {
-  Logger.discordMessage(`RoleSync ready, executing every ${config.verification.autoUpdaterInterval} hours.`);
-  cron.schedule(`0 */${config.verification.autoUpdaterInterval} * * *`, async () => {
-    Logger.discordMessage("Executing RoleSync...");
-    await updateRolesCommand.execute(null, true);
-    Logger.discordMessage("RoleSync successfully executed.");
-  });
-}
+const updateRolesCommand = require("../commands/forceUpdateEveryone.js");
+const config = require("../../../config.json");
+const Logger = require("../../Logger.js");
+const cron = require("node-cron");
+
+if (config.verification.autoUpdater) {
+  Logger.discordMessage(`RoleSync ready, executing every ${config.verification.autoUpdaterInterval} hours.`);
+  cron.schedule(`0 */${config.verification.autoUpdaterInterval} * * *`, async () => {
+    Logger.discordMessage("Executing RoleSync...");
+    await updateRolesCommand.execute(null, true);
+    Logger.discordMessage("RoleSync successfully executed.");
+  });
+}