Merge branch 'main' into leoortizz_nextjsproxyfixes

Author: leoortizz

.github/workflows/node-test.yml

@@ -270,7 +270,7 @@ jobs:
           # - npm run test:storage-emulator-integration
           # - npm run test:dataconnect-deploy #  TODO (joehanley): Reenable this - it should be safe to run in parallel
           # - npm run test:dataconnect-emulator # TODO (joehanley): Figure out why this is failing
-          - npm run test:frameworks
+          # - npm run test:frameworks
     steps:
       - name: Setup Java JDK
         uses: actions/setup-java@v3.3.0

firebase-vscode/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## NEXT
 
+- Fix the data connect emulator discovery bugs.
+
 ## 2.0.0
 
 - Update internal `firebase-tools` dependency to 15.0.0

firebase-vscode/src/core/emulators.ts

@@ -21,8 +21,11 @@ export class EmulatorsController implements Disposable {
 
     // called by emulator UI
     this.subscriptions.push(
-      broker.on("runStartEmulators", () => {
-        this.setEmulatorsStarting();
+      broker.on("runStartEmulators", async () => {
+        if (await this.areEmulatorsRunning()) {
+          return;
+        }
+        this.startEmulators();
       }),
     );
 
@@ -143,6 +146,12 @@ export class EmulatorsController implements Disposable {
     this.notifyEmulatorStateChanged();
   }
 
+  public async areEmulatorsRunning(): Promise<boolean> {
+    // Check if any emulators are running
+    // It may have been terminated without VS Code knowing.
+    return (await this.findRunningCliEmulators())?.status === "running";
+  }
+
   async findRunningCliEmulators(): Promise<
     { status: EmulatorsStatus; infos?: RunningEmulatorInfo }
   > {
@@ -188,13 +197,6 @@ export class EmulatorsController implements Disposable {
     }
   }
 
-  public async areEmulatorsRunning(): Promise<boolean> {
-    if (this.emulators.status === "running") {
-      return true;
-    }
-    return (await this.findRunningCliEmulators())?.status === "running";
-  }
-
   /** FDC specific functions */
   readonly isPostgresEnabled = signal(false);
   private connectToEmulatorStream() {

firebase-vscode/src/data-connect/terminal.ts

@@ -4,6 +4,7 @@ import { checkLogin } from "../core/user";
 import { DATA_CONNECT_EVENT_NAME, AnalyticsLogger } from "../analytics";
 import { getSettings } from "../utils/settings";
 import { currentProjectId } from "../core/project";
+import { EmulatorHub } from "../../../src/emulator/hub";
 
 let environmentVariables: Record<string, string> = {};
 
@@ -93,9 +94,7 @@ export function registerTerminalTasks(
     analyticsLogger.logger.logUsage(DATA_CONNECT_EVENT_NAME.START_EMULATORS);
 
     let cmd = `${settings.firebasePath} emulators:start`;
-    if (currentProjectId.value) {
-      cmd += ` --project ${currentProjectId.value}`;
-    }
+    cmd += ` --project ${currentProjectId.value || EmulatorHub.MISSING_PROJECT_PLACEHOLDER}`;
     if (settings.importPath) {
       cmd += ` --import ${settings.importPath}`;
     }
@@ -108,17 +107,13 @@ export function registerTerminalTasks(
       { focus: true },
     );
   };
-  const startEmulatorsTaskBroker = broker.on("runStartEmulators", () => {
-    startEmulatorsTask();
-  });
   const startEmulatorsCommand = vscode.commands.registerCommand(
     "firebase.emulators.start",
     startEmulatorsTask,
   );
 
   return Disposable.from(
     { dispose: loginTaskBroker },
-    { dispose: startEmulatorsTaskBroker },
     startEmulatorsCommand,
     vscode.commands.registerCommand(
       "firebase.dataConnect.runTerminalTask",