fix background triggers

firebase · May 13, 2021 · a95fe7b · a95fe7b
1 parent e5c119e
commit a95fe7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/emulator/functionsEmulator.ts b/src/emulator/functionsEmulator.ts
@@ -222,10 +222,8 @@ export class FunctionsEmulator implements EmulatorInstance {
     const httpsFunctionRoutes = [httpsFunctionRoute, `${httpsFunctionRoute}/*`];
 
     const backgroundHandler: express.RequestHandler = (req, res) => {
-      const triggerName = req.params.trigger_name;
-      const region = req.params.region;
+      const triggerId = req.params.trigger_name;
       const projectId = req.params.project_id;
-      const triggerId = `${region}-${triggerName}`;
 
       const reqBody = (req as RequestWithRawBody).rawBody;
       const proto = JSON.parse(reqBody.toString());
@@ -1094,7 +1092,7 @@ export class FunctionsEmulator implements EmulatorInstance {
     // req.url = /:projectId/:region/:trigger_name/*
     const url = new URL(`${req.protocol}://${req.hostname}${req.url}`);
     const path = `${url.pathname}${url.search}`.replace(
-      new RegExp(`\/${this.args.projectId}\/[^\/]*\/${triggerId}\/?`),
+      new RegExp(`\/${this.args.projectId}\/[^\/]*\/${triggerName}\/?`),
       "/"
     );
 

diff --git a/src/emulator/functionsEmulatorRuntime.ts b/src/emulator/functionsEmulatorRuntime.ts
@@ -8,7 +8,6 @@ import {
   findModuleRoot,
   FunctionsRuntimeBundle,
   FunctionsRuntimeFeatures,
-  emulatedFunctionsByRegion,
   getEmulatedTriggersFromDefinitions,
   FunctionsRuntimeArgs,
   HttpConstants,