Merge branch 'master' into jh-4gb-emu

CHANGELOG.md

@@ -1,3 +1,5 @@
 - Catches errors while updating authorized domains when deleting channels, printing a warning instead of failing.
 - Fixes issue where `host` header was being incorrectly set when proxying to Cloud Run or Cloud Functions for Firebase from the Hosting emulator. (#3012)
-- Adds support for setting availableMemoryMb to 4GB in the Cloud Functions for Firebase emulator. (#3026)
+- Adds support for setting availableMemoryMb to 4GB in the Cloud Functions for Firebase emulator. (#3026)
+- Fixes issue where emulated HTTP functions would crash when the URL contained query parameters (#3032)
+- Fixes issue with routing to emulated HTTP functions in regions outside of `us-central1` (#3031)

scripts/extensions-emulator-tests/greet-the-world/package.json

@@ -4,10 +4,9 @@
   "description": "",
   "main": "functions/index.js",
   "dependencies": {
-    "async": "^3.0.1",
-    "firebase-admin": "^8.6.0",
+    "firebase-admin": "^9.4.2",
     "firebase-functions": "^3.3.0"
   },
   "author": "",
-  "license": "ISC"
+  "license": "MIT"
 }

src/emulator/functionsEmulator.ts

@@ -1068,8 +1068,8 @@ 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(
-      `/${this.args.projectId}/us-central1/${triggerId}`,
-      ""
+      new RegExp(`\/${this.args.projectId}\/[^\/]*\/${triggerId}\/?`),
+      "/"
     );
 
     // We do this instead of just 302'ing because many HTTP clients don't respect 302s so it may

src/test/emulators/functionsEmulator.spec.ts

@@ -227,6 +227,34 @@ describe("FunctionsEmulator-Hub", () => {
       });
   }).timeout(TIMEOUT_LONG);
 
+  it("should return the correct url, baseUrl, originalUrl with query params", async () => {
+    useFunctions(() => {
+      require("firebase-admin").initializeApp();
+      return {
+        function_id: require("firebase-functions").https.onRequest(
+          (req: express.Request, res: express.Response) => {
+            res.json({
+              url: req.url,
+              baseUrl: req.baseUrl,
+              originalUrl: req.originalUrl,
+              query: req.query,
+            });
+          }
+        ),
+      };
+    });
+
+    await supertest(functionsEmulator.createHubServer())
+      .get("/fake-project-id/us-central1/function_id?a=1&b=2")
+      .expect(200)
+      .then((res) => {
+        expect(res.body.url).to.eq("/?a=1&b=2");
+        expect(res.body.baseUrl).to.eq("");
+        expect(res.body.originalUrl).to.eq("/?a=1&b=2");
+        expect(res.body.query).to.deep.eq({ a: "1", b: "2" });
+      });
+  }).timeout(TIMEOUT_LONG);
+
   it("should return the correct url, baseUrl, originalUrl for a subroute", async () => {
     useFunctions(() => {
       require("firebase-admin").initializeApp();
@@ -253,6 +281,32 @@ describe("FunctionsEmulator-Hub", () => {
       });
   }).timeout(TIMEOUT_LONG);
 
+  it("should return the correct url, baseUrl, originalUrl for any region", async () => {
+    useFunctions(() => {
+      require("firebase-admin").initializeApp();
+      return {
+        function_id: require("firebase-functions")
+          .region("europe-west3")
+          .https.onRequest((req: express.Request, res: express.Response) => {
+            res.json({
+              url: req.url,
+              baseUrl: req.baseUrl,
+              originalUrl: req.originalUrl,
+            });
+          }),
+      };
+    });
+
+    await supertest(functionsEmulator.createHubServer())
+      .get("/fake-project-id/europe-west3/function_id")
+      .expect(200)
+      .then((res) => {
+        expect(res.body.url).to.eq("/");
+        expect(res.body.baseUrl).to.eq("");
+        expect(res.body.originalUrl).to.eq("/");
+      });
+  }).timeout(TIMEOUT_LONG);
+
   it("should route request body", async () => {
     useFunctions(() => {
       require("firebase-admin").initializeApp();

src/test/extensions/updateHelper.spec.ts

@@ -1,12 +1,14 @@
 import { expect } from "chai";
+import * as nock from "nock";
 import * as sinon from "sinon";
 
 import { FirebaseError } from "../../error";
-import * as updateHelper from "../../extensions/updateHelper";
-import * as prompt from "../../prompt";
+import { firebaseExtensionsRegistryOrigin } from "../../api";
+import * as extensionsApi from "../../extensions/extensionsApi";
 import * as extensionsHelper from "../../extensions/extensionsHelper";
+import * as prompt from "../../prompt";
 import * as resolveSource from "../../extensions/resolveSource";
-import * as extensionsApi from "../../extensions/extensionsApi";
+import * as updateHelper from "../../extensions/updateHelper";
 
 const SPEC = {
   name: "test",
@@ -143,12 +145,17 @@ describe("updateHelper", () => {
       promptStub = sinon.stub(prompt, "promptOnce");
       createSourceStub = sinon.stub(extensionsHelper, "createSourceFromLocation");
       getInstanceStub = sinon.stub(extensionsApi, "getInstance").resolves(INSTANCE);
+
+      // The logic will fetch the extensions registry, but it doesn't need to receive anything.
+      nock(firebaseExtensionsRegistryOrigin).get("/extensions.json").reply(200, {});
     });
 
     afterEach(() => {
       promptStub.restore();
       createSourceStub.restore();
       getInstanceStub.restore();
+
+      nock.cleanAll();
     });
 
     it("should return the correct source name for a valid local source", async () => {
@@ -190,12 +197,17 @@ describe("updateHelper", () => {
       promptStub = sinon.stub(prompt, "promptOnce");
       createSourceStub = sinon.stub(extensionsHelper, "createSourceFromLocation");
       getInstanceStub = sinon.stub(extensionsApi, "getInstance").resolves(INSTANCE);
+
+      // The logic will fetch the extensions registry, but it doesn't need to receive anything.
+      nock(firebaseExtensionsRegistryOrigin).get("/extensions.json").reply(200, {});
     });
 
     afterEach(() => {
       promptStub.restore();
       createSourceStub.restore();
       getInstanceStub.restore();
+
+      nock.cleanAll();
     });
 
     it("should return the correct source name for a valid url source", async () => {