firebase-tools 13.11.3 → 13.11.4

package/lib/commands/index.js

@@ -200,17 +200,15 @@ function load(client) {
     client.setup.emulators.pubsub = loadCommand("setup-emulators-pubsub");
     client.setup.emulators.storage = loadCommand("setup-emulators-storage");
     client.setup.emulators.ui = loadCommand("setup-emulators-ui");
-    if (experiments.isEnabled("dataconnect")) {
-        client.dataconnect = {};
-        client.setup.emulators.dataconnect = loadCommand("setup-emulators-dataconnect");
-        client.dataconnect.services = {};
-        client.dataconnect.services.list = loadCommand("dataconnect-services-list");
-        client.dataconnect.sql = {};
-        client.dataconnect.sql.diff = loadCommand("dataconnect-sql-diff");
-        client.dataconnect.sql.migrate = loadCommand("dataconnect-sql-migrate");
-        client.dataconnect.sdk = {};
-        client.dataconnect.sdk.generate = loadCommand("dataconnect-sdk-generate");
-    }
+    client.dataconnect = {};
+    client.setup.emulators.dataconnect = loadCommand("setup-emulators-dataconnect");
+    client.dataconnect.services = {};
+    client.dataconnect.services.list = loadCommand("dataconnect-services-list");
+    client.dataconnect.sql = {};
+    client.dataconnect.sql.diff = loadCommand("dataconnect-sql-diff");
+    client.dataconnect.sql.migrate = loadCommand("dataconnect-sql-migrate");
+    client.dataconnect.sdk = {};
+    client.dataconnect.sdk.generate = loadCommand("dataconnect-sdk-generate");
     client.target = loadCommand("target");
     client.target.apply = loadCommand("target-apply");
     client.target.clear = loadCommand("target-clear");

package/lib/commands/init.js

@@ -76,13 +76,11 @@ if ((0, experiments_1.isEnabled)("genkit")) {
         checked: false,
     });
 }
-if ((0, experiments_1.isEnabled)("dataconnect")) {
-    choices.push({
-        value: "dataconnect",
-        name: "Data Connect: Set up a Firebase Data Connect service.",
-        checked: false,
-    });
-}
+choices.push({
+    value: "dataconnect",
+    name: "Data Connect: Set up a Firebase Data Connect service.",
+    checked: false,
+});
 const featureNames = choices.map((choice) => choice.value);
 const DESCRIPTION = `Interactively configure the current directory as a Firebase project or initialize new features in an already configured Firebase project directory.
 

package/lib/crashlytics/buildToolsJarHelper.js

@@ -12,7 +12,7 @@ const rimraf = require("rimraf");
 const utils = require("../utils");
 const JAR_CACHE_DIR = process.env.FIREBASE_CRASHLYTICS_BUILDTOOLS_PATH ||
     path.join(os.homedir(), ".cache", "firebase", "crashlytics", "buildtools");
-const JAR_VERSION = "3.0.0";
+const JAR_VERSION = "3.0.2";
 const JAR_URL = `https://dl.google.com/android/maven2/com/google/firebase/firebase-crashlytics-buildtools/${JAR_VERSION}/firebase-crashlytics-buildtools-${JAR_VERSION}.jar`;
 async function fetchBuildtoolsJar() {
     if (process.env.CRASHLYTICS_LOCAL_JAR) {

package/lib/dataconnect/client.js

@@ -132,7 +132,7 @@ async function listConnectors(serviceName) {
                 pageToken,
             },
         });
-        connectors.push(...res.body.connectors);
+        connectors.push(...(res.body.connectors || []));
         if (res.body.nextPageToken) {
             await getNextPage(res.body.nextPageToken);
         }

package/lib/emulator/controller.js

@@ -539,9 +539,6 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             rc: options.rc,
         });
         await startEmulator(dataConnectEmulator);
