firebase-tools 10.3.1 → 10.4.0

package/lib/commands/deploy.js

@@ -6,7 +6,7 @@ const { checkServiceAccountIam } = require("../deploy/functions/checkIam");
 const checkValidTargetFilters = require("../checkValidTargetFilters");
 const { Command } = require("../command");
 const deploy = require("../deploy");
-const requireConfig = require("../requireConfig");
+const { requireConfig } = require("../requireConfig");
 const { filterTargets } = require("../filterTargets");
 const { requireHostingSite } = require("../requireHostingSite");
 const VALID_TARGETS = [

package/lib/commands/experimental-functions-shell.js

@@ -2,7 +2,7 @@
 var { Command } = require("../command");
 var { requirePermissions } = require("../requirePermissions");
 var { actionFunction } = require("../functionsShellCommandAction");
-var requireConfig = require("../requireConfig");
+var { requireConfig } = require("../requireConfig");
 module.exports = new Command("experimental:functions:shell")
     .description("launch full Node shell with emulated functions. (Alias for `firebase functions:shell.)")
     .option("-p, --port <port>", "the port on which to emulate functions (default: 5000)", 5000)

package/lib/commands/ext-configure.js

@@ -58,12 +58,13 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
             instanceId,
             reconfiguring: true,
         });
