firebase-tools 13.10.0 → 13.10.2

package/lib/commands/dataconnect-sdk-generate.js

@@ -20,16 +20,12 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
             configDir = path.resolve(path.join(cwd), configDir);
         }
         const serviceInfo = await (0, load_1.load)(projectId, service.location, configDir);
-        const args = {
-            projectId,
-            configDir,
-            auto_download: true,
-            rc: options.rc,
-            locationId: service.location,
-        };
-        const dataconnectEmulator = new dataconnectEmulator_1.DataConnectEmulator(args);
         for (const conn of serviceInfo.connectorInfo) {
-            const output = await dataconnectEmulator.generate(conn.connectorYaml.connectorId);
+            const output = await dataconnectEmulator_1.DataConnectEmulator.generate({
+                configDir,
+                locationId: service.location,
+                connectorId: conn.connectorYaml.connectorId,
+            });
             logger_1.logger.info(output);
             logger_1.logger.info(`Generated SDKs for ${conn.connectorYaml.connectorId}`);
         }

package/lib/commands/dataconnect-sql-migrate.js

@@ -33,7 +33,6 @@ exports.command = new command_1.Command("dataconnect:sql:migrate [serviceId]")
     const diffs = await (0, schemaMigration_1.migrateSchema)({
         options,
         schema: serviceInfo.schema,
-        allowNonInteractiveMigration: true,
         validateOnly: true,
     });
     if (diffs.length) {

package/lib/dataconnect/build.js

@@ -5,19 +5,11 @@ const dataconnectEmulator_1 = require("../emulator/dataconnectEmulator");
 const error_1 = require("../error");
 const graphqlError_1 = require("./graphqlError");
 async function build(options, configDir) {
-    var _a, _b, _c;
-    const projectId = (_a = options.project) !== null && _a !== void 0 ? _a : "demo-test";
-    const args = {
-        projectId,
-        configDir,
-        auto_download: true,
-        rc: options.rc,
-    };
-    const dataconnectEmulator = new dataconnectEmulator_1.DataConnectEmulator(args);
-    const buildResult = await dataconnectEmulator.build();
-    if ((_b = buildResult === null || buildResult === void 0 ? void 0 : buildResult.errors) === null || _b === void 0 ? void 0 : _b.length) {
+    var _a, _b;
+    const buildResult = await dataconnectEmulator_1.DataConnectEmulator.build({ configDir });
+    if ((_a = buildResult === null || buildResult === void 0 ? void 0 : buildResult.errors) === null || _a === void 0 ? void 0 : _a.length) {
         throw new error_1.FirebaseError(`There are errors in your schema and connector files:\n${buildResult.errors.map(graphqlError_1.prettify).join("\n")}`);
     }
-    return (_c = buildResult === null || buildResult === void 0 ? void 0 : buildResult.metadata) !== null && _c !== void 0 ? _c : {};
+    return (_b = buildResult === null || buildResult === void 0 ? void 0 : buildResult.metadata) !== null && _b !== void 0 ? _b : {};
 }
 exports.build = build;

package/lib/dataconnect/schemaMigration.js

@@ -40,7 +40,7 @@ async function diffSchema(schema) {
 }
 exports.diffSchema = diffSchema;
 async function migrateSchema(args) {
-    const { options, schema, allowNonInteractiveMigration, validateOnly } = args;
+    const { options, schema, validateOnly } = args;
     const { serviceName, instanceId, instanceName, databaseId } = getIdentifiers(schema);
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, true);
     try {
@@ -56,13 +56,8 @@ async function migrateSchema(args) {
         if (!incompatible && !invalidConnectors.length) {
             throw err;
         }
+        const migrationMode = await promptForSchemaMigration(options, databaseId, incompatible, validateOnly);
         const shouldDeleteInvalidConnectors = await promptForInvalidConnectorError(options, serviceName, invalidConnectors, validateOnly);
-        const migrationMode = incompatible
-            ? await promptForSchemaMigration(options, databaseId, incompatible, allowNonInteractiveMigration)
-            : "none";
-        if (migrationMode === "none" && incompatible) {
-            throw new error_1.FirebaseError("Command aborted.");
-        }
         let diffs = [];
         if (incompatible) {
             diffs = await handleIncompatibleSchemaError({
@@ -143,16 +138,22 @@ async function handleIncompatibleSchemaError(args) {
     }
     return [];
 }
-async function promptForSchemaMigration(options, databaseName, err, allowNonInteractiveMigration) {
+async function promptForSchemaMigration(options, databaseName, err, validateOnly) {
+    if (!err) {
+        return "none";
+    }
     displaySchemaChanges(err);
     if (!options.nonInteractive) {
+        if (validateOnly && options.force) {
+            return "all";
+        }
         const choices = err.destructive
             ? [
                 { name: "Execute all changes (including destructive changes)", value: "all" },
                 { name: "Abort changes", value: "none" },
             ]
             : [
-                { name: "Execute changes", value: "safe" },
+                { name: "Execute changes", value: "all" },
                 { name: "Abort changes", value: "none" },
             ];
         return await (0, prompt_1.promptOnce)({
@@ -161,19 +162,17 @@ async function promptForSchemaMigration(options, databaseName, err, allowNonInte
             choices,
         });
     }
-    else if (!allowNonInteractiveMigration) {
-        logger_1.logger.error("Your database schema is incompatible with your Data Connect schema. Run `firebase dataconnect:sql:migrate` to migrate your database schema");
-        return "none";
+    if (!validateOnly) {
+        throw new error_1.FirebaseError("Command aborted. Your database schema is incompatible with your Data Connect schema. Run `firebase dataconnect:sql:migrate` to migrate your database schema");
     }
     else if (options.force) {
         return "all";
     }
     else if (!err.destructive) {
-        return "safe";
+        return "all";
     }
     else {
-        logger_1.logger.error("This schema migration includes potentially destructive changes. If you'd like to execute it anyway, rerun this command with --force");
-        return "none";
+        throw new error_1.FirebaseError("Command aborted. This schema migration includes potentially destructive changes. If you'd like to execute it anyway, rerun this command with --force");
     }
 }
 async function promptForInvalidConnectorError(options, serviceName, invalidConnectors, validateOnly) {

package/lib/deploy/dataconnect/release.js

@@ -21,7 +21,6 @@ async function default_1(context, options) {
             await (0, schemaMigration_1.migrateSchema)({
                 options,
                 schema: s,
-                allowNonInteractiveMigration: false,
                 validateOnly: false,
             });
         }

package/lib/emulator/controller.js

@@ -518,7 +518,6 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         await startEmulator(pubsubEmulator);
     }
     if (listenForEmulator.dataconnect) {
-        const dataConnectAddr = legacyGetFirstAddr(types_1.Emulators.DATACONNECT);
         const config = (0, fileUtils_1.readFirebaseJson)(options.config);
         if (!config.length) {
             throw new error_1.FirebaseError("No Data Connect service found in firebase.json");
@@ -532,8 +531,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             configDir = path.resolve(path.join(cwd), configDir);
         }
         const dataConnectEmulator = new dataconnectEmulator_1.DataConnectEmulator({
-            host: dataConnectAddr.host,
-            port: dataConnectAddr.port,
+            listen: listenForEmulator.dataconnect,
             projectId,
             auto_download: true,
             configDir,

package/lib/emulator/dataconnectEmulator.js

@@ -9,16 +9,15 @@ const types_1 = require("./types");
 const error_1 = require("../error");
 const emulatorLogger_1 = require("./emulatorLogger");
 const types_2 = require("../dataconnect/types");
-const grpcDefaultPort = 9510;
+const portUtils_1 = require("./portUtils");
 class DataConnectEmulator {
     constructor(args) {
         this.args = args;
         this.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT);
     }
     async start() {
-        const port = this.args.port || constants_1.Constants.getDefaultPort(types_1.Emulators.DATACONNECT);
         this.logger.log("DEBUG", `Using Postgres connection string: ${this.getLocalConectionString()}`);
-        const info = await this.build();
+        const info = await DataConnectEmulator.build({ configDir: this.args.configDir });
         if ((0, types_2.requiresVector)(info.metadata)) {
             if (constants_1.Constants.isDemoProject(this.args.projectId)) {
                 this.logger.logLabeled("WARN", "Data Connect", "Detected a 'demo-' project, but vector embeddings require a real project. Operations that use vector_embed will fail.");
@@ -27,7 +26,7 @@ class DataConnectEmulator {
                 this.logger.logLabeled("WARN", "Data Connect", "Operations that use vector_embed will make calls to production Vertex AI");
             }
         }
-        return (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, Object.assign(Object.assign({}, this.args), { http_port: port, grpc_port: grpcDefaultPort, config_dir: this.args.configDir, local_connection_string: this.getLocalConectionString(), project_id: this.args.projectId, service_location: this.args.locationId }));
+        return (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, Object.assign(Object.assign({}, this.args), { listen: (0, portUtils_1.listenSpecsToString)(this.args.listen), config_dir: this.args.configDir, local_connection_string: this.getLocalConectionString(), project_id: this.args.projectId, service_location: this.args.locationId }));
     }
     connect() {
         return Promise.resolve();
@@ -36,12 +35,11 @@ class DataConnectEmulator {
         return (0, downloadableEmulators_1.stop)(types_1.Emulators.DATACONNECT);
     }
     getInfo() {
-        const host = this.args.host || constants_1.Constants.getDefaultHost();
-        const port = this.args.port || constants_1.Constants.getDefaultPort(types_1.Emulators.DATACONNECT);
         return {
             name: this.getName(),
-            host,
-            port,
+            listen: this.args.listen,
+            host: this.args.listen[0].address,
+            port: this.args.listen[0].port,
             pid: (0, downloadableEmulators_1.getPID)(types_1.Emulators.DATACONNECT),
             timeout: 10000,
         };
@@ -49,25 +47,32 @@ class DataConnectEmulator {
     getName() {
         return types_1.Emulators.DATACONNECT;
     }
-    async generate(connectorId) {
+    static async generate(args) {
         const commandInfo = await (0, downloadableEmulators_1.downloadIfNecessary)(types_1.Emulators.DATACONNECT);
         const cmd = [
             "generate",
-            `--service_location=${this.args.locationId}`,
-            `--config_dir=${this.args.configDir}`,
-            `--connector_id=${connectorId}`,
+            `--service_location=${args.locationId}`,
+            `--config_dir=${args.configDir}`,
+            `--connector_id=${args.connectorId}`,
         ];
         const res = childProcess.spawnSync(commandInfo.binary, cmd, { encoding: "utf-8" });
         if (res.error) {
-            throw new error_1.FirebaseError(`Error starting up Data Connect emulator: ${res.error}`);
+            throw new error_1.FirebaseError(`Error starting up Data Connect generate: ${res.error.message}`, {
+                original: res.error,
+            });
         }
         return res.stdout;
     }
-    async build() {
+    static async build(args) {
         var _a;
         const commandInfo = await (0, downloadableEmulators_1.downloadIfNecessary)(types_1.Emulators.DATACONNECT);
-        const cmd = ["build", `--config_dir=${this.args.configDir}`];
+        const cmd = ["build", `--config_dir=${args.configDir}`];
         const res = childProcess.spawnSync(commandInfo.binary, cmd, { encoding: "utf-8" });
+        if (res.error) {
+            throw new error_1.FirebaseError(`Error starting up Data Connect build: ${res.error.message}`, {
+                original: res.error,
+            });
+        }
         if (res.stderr) {
             throw new error_1.FirebaseError(`Unable to build your Data Connect schema and connectors: ${res.stderr}`);
         }

package/lib/emulator/downloadableEmulators.js

@@ -46,15 +46,21 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.1.17",
-            expectedSize: 25602224,
-            expectedChecksum: "1f9e3dd040a0ac4d1cb4d9dde4a3c0b0",
+            version: "1.1.19",
+            expectedSize: 25836864,
+            expectedChecksum: "b31ba00789b82a30f0dee1c03b8f74ce",
         }
-        : {
-            version: "1.1.17",
-            expectedSize: 23036912,
-            expectedChecksum: "a0ec0517108f842ed06fea14fe7c7e56",
-        },
+        : process.platform === "win32"
+            ? {
+                version: "1.1.19",
+                expectedSize: 23629824,
+                expectedChecksum: "bcbd7705b36cee72ff0587749d67bfc3",
+            }
+            : {
+                version: "1.1.19",
+                expectedSize: 23247120,
+                expectedChecksum: "56d6cb2ad85474d3a67999e35d2916a1",
+            },
 };
 exports.DownloadDetails = {
     database: {
@@ -119,14 +125,16 @@ exports.DownloadDetails = {
         },
     },
     dataconnect: {
-        downloadPath: path.join(CACHE_DIR, `dataconnect-emulator-${EMULATOR_UPDATE_DETAILS.dataconnect.version}`),
+        downloadPath: path.join(CACHE_DIR, `dataconnect-emulator-${EMULATOR_UPDATE_DETAILS.dataconnect.version}${process.platform === "win32" ? ".exe" : ""}`),
         version: EMULATOR_UPDATE_DETAILS.dataconnect.version,
-        binaryPath: path.join(CACHE_DIR, `dataconnect-emulator-${EMULATOR_UPDATE_DETAILS.dataconnect.version}`),
+        binaryPath: path.join(CACHE_DIR, `dataconnect-emulator-${EMULATOR_UPDATE_DETAILS.dataconnect.version}${process.platform === "win32" ? ".exe" : ""}`),
         opts: {
             cacheDir: CACHE_DIR,
             remoteUrl: process.platform === "darwin"
                 ? `https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v${EMULATOR_UPDATE_DETAILS.dataconnect.version}`
-                : `https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v${EMULATOR_UPDATE_DETAILS.dataconnect.version}`,
+                : process.platform === "win32"
+                    ? `https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v${EMULATOR_UPDATE_DETAILS.dataconnect.version}`
+                    : `https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v${EMULATOR_UPDATE_DETAILS.dataconnect.version}`,
             expectedSize: EMULATOR_UPDATE_DETAILS.dataconnect.expectedSize,
             expectedChecksum: EMULATOR_UPDATE_DETAILS.dataconnect.expectedChecksum,
             skipChecksumAndSize: false,
@@ -232,7 +240,13 @@ const Commands = {
     dataconnect: {
         binary: getExecPath(types_1.Emulators.DATACONNECT),
         args: ["dev"],
-        optionalArgs: ["http_port", "grpc_port", "config_dir", "local_connection_string", "project_id"],
+        optionalArgs: [
+            "listen",
+            "config_dir",
+            "local_connection_string",
+            "project_id",
+            "service_location",
+        ],
         joinArgs: true,
         shell: true,
     },

package/lib/emulator/portUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveHostAndAssignPorts = exports.waitForPortUsed = exports.checkListenable = void 0;
+exports.listenSpecsToString = exports.resolveHostAndAssignPorts = exports.waitForPortUsed = exports.checkListenable = void 0;
 const clc = require("colorette");
 const tcpport = require("tcp-port-used");
 const node_net_1 = require("node:net");
@@ -146,7 +146,7 @@ const EMULATOR_CAN_LISTEN_ON_PRIMARY_ONLY = {
     firestore: true,
     "firestore.websocket": true,
     pubsub: true,
-    dataconnect: true,
+    dataconnect: false,
     hub: false,
     ui: false,
     auth: true,
@@ -321,3 +321,12 @@ function listenSpec(lookup, port) {
         port: port,
     };
 }
+function listenSpecsToString(specs) {
+    return specs
+        .map((spec) => {
+        const host = spec.family === "IPv4" ? spec.address : `[${spec.address}]`;
+        return `${host}:${spec.port}`;
+    })
+        .join(",");
+}
+exports.listenSpecsToString = listenSpecsToString;

package/lib/init/features/dataconnect/index.js

@@ -45,7 +45,7 @@ async function doSetup(setup, config) {
         }
         if (instances.length) {
             cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
-                message: `Which CloudSSQL instance would you like to use?`,
+                message: `Which CloudSQL instance would you like to use?`,
                 type: "list",
                 choices,
             });

package/package.json

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