firebase-tools 11.5.0 → 11.8.0

package/lib/deploy/functions/runtimes/discovery/v1alpha1.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.backendFromV1Alpha1 = exports.buildFromV1Alpha1 = void 0;
-const backend = require("../../backend");
+exports.buildFromV1Alpha1 = void 0;
 const build = require("../../build");
 const proto_1 = require("../../../../gcp/proto");
 const parsing_1 = require("./parsing");
@@ -27,33 +26,13 @@ function buildFromV1Alpha1(yaml, project, region, runtime) {
     bd.requiredAPIs = parseRequiredAPIs(manifest);
     for (const id of Object.keys(manifest.endpoints)) {
         const me = manifest.endpoints[id];
-        assertManifestEndpoint(me, id);
+        assertBuildEndpoint(me, id);
         const be = parseEndpointForBuild(id, me, project, region, runtime);
         bd.endpoints[id] = be;
     }
     return bd;
 }
 exports.buildFromV1Alpha1 = buildFromV1Alpha1;
-function backendFromV1Alpha1(yaml, project, region, runtime) {
-    const manifest = JSON.parse(JSON.stringify(yaml));
-    const bkend = backend.empty();
-    bkend.requiredAPIs = parseRequiredAPIs(manifest);
-    (0, parsing_1.requireKeys)("", manifest, "endpoints");
-    (0, parsing_1.assertKeyTypes)("", manifest, {
-        specVersion: "string",
-        params: "array",
-        requiredAPIs: "array",
-        endpoints: "object",
-    });
-    for (const id of Object.keys(manifest.endpoints)) {
-        for (const parsed of parseEndpoints(manifest, id, project, region, runtime)) {
-            bkend.endpoints[parsed.region] = bkend.endpoints[parsed.region] || {};
-            bkend.endpoints[parsed.region][parsed.id] = parsed;
-        }
-    }
-    return bkend;
-}
-exports.backendFromV1Alpha1 = backendFromV1Alpha1;
 function parseRequiredAPIs(manifest) {
     const requiredAPIs = manifest.requiredAPIs || [];
     for (const { api, reason } of requiredAPIs) {
@@ -66,22 +45,22 @@ function parseRequiredAPIs(manifest) {
     }
     return requiredAPIs;
 }
-function assertManifestEndpoint(ep, id) {
+function assertBuildEndpoint(ep, id) {
     const prefix = `endpoints[${id}]`;
     (0, parsing_1.assertKeyTypes)(prefix, ep, {
         region: "array",
-        platform: (platform) => backend.AllFunctionsPlatforms.includes(platform),
+        platform: (platform) => build.AllFunctionsPlatforms.includes(platform),
         entryPoint: "string",
-        availableMemoryMb: (mem) => mem === null || backend.isValidMemoryOption(mem),
-        maxInstances: "number?",
-        minInstances: "number?",
-        concurrency: "number?",
+        availableMemoryMb: (mem) => mem === null || isCEL(mem) || build.isValidMemoryOption(mem),
+        maxInstances: "Field<number>?",
+        minInstances: "Field<number>?",
+        concurrency: "Field<number>?",
         serviceAccount: "string?",
         serviceAccountEmail: "string?",
-        timeoutSeconds: "number?",
+        timeoutSeconds: "Field<number>?",
         vpc: "object?",
         labels: "object?",
-        ingressSettings: (setting) => setting === null || backend.AllIngressSettings.includes(setting),
+        ingressSettings: (setting) => setting === null || build.AllIngressSettings.includes(setting),
         environmentVariables: "object?",
         secretEnvironmentVariables: "array?",
         httpsTrigger: "object",
@@ -90,12 +69,12 @@ function assertManifestEndpoint(ep, id) {
         scheduleTrigger: "object",
         taskQueueTrigger: "object",
         blockingTrigger: "object",
-        cpu: (cpu) => cpu === null || typeof cpu === "number" || cpu === "gcf_gen1",
+        cpu: (cpu) => cpu === null || isCEL(cpu) || cpu === "gcf_gen1" || typeof cpu === "number",
     });
     if (ep.vpc) {
         (0, parsing_1.assertKeyTypes)(prefix + ".vpc", ep.vpc, {
             connector: "string",
-            egressSettings: (setting) => setting === null || backend.AllVpcEgressSettings.includes(setting),
+            egressSettings: (setting) => setting === null || build.AllVpcEgressSettings.includes(setting),
         });
         (0, parsing_1.requireKeys)(prefix + ".vpc", ep.vpc, "connector");
     }
@@ -124,44 +103,46 @@ function assertManifestEndpoint(ep, id) {
     if (triggerCount > 1) {
         throw new error_1.FirebaseError("Multiple triggers defined for endpoint" + id);
     }
-    if (backend.isEventTriggered(ep)) {
+    if (build.isEventTriggered(ep)) {
         (0, parsing_1.requireKeys)(prefix + ".eventTrigger", ep.eventTrigger, "eventType", "eventFilters");
         (0, parsing_1.assertKeyTypes)(prefix + ".eventTrigger", ep.eventTrigger, {
             eventFilters: "object",
             eventFilterPathPatterns: "object",
             eventType: "string",
-            retry: "boolean",
-            region: "string",
+            retry: "Field<boolean>",
+            region: "Field<string>",
             serviceAccount: "string?",
             serviceAccountEmail: "string?",
             channel: "string",
         });
     }
-    else if (backend.isHttpsTriggered(ep)) {
+    else if (build.isHttpsTriggered(ep)) {
         (0, parsing_1.assertKeyTypes)(prefix + ".httpsTrigger", ep.httpsTrigger, {
             invoker: "array?",
         });
     }
-    else if (backend.isCallableTriggered(ep)) {
+    else if (build.isCallableTriggered(ep)) {
     }
-    else if (backend.isScheduleTriggered(ep)) {
+    else if (build.isScheduleTriggered(ep)) {
         (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger", ep.scheduleTrigger, {
-            schedule: "string",
-            timeZone: "string?",
+            schedule: "Field<string>",
+            timeZone: "Field<string>?",
             retryConfig: "object?",
         });
-        (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger.retryConfig", ep.scheduleTrigger.retryConfig || {}, {
-            retryCount: "number?",
-            maxDoublings: "number?",
-            minBackoffSeconds: "number?",
-            maxBackoffSeconds: "number?",
-            maxRetrySeconds: "number?",
-            minBackoffDuration: "string?",
-            maxBackoffDuration: "string?",
-            maxRetryDuration: "string?",
-        });
+        if (ep.scheduleTrigger.retryConfig) {
+            (0, parsing_1.assertKeyTypes)(prefix + ".scheduleTrigger.retryConfig", ep.scheduleTrigger.retryConfig, {
+                retryCount: "Field<number>?",
+                maxDoublings: "Field<number>?",
+                minBackoffSeconds: "Field<number>?",
+                maxBackoffSeconds: "Field<number>?",
+                maxRetrySeconds: "Field<number>?",
+                maxRetryDuration: "string?",
+                minBackoffDuration: "string?",
+                maxBackoffDuration: "string?",
+            });
+        }
     }
-    else if (backend.isTaskQueueTriggered(ep)) {
+    else if (build.isTaskQueueTriggered(ep)) {
         (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger", ep.taskQueueTrigger, {
             rateLimits: "object?",
             retryConfig: "object?",
@@ -169,21 +150,21 @@ function assertManifestEndpoint(ep, id) {
         });
         if (ep.taskQueueTrigger.rateLimits) {
             (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger.rateLimits", ep.taskQueueTrigger.rateLimits, {
-                maxConcurrentDispatches: "number?",
-                maxDispatchesPerSecond: "number?",
+                maxConcurrentDispatches: "Field<number>?",
+                maxDispatchesPerSecond: "Field<number>?",
             });
         }
         if (ep.taskQueueTrigger.retryConfig) {
             (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger.retryConfig", ep.taskQueueTrigger.retryConfig, {
-                maxAttempts: "number?",
-                maxRetrySeconds: "number?",
-                minBackoffSeconds: "number?",
-                maxBackoffSeconds: "number?",
-                maxDoublings: "number?",
+                maxAttempts: "Field<number>?",
+                maxRetrySeconds: "Field<number>?",
+                minBackoffSeconds: "Field<number>?",
+                maxBackoffSeconds: "Field<number>?",
+                maxDoublings: "Field<number>?",
             });
         }
     }
-    else if (backend.isBlockingTriggered(ep)) {
+    else if (build.isBlockingTriggered(ep)) {
         (0, parsing_1.requireKeys)(prefix + ".blockingTrigger", ep.blockingTrigger, "eventType");
         (0, parsing_1.assertKeyTypes)(prefix + ".blockingTrigger", ep.blockingTrigger, {
             eventType: "string",
@@ -198,12 +179,14 @@ function assertManifestEndpoint(ep, id) {
 function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     var _a;
     let triggered;
-    if (backend.isEventTriggered(ep)) {
+    if (build.isEventTriggered(ep)) {
         const eventTrigger = {
             eventType: ep.eventTrigger.eventType,
             retry: ep.eventTrigger.retry,
         };
-        (0, proto_1.renameIfPresent)(eventTrigger, ep.eventTrigger, "serviceAccount", "serviceAccountEmail");
+        if ("serviceAccountEmail" in ep.eventTrigger) {
+            eventTrigger.serviceAccount = ep.eventTrigger.serviceAccountEmail;
+        }
         (0, proto_1.copyIfPresent)(eventTrigger, ep.eventTrigger, "serviceAccount", "eventFilterPathPatterns", "region");
         (0, proto_1.convertIfPresent)(eventTrigger, ep.eventTrigger, "channel", (c) => resolveChannelName(project, c, defaultRegion));
         (0, proto_1.convertIfPresent)(eventTrigger, ep.eventTrigger, "eventFilters", (filters) => {
@@ -215,20 +198,23 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
         });
         triggered = { eventTrigger };
     }
-    else if (backend.isHttpsTriggered(ep)) {
+    else if (build.isHttpsTriggered(ep)) {
         triggered = { httpsTrigger: {} };
         (0, proto_1.copyIfPresent)(triggered.httpsTrigger, ep.httpsTrigger, "invoker");
     }
-    else if (backend.isCallableTriggered(ep)) {
+    else if (build.isCallableTriggered(ep)) {
         triggered = { callableTrigger: {} };
     }
-    else if (backend.isScheduleTriggered(ep)) {
+    else if (build.isScheduleTriggered(ep)) {
         const st = {
             schedule: ep.scheduleTrigger.schedule || "",
             timeZone: (_a = ep.scheduleTrigger.timeZone) !== null && _a !== void 0 ? _a : null,
         };
         if (ep.scheduleTrigger.retryConfig) {
             st.retryConfig = {};
+            (0, proto_1.convertIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "maxBackoffSeconds", "maxBackoffDuration", (duration) => (duration === null ? null : (0, proto_1.secondsFromDuration)(duration)));
+            (0, proto_1.convertIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "minBackoffSeconds", "minBackoffDuration", (duration) => (duration === null ? null : (0, proto_1.secondsFromDuration)(duration)));
+            (0, proto_1.convertIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "maxRetrySeconds", "maxRetryDuration", (duration) => (duration === null ? null : (0, proto_1.secondsFromDuration)(duration)));
             (0, proto_1.copyIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "retryCount", "minBackoffSeconds", "maxBackoffSeconds", "maxRetrySeconds", "maxDoublings");
             (0, proto_1.convertIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "minBackoffSeconds", "minBackoffDuration", (0, functional_1.nullsafeVisitor)(proto_1.secondsFromDuration));
             (0, proto_1.convertIfPresent)(st.retryConfig, ep.scheduleTrigger.retryConfig, "maxBackoffSeconds", "maxBackoffDuration", (0, functional_1.nullsafeVisitor)(proto_1.secondsFromDuration));
@@ -239,7 +225,7 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
         }
         triggered = { scheduleTrigger: st };
     }
-    else if (backend.isTaskQueueTriggered(ep)) {
+    else if (build.isTaskQueueTriggered(ep)) {
         const tq = {};
         if (ep.taskQueueTrigger.invoker) {
             tq.invoker = ep.taskQueueTrigger.invoker;
@@ -261,7 +247,7 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
         }
         triggered = { taskQueueTrigger: tq };
     }
-    else if (backend.isBlockingTriggered(ep)) {
+    else if (ep.blockingTrigger) {
         triggered = { blockingTrigger: ep.blockingTrigger };
     }
     else {
@@ -270,7 +256,9 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     }
     const parsed = Object.assign({ platform: ep.platform || "gcfv2", region: ep.region || [defaultRegion], project,
         runtime, entryPoint: ep.entryPoint }, triggered);
-    (0, proto_1.renameIfPresent)(parsed, ep, "serviceAccount", "serviceAccountEmail");
+    if ("serviceAccountEmail" in ep) {
+        parsed.serviceAccount = ep.serviceAccountEmail;
+    }
     (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "cpu", "maxInstances", "minInstances", "concurrency", "timeoutSeconds", "vpc", "labels", "ingressSettings", "environmentVariables", "serviceAccount");
     (0, proto_1.convertIfPresent)(parsed, ep, "secretEnvironmentVariables", (senvs) => {
         if (!senvs) {
@@ -282,69 +270,6 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     });
     return parsed;
 }
-function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
-    const allParsed = [];
-    const prefix = `endpoints[${id}]`;
-    const ep = manifest.endpoints[id];
-    assertManifestEndpoint(ep, id);
-    for (const region of ep.region || [defaultRegion]) {
-        let triggered;
-        if (backend.isEventTriggered(ep)) {
-            const eventTrigger = {
-                eventType: ep.eventTrigger.eventType,
-                retry: false,
-            };
-            (0, proto_1.renameIfPresent)(eventTrigger, ep.eventTrigger, "serviceAccount", "serviceAccountEmail");
-            (0, proto_1.copyIfPresent)(eventTrigger, ep.eventTrigger, "eventFilterPathPatterns", "retry", "serviceAccount", "region");
-            (0, proto_1.convertIfPresent)(eventTrigger, ep.eventTrigger, "channel", (c) => resolveChannelName(project, c, defaultRegion));
-            (0, proto_1.convertIfPresent)(eventTrigger, ep.eventTrigger, "eventFilters", (filters) => {
-                const copy = Object.assign({}, filters);
-                if (copy["topic"] && !copy["topic"].startsWith("projects/")) {
-                    copy["topic"] = `projects/${project}/topics/${copy["topic"]}`;
-                }
-                return copy;
-            });
-            triggered = { eventTrigger };
-        }
-        else if (backend.isHttpsTriggered(ep)) {
-            triggered = { httpsTrigger: {} };
-            (0, proto_1.copyIfPresent)(triggered.httpsTrigger, ep.httpsTrigger, "invoker");
-        }
-        else if (backend.isCallableTriggered(ep)) {
-            triggered = { callableTrigger: {} };
-        }
-        else if (backend.isScheduleTriggered(ep)) {
-            triggered = { scheduleTrigger: ep.scheduleTrigger };
-        }
-        else if (backend.isTaskQueueTriggered(ep)) {
-            triggered = { taskQueueTrigger: ep.taskQueueTrigger };
-        }
-        else if (backend.isBlockingTriggered(ep)) {
-            triggered = { blockingTrigger: ep.blockingTrigger };
-        }
-        else {
-            throw new error_1.FirebaseError(`Do not recognize trigger type for endpoint ${id}. Try upgrading ` +
-                "firebase-tools with npm install -g firebase-tools@latest");
-        }
-        (0, parsing_1.requireKeys)(prefix, ep, "entryPoint");
-        const parsed = Object.assign({ platform: ep.platform || "gcfv2", id,
-            region,
-            project,
-            runtime, entryPoint: ep.entryPoint }, triggered);
-        (0, proto_1.renameIfPresent)(parsed, ep, "serviceAccount", "serviceAccountEmail");
-        (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "serviceAccount", "timeoutSeconds", "vpc", "labels", "ingressSettings", "environmentVariables", "cpu");
-        (0, proto_1.convertIfPresent)(parsed, ep, "secretEnvironmentVariables", (senvs) => {
-            if (!senvs) {
-                return null;
-            }
-            return senvs.map(({ key, secret }) => {
-                return { key, secret: secret || key, projectId: project };
-            });
-        });
-        allParsed.push(parsed);
-    }
-    return allParsed;
-}
 function resolveChannelName(projectId, channel, defaultRegion) {
     if (!channel.includes("/")) {
         const location = defaultRegion;
@@ -365,3 +290,6 @@ function resolveChannelName(projectId, channel, defaultRegion) {
         return "projects/" + projectId + "/locations/" + location + "/channels/" + channelId;
     }
 }
+function isCEL(expr) {
+    return typeof expr === "string" && expr.includes("{{") && expr.includes("}}");
+}

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

@@ -116,7 +116,7 @@ function addResourcesToBuild(projectId, runtime, annotation, want) {
             proto.copyIfPresent(triggered.taskQueueTrigger.retryConfig, annotation.taskQueueTrigger.retryConfig, "maxAttempts", "maxDoublings");
             proto.convertIfPresent(triggered.taskQueueTrigger.retryConfig, annotation.taskQueueTrigger.retryConfig, "minBackoffSeconds", "minBackoff", toSeconds);
             proto.convertIfPresent(triggered.taskQueueTrigger.retryConfig, annotation.taskQueueTrigger.retryConfig, "maxBackoffSeconds", "maxBackoff", toSeconds);
-            proto.convertIfPresent(triggered.taskQueueTrigger.retryConfig, annotation.taskQueueTrigger.retryConfig, "maxRetryDurationSeconds", "maxRetryDuration", toSeconds);
+            proto.convertIfPresent(triggered.taskQueueTrigger.retryConfig, annotation.taskQueueTrigger.retryConfig, "maxRetrySeconds", "maxRetryDuration", toSeconds);
         }
     }
     else if (annotation.httpsTrigger) {

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,6 +1,6 @@
 "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;
+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");
@@ -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: true,
 };
 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";