review changes

Author: Saitharun279

config/config.ts

@@ -23,9 +23,6 @@ import { config as configFromDotEnv } from "dotenv";
 
 export function loadEnv(env: env, fromWorkerEnv: boolean): env {
   const Env: env = {
-    //if `fromWokerEnv` is true, then load from the `env` passed as argument to the function,
-    // else if `fromWokerEnv` is false, load from process.env
-    //(or set to '' if value from process.env is undefined) to avoid Error TS2322
     CURRENT_ENVIRONMENT: fromWorkerEnv
       ? env.CURRENT_ENVIRONMENT
       : process.env.CURRENT_ENVIRONMENT || "",

config/envVarCheck.ts

@@ -1,26 +1,26 @@
 import { env } from "../src/typeDefinitions/default.types";
 import { loadEnv } from "./config";
 
-validateEnv();
-
 /**
  * Validate if all the required environment variables are set to a non empty value
  * else throw an error
  * ---
  */
 export function validateEnv() {
   //pass empty object as env and fromWorkerEnv = false, since this method is should get executed in github actions and not in worker
-  const envLoadedFromProcess: env = loadEnv({}, false);
-  const missingEnvVars = Object.keys(envLoadedFromProcess).filter(
-    (key) => envLoadedFromProcess[key] == ""
+  const env: env = loadEnv({}, false);
+  const missingEnvVariables = Object.keys(env).filter(
+    (key) => env[key] == ""
   );
 
   // Logging missing environment variables and throw error if any are missing
-  if (missingEnvVars.length > 0) {
+  if (missingEnvVariables.length > 0) {
     throw new Error(
-      `Missing environment variables: ${missingEnvVars.join(", ")}`
+      `Missing environment variables: ${missingEnvVariables.join(", ")}`
     );
   } else {
     console.log("All required environment variables are set.");
   }
 }
+
+validateEnv();

src/index.ts

@@ -107,12 +107,10 @@ export default {
         return new JSONResponse(response.BAD_SIGNATURE, { status: 401 });
       }
     }
-    const envLoadedFromWorker: env = loadEnv(env, true);
-    return router.handle(request, envLoadedFromWorker, ctx);
+    return router.handle(request, loadEnv(env, true), ctx);
   },
 
   async scheduled(req: Request, env: env, ctx: ExecutionContext) {
-    const envLoadedFromWorker: env = loadEnv(env, true);
-    ctx.waitUntil(send(envLoadedFromWorker));
+    ctx.waitUntil(send(loadEnv(env, true)));
   },
 };