Changed loadVariables

Author: breadddevv

package-lock.json

@@ -29,6 +29,6 @@
     "dotenv": "^17.4.2",
     "pg": "^8.20.0",
     "tsx": "^4.21.0",
-    "zod": "^4.3.6"
+    "zod": "^4.4.3"
   }
 }

package.json

@@ -1,3 +1,4 @@
+import "../libs/loadVariables.js";
 import {
   SlashCommandBuilder,
   ChatInputCommandInteraction,
@@ -8,7 +9,6 @@ import {
 } from "discord.js";
 import { Command } from "../libs/loadCommands.js";
 import { loadCommands } from "../libs/loadCommands.js";
-import { loadVariables } from "../libs/loadVariables.js";
 
 const reloadCommand: Command = {
   data: new SlashCommandBuilder()
@@ -20,10 +20,9 @@ const reloadCommand: Command = {
     await interaction.deferReply({ flags: MessageFlags.Ephemeral });
 
     try {
-      const config = loadVariables();
       const client = interaction.client as Client & { commands?: Collection<string, Command> };
 
-      await loadCommands(client, config.clientId, config.botToken, config.guildId);
+      await loadCommands(client, process.env.CLIENT_ID, process.env.BOT_TOKEN, process.env.GUILD_ID);
 
       await interaction.editReply("Commands reloaded successfully.");
     } catch (error) {

src/commands/reload.ts

@@ -1,5 +1,5 @@
+import "../libs/loadVariables.js"
 import { Client, EmbedBuilder, Events, GuildMember, TextChannel } from "discord.js";
-import { loadVariables } from "../libs/loadVariables.js";
 import {
   registerBoost,
   removeBoost,
@@ -35,7 +35,6 @@ export default {
 };
 
 async function onBoostStart(member: GuildMember): Promise<void> {
-  const config = loadVariables();
   const guild = member.guild;
 
   const record = await registerBoost(
@@ -50,7 +49,7 @@ async function onBoostStart(member: GuildMember): Promise<void> {
   await clearPendingCustomRoleDeletion(record.id);
   await assignLevelRoles(member, record.boostCounts ?? 1);
 
-  const greetChannel = guild.channels.cache.get(config.greetChannelId) as
+  const greetChannel = guild.channels.cache.get(process.env.GREET_CHANNEL_ID) as
     | TextChannel
     | undefined;
   if (greetChannel) {
@@ -71,7 +70,7 @@ async function onBoostStart(member: GuildMember): Promise<void> {
     await greetChannel.send({ embeds: [embed] });
   }
 
-  const logChannel = guild.channels.cache.get(config.logChannelId) as
+  const logChannel = guild.channels.cache.get(process.env.GREET_CHANNEL_ID) as
     | TextChannel
     | undefined;
   if (logChannel) {
@@ -104,7 +103,6 @@ async function onBoostStart(member: GuildMember): Promise<void> {
 }
 
 async function onBoostEnd(member: GuildMember): Promise<void> {
-  const config = loadVariables();
   const guild = member.guild;
 
   const result = await removeBoost(member.id, guild.id);
@@ -113,7 +111,7 @@ async function onBoostEnd(member: GuildMember): Promise<void> {
   await removeAllLevelRoles(member);
   await scheduleCustomRoleDeletionAfterGrace(member.id, guild.id);
 
-  const logChannel = guild.channels.cache.get(config.logChannelId) as
+  const logChannel = guild.channels.cache.get(process.env.LOG_CHANNEL_ID) as
     | TextChannel
     | undefined;
   if (logChannel) {

src/events/guildMemberUpdate.ts

@@ -1,11 +1,11 @@
+import "./libs/loadVariables.js"
 import {
   Client,
   GatewayIntentBits,
   Partials,
   Collection
 } from "discord.js";
 import * as dotenv from "dotenv/config";
-import { loadVariables } from "./libs/loadVariables.js";
 import { Command, loadCommands } from "./libs/loadCommands.js";
 import path from "path";
 import fs from 'fs';
@@ -16,8 +16,6 @@ const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
 dotenv;
 
-const config = loadVariables();
-
 const client = new Client({
   intents: [
     GatewayIntentBits.Guilds,
@@ -57,10 +55,10 @@ for (const file of eventFiles) {
   logger.startup(`Loaded event ${file.replace(/\.[jt]s$/, '')}`);
 }
 
-await loadCommands(client, config.clientId, config.botToken, config.guildId)
+await loadCommands(client, process.env.CLIENT_ID, process.env.BOT_TOKEN, process.env.GUILD_ID);
 
 try {
-  client.login(config.botToken);
+  client.login(process.env.BOT_TOKEN);
 } catch (err) {
   console.log(err)
 }

src/index.ts

@@ -1,30 +1,28 @@
+import { z } from "zod";
 import { logger } from "./logger.js";
 
-export interface Config {
-  botToken: string;
-  clientId: string;
-  guildId: string | undefined;
-  greetChannelId: string;
-  logChannelId: string;
-  databaseUrl: string;
-}
+const envSchema = z.object({
+  BOT_TOKEN: z.string().min(1),
+  CLIENT_ID: z.string().min(1),
+  GUILD_ID: z.string().optional(),
+  GREET_CHANNEL_ID: z.string().min(1),
+  LOG_CHANNEL_ID: z.string().min(1),
+  DATABASE_URL: z.string().min(1),
+});
 
-function requireEnv(key: string): string {
-  const value = process.env[key];
-  console.log("here")
-  if (!value) {
-    logger.fatal(`Missing required environment variable: ${key}`);
+declare global {
+  namespace NodeJS {
+    interface ProcessEnv extends z.infer<typeof envSchema> {}
   }
-  return value as string;
 }
 
-export function loadVariables(): Config {
-  return {
-    botToken: requireEnv("BOT_TOKEN"),
-    clientId: requireEnv("CLIENT_ID"),
-    guildId: process.env.GUILD_ID?.toString() ?? undefined,
-    greetChannelId: requireEnv("GREET_CHANNEL_ID"),
-    logChannelId: requireEnv("LOG_CHANNEL_ID"),
-    databaseUrl: requireEnv("DATABASE_URL"),
-  };
-}
+const result = envSchema.safeParse(process.env);
+
+if (!result.success) {
+  result.error.issues.forEach((issue) => {
+    logger.fatal(`Missing or invalid env var: ${issue.path.join(".")} — ${issue.message}`);
+  });
+  process.exit(1);
+}
+
+Object.assign(process.env, result.data);