Use `platform` for getting env vars in Cloudflare

1 files changed, 21 insertions, 22 deletions

diff --git a/src/env.ts b/src/env.ts
index 8927d76..2f0a632 100644
--- a/src/env.ts
+++ b/src/env.ts
@@ -1,26 +1,25 @@
-// Cloudflare Workers can't read process.env so we have to do it like this
-
 let skyblockStatsApiKey: string | undefined
-try {
-	skyblockStatsApiKey = process.env.SKYBLOCK_STATS_API_KEY
-} catch {
-	// @ts-ignore
-	skyblockStatsApiKey = SKYBLOCK_STATS_API_KEY
-}
-if (!skyblockStatsApiKey)
-	console.warn('SKYBLOCK_STATS_API_KEY is not set as an environment variable. This is required for logging in with Discord to work. It should be the same as the `key` environment variable in skyblock-api.')
-
 let discordClientId: string | undefined
-try {
-	discordClientId = process.env.DISCORD_CLIENT_ID
-} catch {
-	// @ts-ignore
-	discordClientId = DISCORD_CLIENT_ID
-}
-if (!discordClientId)
-	console.warn('DISCORD_CLIENT_ID is not set as an environment variable. This is required for logging in with Discord to work.')
 
-export {
-	skyblockStatsApiKey as SKYBLOCK_STATS_API_KEY,
-	discordClientId as DISCORD_CLIENT_ID,
+export default function env(platform?: Readonly<App.Platform>) {
+	try {
+		skyblockStatsApiKey = process.env.SKYBLOCK_STATS_API_KEY
+	} catch {
+		skyblockStatsApiKey = platform?.env.SKYBLOCK_STATS_API_KEY
+	}
+	if (!skyblockStatsApiKey)
+		console.warn('SKYBLOCK_STATS_API_KEY is not set as an environment variable. This is required for logging in with Discord to work. It should be the same as the `key` environment variable in skyblock-api.')
+
+	try {
+		discordClientId = process.env.DISCORD_CLIENT_ID
+	} catch {
+		discordClientId = platform?.env.DISCORD_CLIENT_ID
+	}
+	if (!discordClientId)
+		console.warn('DISCORD_CLIENT_ID is not set as an environment variable. This is required for logging in with Discord to work.')
+
+	return {
+		SKYBLOCK_STATS_API_KEY: skyblockStatsApiKey,
+		DISCORD_CLIENT_ID: discordClientId,
+	}
 }
\ No newline at end of file