feat: revise command loader

Author: mrepol742

src/commands/reload.ts

@@ -4,7 +4,7 @@ import log from "../components/utils/log";
 import fs from "fs";
 import path from "path";
 import { commands } from "../index";
-import Loader from "../components/utils/loader";
+import Loader from "../components/utils/cmd/loader";
 
 export const info = {
   command: "reload",

src/components/utils/loader.ts src/components/utils/cmd/loader.tssrc/components/utils/loader.ts renamed to src/components/utils/cmd/loader.ts

@@ -1,11 +1,11 @@
-import log from "./log";
-import fs from "fs";
+import log from "../log";
+import { promises as fs } from "fs";
 import path from "path";
-import { commands } from "../../index";
+import { commands } from "../../../index";
 
-const commandsPath = path.join(__dirname, "..", "..", "commands");
+const commandsPath = path.join(__dirname, "..", "..", "..", "commands");
 
-export default function (file: string, customPath?: string) {
+export default function loader(file: string, customPath?: string) {
   if (/\.js$|\.ts$/.test(file)) {
     const filePath = path.join(customPath || commandsPath, file);
 
@@ -32,3 +32,9 @@ export default function (file: string, customPath?: string) {
     }
   }
 }
+
+export async function mapCommands() {
+  const files = await fs.readdir(commandsPath);
+
+  Promise.all(files.map((file) => loader(file)));
+}

src/components/utils/cmd/watcher.ts

@@ -0,0 +1,19 @@
+import { watch } from "fs/promises";
+import loader from "./loader";
+import log from "../log";
+
+export default async function (commandsPath: string) {
+  const watcher = watch(commandsPath, { recursive: false });
+
+  for await (const event of watcher) {
+    const { eventType, filename } = event;
+    if (filename && /\.(js|ts)$/.test(filename)) {
+      try {
+        await loader(filename);
+        log.info("Loader", `Reloaded command: ${filename}`);
+      } catch (err) {
+        log.error("Loader", `Failed to reload command: ${filename}`, err);
+      }
+    }
+  }
+}

src/index.ts

@@ -2,10 +2,10 @@ import dotenv from "dotenv";
 dotenv.config();
 
 import { Message } from "whatsapp-web.js";
-import fs from "fs";
 import path from "path";
 import log from "./components/utils/log";
-import loader from "./components/utils/loader";
+import loader, { mapCommands } from "./components/utils/cmd/loader";
+import watcher from "./components/utils/cmd/watcher";
 import "./components/process";
 import server from "./components/server";
 import { client } from "./components/client";
@@ -40,19 +40,10 @@ const commands: Record<
   }
 > = {};
 
-fs.readdirSync(commandsPath).forEach((file: string) => loader(file));
+mapCommands();
 
 // Watch for changes
-if (autoReload)
-  fs.watch(commandsPath, (eventType: string, filename: string | null) => {
-    if (filename && /\.js$|\.ts$/.test(filename)) {
-      try {
-        loader(filename);
-      } catch (err) {
-        log.error("Loader", `Failed to reload command: ${filename}`, err);
-      }
-    }
-  });
+if (autoReload) watcher(commandsPath);
 
 export {
   commands,