Merge branch 'silh-conditional-module-timer-cleanup'

nestjs · Mar 25, 2024 · cf8e3c5 · cf8e3c5
2 parents e45cbb0 + e416a64
commit cf8e3c5
Show file tree

Hide file tree

Showing 3 changed files with 1,601 additions and 1,586 deletions.
diff --git a/lib/conditional.module.ts b/lib/conditional.module.ts
@@ -13,15 +13,15 @@ export class ConditionalModule {
     condition: string | ((env: NodeJS.ProcessEnv) => boolean),
     options?: { timeout: number },
   ) {
-    let configResolved = false;
     const { timeout = 5000 } = options ?? {};
-    setTimeout(() => {
-      if (!configResolved) {
-        throw new Error(
-          `Nest was not able to resolve the config variables within ${timeout} milliseconds. Bause of this, the ConditionalModule was not able to determine if ${module.toString()} should be registered or not`,
-        );
-      }
+
+    const timer = setTimeout(() => {
+      throw new Error(
+        `Nest was not able to resolve the config variables within ${timeout} milliseconds. Bause of this, the ConditionalModule was not able to determine if ${module.toString()} should be registered or not`,
+      );
     }, timeout);
+    timer.unref();
+
     const returnModule: Required<
       Pick<DynamicModule, 'module' | 'imports' | 'exports'>
     > = { module: ConditionalModule, imports: [], exports: [] };
@@ -32,7 +32,7 @@ export class ConditionalModule {
       };
     }
     await ConfigModule.envVariablesLoaded;
-    configResolved = true;
+    clearTimeout(timer);
     const evaluation = condition(process.env);
     if (evaluation) {
       returnModule.imports.push(module);