firebase-tools 11.5.0 → 11.8.0

package/lib/command.js

@@ -70,22 +70,39 @@ class Command {
         this.positionalArgs = cmd._args;
         cmd.action((...args) => {
             const runner = this.runner();
-            const start = new Date().getTime();
+            const start = process.uptime();
             const options = (0, lodash_1.last)(args);
             if (args.length - 1 > cmd._args.length) {
                 client.errorOut(new error_1.FirebaseError(`Too many arguments. Run ${clc.bold("firebase help " + this.name)} for usage instructions`, { exit: 1 }));
                 return;
             }
+            const isEmulator = this.name.includes("emulator") || this.name === "serve";
+            if (isEmulator) {
+                void (0, track_1.trackEmulator)("command_start", { command_name: this.name });
+            }
             runner(...args)
-                .then((result) => {
+                .then(async (result) => {
                 if ((0, utils_1.getInheritedOption)(options, "json")) {
                     console.log(JSON.stringify({
                         status: "success",
                         result: result,
                     }, null, 2));
                 }
-                const duration = new Date().getTime() - start;
-                void (0, track_1.track)(this.name, "success", duration).then(() => process.exit());
+                const duration = Math.floor((process.uptime() - start) * 1000);
+                const trackSuccess = (0, track_1.track)(this.name, "success", duration);
+                if (!isEmulator) {
+                    await (0, utils_1.withTimeout)(5000, trackSuccess);
+                }
+                else {
+                    await (0, utils_1.withTimeout)(5000, Promise.all([
+                        trackSuccess,
+                        (0, track_1.trackEmulator)("command_success", {
+                            command_name: this.name,
+                            duration,
+                        }),
+                    ]));
+                }
+                process.exit();
             })
                 .catch(async (err) => {
                 if ((0, utils_1.getInheritedOption)(options, "json")) {
@@ -94,9 +111,18 @@ class Command {
                         error: err.message,
                     }, null, 2));
                 }
-                const duration = Date.now() - start;
-                const errorEvent = err.exit === 1 ? "Error (User)" : "Error (Unexpected)";
-                await Promise.all([(0, track_1.track)(this.name, "error", duration), (0, track_1.track)(errorEvent, "", duration)]);
+                const duration = Math.floor((process.uptime() - start) * 1000);
+                await (0, utils_1.withTimeout)(5000, Promise.all([
+                    (0, track_1.track)(this.name, "error", duration),
+                    (0, track_1.track)(err.exit === 1 ? "Error (User)" : "Error (Unexpected)", "", duration),
+                    isEmulator
+                        ? (0, track_1.trackEmulator)("command_error", {
+                            command_name: this.name,
+                            duration,
+                            error_type: err.exit === 1 ? "user" : "unexpected",
+                        })
+                        : Promise.resolve(),
+                ]));
                 client.errorOut(err);
             });
         });

package/lib/commands/crashlytics-mappingfile-generateid.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const command_1 = require("../command");
+const utils = require("../utils");
+const buildToolsJarHelper_1 = require("../crashlytics/buildToolsJarHelper");
+const error_1 = require("../error");
+exports.command = new command_1.Command("crashlytics:mappingfile:generateid")
+    .description("generate a mapping file id and write it to an Android resource file, which will be built into the app")
+    .option("--resource-file <resourceFile>", "path to the Android resource XML file that will be created or updated.")
+    .action(async (options) => {
+    const debug = !!options.debug;
+    const resourceFilePath = options.resourceFile;
+    if (!resourceFilePath) {
+        throw new error_1.FirebaseError("set --resource-file <resourceFile> to an Android resource file path, e.g. app/src/main/res/values/crashlytics.xml");
+    }
+    const jarFile = await (0, buildToolsJarHelper_1.fetchBuildtoolsJar)();
+    const jarOptions = { resourceFilePath };
+    utils.logBullet(`Updating resource file: ${resourceFilePath}`);
+    const generateIdArgs = buildArgs(jarOptions);
+    (0, buildToolsJarHelper_1.runBuildtoolsCommand)(jarFile, generateIdArgs, debug);
+    utils.logBullet("Successfully updated mapping file id");
+});
+function buildArgs(options) {
+    return ["-injectMappingFileIdIntoResource", options.resourceFilePath, "-verbose"];
+}

package/lib/commands/crashlytics-mappingfile-upload.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const command_1 = require("../command");
+const error_1 = require("../error");
+const utils = require("../utils");
+const buildToolsJarHelper_1 = require("../crashlytics/buildToolsJarHelper");
+exports.command = new command_1.Command("crashlytics:mappingfile:upload <mappingFile>")
+    .description("upload a ProGuard/R8-compatible mapping file to deobfuscate stack traces")
+    .option("--app <appID>", "the app id of your Firebase app")
+    .option("--resource-file <resourceFile>", "path to the Android resource XML file that includes the mapping file id")
+    .action(async (mappingFile, options) => {
+    const app = getGoogleAppID(options);
+    const debug = !!options.debug;
+    if (!mappingFile) {
+        throw new error_1.FirebaseError("set `--mapping-file <mappingFile>` to a valid mapping file path, e.g. app/build/outputs/mapping.txt");
+    }
+    const mappingFilePath = mappingFile;
+    const resourceFilePath = options.resourceFile;
+    if (!resourceFilePath) {
+        throw new error_1.FirebaseError("set --resource-file <resourceFile> to a valid Android resource file path, e.g. app/main/res/values/strings.xml");
+    }
+    const jarFile = await (0, buildToolsJarHelper_1.fetchBuildtoolsJar)();
+    const jarOptions = { app, mappingFilePath, resourceFilePath };
+    utils.logBullet(`Uploading mapping file: ${mappingFilePath}`);
+    const uploadArgs = buildArgs(jarOptions);
+    (0, buildToolsJarHelper_1.runBuildtoolsCommand)(jarFile, uploadArgs, debug);
+    utils.logBullet("Successfully uploaded mapping file");
+});
+function getGoogleAppID(options) {
+    if (!options.app) {
+        throw new error_1.FirebaseError("set --app <appId> to a valid Firebase application id, e.g. 1:00000000:android:0000000");
+    }
+    return options.app;
+}
+function buildArgs(options) {
+    return [
+        "-uploadMappingFile",
+        options.mappingFilePath,
+        "-resourceFile",
+        options.resourceFilePath,
+        "-googleAppId",
+        options.app,
+        "-verbose",
+    ];
+}

package/lib/commands/crashlytics-symbols-upload.js

@@ -1,44 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const fs = require("fs-extra");
 const os = require("os");
 const path = require("path");
-const spawn = require("cross-spawn");
 const uuid = require("uuid");
 const command_1 = require("../command");
-const downloadUtils = require("../downloadUtils");
 const error_1 = require("../error");
-const logger_1 = require("../logger");
-const rimraf = require("rimraf");
 const utils = require("../utils");
+const buildToolsJarHelper_1 = require("../crashlytics/buildToolsJarHelper");
 var SymbolGenerator;
 (function (SymbolGenerator) {
     SymbolGenerator["breakpad"] = "breakpad";
     SymbolGenerator["csym"] = "csym";
 })(SymbolGenerator || (SymbolGenerator = {}));
 const SYMBOL_CACHE_ROOT_DIR = process.env.FIREBASE_CRASHLYTICS_CACHE_PATH || os.tmpdir();
-const JAR_CACHE_DIR = process.env.FIREBASE_CRASHLYTICS_BUILDTOOLS_PATH ||
-    path.join(os.homedir(), ".cache", "firebase", "crashlytics", "buildtools");
-const JAR_VERSION = "2.8.0";
-const JAR_URL = `https://dl.google.com/android/maven2/com/google/firebase/firebase-crashlytics-buildtools/${JAR_VERSION}/firebase-crashlytics-buildtools-${JAR_VERSION}.jar`;
 exports.command = new command_1.Command("crashlytics:symbols:upload <symbolFiles...>")
-    .description("Upload symbols for native code, to symbolicate stack traces.")
+    .description("upload symbols for native code, to symbolicate stack traces")
     .option("--app <appID>", "the app id of your Firebase app")
-    .option("--generator [breakpad|csym]", "the symbol generator being used, defaults to breakpad.")
+    .option("--generator [breakpad|csym]", "the symbol generator being used, default is breakpad")
     .option("--dry-run", "generate symbols without uploading them")
-    .option("--debug", "print debug output and logging from the underlying uploader tool")
     .action(async (symbolFiles, options) => {
-    const app = getGoogleAppID(options) || "";
+    const app = getGoogleAppID(options);
     const generator = getSymbolGenerator(options);
     const dryRun = !!options.dryRun;
     const debug = !!options.debug;
-    let jarFile = await downloadBuiltoolsJar();
-    if (process.env.LOCAL_JAR) {
-        jarFile = process.env.LOCAL_JAR;
-    }
+    const jarFile = await (0, buildToolsJarHelper_1.fetchBuildtoolsJar)();
     const jarOptions = {
-        jarFile,
         app,
         generator,
         cachePath: path.join(SYMBOL_CACHE_ROOT_DIR, `crashlytics-${uuid.v4()}`, "nativeSymbols", app.replace(/:/g, "-"), generator),
@@ -48,32 +35,22 @@ exports.command = new command_1.Command("crashlytics:symbols:upload <symbolFiles
     for (const symbolFile of symbolFiles) {
         utils.logBullet(`Generating symbols for ${symbolFile}`);
         const generateArgs = buildArgs(Object.assign(Object.assign({}, jarOptions), { symbolFile }));
-        const output = runJar(generateArgs, debug);
-        if (output.length > 0) {
-            utils.logBullet(output);
-        }
-        else {
-            utils.logBullet(`Generated symbols for ${symbolFile}`);
-            utils.logBullet(`Output Path: ${jarOptions.cachePath}`);
-        }
+        (0, buildToolsJarHelper_1.runBuildtoolsCommand)(jarFile, generateArgs, debug);
+        utils.logBullet(`Generated symbols for ${symbolFile}`);
+        utils.logBullet(`Output Path: ${jarOptions.cachePath}`);
     }
     if (dryRun) {
         utils.logBullet("Skipping upload because --dry-run was passed");
         return;
     }
-    utils.logBullet(`Uploading all generated symbols`);
+    utils.logBullet(`Uploading all generated symbols...`);
     const uploadArgs = buildArgs(Object.assign(Object.assign({}, jarOptions), { generate: false }));
-    const output = runJar(uploadArgs, debug);
-    if (output.length > 0) {
-        utils.logBullet(output);
-    }
-    else {
-        utils.logBullet("Successfully uploaded all symbols");
-    }
+    (0, buildToolsJarHelper_1.runBuildtoolsCommand)(jarFile, uploadArgs, debug);
+    utils.logBullet("Successfully uploaded all symbols");
 });
 function getGoogleAppID(options) {
     if (!options.app) {
-        throw new error_1.FirebaseError("set the --app option to a valid Firebase app id and try again");
+        throw new error_1.FirebaseError("set --app <appId> to a valid Firebase application id, e.g. 1:00000000:android:0000000");
     }
     return options.app;
 }
@@ -86,62 +63,16 @@ function getSymbolGenerator(options) {
     }
     return options.generator;
 }
-async function downloadBuiltoolsJar() {
-    const jarPath = path.join(JAR_CACHE_DIR, `crashlytics-buildtools-${JAR_VERSION}.jar`);
-    if (fs.existsSync(jarPath)) {
-        logger_1.logger.debug(`Buildtools Jar already downloaded at ${jarPath}`);
-        return jarPath;
-    }
-    if (fs.existsSync(JAR_CACHE_DIR)) {
-        logger_1.logger.debug(`Deleting Jar cache at ${JAR_CACHE_DIR} because the CLI was run with a newer Jar version`);
-        rimraf.sync(JAR_CACHE_DIR);
-    }
-    utils.logBullet("Downloading buildtools.jar to " + jarPath);
-    utils.logBullet("For open source licenses used by this command, look in the META-INF directory in the buildtools.jar file");
-    const tmpfile = await downloadUtils.downloadToTmp(JAR_URL);
-    fs.mkdirSync(JAR_CACHE_DIR, { recursive: true });
-    fs.copySync(tmpfile, jarPath);
-    return jarPath;
-}
 function buildArgs(options) {
     const baseArgs = [
-        "-jar",
-        options.jarFile,
-        `-symbolGenerator=${options.generator}`,
-        `-symbolFileCacheDir=${options.cachePath}`,
+        "-symbolGenerator",
+        options.generator,
+        "-symbolFileCacheDir",
+        options.cachePath,
         "-verbose",
     ];
     if (options.generate) {
-        return baseArgs.concat(["-generateNativeSymbols", `-unstrippedLibrary=${options.symbolFile}`]);
-    }
-    return baseArgs.concat([
-        "-uploadNativeSymbols",
-        `-googleAppId=${options.app}`,
-    ]);
-}
-function runJar(args, debug) {
-    var _a, _b, _c;
-    const outputs = spawn.sync("java", args, {
-        stdio: debug ? "inherit" : "pipe",
-    });
-    if (outputs.status || 0 > 0) {
-        if (!debug) {
-            utils.logWarning(((_a = outputs.stdout) === null || _a === void 0 ? void 0 : _a.toString()) || "An unknown error occurred");
-        }
-        throw new error_1.FirebaseError("Failed to upload symbols");
-    }
-    if (!debug) {
-        let logRegex = /(Generated symbol file.*$)/m;
-        let matched = (((_b = outputs.stdout) === null || _b === void 0 ? void 0 : _b.toString()) || "").match(logRegex);
-        if (matched) {
-            return matched[1];
-        }
-        logRegex = /(Crashlytics symbol file uploaded successfully.*$)/m;
-        matched = (((_c = outputs.stdout) === null || _c === void 0 ? void 0 : _c.toString()) || "").match(logRegex);
-        if (matched) {
-            return matched[1];
-        }
-        return "";
+        return baseArgs.concat(["-generateNativeSymbols", "-unstrippedLibrary", options.symbolFile]);
     }
-    return "";
+    return baseArgs.concat(["-uploadNativeSymbols", "-googleAppId", options.app]);
 }

package/lib/commands/emulators-exec.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
 const commandUtils = require("../emulator/commandUtils");
+const commandUtils_1 = require("../emulator/commandUtils");
 exports.command = new command_1.Command("emulators:exec <script>")
     .before(commandUtils.setExportOnExitOptions)
     .before(commandUtils.beforeEmulatorCommand)
@@ -12,4 +13,6 @@ exports.command = new command_1.Command("emulators:exec <script>")
     .option(commandUtils.FLAG_IMPORT, commandUtils.DESC_IMPORT)
     .option(commandUtils.FLAG_EXPORT_ON_EXIT, commandUtils.DESC_EXPORT_ON_EXIT)
     .option(commandUtils.FLAG_UI, commandUtils.DESC_UI)
-    .action(commandUtils.emulatorExec);
+    .action((script, options) => {
+    return Promise.race([(0, commandUtils_1.shutdownWhenKilled)(options), (0, commandUtils_1.emulatorExec)(script, options)]);
+});

package/lib/commands/emulators-export.js

@@ -4,8 +4,11 @@ exports.command = void 0;
 const command_1 = require("../command");
 const controller = require("../emulator/controller");
 const commandUtils = require("../emulator/commandUtils");
-exports.command = new command_1.Command("emulators:export <path>")
+const COMMAND_NAME = "emulators:export";
+exports.command = new command_1.Command(`${COMMAND_NAME} <path>`)
     .description("export data from running emulators")
     .withForce("overwrite any export data in the target directory")
     .option(commandUtils.FLAG_ONLY, commandUtils.DESC_ONLY)
-    .action(controller.exportEmulatorData);
+    .action((exportPath, options) => {
+    return controller.exportEmulatorData(exportPath, options, COMMAND_NAME);
+});

package/lib/commands/emulators-start.js

@@ -22,16 +22,28 @@ exports.command = new command_1.Command("emulators:start")
     .option(commandUtils.FLAG_INSPECT_FUNCTIONS, commandUtils.DESC_INSPECT_FUNCTIONS)
     .option(commandUtils.FLAG_IMPORT, commandUtils.DESC_IMPORT)
     .option(commandUtils.FLAG_EXPORT_ON_EXIT, commandUtils.DESC_EXPORT_ON_EXIT)
-    .action(async (options) => {
+    .action((options) => {
     const killSignalPromise = commandUtils.shutdownWhenKilled(options);
-    let deprecationNotices;
-    try {
-        ({ deprecationNotices } = await controller.startAll(options));
-    }
-    catch (e) {
-        await controller.cleanShutdown();
-        throw e;
-    }
+    return Promise.race([
+        killSignalPromise,
+        (async () => {
+            let deprecationNotices;
+            try {
+                ({ deprecationNotices } = await controller.startAll(options));
+            }
+            catch (e) {
+                await controller.cleanShutdown();
+                throw e;
+            }
+            printEmulatorOverview(options);
+            for (const notice of deprecationNotices) {
+                (0, utils_1.logLabeledWarning)("emulators", notice, "warn");
+            }
+            return killSignalPromise;
+        })(),
+    ]);
+});
+function printEmulatorOverview(options) {
     const reservedPorts = [];
     for (const internalEmulator of [types_1.Emulators.LOGGING]) {
         const info = registry_1.EmulatorRegistry.getInfo(internalEmulator);
@@ -71,9 +83,7 @@ exports.command = new command_1.Command("emulators:start")
         return [
             emulatorName,
             registry_1.EmulatorRegistry.getInfoHostString(info),
-            isSupportedByUi && uiInfo
-                ? stylizeLink(`${uiUrl}/${emulator}`)
-                : clc.blackBright("n/a"),
+            isSupportedByUi && uiInfo ? stylizeLink(`${uiUrl}/${emulator}`) : clc.blackBright("n/a"),
         ];
     })
         .map((col) => col.slice(0, head.length))
@@ -93,8 +103,4 @@ ${clc.blackBright("  Other reserved ports:")} ${reservedPortsString}
 ${extensionsTable}
 Issues? Report them at ${stylizeLink("https://github.com/firebase/firebase-tools/issues")} and attach the *-debug.log files.
  `);
-    for (const notice of deprecationNotices) {
-        (0, utils_1.logLabeledWarning)("emulators", notice, "warn");
-    }
-    await killSignalPromise;
-});
+}

package/lib/commands/ext-dev-publish.js

@@ -17,12 +17,14 @@ marked.setOptions({
 });
 exports.command = new command_1.Command("ext:dev:publish <extensionRef>")
     .description(`publish a new version of an extension`)
+    .option(`-s, --stage <stage>`, `release stage (supports "rc", "alpha", "beta", and "stable")`)
     .withForce()
     .help("if you have not previously published a version of this extension, this will " +
     "create the extension. If you have previously published a version of this extension, this version must " +
     "be greater than previous versions.")
     .before(requireAuth_1.requireAuth)
     .action(async (extensionRef, options) => {
+    var _a;
     const { publisherId, extensionId, version } = refs.parse(extensionRef);
     if (version) {
         throw new error_1.FirebaseError(`The input extension reference must be of the format ${clc.bold("<publisherId>/<extensionId>")}. Version should not be supplied and will be inferred directly from extension.yaml. Please increment the version in extension.yaml if you would like to bump/specify a version.`);
@@ -37,6 +39,7 @@ exports.command = new command_1.Command("ext:dev:publish <extensionRef>")
         rootDirectory: extensionYamlDirectory,
         nonInteractive: options.nonInteractive,
         force: options.force,
+        stage: (_a = options.stage) !== null && _a !== void 0 ? _a : "stable",
     });
     if (res) {
         utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`[Install Link](${(0, publishHelpers_1.consoleInstallLink)(res.ref)})`));

package/lib/commands/functions-delete.js

@@ -17,6 +17,7 @@ const fabricator = require("../deploy/functions/release/fabricator");
 const executor = require("../deploy/functions/release/executor");
 const reporter = require("../deploy/functions/release/reporter");
 const containerCleaner = require("../deploy/functions/containerCleaner");
+const getProjectNumber_1 = require("../getProjectNumber");
 exports.command = new command_1.Command("functions:delete [filters...]")
     .description("delete one or more Cloud Functions by name or group name.")
     .option("--region <region>", "Specify region of the function to be deleted. " +
@@ -78,6 +79,7 @@ exports.command = new command_1.Command("functions:delete [filters...]")
             appEngineLocation,
             executor: new executor.QueueExecutor({}),
             sources: {},
+            projectNumber: options.projectNumber || (await (0, getProjectNumber_1.getProjectNumber)({ projectId: context.projectId })),
         });
         const summary = await fab.applyPlan(plan);
         await reporter.logAndTrackDeployStats(summary);

package/lib/commands/functions-secrets-get.js

@@ -6,8 +6,10 @@ const command_1 = require("../command");
 const logger_1 = require("../logger");
 const projectUtils_1 = require("../projectUtils");
 const secretManager_1 = require("../gcp/secretManager");
+const requirePermissions_1 = require("../requirePermissions");
 exports.command = new command_1.Command("functions:secrets:get <KEY>")
     .description("Get metadata for secret and its versions")
+    .before(requirePermissions_1.requirePermissions, ["secretmanager.secrets.get"])
     .action(async (key, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const versions = await (0, secretManager_1.listSecretVersions)(projectId, key);

package/lib/commands/index.js

@@ -34,6 +34,9 @@ function load(client) {
     client.crashlytics = {};
     client.crashlytics.symbols = {};
     client.crashlytics.symbols.upload = loadCommand("crashlytics-symbols-upload");
+    client.crashlytics.mappingfile = {};
+    client.crashlytics.mappingfile.generateid = loadCommand("crashlytics-mappingfile-generateid");
+    client.crashlytics.mappingfile.upload = loadCommand("crashlytics-mappingfile-upload");
     client.database = {};
     client.database.get = loadCommand("database-get");
     client.database.instances = {};

package/lib/commands/login.js

@@ -28,11 +28,11 @@ exports.command = new command_1.Command("login")
         return user;
     }
     if (!options.reauth) {
-        utils.logBullet("Firebase optionally collects CLI usage and error reporting information to help improve our products. Data is collected in accordance with Google's privacy policy (https://policies.google.com/privacy) and is not used to identify you.\n");
+        utils.logBullet("Firebase optionally collects CLI and Emulator Suite usage and error reporting information to help improve our products. Data is collected in accordance with Google's privacy policy (https://policies.google.com/privacy) and is not used to identify you.\n");
         const collectUsage = await (0, prompt_1.promptOnce)({
             type: "confirm",
             name: "collectUsage",
-            message: "Allow Firebase to collect CLI usage and error reporting information?",
+            message: "Allow Firebase to collect CLI and Emulator Suite usage and error reporting information?",
         });
         configstore_1.configstore.set("usage", collectUsage);
         if (collectUsage) {

package/lib/crashlytics/buildToolsJarHelper.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runBuildtoolsCommand = exports.fetchBuildtoolsJar = void 0;
+const fs = require("fs-extra");
+const os = require("os");
+const path = require("path");
+const spawn = require("cross-spawn");
+const downloadUtils = require("../downloadUtils");
+const error_1 = require("../error");
+const logger_1 = require("../logger");
+const rimraf = require("rimraf");
+const utils = require("../utils");
+const JAR_CACHE_DIR = process.env.FIREBASE_CRASHLYTICS_BUILDTOOLS_PATH ||
+    path.join(os.homedir(), ".cache", "firebase", "crashlytics", "buildtools");
+const JAR_VERSION = "2.9.1";
+const JAR_URL = `https://dl.google.com/android/maven2/com/google/firebase/firebase-crashlytics-buildtools/${JAR_VERSION}/firebase-crashlytics-buildtools-${JAR_VERSION}.jar`;
+async function fetchBuildtoolsJar() {
+    if (process.env.CRASHLYTICS_LOCAL_JAR) {
+        return process.env.CRASHLYTICS_LOCAL_JAR;
+    }
+    const jarPath = path.join(JAR_CACHE_DIR, `crashlytics-buildtools-${JAR_VERSION}.jar`);
+    if (fs.existsSync(jarPath)) {
+        logger_1.logger.debug(`Buildtools Jar already downloaded at ${jarPath}`);
+        return jarPath;
+    }
+    if (fs.existsSync(JAR_CACHE_DIR)) {
+        logger_1.logger.debug(`Deleting Jar cache at ${JAR_CACHE_DIR} because the CLI was run with a newer Jar version`);
+        rimraf.sync(JAR_CACHE_DIR);
+    }
+    utils.logBullet("Downloading crashlytics-buildtools.jar to " + jarPath);
+    utils.logBullet("For open source licenses used by this command, look in the META-INF directory in the buildtools.jar file");
+    const tmpfile = await downloadUtils.downloadToTmp(JAR_URL);
+    fs.mkdirSync(JAR_CACHE_DIR, { recursive: true });
+    fs.copySync(tmpfile, jarPath);
+    return jarPath;
+}
+exports.fetchBuildtoolsJar = fetchBuildtoolsJar;
+function runBuildtoolsCommand(jarFile, args, debug) {
+    var _a;
+    const fullArgs = ["-jar", jarFile, ...args, "-clientName", "firebase-cli;crashlytics-buildtools"];
+    const outputs = spawn.sync("java", fullArgs, {
+        stdio: debug ? "inherit" : "pipe",
+    });
+    if (outputs.status !== 0) {
+        if (!debug) {
+            utils.logWarning(((_a = outputs.stdout) === null || _a === void 0 ? void 0 : _a.toString()) || "An unknown error occurred");
+        }
+        throw new error_1.FirebaseError(`java command failed with args: ${fullArgs}`);
+    }
+}
+exports.runBuildtoolsCommand = runBuildtoolsCommand;

package/lib/deploy/functions/backend.js

@@ -65,8 +65,8 @@ function memoryToGen1Cpu(memory) {
         2048: 1,
         4096: 2,
         8192: 2,
-        16384: 3,
-        32768: 4,
+        16384: 4,
+        32768: 8,
     }[memory];
 }
 exports.memoryToGen1Cpu = memoryToGen1Cpu;
@@ -79,8 +79,8 @@ function memoryToGen2Cpu(memory) {
         2048: 1,
         4096: 2,
         8192: 2,
-        16384: 2,
-        32768: 4,
+        16384: 4,
+        32768: 8,
     }[memory];
 }
 exports.memoryToGen2Cpu = memoryToGen2Cpu;