[FDC] Fix firebase dataconnect:sdk:generate --watch (#9055)

Author: fredzqm

CHANGELOG.md

@@ -1,2 +1,3 @@
 - Support auth token JSON in `dataconnect_execute` MPC tool. (#9046)
 - Fixed the bugs when MCP tools cannot connect to emulator due to CLI version mis-matched. (#9068)
+- Fix bug when `firebase dataconnect:sdk:generate --watch` swallow all logs. (#9055)

src/commands/dataconnect-sdk-generate.ts

@@ -7,6 +7,8 @@ import { needProjectId } from "../projectUtils";
 import { loadAll } from "../dataconnect/load";
 import { logger } from "../logger";
 import { getProjectDefaultAccount } from "../auth";
+import { logLabeledSuccess } from "../utils";
+import { ServiceInfo } from "../dataconnect/types";
 
 type GenerateOptions = Options & { watch?: boolean };
 
@@ -20,36 +22,41 @@ export const command = new Command("dataconnect:sdk:generate")
     const projectId = needProjectId(options);
 
     const serviceInfos = await loadAll(projectId, options.config);
-    for (const serviceInfo of serviceInfos) {
-      const configDir = serviceInfo.sourceDirectory;
-      const hasGeneratables = serviceInfo.connectorInfo.some((c) => {
+    const serviceInfosWithSDKs = serviceInfos.filter((serviceInfo) =>
+      serviceInfo.connectorInfo.some((c) => {
         return (
           c.connectorYaml.generate?.javascriptSdk ||
           c.connectorYaml.generate?.kotlinSdk ||
           c.connectorYaml.generate?.swiftSdk ||
           c.connectorYaml.generate?.dartSdk
         );
+      }),
+    );
+    if (!serviceInfosWithSDKs.length) {
+      logger.warn("No generated SDKs have been declared in connector.yaml files.");
+      logger.warn(`Run ${clc.bold("firebase init dataconnect:sdk")} to configure a generated SDK.`);
+      logger.warn(
+        `See https://firebase.google.com/docs/data-connect/web-sdk for more details of how to configure generated SDKs.`,
+      );
+      return;
+    }
+    async function generateSDK(serviceInfo: ServiceInfo): Promise<void> {
+      return DataConnectEmulator.generate({
+        configDir: serviceInfo.sourceDirectory,
+        watch: options.watch,
+        account: getProjectDefaultAccount(options.projectRoot),
       });
-      if (!hasGeneratables) {
-        logger.warn("No generated SDKs have been declared in connector.yaml files.");
-        logger.warn(
-          `Run ${clc.bold("firebase init dataconnect:sdk")} to configure a generated SDK.`,
-        );
-        logger.warn(
-          `See https://firebase.google.com/docs/data-connect/web-sdk for more details of how to configure generated SDKs.`,
-        );
-        return;
-      }
-      for (const conn of serviceInfo.connectorInfo) {
-        const account = getProjectDefaultAccount(options.projectRoot);
-        const output = await DataConnectEmulator.generate({
-          configDir,
-          connectorId: conn.connectorYaml.connectorId,
-          watch: options.watch,
-          account,
-        });
-        logger.info(output);
-        logger.info(`Generated SDKs for ${conn.connectorYaml.connectorId}`);
+    }
+    if (options.watch) {
+      await Promise.race(serviceInfosWithSDKs.map(generateSDK));
+    } else {
+      for (const s of serviceInfosWithSDKs) {
+        await generateSDK(s);
       }
+      const services = serviceInfosWithSDKs.map((s) => s.dataConnectYaml.serviceId).join(", ");
+      logLabeledSuccess(
+        "dataconnect",
+        `Successfully Generated SDKs for services: ${clc.bold(services)}`,
+      );
     }
   });

src/emulator/dataconnectEmulator.ts

@@ -22,7 +22,6 @@ import { BuildResult, requiresVector } from "../dataconnect/types";
 import { listenSpecsToString } from "./portUtils";
 import { Client, ClientResponse } from "../apiv2";
 import { EmulatorRegistry } from "./registry";
-import { logger } from "../logger";
 import { load } from "../dataconnect/load";
 import { Config } from "../config";
 import { PostgresServer, TRUNCATE_TABLES_SQL } from "./dataconnect/pgliteServer";
@@ -51,7 +50,6 @@ export interface DataConnectEmulatorArgs {
 
 export interface DataConnectGenerateArgs {
   configDir: string;
-  connectorId: string;
   watch?: boolean;
   account?: Account;
 }
@@ -238,39 +236,44 @@ export class DataConnectEmulator implements EmulatorInstance {
     }
   }
 
-  static async generate(args: DataConnectGenerateArgs): Promise<string> {
+  static async generate(args: DataConnectGenerateArgs): Promise<void> {
     const commandInfo = await downloadIfNecessary(Emulators.DATACONNECT);
-    const cmd = [
-      "--logtostderr",
-      "-v=2",
-      "generate",
-      `--config_dir=${args.configDir}`,
-      `--connector_id=${args.connectorId}`,
-    ];
+    const cmd = ["--logtostderr", "-v=2", "sdk", "generate", `--config_dir=${args.configDir}`];
     if (args.watch) {
       cmd.push("--watch");
     }
     const env = await DataConnectEmulator.getEnv(args.account);
-    const res = childProcess.spawnSync(commandInfo.binary, cmd, { encoding: "utf-8", env });
-    if (isIncomaptibleArchError(res.error)) {
-      throw new FirebaseError(
-        `Unknown system error when running the Data Connect toolkit. ` +
-          `You may be able to fix this by installing Rosetta: ` +
-          `softwareupdate --install-rosetta`,
-      );
-    }
-    logger.info(res.stderr);
-    if (res.error) {
-      throw new FirebaseError(`Error starting up Data Connect generate: ${res.error.message}`, {
-        original: res.error,
-      });
-    }
-    if (res.status !== 0) {
-      throw new FirebaseError(
-        `Unable to generate your Data Connect SDKs (exit code ${res.status}): ${res.stderr}`,
-      );
-    }
-    return res.stdout;
+    return new Promise((resolve, reject) => {
+      try {
+        const proc = childProcess.spawn(commandInfo.binary, cmd, { stdio: "inherit", env });
+        proc.on("close", (code) => {
+          if (code === 0) {
+            // Command executed successfully
+            resolve();
+          } else {
+            // Command failed
+            reject(new Error(`Command failed with exit code ${code}`));
+          }
+        });
+
+        proc.on("error", (err) => {
+          // Handle errors like command not found
+          reject(err);
+        });
+      } catch (e: any) {
+        if (isIncomaptibleArchError(e)) {
+          reject(
+            new FirebaseError(
+              `Unknown system error when running the Data Connect toolkit. ` +
+                `You may be able to fix this by installing Rosetta: ` +
+                `softwareupdate --install-rosetta`,
+            ),
+          );
+        } else {
+          reject(e);
+        }
+      }
+    });
   }
 
   static async build(args: DataConnectBuildArgs): Promise<BuildResult> {

src/init/features/dataconnect/sdk.ts

@@ -202,7 +202,6 @@ async function actuateWithInfo(setup: Setup, config: Config, info: SdkRequiredIn
   const account = getGlobalDefaultAccount();
   await DataConnectEmulator.generate({
     configDir: connectorInfo.directory,
-    connectorId: connectorInfo.connectorYaml.connectorId,
     account,
   });