-        if (!utils.isVSCodeExtension()) {
-            await dataConnectEmulator.connectToPostgres();
-        }
     }
     if (listenForEmulator.storage) {
         const storageAddr = legacyGetFirstAddr(types_1.Emulators.STORAGE);

package/lib/emulator/dataconnectEmulator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataConnectEmulatorClient = exports.DataConnectEmulator = void 0;
+exports.checkIfDataConnectEmulatorRunningOnAddress = exports.DataConnectEmulatorClient = exports.DataConnectEmulator = exports.dataConnectEmulatorEvents = void 0;
 const childProcess = require("child_process");
 const clc = require("colorette");
 const api_1 = require("../api");
@@ -11,10 +11,16 @@ const error_1 = require("../error");
 const emulatorLogger_1 = require("./emulatorLogger");
 const types_2 = require("../dataconnect/types");
 const portUtils_1 = require("./portUtils");
+const apiv2_1 = require("../apiv2");
 const registry_1 = require("./registry");
+const load_1 = require("../dataconnect/load");
+const utils_1 = require("../utils");
+const events_1 = require("events");
+exports.dataConnectEmulatorEvents = new events_1.EventEmitter();
 class DataConnectEmulator {
     constructor(args) {
         this.args = args;
+        this.usingExistingEmulator = false;
         this.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT);
         this.emulatorClient = new DataConnectEmulatorClient();
     }
@@ -33,17 +39,39 @@ class DataConnectEmulator {
         catch (err) {
             this.logger.log("DEBUG", `'fdc build' failed with error: ${err.message}`);
         }
-        return (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, {
-            auto_download: this.args.auto_download,
-            listen: (0, portUtils_1.listenSpecsToString)(this.args.listen),
-            config_dir: this.args.configDir,
-            service_location: this.args.locationId,
-        });
+        const alreadyRunning = await this.discoverRunningInstance();
+        if (alreadyRunning) {
+            this.logger.logLabeled("INFO", "Data Connect", "Detected an instance of the emulator already running with your service, reusing it. This emulator will not be shut down at the end of this command.");
+            this.usingExistingEmulator = true;
+            this.watchUnmanagedInstance();
+        }
+        else {
+            await (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, {
+                auto_download: this.args.auto_download,
+                listen: (0, portUtils_1.listenSpecsToString)(this.args.listen),
+                config_dir: this.args.configDir,
+                service_location: this.args.locationId,
+            });
+            this.usingExistingEmulator = false;
+        }
+        if (!(0, utils_1.isVSCodeExtension)()) {
+            await this.connectToPostgres();
+        }
+        return;
     }
-    connect() {
+    async connect() {
+        const emuInfo = await this.emulatorClient.getInfo();
+        if (!emuInfo) {
+            this.logger.logLabeled("ERROR", "Data Connect", "Could not connect to Data Connect emulator. Check dataconnect-debug.log for more details.");
+            return Promise.reject();
+        }
         return Promise.resolve();
     }
-    stop() {
+    async stop() {
+        if (this.usingExistingEmulator) {
+            this.logger.logLabeled("INFO", "Data Connect", "Skipping cleanup of Data Connect emulator, as it was not started by this process.");
+            return;
+        }
         return (0, downloadableEmulators_1.stop)(types_1.Emulators.DATACONNECT);
     }
     getInfo() {
@@ -107,6 +135,35 @@ class DataConnectEmulator {
         }
         return (_b = (_a = this.args.rc.getDataconnect()) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.localConnectionString;
     }
+    async discoverRunningInstance() {
+        const emuInfo = await this.emulatorClient.getInfo();
+        if (!emuInfo) {
+            return false;
+        }
+        const serviceInfo = await (0, load_1.load)(this.args.projectId, this.args.locationId, this.args.configDir);
+        const sameService = emuInfo.services.find((s) => serviceInfo.dataConnectYaml.serviceId === s.serviceId);
+        if (!sameService) {
+            throw new error_1.FirebaseError(`There is a Data Connect emulator already running on ${this.args.listen[0].address}:${this.args.listen[0].port}, but it is emulating a different service. Please stop that instance of the Data Connect emulator, or specify a different port in 'firebase.json'`);
+        }
+        if (sameService.connectionString &&
+            sameService.connectionString !== this.getLocalConectionString()) {
+            throw new error_1.FirebaseError(`There is a Data Connect emulator already running, but it is using a different Postgres connection string. Please stop that instance of the Data Connect emulator, or specify a different port in 'firebase.json'`);
+        }
+        return true;
+    }
+    watchUnmanagedInstance() {
+        return setInterval(async () => {
+            if (!this.usingExistingEmulator) {
+                return;
+            }
+            const emuInfo = await this.emulatorClient.getInfo();
+            if (!emuInfo) {
+                this.logger.logLabeled("INFO", "Data Connect", "The already running emulator seems to have shut down. Starting a new instance of the Data Connect emulator...");
+                await this.start();
+                exports.dataConnectEmulatorEvents.emit("restart");
+            }
+        }, 5000);
+    }
     async connectToPostgres(localConnectionString, database, serviceId) {
         const connectionString = localConnectionString !== null && localConnectionString !== void 0 ? localConnectionString : this.getLocalConectionString();
         if (!connectionString) {
@@ -114,8 +171,22 @@ class DataConnectEmulator {
 Run ${clc.bold("firebase setup:emulators:dataconnect")} to set up a Postgres connection.`;
             throw new error_1.FirebaseError(msg);
         }
-        await this.emulatorClient.configureEmulator({ connectionString, database, serviceId });
-        return true;
+        const MAX_RETRIES = 3;
+        for (let i = 1; i <= MAX_RETRIES; i++) {
+            try {
+                this.logger.logLabeled("DEBUG", "Data Connect", `Connecting to ${connectionString}}`);
+                await this.emulatorClient.configureEmulator({ connectionString, database, serviceId });
+                return true;
+            }
+            catch (err) {
+                if (i === MAX_RETRIES) {
+                    throw err;
+                }
+                this.logger.logLabeled("DEBUG", "Data Connect", `Retrying connectToPostgress call (${i} of ${MAX_RETRIES} attempts): ${err}`);
+                await new Promise((resolve) => setTimeout(resolve, 800));
+            }
+        }
+        return false;
     }
 }
 exports.DataConnectEmulator = DataConnectEmulator;
@@ -124,6 +195,7 @@ class DataConnectEmulatorClient {
         this.client = undefined;
     }
     async configureEmulator(body) {
+        var _a, _b;
         if (!this.client) {
             this.client = registry_1.EmulatorRegistry.client(types_1.Emulators.DATACONNECT);
         }
@@ -133,10 +205,33 @@ class DataConnectEmulatorClient {
         }
         catch (err) {
             if (err.status === 500) {
-                throw new error_1.FirebaseError(`Data Connect emulator: ${err.context.body.message}`);
+                throw new error_1.FirebaseError(`Data Connect emulator: ${(_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.message}`);
             }
             throw err;
         }
     }
+    async getInfo() {
+        if (!this.client) {
+            this.client = registry_1.EmulatorRegistry.client(types_1.Emulators.DATACONNECT);
+        }
+        return getInfo(this.client);
+    }
 }
 exports.DataConnectEmulatorClient = DataConnectEmulatorClient;
+async function checkIfDataConnectEmulatorRunningOnAddress(l) {
+    const client = new apiv2_1.Client({
+        urlPrefix: `http:/${l.family === "IPv6" ? `[${l.address}]` : l.address}:${l.port}`,
+        auth: false,
+    });
+    return getInfo(client);
+}
+exports.checkIfDataConnectEmulatorRunningOnAddress = checkIfDataConnectEmulatorRunningOnAddress;
+async function getInfo(client) {
+    try {
+        const res = await client.get("emulator/info");
+        return res.body;
+    }
+    catch (err) {
+        return;
+    }
+}

package/lib/emulator/hub.js

@@ -149,7 +149,7 @@ class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
         const locatorPath = EmulatorHub.getLocatorFilePath(this.args.projectId);
         return new Promise((resolve, reject) => {
             fs.unlink(locatorPath, (e) => {
-                if (e) {
+                if (e && e.code !== "ENOENT") {
                     reject(e);
                 }
                 else {

package/lib/emulator/portUtils.js

@@ -11,6 +11,7 @@ const types_1 = require("./types");
 const constants_1 = require("./constants");
 const emulatorLogger_1 = require("./emulatorLogger");
 const node_child_process_1 = require("node:child_process");
+const dataconnectEmulator_1 = require("./dataconnectEmulator");
 const RESTRICTED_PORTS = new Set([
     1,
     7,
@@ -219,6 +220,14 @@ async function resolveHostAndAssignPorts(listenConfig) {
                         available.push(listen);
                     }
                     else {
+                        if (/^dataconnect/i.exec(name)) {
+                            const alreadyRunning = await (0, dataconnectEmulator_1.checkIfDataConnectEmulatorRunningOnAddress)(listen);
+                            if (alreadyRunning) {
+                                emuLogger.logLabeled("DEBUG", "dataconnect", `Detected already running emulator on ${listen.address}:${listen.port}. Will attempt to reuse it.`);
+                            }
+                            available.push(listen);
+                            continue;
+                        }
                         if (!portFixed) {
                             if (i > 0) {
                                 emuLogger.logLabeled("DEBUG", name, `Port ${p} taken on secondary address ${addr.address}, will keep searching to find a better port.`);

package/lib/experiments.js

@@ -92,8 +92,8 @@ exports.ALL_EXPERIMENTS = experiments({
         public: false,
     },
     dataconnect: {
-        shortDescription: "Enable Data Connect related features.",
-        fullDescription: "Enable Data Connect related features.",
+        shortDescription: "Deprecated. Previosuly, enabled Data Connect related features.",
+        fullDescription: "Deprecated. Previously, enabled Data Connect related features.",
         public: false,
     },
     genkit: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.11.3",
+  "version": "13.11.4",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {