Clean up logs when using FIREBASE_DATACONNECT_POSTGRESQL_STRING

CHANGELOG.md

@@ -1 +1,2 @@
 - Fixed Next.js issue with PPR routes not rendering correctly. (#7625)
+- Fixed some misleading logs when using the Data Connect emulator with `FIREBASE_DATACONNECT_POSTGRESQL_STRING` set.

src/emulator/controller.ts

@@ -60,6 +60,7 @@
 import { TasksEmulator } from "./tasksEmulator";
 import { AppHostingEmulator } from "./apphosting";
 import { sendVSCodeMessage, VSCODE_MESSAGE } from "../dataconnect/webhook";
+import { dataConnectLocalConnString } from "../api";
 
 const START_LOGGING_EMULATOR = utils.envOverride(
   "START_LOGGING_EMULATOR",
@@ -69,20 +70,20 @@
 
 /**
  * Exports emulator data on clean exit (SIGINT or process end)
  * @param options
  */
 export async function exportOnExit(options: any) {
   const exportOnExitDir = options.exportOnExit;
   if (exportOnExitDir) {
     try {
       utils.logBullet(
         `Automatically exporting data using ${FLAG_EXPORT_ON_EXIT_NAME} "${exportOnExitDir}" ` +
           "please wait for the export to finish...",
       );
       await exportEmulatorData(exportOnExitDir, options, /* initiatedBy= */ "exit");
     } catch (e: any) {
       utils.logWarning(e);
       utils.logWarning(`Automatic export to "${exportOnExitDir}" failed, going to exit now...`);
     }
   }
 }
@@ -419,7 +420,7 @@
           portFixed: !!wsPortConfig,
         };
       }
-      if (emulator === Emulators.DATACONNECT) {
+      if (emulator === Emulators.DATACONNECT && !dataConnectLocalConnString()) {
         const pglitePortConfig = options.config.src.emulators?.dataconnect?.postgresPort;
         listenConfig["dataconnect.postgres"] = {
           host: config.host,

src/emulator/dataconnectEmulator.ts

@@ -1,5 +1,6 @@
 import * as childProcess from "child_process";
 import { EventEmitter } from "events";
+import * as clc from "colorette";
 
 import { dataConnectLocalConnString } from "../api";
 import { Constants } from "./constants";
@@ -64,13 +65,13 @@ export class DataConnectEmulator implements EmulatorInstance {
         if (Constants.isDemoProject(this.args.projectId)) {
           this.logger.logLabeled(
             "WARN",
-            "Data Connect",
+            "dataconnect",
             "Detected a 'demo-' project, but vector embeddings require a real project. Operations that use vector_embed will fail.",
           );
         } else {
           this.logger.logLabeled(
             "WARN",
-            "Data Connect",
+            "dataconnect",
             "Operations that use vector_embed will make calls to production Vertex AI",
           );
         }
@@ -94,11 +95,11 @@ export class DataConnectEmulator implements EmulatorInstance {
       const pgPort = this.args.postgresListen?.[0].port;
       const pgHost = this.args.postgresListen?.[0].address;
       let connStr = dataConnectLocalConnString();
-      if (dataConnectLocalConnString()) {
+      if (connStr) {
         this.logger.logLabeled(
           "INFO",
-          "Data Connect",
-          `FIREBASE_DATACONNECT_POSTGRESQL_STRING is set to ${dataConnectLocalConnString()} - using that instead of starting a new database`,
+          "dataconnect",
+          `FIREBASE_DATACONNECT_POSTGRESQL_STRING is set to ${clc.bold(connStr)} - using that instead of starting a new database`,
         );
       } else if (pgHost && pgPort) {
         const pgServer = new PostgresServer(dbId, "postgres");
@@ -111,16 +112,16 @@ export class DataConnectEmulator implements EmulatorInstance {
           } else {
             this.logger.logLabeled(
               "ERROR",
-              "Data Connect",
+              "dataconnect",
               `Postgres threw an unexpected error, shutting down the Data Connect emulator: ${err}`,
             );
           }
           void cleanShutdown();
         });
         this.logger.logLabeled(
           "INFO",
-          "Data Connect",
-          `Started up Postgres server, listening on ${server.address()?.toString()}`,
+          "dataconnect",
+          `Started up Postgres server, listening on ${JSON.stringify(server.address())}`,
         );
       }
       await this.connectToPostgres(new URL(connStr), dbId, serviceId);
@@ -134,7 +135,7 @@ export class DataConnectEmulator implements EmulatorInstance {
     if (!emuInfo) {
       this.logger.logLabeled(
         "ERROR",
-        "Data Connect",
+        "dataconnect",
         "Could not connect to Data Connect emulator. Check dataconnect-debug.log for more details.",
       );
       return Promise.reject();
@@ -146,7 +147,7 @@ export class DataConnectEmulator implements EmulatorInstance {
     if (this.usingExistingEmulator) {
       this.logger.logLabeled(
         "INFO",
-        "Data Connect",
+        "dataconnect",
         "Skipping cleanup of Data Connect emulator, as it was not started by this process.",
       );
       return;

src/emulator/emulatorLogger.ts

@@ -310,6 +310,9 @@ You can probably fix this by running "npm install ${systemLog.data.name}@latest"
       case "BULLET":
         utils.logLabeledBullet(label, text, "info", mergedData);
         break;
+      case "INFO":
+        utils.logLabeledBullet(label, text, "info", mergedData);
+        break;
       case "SUCCESS":
         utils.logLabeledSuccess(label, text, "info", mergedData);
         break;