Fix race condition in functions discovery shutdown

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

@@ -57,7 +57,7 @@
     throw new FirebaseError(`Unexpected runtime ${runtime}`);
   }
 
   return new Delegate(context.projectId, context.projectDir, context.sourceDir, runtime);
 }
 
 // TODO(inlined): Consider moving contents in parseRuntimeAndValidateSDK and validate around.
@@ -265,24 +265,28 @@
   ): Promise<() => Promise<void>> {
     const childProcess = this.spawnFunctionsProcess(config, { ...envs, PORT: port });
 
+    const pExit = new Promise<void>((resolve, reject) => {
+      childProcess.once("exit", resolve);
+      childProcess.once("error", reject);
+    });
+
     // TODO: Refactor return type to () => Promise<void> to simplify nested promises
     return Promise.resolve(async () => {
-      const p = new Promise<void>((resolve, reject) => {
-        childProcess.once("exit", resolve);
-        childProcess.once("error", reject);
-      });
-
       try {
         await fetch(`http://localhost:${port}/__/quitquitquit`);
       } catch (e) {
         logger.debug("Failed to call quitquitquit. This often means the server failed to start", e);
       }
-      setTimeout(() => {
+
+      const quitTimeout = setTimeout(() => {
         if (!childProcess.killed) {
           childProcess.kill("SIGKILL");
         }
       }, 10_000);
-      return p;
+
+      return pExit.finally(() => {
+        clearTimeout(quitTimeout);
+      });
     });
   }
 

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

@@ -39,7 +39,7 @@
       { exit: 1 },
     );
   }
   return Promise.resolve(new Delegate(context.projectId, context.sourceDir, runtime));
 }
 
 /**
@@ -148,7 +148,7 @@
     return Promise.resolve();
   }
 
   async serveAdmin(port: number, envs: backend.EnvironmentVariables) {
     const modulesDir = await this.modulesDir();
     const envWithAdminPort = {
       ...envs,
@@ -167,21 +167,27 @@
     childProcess.stderr?.on("data", (chunk: Buffer) => {
       logger.error(chunk.toString("utf8"));
     });
+
+    const pExit = new Promise<void>((resolve, reject) => {
+      childProcess.once("exit", resolve);
+      childProcess.once("error", reject);
+    });
+
     return Promise.resolve(async () => {
       try {
         await fetch(`http://127.0.0.1:${port}/__/quitquitquit`);
       } catch (e) {
         logger.debug("Failed to call quitquitquit. This often means the server failed to start", e);
       }
+
       const quitTimeout = setTimeout(() => {
         if (!childProcess.killed) {
           childProcess.kill("SIGKILL");
         }
       }, 10_000);
-      clearTimeout(quitTimeout);
-      return new Promise<void>((resolve, reject) => {
-        childProcess.once("exit", resolve);
-        childProcess.once("error", reject);
+
+      return pExit.finally(() => {
+        clearTimeout(quitTimeout);
       });
     });
   }