Use FUNCTIONS_DISCOVERY_TIMEOUT when waiting for sockets

CHANGELOG.md

@@ -3,4 +3,5 @@
 - Removed outdated dependency on `rimraf`.
 - Fixed an issue where the Extensions emulator would fail silently if started with a non-existant project without the `demo-` prefix. (#7779)
 - Bumped the Firebase Data Connect local toolkit version to v1.5.1, which adds compatible mode schema migration support to the emulator and fixes an issue with the Timestamp type in Swift codegen. (#7837)
+- Fixed an issue during functions discovery where `FUNCTIONS_DISCOVERY_TIMEOUT` wasn't respected. (#6285)
 - Improved handling when `emulators:export` cannot read the metadata file.

src/deploy/functions/runtimes/discovery/index.ts

@@ -15,26 +15,30 @@
 
 const TIMEOUT_OVERRIDE_ENV_VAR = "FUNCTIONS_DISCOVERY_TIMEOUT";
 
+export function getFunctionDiscoveryTimeout(): number {
+  return +(process.env[TIMEOUT_OVERRIDE_ENV_VAR] || 0) * 1000; /* ms */
+}
+
 /**
  * Converts the YAML retrieved from discovery into a Build object for param interpolation.
  */
 export function yamlToBuild(
   yaml: any,
   project: string,
   region: string,
   runtime: Runtime,
 ): build.Build {
   try {
     if (!yaml.specVersion) {
       throw new FirebaseError("Expect manifest yaml to specify a version number");
     }
     if (yaml.specVersion === "v1alpha1") {
       return v1alpha1.buildFromV1Alpha1(yaml, project, region, runtime);
     }
     throw new FirebaseError(
       "It seems you are using a newer SDK than this version of the CLI can handle. Please update your CLI with `npm install -g firebase-tools`",
     );
   } catch (err: any) {
     throw new FirebaseError("Failed to parse build specification", { children: [err] });
   }
 }
@@ -49,9 +53,9 @@
 ): Promise<build.Build | undefined> {
   let text: string;
   try {
     text = await exports.readFileAsync(path.join(directory, "functions.yaml"), "utf8");
   } catch (err: any) {
     if (err.code === "ENOENT") {
       logger.debug("Could not find functions.yaml. Must use http discovery");
     } else {
       logger.debug("Unexpected error looking for functions.yaml file:", err);
@@ -75,14 +79,9 @@
 ): Promise<build.Build> {
   let res: Response;
   const timedOut = new Promise<never>((resolve, reject) => {
-    setTimeout(
-      () => {
-        reject(
-          new FirebaseError("User code failed to load. Cannot determine backend specification"),
-        );
-      },
-      +(process.env[TIMEOUT_OVERRIDE_ENV_VAR] || 0) * 1000 /* ms */ || timeout,
-    );
+    setTimeout(() => {
+      reject(new FirebaseError("User code failed to load. Cannot determine backend specification"));
+    }, getFunctionDiscoveryTimeout() || timeout);
   });
 
   while (true) {

src/emulator/functionsRuntimeWorker.ts

@@ -8,6 +8,7 @@ import { EventEmitter } from "events";
 import { EmulatorLogger, ExtensionLogInfo } from "./emulatorLogger";
 import { FirebaseError } from "../error";
 import { Serializable } from "child_process";
+import { getFunctionDiscoveryTimeout } from "../deploy/functions/runtimes/discovery";
 
 type LogListener = (el: EmulatorLog) => any;
 
@@ -264,7 +265,7 @@ export class RuntimeWorker {
     const timeout = new Promise<never>((resolve, reject) => {
       setTimeout(() => {
         reject(new FirebaseError("Failed to load function."));
-      }, 30_000);
+      }, getFunctionDiscoveryTimeout() || 30_000);
     });
     while (true) {
       try {