Fix blocking functions in the emulator when using multiple codebases

CHANGELOG.md

@@ -0,0 +1 @@
+- Fix blocking functions in the emulator when using multiple codebases (#6504).

src/emulator/functionsEmulator.ts

@@ -266,7 +266,7 @@
   createHubServer(): express.Application {
     // TODO(samstern): Should not need this here but some tests are directly calling this method
     // because FunctionsEmulator.start() used to not be test safe.
     this.workQueue.start();
 
     const hub = express();
 
@@ -308,15 +308,15 @@
     const multicastHandler: express.RequestHandler = (req: express.Request, res) => {
       const projectId = req.params.project_id;
       const rawBody = (req as RequestWithRawBody).rawBody;
       const event = JSON.parse(rawBody.toString());
       let triggerKey: string;
       if (req.headers["content-type"]?.includes("cloudevent")) {
         triggerKey = `${this.args.projectId}:${event.type}`;
       } else {
         triggerKey = `${this.args.projectId}:${event.eventType}`;
       }
       if (event.data.bucket) {
         triggerKey += `:${event.data.bucket}`;
       }
       const triggers = this.multicastTriggers[triggerKey] || [];
 
@@ -361,7 +361,7 @@
     return hub;
   }
 
   async sendRequest(trigger: EmulatedTriggerDefinition, body?: any) {
     const record = this.getTriggerRecordByKey(this.getTriggerKey(trigger));
     const pool = this.workerPools[record.backend.codebase];
     if (!pool.readyForWork(trigger.id)) {
@@ -566,8 +566,6 @@
     } else {
       this.workerPools[emulatableBackend.codebase].refresh();
     }
-    // reset blocking functions config for reloads
-    this.blockingFunctionsConfig = {};
 
     // When force is true we set up all triggers, otherwise we only set up
     // triggers which have a unique function name
@@ -1436,6 +1434,8 @@
 
   async reloadTriggers() {
     this.triggerGeneration++;
+    // reset blocking functions config for reloads
+    this.blockingFunctionsConfig = {};
     for (const backend of this.args.emulatableBackends) {
       await this.loadTriggers(backend);
     }