made changes from feature branch to test branch for testing

Author: Saitharun279

config/config.ts

@@ -26,6 +26,9 @@ export function loadEnv (
   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 || '',
     DISCORD_APPLICATION_ID: fromWorkerEnv ? env.DISCORD_APPLICATION_ID : process.env.DISCORD_APPLICATION_ID || '',
     DISCORD_GUILD_ID: fromWorkerEnv ? env.DISCORD_GUILD_ID : process.env.DISCORD_GUILD_ID || '',

config/envVarCheck.ts

@@ -4,19 +4,19 @@ import { loadEnv } from "./config";
 validateEnv();
 
 /**
- * Validate if all the required environment variables defined in the schema above are set
- * and are in the correct format else throw an error
+ * Validate if all the required environment variables are set to a non empty value
+ * else throw an error
  * ---
  */
 export function validateEnv (){
-    const envLoadedFromProcess: env = loadEnv({}, false);
-    console.log(envLoadedFromProcess);
-    const missingEnvVars = Object.keys(envLoadedFromProcess).filter((key) => envLoadedFromProcess[key] == '');
+  //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] == '');
 
-    // Logging missing environment variables and exit if any are missing
-    if (missingEnvVars.length > 0) {
-      throw new Error(`Missing environment variables: ${missingEnvVars.join(', ')}`);
-    } else {
-      console.log('All required environment variables are set.');
-    }   
+  // Logging missing environment variables and throw error if any are missing
+  if (missingEnvVars.length > 0) {
+    throw new Error(`Missing environment variables: ${missingEnvVars.join(', ')}`);
+  } else {
+    console.log('All required environment variables are set.');
+  }   
 }

package.json

@@ -36,8 +36,7 @@
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.4",
-    "wrangler": "^3.1.1",
-    "zod": "^3.23.8"
+    "wrangler": "^3.1.1"
   },
   "dependencies": {
     "@tsndr/cloudflare-worker-jwt": "^2.2.1",

src/index.ts

@@ -22,8 +22,8 @@ import { generateInviteLink } from "./controllers/generateDiscordInvite";
 import { sendProfileBlockedMessage } from "./controllers/profileHandler";
 import { sendTaskUpdatesHandler } from "./controllers/taskUpdatesHandler";
 
-import config from "./../config/config";
-import { loadEnv } from "./../config/config";
+import config,{loadEnv} from "./../config/config";
+
 const router = Router();
 
 router.get("/", async () => {
@@ -107,10 +107,12 @@ export default {
         return new JSONResponse(response.BAD_SIGNATURE, { status: 401 });
       }
     }
-    return router.handle(request, loadEnv(env,true), ctx);
+    const envLoadedFromWorker: env = loadEnv(env,true);
+    return router.handle(request, envLoadedFromWorker, ctx);
   },
 
   async scheduled(req: Request, env: env, ctx: ExecutionContext) {
-    ctx.waitUntil(send(loadEnv(env,true)));
+    const envLoadedFromWorker: env = loadEnv(env,true);
+    ctx.waitUntil(send(envLoadedFromWorker));
   },
 };