firebase-tools 10.3.1 → 10.4.2

package/lib/commands/target-remove.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const clc = require("cli-color");
 const command_1 = require("../command");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");
 exports.default = new command_1.Command("target:remove <type> <resource>")
     .description("remove a resource target")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .action((type, resource, options) => {
     const name = options.rc.removeTarget(options.project, type, resource);
     if (name) {

package/lib/commands/target.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const clc = require("cli-color");
 const command_1 = require("../command");
 const logger_1 = require("../logger");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils = require("../utils");
 function logTargets(type, targets) {
     logger_1.logger.info(clc.cyan("[ " + type + " ]"));
@@ -13,7 +13,7 @@ function logTargets(type, targets) {
 }
 exports.default = new command_1.Command("target [type]")
     .description("display configured deploy targets for the current project")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .action((type, options) => {
     if (!options.project) {
         return utils.reject("No active project, cannot list deploy targets.");

package/lib/config.js

@@ -39,10 +39,17 @@ class Config {
                 _.set(this.data, target, this.materialize(target));
             }
         });
-        if (this.projectDir &&
-            !this.get("functions.source") &&
-            fsutils.dirExistsSync(this.path("functions"))) {
-            this.set("functions.source", Config.DEFAULT_FUNCTIONS_SOURCE);
+        if (this.projectDir && fsutils.dirExistsSync(this.path(Config.DEFAULT_FUNCTIONS_SOURCE))) {
+            if (Array.isArray(this.get("functions"))) {
+                if (!this.get("functions.[0].source")) {
+                    this.set("functions.[0].source", Config.DEFAULT_FUNCTIONS_SOURCE);
+                }
+            }
+            else {
+                if (!this.get("functions.source")) {
+                    this.set("functions.source", Config.DEFAULT_FUNCTIONS_SOURCE);
+                }
+            }
         }
     }
     materialize(target) {
@@ -144,6 +151,9 @@ class Config {
         fs.ensureFileSync(this.path(p));
         fs.writeFileSync(this.path(p), content, "utf8");
     }
+    projectFileExists(p) {
+        return fs.existsSync(this.path(p));
+    }
     deleteProjectFile(p) {
         fs.removeSync(this.path(p));
     }

package/lib/deploy/extensions/planner.js

@@ -81,11 +81,17 @@ async function want(args) {
 }
 exports.want = want;
 async function resolveVersion(ref) {
-    if (!ref.version || ref.version === "latest") {
-        return "latest";
-    }
     const extensionRef = refs.toExtensionRef(ref);
     const versions = await extensionsApi.listExtensionVersions(extensionRef);
+    if (versions.length === 0) {
+        throw new error_1.FirebaseError(`No versions found for ${extensionRef}`);
+    }
+    if (!ref.version || ref.version === "latest") {
+        return versions
+            .map((ev) => ev.spec.version)
+            .sort(semver.compare)
+            .pop();
+    }
     const maxSatisfying = semver.maxSatisfying(versions.map((ev) => ev.spec.version), ref.version);
     if (!maxSatisfying) {
         throw new error_1.FirebaseError(`No version of ${extensionRef} matches requested version ${ref.version}`);

package/lib/deploy/functions/checkIam.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureServiceAgentRoles = exports.mergeBindings = exports.checkHttpIam = exports.checkServiceAccountIam = void 0;
+exports.ensureServiceAgentRoles = exports.mergeBindings = exports.obtainEventarcServiceAgentBindings = exports.obtainDefaultComputeServiceAgentBindings = exports.obtainPubSubServiceAgentBindings = exports.obtainBinding = exports.checkHttpIam = exports.checkServiceAccountIam = exports.EVENTARC_SERVICE_AGENT_ROLE = exports.EVENTARC_EVENT_RECEIVER_ROLE = exports.RUN_INVOKER_ROLE = exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE = void 0;
 const cli_color_1 = require("cli-color");
 const logger_1 = require("../../logger");
 const functionsDeployHelper_1 = require("./functionsDeployHelper");
@@ -12,6 +12,10 @@ const utils = require("../../utils");
 const resourceManager_1 = require("../../gcp/resourceManager");
 const services_1 = require("./services");
 const PERMISSION = "cloudfunctions.functions.setIamPolicy";
+exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE = "roles/iam.serviceAccountTokenCreator";
+exports.RUN_INVOKER_ROLE = "roles/run.invoker";
+exports.EVENTARC_EVENT_RECEIVER_ROLE = "roles/eventarc.eventReceiver";
+exports.EVENTARC_SERVICE_AGENT_ROLE = "roles/eventarc.serviceAgent";
 async function checkServiceAccountIam(projectId) {
     const saEmail = `${projectId}@appspot.gserviceaccount.com`;
     let passed = false;
@@ -67,6 +71,37 @@ function reduceEventsToServices(services, endpoint) {
     }
     return services;
 }
+function obtainBinding(existingPolicy, serviceAccount, role) {
+    let binding = existingPolicy.bindings.find((b) => b.role === role);
+    if (!binding) {
+        binding = {
+            role,
+            members: [],
+        };
+    }
+    if (!binding.members.find((m) => m === serviceAccount)) {
+        binding.members.push(serviceAccount);
+    }
+    return binding;
+}
+exports.obtainBinding = obtainBinding;
+function obtainPubSubServiceAgentBindings(projectNumber, existingPolicy) {
+    const pubsubServiceAgent = `serviceAccount:service-${projectNumber}@gcp-sa-pubsub.iam.gserviceaccount.com`;
+    return [obtainBinding(existingPolicy, pubsubServiceAgent, exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE)];
+}
+exports.obtainPubSubServiceAgentBindings = obtainPubSubServiceAgentBindings;
+function obtainDefaultComputeServiceAgentBindings(projectNumber, existingPolicy) {
+    const defaultComputeServiceAgent = `serviceAccount:${projectNumber}-compute@developer.gserviceaccount.com`;
+    const invokerBinding = obtainBinding(existingPolicy, defaultComputeServiceAgent, exports.RUN_INVOKER_ROLE);
+    const eventReceiverBinding = obtainBinding(existingPolicy, defaultComputeServiceAgent, exports.EVENTARC_EVENT_RECEIVER_ROLE);
+    return [invokerBinding, eventReceiverBinding];
+}
+exports.obtainDefaultComputeServiceAgentBindings = obtainDefaultComputeServiceAgentBindings;
+function obtainEventarcServiceAgentBindings(projectNumber, existingPolicy) {
+    const eventarcServiceAgent = `serviceAccount:service-${projectNumber}@gcp-sa-eventarc.iam.gserviceaccount.com`;
+    return [obtainBinding(existingPolicy, eventarcServiceAgent, exports.EVENTARC_SERVICE_AGENT_ROLE)];
+}
+exports.obtainEventarcServiceAgentBindings = obtainEventarcServiceAgentBindings;
 function mergeBindings(policy, allRequiredBindings) {
     for (const requiredBindings of allRequiredBindings) {
         if (requiredBindings.length === 0) {
@@ -107,6 +142,14 @@ async function ensureServiceAgentRoles(projectNumber, want, have) {
     const findRequiredBindings = [];
     newServices.forEach((service) => findRequiredBindings.push(service.requiredProjectBindings(projectNumber, policy)));
     const allRequiredBindings = await Promise.all(findRequiredBindings);
+    if (haveServices.length === 0) {
+        allRequiredBindings.push(obtainPubSubServiceAgentBindings(projectNumber, policy));
+        allRequiredBindings.push(obtainDefaultComputeServiceAgentBindings(projectNumber, policy));
+        allRequiredBindings.push(obtainEventarcServiceAgentBindings(projectNumber, policy));
+    }
+    if (!allRequiredBindings.find((bindings) => bindings.length > 0)) {
+        return;
+    }
     mergeBindings(policy, allRequiredBindings);
     try {
         await (0, resourceManager_1.setIamPolicy)(projectNumber, policy, "bindings");

package/lib/deploy/functions/deploy.js

@@ -9,7 +9,6 @@ const utils_1 = require("../../utils");
 const gcs = require("../../gcp/storage");
 const gcf = require("../../gcp/cloudfunctions");
 const gcfv2 = require("../../gcp/cloudfunctionsv2");
-const utils = require("../../utils");
 const backend = require("./backend");
 (0, tmp_1.setGracefulCleanup)();
 async function uploadSourceV1(context, region) {
@@ -33,7 +32,7 @@ async function uploadSourceV2(context, region) {
     context.storage = Object.assign(Object.assign({}, context.storage), { [region]: res.storageSource });
 }
 async function deploy(context, options, payload) {
-    if (!options.config.src.functions) {
+    if (!context.config) {
         return;
     }
     if (!context.functionsSourceV1 && !context.functionsSourceV2) {
@@ -53,12 +52,9 @@ async function deploy(context, options, payload) {
             }
         }
         await Promise.all(uploads);
-        utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
+        const source = context.config.source;
         if (uploads.length) {
-            (0, utils_1.logSuccess)(clc.green.bold("functions:") +
-                " " +
-                clc.bold(options.config.src.functions.source) +
-                " folder uploaded successfully");
+            (0, utils_1.logSuccess)(`${clc.green.bold("functions:")} ${clc.bold(source)} folder uploaded successfully`);
         }
     }
     catch (err) {

package/lib/deploy/functions/prepare.js

@@ -19,6 +19,7 @@ const logger_1 = require("../../logger");
 const triggerRegionHelper_1 = require("./triggerRegionHelper");
 const checkIam_1 = require("./checkIam");
 const error_1 = require("../../error");
+const projectConfig_1 = require("../../functions/projectConfig");
 function hasUserConfig(config) {
     return Object.keys(config).length > 1;
 }
@@ -28,16 +29,17 @@ function hasDotenv(opts) {
 async function prepare(context, options, payload) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
-    const sourceDirName = options.config.get("functions.source");
+    context.config = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions)[0];
+    const sourceDirName = context.config.source;
     if (!sourceDirName) {
-        throw new error_1.FirebaseError(`No functions code detected at default location (./functions), and no functions.source defined in firebase.json`);
+        throw new error_1.FirebaseError(`No functions code detected at default location (./functions), and no functions source defined in firebase.json`);
     }
     const sourceDir = options.config.path(sourceDirName);
     const delegateContext = {
         projectId,
         sourceDir,
         projectDir: options.config.projectDir,
-        runtime: options.config.get("functions.runtime") || "",
+        runtime: context.config.runtime || "",
     };
     const runtimeDelegate = await runtimes.getRuntimeDelegate(delegateContext);
     logger_1.logger.debug(`Validating ${runtimeDelegate.name} source`);
@@ -95,10 +97,10 @@ async function prepare(context, options, payload) {
             " directory for uploading...");
     }
     if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv1")) {
-        context.functionsSourceV1 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(runtimeConfig, options);
+        context.functionsSourceV1 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, context.config, runtimeConfig);
     }
     if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv2")) {
-        context.functionsSourceV2 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(undefined, options);
+        context.functionsSourceV2 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, context.config);
     }
     for (const endpoint of backend.allEndpoints(wantBackend)) {
         endpoint.environmentVariables = wantBackend.environmentVariables;

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -48,15 +48,14 @@ async function pipeAsync(from, to) {
         from.pipe(to);
     });
 }
-async function packageSource(options, sourceDir, configValues) {
-    var _a;
+async function packageSource(sourceDir, config, runtimeConfig) {
     const tmpFile = tmp.fileSync({ prefix: "firebase-functions-", postfix: ".zip" }).name;
     const fileStream = fs.createWriteStream(tmpFile, {
         flags: "w",
         encoding: "binary",
     });
     const archive = archiver("zip");
-    const ignore = ((_a = options.config.src.functions) === null || _a === void 0 ? void 0 : _a.ignore) || ["node_modules", ".git"];
+    const ignore = config.ignore || ["node_modules", ".git"];
     ignore.push("firebase-debug.log", "firebase-debug.*.log", CONFIG_DEST_FILE);
     try {
         const files = await fsAsync.readdirRecursive({ path: sourceDir, ignore: ignore });
@@ -66,8 +65,8 @@ async function packageSource(options, sourceDir, configValues) {
                 mode: file.mode,
             });
         });
-        if (typeof configValues !== "undefined") {
-            archive.append(JSON.stringify(configValues, null, 2), {
+        if (typeof runtimeConfig !== "undefined") {
+            archive.append(JSON.stringify(runtimeConfig, null, 2), {
                 name: CONFIG_DEST_FILE,
                 mode: 420,
             });
@@ -81,20 +80,15 @@ async function packageSource(options, sourceDir, configValues) {
             exit: 1,
         });
     }
-    utils.assertDefined(options.config.src.functions);
-    utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
     utils.logBullet(clc.cyan.bold("functions:") +
         " packaged " +
-        clc.bold(options.config.src.functions.source) +
+        clc.bold(sourceDir) +
         " (" +
         filesize(archive.pointer()) +
         ") for uploading");
     return tmpFile;
 }
-async function prepareFunctionsUpload(runtimeConfig, options) {
-    utils.assertDefined(options.config.src.functions);
-    utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
-    const sourceDir = options.config.path(options.config.src.functions.source);
-    return packageSource(options, sourceDir, runtimeConfig);
+async function prepareFunctionsUpload(sourceDir, config, runtimeConfig) {
+    return packageSource(sourceDir, config, runtimeConfig);
 }
 exports.prepareFunctionsUpload = prepareFunctionsUpload;

package/lib/deploy/functions/release/fabricator.js

@@ -180,6 +180,13 @@ class Fabricator {
                     .catch(rethrowAs(endpoint, "set invoker"));
             }
         }
+        else if (backend.isCallableTriggered(endpoint)) {
+            await this.executor
+                .run(async () => {
+                await gcf.setInvokerCreate(endpoint.project, backend.functionName(endpoint), ["public"]);
+            })
+                .catch(rethrowAs(endpoint, "set invoker"));
+        }
         else if (backend.isTaskQueueTriggered(endpoint)) {
             const invoker = endpoint.taskQueueTrigger.invoker;
             if (invoker && !invoker.includes("private")) {
@@ -232,12 +239,17 @@ class Fabricator {
                     .catch(rethrowAs(endpoint, "set invoker"));
             }
         }
+        else if (backend.isCallableTriggered(endpoint)) {
+            await this.executor
+                .run(() => run.setInvokerCreate(endpoint.project, serviceName, ["public"]))
+                .catch(rethrowAs(endpoint, "set invoker"));
+        }
         else if (backend.isTaskQueueTriggered(endpoint)) {
             const invoker = endpoint.taskQueueTrigger.invoker;
             if (invoker && !invoker.includes("private")) {
                 await this.executor
                     .run(async () => {
-                    await gcf.setInvokerCreate(endpoint.project, backend.functionName(endpoint), invoker);
+                    await run.setInvokerCreate(endpoint.project, serviceName, invoker);
                 })
                     .catch(rethrowAs(endpoint, "set invoker"));
             }

package/lib/deploy/functions/release/index.js

@@ -15,7 +15,7 @@ const functionsConfig_1 = require("../../../functionsConfig");
 const functionsDeployHelper_1 = require("../functionsDeployHelper");
 const error_1 = require("../../../error");
 async function release(context, options, payload) {
-    if (!options.config.has("functions")) {
+    if (!context.config) {
         return;
     }
     const plan = planner.createDeploymentPlan(payload.functions.backend, await backend.existingBackend(context), { filters: context.filters });

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

@@ -1,23 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureFirebaseAlertsTriggerRegion = exports.obtainFirebaseAlertsBindings = exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE = void 0;
+exports.ensureFirebaseAlertsTriggerRegion = void 0;
 const error_1 = require("../../../error");
-exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE = "roles/iam.serviceAccountTokenCreator";
-function obtainFirebaseAlertsBindings(projectNumber, existingPolicy) {
-    const pubsubServiceAgent = `serviceAccount:service-${projectNumber}@gcp-sa-pubsub.iam.gserviceaccount.com`;
-    let pubsubBinding = existingPolicy.bindings.find((b) => b.role === exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE);
-    if (!pubsubBinding) {
-        pubsubBinding = {
-            role: exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE,
-            members: [],
-        };
-    }
-    if (!pubsubBinding.members.find((m) => m === pubsubServiceAgent)) {
-        pubsubBinding.members.push(pubsubServiceAgent);
-    }
-    return Promise.resolve([pubsubBinding]);
-}
-exports.obtainFirebaseAlertsBindings = obtainFirebaseAlertsBindings;
 function ensureFirebaseAlertsTriggerRegion(endpoint) {
     if (!endpoint.eventTrigger.region) {
         endpoint.eventTrigger.region = "global";

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

@@ -5,6 +5,7 @@ const backend = require("../backend");
 const storage_1 = require("./storage");
 const firebaseAlerts_1 = require("./firebaseAlerts");
 const noop = () => Promise.resolve();
+const noopProjectBindings = () => Promise.resolve([]);
 exports.NoOpService = {
     name: "noop",
     api: "",
@@ -26,7 +27,7 @@ exports.StorageService = {
 exports.FirebaseAlertsService = {
     name: "firebasealerts",
     api: "logging.googleapis.com",
-    requiredProjectBindings: firebaseAlerts_1.obtainFirebaseAlertsBindings,
+    requiredProjectBindings: noopProjectBindings,
     ensureTriggerRegion: firebaseAlerts_1.ensureFirebaseAlertsTriggerRegion,
 };
 exports.EVENT_SERVICE_MAPPING = {

package/lib/deploy/hosting/deploy.js

@@ -41,12 +41,22 @@ async function deploy(context, options) {
         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)}`);
+        let concurrency = 200;
+        const envConcurrency = (0, utils_1.envOverride)("FIREBASE_HOSTING_UPLOAD_CONCURRENCY", "");
+        if (envConcurrency) {
+            const c = parseInt(envConcurrency, 10);
+            if (!isNaN(c) && c > 0) {
+                concurrency = c;
+            }
+        }
+        logger_1.logger.debug(`[hosting] uploading with ${concurrency} concurrency`);
         const uploader = new uploader_1.Uploader({
             version: deploy.version,
             files: files,
             public: publicDir,
             cwd: options.cwd,
             projectRoot: (0, detectProjectRoot_1.detectProjectRoot)(options),
+            uploadConcurrency: concurrency,
         });
         const progressInterval = setInterval(() => updateSpinner(uploader.statusMessage(), debugging), debugging ? 2000 : 200);
         try {

package/lib/emulator/auth/apiSpec.js

@@ -5705,6 +5705,28 @@ exports.default = {
                 },
                 type: "object",
             },
+            GoogleCloudIdentitytoolkitAdminV2AllowByDefault: {
+                description: "Defines a policy of allowing every region by default and adding disallowed regions to a disallow list.",
+                properties: {
+                    disallowedRegions: {
+                        description: "Two letter unicode region codes to disallow as defined by https://cldr.unicode.org/ The full list of these region codes is here: https://github.com/unicode-cldr/cldr-localenames-full/blob/master/main/en/territories.json",
+                        items: { type: "string" },
+                        type: "array",
+                    },
+                },
+                type: "object",
+            },
+            GoogleCloudIdentitytoolkitAdminV2AllowlistOnly: {
+                description: "Defines a policy of only allowing regions by explicitly adding them to an allowlist.",
+                properties: {
+                    allowedRegions: {
+                        description: "Two letter unicode region codes to allow as defined by https://cldr.unicode.org/ The full list of these region codes is here: https://github.com/unicode-cldr/cldr-localenames-full/blob/master/main/en/territories.json",
+                        items: { type: "string" },
+                        type: "array",
+                    },
+                },
+                type: "object",
+            },
             GoogleCloudIdentitytoolkitAdminV2Anonymous: {
                 description: "Configuration options related to authenticating an anonymous user.",
                 properties: {
@@ -6315,6 +6337,18 @@ exports.default = {
                 },
                 type: "object",
             },
+            GoogleCloudIdentitytoolkitAdminV2SmsRegionConfig: {
+                description: "Configures the regions where users are allowed to send verification SMS for the project or tenant. This is based on the calling code of the destination phone number.",
+                properties: {
+                    allowByDefault: {
+                        $ref: "#/components/schemas/GoogleCloudIdentitytoolkitAdminV2AllowByDefault",
+                    },
+                    allowlistOnly: {
+                        $ref: "#/components/schemas/GoogleCloudIdentitytoolkitAdminV2AllowlistOnly",
+                    },
+                },
+                type: "object",
+            },
             GoogleCloudIdentitytoolkitAdminV2SmsTemplate: {
                 description: "The template to use when sending an SMS.",
                 properties: {
@@ -6424,6 +6458,9 @@ exports.default = {
                         readOnly: true,
                         type: "string",
                     },
+                    smsRegionConfig: {
+                        $ref: "#/components/schemas/GoogleCloudIdentitytoolkitAdminV2SmsRegionConfig",
+                    },
                     testPhoneNumbers: {
                         additionalProperties: { type: "string" },
                         description: "A map of pairs that can be used for MFA. The phone number should be in E.164 format (https://www.itu.int/rec/T-REC-E.164/) and a maximum of 10 pairs can be added (error will be thrown once exceeded).",

package/lib/emulator/commandUtils.js

@@ -10,7 +10,7 @@ const logger_1 = require("../logger");
 const path = require("path");
 const constants_1 = require("./constants");
 const requireAuth_1 = require("../requireAuth");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const types_1 = require("./types");
 const error_1 = require("../error");
 const registry_1 = require("./registry");
@@ -102,7 +102,7 @@ async function beforeEmulatorCommand(options) {
         options.config = DEFAULT_CONFIG;
     }
     else {
-        await requireConfig(options);
+        await (0, requireConfig_1.requireConfig)(options);
     }
 }
 exports.beforeEmulatorCommand = beforeEmulatorCommand;

package/lib/emulator/controller.js

@@ -38,6 +38,7 @@ const getDefaultDatabaseInstance_1 = require("../getDefaultDatabaseInstance");
 const auth_2 = require("../auth");
 const extensionsEmulator_1 = require("./extensionsEmulator");
 const previews_1 = require("../previews");
+const projectConfig_1 = require("../functions/projectConfig");
 const START_LOGGING_EMULATOR = utils.envOverride("START_LOGGING_EMULATOR", "false", (val) => val === "true");
 async function getAndCheckAddress(emulator, options) {
     var _a, _b, _c, _d;
@@ -140,7 +141,7 @@ function filterEmulatorTargets(options) {
 }
 exports.filterEmulatorTargets = filterEmulatorTargets;
 function shouldStart(options, name) {
-    var _a, _b, _c;
+    var _a, _b;
     if (name === types_1.Emulators.HUB) {
         return !!options.project;
     }
@@ -155,9 +156,15 @@ function shouldStart(options, name) {
         }
         return (!!options.project && targets.some((target) => types_1.EMULATORS_SUPPORTED_BY_UI.includes(target)));
     }
-    if (name === types_1.Emulators.FUNCTIONS && emulatorInTargets && !((_c = options.config.src.functions) === null || _c === void 0 ? void 0 : _c.source)) {
-        emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).logLabeled("WARN", "functions", `The functions emulator is configured but there is no functions source directory. Have you run ${clc.bold("firebase init functions")}?`);
-        return false;
+    if (name === types_1.Emulators.FUNCTIONS && emulatorInTargets) {
+        try {
+            (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions);
+            return true;
+        }
+        catch (err) {
+            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).logLabeled("WARN", "functions", `The functions emulator is configured but there is no functions source directory. Have you run ${clc.bold("firebase init functions")}?`);
+            return false;
+        }
     }
     if (name === types_1.Emulators.HOSTING && emulatorInTargets && !options.config.get("hosting")) {
         emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.HOSTING).logLabeled("WARN", "hosting", `The hosting emulator is configured but there is no hosting configuration. Have you run ${clc.bold("firebase init hosting")}?`);
@@ -253,16 +260,15 @@ async function startAll(options, showUI = true) {
     const emulatableBackends = [];
     const projectDir = (options.extDevDir || options.config.projectDir);
     if (shouldStart(options, types_1.Emulators.FUNCTIONS)) {
-        utils.assertDefined(options.config.src.functions);
-        utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
+        const functionsCfg = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions)[0];
         utils.assertIsStringOrUndefined(options.extDevDir);
-        const functionsDir = path.join(projectDir, options.config.src.functions.source);
+        const functionsDir = path.join(projectDir, functionsCfg.source);
         emulatableBackends.push({
             functionsDir,
             env: Object.assign({}, options.extDevEnv),
             secretEnv: [],
             predefinedTriggers: options.extDevTriggers,
-            nodeMajorVersion: (0, functionsEmulatorUtils_1.parseRuntimeVersion)(options.extDevNodeVersion || options.config.get("functions.runtime")),
+            nodeMajorVersion: (0, functionsEmulatorUtils_1.parseRuntimeVersion)(options.extDevNodeVersion || functionsCfg.runtime),
         });
     }
     if (shouldStart(options, types_1.Emulators.EXTENSIONS) && previews_1.previews.extensionsemulator) {

package/lib/emulator/downloadableEmulators.js

@@ -40,13 +40,13 @@ exports.DownloadDetails = {
         },
     },
     storage: {
-        downloadPath: path.join(CACHE_DIR, "cloud-storage-rules-runtime-v1.0.1.jar"),
-        version: "1.0.1",
+        downloadPath: path.join(CACHE_DIR, "cloud-storage-rules-runtime-v1.0.2.jar"),
+        version: "1.0.2",
         opts: {
             cacheDir: CACHE_DIR,
-            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-storage-rules-runtime-v1.0.1.jar",
-            expectedSize: 32729999,
-            expectedChecksum: "1a441f5e16c17aa7a27db71c9c9186d5",
+            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-storage-rules-runtime-v1.0.2.jar",
+            expectedSize: 35704306,
+            expectedChecksum: "0dd3e17939610fc3dbdf53fb24cfda86",
             namePrefix: "cloud-storage-rules-emulator",
         },
     },

package/lib/emulator/extensionsEmulator.js

@@ -65,6 +65,9 @@ class ExtensionsEmulator {
             "./functions/package.json",
             "./functions/node_modules",
         ];
+        if (!fs.existsSync(args.path)) {
+            return false;
+        }
         for (const requiredFile of requiredFiles) {
             const f = path.join(args.path, requiredFile);
             if (!fs.existsSync(f)) {

package/lib/emulator/functionsEmulator.js

@@ -289,7 +289,7 @@ class FunctionsEmulator {
         });
         for (const definition of toSetup) {
             try {
-                (0, validate_1.functionIdsAreValid)([definition]);
+                (0, validate_1.functionIdsAreValid)([Object.assign(Object.assign({}, definition), { id: definition.name })]);
             }
             catch (e) {
                 this.logger.logLabeled("WARN", `functions[${definition.id}]`, `Invalid function id: ${e.message}`);
@@ -488,26 +488,16 @@ class FunctionsEmulator {
         return def.eventTrigger ? `${def.id}-${this.triggerGeneration}` : def.id;
     }
     getBackendInfo() {
-        const cf3Triggers = Object.values(this.triggers)
-            .filter((t) => !t.backend.extensionInstanceId)
-            .map((t) => t.def);
+        const cf3Triggers = this.getCF3Triggers();
         return this.args.emulatableBackends.map((e) => {
-            var _a;
-            const envWithSecrets = Object.assign({}, e.env);
-            for (const s of e.secretEnv) {
-                envWithSecrets[s.key] = backend.secretVersionName(s);
-            }
-            return {
-                directory: e.functionsDir,
-                env: envWithSecrets,
-                extensionInstanceId: e.extensionInstanceId,
-                extension: e.extension,
-                extensionVersion: e.extensionVersion,
-                extensionSpec: e.extensionSpec,
-                functionTriggers: (_a = e.predefinedTriggers) !== null && _a !== void 0 ? _a : cf3Triggers,
-            };
+            return (0, functionsEmulatorShared_1.toBackendInfo)(e, cf3Triggers);
         });
     }
+    getCF3Triggers() {
+        return Object.values(this.triggers)
+            .filter((t) => !t.backend.extensionInstanceId)
+            .map((t) => t.def);
+    }
     addTriggerRecord(def, opts) {
         const key = this.getTriggerKey(def);
         this.triggers[key] = {