firebase-tools 11.4.1 → 11.6.0

package/lib/deploy/functions/runtimes/node/versioning.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkFunctionsSDKVersion = exports.getLatestSDKVersion = exports.getFunctionsSDKVersion = exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const semver = require("semver");
 const spawn = require("cross-spawn");
 const utils = require("../../../../utils");
 const logger_1 = require("../../../../logger");
 const track_1 = require("../../../../track");
 const MIN_SDK_VERSION = "2.0.0";
-exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = clc.bold.yellow("functions: ") +
+exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = clc.bold(clc.yellow("functions: ")) +
     "You must have a " +
     clc.bold("firebase-functions") +
     " version that is at least 2.0.0. Please run " +
@@ -62,12 +62,12 @@ function checkFunctionsSDKVersion(currentVersion) {
         if (semver.eq(currentVersion, latest)) {
             return;
         }
-        utils.logWarning(clc.bold.yellow("functions: ") +
+        utils.logWarning(clc.bold(clc.yellow("functions: ")) +
             "package.json indicates an outdated version of firebase-functions. Please upgrade using " +
             clc.bold("npm install --save firebase-functions@latest") +
             " in your functions directory.");
         if (semver.major(currentVersion) < semver.major(latest)) {
-            utils.logWarning(clc.bold.yellow("functions: ") +
+            utils.logWarning(clc.bold(clc.yellow("functions: ")) +
                 "Please note that there will be breaking changes when you upgrade.");
         }
     }

package/lib/deploy/functions/services/storage.js

@@ -17,8 +17,14 @@ async function obtainStorageBindings(projectNumber) {
 }
 exports.obtainStorageBindings = obtainStorageBindings;
 async function ensureStorageTriggerRegion(endpoint) {
+    var _a;
     const { eventTrigger } = endpoint;
     if (!eventTrigger.region) {
+        logger_1.logger.debug("Looking up bucket region for the storage event trigger");
+        if (!((_a = eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.bucket)) {
+            throw new error_1.FirebaseError("Error: storage event trigger is missing bucket filter: " +
+                JSON.stringify(eventTrigger, null, 2));
+        }
         logger_1.logger.debug(`Looking up bucket region for the storage event trigger on bucket ${eventTrigger.eventFilters.bucket}`);
         try {
             const bucket = await storage.getBucket(eventTrigger.eventFilters.bucket);

package/lib/deploy/functions/validate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.secretsAreValid = exports.functionIdsAreValid = exports.functionsDirectoryExists = exports.endpointsAreUnique = exports.cpuConfigIsValid = exports.endpointsAreValid = void 0;
 const path = require("path");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../error");
 const secretManager_1 = require("../../gcp/secretManager");
 const logger_1 = require("../../logger");

package/lib/deploy/hosting/convertConfig.js

@@ -50,11 +50,18 @@ async function convertConfig(context, payload, config, finalize) {
                 (!functionsEndpointInfo.platform || endpoint.platform === functionsEndpointInfo.platform));
         });
         if (matchingBackends.length > 1) {
+            for (const endpoint of matchingBackends) {
+                if (endpoint.region === "us-central1") {
+                    (0, utils_1.logLabeledBullet)(`hosting[${config.site}]`, `Function \`${functionsEndpointInfo.serviceId}\` found in multiple regions, defaulting to \`us-central1\`. ` +
+                        `To rewrite to a different region, specify a \`region\` for the rewrite in \`firebase.json\`.`);
+                    return endpoint;
+                }
+            }
             throw new error_1.FirebaseError(`More than one backend found for function name: ${functionsEndpointInfo.serviceId}. If the function is deployed in multiple regions, you must specify a region.`);
         }
         if (matchingBackends.length === 1) {
             const endpoint = matchingBackends[0];
-            if (endpoint && (0, backend_1.isHttpsTriggered)(endpoint)) {
+            if (endpoint && ((0, backend_1.isHttpsTriggered)(endpoint) || (0, backend_1.isCallableTriggered)(endpoint))) {
                 return endpoint;
             }
         }

package/lib/deploy/hosting/deploy.js

@@ -7,24 +7,21 @@ const listFiles_1 = require("../../listFiles");
 const logger_1 = require("../../logger");
 const track_1 = require("../../track");
 const utils_1 = require("../../utils");
-const clc = require("cli-color");
-const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
-const _ERASE_LINE = "\x1b[2K";
+const colorette_1 = require("colorette");
+const ora = require("ora");
 async function deploy(context, options) {
     var _a, _b;
     if (!((_a = context.hosting) === null || _a === void 0 ? void 0 : _a.deploys)) {
         return;
     }
-    let spins = 0;
+    const spinner = ora();
     function updateSpinner(newMessage, debugging) {
         if (debugging) {
             (0, utils_1.logLabeledBullet)("hosting", newMessage);
         }
         else {
-            process.stdout.write(_ERASE_LINE + clc.move(-9999, 0));
-            process.stdout.write(clc.bold.cyan(SPINNER[spins % SPINNER.length] + "  hosting: ") + newMessage);
+            spinner.text = `${(0, colorette_1.bold)((0, colorette_1.cyan)(" hosting:"))} ${newMessage}`;
         }
-        spins++;
     }
     async function runDeploys(deploys, debugging) {
         var _a;
@@ -40,7 +37,7 @@ async function deploy(context, options) {
         const t0 = Date.now();
         const publicDir = options.config.path(deploy.config.public);
         const files = (0, listFiles_1.listFiles)(publicDir, deploy.config.ignore);
-        (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, `found ${files.length} files in ${clc.bold(deploy.config.public)}`);
+        (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, `found ${files.length} files in ${(0, colorette_1.bold)(deploy.config.public)}`);
         let concurrency = 200;
         const envConcurrency = (0, utils_1.envOverride)("FIREBASE_HOSTING_UPLOAD_CONCURRENCY", "");
         if (envConcurrency) {
@@ -59,6 +56,9 @@ async function deploy(context, options) {
             uploadConcurrency: concurrency,
         });
         const progressInterval = setInterval(() => updateSpinner(uploader.statusMessage(), debugging), debugging ? 2000 : 200);
+        if (!debugging) {
+            spinner.start();
+        }
         try {
             await uploader.start();
         }
@@ -68,9 +68,10 @@ async function deploy(context, options) {
         }
         finally {
             clearInterval(progressInterval);
+            updateSpinner(uploader.statusMessage(), debugging);
         }
         if (!debugging) {
-            process.stdout.write(_ERASE_LINE + clc.move(-9999, 0));
+            spinner.stop();
         }
         (0, utils_1.logLabeledSuccess)("hosting[" + deploy.site + "]", "file upload complete");
         const dt = Date.now() - t0;

package/lib/deploy/hosting/uploader.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Uploader = void 0;
 const lodash_1 = require("lodash");
 const abort_controller_1 = require("abort-controller");
-const clc = require("cli-color");
+const clc = require("colorette");
 const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
@@ -19,7 +19,7 @@ const MAX_UPLOAD_TIMEOUT = 7200000;
 function progressMessage(message, current, total) {
     current = Math.min(current, total);
     const percent = Math.floor(((current * 1.0) / total) * 100).toString();
-    return `${message} [${current}/${total}] (${clc.bold.green(`${percent}%`)})`;
+    return `${message} [${current}/${total}] (${clc.bold(clc.green(`${percent}%`))})`;
 }
 class Uploader {
     constructor(options) {

package/lib/deploy/hosting/validate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateDeploy = void 0;
 const path = require("path");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../error");
 const projectPath_1 = require("../../projectPath");
 const fsutils_1 = require("../../fsutils");
@@ -33,7 +33,7 @@ function validateDeploy(deploy, options) {
         else {
             const i18nPath = path.join(cfg.public, cfg.i18n.root);
             if (!(0, fsutils_1.dirExistsSync)((0, projectPath_1.resolveProjectPath)(options, i18nPath))) {
-                (0, utils_1.logLabeledWarning)("hosting", `Couldn't find specified i18n root directory ${clc.bold(cfg.i18n.root)} in public directory ${clc.bold(cfg.public)}.`);
+                (0, utils_1.logLabeledWarning)("hosting", `Couldn't find specified i18n root directory ${clc.bold(cfg.i18n.root)} in public directory ${clc.bold(cfg.public || "")}.`);
             }
         }
     }

package/lib/deploy/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploy = void 0;
 const logger_1 = require("../logger");
 const api_1 = require("../api");
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const lodash_1 = require("lodash");
 const projectUtils_1 = require("../projectUtils");
 const utils_1 = require("../utils");
@@ -52,7 +52,7 @@ const deploy = async function (targetNames, options, customContext = {}) {
     for (const targetName of targetNames) {
         const target = TARGETS[targetName];
         if (!target) {
-            return Promise.reject(new error_1.FirebaseError(`${(0, cli_color_1.bold)(targetName)} is not a valid deploy target`));
+            return Promise.reject(new error_1.FirebaseError(`${(0, colorette_1.bold)(targetName)} is not a valid deploy target`));
         }
         predeploys.push((0, lifecycleHooks_1.lifecycleHooks)(targetName, "predeploy"));
         prepares.push(target.prepare);
@@ -61,9 +61,9 @@ const deploy = async function (targetNames, options, customContext = {}) {
         postdeploys.push((0, lifecycleHooks_1.lifecycleHooks)(targetName, "postdeploy"));
     }
     logger_1.logger.info();
-    logger_1.logger.info((0, cli_color_1.bold)((0, cli_color_1.white)("===") + " Deploying to '" + projectId + "'..."));
+    logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.white)("===") + " Deploying to '" + projectId + "'..."));
     logger_1.logger.info();
-    (0, utils_1.logBullet)("deploying " + (0, cli_color_1.bold)(targetNames.join(", ")));
+    (0, utils_1.logBullet)("deploying " + (0, colorette_1.bold)(targetNames.join(", ")));
     await chain(predeploys, context, options, payload);
     await chain(prepares, context, options, payload);
     await chain(deploys, context, options, payload);
@@ -75,13 +75,13 @@ const deploy = async function (targetNames, options, customContext = {}) {
     const duration = Date.now() - startTime;
     await (0, track_1.track)("Product Deploy", [...targetNames].sort().join(","), duration);
     logger_1.logger.info();
-    (0, utils_1.logSuccess)(cli_color_1.bold.underline("Deploy complete!"));
+    (0, utils_1.logSuccess)((0, colorette_1.bold)((0, colorette_1.underline)("Deploy complete!")));
     logger_1.logger.info();
     const deployedHosting = (0, lodash_1.includes)(targetNames, "hosting");
-    logger_1.logger.info((0, cli_color_1.bold)("Project Console:"), (0, utils_1.consoleUrl)(options.project, "/overview"));
+    logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)(options.project, "/overview"));
     if (deployedHosting) {
         (0, lodash_1.each)(context.hosting.deploys, (deploy) => {
-            logger_1.logger.info((0, cli_color_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)(api_1.hostingOrigin, deploy.site));
+            logger_1.logger.info((0, colorette_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)(api_1.hostingOrigin, deploy.site));
         });
         const versionNames = context.hosting.deploys.map((deploy) => deploy.version);
         return { hosting: versionNames.length === 1 ? versionNames[0] : versionNames };

package/lib/deploy/lifecycleHooks.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lifecycleHooks = void 0;
 const utils = require("../utils");
-const clc = require("cli-color");
+const clc = require("colorette");
 const childProcess = require("child_process");
 const error_1 = require("../error");
 const needProjectId = require("../projectUtils").needProjectId;
@@ -82,7 +82,10 @@ function runTargetCommands(target, hook, overallOptions, config) {
     }
     return runAllCommands
         .then(() => {
-        utils.logSuccess(clc.green.bold(logIdentifier + ":") + " Finished running " + clc.bold(hook) + " script.");
+        utils.logSuccess(clc.green(clc.bold(logIdentifier + ":")) +
+            " Finished running " +
+            clc.bold(hook) +
+            " script.");
     })
         .catch((err) => {
         throw new error_1.FirebaseError(logIdentifier + " " + hook + " error: " + err.message);

package/lib/deploy/storage/prepare.js

@@ -24,13 +24,11 @@ async function default_1(context, options) {
             }
         }
     }
-    _.set(context, "storage.rules", rulesConfig);
     const rulesDeploy = new rulesDeploy_1.RulesDeploy(options, rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE);
-    _.set(context, "storage.rulesDeploy", rulesDeploy);
+    const rulesConfigsToDeploy = [];
     if (!Array.isArray(rulesConfig)) {
         const defaultBucket = await gcp.storage.getDefaultBucket(options.project);
         rulesConfig = [Object.assign(rulesConfig, { bucket: defaultBucket })];
-        _.set(context, "storage.rules", rulesConfig);
     }
     for (const ruleConfig of rulesConfig) {
         const target = ruleConfig.target;
@@ -39,12 +37,16 @@ async function default_1(context, options) {
         }
         if (allStorage || onlyTargets.has(target)) {
             rulesDeploy.addFile(ruleConfig.rules);
+            rulesConfigsToDeploy.push(ruleConfig);
             onlyTargets.delete(target);
         }
     }
     if (!allStorage && onlyTargets.size !== 0) {
         throw new error_1.FirebaseError(`Could not find rules for the following storage targets: ${[...onlyTargets].join(", ")}`);
     }
+    _.set(context, "storage.rules", rulesConfig);
+    _.set(context, "storage.rulesConfigsToDeploy", rulesConfigsToDeploy);
+    _.set(context, "storage.rulesDeploy", rulesDeploy);
     await rulesDeploy.compile();
 }
 exports.default = default_1;

package/lib/deploy/storage/release.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
 const rulesDeploy_1 = require("../../rulesDeploy");
 async function default_1(context, options) {
-    const rules = (0, lodash_1.get)(context, "storage.rules", []);
+    const rulesConfigsToDeploy = (0, lodash_1.get)(context, "storage.rulesConfigsToDeploy", []);
     const rulesDeploy = (0, lodash_1.get)(context, "storage.rulesDeploy");
-    if (!rules.length || !rulesDeploy) {
-        return;
+    if (!rulesConfigsToDeploy.length || !rulesDeploy) {
+        return [];
     }
     const toRelease = [];
-    for (const ruleConfig of rules) {
+    for (const ruleConfig of rulesConfigsToDeploy) {
         if (ruleConfig.target) {
             options.rc.target(options.project, "storage", ruleConfig.target).forEach((bucket) => {
                 toRelease.push({ bucket: bucket, rules: ruleConfig.rules });
@@ -19,8 +19,9 @@ async function default_1(context, options) {
             toRelease.push({ bucket: ruleConfig.bucket, rules: ruleConfig.rules });
         }
     }
-    await Promise.all(toRelease.map((release) => {
-        return rulesDeploy.release(release.rules, rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE, release.bucket);
+    await Promise.all(toRelease.map((r) => {
+        return rulesDeploy.release(r.rules, rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE, r.bucket);
     }));
+    return toRelease.map((r) => r.bucket);
 }
 exports.default = default_1;

package/lib/emulator/auth/index.js

@@ -10,6 +10,7 @@ const emulatorLogger_1 = require("../emulatorLogger");
 const types_1 = require("../types");
 const server_1 = require("./server");
 const error_1 = require("../../error");
+const track_1 = require("../../track");
 class AuthEmulator {
     constructor(args) {
         this.args = args;
@@ -37,8 +38,12 @@ class AuthEmulator {
     getName() {
         return types_1.Emulators.AUTH;
     }
-    async importData(authExportDir, projectId) {
-        const logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATABASE);
+    async importData(authExportDir, projectId, options) {
+        void (0, track_1.trackEmulator)("emulator_import", {
+            initiated_by: options.initiatedBy,
+            emulator_name: types_1.Emulators.AUTH,
+        });
+        const logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.AUTH);
         const { host, port } = this.getInfo();
         const configPath = path.join(authExportDir, "config.json");
         const configStat = await stat(configPath);

package/lib/emulator/auth/operations.js

@@ -340,7 +340,7 @@ function batchCreate(state, reqBody) {
             }
             fields.emailVerified = !!userInfo.emailVerified;
             fields.disabled = !!userInfo.disabled;
-            if (userInfo.mfaInfo) {
+            if (userInfo.mfaInfo && userInfo.mfaInfo.length > 0) {
                 fields.mfaInfo = [];
                 (0, errors_1.assert)(fields.email, "Second factor account requires email to be presented.");
                 (0, errors_1.assert)(fields.emailVerified, "Second factor account requires email to be verified.");
@@ -1716,14 +1716,14 @@ function fakeFetchUserInfoFromIdp(providerId, claims, samlResponse) {
     switch (providerId) {
         case "google.com": {
             federatedId = `https://accounts.google.com/${rawId}`;
-            let granted_scopes = "openid https://www.googleapis.com/auth/userinfo.profile";
+            let grantedScopes = "openid https://www.googleapis.com/auth/userinfo.profile";
             if (email) {
-                granted_scopes += " https://www.googleapis.com/auth/userinfo.email";
+                grantedScopes += " https://www.googleapis.com/auth/userinfo.email";
             }
             response.firstName = claims.given_name;
             response.lastName = claims.family_name;
             response.rawUserInfo = JSON.stringify({
-                granted_scopes,
+                granted_scopes: grantedScopes,
                 id: rawId,
                 name: displayName,
                 given_name: claims.given_name,
@@ -2064,7 +2064,7 @@ function generateBlockingFunctionJwt(state, event, url, timeoutMs, user, options
         jwt.tenant_id = state.tenantId;
         jwt.user_record.tenant_id = state.tenantId;
     }
-    const provider_data = [];
+    const providerData = [];
     if (user.providerUserInfo) {
         for (const providerUserInfo of user.providerUserInfo) {
             const provider = {
@@ -2075,12 +2075,12 @@ function generateBlockingFunctionJwt(state, event, url, timeoutMs, user, options
                 uid: providerUserInfo.rawId,
                 phone_number: providerUserInfo.phoneNumber,
             };
-            provider_data.push(provider);
+            providerData.push(provider);
         }
     }
-    jwt.user_record.provider_data = provider_data;
+    jwt.user_record.provider_data = providerData;
     if (user.mfaInfo) {
-        const enrolled_factors = [];
+        const enrolledFactors = [];
         for (const mfaEnrollment of user.mfaInfo) {
             if (!mfaEnrollment.mfaEnrollmentId) {
                 continue;
@@ -2092,10 +2092,10 @@ function generateBlockingFunctionJwt(state, event, url, timeoutMs, user, options
                 phone_number: mfaEnrollment.phoneInfo,
                 factor_id: state_1.PROVIDER_PHONE,
             };
-            enrolled_factors.push(enrolledFactor);
+            enrolledFactors.push(enrolledFactor);
         }
         jwt.user_record.multi_factor = {
-            enrolled_factors,
+            enrolled_factors: enrolledFactors,
         };
     }
     if (user.lastLoginAt || user.createdAt) {

package/lib/emulator/commandUtils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JAVA_DEPRECATION_WARNING = exports.checkJavaSupported = exports.emulatorExec = exports.shutdownWhenKilled = exports.setExportOnExitOptions = exports.parseInspectionPort = exports.beforeEmulatorCommand = exports.warnEmulatorNotSupported = exports.printNoticeIfEmulated = exports.DESC_TEST_PARAMS = exports.FLAG_TEST_PARAMS = exports.DESC_TEST_CONFIG = exports.FLAG_TEST_CONFIG = exports.DESC_UI = exports.FLAG_UI = exports.EXPORT_ON_EXIT_CWD_DANGER = exports.EXPORT_ON_EXIT_USAGE_ERROR = exports.DESC_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT_NAME = exports.DESC_IMPORT = exports.FLAG_IMPORT = exports.DESC_INSPECT_FUNCTIONS = exports.FLAG_INSPECT_FUNCTIONS = exports.DESC_ONLY = exports.FLAG_ONLY = void 0;
-const clc = require("cli-color");
+exports.JAVA_DEPRECATION_WARNING = exports.MIN_SUPPORTED_JAVA_MAJOR_VERSION = exports.checkJavaMajorVersion = exports.emulatorExec = exports.shutdownWhenKilled = exports.setExportOnExitOptions = exports.parseInspectionPort = exports.beforeEmulatorCommand = exports.warnEmulatorNotSupported = exports.printNoticeIfEmulated = exports.DESC_TEST_PARAMS = exports.FLAG_TEST_PARAMS = exports.DESC_TEST_CONFIG = exports.FLAG_TEST_CONFIG = exports.DESC_UI = exports.FLAG_UI = exports.EXPORT_ON_EXIT_CWD_DANGER = exports.EXPORT_ON_EXIT_USAGE_ERROR = exports.DESC_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT_NAME = exports.DESC_IMPORT = exports.FLAG_IMPORT = exports.DESC_INSPECT_FUNCTIONS = exports.FLAG_INSPECT_FUNCTIONS = exports.DESC_ONLY = exports.FLAG_ONLY = void 0;
+const clc = require("colorette");
 const childProcess = require("child_process");
 const controller = require("../emulator/controller");
 const config_1 = require("../config");
@@ -20,6 +20,7 @@ const prompt_1 = require("../prompt");
 const controller_1 = require("./controller");
 const fsutils = require("../fsutils");
 const Table = require("cli-table");
+const track_1 = require("../track");
 exports.FLAG_ONLY = "--only <emulators>";
 exports.DESC_ONLY = "only specific emulators. " +
     "This is a comma separated list of emulator names. " +
@@ -43,7 +44,14 @@ exports.FLAG_TEST_CONFIG = "--test-config <firebase.json file>";
 exports.DESC_TEST_CONFIG = "A firebase.json style file. Used to configure the Firestore and Realtime Database emulators.";
 exports.FLAG_TEST_PARAMS = "--test-params <params.env file>";
 exports.DESC_TEST_PARAMS = "A .env file containing test param values for your emulated extension.";
-const DEFAULT_CONFIG = new config_1.Config({ database: {}, firestore: {}, functions: {}, hosting: {}, emulators: { auth: {}, pubsub: {} } }, {});
+const DEFAULT_CONFIG = new config_1.Config({
+    eventarc: {},
+    database: {},
+    firestore: {},
+    functions: {},
+    hosting: {},
+    emulators: { auth: {}, pubsub: {} },
+}, {});
 function printNoticeIfEmulated(options, emulator) {
     if (emulator !== types_1.Emulators.DATABASE && emulator !== types_1.Emulators.FIRESTORE) {
         return;
@@ -201,14 +209,10 @@ function shutdownWhenKilled(options) {
         ["SIGINT", "SIGTERM", "SIGHUP", "SIGQUIT"].forEach((signal) => {
             process.on(signal, processKillSignal(signal, res, rej, options));
         });
-    })
-        .then(() => {
-        process.exit(0);
-    })
-        .catch((e) => {
+    }).catch((e) => {
         logger_1.logger.debug(e);
         utils.logLabeledWarning("emulators", "emulators failed to shut down cleanly, see firebase-debug.log for details.");
-        process.exit(1);
+        throw e;
     });
 }
 exports.shutdownWhenKilled = shutdownWhenKilled;
@@ -247,6 +251,12 @@ async function runScript(script, extraEnv) {
         const address = registry_1.EmulatorRegistry.getInfoHostString(info);
         env[constants_1.Constants.FIREBASE_EMULATOR_HUB] = address;
     }
+    const eventarcInstance = registry_1.EmulatorRegistry.get(types_1.Emulators.EVENTARC);
+    if (eventarcInstance) {
+        const info = eventarcInstance.getInfo();
+        const address = registry_1.EmulatorRegistry.getInfoHostString(info);
+        env[constants_1.Constants.CLOUD_EVENTARC_EMULATOR_HOST] = address;
+    }
     const proc = childProcess.spawn(script, {
         stdio: ["inherit", "inherit", "inherit"],
         shell: true,
@@ -280,12 +290,15 @@ async function runScript(script, extraEnv) {
     });
 }
 async function emulatorExec(script, options) {
-    shutdownWhenKilled(options);
     const projectId = (0, projectUtils_1.getProjectId)(options);
     const extraEnv = {};
     if (projectId) {
         extraEnv.GCLOUD_PROJECT = projectId;
     }
+    const session = (0, track_1.emulatorSession)();
+    if (session && session.debugMode) {
+        extraEnv[constants_1.Constants.FIREBASE_GA_SESSION] = JSON.stringify(session);
+    }
     let exitCode = 0;
     let deprecationNotices;
     try {
@@ -308,9 +321,8 @@ async function emulatorExec(script, options) {
 }
 exports.emulatorExec = emulatorExec;
 const JAVA_VERSION_REGEX = /version "([1-9][0-9]*)/;
-const MIN_SUPPORTED_JAVA_MAJOR_VERSION = 11;
 const JAVA_HINT = "Please make sure Java is installed and on your system PATH.";
-async function checkJavaSupported() {
+async function checkJavaMajorVersion() {
     return new Promise((resolve, reject) => {
         var _a, _b;
         let child;
@@ -351,25 +363,30 @@ async function checkJavaSupported() {
             }
         });
     }).then((output) => {
+        let versionInt = -1;
         const match = output.match(JAVA_VERSION_REGEX);
         if (match) {
             const version = match[1];
-            const versionInt = parseInt(version, 10);
+            versionInt = parseInt(version, 10);
             if (!versionInt) {
                 utils.logLabeledWarning("emulators", `Failed to parse Java version. Got "${match[0]}".`, "warn");
             }
             else {
                 logger_1.logger.debug(`Parsed Java major version: ${versionInt}`);
-                return versionInt >= MIN_SUPPORTED_JAVA_MAJOR_VERSION;
             }
         }
         else {
             logger_1.logger.debug("java -version outputs:", output);
             logger_1.logger.warn(`Failed to parse Java version.`);
         }
-        return false;
+        const session = (0, track_1.emulatorSession)();
+        if (session) {
+            session.javaMajorVersion = versionInt;
+        }
+        return versionInt;
     });
 }
-exports.checkJavaSupported = checkJavaSupported;
+exports.checkJavaMajorVersion = checkJavaMajorVersion;
+exports.MIN_SUPPORTED_JAVA_MAJOR_VERSION = 11;
 exports.JAVA_DEPRECATION_WARNING = "firebase-tools no longer supports Java version before 11. " +
     "Please upgrade to Java version 11 or above to continue using the emulators.";

package/lib/emulator/constants.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Constants = exports.EMULATOR_DESCRIPTION = exports.FIND_AVAILBLE_PORT_BY_DEFAULT = void 0;
+exports.Constants = exports.DEFAULT_HOST = exports.EMULATOR_DESCRIPTION = exports.FIND_AVAILBLE_PORT_BY_DEFAULT = exports.DEFAULT_PORTS = void 0;
 const url = require("url");
-const DEFAULT_PORTS = {
+exports.DEFAULT_PORTS = {
     ui: 4000,
     hub: 4400,
     logging: 4500,
@@ -14,6 +14,7 @@ const DEFAULT_PORTS = {
     database: 9000,
     auth: 9099,
     storage: 9199,
+    eventarc: 9299,
 };
 exports.FIND_AVAILBLE_PORT_BY_DEFAULT = {
     ui: true,
@@ -27,6 +28,7 @@ exports.FIND_AVAILBLE_PORT_BY_DEFAULT = {
     auth: false,
     storage: false,
     extensions: false,
+    eventarc: false,
 };
 exports.EMULATOR_DESCRIPTION = {
     ui: "Emulator UI",
@@ -40,8 +42,9 @@ exports.EMULATOR_DESCRIPTION = {
     auth: "Authentication Emulator",
     storage: "Storage Emulator",
     extensions: "Extensions Emulator",
+    eventarc: "Eventarc Emulator",
 };
-const DEFAULT_HOST = "localhost";
+exports.DEFAULT_HOST = "localhost";
 class Constants {
     static getServiceName(service) {
         switch (service) {
@@ -63,15 +66,17 @@ class Constants {
                 return "storage";
             case this.SERVICE_TEST_LAB:
                 return "test lab";
+            case this.SERVICE_EVENTARC:
+                return "eventarc";
             default:
                 return service;
         }
     }
     static getDefaultHost() {
-        return DEFAULT_HOST;
+        return exports.DEFAULT_HOST;
     }
     static getDefaultPort(emulator) {
-        return DEFAULT_PORTS[emulator];
+        return exports.DEFAULT_PORTS[emulator];
     }
     static description(name) {
         return exports.EMULATOR_DESCRIPTION[name];
@@ -82,7 +87,7 @@ class Constants {
             normalized = `http://${normalized}`;
         }
         const u = url.parse(normalized);
-        return u.hostname || DEFAULT_HOST;
+        return u.hostname || exports.DEFAULT_HOST;
     }
     static isDemoProject(projectId) {
         return !!projectId && projectId.startsWith(this.FAKE_PROJECT_ID_PREFIX);
@@ -97,10 +102,13 @@ Constants.FIREBASE_DATABASE_EMULATOR_HOST = "FIREBASE_DATABASE_EMULATOR_HOST";
 Constants.FIREBASE_AUTH_EMULATOR_HOST = "FIREBASE_AUTH_EMULATOR_HOST";
 Constants.FIREBASE_STORAGE_EMULATOR_HOST = "FIREBASE_STORAGE_EMULATOR_HOST";
 Constants.CLOUD_STORAGE_EMULATOR_HOST = "STORAGE_EMULATOR_HOST";
+Constants.CLOUD_EVENTARC_EMULATOR_HOST = "CLOUD_EVENTARC_EMULATOR_HOST";
 Constants.FIREBASE_EMULATOR_HUB = "FIREBASE_EMULATOR_HUB";
+Constants.FIREBASE_GA_SESSION = "FIREBASE_GA_SESSION";
 Constants.SERVICE_FIRESTORE = "firestore.googleapis.com";
 Constants.SERVICE_REALTIME_DATABASE = "firebaseio.com";
 Constants.SERVICE_PUBSUB = "pubsub.googleapis.com";
+Constants.SERVICE_EVENTARC = "eventarc.googleapis.com";
 Constants.SERVICE_ANALYTICS = "app-measurement.com";
 Constants.SERVICE_AUTH = "firebaseauth.googleapis.com";
 Constants.SERVICE_CRASHLYTICS = "fabric.io";