firebase-tools 14.4.0 → 14.5.0

package/lib/apphosting/backend.js

@@ -108,10 +108,12 @@ async function doSetup(projectId, webAppName, serviceAccount) {
 exports.doSetup = doSetup;
 async function doSetupSourceDeploy(projectId, backendId) {
     const location = await promptLocation(projectId, "Select a primary region to host your backend:\n");
+    const webAppSpinner = ora("Creating a new web app...\n").start();
     const webApp = await app_1.webApps.getOrCreateWebApp(projectId, null, backendId);
     if (!webApp) {
         (0, utils_1.logWarning)(`Firebase web app not set`);
     }
+    webAppSpinner.stop();
     const createBackendSpinner = ora("Creating your new backend...").start();
     const backend = await createBackend(projectId, location, backendId, null, undefined, webApp === null || webApp === void 0 ? void 0 : webApp.id);
     createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);

package/lib/bin/mcp.js

@@ -33,6 +33,7 @@ async function mcp() {
         console.log((0, index_js_1.markdownDocsOfTools)());
         return;
     }
+    process.env.IS_FIREBASE_MCP = "true";
     (0, logger_1.useFileLogger)();
     const activeFeatures = (values.only || "")
         .split(",")

package/lib/commands/init.js

@@ -186,12 +186,9 @@ async function initAction(feature, options) {
     }
     await (0, init_1.init)(setup, config, options);
     logger_1.logger.info();
-    utils.logBullet("Writing configuration info to " + clc.bold("firebase.json") + "...");
     config.writeProjectFile("firebase.json", setup.config);
-    utils.logBullet("Writing project information to " + clc.bold(".firebaserc") + "...");
     config.writeProjectFile(".firebaserc", setup.rcfile);
     if (!fsutils.fileExistsSync(config.path(".gitignore"))) {
-        utils.logBullet("Writing gitignore file to " + clc.bold(".gitignore") + "...");
         config.writeProjectFile(".gitignore", GITIGNORE_TEMPLATE);
     }
     logger_1.logger.info();

package/lib/config.js

@@ -156,11 +156,20 @@ class Config {
         }
     }
     writeProjectFile(p, content) {
-        if (typeof content !== "string") {
-            content = JSON.stringify(content, null, 2) + "\n";
+        const path = this.path(p);
+        fs.ensureFileSync(path);
+        fs.writeFileSync(path, stringifyContent(content), "utf8");
+        switch (p) {
+            case "firebase.json":
+                utils.logSuccess("Wrote configuration info to " + clc.bold("firebase.json"));
+                break;
+            case ".firebaserc":
+                utils.logSuccess("Wrote project information to " + clc.bold(".firebaserc"));
+                break;
+            default:
+                utils.logSuccess("Wrote " + clc.bold(p));
+                break;
         }
-        fs.ensureFileSync(this.path(p));
-        fs.writeFileSync(this.path(p), content, "utf8");
     }
     projectFileExists(p) {
         return fs.existsSync(this.path(p));
@@ -168,32 +177,35 @@ class Config {
     deleteProjectFile(p) {
         fs.removeSync(this.path(p));
     }
-    async askWriteProjectFile(path, content, force, confirmByDefault) {
+    async confirmWriteProjectFile(path, content, confirmByDefault) {
         const writeTo = this.path(path);
-        let next = true;
-        if (typeof content !== "string") {
-            content = JSON.stringify(content, null, 2) + "\n";
-        }
-        let existingContent;
-        if (fsutils.fileExistsSync(writeTo)) {
-            existingContent = fsutils.readFile(writeTo);
-        }
-        if (existingContent && existingContent !== content && !force) {
-            next = await (0, prompt_1.confirm)({
-                message: "File " + clc.underline(path) + " already exists. Overwrite?",
-                default: !!confirmByDefault,
-            });
+        if (!fsutils.fileExistsSync(writeTo)) {
+            return true;
         }
-        if (existingContent === content) {
+        const existingContent = fsutils.readFile(writeTo);
+        const newContent = stringifyContent(content);
+        if (existingContent === newContent) {
             utils.logBullet(clc.bold(path) + " is unchanged");
+            return false;
         }
-        else if (next) {
-            this.writeProjectFile(path, content);
-            utils.logSuccess("Wrote " + clc.bold(path));
-        }
-        else {
+        const shouldWrite = await (0, prompt_1.confirm)({
+            message: "File " + clc.underline(path) + " already exists. Overwrite?",
+            default: !!confirmByDefault,
+        });
+        if (!shouldWrite) {
             utils.logBullet("Skipping write of " + clc.bold(path));
+            return false;
         }
+        return true;
+    }
+    async askWriteProjectFile(path, content, force, confirmByDefault) {
+        if (!force) {
+            const shouldWrite = await this.confirmWriteProjectFile(path, content, confirmByDefault);
+            if (!shouldWrite) {
+                return;
+            }
+        }
+        this.writeProjectFile(path, content);
     }
     static load(options, allowMissing) {
         const pd = (0, detectProjectRoot_1.detectProjectRoot)(options);
@@ -241,3 +253,9 @@ Config.MATERIALIZE_TARGETS = [
     "dataconnect",
     "apphosting",
 ];
+function stringifyContent(content) {
+    if (typeof content === "string") {
+        return content;
+    }
+    return JSON.stringify(content, null, 2) + "\n";
+}

package/lib/dataconnect/cloudAICompanionClient.js

@@ -21,8 +21,13 @@ async function callCloudAICompanion(client, vscodeRequest, type) {
     const request = buildRequest(vscodeRequest, type);
     const { projectId } = getServiceParts(vscodeRequest.servicePath);
     const instance = toChatResourceName(projectId);
-    const res = await client.post(`${instance}:completeTask`, request);
-    return res;
+    try {
+        const res = await client.post(`${instance}:completeTask`, request);
+        return res.body;
+    }
+    catch (error) {
+        return { output: { messages: [] }, error: error };
+    }
 }
 exports.callCloudAICompanion = callCloudAICompanion;
 function buildRequest({ servicePath, naturalLanguageQuery, chatHistory }, type) {

package/lib/dataconnect/cloudAICompanionTypes.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/dataconnect/fileUtils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFrameworksFromPackageJson = exports.frameworksMap = exports.SUPPORTED_FRAMEWORKS = exports.resolvePackageJson = exports.getPlatformFromFolder = exports.pickService = exports.readGQLFiles = exports.readConnectorYaml = exports.readDataConnectYaml = exports.readFirebaseJson = void 0;
 const fs = require("fs-extra");
 const path = require("path");
+const clc = require("colorette");
 const error_1 = require("../error");
 const types_1 = require("./types");
 const utils_1 = require("../utils");
@@ -77,10 +78,16 @@ async function pickService(projectId, config, serviceId) {
     const serviceCfgs = readFirebaseJson(config);
     let serviceInfo;
     if (serviceCfgs.length === 0) {
-        throw new error_1.FirebaseError("No Data Connect services found in firebase.json.");
+        throw new error_1.FirebaseError("No Data Connect services found in firebase.json." +
+            `\nYou can run ${clc.bold("firebase init dataconnect")} to add a Data Connect service.`);
     }
     else if (serviceCfgs.length === 1) {
         serviceInfo = await (0, load_1.load)(projectId, config, serviceCfgs[0].source);
+        if (serviceId && serviceId !== serviceInfo.dataConnectYaml.serviceId) {
+            throw new error_1.FirebaseError(`No service named ${serviceId} declared in firebase.json. Found ${serviceInfo.dataConnectYaml.serviceId}.` +
+                `\nYou can run ${clc.bold("firebase init dataconnect")} to add this Data Connect service.`);
+        }
+        return serviceInfo;
     }
     else {
         if (!serviceId) {
@@ -89,11 +96,11 @@ async function pickService(projectId, config, serviceId) {
         const infos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, config, c.source)));
         const maybe = infos.find((i) => i.dataConnectYaml.serviceId === serviceId);
         if (!maybe) {
-            throw new error_1.FirebaseError(`No service named ${serviceId} declared in firebase.json.`);
+            throw new error_1.FirebaseError(`No service named ${serviceId} declared in firebase.json. Found ${infos.map((i) => i.dataConnectYaml.serviceId).join(", ")}.` +
+                `\nYou can run ${clc.bold("firebase init dataconnect")} to add this Data Connect service.`);
         }
-        serviceInfo = maybe;
+        return maybe;
     }
-    return serviceInfo;
 }
 exports.pickService = pickService;
 const WEB_INDICATORS = ["package.json", "package-lock.json", "node_modules"];

package/lib/dataconnect/schemaMigration.js

@@ -29,6 +29,7 @@ async function setupSchemaIfNecessary(instanceId, databaseId, options) {
     return schemaInfo.setupStatus;
 }
 async function diffSchema(options, schema, schemaValidation) {
+    (0, utils_1.logLabeledBullet)("dataconnect", `generating required schema changes...`);
     const { serviceName, instanceName, databaseId, instanceId } = getIdentifiers(schema);
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, false);
     let diffs = [];
@@ -36,15 +37,12 @@ async function diffSchema(options, schema, schemaValidation) {
     let validationMode = schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE";
     setSchemaValidationMode(schema, validationMode);
     try {
-        if (!schemaValidation) {
-            (0, utils_1.logLabeledBullet)("dataconnect", `generating required schema changes...`);
-        }
         await (0, client_1.upsertSchema)(schema, true);
         if (validationMode === "STRICT") {
-            (0, utils_1.logLabeledSuccess)("dataconnect", `Database schema is up to date.`);
+            (0, utils_1.logLabeledSuccess)("dataconnect", `database schema of ${instanceId}:${databaseId} is up to date.`);
         }
         else {
-            (0, utils_1.logLabeledSuccess)("dataconnect", `Database schema is compatible.`);
+            (0, utils_1.logLabeledSuccess)("dataconnect", `database schema of ${instanceId}:${databaseId} is compatible.`);
         }
     }
     catch (err) {
@@ -97,6 +95,7 @@ async function diffSchema(options, schema, schemaValidation) {
 }
 exports.diffSchema = diffSchema;
 async function migrateSchema(args) {
+    (0, utils_1.logLabeledBullet)("dataconnect", `generating required schema changes...`);
     const { options, schema, validateOnly, schemaValidation } = args;
     const { serviceName, instanceId, instanceName, databaseId } = getIdentifiers(schema);
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, true);
@@ -107,7 +106,7 @@ async function migrateSchema(args) {
     setSchemaValidationMode(schema, validationMode);
     try {
         await (0, client_1.upsertSchema)(schema, validateOnly);
-        logger_1.logger.debug(`Database schema was up to date for ${instanceId}:${databaseId}`);
+        (0, utils_1.logLabeledBullet)("dataconnect", `database schema of ${instanceId}:${databaseId} is up to date.`);
     }
     catch (err) {
         if ((err === null || err === void 0 ? void 0 : err.status) !== 400) {
@@ -355,7 +354,7 @@ async function ensureServiceIsConnectedToCloudSql(serviceName, instanceId, datab
             (0, utils_1.logLabeledWarning)("dataconnect", `Not yet linked to the Cloud SQL instance.`);
             return;
         }
-        (0, utils_1.logLabeledBullet)("dataconnect", `Linking the Cloud SQL instance...`);
+        (0, utils_1.logLabeledBullet)("dataconnect", `linking the Cloud SQL instance...`);
         currentSchema = {
             name: `${serviceName}/schemas/${types_1.SCHEMA_ID}`,
             source: {

package/lib/deploy/apphosting/deploy.js

@@ -9,6 +9,9 @@ const projectUtils_1 = require("../../projectUtils");
 const utils_1 = require("../../utils");
 const util_1 = require("./util");
 async function default_1(context, options) {
+    if (context.backendConfigs.size === 0) {
+        return;
+    }
     const projectId = (0, projectUtils_1.needProjectId)(options);
     options.projectNumber = await (0, getProjectNumber_1.getProjectNumber)(options);
     if (!context.backendConfigs) {

package/lib/deploy/apphosting/prepare.js

@@ -30,6 +30,7 @@ async function default_1(context, options) {
     const foundBackends = [];
     const notFoundBackends = [];
     const ambiguousBackends = [];
+    const skippedBackends = [];
     for (const cfg of configs) {
         const filteredBackends = backends.filter((backend) => (0, apphosting_1.parseBackendName)(backend.name).id === cfg.backendId);
         if (filteredBackends.length === 0) {
@@ -54,6 +55,7 @@ async function default_1(context, options) {
     for (const cfg of foundBackends) {
         const filteredBackends = backends.filter((backend) => (0, apphosting_1.parseBackendName)(backend.name).id === cfg.backendId);
         if (cfg.alwaysDeployFromSource === false) {
+            skippedBackends.push(cfg);
             continue;
         }
         const backend = filteredBackends[0];
@@ -69,9 +71,9 @@ async function default_1(context, options) {
                 cfg.alwaysDeployFromSource = confirmDeploy;
                 const configPath = path.join(options.projectRoot || "", "firebase.json");
                 options.config.writeProjectFile(configPath, options.config.src);
-                (0, utils_1.logLabeledBullet)("apphosting", `Your deployment preferences have been saved to firebase.json. On future invocations of "firebase deploy", your local source will be deployed to ${cfg.backendId}. You can edit this setting in your firebase.json at any time.`);
+                (0, utils_1.logLabeledBullet)("apphosting", `On future invocations of "firebase deploy", your local source will ${!confirmDeploy ? "not " : ""}be deployed to ${cfg.backendId}. You can edit this setting in your firebase.json at any time.`);
                 if (!confirmDeploy) {
-                    (0, utils_1.logLabeledWarning)("apphosting", `Skipping deployment of backend ${cfg.backendId}`);
+                    skippedBackends.push(cfg);
                     continue;
                 }
             }
@@ -79,33 +81,37 @@ async function default_1(context, options) {
         context.backendConfigs.set(cfg.backendId, cfg);
         context.backendLocations.set(cfg.backendId, location);
     }
-    if (notFoundBackends.length === 0) {
-        return;
-    }
-    if (options.force) {
-        (0, utils_1.logLabeledWarning)("apphosting", `Skipping deployments of backend(s) ${notFoundBackends.map((cfg) => cfg.backendId).join(", ")}; ` +
-            "the backend(s) do not exist yet and we cannot create them for you because you must choose primary regions for each one. " +
-            "Please run 'firebase deploy' without the --force flag, or 'firebase apphosting:backends:create' to create the backend, " +
-            "then retry deployment.");
-        return;
-    }
-    const confirmCreate = await (0, prompt_1.confirm)({
-        default: true,
-        message: `Did not find backend(s) ${notFoundBackends.map((cfg) => cfg.backendId).join(", ")}. Do you want to create them (you'll have the option to select which to create in the next step)?`,
-    });
-    if (!confirmCreate) {
-        return;
+    if (notFoundBackends.length > 0) {
+        if (options.force) {
+            (0, utils_1.logLabeledWarning)("apphosting", `Skipping deployments of backend(s) ${notFoundBackends.map((cfg) => cfg.backendId).join(", ")}; ` +
+                "the backend(s) do not exist yet and we cannot create them for you because you must choose primary regions for each one. " +
+                "Please run 'firebase deploy' without the --force flag, or 'firebase apphosting:backends:create' to create the backend, " +
+                "then retry deployment.");
+            return;
+        }
+        const confirmCreate = await (0, prompt_1.confirm)({
+            default: true,
+            message: `Did not find backend(s) ${notFoundBackends.map((cfg) => cfg.backendId).join(", ")}. Do you want to create them (you'll have the option to select which to create in the next step)?`,
+        });
+        if (confirmCreate) {
+            const selected = await (0, prompt_1.checkbox)({
+                message: "Which backends do you want to create and deploy to?",
+                choices: notFoundBackends.map((cfg) => cfg.backendId),
+            });
+            const selectedBackends = selected.map((id) => notFoundBackends.find((backend) => backend.backendId === id));
+            for (const cfg of selectedBackends) {
+                (0, utils_1.logLabeledBullet)("apphosting", `Creating a new backend ${cfg.backendId}...`);
+                const { location } = await (0, backend_1.doSetupSourceDeploy)(projectId, cfg.backendId);
+                context.backendConfigs.set(cfg.backendId, cfg);
+                context.backendLocations.set(cfg.backendId, location);
+            }
+        }
+        else {
+            skippedBackends.push(...notFoundBackends);
+        }
     }
-    const selected = await (0, prompt_1.checkbox)({
-        message: "Which backends do you want to create and deploy to?",
-        choices: notFoundBackends.map((cfg) => cfg.backendId),
-    });
-    const selectedBackends = selected.map((id) => notFoundBackends.find((backend) => backend.backendId === id));
-    for (const cfg of selectedBackends) {
-        (0, utils_1.logLabeledBullet)("apphosting", `Creating a new backend ${cfg.backendId}...`);
-        const { location } = await (0, backend_1.doSetupSourceDeploy)(projectId, cfg.backendId);
-        context.backendConfigs.set(cfg.backendId, cfg);
-        context.backendLocations.set(cfg.backendId, location);
+    if (skippedBackends.length > 0) {
+        (0, utils_1.logLabeledWarning)("apphosting", `Skipping deployment of backend(s) ${skippedBackends.map((cfg) => cfg.backendId).join(", ")}.`);
     }
     return;
 }

package/lib/deploy/apphosting/release.js

@@ -7,6 +7,9 @@ const rollout_1 = require("../../apphosting/rollout");
 const projectUtils_1 = require("../../projectUtils");
 const utils_1 = require("../../utils");
 async function default_1(context, options) {
+    if (context.backendConfigs.size === 0) {
+        return;
+    }
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const rollouts = [];
     const backendIds = [];

package/lib/deploy/firestore/deploy.js

@@ -2,9 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const clc = require("colorette");
 const api_1 = require("../../firestore/api");
+const types = require("../../firestore/api-types");
 const logger_1 = require("../../logger");
 const utils = require("../../utils");
 const rulesDeploy_1 = require("../../rulesDeploy");
+const utils_1 = require("../../utils");
+const error_1 = require("../../error");
+async function createDatabase(context, options) {
+    let firestoreCfg = options.config.data.firestore;
+    if (Array.isArray(firestoreCfg)) {
+        firestoreCfg = firestoreCfg[0];
+    }
+    if (!options.projectId) {
+        throw new error_1.FirebaseError("Project ID is required to create a Firestore database.");
+    }
+    if (!firestoreCfg || !firestoreCfg.database) {
+        throw new error_1.FirebaseError("Firestore database configuration is missing in firebase.json.");
+    }
+    const api = new api_1.FirestoreApi();
+    try {
+        await api.getDatabase(options.projectId, firestoreCfg.database);
+    }
+    catch (e) {
+        if (e.status === 404) {
+            utils.logLabeledBullet("firetore", `Creating the new Firestore database ${firestoreCfg.database}...`);
+            const createDatabaseReq = {
+                project: options.projectId,
+                databaseId: firestoreCfg.database,
+                locationId: firestoreCfg.location || "nam5",
+                type: types.DatabaseType.FIRESTORE_NATIVE,
+                deleteProtectionState: types.DatabaseDeleteProtectionState.DISABLED,
+                pointInTimeRecoveryEnablement: types.PointInTimeRecoveryEnablement.DISABLED,
+            };
+            await api.createDatabase(createDatabaseReq);
+        }
+    }
+}
 async function deployRules(context) {
     var _a;
     const rulesDeploy = (_a = context === null || context === void 0 ? void 0 : context.firestore) === null || _a === void 0 ? void 0 : _a.rulesDeploy;
@@ -33,12 +66,22 @@ async function deployIndexes(context, options) {
             return;
         }
         const fieldOverrides = indexesRawSpec.fieldOverrides || [];
-        await firestoreIndexes.deploy(options, indexes, fieldOverrides, databaseId).then(() => {
-            utils.logSuccess(`${clc.bold(clc.green("firestore:"))} deployed indexes in ${clc.bold(indexesFileName)} successfully for ${databaseId} database`);
-        });
+        try {
+            await firestoreIndexes.deploy(options, indexes, fieldOverrides, databaseId);
+        }
+        catch (err) {
+            if (err.status !== 404) {
+                throw err;
+            }
+            await (0, utils_1.sleep)(1000);
+            await firestoreIndexes.deploy(options, indexes, fieldOverrides, databaseId);
+        }
+        utils.logSuccess(`${clc.bold(clc.green("firestore:"))} deployed indexes in ${clc.bold(indexesFileName)} successfully for ${databaseId} database`);
     }));
 }
 async function default_1(context, options) {
-    await Promise.all([deployRules(context), deployIndexes(context, options)]);
+    await createDatabase(context, options);
+    await deployRules(context);
+    await deployIndexes(context, options);
 }
 exports.default = default_1;

package/lib/emulator/apphosting/serve.js

@@ -135,7 +135,7 @@ async function tripFirebasePostinstall(rootDirectory, env) {
         return;
     }
     const npmLsResults = JSON.parse(npmLs.stdout.toString().trim());
-    const dependenciesToSearch = Object.values(npmLsResults.dependencies);
+    const dependenciesToSearch = Object.values(npmLsResults.dependencies || {});
     const firebaseUtilPaths = [];
     for (const dependency of dependenciesToSearch) {
         if (dependency.name === "@firebase/util" &&

package/lib/emulator/downloadableEmulatorInfo.json

@@ -3,58 +3,79 @@
         "version": "4.11.2",
         "expectedSize": 34495935,
         "expectedChecksum": "2fd771101c0e1f7898c04c9204f2ce63",
-        "expectedChecksumSHA256": "b70d99344caf17c98b6f910fa8f6edf32a7c016cb1035e8915f70d38901eb97f"
+        "expectedChecksumSHA256": "b70d99344caf17c98b6f910fa8f6edf32a7c016cb1035e8915f70d38901eb97f",
+        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/firebase-database-emulator-v4.11.2.jar",
+        "downloadPathRelativeToCacheDir": "firebase-database-emulator-v4.11.2.jar"
     },
     "firestore": {
         "version": "1.19.8",
         "expectedSize": 63634791,
         "expectedChecksum": "9b43a6daa590678de9b7df6d68260395",
-        "expectedChecksumSHA256": "9d43599ed6151199e8d604dc87fac51218e49e5f3a48519b1ae560bbe5e3382d"
+        "expectedChecksumSHA256": "9d43599ed6151199e8d604dc87fac51218e49e5f3a48519b1ae560bbe5e3382d",
+        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.19.8.jar",
+        "downloadPathRelativeToCacheDir": "cloud-firestore-emulator-v1.19.8.jar"
     },
     "storage": {
         "version": "1.1.3",
         "expectedSize": 52892936,
         "expectedChecksum": "2ca11ec1193003bea89f806cc085fa25",
-        "expectedChecksumSHA256": "0cd52db6f6271d62078f805220706377c849220b73bd68aa27078d977df9c900"
+        "expectedChecksumSHA256": "0cd52db6f6271d62078f805220706377c849220b73bd68aa27078d977df9c900",
+        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-storage-rules-runtime-v1.1.3.jar",
+        "downloadPathRelativeToCacheDir": "cloud-storage-rules-runtime-v1.1.3.jar"
     },
     "ui": {
         "snapshot": {
             "version": "SNAPSHOT",
             "expectedSize": -1,
             "expectedChecksum": "",
-            "expectedChecksumSHA256": ""
+            "expectedChecksumSHA256": "",
+            "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-vSNAPSHOT.zip",
+            "downloadPathRelativeToCacheDir": "ui-vSNAPSHOT.zip",
+            "binaryPathRelativeToCacheDir": "ui-vSNAPSHOT/server/server.mjs"
         },
         "main": {
             "version": "1.15.0",
             "expectedSize": 3538469,
             "expectedChecksum": "2f13d5aea9524564c8b7adaa9cfa2128",
-            "expectedChecksumSHA256": "97d8c4c574e3f20c4d690a2ce8373eef76ab024da73279a062dba8517f88cf9a"
+            "expectedChecksumSHA256": "97d8c4c574e3f20c4d690a2ce8373eef76ab024da73279a062dba8517f88cf9a",
+            "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v1.15.0.zip",
+            "downloadPathRelativeToCacheDir": "ui-v1.15.0.zip",
+            "binaryPathRelativeToCacheDir": "ui-v1.15.0/server/server.mjs"
         }
     },
     "pubsub": {
         "version": "0.8.14",
         "expectedSize": 66786933,
         "expectedChecksum": "a9025b3e53fdeafd2969ccb3ba1e1d38",
-        "expectedChecksumSHA256": "4fbeefd8ecb32b10e5ab522e5d8748e0c2b13891c471c0c327c04632dcc75a8d"
+        "expectedChecksumSHA256": "4fbeefd8ecb32b10e5ab522e5d8748e0c2b13891c471c0c327c04632dcc75a8d",
+        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.14.zip",
+        "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.14.zip",
+        "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.14/pubsub-emulator/bin/cloud-pubsub-emulator"
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.6.1",
-            "expectedSize": 27415296,
-            "expectedChecksum": "5814d22b06b1321409f40693dfe47288",
-            "expectedChecksumSHA256": "8df1cfac6ef747909b3c18b57ba52b70a11d53b9d0a22b197011d6550ceca133"
+            "version": "2.6.2",
+            "expectedSize": 27501312,
+            "expectedChecksum": "f4adceec52a29bbc8eabf39dc07460a8",
+            "expectedChecksumSHA256": "038b1a763d2afd487423b37841323554e13bb6973c69a35f993c315819506ff8",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.6.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.6.2"
         },
         "win32": {
-            "version": "2.6.1",
-            "expectedSize": 27875328,
-            "expectedChecksum": "21381052c2bf767ee84fb85975cfd4d5",
-            "expectedChecksumSHA256": "6bebaa9575b460c4fa170b191d94722923a3c869bc1eca24c7e444428e6b7a70"
+            "version": "2.6.2",
+            "expectedSize": 27961856,
+            "expectedChecksum": "36c75d09d9def62891be1ba84424cc5d",
+            "expectedChecksumSHA256": "eb33efdf0374bfe0772f3adff7b2ab7eb3353f5e03e2a781623d10f61a92444e",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.6.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.6.2.exe"
         },
         "linux": {
-            "version": "2.6.1",
-            "expectedSize": 27332760,
-            "expectedChecksum": "0480a92f5af8e8441e680dc4e7995263",
-            "expectedChecksumSHA256": "4f60baf4649c670227314302056f50b1c40ccc8d673b98d16935977508342a67"
+            "version": "2.6.2",
+            "expectedSize": 27414680,
+            "expectedChecksum": "deb1bad4fbccf4e3bbc437f8e2b34536",
+            "expectedChecksumSHA256": "549633c0e3ab26621da197b202e5712163c4be2d1f5d1e6c81bb33f20ccd1d7a",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.6.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.6.2"
         }
     }
 }

package/lib/emulator/downloadableEmulators.js

@@ -30,83 +30,39 @@ const dataconnectDetails = process.platform === "darwin"
         : EMULATOR_UPDATE_DETAILS.dataconnect.linux;
 exports.DownloadDetails = {
     database: {
-        downloadPath: path.join(CACHE_DIR, `firebase-database-emulator-v${EMULATOR_UPDATE_DETAILS.database.version}.jar`),
+        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.database.downloadPathRelativeToCacheDir),
         version: EMULATOR_UPDATE_DETAILS.database.version,
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/firebase-database-emulator-v${EMULATOR_UPDATE_DETAILS.database.version}.jar`,
-            expectedSize: EMULATOR_UPDATE_DETAILS.database.expectedSize,
-            expectedChecksum: EMULATOR_UPDATE_DETAILS.database.expectedChecksum,
-            namePrefix: "firebase-database-emulator",
-        },
+        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.database), { cacheDir: CACHE_DIR, namePrefix: "firebase-database-emulator" }),
     },
     firestore: {
-        downloadPath: path.join(CACHE_DIR, `cloud-firestore-emulator-v${EMULATOR_UPDATE_DETAILS.firestore.version}.jar`),
+        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.firestore.downloadPathRelativeToCacheDir),
         version: EMULATOR_UPDATE_DETAILS.firestore.version,
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v${EMULATOR_UPDATE_DETAILS.firestore.version}.jar`,
-            expectedSize: EMULATOR_UPDATE_DETAILS.firestore.expectedSize,
-            expectedChecksum: EMULATOR_UPDATE_DETAILS.firestore.expectedChecksum,
-            namePrefix: "cloud-firestore-emulator",
-        },
+        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.firestore), { cacheDir: CACHE_DIR, namePrefix: "cloud-firestore-emulator" }),
     },
     storage: {
-        downloadPath: path.join(CACHE_DIR, `cloud-storage-rules-runtime-v${EMULATOR_UPDATE_DETAILS.storage.version}.jar`),
+        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.storage.downloadPathRelativeToCacheDir),
         version: EMULATOR_UPDATE_DETAILS.storage.version,
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-storage-rules-runtime-v${EMULATOR_UPDATE_DETAILS.storage.version}.jar`,
-            expectedSize: EMULATOR_UPDATE_DETAILS.storage.expectedSize,
-            expectedChecksum: EMULATOR_UPDATE_DETAILS.storage.expectedChecksum,
-            namePrefix: "cloud-storage-rules-emulator",
-        },
+        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.storage), { cacheDir: CACHE_DIR, namePrefix: "cloud-storage-rules-emulator" }),
     },
     ui: {
         version: emulatorUiDetails.version,
-        downloadPath: path.join(CACHE_DIR, `ui-v${emulatorUiDetails.version}.zip`),
+        downloadPath: path.join(CACHE_DIR, emulatorUiDetails.downloadPathRelativeToCacheDir),
         unzipDir: path.join(CACHE_DIR, `ui-v${emulatorUiDetails.version}`),
-        binaryPath: path.join(CACHE_DIR, `ui-v${emulatorUiDetails.version}`, "server", "server.mjs"),
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v${emulatorUiDetails.version}.zip`,
-            expectedSize: emulatorUiDetails.expectedSize,
-            expectedChecksum: emulatorUiDetails.expectedChecksum,
-            skipCache: experiments.isEnabled("emulatoruisnapshot"),
-            skipChecksumAndSize: experiments.isEnabled("emulatoruisnapshot"),
-            namePrefix: "ui",
-        },
+        binaryPath: path.join(CACHE_DIR, emulatorUiDetails.binaryPathRelativeToCacheDir),
+        opts: Object.assign(Object.assign({}, emulatorUiDetails), { cacheDir: CACHE_DIR, skipCache: experiments.isEnabled("emulatoruisnapshot"), skipChecksumAndSize: experiments.isEnabled("emulatoruisnapshot"), namePrefix: "ui" }),
     },
     pubsub: {
-        downloadPath: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}.zip`),
+        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.pubsub.downloadPathRelativeToCacheDir),
         version: EMULATOR_UPDATE_DETAILS.pubsub.version,
         unzipDir: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}`),
-        binaryPath: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}`, `pubsub-emulator/bin/cloud-pubsub-emulator${process.platform === "win32" ? ".bat" : ""}`),
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}.zip`,
-            expectedSize: EMULATOR_UPDATE_DETAILS.pubsub.expectedSize,
-            expectedChecksum: EMULATOR_UPDATE_DETAILS.pubsub.expectedChecksum,
-            namePrefix: "pubsub-emulator",
-        },
+        binaryPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.pubsub.binaryPathRelativeToCacheDir),
+        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.pubsub), { cacheDir: CACHE_DIR, namePrefix: "pubsub-emulator" }),
     },
     dataconnect: {
-        downloadPath: path.join(CACHE_DIR, `dataconnect-emulator-${dataconnectDetails.version}${process.platform === "win32" ? ".exe" : ""}`),
+        downloadPath: path.join(CACHE_DIR, dataconnectDetails.downloadPathRelativeToCacheDir),
         version: dataconnectDetails.version,
-        binaryPath: path.join(CACHE_DIR, `dataconnect-emulator-${dataconnectDetails.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${dataconnectDetails.version}`
-                : process.platform === "win32"
-                    ? `https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v${dataconnectDetails.version}`
-                    : `https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v${dataconnectDetails.version}`,
-            expectedSize: dataconnectDetails.expectedSize,
-            expectedChecksum: dataconnectDetails.expectedChecksum,
-            skipChecksumAndSize: false,
-            namePrefix: "dataconnect-emulator",
-            auth: false,
-        },
+        binaryPath: path.join(CACHE_DIR, dataconnectDetails.downloadPathRelativeToCacheDir),
+        opts: Object.assign(Object.assign({}, dataconnectDetails), { cacheDir: CACHE_DIR, skipChecksumAndSize: false, namePrefix: "dataconnect-emulator", auth: false }),
     },
 };
 const EmulatorDetails = {