firebase-tools 15.19.0 → 15.20.0

package/lib/agentSkills.js

@@ -17,11 +17,12 @@ async function installAgentSkills(options) {
     if (!utils.commandExistsSync("npx")) {
         return;
     }
+    const skillPackage = options.skillPackage || "firebase/agent-skills";
     const args = [
         "-y",
         "skills",
         "add",
-        "firebase/agent-skills",
+        skillPackage,
         "--skill",
         "*",
         "-y",

package/lib/api.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hostingApiOrigin = exports.firebaseStorageOrigin = exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.crashlyticsApiOrigin = exports.messagingApiOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsTOSOrigin = exports.extensionsPublisherOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.cloudbuildOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.eventarcOrigin = exports.consoleOrigin = exports.authManagementOrigin = exports.authOrigin = exports.apphostingGitHubAppInstallationURL = exports.apphostingP4SADomain = exports.apphostingOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.developerConnectP4SADomain = exports.developerConnectOrigin = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
-exports.developerKnowledgeOrigin = exports.cloudTestingOrigin = exports.appTestingOrigin = exports.cloudAiCompanionOrigin = exports.aiLogicProxyOrigin = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectP4SADomain = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = exports.studioApiOrigin = exports.serviceUsageOrigin = exports.cloudRunApiOrigin = void 0;
+exports.developerKnowledgeOrigin = exports.cloudTestingOrigin = exports.appTestingOrigin = exports.aiLogicProxyOrigin = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectP4SADomain = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = exports.studioApiOrigin = exports.serviceUsageOrigin = exports.cloudRunApiOrigin = void 0;
 exports.getScopes = getScopes;
 exports.setScopes = setScopes;
 const constants_1 = require("./emulator/constants");
@@ -144,8 +144,6 @@ const vertexAIOrigin = () => utils.envOverride("VERTEX_AI_URL", "https://aiplatf
 exports.vertexAIOrigin = vertexAIOrigin;
 const aiLogicProxyOrigin = () => utils.envOverride("AI_LOGIC_PROXY_URL", "https://firebasevertexai.googleapis.com");
 exports.aiLogicProxyOrigin = aiLogicProxyOrigin;
-const cloudAiCompanionOrigin = () => utils.envOverride("CLOUD_AI_COMPANION_URL", "https://cloudaicompanion.googleapis.com");
-exports.cloudAiCompanionOrigin = cloudAiCompanionOrigin;
 const appTestingOrigin = () => utils.envOverride("FIREBASE_APP_TESTING_URL", "https://firebaseapptesting.googleapis.com");
 exports.appTestingOrigin = appTestingOrigin;
 const cloudTestingOrigin = () => utils.envOverride("CLOUD_TESTING_URL", "https://testing.googleapis.com");

package/lib/appdistribution/client.js

@@ -225,17 +225,18 @@ class AppDistributionClient {
         }
         utils.logSuccess(`Testers removed from group successfully`);
     }
-    async createReleaseTest(releaseName, devices, aiInstructions, loginCredential, testCaseName, displayName) {
+    async createReleaseTest(releaseName, devices, options = {}) {
         try {
             const response = await this.appDistroV1AlphaClient.request({
                 method: "POST",
                 path: `${releaseName}/tests`,
                 body: {
                     deviceExecutions: devices.map((device) => ({ device })),
-                    loginCredential,
-                    testCase: testCaseName,
-                    aiInstructions: aiInstructions,
-                    displayName: displayName,
+                    loginCredential: options.loginCredential,
+                    testCase: options.testCaseName,
+                    aiInstructions: options.aiInstructions,
+                    displayName: options.displayName,
+                    resultsBucket: options.resultsBucket,
                 },
             });
             return response.body;

package/lib/appdistribution/options-parser-util.js

@@ -8,6 +8,7 @@ exports.getAppName = getAppName;
 exports.toAppName = toAppName;
 exports.parseTestDevices = parseTestDevices;
 exports.getLoginCredential = getLoginCredential;
+exports.getResultsBucket = getResultsBucket;
 const fs = require("fs-extra");
 const error_1 = require("../error");
 const projectUtils_1 = require("../projectUtils");
@@ -137,3 +138,23 @@ function getLoginCredential(args) {
 function isPresenceMismatched(value1, value2) {
     return (value1 && !value2) || (!value1 && value2);
 }
+const APP_NAME_REGEX = /^projects\/(?<projectNumber>[^\/]+)\/apps\/(?<appId>[^\/]+)$/;
+const BUCKET_NAME_FORMAT_REGEX = /^[a-z0-9_.-]+$/;
+function getResultsBucket(bucket, appName) {
+    if (!bucket) {
+        return undefined;
+    }
+    let bucketName = bucket;
+    if (bucketName.startsWith("gs://")) {
+        bucketName = bucketName.substring(5);
+    }
+    if (!BUCKET_NAME_FORMAT_REGEX.test(bucketName)) {
+        throw new error_1.FirebaseError(`Invalid results bucket format: ${bucket}`);
+    }
+    const match = APP_NAME_REGEX.exec(appName);
+    if (!match || typeof match.groups === "undefined") {
+        throw new error_1.FirebaseError(`Invalid app name: ${appName}`);
+    }
+    const { projectNumber } = match.groups;
+    return `projects/${projectNumber}/buckets/${bucketName}`;
+}

package/lib/archiveFile.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.archiveFile = archiveFile;
+const archiver = require("archiver");
+const fs = require("fs");
+const path = require("path");
+const tmp = require("tmp");
+async function archiveFile(filePath, options) {
+    const tmpFileObj = tmp.fileSync({ postfix: ".zip" });
+    const tmpFile = tmpFileObj.name;
+    fs.closeSync(tmpFileObj.fd);
+    const fileStream = fs.createWriteStream(tmpFile, {
+        flags: "w",
+        encoding: "binary",
+    });
+    const archive = archiver("zip");
+    const name = options?.archivedFileName ?? path.basename(filePath);
+    archive.file(filePath, { name });
+    await pipeAsync(archive, fileStream);
+    return tmpFile;
+}
+async function pipeAsync(from, to) {
+    return new Promise((resolve, reject) => {
+        to.on("finish", resolve);
+        to.on("error", reject);
+        from.on("error", reject);
+        from.pipe(to);
+        from.finalize().catch(reject);
+    });
+}

package/lib/command.js

@@ -185,6 +185,13 @@ class Command {
                 .filter(Boolean)
                 .join(",");
         }
+        const exceptOption = (0, utils_1.getInheritedOption)(options, "except");
+        if (exceptOption) {
+            options.except = exceptOption
+                .split(/[\s,]+/)
+                .filter(Boolean)
+                .join(",");
+        }
         try {
             options.config = config_1.Config.load(options);
         }

package/lib/commands/appdistribution-distribute.js

@@ -39,9 +39,11 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
     .option("--test-non-blocking", "run automated tests without waiting for them to complete. Visit the Firebase console for the test results.")
     .option("--test-case-ids <string>", "a comma-separated list of test case IDs.")
     .option("--test-case-ids-file <file>", "path to file with a comma- or newline-separated list of test case IDs.")
+    .option("--results-bucket <bucket>", "The name of a Google Cloud Storage bucket where raw results of any automated tests will be stored. If this flag is not set, Firebase creates a bucket for you. Note that the bucket must be owned by a billing-enabled project, and that using a non-default bucket will result in billing charges for the storage used.")
     .before(requireAuth_1.requireAuth)
     .action(async (file, options) => {
     const appName = (0, options_parser_util_1.getAppName)(options);
+    const resultsBucket = (0, options_parser_util_1.getResultsBucket)(options.resultsBucket, appName);
     const distribution = new distribution_1.Distribution(file);
     const releaseNotes = getReleaseNotes(options.releaseNotes, options.releaseNotesFile);
     const testers = (0, options_parser_util_1.parseIntoStringArray)(options.testers, options.testersFile);
@@ -58,9 +60,9 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
         usernameResourceName: options.testUsernameResource,
         passwordResourceName: options.testPasswordResource,
     });
-    await distribute(appName, distribution, testCases, testDevices, releaseNotes, testers, groups, options.testNonBlocking, loginCredential);
+    await distribute(appName, distribution, testCases, testDevices, releaseNotes, testers, groups, options.testNonBlocking, loginCredential, resultsBucket);
 });
-async function distribute(appName, distribution, testCases, testDevices, releaseNotes, testers, groups, testNonBlocking, loginCredential) {
+async function distribute(appName, distribution, testCases, testDevices, releaseNotes, testers, groups, testNonBlocking, loginCredential, resultsBucket) {
     const requests = new client_1.AppDistributionClient();
     let aabInfo;
     if (distribution.distributionFileType() === distribution_1.DistributionFileType.AAB) {
@@ -116,11 +118,18 @@ async function distribute(appName, distribution, testCases, testDevices, release
         utils.logBullet("starting automated test (note: this feature is in beta)");
         const releaseTestPromises = [];
         if (!testCases.length) {
-            releaseTestPromises.push(requests.createReleaseTest(release.name, testDevices, undefined, loginCredential));
+            releaseTestPromises.push(requests.createReleaseTest(release.name, testDevices, {
+                loginCredential,
+                resultsBucket,
+            }));
         }
         else {
             for (const testCaseId of testCases) {
-                releaseTestPromises.push(requests.createReleaseTest(release.name, testDevices, undefined, loginCredential, `${appName}/testCases/${testCaseId}`));
+                releaseTestPromises.push(requests.createReleaseTest(release.name, testDevices, {
+                    loginCredential,
+                    testCaseName: `${appName}/testCases/${testCaseId}`,
+                    resultsBucket,
+                }));
             }
         }
         const releaseTests = await Promise.all(releaseTestPromises);

package/lib/commands/apptesting.js

@@ -29,9 +29,11 @@ exports.command = new command_1.Command("apptesting:execute [release-binary-file
     .option("--test-devices <string>", "Semicolon-separated list of devices to run automated tests on, in the format 'model=<model-id>,version=<os-version-id>,locale=<locale>,orientation=<orientation>'. Run 'gcloud firebase test android|ios models list' to see available devices. Note: This feature is in beta.")
     .option("--test-devices-file <string>", "Path to file containing a list of semicolon- or newline-separated devices to run automated tests on, in the format 'model=<model-id>,version=<os-version-id>,locale=<locale>,orientation=<orientation>'. Run 'gcloud firebase test android|ios models list' to see available devices. Note: This feature is in beta.")
     .option("--test-non-blocking", "Run automated tests without waiting for them to complete. Visit the Firebase console for the test results.")
+    .option("--results-bucket <bucket>", "The name of a Google Cloud Storage bucket where raw test results will be stored. If this flag is not set, Firebase creates a default bucket for you. Note that the bucket must be owned by a billing-enabled project, and that using a non-default bucket will result in billing charges for the storage used.")
     .before(requireAuth_1.requireAuth)
     .action(async (target, options) => {
     const appName = (0, options_parser_util_1.getAppName)(options);
+    const resultsBucket = (0, options_parser_util_1.getResultsBucket)(options.resultsBucket, appName);
     const testDir = path.resolve(options.testDir || "tests");
     if (!(0, fsutils_1.dirExistsSync)(testDir)) {
         throw new error_1.FirebaseError(`Tests directory not found: ${testDir}. Use the --test-dir flag to choose a different directory.`);
@@ -60,7 +62,7 @@ exports.command = new command_1.Command("apptesting:execute [release-binary-file
             utils.logBullet(`Using release ${release.displayVersion} created at ${release.createTime}`);
         }
         invokeSpinner.start();
-        releaseTests = await invokeTests(client, release.name, tests, !testDevices.length ? defaultDevices : testDevices);
+        releaseTests = await invokeTests(client, release.name, tests, !testDevices.length ? defaultDevices : testDevices, resultsBucket);
         invokeSpinner.text = `${(0, parseTestFiles_1.pluralizeTests)(releaseTests.length)} started successfully!`;
         invokeSpinner.succeed();
     }
@@ -76,14 +78,18 @@ exports.command = new command_1.Command("apptesting:execute [release-binary-file
         utils.logBullet(`View detailed results in the Firebase Console:\n${release.firebaseConsoleUri}`);
     }
 });
-async function invokeTests(client, releaseName, testDefs, devices) {
+async function invokeTests(client, releaseName, testDefs, devices, resultsBucket) {
     try {
         const releaseTests = [];
         for (const testDef of testDefs) {
             const aiInstructions = {
                 steps: testDef.testCase.steps,
             };
-            releaseTests.push(await client.createReleaseTest(releaseName, devices, aiInstructions, undefined, undefined, testDef.testCase.displayName));
+            releaseTests.push(await client.createReleaseTest(releaseName, devices, {
+                aiInstructions,
+                displayName: testDef.testCase.displayName,
+                resultsBucket,
+            }));
         }
         return releaseTests;
     }

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

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const path = require("path");
+const fs_extra_1 = require("fs-extra");
+const fsAsync_1 = require("../fsAsync");
+const command_1 = require("../command");
+const error_1 = require("../error");
+const utils_1 = require("../utils");
+const projectUtils_1 = require("../projectUtils");
+const getProjectNumber_1 = require("../getProjectNumber");
+const requireAuth_1 = require("../requireAuth");
+const sourcemap_1 = require("../crashlytics/sourcemap");
+exports.command = new command_1.Command("crashlytics:sourcemap:upload [mappingFiles]")
+    .description("upload javascript source maps to de-minify stack traces")
+    .option("--app <appID>", "the app id of your Firebase app")
+    .option("--bucket-location <bucketLocation>", 'the location of the Google Cloud Storage bucket (default: "US-CENTRAL1"')
+    .option("--app-version <appVersion>", "the version of your Firebase app (defaults to Git commit hash, if available)")
+    .before(requireAuth_1.requireAuth)
+    .action(async (mappingFiles, options) => {
+    (0, sourcemap_1.checkGoogleAppID)(options);
+    const appVersion = (0, sourcemap_1.getAppVersion)(options);
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const projectNumber = await (0, getProjectNumber_1.getProjectNumber)(options);
+    const bucketName = await (0, sourcemap_1.upsertBucket)(projectId, projectNumber, options);
+    const rootDir = path.resolve(options.projectRoot ?? process.cwd());
+    const filePath = mappingFiles ? path.resolve(mappingFiles) : rootDir;
+    let fstat;
+    try {
+        fstat = (0, fs_extra_1.statSync)(filePath);
+    }
+    catch (e) {
+        throw new error_1.FirebaseError("provide a valid directory to mapping file(s), e.g. app/build/outputs");
+    }
+    let successCount = 0;
+    const failedFiles = [];
+    if (fstat.isDirectory()) {
+        (0, utils_1.logLabeledBullet)("crashlytics", "Looking for mapping files in your directory...");
+        const files = await (0, fsAsync_1.readdirRecursive)({
+            path: filePath,
+            ignoreStrings: ["node_modules", ".git"],
+            maxDepth: 20,
+        });
+        const mappings = await (0, sourcemap_1.findSourceMapMappings)(files, rootDir);
+        const result = await (0, sourcemap_1.uploadSourceMaps)(mappings, {
+            projectId,
+            bucketName,
+            appVersion,
+            options,
+        });
+        successCount = result.successCount;
+        failedFiles.push(...result.failedFiles);
+    }
+    else {
+        throw new error_1.FirebaseError("provide a valid directory to mapping file(s), e.g. app/build/outputs");
+    }
+    (0, utils_1.logLabeledBullet)("crashlytics", `Uploaded ${successCount} (${failedFiles.length} failed) mapping files to ${bucketName}`);
+    if (failedFiles.length > 0) {
+        (0, utils_1.logLabeledBullet)("crashlytics", `Could not upload the following files:\n${failedFiles.join("\n")}`);
+    }
+});

package/lib/commands/index.js

@@ -57,6 +57,10 @@ function load(client) {
     client.crashlytics.mappingfile = {};
     client.crashlytics.mappingfile.generateid = loadCommand("crashlytics-mappingfile-generateid");
     client.crashlytics.mappingfile.upload = loadCommand("crashlytics-mappingfile-upload");
+    if (experiments.isEnabled("crashlyticsWeb")) {
+        client.crashlytics.sourcemap = {};
+        client.crashlytics.sourcemap.upload = loadCommand("crashlytics-sourcemap-upload");
+    }
     client.database = {};
     client.database.get = loadCommand("database-get");
     client.database.import = loadCommand("database-import");

package/lib/crashlytics/sourcemap.js

@@ -0,0 +1,270 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CONCURRENCY = void 0;
+exports.checkGoogleAppID = checkGoogleAppID;
+exports.getAppVersion = getAppVersion;
+exports.getGitCommit = getGitCommit;
+exports.getPackageVersion = getPackageVersion;
+exports.upsertBucket = upsertBucket;
+exports.findSourceMapMappings = findSourceMapMappings;
+exports.getLinkedSourceMapPath = getLinkedSourceMapPath;
+exports.uploadSourceMaps = uploadSourceMaps;
+exports.uploadMap = uploadMap;
+exports.normalizeFileName = normalizeFileName;
+exports.registerSourceMap = registerSourceMap;
+const fs = require("fs");
+const path = require("path");
+const node_child_process_1 = require("node:child_process");
+const pLimit = require("p-limit");
+const apiv2_1 = require("../apiv2");
+const error_1 = require("../error");
+const logger_1 = require("../logger");
+const utils_1 = require("../utils");
+const gcs = require("../gcp/storage");
+const archiveFile_1 = require("../archiveFile");
+exports.CONCURRENCY = 25;
+function checkGoogleAppID(options) {
+    if (!options.app) {
+        throw new error_1.FirebaseError("set --app <appId> to a valid Firebase application id, e.g. 1:00000000:android:0000000");
+    }
+}
+function getAppVersion(options) {
+    if (options.appVersion) {
+        return options.appVersion;
+    }
+    const gitCommit = getGitCommit();
+    if (gitCommit) {
+        (0, utils_1.logLabeledBullet)("crashlytics", `Using git commit as app version: ${gitCommit}`);
+        return gitCommit;
+    }
+    const packageVersion = getPackageVersion();
+    if (packageVersion) {
+        (0, utils_1.logLabeledBullet)("crashlytics", `Using package version as app version: ${packageVersion}`);
+        return packageVersion;
+    }
+    return "unset";
+}
+function getGitCommit() {
+    if (!(0, utils_1.commandExistsSync)("git")) {
+        return undefined;
+    }
+    try {
+        return (0, node_child_process_1.execSync)("git rev-parse HEAD").toString().trim();
+    }
+    catch (error) {
+        return undefined;
+    }
+}
+function getPackageVersion() {
+    if (!(0, utils_1.commandExistsSync)("npm")) {
+        return undefined;
+    }
+    try {
+        return (0, node_child_process_1.execSync)("npm pkg get version").toString().trim().replaceAll('"', "");
+    }
+    catch (error) {
+        return undefined;
+    }
+}
+async function upsertBucket(projectId, projectNumber, options) {
+    let loc = "US-CENTRAL1";
+    if (options.bucketLocation) {
+        loc = options.bucketLocation.toUpperCase();
+    }
+    else {
+        (0, utils_1.logLabeledBullet)("crashlytics", "No Google Cloud Storage bucket location specified. Defaulting to US-CENTRAL1.");
+    }
+    const baseName = `firebasecrashlytics-sourcemaps-${projectNumber}-${loc.toLowerCase()}`;
+    return await gcs.upsertBucket({
+        product: "crashlytics",
+        createMessage: `Creating Cloud Storage bucket in ${loc} to store Crashlytics source maps at ${baseName}...`,
+        projectId,
+        req: {
+            baseName,
+            purposeLabel: `crashlytics-sourcemaps-${loc.toLowerCase()}`,
+            location: loc,
+            lifecycle: {
+                rule: [
+                    {
+                        action: {
+                            type: "Delete",
+                        },
+                        condition: {
+                            age: 30,
+                        },
+                    },
+                ],
+            },
+        },
+    });
+}
+async function findSourceMapMappings(files, rootDir) {
+    const jsFiles = files.filter((f) => f.name.endsWith(".js"));
+    const mapFiles = files.filter((f) => f.name.endsWith(".js.map"));
+    const mappings = [];
+    const mapFilePathsSet = new Set(mapFiles.map((f) => f.name));
+    const mapFilesLinkedInJsComment = new Set();
+    const limit = pLimit(exports.CONCURRENCY);
+    const results = await Promise.all(jsFiles.map((jsFile) => limit(async () => {
+        const mapFilePath = await getLinkedSourceMapPath(jsFile.name);
+        return { jsFile, mapFilePath };
+    })));
+    for (const { jsFile, mapFilePath } of results) {
+        if (mapFilePath && mapFilePathsSet.has(mapFilePath)) {
+            mappings.push({
+                mapFilePath,
+                obfuscatedFilePath: path.relative(rootDir, path.resolve(jsFile.name)),
+            });
+            mapFilesLinkedInJsComment.add(mapFilePath);
+        }
+    }
+    for (const mapFile of mapFiles) {
+        if (!mapFilesLinkedInJsComment.has(mapFile.name)) {
+            mappings.push({
+                mapFilePath: mapFile.name,
+                obfuscatedFilePath: path.relative(rootDir, path.resolve(mapFile.name)),
+            });
+        }
+    }
+    return mappings;
+}
+async function getLinkedSourceMapPath(jsFilePath) {
+    let fileHandle;
+    try {
+        const stat = await fs.promises.stat(jsFilePath);
+        const size = stat.size;
+        const bufferSize = Math.min(size, 4096);
+        if (bufferSize === 0) {
+            return undefined;
+        }
+        fileHandle = await fs.promises.open(jsFilePath, "r");
+        const buffer = Buffer.alloc(bufferSize);
+        const { bytesRead } = await fileHandle.read(buffer, 0, bufferSize, size - bufferSize);
+        const tail = buffer.toString("utf-8", 0, bytesRead);
+        const regex = /^\/\/\s*[#@]\s*sourceMappingURL=(?<sourceMappingURL>.+)\s*$/m;
+        const match = regex.exec(tail);
+        const sourceMappingURL = match?.groups?.sourceMappingURL?.trim();
+        if (sourceMappingURL) {
+            return path.join(path.dirname(jsFilePath), sourceMappingURL);
+        }
+    }
+    catch (e) {
+        logger_1.logger.debug(`Error reading sourceMappingURL from ${jsFilePath}: ${e instanceof Error ? e.message : String(e)}`);
+    }
+    finally {
+        if (fileHandle) {
+            try {
+                await fileHandle.close();
+            }
+            catch (e) {
+            }
+        }
+    }
+    return undefined;
+}
+async function uploadSourceMaps(mappings, request) {
+    const { projectId, bucketName, appVersion, options } = request;
+    const limit = pLimit(exports.CONCURRENCY);
+    const results = await Promise.all(mappings.map((mapping) => limit(async () => {
+        const uploadRequest = {
+            projectId,
+            mappingFile: mapping.mapFilePath,
+            obfuscatedFilePath: mapping.obfuscatedFilePath,
+            bucketName,
+            appVersion,
+            options,
+        };
+        let success = await uploadMap(uploadRequest, 1);
+        if (!success) {
+            await new Promise((res) => setTimeout(res, options.retryDelay || 5000));
+            success = await uploadMap(uploadRequest);
+        }
+        return success;
+    })));
+    let successCount = 0;
+    const failedFiles = [];
+    for (const [i, success] of results.entries()) {
+        if (success) {
+            successCount++;
+        }
+        else {
+            failedFiles.push(mappings[i].mapFilePath);
+        }
+    }
+    return {
+        successCount,
+        failedFiles,
+    };
+}
+async function uploadMap(request, attemptsRemaining = 0) {
+    const { projectId, mappingFile, obfuscatedFilePath, bucketName, appVersion, options } = request;
+    const filePath = path.relative(options.projectRoot ?? process.cwd(), mappingFile);
+    const obfuscatedPath = obfuscatedFilePath
+        .split(path.sep)
+        .map((p) => (p === ".next" ? "_next" : p))
+        .filter((p) => p !== "dev")
+        .join("/");
+    const tmpArchive = await (0, archiveFile_1.archiveFile)(filePath, { archivedFileName: "mapping.js.map" });
+    const appId = options.app || "";
+    const gcsFile = `${appId}-${appVersion}-${normalizeFileName(obfuscatedPath)}.zip`;
+    const uid = (0, utils_1.murmurHashV3)(`${appId}-${appVersion}-${obfuscatedPath}`);
+    const name = `projects/${projectId}/locations/global/mappingFiles/${uid}`;
+    const stream = fs.createReadStream(tmpArchive);
+    stream.on("error", (err) => {
+        logger_1.logger.debug(`Stream error on tmpArchive: ${err instanceof Error ? err.message : String(err)}`);
+    });
+    try {
+        const { bucket, object } = await gcs.uploadObject({
+            file: gcsFile,
+            stream,
+        }, bucketName);
+        const fileUri = `gs://${bucket}/${object}`;
+        logger_1.logger.debug(`Uploaded mapping file ${filePath} to ${fileUri}`);
+        await registerSourceMap({
+            name,
+            appId,
+            version: appVersion,
+            obfuscatedFilePath: `/${obfuscatedPath}`,
+            fileUri,
+        });
+        logger_1.logger.debug(`Registered mapping file ${filePath}`);
+        return true;
+    }
+    catch (e) {
+        if (attemptsRemaining === 0) {
+            (0, utils_1.logLabeledWarning)("crashlytics", `Failed to upload mapping file ${filePath}:\n${e instanceof Error ? e.message : String(e)}`);
+        }
+        return false;
+    }
+    finally {
+        stream.destroy();
+        try {
+            fs.rmSync(tmpArchive, { force: true });
+        }
+        catch (err) {
+            logger_1.logger.debug(`Failed to delete temporary archive ${tmpArchive}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+}
+function normalizeFileName(fileName) {
+    return fileName.replaceAll(/\//g, "-");
+}
+async function registerSourceMap(sourceMap) {
+    const client = new apiv2_1.Client({
+        urlPrefix: "https://firebasetelemetryadmin.googleapis.com",
+        auth: true,
+        apiVersion: "v1alpha",
+    });
+    try {
+        await client.patch(sourceMap.name, sourceMap, { queryParams: { allowMissing: "true" } });
+        logger_1.logger.debug(`Registered source map ${sourceMap.obfuscatedFilePath} with Firebase Telemetry service`);
+    }
+    catch (e) {
+        if (e instanceof error_1.FirebaseError) {
+            if (e.status === 409) {
+                return;
+            }
+        }
+        throw new error_1.FirebaseError(`Failed to register source map ${sourceMap.obfuscatedFilePath} with Firebase Telemetry service:\n${e instanceof Error ? e.message : String(e)}`);
+    }
+}

package/lib/dataconnect/ensureApis.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureApis = ensureApis;
-exports.ensureGIFApiTos = ensureGIFApiTos;
 const api = require("../api");
-const configstore_1 = require("../configstore");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const prefix = "dataconnect";
 async function ensureApis(projectId, silent = false) {
@@ -12,14 +10,3 @@ async function ensureApis(projectId, silent = false) {
         (0, ensureApiEnabled_1.ensure)(projectId, api.cloudSQLAdminOrigin(), prefix, silent),
     ]);
 }
-async function ensureGIFApiTos(projectId) {
-    if (configstore_1.configstore.get("gemini")) {
-        await (0, ensureApiEnabled_1.ensure)(projectId, api.cloudAiCompanionOrigin(), "");
-    }
-    else {
-        if (!(await (0, ensureApiEnabled_1.check)(projectId, api.cloudAiCompanionOrigin(), ""))) {
-            return false;
-        }
-    }
-    return true;
-}

package/lib/deploy/apphosting/prepare.js

@@ -4,7 +4,9 @@ exports.default = default_1;
 exports.injectEnvVarsFromApphostingConfig = injectEnvVarsFromApphostingConfig;
 exports.injectAutoInitEnvVars = injectAutoInitEnvVars;
 exports.getBackendConfigs = getBackendConfigs;
+const crypto = require("crypto");
 const fs = require("fs");
+const os = require("os");
 const path = require("path");
 const fsAsync = require("../../fsAsync");
 const util_1 = require("./util");
@@ -19,7 +21,6 @@ const getProjectNumber_1 = require("../../getProjectNumber");
 const prompt_1 = require("../../prompt");
 const utils_1 = require("../../utils");
 const localbuilds_1 = require("../../apphosting/localbuilds");
-const constants_1 = require("../../apphosting/constants");
 const error_1 = require("../../error");
 const managementApps = require("../../management/apps");
 const utils_2 = require("../../apphosting/utils");
@@ -136,8 +137,9 @@ async function default_1(context, options) {
         (0, utils_1.logLabeledBullet)("apphosting", `Starting local build for backend ${cfg.backendId}`);
         await injectEnvVarsFromApphostingConfig(configs.filter((c) => c.backendId === cfg.backendId), options, buildEnv, runtimeEnv);
         await injectAutoInitEnvVars(cfg, backends, buildEnv, runtimeEnv);
-        const rootDir = options.projectRoot || process.cwd();
-        const localBuildScratchDir = path.join(rootDir, `${constants_1.LOCAL_BUILD_DIR_NAME}_${cfg.backendId}`);
+        const rootDir = path.resolve(options.projectRoot || process.cwd());
+        const pathHash = crypto.createHash("md5").update(rootDir).digest("hex").substring(0, 8);
+        const localBuildScratchDir = path.join(os.tmpdir(), `apphosting-local-build-${cfg.backendId}-${pathHash}`);
         try {
             await prepareLocalBuildScratchDirectory(rootDir, localBuildScratchDir, cfg);
             const { outputFiles, buildConfig } = await (0, localbuilds_1.localBuild)(projectId, localBuildScratchDir, buildEnv[cfg.backendId] || {}, {
@@ -250,9 +252,7 @@ async function ensureAppHostingServiceAgentRoles(projectId, projectNumber) {
 }
 async function prepareLocalBuildScratchDirectory(rootDir, localBuildScratchDir, cfg) {
     const ignore = (0, util_1.resolveIgnorePatterns)(cfg);
-    if (fs.existsSync(localBuildScratchDir)) {
-        throw new error_1.FirebaseError(`The local build scratch directory '${localBuildScratchDir}' already exists. Please delete it and try again.`);
-    }
+    fs.rmSync(localBuildScratchDir, { recursive: true, force: true });
     fs.mkdirSync(localBuildScratchDir, { recursive: true });
     const filesToCopy = await fsAsync.readdirRecursive({
         path: rootDir,

package/lib/deploy/dataconnect/context.js

@@ -7,7 +7,6 @@ function initDeployStats() {
         numBuildErrors: 0,
         numBuildWarnings: new Map(),
         numServiceCreated: 0,
-        numServiceDeleted: 0,
         numSchemaMigrated: 0,
         numConnectorUpdatedBeforeSchema: 0,
         numConnectorUpdatedAfterSchema: 0,
@@ -24,7 +23,6 @@ function deployStatsParams(stats) {
     return {
         missing_billing: (!!stats.missingBilling).toString(),
         num_service_created: stats.numServiceCreated,
-        num_service_deleted: stats.numServiceDeleted,
         num_schema_migrated: stats.numSchemaMigrated,
         num_connector_updated_before_schema: stats.numConnectorUpdatedBeforeSchema,
         num_connector_updated_after_schema: stats.numConnectorUpdatedAfterSchema,