-        const newParamValues = Object.assign(Object.assign({}, oldParamValues), (0, paramHelper_1.getBaseParamBindings)(mutableParamsBindingOptions));
+        const newParamOptions = Object.assign(Object.assign({}, (0, paramHelper_1.buildBindingOptionsWithBaseValue)(oldParamValues)), mutableParamsBindingOptions);
         await manifest.writeToManifest([
             {
                 instanceId,
                 ref: targetRef,
-                params: newParamValues,
+                params: newParamOptions,
+                paramSpecs: extensionVersion.spec.params,
             },
         ], config, {
             nonInteractive: false,

package/lib/commands/ext-export.js

@@ -6,6 +6,7 @@ const planner = require("../deploy/extensions/planner");
 const export_1 = require("../extensions/export");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
 const manifest = require("../extensions/manifest");
+const paramHelper_1 = require("../extensions/paramHelper");
 const functional_1 = require("../functional");
 const getProjectNumber_1 = require("../getProjectNumber");
 const logger_1 = require("../logger");
@@ -41,8 +42,13 @@ module.exports = new command_1.Command("ext:export")
         logger_1.logger.info("Exiting. No changes made.");
         return;
     }
+    const manifestSpecs = withRef.map((spec) => ({
+        instanceId: spec.instanceId,
+        ref: spec.ref,
+        params: (0, paramHelper_1.buildBindingOptionsWithBaseValue)(spec.params),
+    }));
     const existingConfig = manifest.loadConfig(options);
-    await manifest.writeToManifest(withRef, existingConfig, {
+    await manifest.writeToManifest(manifestSpecs, existingConfig, {
         nonInteractive: options.nonInteractive,
         force: options.force,
     }, true);

package/lib/commands/ext-install.js

@@ -183,13 +183,13 @@ async function installToManifest(options) {
         paramsEnvPath,
         instanceId,
     });
-    const params = (0, paramHelper_1.getBaseParamBindings)(paramBindingOptions);
     const ref = refs.parse(extVersion.ref);
     await manifest.writeToManifest([
         {
             instanceId,
             ref,
-            params,
+            params: paramBindingOptions,
+            paramSpecs: spec.params,
         },
     ], config, { nonInteractive, force: force !== null && force !== void 0 ? force : false });
     manifest.showPreviewWarning();

package/lib/commands/ext-update.js

@@ -79,12 +79,12 @@ exports.default = new command_1.Command("ext:update <extensionInstanceId> [updat
             nonInteractive: options.nonInteractive,
             instanceId,
         });
-        const newParamBindings = paramHelper.getBaseParamBindings(newParamBindingOptions);
         await manifest.writeToManifest([
             {
                 instanceId,
                 ref: refs.parse(newExtensionVersion.ref),
-                params: newParamBindings,
+                params: newParamBindingOptions,
+                paramSpecs: newExtensionVersion.spec.params,
             },
         ], config, {
             nonInteractive: options.nonInteractive,

package/lib/commands/functions-config-export.js

@@ -12,7 +12,7 @@ const requirePermissions_1 = require("../requirePermissions");
 const utils_1 = require("../utils");
 const functional_1 = require("../functional");
 const configExport = require("../functions/runtimeConfigExport");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const REQUIRED_PERMISSIONS = [
     "runtimeconfig.configs.list",
     "runtimeconfig.configs.get",
@@ -76,7 +76,7 @@ exports.default = new command_1.Command("functions:config:export")
     "runtimeconfig.variables.list",
     "runtimeconfig.variables.get",
 ])
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requireInteractive_1.default)
     .action(async (options) => {
     let pInfos = configExport.getProjectInfos(options);

package/lib/commands/functions-shell.js

@@ -2,7 +2,7 @@
 var { Command } = require("../command");
 var { requirePermissions } = require("../requirePermissions");
 var { actionFunction } = require("../functionsShellCommandAction");
-var requireConfig = require("../requireConfig");
+var { requireConfig } = require("../requireConfig");
 var commandUtils = require("../emulator/commandUtils");
 module.exports = new Command("functions:shell")
     .description("launch full Node shell with emulated functions")

package/lib/commands/hosting-channel-create.js

@@ -10,7 +10,7 @@ const prompt_1 = require("../prompt");
 const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
 const logger_1 = require("../logger");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const { marked } = require("marked");
 const requireHostingSite_1 = require("../requireHostingSite");
 const LOG_TAG = "hosting:channel";
@@ -18,7 +18,7 @@ exports.default = new command_1.Command("hosting:channel:create [channelId]")
     .description("create a Firebase Hosting channel")
     .option("-e, --expires <duration>", "duration string (e.g. 12h or 30d) for channel expiration, max 30d")
     .option("--site <siteId>", "site for which to create the channel")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.update"])
     .before(requireHostingSite_1.requireHostingSite)
     .action(async (channelId, options) => {

package/lib/commands/hosting-channel-delete.js

@@ -9,13 +9,13 @@ const prompt_1 = require("../prompt");
 const requireHostingSite_1 = require("../requireHostingSite");
 const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const logger_1 = require("../logger");
 exports.default = new command_1.Command("hosting:channel:delete <channelId>")
     .description("delete a Firebase Hosting channel")
     .withForce()
     .option("--site <siteId>", "site in which the channel exists")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.update"])
     .before(requireHostingSite_1.requireHostingSite)
     .action(async (channelId, options) => {

package/lib/commands/hosting-channel-deploy.js

@@ -9,7 +9,7 @@ const requirePermissions_1 = require("../requirePermissions");
 const deploy = require("../deploy");
 const projectUtils_1 = require("../projectUtils");
 const logger_1 = require("../logger");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const expireUtils_1 = require("../hosting/expireUtils");
 const utils_1 = require("../utils");
 const { marked } = require("marked");
@@ -21,7 +21,7 @@ exports.default = new command_1.Command("hosting:channel:deploy [channelId]")
     .option("--only <target1,target2...>", "only create previews for specified targets")
     .option("--open", "open a browser to the channel after deploying")
     .option("--no-authorized-domains", "do not sync channel domains with Firebase Auth")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.update"])
     .before(requireHostingSite_1.requireHostingSite)
     .action(async (channelId, options) => {

package/lib/commands/hosting-channel-list.js

@@ -7,14 +7,14 @@ const command_1 = require("../command");
 const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
 const logger_1 = require("../logger");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils_1 = require("../utils");
 const requireHostingSite_1 = require("../requireHostingSite");
 const TABLE_HEAD = ["Channel ID", "Last Release Time", "URL", "Expire Time"];
 exports.default = new command_1.Command("hosting:channel:list")
     .description("list all Firebase Hosting channels for your project")
     .option("--site <siteName>", "list channels for the specified site")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.update"])
     .before(requireHostingSite_1.requireHostingSite)
     .action(async (options) => {

package/lib/commands/hosting-channel-open.js

@@ -8,7 +8,7 @@ const error_1 = require("../error");
 const api_1 = require("../hosting/api");
 const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const utils_1 = require("../utils");
 const prompt_1 = require("../prompt");
 const requireHostingSite_1 = require("../requireHostingSite");
@@ -16,7 +16,7 @@ exports.default = new command_1.Command("hosting:channel:open [channelId]")
     .description("opens the URL for a Firebase Hosting channel")
     .help("if unable to open the URL in a browser, it will be displayed in the output")
     .option("--site <siteId>", "the site to which the channel belongs")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.get"])
     .before(requireHostingSite_1.requireHostingSite)
     .action(async (channelId, options) => {

package/lib/commands/hosting-sites-delete.js

@@ -8,13 +8,13 @@ const prompt_1 = require("../prompt");
 const error_1 = require("../error");
 const requirePermissions_1 = require("../requirePermissions");
 const projectUtils_1 = require("../projectUtils");
-const requireConfig = require("../requireConfig");
+const requireConfig_1 = require("../requireConfig");
 const logger_1 = require("../logger");
 const LOG_TAG = "hosting:sites";
 exports.default = new command_1.Command("hosting:sites:delete <siteId>")
     .description("delete a Firebase Hosting site")
     .withForce()
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .before(requirePermissions_1.requirePermissions, ["firebasehosting.sites.delete"])
     .action(async (siteId, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);

package/lib/commands/serve.js

@@ -5,7 +5,7 @@ var { Command } = require("../command");
 const { logger } = require("../logger");
 var utils = require("../utils");
 var { requirePermissions } = require("../requirePermissions");
-var requireConfig = require("../requireConfig");
+var { requireConfig } = require("../requireConfig");
 var { serve } = require("../serve/index");
 var { filterTargets } = require("../filterTargets");
 var { needProjectNumber } = require("../projectUtils");

package/lib/commands/target-apply.js

@@ -3,12 +3,12 @@ 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");
 const error_1 = require("../error");
 exports.default = new command_1.Command("target:apply <type> <name> <resources...>")
     .description("apply a deploy target to a resource")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .action((type, name, resources, options) => {
     if (!options.project) {
         throw new error_1.FirebaseError(`Must have an active project to set deploy targets. Try ${clc.bold("firebase use --add")}`);

package/lib/commands/target-clear.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:clear <type> <target>")
     .description("clear all resources from a named resource target")
-    .before(requireConfig)
+    .before(requireConfig_1.requireConfig)
     .action((type, name, options) => {
     const existed = options.rc.clearTarget(options.project, type, name);
     if (existed) {

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

@@ -144,6 +144,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/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/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/functionsEmulatorShared.js

@@ -65,6 +65,10 @@ function emulatedFunctionsFromEndpoints(endpoints) {
         if (backend.isHttpsTriggered(endpoint)) {
             def.httpsTrigger = endpoint.httpsTrigger;
         }
+        else if (backend.isCallableTriggered(endpoint)) {
+            def.httpsTrigger = {};
+            def.labels = Object.assign(Object.assign({}, def.labels), { "deployment-callable": "true" });
+        }
         else if (backend.isEventTriggered(endpoint)) {
             const eventTrigger = endpoint.eventTrigger;
             if (endpoint.platform === "gcfv1") {

package/lib/emulator/storage/apis/firebase.js

@@ -52,8 +52,10 @@ function createFirebaseEndpoints(emulator) {
             next();
         });
     }
-    firebaseStorageAPI.use((req, res, next) => {
-        if (!emulator.rules) {
+    firebaseStorageAPI.use(/.*\/b\/(.+?)\/.*/, (req, res, next) => {
+        const bucketId = req.params[0];
+        storageLayer.createBucket(bucketId);
+        if (!emulator.rulesManager.getRuleset(bucketId)) {
             emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.STORAGE).log("WARN", "Permission denied because no Storage ruleset is currently loaded, check your rules for syntax errors.");
             return res.status(403).json({
                 error: {
@@ -64,10 +66,6 @@ function createFirebaseEndpoints(emulator) {
         }
         next();
     });
-    firebaseStorageAPI.use(/.*\/b\/(.+?)\/.*/, (req, res, next) => {
-        storageLayer.createBucket(req.params[0]);
-        next();
-    });
     firebaseStorageAPI.get("/b/:bucketId/o/:objectId", async (req, res) => {
         var _a;
         let metadata;

package/lib/emulator/storage/files.js

@@ -72,7 +72,7 @@ class StorageLayer {
         const hasValidDownloadToken = ((metadata === null || metadata === void 0 ? void 0 : metadata.downloadTokens) || []).includes((_a = request.downloadToken) !== null && _a !== void 0 ? _a : "");
         let authorized = skipAuth || hasValidDownloadToken;
         if (!authorized) {
-            authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), types_1.RulesetOperationMethod.GET, { before: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, request.authorization);
+            authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.GET, { before: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, request.authorization);
         }
         if (!authorized) {
             throw new errors_1.ForbiddenError("Failed auth");
@@ -102,7 +102,7 @@ class StorageLayer {
     async handleDeleteObject(request, skipAuth = false) {
         const storedMetadata = this.getMetadata(request.bucketId, request.decodedObjectId);
         const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), types_1.RulesetOperationMethod.DELETE, { before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource() }, request.authorization));
+            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.DELETE, { before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource() }, request.authorization));
         if (!authorized) {
             throw new errors_1.ForbiddenError();
         }
@@ -134,7 +134,7 @@ class StorageLayer {
     async handleUpdateObjectMetadata(request, skipAuth = false) {
         const storedMetadata = this.getMetadata(request.bucketId, request.decodedObjectId);
         const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), types_1.RulesetOperationMethod.UPDATE, {
+            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.UPDATE, {
                 before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(),
                 after: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(request.metadata),
             }, request.authorization));
@@ -163,7 +163,7 @@ class StorageLayer {
             customMetadata: upload.metadata.metadata,
         }, this._cloudFunctions, this._persistence.readBytes(upload.path, upload.size));
         const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", upload.bucketId, "o", upload.objectId].join("/"), types_1.RulesetOperationMethod.CREATE, { after: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, upload.authorization));
+            (await this._rulesValidator.validate(["b", upload.bucketId, "o", upload.objectId].join("/"), upload.bucketId, types_1.RulesetOperationMethod.CREATE, { after: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, upload.authorization));
         if (!authorized) {
             this._persistence.deleteFile(upload.path);
             throw new errors_1.ForbiddenError();
@@ -210,7 +210,7 @@ class StorageLayer {
     async handleListObjects(request, skipAuth = false) {
         var _a, _b, _c;
         const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.prefix].join("/"), types_1.RulesetOperationMethod.LIST, {}, request.authorization));
+            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.prefix].join("/"), request.bucketId, types_1.RulesetOperationMethod.LIST, {}, request.authorization));
         if (!authorized) {
             throw new errors_1.ForbiddenError();
         }

package/lib/emulator/storage/index.js

@@ -18,9 +18,9 @@ class StorageEmulator {
         this.args = args;
         this._logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.STORAGE);
         this._rulesRuntime = new runtime_1.StorageRulesRuntime();
-        this._rulesManager = new manager_1.StorageRulesManager(this._rulesRuntime);
+        this._rulesManager = (0, manager_1.createStorageRulesManager)(this.args.rules, this._rulesRuntime);
         this._persistence = new persistence_1.Persistence(this.getPersistenceTmpDir());
-        this._storageLayer = new files_1.StorageLayer(args.projectId, (0, utils_1.getRulesValidator)(() => this.rules), (0, utils_1.getAdminCredentialValidator)(), this._persistence);
+        this._storageLayer = new files_1.StorageLayer(args.projectId, (0, utils_1.getRulesValidator)((resource) => this._rulesManager.getRuleset(resource)), (0, utils_1.getAdminCredentialValidator)(), this._persistence);
         this._uploadService = new upload_1.UploadService(this._persistence);
     }
     get storageLayer() {
@@ -29,8 +29,8 @@ class StorageEmulator {
     get uploadService() {
         return this._uploadService;
     }
-    get rules() {
-        return this._rulesManager.ruleset;
+    get rulesManager() {
+        return this._rulesManager;
     }
     get logger() {
         return this._logger;
@@ -43,19 +43,16 @@ class StorageEmulator {
     async start() {
         const { host, port } = this.getInfo();
         await this._rulesRuntime.start(this.args.auto_download);
-        await this._rulesManager.setSourceFile(this.args.rules[0].rules);
+        await this._rulesManager.start();
         this._app = await (0, server_1.createApp)(this.args.projectId, this);
         const server = this._app.listen(port, host);
         this.destroyServer = utils.createDestroyer(server);
     }
     async connect() {
     }
-    async setRules(rules) {
-        return this._rulesManager.setSourceFile(rules);
-    }
     async stop() {
         await this._persistence.deleteAll();
-        await this._rulesManager.close();
+        await this._rulesManager.stop();
         return this.destroyServer ? this.destroyServer() : Promise.resolve();
     }
     getInfo() {

package/lib/emulator/storage/rules/config.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStorageRulesConfig = void 0;
 const error_1 = require("../../../error");
-function getAbsoluteRulesPath(rules, options) {
-    return options.config.path(rules);
+const fsutils_1 = require("../../../fsutils");
+function getSourceFile(rules, options) {
+    const path = options.config.path(rules);
+    return { name: path, content: (0, fsutils_1.readFile)(path) };
 }
 function getStorageRulesConfig(projectId, options) {
     const storageConfig = options.config.data.storage;
@@ -14,8 +16,7 @@ function getStorageRulesConfig(projectId, options) {
         if (!storageConfig.rules) {
             throw new error_1.FirebaseError("Cannot start the Storage emulator without rules file specified in firebase.json: run 'firebase init' and set up your Storage configuration");
         }
-        const resource = "default";
-        return [{ resource, rules: getAbsoluteRulesPath(storageConfig.rules, options) }];
+        return getSourceFile(storageConfig.rules, options);
     }
     const results = [];
     const { rc } = options;
@@ -25,7 +26,7 @@ function getStorageRulesConfig(projectId, options) {
         }
         rc.requireTarget(projectId, "storage", targetConfig.target);
         rc.target(projectId, "storage", targetConfig.target).forEach((resource) => {
-            results.push({ resource, rules: getAbsoluteRulesPath(targetConfig.rules, options) });
+            results.push({ resource, rules: getSourceFile(targetConfig.rules, options) });
         });
     }
     return results;

package/lib/emulator/storage/rules/manager.js

@@ -1,39 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StorageRulesManager = void 0;
+exports.createStorageRulesManager = void 0;
 const chokidar = require("chokidar");
-const fs = require("fs");
 const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
-const error_1 = require("../../../error");
-class StorageRulesManager {
-    constructor(_runtime) {
+const runtime_1 = require("./runtime");
+function createStorageRulesManager(rules, runtime) {
+    return Array.isArray(rules)
+        ? new ResourceBasedStorageRulesManager(rules, runtime)
+        : new DefaultStorageRulesManager(rules, runtime);
+}
+exports.createStorageRulesManager = createStorageRulesManager;
+class DefaultStorageRulesManager {
+    constructor(_rules, _runtime) {
         this._runtime = _runtime;
         this._watcher = new chokidar.FSWatcher();
         this._logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.STORAGE);
+        this._rules = _rules;
+    }
+    start() {
+        return this.updateSourceFile(this._rules);
     }
-    get ruleset() {
+    getRuleset() {
         return this._ruleset;
     }
-    async setSourceFile(rules) {
-        var _a;
-        const prevRulesFile = (_a = this._sourceFile) === null || _a === void 0 ? void 0 : _a.name;
-        let rulesFile;
-        if (typeof rules === "string") {
-            this._sourceFile = { name: rules, content: readSourceFile(rules) };
-            rulesFile = rules;
-        }
-        else {
-            this._sourceFile = rules;
-            rulesFile = rules.name;
-        }
+    async updateSourceFile(rules) {
+        const prevRulesFile = this._rules.name;
+        this._rules = rules;
         const issues = await this.loadRuleset();
-        this.updateWatcher(rulesFile, prevRulesFile);
+        this.updateWatcher(rules.name, prevRulesFile);
         return issues;
     }
-    async close() {
-        delete this._sourceFile;
-        delete this._ruleset;
+    async stop() {
         await this._watcher.close();
     }
     updateWatcher(rulesFile, prevRulesFile) {
@@ -49,12 +47,11 @@ class StorageRulesManager {
         });
     }
     async loadRuleset() {
-        const { ruleset, issues } = await this._runtime.loadRuleset({ files: [this._sourceFile] });
+        const { ruleset, issues } = await this._runtime.loadRuleset({ files: [this._rules] });
         if (ruleset) {
             this._ruleset = ruleset;
             return issues;
         }
-        delete this._ruleset;
         issues.all.forEach((issue) => {
             try {
                 const parsedIssue = JSON.parse(issue);
@@ -67,15 +64,35 @@ class StorageRulesManager {
         return issues;
     }
 }
-exports.StorageRulesManager = StorageRulesManager;
-function readSourceFile(fileName) {
-    try {
-        return fs.readFileSync(fileName).toString();
+class ResourceBasedStorageRulesManager {
+    constructor(_rulesConfig, _runtime) {
+        this._runtime = _runtime;
+        this._rulesManagers = new Map();
+        for (const { resource, rules } of _rulesConfig) {
+            this.createRulesManager(resource, rules);
+        }
     }
-    catch (error) {
-        if (error.code === "ENOENT") {
-            throw new error_1.FirebaseError(`File not found: ${fileName}`);
+    async start() {
+        const allIssues = new runtime_1.StorageRulesIssues();
+        for (const rulesManager of this._rulesManagers.values()) {
+            allIssues.extend(await rulesManager.start());
         }
-        throw error;
+        return allIssues;
+    }
+    getRuleset(resource) {
+        var _a;
+        return (_a = this._rulesManagers.get(resource)) === null || _a === void 0 ? void 0 : _a.getRuleset();
+    }
+    updateSourceFile(rules, resource) {
+        const rulesManager = this._rulesManagers.get(resource) || this.createRulesManager(resource, rules);
+        return rulesManager.updateSourceFile(rules);
+    }
+    async stop() {
+        await Promise.all(Array.from(this._rulesManagers.values(), async (rulesManager) => await rulesManager.stop()));
+    }
+    createRulesManager(resource, rules) {
+        const rulesManager = new DefaultStorageRulesManager(rules, this._runtime);
+        this._rulesManagers.set(resource, rulesManager);
+        return rulesManager;
     }
 }

package/lib/emulator/storage/rules/runtime.js

@@ -49,6 +49,10 @@ class StorageRulesIssues {
     exist() {
         return !!(this.errors.length || this.warnings.length);
     }
+    extend(other) {
+        this.errors.push(...other.errors);
+        this.warnings.push(...other.warnings);
+    }
 }
 exports.StorageRulesIssues = StorageRulesIssues;
 class StorageRulesRuntime {

package/lib/emulator/storage/rules/utils.js

@@ -5,9 +5,9 @@ const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
 function getRulesValidator(rulesetProvider) {
     return {
-        validate: async (path, method, variableOverrides, authorization) => {
+        validate: async (path, bucketId, method, variableOverrides, authorization) => {
             return await isPermitted({
-                ruleset: rulesetProvider(),
+                ruleset: rulesetProvider(bucketId),
                 file: variableOverrides,
                 path,
                 method,

package/lib/emulator/storage/server.js

@@ -58,7 +58,7 @@ function createApp(defaultProjectId, emulator) {
         }
         const name = file.name;
         const content = file.content;
-        const issues = await emulator.setRules({ name, content });
+        const issues = await emulator.rulesManager.updateSourceFile({ name, content }, req.params.bucketId);
         if (issues.errors.length > 0) {
             res.status(400).json({
                 message: "There was an error updating rules, see logs for more details",

package/lib/extensions/askUserForParam.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInquirerDefault = exports.promptCreateSecret = exports.askForParam = exports.ask = exports.checkResponse = void 0;
+exports.getInquirerDefault = exports.promptCreateSecret = exports.askForParam = exports.ask = exports.checkResponse = exports.SecretLocation = void 0;
 const _ = require("lodash");
 const clc = require("cli-color");
 const { marked } = require("marked");
@@ -12,10 +12,15 @@ const utils_1 = require("./utils");
 const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
+var SecretLocation;
+(function (SecretLocation) {
+    SecretLocation[SecretLocation["CLOUD"] = 1] = "CLOUD";
+    SecretLocation[SecretLocation["LOCAL"] = 2] = "LOCAL";
+})(SecretLocation = exports.SecretLocation || (exports.SecretLocation = {}));
 var SecretUpdateAction;
 (function (SecretUpdateAction) {
-    SecretUpdateAction[SecretUpdateAction["LEAVE"] = 0] = "LEAVE";
-    SecretUpdateAction[SecretUpdateAction["SET_NEW"] = 1] = "SET_NEW";
+    SecretUpdateAction[SecretUpdateAction["LEAVE"] = 1] = "LEAVE";
+    SecretUpdateAction[SecretUpdateAction["SET_NEW"] = 2] = "SET_NEW";
 })(SecretUpdateAction || (SecretUpdateAction = {}));
 function checkResponse(response, spec) {
     let valid = true;
@@ -82,6 +87,8 @@ async function askForParam(args) {
     const paramSpec = args.paramSpec;
     let valid = false;
     let response = "";
+    let responseForLocal;
+    let secretLocations = [];
     const description = paramSpec.description || "";
     const label = paramSpec.label.trim();
     logger_1.logger.info(`\n${clc.bold(label)}${clc.bold(paramSpec.required ? "" : " (Optional)")}: ${marked(description).trim()}`);
@@ -116,16 +123,23 @@ async function askForParam(args) {
                         }
                     },
                     message: "Which options do you want enabled for this parameter? " +
-                        "Press Space to select, then Enter to confirm your choices. " +
-                        "You may select multiple options.",
+                        "Press Space to select, then Enter to confirm your choices. ",
                     choices: (0, utils_1.convertExtensionOptionToLabeledList)(paramSpec.options),
                 });
                 valid = checkResponse(response, paramSpec);
                 break;
             case extensionsApi_1.ParamType.SECRET:
-                response = args.reconfiguring
-                    ? await promptReconfigureSecret(args.projectId, args.instanceId, paramSpec)
-                    : await promptCreateSecret(args.projectId, args.instanceId, paramSpec);
+                while (!secretLocations.length) {
+                    secretLocations = await promptSecretLocations();
+                }
+                if (secretLocations.includes(SecretLocation.CLOUD.toString())) {
+                    response = args.reconfiguring
+                        ? await promptReconfigureSecret(args.projectId, args.instanceId, paramSpec)
+                        : await promptCreateSecret(args.projectId, args.instanceId, paramSpec);
+                }
+                if (secretLocations.includes(SecretLocation.LOCAL.toString())) {
+                    responseForLocal = await promptLocalSecret(args.instanceId, paramSpec);
+                }
                 valid = true;
                 break;
             default:
@@ -138,9 +152,38 @@ async function askForParam(args) {
                 valid = checkResponse(response, paramSpec);
         }
     }
-    return { baseValue: response };
+    return Object.assign({ baseValue: response }, (responseForLocal ? { local: responseForLocal } : {}));
 }
 exports.askForParam = askForParam;
+async function promptSecretLocations() {
+    return await (0, prompt_1.promptOnce)({
+        name: "input",
+        type: "checkbox",
+        message: "Where would you like to store your secrets? You must select at least one value",
+        choices: [
+            {
+                checked: true,
+                name: "Google Cloud Secret Manager",
+                value: SecretLocation.CLOUD.toString(),
+            },
+            {
+                checked: false,
+                name: "Local file (Only used by Firebase Emulator)",
+                value: SecretLocation.LOCAL.toString(),
+            },
+        ],
+    });
+}
+async function promptLocalSecret(instanceId, paramSpec) {
+    utils.logLabeledBullet(extensionsHelper_1.logPrefix, "Configure a local secret value for Extensions Emulator");
+    const value = await (0, prompt_1.promptOnce)({
+        name: paramSpec.param,
+        type: "input",
+        message: `This secret will be stored in ./extensions/${instanceId}.secret.local.\n` +
+            `Enter value for "${paramSpec.label.trim()}" to be used by Extensions Emulator:`,
+    });
+    return value;
+}
 async function promptReconfigureSecret(projectId, instanceId, paramSpec) {
     const action = await (0, prompt_1.promptOnce)({
         type: "list",

package/lib/extensions/manifest.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.showPreviewWarning = exports.showDeprecationWarning = exports.readInstanceParam = exports.getInstanceRef = exports.instanceExists = exports.loadConfig = exports.removeFromManifest = exports.writeToManifest = exports.ENV_DIRECTORY = void 0;
+exports.showPreviewWarning = exports.showDeprecationWarning = exports.readInstanceParam = exports.getInstanceRef = exports.instanceExists = exports.loadConfig = exports.removeFromManifest = exports.writeLocalSecrets = exports.writeToManifest = exports.ENV_DIRECTORY = void 0;
 const clc = require("cli-color");
 const path = require("path");
 const refs = require("./refs");
@@ -11,6 +11,7 @@ const paramHelper_1 = require("./paramHelper");
 const error_1 = require("../error");
 const utils = require("../utils");
 const extensionsHelper_1 = require("./extensionsHelper");
+const extensionsApi_1 = require("./extensionsApi");
 exports.ENV_DIRECTORY = "extensions";
 async function writeToManifest(specs, config, options, allowOverwrite = false) {
     if (config.has("extensions") &&
@@ -36,8 +37,33 @@ async function writeToManifest(specs, config, options, allowOverwrite = false) {
     }
     writeExtensionsToFirebaseJson(specs, config);
     await writeEnvFiles(specs, config, options.force);
+    await writeLocalSecrets(specs, config, options.force);
 }
 exports.writeToManifest = writeToManifest;
+async function writeLocalSecrets(specs, config, force) {
+    for (const spec of specs) {
+        if (!spec.paramSpecs) {
+            continue;
+        }
+        const writeBuffer = {};
+        const locallyOverridenSecretParams = spec.paramSpecs.filter((p) => p.type === extensionsApi_1.ParamType.SECRET && spec.params[p.param].local);
+        for (const paramSpec of locallyOverridenSecretParams) {
+            const key = paramSpec.param;
+            const localValue = spec.params[key].local;
+            writeBuffer[key] = localValue;
+        }
+        const content = Object.entries(writeBuffer)
+            .sort((a, b) => {
+            return a[0].localeCompare(b[0]);
+        })
+            .map((r) => `${r[0]}=${r[1]}`)
+            .join("\n");
+        if (content) {
+            await config.askWriteProjectFile(`extensions/${spec.instanceId}.secret.local`, content, force);
+        }
+    }
+}
+exports.writeLocalSecrets = writeLocalSecrets;
 function removeFromManifest(instanceId, config) {
     if (!instanceExists(instanceId, config)) {
         throw new error_1.FirebaseError(`Extension instance ${instanceId} not found in firebase.json.`);
@@ -49,8 +75,14 @@ function removeFromManifest(instanceId, config) {
     logger_1.logger.info(`Removed extension instance ${instanceId} from firebase.json`);
     config.deleteProjectFile(`extensions/${instanceId}.env`);
     logger_1.logger.info(`Removed extension instance environment config extensions/${instanceId}.env`);
-    config.deleteProjectFile(`extensions/${instanceId}.env.local`);
-    logger_1.logger.info(`Removed extension instance environment config extensions/${instanceId}.env.local`);
+    if (config.projectFileExists(`extensions/${instanceId}.env.local`)) {
+        config.deleteProjectFile(`extensions/${instanceId}.env.local`);
+        logger_1.logger.info(`Removed extension instance local environment config extensions/${instanceId}.env.local`);
+    }
+    if (config.projectFileExists(`extensions/${instanceId}.secret.local`)) {
+        config.deleteProjectFile(`extensions/${instanceId}.secret.local`);
+        logger_1.logger.info(`Removed extension instance local secret config extensions/${instanceId}.secret.local`);
+    }
 }
 exports.removeFromManifest = removeFromManifest;
 function loadConfig(options) {
@@ -88,7 +120,7 @@ async function writeEnvFiles(specs, config, force) {
             .sort((a, b) => {
             return a[0].localeCompare(b[0]);
         })
-            .map((r) => `${r[0]}=${r[1]}`)
+            .map((r) => `${r[0]}=${r[1].baseValue}`)
             .join("\n");
         await config.askWriteProjectFile(`extensions/${spec.instanceId}.env`, content, force);
     }

package/lib/extensions/paramHelper.js

@@ -104,6 +104,7 @@ async function getParamsForUpdate(args) {
 }
 exports.getParamsForUpdate = getParamsForUpdate;
 async function promptForNewParams(args) {
+    const newParamBindingOptions = buildBindingOptionsWithBaseValue(args.currentParams);
     const firebaseProjectParams = await (0, extensionsHelper_1.getFirebaseProjectParams)(args.projectId);
     const comparer = (param1, param2) => {
         return param1.type === param2.type && param1.param === param2.param;
@@ -117,7 +118,7 @@ async function promptForNewParams(args) {
         logger_1.logger.info("The following params will no longer be used:");
         paramsDiffDeletions.forEach((param) => {
             logger_1.logger.info(clc.red(`- ${param.param}: ${args.currentParams[param.param.toUpperCase()]}`));
-            delete args.currentParams[param.param.toUpperCase()];
+            delete newParamBindingOptions[param.param.toUpperCase()];
         });
     }
     if (paramsDiffAdditions.length) {
@@ -129,10 +130,10 @@ async function promptForNewParams(args) {
                 paramSpec: param,
                 reconfiguring: false,
             });
-            args.currentParams[param.param] = chosenValue.baseValue;
+            newParamBindingOptions[param.param] = chosenValue;
         }
     }
-    return buildBindingOptionsWithBaseValue(args.currentParams);
+    return newParamBindingOptions;
 }
 exports.promptForNewParams = promptForNewParams;
 function getParamsFromFile(args) {

package/lib/fsutils.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dirExistsSync = exports.fileExistsSync = void 0;
+exports.readFile = exports.dirExistsSync = exports.fileExistsSync = void 0;
 const fs_1 = require("fs");
+const error_1 = require("./error");
 function fileExistsSync(path) {
     try {
         return (0, fs_1.statSync)(path).isFile();
@@ -20,3 +21,15 @@ function dirExistsSync(path) {
     }
 }
 exports.dirExistsSync = dirExistsSync;
+function readFile(path) {
+    try {
+        return (0, fs_1.readFileSync)(path).toString();
+    }
+    catch (e) {
+        if (e.code === "ENOENT") {
+            throw new error_1.FirebaseError(`File not found: ${path}`);
+        }
+        throw e;
+    }
+}
+exports.readFile = readFile;

package/lib/requireConfig.js

@@ -1,11 +1,13 @@
 "use strict";
-var { FirebaseError } = require("./error");
-module.exports = function (options) {
-    if (options.config) {
-        return Promise.resolve();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireConfig = void 0;
+const error_1 = require("./error");
+async function requireConfig(options) {
+    await Promise.resolve();
+    if (!options.config) {
+        throw options.configError
+            ? options.configError
+            : new error_1.FirebaseError("Not in a Firebase project directory (could not locate firebase.json)");
     }
-    return Promise.reject(options.configError ||
-        new FirebaseError("Not in a Firebase project directory (could not locate firebase.json)", {
-            exit: 1,
-        }));
-};
+}
+exports.requireConfig = requireConfig;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "10.3.1",
+  "version": "10.4.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "10.3.1",
+      "version": "10.4.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^2.18.4",

package/package.json

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

package/lib/prepareUpload.js

@@ -1,44 +0,0 @@
-"use strict";
-var fs = require("fs");
-var path = require("path");
-var tar = require("tar");
-var tmp = require("tmp");
-var { listFiles } = require("./listFiles");
-var { FirebaseError } = require("./error");
-var fsutils = require("./fsutils");
-module.exports = function (options) {
-    var hostingConfig = options.config.get("hosting");
-    var publicDir = options.config.path(hostingConfig.public);
-    var indexPath = path.join(publicDir, "index.html");
-    var tmpFile = tmp.fileSync({
-        prefix: "firebase-upload-",
-        postfix: ".tar.gz",
-    });
-    var manifest = listFiles(publicDir, hostingConfig.ignore);
-    return tar
-        .c({
-        gzip: true,
-        file: tmpFile.name,
-        cwd: publicDir,
-        prefix: "public",
-        follow: true,
-        noDirRecurse: true,
-        portable: true,
-    }, manifest.slice(0))
-        .then(function () {
-        var stats = fs.statSync(tmpFile.name);
-        return {
-            file: tmpFile.name,
-            stream: fs.createReadStream(tmpFile.name),
-            manifest: manifest,
-            foundIndex: fsutils.fileExistsSync(indexPath),
-            size: stats.size,
-        };
-    })
-        .catch(function (err) {
-        return Promise.reject(new FirebaseError("There was an issue preparing Hosting files for upload.", {
-            original: err,
-            exit: 2,
-        }));
-    });
-};